[튜토리얼][Common] 튜토리얼 레이아웃 조정 및 일부 텍스트 추가함

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/Tutorial.java

@@ -55,7 +55,7 @@ public class Tutorial {
   public void showTutorial(FragmentActivity activity, int tutorialID, IEventListener listener) {
     if (null != activity) {
       this.activity = activity;
-      frameLayout = activity.getWindow().findViewById(android.R.id.content);
+      frameLayout = this.activity.getWindow().findViewById(android.R.id.content);
       inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
       switch (tutorialID) {
@@ -111,6 +111,11 @@ public class Tutorial {
     );
   }
 
+  /**
+   * 리스티클 커버 첫 진입시 뜨는 튜토리얼
+   *
+   * @param listener
+   */
   private void showTutorialListicleCover(IEventListener listener) {
     View view = inflater.inflate(R.layout.tutorial_listicle_cover, null);
     frameLayout.addView(view);
@@ -157,6 +162,12 @@ public class Tutorial {
 
   }
 
+  /**
+   * 리스티클 첫 진입후
+   * 리스티클 상세에서 뜨는 튜토리얼
+   *
+   * @param listener
+   */
   private void showTutorialListicleDetail(IEventListener listener) {
     View view = inflater.inflate(R.layout.tutorial_listicle_detail, null);
     frameLayout.addView(view);
@@ -211,6 +222,11 @@ public class Tutorial {
 
   }
 
+  /**
+   * 버킷리스트 태그 있는 화면 첫 진입시, 뜨는 튜토리얼
+   * 태그있는 화면 -> 등록 화면 소개 페이지 두개 넘어간 후
+   * 튜토리얼 종료됨
+   */
   private void showTutorialBucketTag() {
     bucketFirstView = inflater.inflate(R.layout.tutorial_bucket_list_tag, null);
     ConstraintLayout firstContainer = bucketFirstView.findViewById(R.id.container);

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

@@ -1,7 +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="#000" android:fillType="evenOdd" android:pathData="M70.5,22l11,-22 11,22H679v214H11V22h59.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"/>
+        android:pathData="M13,24v210h664V24H91.264L81.5,4.472 71.736,24H13z"
+        android:strokeColor="#000" android:strokeWidth="4"/>
 </vector>

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

@@ -73,11 +73,11 @@
       android:layout_marginStart="25dp"
       android:layout_marginTop="18dp"
       android:lineSpacingExtra="3.5sp"
+      android:text="@string/tutorial_bucket_example"
       android:textColor="@color/C999999"
       android:textSize="12sp"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/image_view_bucket"
-      tools:text="연관태그 추천 콘텐츠 31개"/>
+      app:layout_constraintTop_toBottomOf="@+id/image_view_bucket"/>
 
     <android.support.constraint.ConstraintLayout
       android:id="@+id/layout_tag"
@@ -93,14 +93,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="9dp"
-        android:background="@drawable/custom_rectangle_radio_off"
+        android:background="@drawable/custom_rectangle_radio_on"
         android:paddingStart="12dp"
         android:paddingTop="5dp"
         android:paddingEnd="12dp"
         android:paddingBottom="5dp"
         android:text="#배낭여행"
         android:textAlignment="center"
-        android:textColor="@color/C999999"
+        android:textColor="@color/C000000"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/check_box2"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -128,7 +128,7 @@
         android:id="@+id/check_box3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/custom_rectangle_radio_on"
+        android:background="@drawable/custom_rectangle_radio_off"
         android:lineSpacingExtra="4sp"
         android:paddingStart="12dp"
         android:paddingTop="5dp"
@@ -136,7 +136,7 @@
         android:paddingBottom="5dp"
         android:text="#배낭여행"
         android:textAlignment="center"
-        android:textColor="@color/C000000"
+        android:textColor="@color/C999999"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/check_box4"
         app:layout_constraintHorizontal_bias="0.5"
@@ -259,9 +259,10 @@
       android:id="@+id/tutorial_bucket_list_tag2"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="131dp"
+      android:layout_marginStart="26dp"
       android:layout_marginTop="151dp"
       android:visibility="gone"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       tools:visibility="visible"
@@ -297,7 +298,7 @@
       android:id="@+id/tutorial_bucket_list_tag1"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="131dp"
+      android:layout_marginStart="22dp"
       android:layout_marginTop="10dp"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/layout_tag"

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

@@ -11,7 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="67dp"
-    android:layout_marginEnd="21dp"
+    android:layout_marginEnd="24dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 

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

@@ -67,6 +67,7 @@
   <string name="tutorial_title_zumo_message">회원가입하고 혜택을 누리세요!</string>
   <string name="tutorial_title_last">내 일상의 플러스</string>
   <string name="tutorial_title_last_message">삶을 더 잘 살기 위한 이야기\n시작해볼까요?</string>
+  <string name="tutorial_bucket_example">연관태그 추천 콘텐츠 <b>31</b>개</string>
 
   <string name="rest_member_message">장기간 이용 내역이 없어 관련 법령에\n따라 휴면상태로 전환되었습니다.</string>
   <string name="rest_member_message_detail">회원님의 계정을 안전하게 보호하기 위해 1년 이상\n로그인하지 않은 계정은 휴면 상태로 전환됩니다.</string>