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

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/series/MainSeriesView.java

@@ -30,7 +30,8 @@ import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
 public class MainSeriesView extends ConstraintLayout implements IMainSeriesContract.View {
 
   private IMainSeriesContract.Presenter presenter;
-  CustomImageTextAdapter customImageTextAdapter;
+  private CustomImageTextAdapter customImageTextAdapter;
+  private RecyclerView recyclerView;
 
   public void setPresenter(IMainSeriesContract.Presenter presenter) {
     this.presenter = presenter;
@@ -56,7 +57,7 @@ public class MainSeriesView extends ConstraintLayout implements IMainSeriesContr
   public void init(Context context, List<CategoryRecommendBean> recommendBeans, int itemCount) {
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     inflater.inflate(R.layout.main_series_view, this);
-    RecyclerView recyclerView = findViewById(R.id.main_category_recycler_view);
+    recyclerView = findViewById(R.id.main_category_recycler_view);
 
 
     recyclerView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false));
@@ -84,4 +85,8 @@ public class MainSeriesView extends ConstraintLayout implements IMainSeriesContr
     presenter = null;
     customImageTextAdapter = null;
   }
+
+  public RecyclerView.LayoutManager getLayoutManager() {
+    return recyclerView.getLayoutManager();
+  }
 }

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

@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.CoordinatorLayout;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
@@ -84,12 +85,16 @@ public abstract class CategoryMainFragment<P extends CategoryMainPresenter> exte
 
     imageViewFilter.setOnClickListener(view -> {
       presenter.onEvent(new Event.Builder(Event.FILTER).build());
+
     });
 
     spinnerOrder.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
       @Override
       public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         arrayAdapter.setSelectedIndex(position);
+        if (null != mainSeriesView.getLayoutManager()) {
+          ((LinearLayoutManager) mainSeriesView.getLayoutManager()).scrollToPositionWithOffset(0, 20);
+        }
         presenter.onEvent(new Event.Builder(Event.ORDER).index(position).build());
       }
 
@@ -173,6 +178,8 @@ public abstract class CategoryMainFragment<P extends CategoryMainPresenter> exte
 
   @Override
   public void setFilterIcon(boolean isFilterApplied) {
+    appBarLayout.setExpanded(true);
     imageViewFilter.setImageResource(isFilterApplied ? R.drawable.icon_filter_success : R.drawable.icon_filter);
+
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainFragment.java

@@ -56,6 +56,8 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   protected ConstraintLayout layoutMyBucketListPreview;
   protected ConstraintLayout layoutGuestCoinArea;
   protected ConstraintLayout layoutMemberCoinArea;
+  protected ConstraintLayout layoutBookmarkArea;
+  protected ConstraintLayout layoutBucketArea;
   protected RecyclerView recyclerViewBucketListPreview;
 
   protected ConstraintLayout layoutMemberHeader;
@@ -101,6 +103,8 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
 
     layoutGuestCoinArea = findViewById(R.id.guest_coin_area);
     layoutMemberCoinArea = findViewById(R.id.member_coin_area);
+    layoutBookmarkArea = findViewById(R.id.layout_bookmark);
+    layoutBucketArea = findViewById(R.id.layoute_bucket_area);
 
     layoutMyBucketListPreview = findViewById(R.id.layout_my_bucket_list_preview);
     recyclerViewBucketListPreview = findViewById(R.id.recycler_view_bucket_preview);
@@ -122,10 +126,11 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     layoutGuestCoinArea.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
 
 
-    findViewById(R.id.text_view_purchase).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_PURCHASE_HISTORY).build());});
-    findViewById(R.id.text_view_coupon).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.COUPON).build());});
-    textCouponCount.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.COUPON).build());});
-    findViewById(R.id.text_view_event).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_EVENT).build());});
+    findViewById(R.id.layout_purchase_area).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_PURCHASE_HISTORY).build());});
+
+    findViewById(R.id.layout_haved_coupon).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.COUPON).build());});
+    //textCouponCount.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.COUPON).build());});
+    findViewById(R.id.layout_event_area).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_EVENT).build());});
 
     textViewConfirmUser.setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.SIGN_UP).build());});
     findViewById(R.id.image_view_coupon_mall).setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.COUPON_MALL).build());});
