[공통][Bug] 튜토리얼 화면 버튼 클릭 이벤트 수정 중

app/src/main/java/kr/co/zumo/app/lifeplus/activity/TutorialActivity.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.model.TutorialModel;
+import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.ITutorialView;
 import kr.co.zumo.app.lifeplus.view.fragment.tutorial.TutorialPagerAdapter;
 import kr.co.zumo.app.lifeplus.view.presenter.TutorialPresenter;
@@ -34,8 +35,8 @@ public class TutorialActivity extends ActivityBase<TutorialPresenter> implements
   private TutorialPagerAdapter tutorialPagerAdapter;
   private ViewPager viewPager;
   private TabLayout tabLayout;
-  private TextView button1Tutorial;
-  private TextView button2Tutorial;
+  private TextView buttonTutorial1;
+  private TextView buttonTutorial2;
 
   @Override
   void onAfterCreate(Bundle savedInstanceState) {
@@ -44,6 +45,8 @@ public class TutorialActivity extends ActivityBase<TutorialPresenter> implements
     view = (View) findViewById(R.id.tutorial_bottom_layout);
     viewPager = (ViewPager) findViewById(R.id.tutorial_view_pager);
     tabLayout = (TabLayout) findViewById(R.id.tutorial_tab_layout);
+    buttonTutorial1 = (TextView) view.findViewById(R.id.button1_tutorial);
+    buttonTutorial2 = (TextView) view.findViewById(R.id.button2_tutorial);
 
 
     viewPager = findViewById(R.id.tutorial_view_pager);
@@ -57,6 +60,16 @@ public class TutorialActivity extends ActivityBase<TutorialPresenter> implements
     viewPager.setAdapter(tutorialPagerAdapter);
 
 
+    buttonTutorial1.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_CLOSE).build()));
+
+    if (buttonTutorial2.getText().equals("다음")) {
+      buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_NEXT).build()));
+    }
+    else {
+      buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_CLOSE).build()));
+
+    }
+
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/tutorial/TutorialPagerAdapter.java

@@ -10,7 +10,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -89,11 +88,6 @@ public class TutorialPagerAdapter extends PagerAdapter {
     TextView textViewTitle = (TextView) view.findViewById(R.id.text_view_tutorial_title);
     TextView textViewDetail = (TextView) view.findViewById(R.id.text_view_tutorial_detail);
 
-    // TODO: 하단 바 버튼 액티비티에 include 수정됨 
-    TextView buttonTutorial1 = (TextView) view.findViewById(R.id.button1_tutorial);
-    TextView buttonTutorial2 = (TextView) view.findViewById(R.id.button2_tutorial);
-    
-    
     switch (position) {
       case 0:
         bottomView.setVisibility(View.VISIBLE);
@@ -121,19 +115,8 @@ public class TutorialPagerAdapter extends PagerAdapter {
       default:
         break;
 
-        
-    buttonTutorial1.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_CLOSE).build()));
-
-    if (buttonTutorial2.getText().equals("다음")) {
-      buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_NEXT).build()));
-    }
-    else {
-      buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_CLOSE).build()));
-
     }
-
     container.addView(view);
-
     return view;
   }