Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketMyBean;
 import kr.co.zumo.app.lifeplus.view.IView;
 
 /**
@@ -25,4 +26,6 @@ public interface IMyMainView extends IView {
   void drawBestBucket(ArrayList<BucketBean> bestBeans);
 
   void drawBucketLabel(int count);
+
+  void drawMyBucketList(ArrayList<BucketMyBean> myBucketBeans);
 }

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

@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketMyBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
@@ -48,6 +49,19 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   protected ConstraintLayout layoutLikeBookmark1;
   protected ConstraintLayout layoutLikeBookmark2;
 
+  protected ConstraintLayout layoutMyBucketListPreview;
+  protected ConstraintLayout layoutBucketCardView1;
+  protected ConstraintLayout layoutBucketCardView2;
+
+  protected TextView textViewBucketCardViewTitle1;
+  protected TextView textViewBucketCardViewTitle2;
+
+  protected TextView textViewBucket1HashTag1;
+  protected TextView textViewBucket1HashTag2;
+
+  protected TextView textViewBucket2HashTag1;
+  protected TextView textViewBucket2HashTag2;
+
   protected ConstraintLayout layoutMemberHeader;
   protected ConstraintLayout layoutGuestHeader;
   protected View arrowBookmark;
@@ -86,6 +100,20 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     arrowBucket = findViewById(R.id.image_view_arrow_bucket_list);
     textBucketLabel = findViewById(R.id.text_view_exists_bucket_list);
 
+
+    layoutMyBucketListPreview = findViewById(R.id.layout_my_bucket_list_preview);
+    layoutBucketCardView1 = findViewById(R.id.my_bucket_list_card_view1);
+    layoutBucketCardView2 = findViewById(R.id.my_bucket_list_card_view2);
+
+
+    textViewBucketCardViewTitle1 = findViewById(R.id.text_view_my_bucket_title1);
+    textViewBucketCardViewTitle2 = findViewById(R.id.text_view_my_bucket_title2);
+    textViewBucket1HashTag1 = findViewById(R.id.text_view_bucket_hash_tag1);
+    textViewBucket1HashTag2 = findViewById(R.id.text_view_bucket_hash_tag2);
+    textViewBucket2HashTag1 = findViewById(R.id.text_view_bucket2_hash_tag1);
+    textViewBucket2HashTag2 = findViewById(R.id.text_view_bucket2_hash_tag2);
+
+
     findViewById(R.id.text_view_my_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
     textViewBookmarkCount.setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.BOOK_MARK_LIST).build());});
     findViewById(R.id.text_view_purchase).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_PURCHASE_HISTORY).build());});
@@ -203,7 +231,33 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     setBestBucketLabel(count);
   }
 
+  @Override
+  public void drawMyBucketList(ArrayList<BucketMyBean> myBucketBeans) {
+    if (myBucketBeans.size() == 0) {
+      layoutMyBucketListPreview.setVisibility(View.GONE);
+    }
+    else if (myBucketBeans.size() == 1) {
+      layoutMyBucketListPreview.setVisibility(View.VISIBLE);
+      layoutBucketCardView1.setVisibility(View.VISIBLE);
+      layoutBucketCardView2.setVisibility(View.GONE);
+      textViewBucketCardViewTitle1.setText(myBucketBeans.get(0).getTitle());
+      layoutBucketCardView1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.DETAIL).index(0).build()));
+
+    }
+    else {
+      layoutMyBucketListPreview.setVisibility(View.VISIBLE);
+      layoutBucketCardView1.setVisibility(View.VISIBLE);
+      layoutBucketCardView2.setVisibility(View.VISIBLE);
+      textViewBucketCardViewTitle1.setText(myBucketBeans.get(0).getTitle());
+      textViewBucketCardViewTitle2.setText(myBucketBeans.get(1).getTitle());
+      layoutBucketCardView1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.DETAIL).index(0).build()));
+      layoutBucketCardView2.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.DETAIL).index(1).build()));
+    }
+
+  }
+
   /**
+   *
    * template
    */
   protected abstract void createMemberOrGuest();

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

@@ -163,7 +163,10 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
         contentsBean.setImageUrl(bean.getImageUrl());
         deliveryHelper.setPackaging(contentsBean);
         go(ScreenID.CONTENTS);
-
+        break;
+        case Event.DETAIL:
+        deliveryHelper.setPackaging(model.getBucketList().get(event.getIndex()));
+        go(ScreenID.BUCKET_DETAIL);
         break;
       default:
         break;
@@ -233,8 +236,12 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
     int count = 0;
     if (null != model.getBucketList() && model.getBucketList().size() > 0) {
       count = model.getBucketList().size();
+      view.drawMyBucketList(model.getBucketList());
     }
+
     view.drawBucketLabel(count);
