[회원가입][Bug] 파일 이름 변경: From 이라는 단어 제거

app/src/main/AndroidManifest.xml

@@ -36,8 +36,8 @@
     <activity android:name=".lifeplus.activity.PinResetActivity"/>
     <activity android:name=".lifeplus.activity.RestMemberActivity"/>
     <activity android:name=".lifeplus.activity.BlockMemberActivity"/>
-    <activity android:name=".lifeplus.activity.SignUpFromZumoActivity"/>
-    <activity android:name=".lifeplus.activity.SignUpFromOnBoardActivity"/>
+    <activity android:name=".lifeplus.activity.SignUpZumoActivity"/>
+    <activity android:name=".lifeplus.activity.SignUpOnBoardActivity"/>
   </application>
 
 </manifest>

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

@@ -4,13 +4,13 @@
 package kr.co.zumo.app.lifeplus.activity;
 
 import kr.co.zumo.app.lifeplus.model.SignUpModel;
-import kr.co.zumo.app.lifeplus.view.presenter.SignUpFromOnBoardingPresenter;
+import kr.co.zumo.app.lifeplus.view.presenter.SignUpOnBoardingPresenter;
 import kr.co.zumo.app.lifeplus.view.presenter.SignUpPresenter;
 
 /**
- * SignUpFromOnBoardActivity
+ * SignUpOnBoardActivity
  * - OnBoarding 에서 진입한 경우
- * - SignUpActivity 와 모두 같지만 첫 페이지만 다르다.
+ * - SignUpActivity 와 모두 같지만 첫/마지막 페이지만 다르다.
  * <pre>
  * </pre>
  *
@@ -19,11 +19,11 @@ import kr.co.zumo.app.lifeplus.view.presenter.SignUpPresenter;
  * @history 민효동   [2018. 10. 6.]   [최초 작성]
  * @since 2018. 10. 6.
  */
