[온보딩][Bug] 이름 변경: Tutorial -> OnBoarding

app/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
       </intent-filter>
     </activity>
     <activity android:name=".lifeplus.activity.MainActivity"/>
-    <activity android:name=".lifeplus.activity.TutorialActivity"/>
+    <activity android:name=".lifeplus.activity.OnBoardingActivity"/>
     <activity
       android:name=".lifeplus.activity.SignUpActivity"
       android:windowSoftInputMode="adjustResize"/>

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

@@ -60,7 +60,7 @@ public class ActivityStarter {
       intent = new Intent(context, PermissionInfoActivity.class);
     }
     else if (preferences.isTutorialDone() == false) {
-      intent = new Intent(context, TutorialActivity.class);
+      intent = new Intent(context, OnBoardingActivity.class);
     }
     else if (StringUtil.isEmpty(SuperModel.getInstance().getUserId())) {
       intent = new Intent(context, SignUpActivity.class);

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

@@ -13,14 +13,14 @@ 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.model.OnBoardingModel;
 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;
+import kr.co.zumo.app.lifeplus.view.IOnBoardingView;
+import kr.co.zumo.app.lifeplus.view.fragment.onboarding.OnBoardingPagerAdapter;
+import kr.co.zumo.app.lifeplus.view.presenter.OnBoardingPresenter;
 
 /**
- * TutorialActivity
+ * OnBoardingActivity
  * <pre>
  * </pre>
  *
@@ -29,7 +29,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.TutorialPresenter;
  * @history 민효동   [2018. 9. 19.]   [최초 작성]
  * @since 2018. 9. 19.
  */
-public class TutorialActivity extends ActivityBase<TutorialPresenter> implements ITutorialView {
+public class OnBoardingActivity extends ActivityBase<OnBoardingPresenter> implements IOnBoardingView {
 
   private View bottomBar;
   private PagerAdapter pagerAdapter;
@@ -41,7 +41,7 @@ public class TutorialActivity extends ActivityBase<TutorialPresenter> implements
   @Override
   void onAfterCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_tutorial);
-    presenter = new TutorialPresenter(new TutorialModel(), this);
+    presenter = new OnBoardingPresenter(new OnBoardingModel(), this);
     bottomBar = (View) findViewById(R.id.tutorial_bottom_layout);
     viewPager = (ViewPager) findViewById(R.id.tutorial_view_pager);
     tabLayout = (TabLayout) findViewById(R.id.tutorial_tab_layout);
@@ -51,12 +51,12 @@ public class TutorialActivity extends ActivityBase<TutorialPresenter> implements
     viewPager = findViewById(R.id.tutorial_view_pager);
     tabLayout = findViewById(R.id.tutorial_tab_layout);
 
-    TutorialPagerAdapter tutorialPagerAdapter = presenter.getPagerAdapter(this);
-    tutorialPagerAdapter.setPresenter(presenter);
-    tutorialPagerAdapter.setBottomBar(bottomBar);
-    tutorialPagerAdapter.setTabLayout(tabLayout);
+    OnBoardingPagerAdapter onBoardingPagerAdapter = presenter.getPagerAdapter(this);
+    onBoardingPagerAdapter.setPresenter(presenter);
+    onBoardingPagerAdapter.setBottomBar(bottomBar);
+    onBoardingPagerAdapter.setTabLayout(tabLayout);
 
-    pagerAdapter = tutorialPagerAdapter;
+    pagerAdapter = onBoardingPagerAdapter;
 
     // 1개 일 때 인디케이터 표시하지 않기
 //    if (pagerAdapter.getCount() < 2) {
@@ -76,7 +76,7 @@ public class TutorialActivity extends ActivityBase<TutorialPresenter> implements
 
       @Override
       public void onPageScrollStateChanged(int state) {
-        Log.w("APP# TutorialActivity | onPageScrollStateChanged", "|" + state);
+        Log.w("APP# OnBoardingActivity | onPageScrollStateChanged", "|" + state);
 
       }
     });
@@ -92,8 +92,8 @@ public class TutorialActivity extends ActivityBase<TutorialPresenter> implements
   }
 
   @Override
