[버킷][Common] BucketDetailScreen 제거

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/BucketWithTagBean.java

@@ -7,6 +7,8 @@ import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
 
+import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+
 /**
  * BucketWithTagBean
  * <pre>
@@ -29,4 +31,19 @@ public class BucketWithTagBean extends BucketMyBean {
   public void setTagList(List<TagBean> tagList) {
     this.tagList = tagList;
   }
+
+  /**
+   * 버킷 리스트의 연관 태그 수로 다음 스크린을 확인
+   *
+   * @param bean
+   * @return
+   */
+  public static int getScreenId(BucketWithTagBean bean) {
+    if (null != bean.getTagList() && bean.getTagList().size() > 0) {
+      return ScreenID.BUCKET_DETAIL_WITH_TAG;
+    }
+    else {
+      return ScreenID.BUCKET_DETAIL;
+    }
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/BucketDetailScreen.java

@@ -1,39 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.supervisor.screen;
-
-import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
-import kr.co.zumo.app.lifeplus.helper.ScreenManagerHelper;
-import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-
-/**
- * BucketDetailScreen
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018-11-18]   [최초 작성]
- * @since 2018-11-18
- */
-public class BucketDetailScreen extends FragmentScreen {
-  public BucketDetailScreen(ScreenManagerHelper helper, int id, int direction, int method) {
-    super(helper, id, direction, method);
-  }
-
-  @Override
-  public void change() {
-    // 상황에 따라서 id 를 변경해준다.
-    BucketWithTagBean bean = helper.getModel().getDeliveryPackaging(BucketWithTagBean.class);
-
-    if (null != bean.getTagList() && bean.getTagList().size() > 0) {
-      id = ScreenID.BUCKET_DETAIL_WITH_TAG;
-    }
-    else {
-      id = ScreenID.BUCKET_DETAIL;
-    }
-
-    super.change();
-  }
-}

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ScreenManager.java

@@ -145,9 +145,6 @@ public class ScreenManager implements IScreen {
         case ScreenID.PHONE_NUMBER_RESET:
           screen = new ActivityScreen(helper, id, direction, method);
           break;
-        case ScreenID.BUCKET_DETAIL:
-          screen = new BucketDetailScreen(helper, id, direction, method);
-          break;
         default:
           screen = new FragmentScreen(helper, id, direction, method);
           break;

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListPresenter.java

@@ -243,7 +243,7 @@ public class AddMyBucketListPresenter extends Presenter<AddMyBucketListModel, IA
             bean = model.getAddedBucketMyBean();
           }
           model.setDeliveryPackaging(bean);
-          go(ScreenID.BUCKET_DETAIL);
+          go(BucketWithTagBean.getScreenId(bean));
         }
         else {
           // -> 태그 없음 -> 나의 버킷 리스트 목록 페이지 이동

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/MyBucketListPresenter.java

@@ -1,6 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
 
 import kr.co.zumo.app.lifeplus.bean.api.BestBucketBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -78,6 +79,7 @@ public class MyBucketListPresenter extends Presenter<MyBucketListModel, IMyBucke
   @Override
   protected void onEventInternal(Event event) {
     int index = event.getIndex();
+    BucketWithTagBean bucketWithTagBean;
     switch (event.getEventId()) {
 //      case Event.ALERT:
 //        go(ScreenID.BUCKET_DETAIL);
@@ -94,24 +96,25 @@ public class MyBucketListPresenter extends Presenter<MyBucketListModel, IMyBucke
         go(ScreenID.ADD_MY_BUCKET);
         break;
       case Event.MY_BUCKET:
-        model.setDeliveryPackaging(model.getBucketList().get(index));
-        go(ScreenID.BUCKET_DETAIL);
+        bucketWithTagBean = model.getBucketList().get(index);
+        model.setDeliveryPackaging(bucketWithTagBean);
+        go(BucketWithTagBean.getScreenId(bucketWithTagBean));
         break;
       case Event.TOGGLE:
         if (event.getBool()) {
           view.drawList(model.getCompletedBucketList());
-          view.changeCheckImageText(event.getBool());
         }
         else {
           view.drawList(model.getBucketList());
-          view.changeCheckImageText(event.getBool());
         }
+        view.changeCheckImageText(event.getBool());
         break;
       case Event.COMPLETE_BUCKET:
-        model.setDeliveryPackaging(model.getCompletedBucketList().get(event.getIndex()));
+        bucketWithTagBean = model.getCompletedBucketList().get(index);
+        model.setDeliveryPackaging(bucketWithTagBean);
         //isClicked 초기화
         view.setClicked();
-        go(ScreenID.BUCKET_DETAIL);
+        go(BucketWithTagBean.getScreenId(bucketWithTagBean));
         break;
       default:
         break;