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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/tab_white_active"
+        android:state_selected="true"/>
+  <item android:drawable="@drawable/tab_white_inactive"/>
+</selector>

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

@@ -0,0 +1,10 @@
+<?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:centerColor="#08000000"
+    android:startColor="#1C000000"
+    android:type="linear" />
+</shape>

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

@@ -1,6 +1,4 @@
 <vector android:height="44dp" android:viewportHeight="174"
     android:viewportWidth="442" android:width="111dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.4" android:fillColor="#000"
-        android:fillType="evenOdd"
-        android:pathData="M417.933,73.335l24.192,13.72 -24.172,13.481C411.451,142.156 375.444,174 332,174H87c-48.049,0 -87,-38.951 -87,-87S38.951,0 87,0h245c43.4,0 79.377,31.778 85.933,73.335z" android:strokeAlpha="0.4"/>
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M417.933,73.335l24.192,13.72 -24.172,13.481C411.451,142.156 375.444,174 332,174H87c-48.049,0 -87,-38.951 -87,-87S38.951,0 87,0h245c43.4,0 79.377,31.778 85.933,73.335z"/>
 </vector>

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

@@ -4,7 +4,7 @@
 <gradient
   android:angle="90"
   android:endColor="#00000000"
-  android:startColor="#38000000"
-  android:centerColor="#0F000000"
+  android:startColor="#1C000000"
+  android:centerColor="#08000000"
   android:type="linear"/>
 </shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:innerRadius="0dp"
+  android:shape="ring"
+  android:thickness="3dp"
+  android:useLevel="false">
+  <solid android:color="@color/CFFFFFF"/>
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:innerRadius="0dp"
+  android:shape="ring"
+  android:thickness="3dp"
+  android:useLevel="false">
+  <solid android:color="@color/C4DFFFFFF"/>
+</shape>

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

@@ -5,11 +5,19 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-
   <ImageView
     android:id="@+id/image_view_card_listicle_cover"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scaleType="centerCrop"
-    tools:src="@drawable/mymain_bucket_banner_3"/>
+    tools:background="@color/CFFFFFF"/>
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="226dp"
+    android:rotation="180"
+    android:background="@drawable/card_cover_dim_top"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toTopOf="parent"/>
 </android.support.constraint.ConstraintLayout>

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

@@ -22,6 +22,15 @@
       app:layout_constraintTop_toTopOf="parent"/>
   </android.support.constraint.ConstraintLayout>
 
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="226dp"
+    android:rotation="180"
+    android:background="@drawable/card_cover_dim_top"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toTopOf="parent"/>
+
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_more_info"
     android:layout_width="wrap_content"

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

@@ -4,6 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
+  tools:layout_width="300dp"
   android:layout_height="match_parent">
 
   <kr.co.zumo.app.lifeplus.view.custom.contents.CustomListicleImageView
@@ -11,12 +12,10 @@
     android:layout_width="match_parent"
     android:layout_height="0dp"
     app:layout_constraintBottom_toTopOf="@+id/scroll_view"
-    app:layout_constraintDimensionRatio="V, 1:1"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
-    tools:background="@drawable/b"
-    tools:layout_marginTop="100dp"/>
+    tools:background="@color/CFFFFFF"/>
 
 
   <ScrollView
@@ -24,13 +23,9 @@
     style="@style/ContentsScrollBars"
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    android:layout_marginStart="25dp"
-    android:layout_marginTop="25dp"
-    android:layout_marginEnd="25dp"
-    android:layout_marginBottom="25dp"
+    android:padding="25dp"
     android:orientation="vertical"
     app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintDimensionRatio="V, 1:1"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/custom_listicle_image_view">

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

@@ -18,7 +18,7 @@
 
   <View
     android:layout_width="match_parent"
-    android:layout_height="183dp"
+    android:layout_height="235dp"
     android:background="@drawable/listicle_dim_top"
     android:rotation="180"
     app:layout_constraintEnd_toEndOf="parent"

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

