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

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsFragment.java

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

@@ -3,10 +3,12 @@ package kr.co.zumo.app.lifeplus.view.custom.contents;
 import android.content.Context;
 import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.LinearSmoothScroller;
 import android.support.v7.widget.PagerSnapHelper;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SnapHelper;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -197,7 +199,8 @@ public class CustomListicleImageView extends ConstraintLayout {
     if (contentsLength > 1) {
       layoutPager.setVisibility(View.VISIBLE);
       textViewCurrentPage.setText("1");
-      textViewTotalPage.setText(String.valueOf(contentsLength));;
+      textViewTotalPage.setText(String.valueOf(contentsLength));
+      ;
     }
     else {
       layoutPager.setVisibility(View.INVISIBLE);
@@ -215,9 +218,20 @@ public class CustomListicleImageView extends ConstraintLayout {
       protected int getExtraLayoutSpace(RecyclerView.State state) {
         return 1;
       }
+
+      @Override
+      public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state, int position) {
+        final LinearSmoothScroller linearSmoothScroller = new LinearSmoothScroller(recyclerView.getContext()) {
+          @Override
+          protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {
+            return 100f / displayMetrics.densityDpi;
+          }
+        };
+        linearSmoothScroller.setTargetPosition(position);
+        startSmoothScroll(linearSmoothScroller);
+      }
     };
     recyclerView.setLayoutManager(linearLayoutManager);
-
     adapter = new CustomListicleImageViewAdapter(context, inflater, contentsDetailImageBeans, event -> {
       if (null != listener) {
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/GridItemDecoration.java

@@ -39,8 +39,8 @@ public class GridItemDecoration extends RecyclerView.ItemDecoration {
     if (itemViewType == BANNER_VIEW_TYPE) {
       outRect.left = itemOffset;
       outRect.right = itemOffset;
-      outRect.top = ResourceUtil.dpToPx(35);
-      outRect.bottom = ResourceUtil.dpToPx(35);
+      outRect.top = ResourceUtil.dpToPx(18);
+      outRect.bottom = ResourceUtil.dpToPx(18);
     }
     else {
       outRect.set(itemOffset, itemOffset, itemOffset, itemOffset);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type1/FirstCategoryMainBannerViewHolder.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.category.type1;
 
-import android.util.Log;
 import android.view.View;
 
 import kr.co.zumo.app.R;
@@ -36,7 +35,6 @@ public class FirstCategoryMainBannerViewHolder extends CategoryMainViewHolder<Ca
     if (null != bean) {
       mainBannerViewFirstCategory = itemView.findViewById(R.id.main_banner_view_first_category);
       mainBannerViewFirstCategory.init(itemView.getContext(), bean.getBannerBeans(), event -> {
-        Log.i("APP# FirstCategoryMainLinearViewHolder | onEvent", "|" + event);
         if (null != listener) {
           listener.onEvent(event);
         }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type3/ThirdCategoryMainBannerViewHolder.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.category.type3;
 
-import android.util.Log;
 import android.view.View;
 
 import kr.co.zumo.app.R;
@@ -34,10 +33,8 @@ public class ThirdCategoryMainBannerViewHolder extends CategoryMainViewHolder<Ca
   @Override
   public void attach() {
     if (null != bean) {
-      Log.i("APP# ThirdCategoryMainLinearViewHolder | bind", "|" + "들어옴 " + bean.getBannerBeans().size());
       mainBannerViewFirstCategory = itemView.findViewById(R.id.main_banner_view_first_category);
       mainBannerViewFirstCategory.init(itemView.getContext(), bean.getBannerBeans(), event -> {
-        Log.i("APP# FirstCategoryMainLinearViewHolder | onEvent", "|" + event);
         if (null != listener) {
           listener.onEvent(event);
         }

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

@@ -7,9 +7,11 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.LinearSmoothScroller;
 import android.support.v7.widget.PagerSnapHelper;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SnapHelper;
+import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -156,6 +158,7 @@ public class ContentsFragment extends FragmentBase<ContentsPresenter> implements
 
   @Override
   public void setSmoothScrollToPosition(int i) {
+
     recyclerViewContentsDetail.smoothScrollToPosition(i);
   }
 
@@ -180,7 +183,17 @@ public class ContentsFragment extends FragmentBase<ContentsPresenter> implements
         return 1;
       }
 
-
+      @Override
+      public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state, int position) {
+        final LinearSmoothScroller linearSmoothScroller = new LinearSmoothScroller(recyclerView.getContext()) {
+          @Override
+          protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {
+            return 60f / displayMetrics.densityDpi;
+          }
+        };
+        linearSmoothScroller.setTargetPosition(position);
+        startSmoothScroll(linearSmoothScroller);
+      }
     };
     recyclerViewContentsDetail.setLayoutManager(layoutManager);
 

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

@@ -7,16 +7,16 @@
   android:layout_height="match_parent">
 
   <kr.co.zumo.app.lifeplus.view.custom.contents.CustomListicleImageView
-    tools:background="@drawable/b"
     android:id="@+id/custom_listicle_image_view"
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    tools:layout_marginTop="100dp"
-    app:layout_constraintDimensionRatio="V, 1:1"
     app:layout_constraintBottom_toTopOf="@+id/scroll_view"
+    app:layout_constraintDimensionRatio="V, 1:1"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    app:layout_constraintTop_toTopOf="parent"
+    tools:background="@drawable/b"
+    tools:layout_marginTop="100dp"/>
 
 
   <ScrollView
@@ -24,13 +24,13 @@
     style="@style/ContentsScrollBars"
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    app:layout_constraintDimensionRatio="V, 1:1"
     android:layout_marginStart="25dp"
     android:layout_marginTop="25dp"
     android:layout_marginEnd="25dp"
     android:layout_marginBottom="25dp"
     android:orientation="vertical"
     app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintDimensionRatio="V, 1:1"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/custom_listicle_image_view">
@@ -49,44 +49,50 @@
     android:id="@+id/layout_more_info"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="24dp"
-    android:background="@drawable/rectangle_black_more_info"
-    android:paddingStart="13dp"
-    android:paddingTop="5dp"
-    android:paddingEnd="13dp"
-    android:paddingBottom="5dp"
-    android:visibility="visible"
+    android:layout_marginBottom="14dp"
+    android:padding="10dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    tools:visibility="visible">
-
-    <ImageView
+    app:layout_constraintStart_toStartOf="parent">
 
-      android:id="@+id/more_info_image"
+    <android.support.constraint.ConstraintLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toStartOf="@+id/more_info_text"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/icon_info_arrow"
-      />
+      android:background="@drawable/rectangle_black_more_info"
+      android:paddingStart="13dp"
+      android:paddingTop="5dp"
+      android:paddingEnd="13dp"
+      android:paddingBottom="5dp"
+      android:visibility="visible"
+      tools:visibility="visible">
 
-    <TextView
-      android:id="@+id/more_info_text"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="2dp"
-      android:gravity="center_horizontal"
-      android:lineSpacingExtra="3.5sp"
-      android:text="@string/more_info"
-      android:textColor="@color/CFFFFFF"
-      android:textSize="12sp"
-      android:textStyle="bold"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toEndOf="@+id/more_info_image"
-      />
+      <ImageView
+
+        android:id="@+id/more_info_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/more_info_text"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_info_arrow"
+        />
+
+      <TextView
+        android:id="@+id/more_info_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dp"
+        android:gravity="center_horizontal"
+        android:lineSpacingExtra="3.5sp"
+        android:text="@string/more_info"
+        android:textColor="@color/CFFFFFF"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/more_info_image"
+        />
 
+    </android.support.constraint.ConstraintLayout>
   </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

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

@@ -8,6 +8,6 @@
 <kr.co.zumo.app.lifeplus.view.custom.category.banner.MainBannerView
   android:id="@+id/main_banner_view_first_category"
   android:layout_width="match_parent"
-  android:layout_height="122dp"/>
+  android:layout_height="150dp"/>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -2,7 +2,9 @@
 <android.support.constraint.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content">
+  android:layout_height="wrap_content"
+  android:paddingTop="3dp"
+  android:paddingBottom="3dp">
 
 
   <kr.co.zumo.app.lifeplus.view.custom.category.banner.MainBannerView

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

@@ -2,7 +2,9 @@
 <android.support.constraint.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content">
+  android:layout_height="wrap_content"
+  android:paddingTop="3dp"
+  android:paddingBottom="3dp">
 
 
   <kr.co.zumo.app.lifeplus.view.custom.category.banner.MainBannerView