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

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

@@ -3,10 +3,11 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
-    <android.support.v7.widget.RecyclerView
-      android:descendantFocusability="blocksDescendants"
-      android:id="@+id/recycler_view_main_banner_view"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
+  android:layout_height="match_parent"
+  android:descendantFocusability="blocksDescendants">
+
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/recycler_view_main_banner_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
 </android.support.constraint.ConstraintLayout>

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

@@ -30,8 +30,7 @@
     app:layout_constraintEnd_toEndOf="@+id/image_view_tutorial_share"
     app:layout_constraintStart_toStartOf="@+id/image_view_tutorial_share"
     app:layout_constraintTop_toTopOf="@+id/image_view_tutorial_share"
-    tools:text="전체 콘텐츠
-공유하고 싶다면 꾹!"
+    android:text="@string/listicle_cover_tutorial_1"
     />
 
   <ImageView
@@ -55,7 +54,6 @@
     app:layout_constraintEnd_toEndOf="@+id/image_view_tutorial_tag"
     app:layout_constraintStart_toStartOf="@+id/image_view_tutorial_tag"
     app:layout_constraintTop_toTopOf="@+id/image_view_tutorial_tag"
-    tools:text="태그를 누르면
-다른 콘텐츠를 확인 가능해요"
+    android:text="@string/listicle_cover_tutorial_2"
     />
 </android.support.constraint.ConstraintLayout>

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

@@ -687,6 +687,9 @@
 
   <string name="best_bucket_delete_guide">선택된 버킷리스트가 삭제됩니다.</string>
 
+  <string name="listicle_cover_tutorial_1">"<b>전체 콘텐츠</b>"\n공유하고 싶다면 꾹!</string>
+  <string name="listicle_cover_tutorial_2">"<b>태그를 누르면</b>"\n다른 콘텐츠를 확인 가능해요</string>
+
   <string name="inside">실내</string>
   <string name="outside">실외</string>