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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/web/WebFragment.java

@@ -145,10 +145,6 @@ public class WebFragment extends FragmentBase<WebPresenter> implements IWebView
   public void onClickPrev() {
     if (webView.canGoBack()) {
       webView.goBack();
-      imageViewNext.setImageDrawable(getActivity().getResources().getDrawable(R.drawable.icon_bottom_next_able));
-    }
-    else {
-      presenter.onBackPressedInternal();
     }
   }
 
@@ -157,8 +153,5 @@ public class WebFragment extends FragmentBase<WebPresenter> implements IWebView
     if (webView.canGoForward()) {
       webView.goForward();
     }
-    else {
-      imageViewNext.setImageDrawable(getActivity().getResources().getDrawable(R.drawable.icon_bottom_next_disable));
-    }
   }
 }

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

@@ -0,0 +1,7 @@
+<vector android:height="71dp" android:viewportHeight="282"
+    android:viewportWidth="494" android:width="124dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M224.5,22l11,-22 11,22H459v214.02H11V22h213.5z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M13,24v210.02h444V24H245.264L235.5,4.472 225.736,24H13z"
+        android:strokeColor="#000" android:strokeLineJoin="square" android:strokeWidth="4"/>
+</vector>

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

@@ -0,0 +1,7 @@
+<vector android:height="71dp" android:viewportHeight="282"
+    android:viewportWidth="714" android:width="179dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M334.5,22l11,-22 11,22H679v214H11V22h323.5z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M13,24v210h664V24H355.264L345.5,4.472 335.736,24H13z"
+        android:strokeColor="#000" android:strokeLineJoin="bevel" android:strokeWidth="4"/>
+</vector>

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

@@ -0,0 +1,7 @@
+<vector android:height="71dp" android:viewportHeight="284"
+    android:viewportWidth="568" android:width="142dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M270.5,26L282,3l11.5,23H561v214H4V26h266.5z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M6,28v210h553V28H292.264L282,7.472 271.736,28H6z"
+        android:strokeColor="#000" android:strokeLineJoin="bevel" android:strokeWidth="4"/>
+</vector>

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

@@ -1,6 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="70"
-        android:viewportWidth="70" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-  <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M34.955,12l21.808,21.808a1.16,1.16 0,0 1,0 1.64L34.955,57.254"
-        android:strokeColor="@color/C888888" android:strokeWidth="4"/>
-</vector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="rectangle">
+      <stroke android:color="@color/C000000" android:width="1dp"/>
+      <solid android:color="@color/CFFFFFF"/>
+      <size android:width="206dp" android:height="73dp"/>
+    </shape>
+  </item>
+</selector>

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

@@ -48,7 +48,7 @@
       app:layout_constraintEnd_toStartOf="@+id/image_view_refresh"
       app:layout_constraintStart_toEndOf="@+id/image_view_prev"
       app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/icon_bottom_next_disable"
+      app:srcCompat="@drawable/icon_bottom_next"
       />
 
     <ImageView

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
-
-</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  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"
+  tools:background="@color/C888888">
+
+  <ImageView
+    android:id="@+id/image_view_bubble"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="41dp"
+    android:layout_marginEnd="21dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:srcCompat="@drawable/bubble_tutorial_success"
+    />
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="12sp"
+    android:textColor="@color/C000000"
+    android:lineSpacingExtra="4sp"
+    android:gravity="center_horizontal"
+    android:text="@string/tutorial_bucket_list_success"
+    app:layout_constraintStart_toStartOf="@+id/image_view_bubble"
+    app:layout_constraintEnd_toEndOf="@+id/image_view_bubble"
+    app:layout_constraintTop_toTopOf="@+id/image_view_bubble"
+    app:layout_constraintBottom_toBottomOf="@+id/image_view_bubble"
+    />
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  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"
+  tools:background="@color/C888888">
+
+  <ImageView
+    android:id="@+id/image_view_bubble"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintTop_toTopOf="parent"
+    android:layout_marginTop="198dp"
+    app:layout_constraintStart_toStartOf="parent"
+    android:layout_marginStart="30dp"
+    app:srcCompat="@drawable/bubble_tutorial_related_tags"
+    />
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="12sp"
+    android:textColor="@color/C000000"
+    android:lineSpacingExtra="4sp"
+    android:gravity="center_horizontal"
+    android:text="@string/tutorial_bucket_list_tag"
+    app:layout_constraintStart_toStartOf="@+id/image_view_bubble"
+    app:layout_constraintEnd_toEndOf="@+id/image_view_bubble"
+    app:layout_constraintTop_toTopOf="@+id/image_view_bubble"
+    app:layout_constraintBottom_toBottomOf="@+id/image_view_bubble"
+    />
+
+  <ImageView
+    android:id="@+id/image_view_bubble2"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintTop_toTopOf="parent"
+    android:layout_marginTop="83dp"
+    app:layout_constraintStart_toStartOf="parent"
+    android:layout_marginStart="118dp"
+    app:srcCompat="@drawable/bubble_tutorial_edit"
+    />
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="12sp"
+    android:textColor="@color/C000000"
+    android:lineSpacingExtra="4sp"
+    android:gravity="center_horizontal"
+    android:text="@string/tutorial_bucket_list_update"
+    app:layout_constraintStart_toStartOf="@+id/image_view_bubble2"
+    app:layout_constraintEnd_toEndOf="@+id/image_view_bubble2"
+    app:layout_constraintTop_toTopOf="@+id/image_view_bubble2"
+    app:layout_constraintBottom_toBottomOf="@+id/image_view_bubble2"
+    />
+</android.support.constraint.ConstraintLayout>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
-
-</android.support.constraint.ConstraintLayout>

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

@@ -30,7 +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"
-    android:text="@string/listicle_cover_tutorial_1"
+    android:text="@string/tutorial_listicle_cover_1"
     />
 
   <ImageView
@@ -54,6 +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"
-    android:text="@string/listicle_cover_tutorial_2"
+    android:text="@string/tutorial_listicle_cover_2"
     />
 </android.support.constraint.ConstraintLayout>

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

@@ -1,6 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
+<android.support.constraint.ConstraintLayout
+  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"
+  tools:background="@color/C888888"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <ImageView
+    android:id="@+id/image_view_bubble"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="111dp"
+    android:src="@drawable/tutorial_bubble"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"/>
+
+  <ImageView
+    android:id="@+id/image_view_finger"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:srcCompat="@drawable/icon_tutorial_finger"
+    android:layout_marginStart="20dp"
+    app:layout_constraintStart_toStartOf="@+id/image_view_bubble"
+    app:layout_constraintBottom_toBottomOf="@+id/image_view_bubble"
+    app:layout_constraintTop_toTopOf="@+id/image_view_bubble"/>
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:lineSpacingExtra="4sp"
+    android:text="@string/tutorial_listicle_detail"
+    android:textColor="@color/C000000"
+    android:textSize="12sp"
+    android:textStyle="bold"
+    android:layout_marginStart="15dp"
+    android:layout_marginEnd="20dp"
+    app:layout_constraintEnd_toEndOf="@id/image_view_bubble"
+    app:layout_constraintBottom_toBottomOf="@id/image_view_bubble"
+    app:layout_constraintStart_toEndOf="@id/image_view_finger"
+    app:layout_constraintTop_toTopOf="@+id/image_view_bubble"/>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -698,8 +698,13 @@
 
   <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="tutorial_listicle_cover_1">"<b>전체 콘텐츠</b>"\n공유하고 싶다면 꾹!</string>
+  <string name="tutorial_listicle_cover_2">"<b>태그를 누르면</b>"\n다른 콘텐츠를 확인 가능해요</string>
+  <string name="tutorial_listicle_detail">다음으로 넘겨서\n다양한 사진을 확인하세요</string>
+  <string name="tutorial_bucket_list_success">버킷리스트를\n"<b>완료했다면 체크를 꾹!</b>"</string>
+  <string name="tutorial_bucket_list_tag">"<b>연관태그를 선택해서</b>"\n원하는 콘텐츠를 찾아보세요</string>
+  <string name="tutorial_bucket_list_update">"<b>여기를 눌러서</b>"\n수정을 해보세요</string>
+
 
   <string name="last_contents_card">마지막 카드입니다</string>
   <string name="last_contents_listicle">마지막 장입니다</string>