[공통][Common] 튜토리얼 GUI 적용 및 수정

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/tutorial/TutorialPagerAdapter.java

@@ -94,22 +94,22 @@ public class TutorialPagerAdapter extends PagerAdapter {
 
     switch (position) {
       case 0:
-        imageViewTutorial.setImageResource(R.drawable.tutorial_image1);
+        imageViewTutorial.setImageResource(R.drawable.mockup_step_01);
         textViewTitle.setText(R.string.tutorial_title1);
         textViewDetail.setText(R.string.tutorial_title1_message);
         break;
       case 1:
-        imageViewTutorial.setImageResource(R.drawable.tutorial_image2);
+        imageViewTutorial.setImageResource(R.drawable.mockup_step_02);
         textViewTitle.setText(R.string.tutorial_title2);
         textViewDetail.setText(R.string.tutorial_title2_message);
         break;
       case 2:
-        imageViewTutorial.setImageResource(R.drawable.tutorial_image3);
+        imageViewTutorial.setImageResource(R.drawable.mockup_step_03);
         textViewTitle.setText(R.string.tutorial_title3);
         textViewDetail.setText(R.string.tutorial_title3_message);
         break;
       case 3:
-        imageViewTutorial.setImageResource(R.drawable.tutorial_image4);
+        imageViewTutorial.setImageResource(R.drawable.mockup_step_04);
         textViewTitle.setText(R.string.tutorial_title4);
         textViewDetail.setText(R.string.tutorial_title4_message);
         break;

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/TutorialPresenter.java

@@ -6,7 +6,6 @@ package kr.co.zumo.app.lifeplus.view.presenter;
 
 import android.util.Log;
 
-import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.TutorialModel;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -51,7 +50,8 @@ public class TutorialPresenter extends Presenter<TutorialModel, ITutorialView> {
     switch (event.getEventId()) {
       case Event.TUTORIAL_CLOSE:
         // tutorial 본 것으로 표시
-        SuperModel.getInstance().getPreferences().setTutorialDone();
+        // TODO: tutorial 확인 
+        // SuperModel.getInstance().getPreferences().setTutorialDone();
         onCommand(new ActivityChangeCommand(ScreenID.ACTIVITY_MAIN, ScreenID.DIRECTION_NEXT));
         break;
       case Event.TUTORIAL_NEXT:

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

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:innerRadius="0dp"
   android:shape="ring"
-  android:thickness="6dp"
+  android:thickness="3dp"
   android:useLevel="false">
   <solid android:color="@color/black"/>
 </shape>

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

@@ -4,7 +4,7 @@
     <shape
       android:innerRadius="0dp"
       android:shape="ring"
-      android:thickness="6dp"
+      android:thickness="3dp"
       android:useLevel="false">
       <solid android:color="@android:color/darker_gray"/>
     </shape>

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

@@ -10,39 +10,39 @@
 
   <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="42dp"
     android:layout_gravity="bottom"
     android:background="@color/black"
     android:gravity="bottom"
     android:orientation="horizontal"
-    android:weightSum="4"
     >
-
-
     <TextView
       android:id="@+id/button1_tutorial"
-      android:layout_width="0dp"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="28dp"
-      android:layout_marginTop="13.7dp"
-      android:layout_weight="2"
+      android:layout_marginLeft="24.5dp"
+      android:lineSpacingExtra="6sp"
+      android:paddingBottom="8.5dp"
+      android:paddingTop="12dp"
       android:text="@string/tutorial_bottom_jump"
-      android:textAlignment="textStart"
-      android:textColor="@color/white"
-      android:textSize="18dp"
+      android:textColor="#ffffff"
+      android:textSize="15.5sp"
       />
-
+    <View
+      android:layout_width="0dp"
+      android:layout_height="0dp"
+      android:layout_weight="1" />
     <TextView
       android:id="@+id/button2_tutorial"
-      android:layout_width="0dp"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="28dp"
-      android:layout_marginTop="13.7dp"
-      android:layout_weight="2"
+      android:layout_marginRight="24.5dp"
+      android:lineSpacingExtra="6sp"
+      android:paddingBottom="8.5dp"
+      android:paddingTop="12dp"
       android:text="@string/tutorial_bottom_next"
-      android:textAlignment="textEnd"
-      android:textColor="@color/white"
-      android:textSize="18dp"
+      android:textColor="#ffffff"
+      android:textSize="15.5sp"
       />
   </LinearLayout>
 </LinearLayout>

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

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@drawable/tutorial_image5">
+  android:background="@drawable/mockup_step_05">
 
   <ImageView
     android:layout_width="wrap_content"

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

@@ -10,28 +10,33 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+
     android:orientation="vertical">
 
     <TextView
       android:id="@+id/text_view_tutorial_title"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:textSize="24.5sp"
+      android:textColor="#000000"
+      android:lineSpacingExtra="9.5sp"
       android:textAlignment="center"
-      android:textSize="28dp"
       />
   </LinearLayout>
 
   <LinearLayout
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="98dp"
-    android:layout_marginTop="8dp"
+    android:layout_marginTop="7dp"
     android:orientation="vertical">
 
     <TextView
       android:id="@+id/text_view_tutorial_detail"
-      android:layout_width="wrap_content"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:textSize="14sp"
+      android:textColor="#666666"
+      android:lineSpacingExtra="5.5sp"
       android:textAlignment="center"
       />
 
@@ -44,6 +49,7 @@
     <ImageView
       android:id="@+id/image_view_tutorial"
       android:layout_width="wrap_content"
+      android:layout_marginTop="27dp"
       android:layout_height="wrap_content"
       android:layout_alignParentStart="true"
       android:layout_alignParentTop="true"/>