+
   }
 
+
 }

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

@@ -5,7 +5,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  tools:layout_marginTop="-500dp">
 
   <android.support.constraint.ConstraintLayout
     android:layout_width="match_parent"
@@ -302,8 +303,8 @@
       android:id="@+id/fourth_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginStart="25dp"
-      android:layout_marginTop="43dp"
+      android:layout_marginStart="15dp"
+      android:layout_marginTop="33dp"
       android:layout_marginEnd="25dp"
       app:layout_constraintEnd_toEndOf="@+id/third_layout"
       app:layout_constraintStart_toStartOf="@+id/third_layout"
@@ -315,6 +316,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="43dp"
         android:lineSpacingExtra="6sp"
+        android:paddingStart="10dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:textColor="@color/C000000"
         android:textSize="15sp"
         android:textStyle="bold"
@@ -325,9 +329,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="4dp"
-        android:paddingTop="4dp"
+        android:paddingTop="10dp"
         android:paddingEnd="6dp"
-        android:paddingBottom="4dp"
+        android:paddingBottom="10dp"
         app:layout_constraintBottom_toBottomOf="@+id/text_view_book_mark"
         app:layout_constraintStart_toEndOf="@+id/text_view_book_mark"
         app:layout_constraintTop_toTopOf="@+id/text_view_book_mark"
@@ -338,9 +342,10 @@
         android:id="@+id/text_view_book_mark_recommend"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="5dp"
         android:gravity="center_horizontal"
         android:lineSpacingExtra="10sp"
+        android:paddingStart="10dp"
         android:text="@string/book_mark_recommend_text"
         android:textColor="@color/C999999"
         android:textSize="12sp"
@@ -518,14 +523,16 @@
     </android.support.constraint.ConstraintLayout>
 
     <android.support.constraint.ConstraintLayout
+      android:id="@+id/layout_best_bucket"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginStart="25dp"
-      android:layout_marginTop="43dp"
+      android:layout_marginStart="15dp"
+      android:layout_marginTop="33dp"
       android:layout_marginEnd="25dp"
-      android:layout_marginBottom="45dp"
-      app:layout_constraintBottom_toTopOf="@+id/image_view_coupon_mall"
-      app:layout_constraintTop_toBottomOf="@+id/sixth_layout">
+      android:layout_marginBottom="35dp"
+      app:layout_constraintBottom_toTopOf="@+id/layout_my_bucket_list_preview"
+      app:layout_constraintTop_toBottomOf="@+id/sixth_layout"
+      tools:visibility="visible">
 
 
       <TextView
@@ -534,6 +541,9 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="15dp"
         android:lineSpacingExtra="6sp"
+        android:paddingStart="10dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:textColor="@color/C000000"
         android:textSize="15sp"
         android:textStyle="bold"
@@ -545,9 +555,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="4dp"
-        android:paddingTop="4dp"
+        android:paddingTop="10dp"
         android:paddingEnd="6dp"
-        android:paddingBottom="4dp"
+        android:paddingBottom="10dp"
         app:layout_constraintBottom_toBottomOf="@+id/text_view_exists_bucket_list"
         app:layout_constraintStart_toEndOf="@+id/text_view_exists_bucket_list"
         app:layout_constraintTop_toTopOf="@+id/text_view_exists_bucket_list"
@@ -558,7 +568,8 @@
         android:id="@+id/view_pager_best_bucket_list"
         android:layout_width="match_parent"
         android:layout_height="149dp"
-        android:layout_marginTop="15dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_view_exists_bucket_list"/>
@@ -580,15 +591,173 @@
 
     </android.support.constraint.ConstraintLayout>
 
