[로그인][New] 로그인 API 연동 준비

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

@@ -59,7 +59,7 @@ public class DialogManager {
       case DialogID.MOBILE_AUTHORIZATION:
         dialog = new MobileAuthorizationDialog();
         dialog.setResultListener(listener);
-        dialog.show(manager, "IDENTIFY");
+        dialog.show(manager, "AUTHORIZATION");
         break;
 
       case DialogID.WEB:
@@ -67,7 +67,7 @@ public class DialogManager {
 
         dialog = webDialog;
         dialog.setResultListener(listener);
-        dialog.show(manager, "IDENTIFY");
+        dialog.show(manager, "WEB");
         break;
 
       default:

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

@@ -21,8 +21,9 @@ import java.lang.annotation.RetentionPolicy;
 public class DialogResult {
   public final static int CODE_SUCCESS = 0;
   public final static int CODE_FAIL = 1;
+  public final static int CODE_CANCEL = 2;
 
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({CODE_SUCCESS, CODE_FAIL})
+  @IntDef({CODE_SUCCESS, CODE_FAIL, CODE_CANCEL})
   public @interface Code {}
 }

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

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.dialog;
 
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
@@ -58,6 +59,11 @@ public class PasswordDialog extends DialogBase {
     super.onCreate(savedInstanceState);
   }
 
+  @Override
+  public void onCancel(DialogInterface dialog) {
+    resultListener.onDialogResult(this, DialogResult.CODE_CANCEL, null);
+  }
+
   /**
    * 가이드 텍스트를 업데이트 한다.
    *

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/login/LoginFragment.java

@@ -8,12 +8,11 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
-import kr.co.zumo.app.lifeplus.supervisor.DialogManager;
 import kr.co.zumo.app.lifeplus.supervisor.DialogHelper;
+import kr.co.zumo.app.lifeplus.supervisor.DialogManager;
 import kr.co.zumo.app.lifeplus.supervisor.FragmentChanger;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenChangerHelper;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
@@ -44,7 +43,6 @@ public class LoginFragment extends FragmentBase<LoginPresenter> implements ILogi
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     // Inflate the layout for this fragment
-
     return inflater.inflate(R.layout.fragment_login, container, false);
   }
 
@@ -60,8 +58,9 @@ public class LoginFragment extends FragmentBase<LoginPresenter> implements ILogi
   protected void defineActionBar() {
 
     ActionBarManager actionBarManager = ActionBarManager.getInstance();
-    actionBarManager.setTitle(R.string.login);
-    actionBarManager.setDisplayHomeAsUpEnabled(true);
+//    actionBarManager.setTitle(R.string.login);
+//    actionBarManager.setDisplayHomeAsUpEnabled(true);
+    actionBarManager.hide();
   }
 
   @Override
@@ -76,19 +75,22 @@ public class LoginFragment extends FragmentBase<LoginPresenter> implements ILogi
 
   @Override
   protected void draw() {
-    Button button = getView().findViewById(R.id.button_back);
-    button.setOnClickListener(v -> {
-      presenter.onEvent(Event.BACK);
-    });
+//    Button button = getView().findViewById(R.id.button_back);
+//    button.setOnClickListener(v -> {
+//      presenter.onEvent(Event.BACK);
+//    });
 
     DialogManager dialogManager = new DialogManager();
     dialogManager.show(DialogHelper.getInstance().getFragmentManager(), DialogID.INPUT_PIN, (dialog, resultCode, resultString) -> {
-      Log.i("APP# LoginFragment | draw", "|" + "resultCode: " + resultCode + ", resultString- " + resultString);
+      Log.i("APP# LoginFragment | draw", "|" + "resultCode: " + resultCode);
       if (DialogResult.CODE_SUCCESS == resultCode) {
+        presenter.onEvent(Event.INPUT_PIN, resultString);
       }
-      else if (DialogResult.CODE_FAIL == resultCode) {
+      else if (DialogResult.CODE_CANCEL == resultCode) {
+        presenter.onEvent(Event.BACK);
       }
     });
+
   }
 
 }

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

@@ -25,6 +25,7 @@ public class Event {
   public static final int TUTORIAL_CLOSE = 11;
   public static final int TUTORIAL_NEXT = 12;
   public static final int RETRY = 13;
+  public static final int INPUT_PIN = 14;
 
   public static final int HOLDER_AGREE_CHANGED = 200;
   public static final int HOLDER_CREATED = 201;

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

@@ -17,7 +17,7 @@ import java.util.ArrayList;
  */
 public class SignUpBean extends JsonBeanBase {
 
-  private boolean isAutorized;
+  private boolean isAuthorized;
   private String name;
   private String gender;
   private String birthDate;
@@ -27,12 +27,12 @@ public class SignUpBean extends JsonBeanBase {
 
   private ArrayList<Boolean> termsAgree;
 
-  public boolean isAutorized() {
-    return isAutorized;
+  public boolean isAuthorized() {
+    return isAuthorized;
   }
 
-  public void setAutorized(boolean autorized) {
-    isAutorized = autorized;
+  public void setAuthorized(boolean authorized) {
+    isAuthorized = authorized;
   }
 
   public String getName() {

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

@@ -4,6 +4,7 @@
 package kr.co.zumo.app.lifeplus.view.presenter.login;
 
 import android.support.annotation.Nullable;
+import android.util.Log;
 
 import kr.co.zumo.app.lifeplus.supervisor.ScreenChanger;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
@@ -42,6 +43,10 @@ public class LoginPresenter extends Presenter<ILoginView> {
       case Event.BACK:
         exitTo(ScreenID.MAIN);
         break;
+      case Event.INPUT_PIN:
+        //
+        Log.i("APP# LoginPresenter | performOnEvent", "|" + eventId + ", " + stringValue);
+        break;
       default:
         break;
     }
@@ -51,7 +56,7 @@ public class LoginPresenter extends Presenter<ILoginView> {
   public void exitTo(int screenId) {
     switch (screenId) {
       case ScreenID.MAIN:
-        screenChanger.changeToBack(screenId);
+        screenChanger.changeTo(screenId);
         break;
       default:
         break;

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

@@ -4,14 +4,14 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/colorPrimaryDark"
+  android:background="@color/colorAccent"
   android:orientation="horizontal"
   tools:fragmentActivity=".LoginFragment">
 
-  <Button
+  <!--<Button
     android:id="@+id/button_back"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="Back"/>
+    android:text="Back"/>-->
 
 </LinearLayout>