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

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

@@ -27,6 +27,7 @@ import kr.co.zumo.app.lifeplus.bean.api.BucketBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 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.IEventListener;
 import kr.co.zumo.app.lifeplus.view.custom.BookmarkCheckbox;
@@ -108,6 +109,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textViewBookmark2 = findViewById(R.id.text_view_book_mark2);
 
     textViewBookmark1SubTitle = findViewById(R.id.text_view_bookmark1_sub_title);
+    textViewBookmark2SubTitle = findViewById(R.id.text_view_bookmark2_sub_title);
 
     imageViewBookmark1 = findViewById(R.id.image_view_book_mark1);
     imageViewBookmark2 = findViewById(R.id.image_view_book_mark2);
@@ -223,6 +225,10 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
       layoutBookmark1.setVisibility(View.VISIBLE);
       textViewBookmark1.setText(bookmarkBeans.get(0).getTwoLineTitle());
 
+      if (bookmarkBeans.get(0).getSubTitle() != null && StringUtil.isFull(bookmarkBeans.get(0).getSubTitle())) {
+        textViewBookmark1SubTitle.setVisibility(View.VISIBLE);
+        textViewBookmark1SubTitle.setText(bookmarkBeans.get(0).getSubTitle());
+      }
       imageViewBookmark1.setScaleType(ImageView.ScaleType.CENTER);
       Glide.with(imageViewBookmark1)
         .asBitmap()
@@ -244,6 +250,12 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
         // #2
         layoutBookmark2.setVisibility(View.VISIBLE);
         textViewBookmark2.setText(bookmarkBeans.get(1).getTwoLineTitle());
+
+        if (bookmarkBeans.get(1).getSubTitle() != null && StringUtil.isFull(bookmarkBeans.get(1).getSubTitle())) {
+          textViewBookmark2SubTitle.setVisibility(View.VISIBLE);
+          textViewBookmark2SubTitle.setText(bookmarkBeans.get(1).getSubTitle());
+        }
+
         imageViewBookmark2.setScaleType(ImageView.ScaleType.CENTER);
         Glide.with(imageViewBookmark2)
           .asBitmap()

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

@@ -42,17 +42,20 @@
 
     <TextView
       android:id="@+id/text_view_book_mark_title"
-      android:layout_width="wrap_content"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginStart="18dp"
       android:layout_marginTop="16dp"
+      android:layout_marginEnd="25dp"
       android:ellipsize="end"
       android:lineSpacingExtra="6sp"
       android:maxLength="25"
       android:maxLines="2"
       android:textColor="@color/C000000"
       android:textSize="14sp"
+      app:layout_constrainedWidth="true"
       app:layout_constraintBottom_toTopOf="@id/text_view_book_mark_sub_title"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toEndOf="@+id/image_view_book_mark"
       app:layout_constraintTop_toTopOf="parent"
       app:layout_constraintVertical_chainStyle="packed"
@@ -63,10 +66,11 @@
 
     <TextView
       android:id="@+id/text_view_book_mark_sub_title"
-      android:layout_width="wrap_content"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginStart="18dp"
       android:layout_marginTop="7dp"
+      android:layout_marginEnd="25dp"
       android:layout_marginBottom="13dp"
       android:ellipsize="end"
       android:lineSpacingExtra="3.5sp"
@@ -75,7 +79,9 @@
       android:singleLine="true"
       android:textColor="@color/C666666"
       android:textSize="12sp"
+      app:layout_constrainedWidth="true"
       app:layout_constraintBottom_toTopOf="@+id/layout_like_bookmark"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toEndOf="@+id/image_view_book_mark"
       app:layout_constraintTop_toBottomOf="@id/text_view_book_mark_title"
       app:layout_constraintVertical_chainStyle="packed"

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.NestedScrollView
-  android:id="@+id/scroller"
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/scroller"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
@@ -417,7 +417,8 @@
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="@+id/text_view_book_mark"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark"/>
+        app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark"
+        tools:visibility="gone"/>
 
     </android.support.constraint.ConstraintLayout>
 
@@ -437,57 +438,69 @@
         android:layout_marginStart="25dp"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/text_view"
