[마이][Common] 버킷리스트 수정 추가중

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

@@ -13,8 +13,6 @@ import com.bumptech.glide.Glide;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
-import kr.co.zumo.app.lifeplus.model.BlankModel;
-import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
 /**
@@ -44,20 +42,23 @@ public class BucketListDefaultDetailFragment extends FragmentBase<BucketListDefa
     textViewBucketTitle = findViewById(R.id.text_view_bucket_title);
     imageViewBucketCheck = findViewById(R.id.image_checker);
     imageViewBucketBackground = findViewById(R.id.image_view_bucket_background);
-    findViewById(R.id.layout_container).setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.DETAIL).build()));
   }
 
   @Override
   protected void defineActionBar(ActionBarHelper actionBarHelper) {
     actionBarHelper.begin()
-      .back(actionBar -> presenter.onNavigationClickBack(actionBar))
-//      .scroll()
-      .transparent().white().show();
+      .back(navigationBar -> presenter.onNavigationClickBack(navigationBar))
+      .confirm(navigationBar -> presenter.onNavigationClickConfirm(navigationBar))
+      .trash(navigationBar -> presenter.onNavigationClickTrash(navigationBar))
+      .edit(navigationBar -> presenter.onNavigationClickEdit(navigationBar))
+      .transparent()
+      .white()
+      .show();
   }
 
   @Override
   protected BucketListDefaultDetailPresenter definePresenter() {
-    return new BucketListDefaultDetailPresenter(getModel(BlankModel.class), this);
+    return new BucketListDefaultDetailPresenter(getModel(BucketListDefaultDetailModel.class), this);
   }
 
   @Override

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

@@ -0,0 +1,15 @@
+package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
+
+/**
+ * BucketListDefaultDetailModel
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-12-13]   [최초 작성]
+ * @since 2018-12-13
+ */
+public class BucketListDefaultDetailModel  extends AddMyBucketListModel{
+
+}

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

@@ -1,9 +1,15 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
 
+import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
-import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
+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.presenter.Presenter;
 
 /**
@@ -16,11 +22,11 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  * @history 하세미   [2018-11-26]   [최초 작성]
  * @since 2018-11-26
  */
-public class BucketListDefaultDetailPresenter extends Presenter<BlankModel, IBucketListDefaultDetailView> {
+public class BucketListDefaultDetailPresenter extends Presenter<BucketListDefaultDetailModel, IBucketListDefaultDetailView> {
 
   private BucketWithTagBean bucketWithTagBean;
 
-  public BucketListDefaultDetailPresenter(BlankModel model, IBucketListDefaultDetailView view) {
+  public BucketListDefaultDetailPresenter(BucketListDefaultDetailModel model, IBucketListDefaultDetailView view) {
     super(model, view);
     bucketWithTagBean = model.getDeliveryPackaging(BucketWithTagBean.class);
   }
@@ -73,14 +79,7 @@ public class BucketListDefaultDetailPresenter extends Presenter<BlankModel, IBuc
 
   @Override
   protected void onEventInternal(Event event) {
-    switch (event.getEventId()) {
-      case Event.DETAIL:
-        model.setDeliveryPackaging(bucketWithTagBean);
-        go(ScreenID.BUCKET_MY_EDIT);
-        break;
-      default:
-        break;
-    }
+
   }
 
   @Override
@@ -95,4 +94,47 @@ public class BucketListDefaultDetailPresenter extends Presenter<BlankModel, IBuc
   public void onResult(Event event) {
 
   }
+
+  @Override
+  public void onNavigationClickBack(NavigationBar navigationBar) {
+    super.onNavigationClickBack(navigationBar);
+  }
+
+  @Override
+  public void onNavigationClickConfirm(NavigationBar navigationBar) {
+    model.completeBucket();
+  }
+
+  @Override
+  public void onNavigationClickTrash(NavigationBar navigationBar) {
+    // 버킷 리스트 삭제
+    new DialogBuilder<ConfirmDialog, ICustomConfirmListener>(getFragmentManager(), DialogID.CONFIRM)
+      .listener(new ICustomConfirmListener<ConfirmDialog>() {
+        @Override
+        public void onPositiveResult(ConfirmDialog dialog, Event event) {
+          dialog.dispose();
+          model.deleteBucket();
+        }
+
+        @Override
+        public void onNegativeResult(ConfirmDialog dialog, Event event) {
+
+        }
+
+        @Override
+        public void onDialogCanceled(ConfirmDialog dialog) {
+          dialog.dispose();
+        }
+      })
+      .attribute(dialog -> {
+        dialog.setText(ResourceUtil.getString(R.string.best_bucket_delete_guide));
+      })
+      .show();
+  }
+
+  @Override
+  public void onNavigationClickEdit(NavigationBar navigationBar) {
+    model.setDeliveryPackaging(bucketWithTagBean);
+    go(ScreenID.BUCKET_MY_EDIT);
+  }
 }

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

@@ -106,7 +106,7 @@ public class EditMyBucketListPresenter extends AddMyBucketListPresenter {
    */
   @Override
   protected void renderButtonText() {
-    view.setButtonText(ResourceUtil.getString(R.string.update));
+    view.setButtonText(ResourceUtil.getString(R.string.update_success));
   }
 
   /**

app/src/main/res/values/strings.xml

@@ -299,6 +299,7 @@
 
   <string name="setting_user_information">기본 정보</string>
   <string name="update">수정</string>
+  <string name="update_success">수정완료</string>
   <string name="update_underline"><u>수정</u></string>
   <string name="phone">전화번호</string>
   <string name="reset"><u>재설정</u></string>
@@ -329,7 +330,6 @@
   <string name="setting_all_agree_message">모두 확인/동의합니다.</string>
   <string name="setting_option_agree_message">선택 항목에 대해 동의하지 않으셔도 서비스를 이용하실 수 있습니다.</string>
   <string name="life_plus_marketing_agree">Lifeplus 마케팅 정보 수신동의</string>
-  <string name="update_success">수정완료</string>
 
   <string name="user_quit_title">회원탈퇴를 하시면 Lifeplus 회원 서비스 및\n웹사이트로부터 탈퇴됩니다.</string>
   <string name="user_quit_question">Lifeplus 회원탈퇴 신청을 하시겠습니까?</string>