[마이][Common] 버킷리스트 완료된 목록 진입시 디테일 화면 가게 수정

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

@@ -108,6 +108,7 @@ public class Event {
   public static final int BOOK_MARK = 80;
   public static final int ORDER = 81;
   public static final int DEFAULT = 82;
+  public static final int COMPLETE_BUCKET = 83;
 
 
   @Retention(RetentionPolicy.SOURCE)
@@ -119,7 +120,7 @@ public class Event {
     ACTION_BAR_HOME, ACTION_BAR_NOTIFICATION, ACTION_BAR_SETTING, ACTION_BAR_CLOSE, ACTION_BAR_BACK,
     ACTION_BAR_SEARCH, ACTION_BAR_MENU, ACTION_BAR_TITLE, FIRST_CATEGORY, SECOND_CATEGORY, THIRD_CATEGORY, FOURTH_CATEGORY, FIFTH_CATEGORY,
     SWITCH, BOOK_MARK_DEFAULT, BOOK_MARK_LIST, ADD, MY_COIN_MAIN, MY_PURCHASE_HISTORY, GUIDE, ADD_BUCKET, MY_MAIN_GUEST, COUPON_MALL, CATEGORY_CLICK,
-    MY_FAQ, UPDATE, FILTER, CLOSE, HELP, CONTENTS, MORE, BANNER, RECOMMEND, KAKAO_TALK, FACE_BOOK, CODE_COPY, EVENT, TAG, BOOK_MARK, ORDER, DEFAULT
+    MY_FAQ, UPDATE, FILTER, CLOSE, HELP, CONTENTS, MORE, BANNER, RECOMMEND, KAKAO_TALK, FACE_BOOK, CODE_COPY, EVENT, TAG, BOOK_MARK, ORDER, DEFAULT, COMPLETE_BUCKET
   })
   public @interface ID {}
 

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

@@ -48,21 +48,6 @@ public class MyBucketListAdapter extends RecyclerView.Adapter<MyBucketListViewHo
     holder.bind(bean);
   }
 
-  @Override
-  public void onBindViewHolder(@NonNull MyBucketListViewHolder holder, int position, @NonNull List<Object> payloads) {
-    if (payloads.isEmpty()) {
-      super.onBindViewHolder(holder, position, payloads);
-    }
-    else {
-      for (Object payload : payloads) {
-        if (payload instanceof Boolean) {
-          boolean clickFlag = (boolean) payload;
-          holder.bind(clickFlag, myBucketListBeanList.get(position));
-        }
-      }
-    }
-  }
-
   @Override
   public int getItemCount() {
     return myBucketListBeanList.size();

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

@@ -8,6 +8,7 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -112,7 +113,11 @@ public class MyBucketListFragment extends FragmentBase<MyBucketListPresenter> im
   public void drawList(List<BucketWithTagBean> beans) {
     adapter = new MyBucketListAdapter(getActivity(), beans, event -> {
       //버킷리스트 상세 이동
-      presenter.onEvent(event);
+      if(isClicked){
+        presenter.onEvent(new Event.Builder(Event.COMPLETE_BUCKET).index(event.getIndex()).build());
+      }else{
+        presenter.onEvent(event);
+      }
     });
     recyclerViewMyBucketList.setLayoutManager(new GridLayoutManager(getActivity(), 2));
     recyclerViewMyBucketList.setAdapter(adapter);

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

@@ -26,6 +26,7 @@ public class MyBucketListPresenter extends Presenter<MyBucketListModel, IMyBucke
 
   private DoubleChecker doubleChecker;
   private DoubleChecker doubleCheckerBest;
+  private List<BucketWithTagBean> toggleBucketList;
 
   public MyBucketListPresenter(MyBucketListModel model, IMyBucketListView view) {
     super(model, view);
@@ -88,8 +89,7 @@ public class MyBucketListPresenter extends Presenter<MyBucketListModel, IMyBucke
         go(ScreenID.BUCKET_DETAIL);
         break;
       case Event.TOGGLE:
-        List<BucketWithTagBean> toggleBucketList = new ArrayList<>();
-
+        toggleBucketList = new ArrayList<>();
         if (event.getBool()) {
           for (int i = 0; i < model.getBucketList().size(); i++) {
             if (model.getBucketList().get(i).isCompleted()) {
@@ -103,6 +103,17 @@ public class MyBucketListPresenter extends Presenter<MyBucketListModel, IMyBucke
           view.changeCheckImage(event.getBool());
           }
         break;
+        case Event.COMPLETE_BUCKET:
+          int checkIndex = 0;
+          for(int i = 0; i <model.getBucketList().size(); i++){
+            //completed된 index로 모델에서 해당하는 인덱스 찾기
+            if(toggleBucketList.get(index).getBucketNumber().equals(model.getBucketList().get(i).getBucketNumber())){
+              checkIndex = i;
+            }
+          }
+          getHelper(DeliveryHelper.class).setPackaging(model.getBucketList().get(checkIndex));
+          go(ScreenID.BUCKET_DETAIL);
+          break;
       default:
         break;
     }

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

@@ -76,16 +76,5 @@ public class MyBucketListViewHolder extends RecyclerView.ViewHolder {
     });
 
   }
-
-  public void bind(boolean clickFlag, BucketWithTagBean bean) {
-   if (clickFlag) {
-      //완료된 목록만 보기
-      layoutCardView.setVisibility(bean.isCompleted() ? View.VISIBLE : View.GONE);
-    }
-    else {
-      //클릭해제
-      layoutCardView.setVisibility(bean.isCompleted() ? View.GONE : View.VISIBLE);
-    }
-  }
 }
 

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

@@ -18,15 +18,16 @@
     android:id="@+id/edit_text_my_bucket"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="40dp"
-    android:layout_marginEnd="40dp"
+    android:layout_marginStart="30dp"
+    android:layout_marginEnd="30dp"
     android:background="@null"
     android:hint="@string/make_my_bucket_list"
     android:maxLength="@integer/bucket_subject_max_length"
     android:imeOptions="normal"
     android:lineSpacingExtra="11sp"
     android:maxLines="3"
-    tools:text="ddddddddddddddddddddddddddddddddddddddddd"
+    tools:text="ddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"
+    android:ellipsize="end"
     android:textAlignment="center"
     android:textColor="@color/CFFFFFF"
     android:textColorHint="#80FFFFFF"

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

@@ -44,7 +44,7 @@
       android:layout_centerInParent="true"
       android:layout_marginTop="20dp"
       android:layout_marginBottom="20dp"
-      android:gravity="center_horizontal"
+      android:ellipsize="end"
       android:lineSpacingExtra="8sp"
       android:maxLength="40"
       android:maxLines="3"
@@ -55,7 +55,7 @@
       app:layout_constraintHorizontal_chainStyle="packed"
       app:layout_constraintStart_toEndOf="@+id/image_checker"
       app:layout_constraintTop_toTopOf="parent"
-      tools:text="OOOOOOOOdddddddddddddxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"/>
+      tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"/>
 
   </android.support.constraint.ConstraintLayout>