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

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.support.annotation.DrawableRes;
 import android.support.constraint.ConstraintLayout;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -54,6 +53,7 @@ public class CustomMoreInfoView extends ConstraintLayout {
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     inflater.inflate(R.layout.custom_contents_information_view, this);
     ((ImageView) findViewById(R.id.image_view_info)).setImageResource(iconResource);
+    contents = contents.trim().replaceAll("\\\\n", System.getProperty("line.separator"));
     ((TextView) findViewById(R.id.text_view_info)).setText(contents);
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsListicleHolder.java

@@ -1,7 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
 import android.support.constraint.ConstraintLayout;
-import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -71,7 +70,7 @@ public class ContentsListicleHolder extends ContentsHolder<ContentsDetailBean> {
       listener.onEvent(new Event.Builder(Event.MORE).index(getAdapterPosition()).build());
     });
     for (int i = 0; i < bean.getMoreInfoList().size(); i++) {
-      Log.e("APP#  ContentsListicleHolder | attach", "|" + bean.getMoreInfoList().get(i).getDetailType() + "," + bean.getMoreInfoList().get(i).getMoreInfo());
+    //  Log.e("APP#  ContentsListicleHolder | attach", "|" + bean.getMoreInfoList().get(i).getDetailType() + "," + bean.getMoreInfoList().get(i).getMoreInfo());
     }
 
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpStartPresenter.java

@@ -25,6 +25,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 public class SignUpStartPresenter extends Presenter<SignUpStartModel, ISignUpStartView> {
 
   private DoubleChecker doubleChecker;
+  private boolean isOnboardingStarted;
 
   public SignUpStartPresenter(SignUpStartModel model, ISignUpStartView view) {
     super(model, view);
@@ -34,6 +35,10 @@ public class SignUpStartPresenter extends Presenter<SignUpStartModel, ISignUpSta
     this.model.requestBanners();
   }
 
+  public void setOnBoardingStart(){
+    isOnboardingStarted = true;
+  }
+
   @Override
   protected void startInternal() {
     getHelper(ActionBarHelper.class).setProgress(8); // 26/360
@@ -90,7 +95,11 @@ public class SignUpStartPresenter extends Presenter<SignUpStartModel, ISignUpSta
 
   @Override
   public boolean onBackPressed() {
-    back(ScreenID.MAIN);
+    if(isOnboardingStarted){
+      home();
+    }else{
+      back(ScreenID.MAIN);
+    }
     return true;
   }
 

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

@@ -19,7 +19,7 @@
     android:id="@+id/layout_pager"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginStart="25dp"
+    android:layout_marginStart="18dp"
     android:layout_marginTop="19dp"
     android:layout_marginBottom="16dp"
     app:layout_constraintBottom_toBottomOf="parent"
@@ -30,7 +30,10 @@
       android:id="@+id/image_view_pre_page"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="7dp"
+      android:paddingTop="5dp"
       android:paddingEnd="7dp"
+      android:paddingBottom="5dp"
       app:layout_constraintBottom_toBottomOf="@id/text_view_current_page"
       app:layout_constraintEnd_toStartOf="@+id/text_view_current_page"
       app:layout_constraintHorizontal_bias="0.5"
@@ -43,6 +46,8 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:lineSpacingExtra="4dp"
+      android:paddingTop="5dp"
+      android:paddingBottom="5dp"
       android:textColor="@color/CFFFFFF"
       android:textSize="12dp"
       app:layout_constraintEnd_toStartOf="@+id/slash"
@@ -55,6 +60,8 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:lineSpacingExtra="4dp"
+      android:paddingTop="5dp"
+      android:paddingBottom="5dp"
       android:text="@string/slash"
       android:textColor="@color/CFFFFFF"
       android:textSize="12dp"
@@ -67,6 +74,8 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:lineSpacingExtra="4dp"
+      android:paddingTop="5dp"
+      android:paddingBottom="5dp"
       android:textColor="@color/CFFFFFF"
       android:textSize="12dp"
       app:layout_constraintEnd_toStartOf="@+id/image_view_next_page"
@@ -79,6 +88,9 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:paddingStart="7dp"
+      android:paddingTop="5dp"
+      android:paddingEnd="7dp"
+      android:paddingBottom="5dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_total_page"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toEndOf="@+id/text_view_total_page"
@@ -132,7 +144,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="25dp"
-    android:layout_marginBottom="17dp"
+    android:layout_marginBottom="12dp"
     android:lineSpacingExtra="4dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="12sp"