@@ -173,7 +178,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   @Override
   public void drawBookmarkLabel(int count) {
     textViewBookmarkCount.setText(ResourceUtil.getString(R.string.book_mark_count, count));
-    textViewBookmarkCount.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK_LIST).build()));
+    layoutBookmarkArea.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK_LIST).build()));
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainGuestFragment.java

@@ -41,14 +41,14 @@ public class MyMainGuestFragment extends MyMainFragment {
   protected void setDefaultBookmarkLabel() {
     textViewBookmarkCount.setText(ResourceUtil.getString(R.string.book_mark_count, " "));
     arrowBookmark.setVisibility(View.GONE);
-    textViewBookmarkCount.setOnClickListener(null);
+    layoutBookmarkArea.setOnClickListener(null);
   }
 
   @Override
   protected void setBestBucketLabel(int count) {
     textBucketLabel.setText(ResourceUtil.getString(R.string.bucket_list_count, " "));
     arrowBucket.setVisibility(View.GONE);
-    textBucketLabel.setOnClickListener(null);
+    layoutBucketArea.setOnClickListener(null);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainMemberFragment.java

@@ -40,14 +40,14 @@ public class MyMainMemberFragment extends MyMainFragment {
   @Override
   protected void setDefaultBookmarkLabel() {
     textViewBookmarkCount.setText(ResourceUtil.getString(R.string.book_mark_count, "0"));
-    textViewBookmarkCount.setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.BOOK_MARK_LIST).build());});
+    layoutBookmarkArea.setOnClickListener(view -> { presenter.onEvent(new Event.Builder(Event.BOOK_MARK_LIST).build());});
   }
 
   @Override
   protected void setBestBucketLabel(int count) {
     arrowBucket.setVisibility(View.VISIBLE);
     textBucketLabel.setText(ResourceUtil.getString(R.string.bucket_list_count, count));
-    textBucketLabel.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_BUCKET).build());});
+    layoutBucketArea.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_BUCKET).build());});
   }
 
   @Override

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

@@ -10,26 +10,30 @@
     android:id="@+id/image_view_default_book_mark"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    app:layout_constraintDimensionRatio="V, 311:233"
-    android:scaleType="centerCrop"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
     android:layout_marginStart="25dp"
     android:layout_marginEnd="25dp"
+    android:scaleType="centerCrop"
+    app:layout_constraintDimensionRatio="V, 311:233"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
     tools:src="@drawable/img_bookmark_default"
     />
 
   <TextView
     android:id="@+id/text_view_default_book_mark"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginTop="12dp"
+    android:ellipsize="end"
     android:lineSpacingExtra="6sp"
+    android:singleLine="true"
     android:textColor="@color/C000000"
     android:textSize="14sp"
+    app:layout_constrainedWidth="true"
+    app:layout_constraintEnd_toEndOf="@+id/image_view_default_book_mark"
     app:layout_constraintStart_toStartOf="@+id/image_view_default_book_mark"
     app:layout_constraintTop_toBottomOf="@+id/image_view_default_book_mark"
-    tools:text="@string/book_mark_default_text"
+    tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
     />
 
 </android.support.constraint.ConstraintLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<android.support.v4.widget.NestedScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
@@ -30,6 +30,7 @@
         android:id="@+id/member_coin_area"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
         android:background="?android:attr/selectableItemBackground"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -46,7 +47,7 @@
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintHorizontal_chainStyle="packed"
           app:layout_constraintTop_toTopOf="parent"
-          tools:text="@string/my_coin_detail"/>
+          tools:text="18,744"/>
 
         <ImageView
           android:id="@+id/image_view_coin"
@@ -85,83 +86,100 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/member_coin_area">
 
-        <TextView
-          android:id="@+id/text_view_coupon"
+        <android.support.constraint.ConstraintLayout
+          android:id="@+id/layout_haved_coupon"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginEnd="4dp"
           android:background="?android:attr/selectableItemBackground"
-          android:includeFontPadding="false"
-          android:paddingTop="10dp"
-          android:paddingBottom="10dp"
-          android:text="@string/having_coupon"
-          android:textColor="@color/C999999"
-          android:textSize="12sp"
-          app:layout_constraintEnd_toStartOf="@+id/text_view_coupon_count"
-          app:layout_constraintHorizontal_bias="0.5"
-          app:layout_constraintStart_toStartOf="parent"/>
-
-        <TextView
-          android:id="@+id/text_view_coupon_count"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="21dp"
-          android:background="?android:attr/selectableItemBackground"
-          android:includeFontPadding="false"
-          android:paddingTop="10dp"
-          android:paddingBottom="10dp"
-          android:text="@string/zero"
-          android:textColor="@color/C000000"
-          android:textSize="12sp"
           app:layout_constraintEnd_toStartOf="@+id/divider1"
           app:layout_constraintHorizontal_bias="0.5"
-          app:layout_constraintStart_toEndOf="@+id/text_view_coupon"/>
+          app:layout_constraintStart_toStartOf="parent">
+
+          <TextView
+            android:id="@+id/text_view_coupon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:text="@string/having_coupon"
+            android:textColor="@color/C999999"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toStartOf="@+id/text_view_coupon_count"
+            />
+
+          <TextView
+            android:id="@+id/text_view_coupon_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="21dp"
+            android:includeFontPadding="false"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:text="@string/zero"
+            android:textColor="@color/C000000"
+            android:textSize="12sp"
+
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/text_view_coupon"/>
+        </android.support.constraint.ConstraintLayout>
 
         <View
           android:id="@+id/divider1"
           android:layout_width="1dp"
           android:layout_height="9dp"
+          android:layout_marginStart="26dp"
           android:layout_marginEnd="23dp"
           android:background="@color/CE5E5E5"
           app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toStartOf="@+id/text_view_purchase"
+          app:layout_constraintEnd_toStartOf="@+id/layout_purchase_area"
           app:layout_constraintHorizontal_bias="0.5"
-          app:layout_constraintStart_toEndOf="@+id/text_view_coupon_count"
+          app:layout_constraintStart_toEndOf="@+id/layout_haved_coupon"
           app:layout_constraintTop_toTopOf="parent"/>
 
-        <TextView
-          android:id="@+id/text_view_purchase"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="4dp"
-          android:background="?android:attr/selectableItemBackground"
-          android:includeFontPadding="false"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="10dp"
-          android:paddingBottom="10dp"
-          android:text="@string/buy_and_reserve"
-          android:textColor="@color/C999999"
-          android:textSize="12sp"
-          app:layout_constraintEnd_toStartOf="@+id/text_view_purchase_count"
-          app:layout_constraintHorizontal_bias="0.5"
-          app:layout_constraintStart_toEndOf="@+id/divider1"/>
-
-        <TextView
-          android:id="@+id/text_view_purchase_count"
+        <android.support.constraint.ConstraintLayout
+          android:id="@+id/layout_purchase_area"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginEnd="23dp"
           android:background="?android:attr/selectableItemBackground"
-          android:includeFontPadding="false"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="10dp"
-          android:paddingBottom="10dp"
-          android:text="@string/zero"
-          android:textColor="@color/C000000"
-          android:textSize="12sp"
           app:layout_constraintEnd_toStartOf="@+id/divider2"
-          app:layout_constraintHorizontal_bias="0.5"
-          app:layout_constraintStart_toEndOf="@+id/text_view_purchase"/>
+          app:layout_constraintStart_toEndOf="@+id/divider1">
+
+          <TextView
+            android:id="@+id/text_view_purchase"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="4sp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:text="@string/buy_and_reserve"
+            android:textColor="@color/C999999"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toStartOf="@+id/text_view_purchase_count"
+            app:layout_constraintHorizontal_bias="0.5"
+            />
+
+          <TextView
+            android:id="@+id/text_view_purchase_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="23dp"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="4sp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:text="@string/zero"
+            android:textColor="@color/C000000"
+            android:textSize="12sp"
+
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/text_view_purchase"/>
+        </android.support.constraint.ConstraintLayout>
 
         <View
           android:id="@+id/divider2"
