[회원가입][New] 핀 입력 화면 추가 2

app/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
     <activity android:name=".lifeplus.activity.NetworkErrorActivity"/>
     <activity android:name=".lifeplus.activity.PermissionInfoActivity"/>
     <activity android:name=".lifeplus.activity.FAQActivity"/>
-    <activity android:name=".lifeplus.activity.PinActivity"/>
+    <activity android:name=".lifeplus.activity.PinConfirmActivity"/>
     <activity android:name=".lifeplus.activity.PinResetActivity"/>
   </application>
 

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

@@ -13,10 +13,11 @@ import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IPinView;
 import kr.co.zumo.app.lifeplus.view.custom.CustomPinConfirmPresenter;
 import kr.co.zumo.app.lifeplus.view.custom.CustomPinView;
-import kr.co.zumo.app.lifeplus.view.presenter.PinPresenter;
+import kr.co.zumo.app.lifeplus.view.presenter.PinConfirmPresenter;
 
 /**
- * PinActivity
+ * PinConfirmActivity
+ * - 핀 확인 액티비티
  * <pre>
  * </pre>
  *
@@ -25,16 +26,24 @@ import kr.co.zumo.app.lifeplus.view.presenter.PinPresenter;
  * @history 민효동   [2018-10-04]   [최초 작성]
  * @since 2018-10-04
  */
-public class PinActivity extends ActivityBase<PinPresenter> implements IPinView {
+public class PinConfirmActivity extends ActivityBase<PinConfirmPresenter> implements IPinView {
 
-  CustomPinView customPinView;
-  CustomPinConfirmPresenter customPinConfirmPresenter;
+  private CustomPinView customPinView;
+  private CustomPinConfirmPresenter customPinConfirmPresenter;
 
   @Override
   void onAfterCreate(Bundle savedInstanceState) {
 
     setContentView(R.layout.view_container);
 
+    /**
+     * 핀 확인/등록/초기화(재등록)
+     *
+     * - 같은 뷰(CustomPinView)를 이용한다.
+     * - presenter 를 달리하여 각 단계를 컨트롤한다.
+     * - 결과는 IPinContract.Listener 로 전달한다.
+     *
+     */
     customPinView = new CustomPinView(this);
     customPinConfirmPresenter = new CustomPinConfirmPresenter(customPinView, result ->
     {
@@ -52,8 +61,8 @@ public class PinActivity extends ActivityBase<PinPresenter> implements IPinView
   }
 
   @Override
-  PinPresenter definePresenter() {
-    return new PinPresenter(getModel(PinModel.class), this);
+  PinConfirmPresenter definePresenter() {
+    return new PinConfirmPresenter(getModel(PinModel.class), this);
   }
 
   @Override

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

@@ -8,7 +8,7 @@ import android.os.Bundle;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
- * PinActivity
+ * PinResetActivity
  * <pre>
  * </pre>
  *

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

@@ -6,7 +6,7 @@ package kr.co.zumo.app.lifeplus.activity.factory;
 import kr.co.zumo.app.lifeplus.activity.ActivityBase;
 import kr.co.zumo.app.lifeplus.activity.MainActivity;
 import kr.co.zumo.app.lifeplus.activity.NetworkErrorActivity;
-import kr.co.zumo.app.lifeplus.activity.PinActivity;
+import kr.co.zumo.app.lifeplus.activity.PinConfirmActivity;
 import kr.co.zumo.app.lifeplus.activity.PinResetActivity;
 import kr.co.zumo.app.lifeplus.activity.SignUpActivity;
 import kr.co.zumo.app.lifeplus.activity.TutorialActivity;
@@ -38,7 +38,7 @@ public class ActivityFactory {
         activity = MainActivity.class;
         break;
       case ScreenID.ACTIVITY_PIN:
-        activity = PinActivity.class;
+        activity = PinConfirmActivity.class;
         break;
       case ScreenID.ACTIVITY_PIN_RESET:
         activity = PinResetActivity.class;

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

@@ -1,19 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.view;
-
-/**
- * IPinDriver
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 9. 28.]   [최초 작성]
- * @since 2018. 9. 28.
- */
-public interface IPinDriver {
-  void onPinResult(String pin);
-  void onPinStart();
-}

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

@@ -13,7 +13,7 @@ import kr.co.zumo.app.lifeplus.view.IPinView;
 import kr.co.zumo.app.lifeplus.view.command.ActivityChangeCommand;
 
 /**
- * PinPresenter
+ * PinConfirmPresenter
  * <pre>
  * </pre>
  *
@@ -22,11 +22,11 @@ import kr.co.zumo.app.lifeplus.view.command.ActivityChangeCommand;
  * @history 민효동   [2018. 9. 21.]   [최초 작성]
  * @since 2018. 9. 21.
  */
-public class PinPresenter extends Presenter<PinModel, IPinView> {
+public class PinConfirmPresenter extends Presenter<PinModel, IPinView> {
 
   private Disposable disposable;
 
-  public PinPresenter(PinModel model, IPinView view) {
+  public PinConfirmPresenter(PinModel model, IPinView view) {
     super(model, view);
   }
 
@@ -73,7 +73,7 @@ public class PinPresenter extends Presenter<PinModel, IPinView> {
   protected void onEventInternal(Event event) {
     switch (event.getEventId()) {
       case Event.SUCCESS:
-        Log.i("APP# PinPresenter | onEventInternal", "|" + event.getString());
+        Log.i("APP# PinConfirmPresenter | onEventInternal", "|" + event.getString());
         verifyPin(event.getString());
         break;
       default: