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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type4/FourthCategoryMainItemViewHolder.java

@@ -43,9 +43,9 @@ public class FourthCategoryMainItemViewHolder extends CategoryMainViewHolder<Cat
 
     if (null != bean) {
       Glide.with(imageViewMainFourthCategory).load(bean.getImageUrl()).into(imageViewMainFourthCategory);
-      textViewMainFourthCategoryTitle1.setText(bean.getTitle());
-      textViewMainFourthCategoryTitle2.setText(bean.getSubTitle());
-      textViewMainFourthCategoryTitle3.setText("");
+      textViewMainFourthCategoryTitle1.setText(bean.getSubTitle());
+      textViewMainFourthCategoryTitle2.setText(bean.getTitle());
+      textViewMainFourthCategoryTitle3.setText("category");
     }
 
     imageViewMainFourthCategory.setOnClickListener(v -> {

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

@@ -90,6 +90,7 @@ public class MyBucketListFragment extends FragmentBase<MyBucketListPresenter> im
       .menu(actionBar -> presenter.onNavigationClickMenu(actionBar))
       .search(actionBar -> presenter.onNavigationClickSearch(actionBar))
       .back(actionBar -> presenter.onNavigationClickBack(actionBar))
+      .scroll()
       .show();
   }
 

app/src/main/res/drawable/rectangle_dim.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+
+  <gradient
+    android:angle="90"
+    android:endColor="#00000000"
+    android:startColor="#a6000000"
+    android:type="linear" />
+
+  <corners
+    android:radius="0dp"/>
+</shape>

app/src/main/res/drawable/rectangle_dim_top.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+
+  <gradient
+    android:angle="90"
+    android:endColor="#4D000000"
+    android:startColor="#00000000"
+    android:type="linear" />
+
+  <corners
+    android:radius="0dp"/>
+</shape>

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

@@ -62,7 +62,6 @@
       tools:visibility="visible"
       >
 
-
       <RadioGroup
         android:id="@+id/category_main_tab"
         android:layout_width="wrap_content"

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

@@ -31,7 +31,7 @@
       android:focusable="true"
       android:padding="10dp"
       android:textColor="@color/C000000"
-      android:textSize="14sp"/>
+      android:textSize="12dp"/>
 
     <ImageView
       android:id="@+id/first_category_main_filter"

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

@@ -9,6 +9,7 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/action_bar_height"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -95,7 +96,6 @@
       android:layout_marginStart="17dp"
       android:layout_marginTop="20dp"
       android:layout_marginEnd="17dp"
-      android:layout_marginBottom="14dp"
       android:orientation="vertical">
 
       <android.support.v7.widget.RecyclerView

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

@@ -22,11 +22,10 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="13dp"
     android:gravity="center_horizontal"
-    android:lineSpacingExtra="4sp"
+    android:lineSpacingExtra="2dp"
     android:maxLines="2"
-    android:ellipsize="end"
     tools:text="카페 거리
-걷기 OOOOOOOOOOOOOOOOOOOO"
+    걷기 OOOOOOOOOOOOOOOOOOOO"
     android:textColor="@color/C000000"
     android:textSize="11sp"
     />

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

@@ -16,32 +16,48 @@
     tools:src="@drawable/img_bestbucket_1"
     />
 
-  <TextView
-    android:id="@+id/text_view_main_fifth_date"
-    android:layout_width="wrap_content"
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="18dp"
-    android:layout_marginBottom="5dp"
-    android:lineSpacingExtra="4sp"
-    android:textColor="@color/CFFFFFF"
-    android:textSize="11sp"
-    app:layout_constraintBottom_toTopOf="@+id/text_view_main_fifth_title"
-    app:layout_constraintStart_toStartOf="parent"
-    tools:text="2018.09.17 ~ 2018.09.23"
+    android:background="@drawable/rectangle_dim_top"
+    app:layout_constraintBottom_toTopOf="@+id/image_dim_layer"
     />
 
-  <TextView
-    android:id="@+id/text_view_main_fifth_title"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="18dp"
-    android:layout_marginBottom="18dp"
-    android:lineSpacingExtra="8sp"
-    android:textColor="@color/CFFFFFF"
-    android:textSize="19sp"
-    app:layout_constraintBottom_toBottomOf="@+id/image_view_main_fifth_category"
-    app:layout_constraintStart_toStartOf="parent"
-    tools:text="9월 3주차
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/image_dim_layer"
+    android:layout_width="match_parent"
+    android:layout_height="157dp"
+    android:background="@drawable/rectangle_dim"
+    app:layout_constraintBottom_toBottomOf="parent"
+    >
+
+    <TextView
+      android:id="@+id/text_view_main_fifth_date"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="18dp"
+      android:layout_marginBottom="5dp"
+      android:lineSpacingExtra="4sp"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="11sp"
+      app:layout_constraintBottom_toTopOf="@+id/text_view_main_fifth_title"
+      app:layout_constraintStart_toStartOf="parent"
+      tools:text="2018.09.17 ~ 2018.09.23"
+      />
+
+    <TextView
+      android:id="@+id/text_view_main_fifth_title"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="18dp"
+      android:layout_marginBottom="18dp"
+      android:lineSpacingExtra="5dp"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="19sp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      tools:text="9월 3주차
 뮤지컬 예매순위 TOP 10"
-    />
+      />
+  </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

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

@@ -9,8 +9,8 @@
     android:id="@+id/text_view_main_fifth_category_title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="9dp"
-    android:lineSpacingExtra="8sp"
+    android:textStyle="bold"
+    android:lineSpacingExtra="5dp"
     android:textColor="@color/C000000"
     android:textSize="21sp"
     app:layout_constraintStart_toStartOf="parent"

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

@@ -13,17 +13,32 @@
     android:scaleType="centerCrop"
     app:srcCompat="@drawable/img_bestbucket_1"/>
 
-  <TextView
-    android:id="@+id/text_view_main_first_category"
-    android:layout_width="wrap_content"
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="12dp"
-    android:layout_marginBottom="12dp"
-    android:lineSpacingExtra="6sp"
-    android:textColor="@color/CFFFFFF"
-    android:textSize="14sp"
-    app:layout_constraintStart_toStartOf="parent"
+    android:background="@drawable/rectangle_dim_top"
+    app:layout_constraintBottom_toTopOf="@+id/image_dim_layer"
+    />
+
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/image_dim_layer"
+    android:layout_width="match_parent"
+    android:layout_height="130dp"
     app:layout_constraintBottom_toBottomOf="parent"
-    tools:text="뜻밖의 오후 반차
+    android:background="@drawable/rectangle_dim"
+    >
+    <TextView
+      android:id="@+id/text_view_main_first_category"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="12dp"
+      android:layout_marginBottom="12dp"
+      android:lineSpacingExtra="4dp"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="14sp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      tools:text="뜻밖의 오후 반차
 어디가지? 코스 6"/>
+  </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

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

@@ -25,7 +25,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="5dp"
     android:lineSpacingExtra="6sp"
-    android:maxLines="1"
+    android:maxLines="2"
     android:textColor="@color/C000000"
     android:textSize="14sp"
     android:ellipsize="end"

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

@@ -14,6 +14,20 @@
     tools:src="@drawable/mymain_bucket_banner_3"
     />
 
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rectangle_dim_top"
+    app:layout_constraintBottom_toTopOf="@+id/image_dim_layer"
+    />
+
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/image_dim_layer"
+    android:layout_width="match_parent"
+    android:layout_height="61dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    android:background="@drawable/rectangle_dim"
+    >
   <TextView
     android:id="@+id/text_title"
     android:layout_width="wrap_content"
@@ -27,5 +41,5 @@
     app:layout_constraintStart_toStartOf="parent"
     tools:text="중국판 헐리우드"
     />
-
+  </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

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

@@ -13,7 +13,20 @@
     android:scaleType="centerCrop"
     tools:src="@drawable/mymain_bucket_banner_3"
     />
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rectangle_dim_top"
+    app:layout_constraintBottom_toTopOf="@+id/image_dim_layer"
+    />
 
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/image_dim_layer"
+    android:layout_width="match_parent"
+    android:layout_height="205dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    android:background="@drawable/rectangle_dim"
+    >
   <TextView
     android:id="@+id/text_title"
     android:layout_width="wrap_content"
@@ -27,5 +40,5 @@
     app:layout_constraintStart_toStartOf="parent"
     tools:text="디즈니랜드 여행"
     />
-
+  </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

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

@@ -20,7 +20,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="11dp"
     android:layout_marginBottom="9dp"
-    android:lineSpacingExtra="6sp"
+    android:lineSpacingExtra="3sp"
     android:textColor="@color/C000000"
     android:textSize="14sp"
     app:layout_constraintBottom_toBottomOf="parent"