-  TutorialPresenter definePresenter() {
-    return new TutorialPresenter(getModel(TutorialModel.class), this);
+  OnBoardingPresenter definePresenter() {
+    return new OnBoardingPresenter(getModel(OnBoardingModel.class), this);
   }
 
   @Override

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

@@ -14,7 +14,6 @@ import kr.co.zumo.app.lifeplus.view.ISignUpView;
 import kr.co.zumo.app.lifeplus.view.presenter.SignUpPresenter;
 
 /**
- * ;
  * SignUpActivity
  * <pre>
  * </pre>

app/src/main/java/kr/co/zumo/app/lifeplus/activity/factory/ActivityFactory.java

@@ -8,11 +8,11 @@ import kr.co.zumo.app.lifeplus.activity.BlockMemberActivity;
 import kr.co.zumo.app.lifeplus.activity.FAQActivity;
 import kr.co.zumo.app.lifeplus.activity.MainActivity;
 import kr.co.zumo.app.lifeplus.activity.NetworkErrorActivity;
+import kr.co.zumo.app.lifeplus.activity.OnBoardingActivity;
 import kr.co.zumo.app.lifeplus.activity.PinConfirmActivity;
 import kr.co.zumo.app.lifeplus.activity.PinResetActivity;
 import kr.co.zumo.app.lifeplus.activity.RestMemberActivity;
 import kr.co.zumo.app.lifeplus.activity.SignUpActivity;
-import kr.co.zumo.app.lifeplus.activity.TutorialActivity;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 
 /**
@@ -49,8 +49,8 @@ public class ActivityFactory {
       case ScreenID.ACTIVITY_SIGN_UP:
         activity = SignUpActivity.class;
         break;
-      case ScreenID.ACTIVITY_TUTORIAL:
-        activity = TutorialActivity.class;
+      case ScreenID.ACTIVITY_ON_BOARDING:
+        activity = OnBoardingActivity.class;
         break;
       case ScreenID.ACTIVITY_NETWORK_ERROR:
         activity = NetworkErrorActivity.class;

app/src/main/java/kr/co/zumo/app/lifeplus/model/TutorialModel.java

@@ -4,7 +4,7 @@
 package kr.co.zumo.app.lifeplus.model;
 
 /**
- * TutorialModel
+ * OnBoardingModel
  * <pre>
  * </pre>
  *
@@ -13,7 +13,7 @@ package kr.co.zumo.app.lifeplus.model;
  * @history 민효동   [2018. 9. 21.]   [최초 작성]
  * @since 2018. 9. 21.
  */
-public class TutorialModel extends Model {
+public class OnBoardingModel extends Model {
 
   @Override
   protected void destroyInternal() {

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenID.java

@@ -42,18 +42,20 @@ public class ScreenID {
   public static final int ACTIVITY_PIN = 1000;
   public static final int ACTIVITY_MAIN = 1001;
   public static final int ACTIVITY_SIGN_UP = 1002;
-  public static final int ACTIVITY_TUTORIAL = 1003;
+  public static final int ACTIVITY_ON_BOARDING = 1003;
   public static final int ACTIVITY_NETWORK_ERROR = 1004;
   public static final int ACTIVITY_AUTHORIZATION = 1005;
   public static final int ACTIVITY_FAQ = 1006;
   public static final int ACTIVITY_PIN_RESET = 1007;
   public static final int ACTIVITY_MEMBER_REST = 1008;
   public static final int ACTIVITY_MEMBER_BLOCK = 1009;
+  public static final int ACTIVITY_SIGN_UP_FROM_ZUMO = 1010;
+  public static final int ACTIVITY_SIGN_UP_FROM_ON_BOARDING = 1011;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
-    ACTIVITY_PIN, ACTIVITY_MAIN, ACTIVITY_SIGN_UP, ACTIVITY_TUTORIAL, ACTIVITY_NETWORK_ERROR, ACTIVITY_AUTHORIZATION, ACTIVITY_FAQ,
-    ACTIVITY_PIN_RESET, ACTIVITY_MEMBER_REST, ACTIVITY_MEMBER_BLOCK,
+    ACTIVITY_PIN, ACTIVITY_MAIN, ACTIVITY_SIGN_UP, ACTIVITY_ON_BOARDING, ACTIVITY_NETWORK_ERROR, ACTIVITY_AUTHORIZATION, ACTIVITY_FAQ,
+    ACTIVITY_PIN_RESET, ACTIVITY_MEMBER_REST, ACTIVITY_MEMBER_BLOCK, ACTIVITY_SIGN_UP_FROM_ZUMO, ACTIVITY_SIGN_UP_FROM_ON_BOARDING,
   })
   public @interface ActivityID {}
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/ITutorialView.java

@@ -4,7 +4,7 @@
 package kr.co.zumo.app.lifeplus.view;
 
 /**
- * ITutorialView
+ * IOnBoardingView
  * <pre>
  * </pre>
  *
@@ -13,7 +13,7 @@ package kr.co.zumo.app.lifeplus.view;
  * @history 민효동   [2018. 9. 21.]   [최초 작성]
  * @since 2018. 9. 21.
  */
-public interface ITutorialView extends IView {
+public interface IOnBoardingView extends IView {
 
   /**
    * 건너뛰기 클릭시 main page 이동

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

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
  */
-package kr.co.zumo.app.lifeplus.view.fragment.tutorial;
+package kr.co.zumo.app.lifeplus.view.fragment.onboarding;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
@@ -14,7 +14,7 @@ import android.widget.TextView;
 import kr.co.zumo.app.R;
 
 /**
- * TutorialFromZumoPagerAdapter
+ * OnBoardingFromZumoPagerAdapter
  * <pre>
  * </pre>
  *
@@ -23,8 +23,8 @@ import kr.co.zumo.app.R;
  * @history 민효동   [2018. 10. 4.]   [최초 작성]
  * @since 2018. 10. 4.
  */
-public class TutorialFromZumoPagerAdapter extends TutorialPagerAdapter {
-  public TutorialFromZumoPagerAdapter(Context context) {
+public class OnBoardingFromZumoPagerAdapter extends OnBoardingPagerAdapter {
+  public OnBoardingFromZumoPagerAdapter(Context context) {
     super(context);
   }
 
@@ -37,7 +37,7 @@ public class TutorialFromZumoPagerAdapter extends TutorialPagerAdapter {
   @Override
   public Object instantiateItem(@NonNull ViewGroup container, int position) {
 
-    Log.e("APP#  TutorialPagerAdapter | instantiateItem", "| position" + position);
+    Log.e("APP#  OnBoardingPagerAdapter | instantiateItem", "| position" + position);
     view = layoutInflater.inflate(R.layout.tutorial_layout, container, false);
     ImageView imageViewTutorial = (ImageView) view.findViewById(R.id.image_view_tutorial);
     TextView textViewTitle = (TextView) view.findViewById(R.id.text_view_tutorial_title);

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

@@ -1,4 +1,4 @@
-package kr.co.zumo.app.lifeplus.view.fragment.tutorial;
+package kr.co.zumo.app.lifeplus.view.fragment.onboarding;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
@@ -15,7 +15,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
- * TutorialPagerAdapter
+ * OnBoardingPagerAdapter
  * <pre>
  *  tutorial viewpager adapter 클래스
  * </pre>
@@ -25,7 +25,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  * @history 하세미   [2018-09-18]   [최초 작성]
  * @since 2018-09-18
  */
-public class TutorialPagerAdapter extends PagerAdapter {
+public class OnBoardingPagerAdapter extends PagerAdapter {
 
   protected View view;
   protected View bottomBar;
@@ -45,7 +45,7 @@ public class TutorialPagerAdapter extends PagerAdapter {
 
   public void setTabLayout(View tabLayout) {this.tabLayout = tabLayout;}
 
-  public TutorialPagerAdapter(Context context) {
+  public OnBoardingPagerAdapter(Context context) {
     layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/TutorialPresenter.java

@@ -8,17 +8,17 @@ import android.content.Context;
 import android.util.Log;
 
 import kr.co.zumo.app.lifeplus.activity.ActivityStarter;
+import kr.co.zumo.app.lifeplus.model.OnBoardingModel;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
-import kr.co.zumo.app.lifeplus.model.TutorialModel;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.ITutorialView;
+import kr.co.zumo.app.lifeplus.view.IOnBoardingView;
 import kr.co.zumo.app.lifeplus.view.command.ActivityChangeCommand;
-import kr.co.zumo.app.lifeplus.view.fragment.tutorial.TutorialFromZumoPagerAdapter;
-import kr.co.zumo.app.lifeplus.view.fragment.tutorial.TutorialPagerAdapter;
+import kr.co.zumo.app.lifeplus.view.fragment.onboarding.OnBoardingFromZumoPagerAdapter;
+import kr.co.zumo.app.lifeplus.view.fragment.onboarding.OnBoardingPagerAdapter;
 
 /**
- * TutorialPresenter
+ * OnBoardingPresenter
  * <pre>
  * </pre>
  *
@@ -27,10 +27,10 @@ import kr.co.zumo.app.lifeplus.view.fragment.tutorial.TutorialPagerAdapter;
  * @history 민효동   [2018. 9. 21.]   [최초 작성]
  * @since 2018. 9. 21.
  */
-public class TutorialPresenter extends Presenter<TutorialModel, ITutorialView> {
+public class OnBoardingPresenter extends Presenter<OnBoardingModel, IOnBoardingView> {
   ActivityStarter starter;
 
-  public TutorialPresenter(TutorialModel model, ITutorialView view) {
+  public OnBoardingPresenter(OnBoardingModel model, IOnBoardingView view) {
     super(model, view);
   }
 
@@ -69,7 +69,7 @@ public class TutorialPresenter extends Presenter<TutorialModel, ITutorialView> {
 
   @Override
   public boolean onBackPressed() {
-    Log.e("APP#  TutorialPresenter | onBackPressed", "|" + "onBackPressed");
+    Log.e("APP#  OnBoardingPresenter | onBackPressed", "|" + "onBackPressed");
     onCommand(new ActivityChangeCommand(ScreenID.ACTIVITY_MAIN, ScreenID.DIRECTION_BACK));
     return true;
   }
@@ -121,14 +121,14 @@ public class TutorialPresenter extends Presenter<TutorialModel, ITutorialView> {
 
   }
 
-  public TutorialPagerAdapter getPagerAdapter(Context context) {
-    TutorialPagerAdapter tutorialPagerAdapter;
+  public OnBoardingPagerAdapter getPagerAdapter(Context context) {
+    OnBoardingPagerAdapter onBoardingPagerAdapter;
     if (model.isUpdateUser()) {
-      tutorialPagerAdapter = new TutorialFromZumoPagerAdapter(context);
+      onBoardingPagerAdapter = new OnBoardingFromZumoPagerAdapter(context);
     }
     else {
-      tutorialPagerAdapter = new TutorialPagerAdapter(context);
+      onBoardingPagerAdapter = new OnBoardingPagerAdapter(context);
     }
-    return tutorialPagerAdapter;
+    return onBoardingPagerAdapter;
   }
 }

app/src/main/res/layout/activity_faq.xml

@@ -8,7 +8,7 @@
   android:layout_height="match_parent"
   android:background="@color/CFFFFFF"
   android:orientation="vertical"
-  tools:context="kr.co.zumo.app.lifeplus.activity.TutorialActivity">
+  tools:context="kr.co.zumo.app.lifeplus.activity.OnBoardingActivity">
 
   <android.support.design.widget.TabLayout
     android:background="@null"

app/src/main/res/layout/activity_tutorial.xml

@@ -7,7 +7,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:fitsSystemWindows="true"
-  tools:context="kr.co.zumo.app.lifeplus.activity.TutorialActivity">
+  tools:context="kr.co.zumo.app.lifeplus.activity.OnBoardingActivity">
 
   <android.support.v4.view.ViewPager
     android:id="@+id/tutorial_view_pager"

app/src/main/res/menu/menu_tutorial.xml

@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
       xmlns:tools="http://schemas.android.com/tools"
-      tools:context="kr.co.zumo.app.lifeplus.view.fragment.tutorial.TutorialFragment">
+      tools:context="kr.co.zumo.app.lifeplus.view.fragment.onboarding.TutorialFragment">
   <item
     android:id="@+id/action_settings"
     android:orderInCategory="100"

app/src/test/java/kr/co/zumo/app/lifeplus/activity/factory/ActivityFactoryTest.java

@@ -12,7 +12,7 @@ import kr.co.zumo.app.lifeplus.activity.PinConfirmActivity;
 import kr.co.zumo.app.lifeplus.activity.PinResetActivity;
 import kr.co.zumo.app.lifeplus.activity.RestMemberActivity;
 import kr.co.zumo.app.lifeplus.activity.SignUpActivity;
-import kr.co.zumo.app.lifeplus.activity.TutorialActivity;
+import kr.co.zumo.app.lifeplus.activity.OnBoardingActivity;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 
 public class ActivityFactoryTest {
@@ -25,7 +25,7 @@ public class ActivityFactoryTest {
     Assert.assertEquals(PinConfirmActivity.class, factory.getActivityClass(ScreenID.ACTIVITY_PIN));
     Assert.assertEquals(PinResetActivity.class, factory.getActivityClass(ScreenID.ACTIVITY_PIN_RESET));
     Assert.assertEquals(SignUpActivity.class, factory.getActivityClass(ScreenID.ACTIVITY_SIGN_UP));
-    Assert.assertEquals(TutorialActivity.class, factory.getActivityClass(ScreenID.ACTIVITY_TUTORIAL));
+    Assert.assertEquals(OnBoardingActivity.class, factory.getActivityClass(ScreenID.ACTIVITY_ON_BOARDING));
     Assert.assertEquals(NetworkErrorActivity.class, factory.getActivityClass(ScreenID.ACTIVITY_NETWORK_ERROR));
     Assert.assertEquals(FAQActivity.class, factory.getActivityClass(ScreenID.ACTIVITY_FAQ));
     Assert.assertEquals(RestMemberActivity.class, factory.getActivityClass(ScreenID.ACTIVITY_MEMBER_REST));