-public class SignUpFromOnBoardActivity extends SignUpActivity {
+public class SignUpOnBoardActivity extends SignUpActivity {
 
   @Override
   SignUpPresenter definePresenter() {
-    return new SignUpFromOnBoardingPresenter(getModel(SignUpModel.class), this);
+    return new SignUpOnBoardingPresenter(getModel(SignUpModel.class), this);
   }
 
 }

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

@@ -4,13 +4,13 @@
 package kr.co.zumo.app.lifeplus.activity;
 
 import kr.co.zumo.app.lifeplus.model.SignUpModel;
-import kr.co.zumo.app.lifeplus.view.presenter.SignUpFromZumoPresenter;
+import kr.co.zumo.app.lifeplus.view.presenter.SignUpZumoPresenter;
 import kr.co.zumo.app.lifeplus.view.presenter.SignUpPresenter;
 
 /**
- * SignUpFromZumoActivity
+ * SignUpZumoActivity
  * - Zumo 유저가 가입 할 경우
- * - SignUpActivity 와 모두 같지만 첫 페이지만 다르다.
+ * - SignUpActivity 와 모두 같지만 첫/마지막 페이지만 다르다.
  * <pre>
  * </pre>
  *
@@ -19,11 +19,11 @@ import kr.co.zumo.app.lifeplus.view.presenter.SignUpPresenter;
  * @history 민효동   [2018. 10. 6.]   [최초 작성]
  * @since 2018. 10. 6.
  */
-public class SignUpFromZumoActivity extends SignUpActivity {
+public class SignUpZumoActivity extends SignUpActivity {
 
   @Override
   SignUpPresenter definePresenter() {
-    return new SignUpFromZumoPresenter(getModel(SignUpModel.class), this);
+    return new SignUpZumoPresenter(getModel(SignUpModel.class), this);
   }
 
 }

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

@@ -13,8 +13,8 @@ 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.SignUpFromOnBoardActivity;
-import kr.co.zumo.app.lifeplus.activity.SignUpFromZumoActivity;
+import kr.co.zumo.app.lifeplus.activity.SignUpOnBoardActivity;
+import kr.co.zumo.app.lifeplus.activity.SignUpZumoActivity;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 
 /**
@@ -52,10 +52,10 @@ public class ActivityFactory {
         activity = SignUpActivity.class;
         break;
       case ScreenID.ACTIVITY_SIGN_UP_FROM_ZUMO:
-        activity = SignUpFromZumoActivity.class;
+        activity = SignUpZumoActivity.class;
         break;
       case ScreenID.ACTIVITY_SIGN_UP_FROM_ON_BOARDING:
-        activity = SignUpFromOnBoardActivity.class;
+        activity = SignUpOnBoardActivity.class;
         break;
       case ScreenID.ACTIVITY_ON_BOARDING:
         activity = OnBoardingActivity.class;

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

@@ -4,7 +4,7 @@
 package kr.co.zumo.app.lifeplus.model;
 
 import kr.co.zumo.app.lifeplus.view.fragment.factory.FragmentFactory;
-import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpFromOnBoardingFragmentFactory;
+import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpOnBoardingFragmentFactory;
 
 /**
  * SignUpFromOnBoardingModel
@@ -24,6 +24,6 @@ public class SignUpFromOnBoardingModel extends SignUpModel {
    */
   @Override
   public FragmentFactory getFragmentFactory() {
-    return new SignUpFromOnBoardingFragmentFactory();
+    return new SignUpOnBoardingFragmentFactory();
   }
 }

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

@@ -4,7 +4,7 @@
 package kr.co.zumo.app.lifeplus.model;
 
 import kr.co.zumo.app.lifeplus.view.fragment.factory.FragmentFactory;
-import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpFromZumoFragmentFactory;
+import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpZumoFragmentFactory;
 
 /**
  * SignUpFromZumoModel
@@ -24,6 +24,6 @@ public class SignUpFromZumoModel extends SignUpModel {
    */
   @Override
   public FragmentFactory getFragmentFactory() {
-    return new SignUpFromZumoFragmentFactory();
+    return new SignUpZumoFragmentFactory();
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/factory/SignUpFromOnBoardingFragmentFactory.java

@@ -6,7 +6,7 @@ package kr.co.zumo.app.lifeplus.view.fragment.factory;
 import android.support.v4.app.Fragment;
 
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpStartFromOnBoardingFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpStartOnBoardingFragment;
 
 /**
  * 프래그먼트 팩토리
@@ -18,13 +18,13 @@ import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpStartFromOnBoardingFra
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
-public class SignUpFromOnBoardingFragmentFactory extends BasicFragmentFactory {
+public class SignUpOnBoardingFragmentFactory extends BasicFragmentFactory {
   @Override
   public Fragment getFragmentById(@ScreenID.FragmentID int id) {
     Fragment fragment = null;
     switch (id) {
       case ScreenID.SIGN_UP_START:
-        fragment = new SignUpStartFromOnBoardingFragment();
+        fragment = new SignUpStartOnBoardingFragment();
         break;
       default:
         fragment = super.getFragmentById(id);

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/factory/SignUpFromZumoFragmentFactory.java

@@ -6,7 +6,7 @@ package kr.co.zumo.app.lifeplus.view.fragment.factory;
 import android.support.v4.app.Fragment;
 
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpStartFromZumoFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpStartZumoFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpCompletedZumoFragment;
 
 /**
@@ -19,13 +19,13 @@ import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpCompletedZumoFragment;
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
-public class SignUpFromZumoFragmentFactory extends BasicFragmentFactory {
+public class SignUpZumoFragmentFactory extends BasicFragmentFactory {
   @Override
   public Fragment getFragmentById(@ScreenID.FragmentID int id) {
     Fragment fragment = null;
     switch (id) {
       case ScreenID.SIGN_UP_START:
-        fragment = new SignUpStartFromZumoFragment();
+        fragment = new SignUpStartZumoFragment();
         break;
       case ScreenID.SIGN_UP_COMPLETED:
         fragment = new SignUpCompletedZumoFragment();

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpStartFromOnBoardingFragment.java

@@ -19,7 +19,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.signup.ISignUpStartView;
 import kr.co.zumo.app.lifeplus.view.presenter.signup.SignUpStartPresenter;
 
 /**
- * SignUpStartFromOnBoardingFragment
+ * SignUpStartOnBoardingFragment
  * <pre>
  * </pre>
  *
@@ -28,7 +28,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.signup.SignUpStartPresenter;
  * @history 하세미   [2018-09-21]   [최초 작성]
  * @since 2018-09-21
  */
-public class SignUpStartFromOnBoardingFragment extends FragmentBase<SignUpStartPresenter> implements ISignUpStartView {
+public class SignUpStartOnBoardingFragment extends FragmentBase<SignUpStartPresenter> implements ISignUpStartView {
 
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpStartFromZumoFragment.java

@@ -28,7 +28,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.signup.SignUpStartPresenter;
  * @history 하세미   [2018-09-21]   [최초 작성]
  * @since 2018-09-21
  */
-public class SignUpStartFromZumoFragment extends FragmentBase<SignUpStartPresenter> implements ISignUpStartView {
+public class SignUpStartZumoFragment extends FragmentBase<SignUpStartPresenter> implements ISignUpStartView {
 
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {

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

@@ -5,10 +5,10 @@ package kr.co.zumo.app.lifeplus.view.presenter;
 
 import kr.co.zumo.app.lifeplus.model.SignUpModel;
 import kr.co.zumo.app.lifeplus.view.ISignUpView;
-import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpFromOnBoardingFragmentFactory;
+import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpOnBoardingFragmentFactory;
 
 /**
- * SignUpFromOnBoardingPresenter
+ * SignUpOnBoardingPresenter
  * <pre>
  * </pre>
  *
@@ -17,15 +17,15 @@ import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpFromOnBoardingFragmen
  * @history 민효동   [2018. 9. 21.]   [최초 작성]
  * @since 2018. 9. 21.
  */
-public class SignUpFromOnBoardingPresenter extends SignUpPresenter {
+public class SignUpOnBoardingPresenter extends SignUpPresenter {
 
 
-  public SignUpFromOnBoardingPresenter(SignUpModel model, ISignUpView view) {
+  public SignUpOnBoardingPresenter(SignUpModel model, ISignUpView view) {
     super(model, view);
   }
 
   @Override
   protected void defineFactory() {
-    model.setFragmentFactory(new SignUpFromOnBoardingFragmentFactory());
+    model.setFragmentFactory(new SignUpOnBoardingFragmentFactory());
   }
 }

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

@@ -5,10 +5,10 @@ package kr.co.zumo.app.lifeplus.view.presenter;
 
 import kr.co.zumo.app.lifeplus.model.SignUpModel;
 import kr.co.zumo.app.lifeplus.view.ISignUpView;
-import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpFromZumoFragmentFactory;
+import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpZumoFragmentFactory;
 
 /**
- * SignUpFromZumoPresenter
+ * SignUpZumoPresenter
  * <pre>
  * </pre>
  *
@@ -17,15 +17,15 @@ import kr.co.zumo.app.lifeplus.view.fragment.factory.SignUpFromZumoFragmentFacto
  * @history 민효동   [2018. 9. 21.]   [최초 작성]
  * @since 2018. 9. 21.
  */
-public class SignUpFromZumoPresenter extends SignUpPresenter {
+public class SignUpZumoPresenter extends SignUpPresenter {
 
 
-  public SignUpFromZumoPresenter(SignUpModel model, ISignUpView view) {
+  public SignUpZumoPresenter(SignUpModel model, ISignUpView view) {
     super(model, view);
   }
 
   @Override
   protected void defineFactory() {
-    model.setFragmentFactory(new SignUpFromZumoFragmentFactory());
+    model.setFragmentFactory(new SignUpZumoFragmentFactory());
   }
 }