-    <ImageView
-      android:id="@+id/image_view_coupon_mall"
+    <android.support.constraint.ConstraintLayout
+      android:id="@+id/layout_my_bucket_list_preview"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:scaleType="fitXY"
-      android:src="@drawable/banner_mymain"
+      android:layout_marginStart="25dp"
+      android:layout_marginTop="25dp"
+      android:layout_marginEnd="25dp"
+      android:visibility="visible"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/layout_best_bucket">
+
+      <android.support.constraint.ConstraintLayout
+        android:id="@+id/my_bucket_list_card_view1"
+        android:layout_width="148dp"
+        android:layout_height="148dp"
+        android:background="@drawable/faq_text_border">
+
+        <TextView
+          android:id="@+id/text_view_my_bucket_title1"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="38dp"
+          android:layout_marginTop="30dp"
+          android:layout_marginEnd="23dp"
+          android:lineSpacingExtra="6sp"
+          android:maxLines="3"
+          android:maxWidth="87dp"
+          android:ellipsize="end"
+          android:textColor="@color/C000000"
+          android:textSize="14sp"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          tools:text="나를 위한\n명품시계\n구매하기"/>
+
+        <TextView
+          android:id="@+id/text_view_bucket_hash_tag1"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="38dp"
+          android:layout_marginBottom="29dp"
+          android:layout_toEndOf="@+id/text_view_bucket_hash_tag2"
+          android:lineSpacingExtra="4sp"
+          android:textColor="#666666"
+          android:textSize="11sp"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          tools:text="#시계"/>
+
+        <TextView
+          android:id="@+id/text_view_bucket_hash_tag2"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignStart="@+id/text_view_my_bucket_title1"
+          android:layout_marginStart="5dp"
+          android:layout_marginBottom="29dp"
+          android:lineSpacingExtra="4sp"
+          android:textColor="@color/C666666"
+          android:textSize="11sp"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toEndOf="@+id/text_view_bucket_hash_tag1"
+          tools:layout_editor_absoluteX="72dp"
+          tools:text="#구매하기"/>
+
+        <ImageView
+          android:id="@+id/image_view_bucket_check1"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignTop="@+id/text_view_my_bucket_title1"
+          android:layout_alignParentStart="true"
+          android:layout_marginStart="23dp"
+          android:layout_marginTop="5dp"
+          android:layout_marginEnd="5dp"
+          app:layout_constraintEnd_toStartOf="@+id/text_view_my_bucket_title1"
+          app:layout_constraintTop_toTopOf="@+id/text_view_my_bucket_title1"
+          app:srcCompat="@drawable/icon_bucket_complete"/>
+      </android.support.constraint.ConstraintLayout>
+
+      <android.support.constraint.ConstraintLayout
+        android:id="@+id/my_bucket_list_card_view2"
+        android:layout_width="148dp"
+        android:layout_height="148dp"
+        android:background="@drawable/faq_text_border"
+        app:layout_constraintEnd_toEndOf="parent"
+        >
+
+        <TextView
+          android:id="@+id/text_view_my_bucket_title2"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="38dp"
+          android:layout_marginTop="30dp"
+          android:layout_marginEnd="23dp"
+          android:maxLines="3"
+          android:maxWidth="87dp"
+          android:ellipsize="end"
+          android:lineSpacingExtra="6sp"
+          android:text="나를 위한\n명품시계\n구매하기"
+          android:textColor="@color/C000000"
+          android:textSize="14sp"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"/>
+
+        <TextView
+          android:id="@+id/text_view_bucket2_hash_tag1"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="38dp"
+          android:layout_marginBottom="29dp"
+          android:layout_toEndOf="@+id/text_view_bucket2_hash_tag2"
+          android:lineSpacingExtra="4sp"
+          android:text="#시계"
+          android:textColor="#666666"
+          android:textSize="11sp"
+          android:visibility="gone"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toStartOf="parent"/>
+
+        <TextView
+          android:id="@+id/text_view_bucket2_hash_tag2"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignStart="@+id/text_view_my_bucket_title2"
+          android:layout_marginStart="5dp"
+          android:layout_marginBottom="29dp"
+          android:lineSpacingExtra="4sp"
+          android:text="#구매하기"
+          android:textColor="@color/C666666"
+          android:textSize="11sp"
+          android:visibility="gone"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toEndOf="@+id/text_view_bucket2_hash_tag1"
+          tools:layout_editor_absoluteX="72dp"/>
+
+        <ImageView
+          android:id="@+id/image_view_bucket_check2"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignTop="@+id/text_view_my_bucket_title2"
+          android:layout_alignParentStart="true"
+          android:layout_marginStart="23dp"
+          android:layout_marginTop="5dp"
+          android:layout_marginEnd="5dp"
+          app:layout_constraintEnd_toStartOf="@+id/text_view_my_bucket_title2"
+          app:layout_constraintTop_toTopOf="@+id/text_view_my_bucket_title2"
+          app:srcCompat="@drawable/icon_bucket_complete"/>\
+      </android.support.constraint.ConstraintLayout>
+    </android.support.constraint.ConstraintLayout>
+
+    <android.support.constraint.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="45dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"/>
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/layout_my_bucket_list_preview">
 
+      <ImageView
+        android:id="@+id/image_view_coupon_mall"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:src="@drawable/banner_mymain"
+        />
+    </android.support.constraint.ConstraintLayout>
   </android.support.constraint.ConstraintLayout>
 </android.support.v4.widget.NestedScrollView>

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

@@ -26,6 +26,9 @@
       android:layout_marginTop="30dp"
       android:layout_marginEnd="23dp"
       android:lineSpacingExtra="6sp"
+      android:maxLines="3"
+      android:maxWidth="87dp"
+      android:ellipsize="end"
       android:textColor="@color/C000000"
       android:textSize="14sp"
       tools:text="나를 위한\n명품시계\n구매하기"/>