[공통][New] Dialog 정리

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

@@ -6,11 +6,14 @@ package kr.co.zumo.app.lifeplus.view;
 import android.app.Activity;
 import android.util.Log;
 
+import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.model.PinModel;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
+import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
 import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
+import kr.co.zumo.app.lifeplus.view.dialog.PinDialog;
 import kr.co.zumo.app.lifeplus.view.presenter.PinPresenter;
 
 /**
@@ -46,6 +49,10 @@ public class PinDialogAgent implements IPinView {
   public void showPinDialog() {
     presenter.resetCounter();
     dialog = DialogBuilder.create(DialogID.INPUT_PIN)
+      .attribute((IAttribute<PinDialog>) dialog -> {
+        dialog.updateGuideText(R.string.login_input_pin);
+        dialog.updateTitleText(R.string.login_input_pin_title);
+      })
       .listener(new IDialogResultListener() {
         @Override
         public void onDialogResult(DialogBase dialog, Event event) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/DialogID.java

@@ -20,15 +20,14 @@ import java.lang.annotation.RetentionPolicy;
  */
 public class DialogID {
   public final static int NONE = -1;
-  public final static int REGISTER_PIN = 0;
+  public final static int ALERT = 0;
   public final static int MOBILE_AUTHORIZATION = 1;
   public final static int INPUT_PIN = 2;
   public final static int WEB = 3;
   public final static int ADD_REGISTRATION = 4;
-  public final static int ALERT = 5;
 
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({NONE, REGISTER_PIN, MOBILE_AUTHORIZATION, INPUT_PIN, WEB, ADD_REGISTRATION, ALERT})
+  @IntDef({NONE, ALERT, MOBILE_AUTHORIZATION, INPUT_PIN, WEB, ADD_REGISTRATION})
   public @interface ID {}
 
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/factory/BasicDialogFactory.java

@@ -3,7 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.view.dialog.factory;
 
-import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.view.dialog.AddRegistrationDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.AlertDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
@@ -28,17 +27,8 @@ public class BasicDialogFactory implements IDialogFactory {
   public DialogBase getDialogById(@DialogID.ID int id) {
     DialogBase dialog;
     switch (id) {
-      case DialogID.REGISTER_PIN:
-        PinDialog pinDialog = new PinDialog();
-        pinDialog.updateGuideText(R.string.sign_up_register_pin);
-        pinDialog.updateTitleText(R.string.sign_up_register_pin_title);
-        dialog = pinDialog;
-        break;
       case DialogID.INPUT_PIN:
-        PinDialog pinDialogLogin = new PinDialog();
-        pinDialogLogin.updateGuideText(R.string.login_input_pin);
-        pinDialogLogin.updateTitleText(R.string.login_input_pin_title);
-        dialog = pinDialogLogin;
+        dialog = new PinDialog();
         break;
       case DialogID.MOBILE_AUTHORIZATION:
         dialog = new MobileAuthorizationDialog();

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

@@ -14,6 +14,7 @@ import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
+import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
 import kr.co.zumo.app.lifeplus.view.dialog.IDialogResultListener;
 import kr.co.zumo.app.lifeplus.view.dialog.PinDialog;
 import kr.co.zumo.app.lifeplus.view.fragment.signup.ISignUpHolderEventListener;
@@ -41,7 +42,11 @@ public class SignUpStepPin extends SignUpStep {
 
       // 핀 번호 입력 다이얼 로그 호출
       Log.i("APP# SignUpStepPin | onSignUpHolderEvent", "| eventId: " + eventId + ", type: " + type);
-      DialogBuilder.create(DialogID.REGISTER_PIN)
+      DialogBuilder.create(DialogID.INPUT_PIN)
+        .attribute((IAttribute<PinDialog>) dialog -> {
+          dialog.updateGuideText(R.string.sign_up_register_pin);
+          dialog.updateTitleText(R.string.sign_up_register_pin_title);
+        })
         .listener(new IDialogResultListener() {
           @Override
           public void onDialogResult(DialogBase dialog, Event event) {