@@ -30,5 +30,5 @@
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     tools:text="© instagram @robococodd"
-    tools:textColor="@color/C000000"/>
+    tools:textColor="@color/C66000000"/>
 </android.support.constraint.ConstraintLayout>

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

@@ -2,12 +2,13 @@
 <LinearLayout
   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:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="@color/CFFFFFF"
   android:orientation="vertical">
 
-  <RelativeLayout
+  <android.support.constraint.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -15,43 +16,48 @@
       android:id="@+id/view_pager_bucket_list"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:layout_alignParentTop="true"
       android:layout_marginTop="30dp"
       android:layout_marginBottom="35dp"
       android:paddingLeft="25dp"
-      android:paddingRight="25dp"/>
+      android:paddingRight="25dp"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:background="@color/CD0D0D0"/>
 
     <android.support.design.widget.TabLayout
       android:id="@+id/tab_layout_bucket_list"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_alignParentStart="true"
-      android:layout_alignParentBottom="true"
-      android:layout_marginBottom="35dp"
-      app:tabBackground="@drawable/tab_selector"
+      app:layout_constraintBottom_toBottomOf="@+id/view_pager_bucket_list"
+      app:tabBackground="@drawable/best_bucket_tab_selector"
+      app:tabMaxWidth="0dp"
+      app:tabMode="fixed"
       app:tabGravity="center"
-      app:tabIndicatorHeight="0dp"/>
+      app:tabIndicatorHeight="0dp"
+      />
 
     <ImageView
       android:id="@+id/image_view_text_balloon"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentBottom="true"
       android:layout_marginEnd="73dp"
       android:layout_marginBottom="22dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
       app:srcCompat="@drawable/ic_textballoon_shape"/>
 
     <TextView
+      android:id="@+id/text_view_bucket_guide"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentBottom="true"
-      android:layout_marginEnd="87dp"
-      android:layout_marginBottom="27dp"
-      android:lineSpacingExtra="4sp"
+      android:layout_marginStart="18dp"
+      android:lineSpacingExtra="2sp"
       android:text="@string/bucket_list_write"
       android:textColor="@color/CD0D0D0"
-      android:textSize="12sp"/>
-  </RelativeLayout>
+      android:textSize="11sp"
+      android:layout_marginEnd="23dp"
+      app:layout_constraintEnd_toEndOf="@+id/image_view_text_balloon"
+      app:layout_constraintBottom_toBottomOf="@+id/image_view_text_balloon"
+      app:layout_constraintStart_toStartOf="@+id/image_view_text_balloon"
+      app:layout_constraintTop_toTopOf="@+id/image_view_text_balloon"/>
+  </android.support.constraint.ConstraintLayout>
 </LinearLayout>

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

@@ -9,7 +9,7 @@
 
   <android.support.v7.widget.RecyclerView
     android:id="@+id/recycler_view_over_view"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_gravity="center"
     android:clipToPadding="false"

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

@@ -677,10 +677,14 @@
   <string name="next_time">다음 기회에</string>
   <string name="app_review_write">앱 리뷰 쓰기</string>
   <string name="app_join_recommend">\n회원가입하시면 특별한 혜택을 드립니다.</string>
-  <string name="with_shown_contents_detail">이 콘텐츠와 같은 태그를 포함한\n 콘텐츠입니다</string>
   <string name="recommend_code_title">추천인코드</string>
 
-  <string name="with_shown_contents">함께 보면 좋은 콘텐츠</string>
+  <string name="with_shown_contents">함께 본 콘텐츠</string>
+  <string name="with_shown_contents_detail">이 콘텐츠를 북마크한 분들이\n다음 콘텐츠도 보셨습니다</string>
+
+  <string name="with_shown_contents_with_tag">함께 보면 좋은 콘텐츠</string>
+  <string name="with_shown_contents_with_tag_detail">이 콘텐츠와 같은 태그를 포함한\n콘텐츠입니다</string>
+
   <string name="best_bucket_delete_guide">선택된 버킷리스트가 삭제됩니다.</string>
 
   <string name="inside">실내</string>