@@ -170,43 +188,49 @@
           android:layout_marginEnd="32dp"
           android:background="@color/CE5E5E5"
           app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toStartOf="@+id/text_view_event"
+          app:layout_constraintEnd_toStartOf="@+id/layout_event_area"
           app:layout_constraintHorizontal_bias="0.5"
-          app:layout_constraintStart_toEndOf="@+id/text_view_purchase_count"
+          app:layout_constraintStart_toEndOf="@+id/layout_purchase_area"
           app:layout_constraintTop_toTopOf="parent"/>
 
-        <TextView
-          android:id="@+id/text_view_event"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="4dp"
-          android:background="?android:attr/selectableItemBackground"
-          android:includeFontPadding="false"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="10dp"
-          android:paddingBottom="10dp"
-          android:text="@string/menu_category2"
-          android:textColor="@color/C999999"
-          android:textSize="12sp"
-          app:layout_constraintEnd_toStartOf="@+id/text_view_event_count"
-          app:layout_constraintHorizontal_bias="0.5"
-          app:layout_constraintStart_toEndOf="@+id/divider2"/>
-
-        <TextView
-          android:id="@+id/text_view_event_count"
+        <android.support.constraint.ConstraintLayout
+          android:id="@+id/layout_event_area"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:background="?android:attr/selectableItemBackground"
-          android:includeFontPadding="false"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="10dp"
-          android:paddingBottom="10dp"
-          android:text="@string/zero"
-          android:textColor="@color/C000000"
-          android:textSize="12sp"
           app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintHorizontal_bias="0.5"
-          app:layout_constraintStart_toEndOf="@+id/text_view_event"/>
+          app:layout_constraintStart_toEndOf="@+id/divider2"
+          >
+
+          <TextView
+            android:id="@+id/text_view_event"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="4sp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:text="@string/menu_category2"
+            android:textColor="@color/C999999"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toStartOf="@+id/text_view_event_count"
+            />
+
+          <TextView
+            android:id="@+id/text_view_event_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:includeFontPadding="false"
+            android:lineSpacingExtra="4sp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:text="@string/zero"
+            android:textColor="@color/C000000"
+            android:textSize="12sp"
+            app:layout_constraintStart_toEndOf="@+id/text_view_event"/>
+        </android.support.constraint.ConstraintLayout>
       </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 
@@ -221,7 +245,7 @@
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      tools:visibility="visible">
+      tools:visibility="gone">
 
       <android.support.constraint.ConstraintLayout
         android:id="@+id/guest_coin_area"
@@ -409,36 +433,40 @@
       app:layout_constraintStart_toStartOf="@+id/third_layout"
       app:layout_constraintTop_toBottomOf="@+id/third_layout">
 
-      <TextView
-        android:id="@+id/text_view_book_mark"
+      <android.support.constraint.ConstraintLayout
+        android:id="@+id/layout_bookmark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="43dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="0dp"
-        android:paddingStart="10dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        android:textColor="@color/C000000"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        tools:text="@string/book_mark_count"/>
+        android:background="?android:attr/selectableItemBackground">
 
-      <ImageView
-        android:id="@+id/image_view_book_mark_arrow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingStart="4dp"
-        android:paddingTop="10dp"
-        android:paddingEnd="6dp"
-        android:paddingBottom="10dp"
-        app:layout_constraintBottom_toBottomOf="@+id/text_view_book_mark"
-        app:layout_constraintStart_toEndOf="@+id/text_view_book_mark"
-        app:layout_constraintTop_toTopOf="@+id/text_view_book_mark"
-        app:srcCompat="@drawable/icon_book_mark_arrow"/>
+        <TextView
+          android:id="@+id/text_view_book_mark"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="43dp"
+          android:includeFontPadding="false"
+          android:lineSpacingExtra="0dp"
+          android:paddingStart="10dp"
+          android:paddingTop="10dp"
+          android:paddingBottom="10dp"
+          android:textColor="@color/C000000"
+          android:textSize="15sp"
+          android:textStyle="bold"
+          tools:text="@string/book_mark_count"/>
 
