Procházet zdrojové kódy

[공통][Bug] DialogManager.show() 구조 변경
- 내부에서 싱글톤 객체를 참조하면 테스트에 어려움이 있어 외부에서 필요한 객체(FragmentManager)를 전달해줌

hyodong.min před 7 roky
rodič
revize
d53f867c3f

+ 2 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/manager/DialogManager.java

@@ -5,7 +5,6 @@ package kr.co.zumo.app.lifeplus.manager;
 
 import android.support.v4.app.FragmentManager;
 
-import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
 import kr.co.zumo.app.lifeplus.view.dialog.PasswordDialog;
 
@@ -35,12 +34,11 @@ public class DialogManager {
    *
    * @param dialogId DialogID.PASSWORD
    */
-  public void show(int dialogId) {
-    FragmentManager manager = SuperModel.getInstance().getCurrentFragment().getFragmentManager();
+  public void show(FragmentManager manager, int dialogId) {
     switch (dialogId) {
       case DialogID.PASSWORD:
         PasswordDialog dialog = new PasswordDialog();
-        dialog.show(manager, "example");
+        dialog.show(manager, "PASSWORD");
         break;
       default:
         throw new Error("not support dialog.");

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/model/SignUpViewModel.java

@@ -9,6 +9,7 @@ import android.support.annotation.Nullable;
 import android.util.Log;
 
 import kr.co.zumo.app.lifeplus.manager.DialogManager;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenChanger;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
@@ -52,8 +53,7 @@ public class SignUpViewModel extends ViewModel {
         if (intValue == SignUpItem.BUTTON_ID_PIN) {
           // 핀 번호 입력 다이얼 로그 호출
           Log.i("APP# SignUpViewModel | onEvent", "| eventId: " + eventId + ", intValue: " + intValue);
-//          viewModelEventListener.onEventFromViewModel(this, eventId, intValue, stringValue);
-          DialogManager.getInstance().show(DialogID.PASSWORD);
+          DialogManager.getInstance().show(SuperModel.getInstance().getCurrentFragment().getFragmentManager(), DialogID.PASSWORD);
         }
         break;
       default: