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

app/src/main/java/kr/co/zumo/app/lifeplus/view/Event.java

@@ -58,14 +58,14 @@ public class Event {
   public static final int DELETE = 30;
   public static final int MEMBER_DELETE_COMPLETED = 31;
   public static final int MEMBER_DELETE_ERROR = 32;
-
+  public static final int TUTORIAL_END = 33;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     NONE, CLICK, BACK, SIGN_UP, LOGIN, CHECK, UNCHECK, JOINED, TUTORIAL_LEFT, TUTORIAL_RIGHT,
     RETRY, INPUT_PIN, NETWORK_CONNECTED, CHANGED, INIT, DETAIL, ERROR, UNLOCK, RESET,
     SUCCESS, FAIL, CANCEL, EMAIL_CLICK, SPECIAL_CODE_CLICK, CONFIRM, RESULT, FAQ, DELETE,
-    MEMBER_DELETE_COMPLETED, MEMBER_DELETE_ERROR,
+    MEMBER_DELETE_COMPLETED, MEMBER_DELETE_ERROR, TUTORIAL_END,
   })
   public @interface ID {}
 

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

@@ -124,7 +124,7 @@ public class TutorialPagerAdapter extends PagerAdapter {
         bottomBar.setVisibility(View.GONE);
         view = layoutInflater.inflate(R.layout.tutorial_last, container, false);
         Button buttonStart = view.findViewById(R.id.button_start_main);
-        buttonStart.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_LEFT).build()));
+        buttonStart.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_END).build()));
         break;
       default:
         break;

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

@@ -103,7 +103,12 @@ public class TutorialPresenter extends Presenter<TutorialModel, ITutorialView> {
           // 다음
           view.onNextButtonClick();
           break;
+        case Event.TUTORIAL_END:
+          // 시작하기, tutorial 본 것으로 표시
+          SuperModel.getInstance().getPreferences().setTutorialDone(true);
 
+          onCommand(new ActivityChangeCommand(ScreenID.ACTIVITY_SIGN_UP, ScreenID.DIRECTION_NEXT));
+          break;
         default:
           break;
       }

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

@@ -13,18 +13,18 @@
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:paddingEnd="24dp"
-    android:paddingStart="24dp"
+    android:paddingStart="14dp"
      >
 
     <ImageView
       android:id="@+id/button_back"
       android:layout_width="35dp"
       android:layout_height="35dp"
-      android:contentDescription="@string/previous_page"
       android:paddingTop="10dp"
       android:paddingRight="10dp"
       android:paddingBottom="10dp"
-      android:paddingLeft="-10dp"
+      android:paddingLeft="10dp"
+      android:contentDescription="@string/previous_page"
       android:src="@drawable/icon_header_back"/>
 
     <TextView
@@ -32,7 +32,7 @@
       android:layout_width="0dp"
       android:layout_height="56dp"
       android:layout_marginEnd="18dp"
-      android:layout_marginStart="18dp"
+      android:layout_marginStart="28dp"
       android:layout_weight="1"
       android:gravity="center"
       android:textColor="@color/C000000"