+        <ImageView
+          android:id="@+id/image_view_book_mark_arrow"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:paddingStart="4dp"
+          android:paddingTop="10dp"
+          android:paddingEnd="6dp"
+          android:paddingBottom="10dp"
+          app:layout_constraintBottom_toBottomOf="@+id/text_view_book_mark"
+          app:layout_constraintStart_toEndOf="@+id/text_view_book_mark"
+          app:layout_constraintTop_toTopOf="@+id/text_view_book_mark"
+          app:srcCompat="@drawable/icon_book_mark_arrow"/>
+      </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 
     <android.support.constraint.ConstraintLayout
@@ -473,36 +501,42 @@
       app:layout_constraintTop_toBottomOf="@+id/bookmark_container"
       tools:visibility="visible">
 
-      <TextView
-        android:id="@+id/text_view_exists_bucket_list"
+      <android.support.constraint.ConstraintLayout
+        android:id="@+id/layoute_bucket_area"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="0dp"
-        android:paddingStart="10dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        android:textColor="@color/C000000"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        tools:text="@string/bucket_list_count"/>
+        android:background="?android:attr/selectableItemBackground">
 
-      <ImageView
-        android:id="@+id/image_view_arrow_bucket_list"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingStart="4dp"
-        android:paddingTop="10dp"
-        android:paddingEnd="6dp"
-        android:paddingBottom="10dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/text_view_exists_bucket_list"
-        app:layout_constraintStart_toEndOf="@+id/text_view_exists_bucket_list"
-        app:layout_constraintTop_toTopOf="@+id/text_view_exists_bucket_list"
-        app:srcCompat="@drawable/icon_book_mark_arrow"/>
+        <TextView
+          android:id="@+id/text_view_exists_bucket_list"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="15dp"
+          android:includeFontPadding="false"
+          android:lineSpacingExtra="0dp"
+          android:paddingStart="10dp"
+          android:paddingTop="10dp"
+          android:paddingBottom="10dp"
+          android:textColor="@color/C000000"
+          android:textSize="15sp"
+          android:textStyle="bold"
+          tools:text="@string/bucket_list_count"/>
+
+        <ImageView
+          android:id="@+id/image_view_arrow_bucket_list"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:paddingStart="4dp"
+          android:paddingTop="10dp"
+          android:paddingEnd="6dp"
+          android:paddingBottom="10dp"
+          android:visibility="gone"
+          app:layout_constraintBottom_toBottomOf="@+id/text_view_exists_bucket_list"
+          app:layout_constraintStart_toEndOf="@+id/text_view_exists_bucket_list"
+          app:layout_constraintTop_toTopOf="@+id/text_view_exists_bucket_list"
+          app:srcCompat="@drawable/icon_book_mark_arrow"
+          tools:visibility="visible"/>
+      </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 
     <android.support.constraint.ConstraintLayout
@@ -586,4 +620,4 @@
         android:src="@drawable/banner_mymain"/>
     </android.support.constraint.ConstraintLayout>
   </android.support.constraint.ConstraintLayout>
-</ScrollView>
+</android.support.v4.widget.NestedScrollView>

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

@@ -472,7 +472,7 @@
   <string name="overview">전체보기</string>
   <string name="show_contents">%s개 콘텐츠 보기</string>
 
-  <string name="filter_result_nothing">콘텐츠를 준비하고 있습니다.
\n다른 필터로 적용해주세요.</string>
+  <string name="filter_result_nothing">콘텐츠를 준비하고 있습니다.\n다른 필터로 적용해주세요.</string>
   <string name="select_foreign">해외 선택</string>
   <string name="south_east_asia">동남아시아/대만</string>
   <string name="japan">일본</string>