+        app:layout_constraintEnd_toStartOf="@+id/text_view_book_mark1"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/img_bestbucket_banner_1"/>
 
       <TextView
         android:id="@+id/text_view_book_mark1"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="18dp"
-        android:layout_marginTop="16dp"
-        android:lineSpacingExtra="6sp"
+        android:layout_marginTop="15dp"
+        android:layout_marginEnd="25dp"
         android:ellipsize="end"
+        android:lineSpacingExtra="6sp"
         android:maxLines="2"
         android:text="9월엔 구월동\n구월동 추천 스팟 6"
         android:textColor="@color/C000000"
         android:textSize="14sp"
-        app:layout_constraintBottom_toTopOf="@id/layout_like_bookmark1"
+        app:layout_constrainedWidth="true"
+
+        app:layout_constraintBottom_toTopOf="@id/text_view_bookmark1_sub_title"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_view_book_mark1"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/image_view_book_mark1"
+        app:layout_constraintVertical_chainStyle="spread_inside"
         app:layout_goneMarginBottom="27dp"
         app:layout_goneMarginTop="27dp"/>
+
       <TextView
         android:id="@+id/text_view_bookmark1_sub_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textSize="12sp"
+        android:layout_marginStart="18dp"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="25dp"
         android:layout_marginBottom="4dp"
-        android:layout_marginStart="18dp"
+        android:ellipsize="end"
+        android:lineSpacingExtra="4sp"
+        android:singleLine="true"
+        android:textColor="@color/C666666"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toTopOf="@+id/layout_like_bookmark1"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_view_book_mark1"
         app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark1"
-        app:layout_constraintBottom_toTopOf="@+id/layout_like_bookmark1"
-        android:textColor="@color/C666666"
-        android:lineSpacingExtra="4sp"
-        android:text="트렌드이슈"
+        app:layout_constraintVertical_chainStyle="spread_inside"
+        tools:text="트렌드이슈"
+        tools:visibility="visible"
         />
+
       <android.support.constraint.ConstraintLayout
         android:id="@+id/layout_like_bookmark1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="14dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="208dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginTop="6dp"
         android:visibility="gone"
-        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toEndOf="@+id/image_view_book_mark1"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark1">
+        app:layout_constraintTop_toBottomOf="@+id/text_view_bookmark1_sub_title"
+        tools:visibility="visible">
 
         <kr.co.zumo.app.lifeplus.view.custom.LikeCheckbox
           android:id="@+id/like_check"
@@ -532,20 +545,51 @@
 
       <TextView
         android:id="@+id/text_view_book_mark2"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="18dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="5dp"
+        android:ellipsize="end"
         android:lineSpacingExtra="6sp"
+        android:maxLines="2"
         android:text="9월엔 구월동\n구월동 추천 스팟 6"
         android:textColor="@color/C000000"
         android:textSize="14sp"
-        app:layout_constraintBottom_toTopOf="@+id/layout_like_bookmark2"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toTopOf="@+id/text_view_bookmark2_sub_title"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_view_book_mark2"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread_inside"
         app:layout_goneMarginBottom="27dp"
         app:layout_goneMarginTop="27dp"/>
 
+      <TextView
+        android:id="@+id/text_view_bookmark2_sub_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="4dp"
+        android:ellipsize="end"
+        android:lineSpacingExtra="4sp"
+        android:singleLine="true"
+        android:textColor="@color/C666666"
+        android:textSize="12sp"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toTopOf="@+id/layout_like_bookmark2"
+        app:layout_constraintEnd_toEndOf="parent"
+
+        app:layout_constraintStart_toEndOf="@+id/image_view_book_mark2"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark2"
+        app:layout_constraintVertical_chainStyle="spread_inside"
+        tools:text="트렌드이슈"
+        tools:visibility="gone"
+        />
+
       <android.support.constraint.ConstraintLayout
         android:id="@+id/layout_like_bookmark2"
         android:layout_width="wrap_content"
@@ -558,7 +602,9 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toEndOf="@+id/image_view_book_mark2"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark2"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_bookmark2_sub_title"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_goneMarginTop="11dp"
         tools:visibility="visible">
 
         <kr.co.zumo.app.lifeplus.view.custom.LikeCheckbox