Forráskód Böngészése

[온보딩][Bug] 기존주모회원 진입시 온보딩 버그 수정

Hasemi 7 éve
szülő
commit
a2416f1cfc

+ 7 - 6
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/onboarding/OnBoardingFragment.java

@@ -19,6 +19,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
 /**
@@ -50,11 +51,11 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    //   bottomBar = (View) findViewById(R.id.tutorial_bottom_layout);
+    bottomBar = (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) bottomBar.findViewById(R.id.button1_tutorial);
-//    buttonTutorial2 = (TextView) bottomBar.findViewById(R.id.button2_tutorial);
+    buttonTutorial1 = (TextView) bottomBar.findViewById(R.id.button1_tutorial);
+    buttonTutorial2 = (TextView) bottomBar.findViewById(R.id.button2_tutorial);
 
     findViewById(R.id.main_content).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
 
@@ -78,7 +79,7 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
 
       // TODO: 2차 오픈: 준비중, 얼랏 처리
       public void onPageSelected(int position) {
-        //bottomBar.setVisibility(position != 0 ? View.VISIBLE : View.INVISIBLE);
+        bottomBar.setVisibility(position != 0 ? View.VISIBLE : View.INVISIBLE);
       }
 
       @Override
@@ -87,8 +88,8 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
 
       }
     });
-//    buttonTutorial1.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_LEFT).build()));
-//    buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_RIGHT).build()));
+    buttonTutorial1.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_LEFT).build()));
+    buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_RIGHT).build()));
 
   }
 

+ 0 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/onboarding/OnBoardingFromZumoPagerAdapter.java

@@ -46,7 +46,6 @@ public class OnBoardingFromZumoPagerAdapter extends OnBoardingPagerAdapter {
     tabLayout.setVisibility(View.GONE);
 
     ((TextView) bottomBar.findViewById(R.id.button1_tutorial)).setText(R.string.tutorial_bottom_close);
-    // TODO: 2차 오픈: 준비중, 얼랏 처리
     ((TextView) bottomBar.findViewById(R.id.button2_tutorial)).setText(R.string.tutorial_bottom_next_for_zumo_user_2);
 
     switch (position) {

+ 1 - 1
app/src/main/res/layout/fragment_on_boarding.xml

@@ -26,6 +26,6 @@
     app:tabGravity="center"
     app:tabIndicatorHeight="0dp"/>
 
-  <!--<include layout="@layout/on_boarding_bottom_layout"/>-->
+  <include layout="@layout/on_boarding_bottom_layout"/>
 
 </RelativeLayout>