[공통][New] DialogProvider 추가

- presenter 의 다이얼로그 들을 공통을 사용할 수 있도록 provider 로 이동

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

@@ -31,14 +31,8 @@ import kr.co.zumo.app.lifeplus.supervisor.GuestCoinManager;
 import kr.co.zumo.app.lifeplus.tool.ReviewCounter;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
-import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.dialog.AlertDialog;
-import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
 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.ICustomConfirmListener;
-import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogProvider;
 import kr.co.zumo.app.lifeplus.view.screen.main.SystemPopupManager;
 
 /**
@@ -206,22 +200,9 @@ public class ScreenStarter implements IModuleEmergencyHandler {
   private DialogBase alertDialog;
 
   private void showErrorPopup(String errorMessage) {
-    alertDialog = new DialogBuilder<AlertDialog, ICustomDialogListener>(fragmentActivity.getSupportFragmentManager(), DialogID.ALERT)
-      .listener(new ICustomDialogListener<AlertDialog>() {
-        @Override
-        public void onDialogResult(AlertDialog dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            gotoMainOrUnlock();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(AlertDialog dialog) {
-          gotoMainOrUnlock();
-        }
-      })
-      .attribute(dialog -> dialog.setText(errorMessage))
-      .show();
+    alertDialog = DialogProvider.of(fragmentActivity.getSupportFragmentManager()).showErrorDialog(errorMessage, () -> {
+      gotoMainOrUnlock();
+    });
   }
 
   private void gotoScreen(int fragmentFlag) {
@@ -247,8 +228,6 @@ public class ScreenStarter implements IModuleEmergencyHandler {
   @Override
   public void onApiEmergency(IEmergency emergency) {
     /*
-    todo presenter 와 screen starter 의 emergency 중복 코드 제거 필요
-
     멀티 디바이스 사용 등의 경우 api 호출 시 특정 값을 반환하므로 이를 처리한다.
      */
     if (emergency.getEmergencyCode() == EmergencyBean.CODE_MULTI_DEVICE) {
@@ -262,37 +241,14 @@ public class ScreenStarter implements IModuleEmergencyHandler {
     AppInitializer.dispose(fragmentActivity);
   }
 
-  protected void showPopupMultiDevice() {
-    new DialogBuilder<ConfirmDialog, ICustomConfirmListener>(fragmentActivity.getSupportFragmentManager(), DialogID.CONFIRM)
-      .listener(new ICustomConfirmListener<ConfirmDialog>() {
-        @Override
-        public void onPositiveResult(ConfirmDialog dialog, Event event) {
-          dialog.dispose();
-          // 잠금 화면으로 이동
-          gotoScreen(START_MULTI_DEVICE);
-        }
-
-        @Override
-        public void onNegativeResult(ConfirmDialog dialog, Event event) {
-          dialog.dispose();
-          // 앱 종료
-          exit();
-        }
-
-        @Override
-        public void onDialogCanceled(ConfirmDialog dialog) {
-          dialog.dispose();
-          // 앱 종료
-          exit();
-        }
-      })
-      .attribute(dialog -> {
-        dialog.setTitleId(R.string.emergency_multi_device_title);
-        dialog.setText(ResourceUtil.getString(R.string.emergency_multi_device));
-        dialog.setNegativeButtonLabelId(R.string.emergency_multi_device_button_negative);
-        dialog.setPositiveButtonLabelId(R.string.emergency_multi_device_button_positive);
-      })
-      .show();
+  private void showPopupMultiDevice() {
+    DialogProvider.of(fragmentActivity.getSupportFragmentManager()).showPopupMultiDevice(() -> {
+      // 잠금 화면으로 이동
+      gotoScreen(START_MULTI_DEVICE);
+    }, () -> {
+      // 앱 종료
+      exit();
+    });
   }
 
   public interface IListener {

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

@@ -0,0 +1,243 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.dialog;
+
+import android.support.annotation.StringRes;
+import android.support.v4.app.FragmentManager;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.model.Model;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.view.Event;
+
+/**
+ * DialogProvider
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2019. 3. 15.]   [최초 작성]
+ * @since 2019. 3. 15.
+ */
+public class DialogProvider {
+
+  private FragmentManager manager;
+
+  private DialogProvider(FragmentManager manager) {
+    this.manager = manager;
+  }
+
+  /**
+   * DialogProvider 생성
+   *
+   * @param manager
+   * @return
+   */
+  public static DialogProvider of(FragmentManager manager) {
+    if (null == manager) {
+      throw new NullPointerException();
+    }
+
+    return new DialogProvider(manager);
+  }
+
+  /**
+   * 다중 장치 팝업
+   *
+   * @param positive
+   * @param negative
+   * @return
+   */
+  public ConfirmDialog showPopupMultiDevice(Runnable positive, Runnable negative) {
+    return new DialogBuilder<ConfirmDialog, ICustomConfirmListener>(manager, DialogID.CONFIRM)
+      .listener(new ICustomConfirmListener<ConfirmDialog>() {
+        @Override
+        public void onPositiveResult(ConfirmDialog dialog, Event event) {
+          dialog.dispose();
+          // 잠금 화면으로 이동
+          positive.run();
+        }
+
+        @Override
+        public void onNegativeResult(ConfirmDialog dialog, Event event) {
+          dialog.dispose();
+          // 앱 종료
+          negative.run();
+        }
+
+        @Override
+        public void onDialogCanceled(ConfirmDialog dialog) {
+          dialog.dispose();
+          // 앱 종료
+          negative.run();
+        }
+      })
+      .attribute(dialog -> {
+        dialog.setTitleId(R.string.emergency_multi_device_title);
+        dialog.setText(ResourceUtil.getString(R.string.emergency_multi_device));
+        dialog.setNegativeButtonLabelId(R.string.emergency_multi_device_button_negative);
+        dialog.setPositiveButtonLabelId(R.string.emergency_multi_device_button_positive);
+      })
+      .show();
+  }
+
+  /**
+   * 핀 확인
+   *
+   * @param model
+   * @param confirm
+   * @param fail
+   * @param cancel
+   * @param reset
+   * @param help
+   * @param hasResetButton
+   * @return
+   */
+  public PinConfirmDialog showPinConfirm(Model model, Runnable confirm, Runnable fail, Runnable cancel, Runnable reset, Runnable help, boolean hasResetButton) {
+    // PinConfirmDialog
+    return new DialogBuilder<PinConfirmDialog, ICustomDialogListener>(manager, DialogID.PIN_CONFIRM)
+      .listener(new ICustomDialogListener<PinConfirmDialog>() {
+        @Override
+        public void onDialogResult(PinConfirmDialog dialog, Event event) {
+          switch (event.getEventId()) {
+            case Event.CONFIRM:
+              String inputPin = event.getString();
+              if (model.verifyPin(inputPin)) {
+                dialog.resetPinFailCount();
+                dialog.dispose();
+                confirm.run();
+              }
+              else {
+                dialog.retry();
+              }
+
+              break;
+            case Event.FAIL:
+              // 핀 불일치
+              fail.run();
+              break;
+            case Event.RESET:
+              dialog.dispose();
+              reset.run();
+              break;
+            case Event.HELP:
+              // 이메일 문의
+              help.run();
+              break;
+            default:
+              dialog.dispose();
+              break;
+          }
+        }
+
+        @Override
+        public void onDialogCanceled(PinConfirmDialog dialog) {
+          dialog.dispose();
+          cancel.run();
+        }
+      })
+      .attribute(dialog -> dialog.setResetButtonVisible(hasResetButton))
+      .show();
+  }
+
+  /**
+   * 비회원 가입 유도
+   *
+   * @param confirm
+   * @return
+   */
+  public ConfirmDialog showPopupForGuest(Runnable confirm) {
+    // 비회원 가입 유도
+    return new DialogBuilder<ConfirmDialog, ICustomConfirmListener>(manager, DialogID.CONFIRM)
+      .listener(new ICustomConfirmListener<ConfirmDialog>() {
+        @Override
+        public void onPositiveResult(ConfirmDialog dialog, Event event) {
+          dialog.dispose();
+          confirm.run();
+        }
+
+        @Override
+        public void onNegativeResult(ConfirmDialog dialog, Event event) {
+          dialog.dispose();
+        }
+
+        @Override
+        public void onDialogCanceled(ConfirmDialog dialog) {
+          dialog.dispose();
+        }
+      })
+      .attribute(dialog -> {
+        dialog.setText(ResourceUtil.getString(R.string.only_user_service));
+        dialog.setPositiveButtonLabelId(R.string.member_confirm);
+      })
+      .show();
+  }
+
+  /**
+   * 에러 팝업
+   *
+   * @param string
+   * @param runnable
+   * @param buttonLabelId
+   * @return
+   */
+  public AlertDialog showErrorDialog(String string, Runnable runnable, @StringRes int buttonLabelId) {
+    return new DialogBuilder<AlertDialog, ICustomDialogListener>(manager, DialogID.ALERT)
+      .listener(new ICustomDialogListener<AlertDialog>() {
+        @Override
+        public void onDialogResult(AlertDialog dialog, Event event) {
+          dialog.dispose();
+
+          if (null != runnable) {
+            runnable.run();
+          }
+        }
+
+        @Override
+        public void onDialogCanceled(AlertDialog dialog) {
+          dialog.dispose();
+
+          if (null != runnable) {
+            runnable.run();
+          }
+        }
+      })
+      .attribute(dialog -> {
+        dialog.setText(string);
+        if (buttonLabelId != R.string.empty_string) {
+          dialog.setPositiveButtonLabelId(buttonLabelId);
+        }
+      })
+      .show();
+  }
+
+  /**
+   * 에러 팝업
+   *
+   * @param string
+   * @param runnable
+   * @return
+   */
+  public AlertDialog showErrorDialog(String string, Runnable runnable) {
+    return showErrorDialog(string, runnable, R.string.empty_string);
+  }
+
+  /**
+   * 네트워크 에러
+   *
+   * @param listener
+   * @return
+   */
+  public AlertDialog showNetworkError(ICustomDialogListener<AlertDialog> listener) {
+    return new DialogBuilder<AlertDialog, ICustomDialogListener>(manager, DialogID.ALERT)
+      .listener(listener)
+      .attribute(dialog -> {
+        dialog.setCancelable(false);
+        dialog.setText(R.string.network_disconnected_message_detail_dialog);
+        dialog.setPositiveButtonLabelId(R.string.retry);
+      })
+      .show();
+  }
+}

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

@@ -4,8 +4,6 @@
 package kr.co.zumo.app.lifeplus.view.presenter;
 
 import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.ActionBar;
@@ -24,8 +22,6 @@ import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.ContentsWebDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.EventDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.UtilityActivityBean;
-import kr.co.zumo.app.lifeplus.bean.api.BestBucketBean;
-import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
 import kr.co.zumo.app.lifeplus.bean.api.EmergencyBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
@@ -62,11 +58,8 @@ import kr.co.zumo.app.lifeplus.view.command.ScreenCommand;
 import kr.co.zumo.app.lifeplus.view.dialog.AlertDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
 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.ICustomConfirmListener;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogProvider;
 import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
-import kr.co.zumo.app.lifeplus.view.dialog.PinConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.screen.event.EventDetailDelegate;
 import kr.co.zumo.app.lifeplus.view.screen.main.SystemPopupManager;
 
@@ -87,7 +80,7 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
   protected Command command;
   protected FirebaseAnalyticsHelper firebaseAnalyticsHelper;
 
-  private DialogBase dialog;
+  private DialogBase dialogError;
   private DialogBase dialogNetwork;
   private DialogBase pinDialog;
   private LoadingDriver waiter;
@@ -167,9 +160,9 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
   public final void destroy() {
     Log.i("APP# Presenter | destroy", "|" + "<<------------------------- " + this.getClass().getSimpleName());
 
-    if (null != dialog) {
-      dialog.dispose();
-      dialog = null;
+    if (null != dialogError) {
+      dialogError.dispose();
+      dialogError = null;
     }
     if (null != pinDialog) {
       pinDialog.dispose();
@@ -405,35 +398,12 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
   }
 
   protected void showErrorDialog(String string, Runnable runnable, @StringRes int buttonLabelId) {
-    dialog = new DialogBuilder<AlertDialog, ICustomDialogListener>(getFragmentManager(), DialogID.ALERT)
-      .listener(new ICustomDialogListener<AlertDialog>() {
-        @Override
-        public void onDialogResult(AlertDialog dialog, Event event) {
-          if (event.getEventId() == Event.CONFIRM) {
-            dialog.dispose();
-          }
-
-          if (null != runnable) {
-            runnable.run();
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(AlertDialog dialog) {
-          dialog.dispose();
-
-          if (null != runnable) {
-            runnable.run();
-          }
-        }
-      })
-      .attribute(dialog -> {
-        dialog.setText(string);
-        if (buttonLabelId != R.string.empty_string) {
-          dialog.setPositiveButtonLabelId(buttonLabelId);
-        }
-      })
-      .show();
+    dialogError = DialogProvider.of(getFragmentManager()).showErrorDialog(string, () -> {
+      dialogError = null;
+      if (null != runnable) {
+        runnable.run();
+      }
+    }, buttonLabelId);
   }
 
   protected FragmentManager getFragmentManager() {
@@ -582,50 +552,15 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
 
   protected void confirmPin(Runnable doAfterConfirm, Runnable doAfterFail, Runnable doAfterCancel, boolean hasResetButton) {
     // PinConfirmDialog
-    pinDialog = new DialogBuilder<PinConfirmDialog, ICustomDialogListener>(getFragmentManager(), DialogID.PIN_CONFIRM)
-      .listener(new ICustomDialogListener<PinConfirmDialog>() {
-        @Override
-        public void onDialogResult(PinConfirmDialog dialog, Event event) {
-          switch (event.getEventId()) {
-            case Event.CONFIRM:
-              String inputPin = event.getString();
-              if (model.verifyPin(inputPin)) {
-                dialog.resetPinFailCount();
-                dialog.dispose();
-                doAfterConfirm.run();
+    pinDialog = DialogProvider.of(getFragmentManager()).showPinConfirm(
+      model,
+      doAfterConfirm,
+      doAfterFail,
+      doAfterCancel,
+      () -> go(ScreenID.PIN_RESET_AUTH),
+      () -> onCommand(new EmailSendingCommand(ResourceUtil.getString(R.string.lifeplus_email))),
+      hasResetButton);
 
-              }
-              else {
-                dialog.retry();
-              }
-
-              break;
-            case Event.FAIL:
-              // 핀 불일치
-              doAfterFail.run();
-              break;
-            case Event.RESET:
-              dialog.dispose();
-              go(ScreenID.PIN_RESET_AUTH);
-              break;
-            case Event.HELP:
-              // 이메일 문의
-              onCommand(new EmailSendingCommand(ResourceUtil.getString(R.string.lifeplus_email)));
-              break;
-            default:
-              dialog.dispose();
-              break;
-          }
-        }
-
-        @Override
-        public void onDialogCanceled(PinConfirmDialog dialog) {
-          dialog.dispose();
-          doAfterCancel.run();
-        }
-      })
-      .attribute(dialog -> dialog.setResetButtonVisible(hasResetButton))
-      .show();
   }
 
   /***********************************
@@ -633,83 +568,29 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
    ***********************************/
   protected void showPopupForGuest() {
     // 비회원 가입 유도
-    new DialogBuilder<ConfirmDialog, ICustomConfirmListener>(getFragmentManager(), DialogID.CONFIRM)
-      .listener(new ICustomConfirmListener<ConfirmDialog>() {
-        @Override
-        public void onPositiveResult(ConfirmDialog dialog, Event event) {
-          dialog.dispose();
-          go(ScreenID.SIGN_UP_START);
-        }
-
-        @Override
-        public void onNegativeResult(ConfirmDialog dialog, Event event) {
-          dialog.dispose();
-        }
-
-        @Override
-        public void onDialogCanceled(ConfirmDialog dialog) {
-          dialog.dispose();
-        }
-      })
-      .attribute(dialog -> {
-        dialog.setText(ResourceUtil.getString(R.string.only_user_service));
-        dialog.setPositiveButtonLabelId(R.string.member_confirm);
-      })
-      .show();
+    DialogProvider.of(getFragmentManager()).showPopupForGuest(() -> go(ScreenID.SIGN_UP_START));
   }
 
   /***********************************
    * Popup - multi device
    ***********************************/
-  protected ConfirmDialog multiDeviceDialog;
+  private ConfirmDialog multiDeviceDialog;
 
-  protected void showPopupMultiDevice() {
+  private void showPopupMultiDevice() {
     if (null == multiDeviceDialog) {
       Log.i("APP# Presenter | showPopupMultiDevice", "|" + " showPopupMultiDevice --------");
-      multiDeviceDialog = new DialogBuilder<ConfirmDialog, ICustomConfirmListener>(getFragmentManager(), DialogID.CONFIRM)
-        .listener(new ICustomConfirmListener<ConfirmDialog>() {
-          @Override
-          public void onPositiveResult(ConfirmDialog dialog, Event event) {
-            multiDeviceDialog = null;
-            dialog.dispose();
-            // 잠금 화면으로 이동
-            go(ScreenID.PIN_RESET_AUTH_FROM_MULTI_DEVICE);
-          }
-
-          @Override
-          public void onNegativeResult(ConfirmDialog dialog, Event event) {
-            multiDeviceDialog = null;
-            dialog.dispose();
-            // 앱 종료
-            onCommand(new ExitCommand());
-          }
-
-          @Override
-          public void onDialogCanceled(ConfirmDialog dialog) {
-            multiDeviceDialog = null;
-            dialog.dispose();
-            // 앱 종료
-            onCommand(new ExitCommand());
-          }
-        })
-        .attribute(dialog -> {
-          dialog.setTitleId(R.string.emergency_multi_device_title);
-          dialog.setText(ResourceUtil.getString(R.string.emergency_multi_device));
-          dialog.setNegativeButtonLabelId(R.string.emergency_multi_device_button_negative);
-          dialog.setPositiveButtonLabelId(R.string.emergency_multi_device_button_positive);
-        })
-        .show();
+      multiDeviceDialog = DialogProvider.of(getFragmentManager()).showPopupMultiDevice(() -> {
+        multiDeviceDialog = null;
+        // 잠금 화면으로 이동
+        go(ScreenID.PIN_RESET_AUTH_FROM_MULTI_DEVICE);
+      }, () -> {
+        multiDeviceDialog = null;
+        // 앱 종료
+        onCommand(new ExitCommand());
+      });
     }
   }
 
-  private BucketDeliveryBean getBucketDeliveryBean(@NonNull @ScreenID.ID @IntRange(from = 0, to = 1000) int id, @Nullable BestBucketBean bestBucketBean, @Nullable BucketWithTagBean bean) {
-    BucketDeliveryBean bucketDeliveryBean = new BucketDeliveryBean();
-    bucketDeliveryBean.setScreenId(id);
-    bucketDeliveryBean.setBestBucketBean(bestBucketBean);
-    bucketDeliveryBean.setBucketWithTagBean(bean);
-    return bucketDeliveryBean;
-  }
-
 
   /***********************************
    * navigation
@@ -850,38 +731,32 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
     }
     else {
       if (null == dialogNetwork) {
-        dialogNetwork = new DialogBuilder<AlertDialog, ICustomDialogListener>(getFragmentManager(), DialogID.ALERT)
-          .listener(new ICustomDialogListener<AlertDialog>() {
-            @Override
-            public void onDialogResult(AlertDialog dialog, Event event) {
-              if (event.getEventId() == Event.BACK) {
-                dialogNetwork.dispose();
-                onCommand(new ExitCommand());
-              }
-              else {
-                dialogNetwork.dispose();
-                dialogNetwork = null;
+        dialogNetwork = DialogProvider.of(getFragmentManager()).showNetworkError(new ICustomDialogListener<AlertDialog>() {
+          @Override
+          public void onDialogResult(AlertDialog dialog, Event event) {
+            if (event.getEventId() == Event.BACK) {
+              dialogNetwork.dispose();
+              onCommand(new ExitCommand());
+            }
+            else {
+              dialogNetwork.dispose();
+              dialogNetwork = null;
 
-                showNetworkBarrier();
+              showNetworkBarrier();
 
-                isDoingNetworkCheck = true;
-                model.checkNetwork();
-              }
+              isDoingNetworkCheck = true;
+              model.checkNetwork();
             }
+          }
 
-            @Override
-            public void onDialogCanceled(AlertDialog dialog) {
-              dialogNetwork = null;
-            }
-          })
-          .attribute(dialog -> {
-            dialog.setCancelable(false);
-            dialog.setText(R.string.network_disconnected_message_detail_dialog);
-            dialog.setPositiveButtonLabelId(R.string.retry);
-          })
-          .show();
+          @Override
+          public void onDialogCanceled(AlertDialog dialog) {
+            dialogNetwork = null;
+          }
+        });
       }
     }
+
     isDoingNetworkCheck = false;
   }
 
@@ -891,8 +766,6 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
   @Override
   public void onApiEmergency(IEmergency emergency) {
     /*
-    todo presenter 와 screen starter 의 emergency 중복 코드 제거 필요
-
     멀티 디바이스 사용 등의 경우 api 호출 시 특정 값을 반환하므로 이를 처리한다.
      */
     if (emergency.getEmergencyCode() == EmergencyBean.CODE_MULTI_DEVICE) {
@@ -999,8 +872,6 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
     activityBase.openDrawer();
     activityBase.setVisibleTextButton(false == model.isActiveMember());
 
-    //model.setDeliveryPackaging(model.getScreenId());
-    // go(ScreenID.ALL_MENU);
   }
 
   /**