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

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

@@ -4,8 +4,6 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.constraint.ConstraintLayout;
-import android.support.v4.widget.NestedScrollView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -42,9 +40,6 @@ public class BucketListDetailFragment extends FragmentBase<BucketListDetailPrese
   private RecyclerView recyclerViewBucketListDetail;
   private BucketListDetailAdapter adapter;
 
-  private NestedScrollView scrollLayout;
-  private ConstraintLayout containerLayout;
-
   private TextView textTagTitle;
   private ViewGroup layoutTagContents;
 
@@ -61,13 +56,12 @@ public class BucketListDetailFragment extends FragmentBase<BucketListDetailPrese
 
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
-    findViewById(R.id.layout_bucket_detail_header).setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.UPDATE).build()));
 
-    scrollLayout = findViewById(R.id.scroll_layout);
-    containerLayout = findViewById(R.id.container_layout);
     textBucketTitle = findViewById(R.id.text_view_select_bucket);
     imageBucket = findViewById(R.id.image_background);
     imageChecker = findViewById(R.id.image_checker);
+
+    imageBucket.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.UPDATE).build()));
   }
 
   @Override
@@ -139,7 +133,6 @@ public class BucketListDetailFragment extends FragmentBase<BucketListDetailPrese
         presenter.onEvent(event);
       });
       recyclerViewBucketListDetail.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
-      recyclerViewBucketListDetail.setNestedScrollingEnabled(false);
       recyclerViewBucketListDetail.addItemDecoration(new RecyclerView.ItemDecoration() {
         @Override
         public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
@@ -153,38 +146,6 @@ public class BucketListDetailFragment extends FragmentBase<BucketListDetailPrese
       // update
       adapter.update(contentsBeans);
     }
-
-    // TODO: 스크롤 컨트롤 해야됨 
-//    scrollLayout.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
-//      @Override
-//      public void onScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
-//
-//        float imageY = imageBucket.getHeight();
-//
-//        if(scrollY > oldScrollY){
-//          //scroll down
-//          if(scrollY > imageY / 3){
-//            imageBucket.setY(imageY / 3);
-//            scrollLayout.setNestedScrollingEnabled(false);
-//            recyclerViewBucketListDetail.setNestedScrollingEnabled(true);
-//          }
-//
-//        }
-//
-//        if (scrollY < oldScrollY) {
-//          Log.i("APP#  BucketListDetailFragment | onScrollChange", "Scroll UP");
-//          scrollLayout.setNestedScrollingEnabled(true);
-//          recyclerViewBucketListDetail.setNestedScrollingEnabled(false);
-//        }
-//        if(scrollY == 0){
-//          Log.e("APP#  BucketListDetailFragment | onScrollChange", "|" + "Scroll Top");
-//          //imageBucket.setY(imageY);
-//        }
-//        if (scrollY == ( v.getChildAt(0).getMeasuredHeight() - v.getMeasuredHeight() )) {
-//          Log.e("APP#  BucketListDetailFragment | onScrollChange", "|" + "Bottom scroll");
-//        }
-//      }
-//    });
   }
 
   @Override

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

@@ -103,6 +103,7 @@ public class BucketListDetailPresenter extends Presenter<BucketListDetailModel,
         /*
 
          */
+        Log.e("APP#  BucketListDetailPresenter | onEventInternal", "|" + "in");
         DeliveryHelper helper = getHelper(DeliveryHelper.class);
         helper.setPackaging(model.getBucketMyBean());
         go(ScreenID.BUCKET_MY_EDIT);

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

@@ -1,38 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView
- android:id="@+id/scroll_layout"
+<android.support.design.widget.CoordinatorLayout
   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"
+  android:id="@+id/scroll_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <android.support.constraint.ConstraintLayout
-    android:id="@+id/container_layout"
+  <!--header영역-->
+  <android.support.design.widget.AppBarLayout
+    android:id="@+id/app_bar_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
-    <android.support.constraint.ConstraintLayout
-      android:id="@+id/layout_bucket_detail_header"
-      android:layout_width="0dp"
-      android:layout_height="0dp"
+    <android.support.design.widget.CollapsingToolbarLayout
+      android:id="@+id/collapsing_tool_bar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
       app:layout_constraintDimensionRatio="H,2:1"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHeight_max="250dp"
-      app:layout_constraintStart_toStartOf="parent">
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
 
       <ImageView
         android:id="@+id/image_background"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="208dp"
         android:scaleType="centerCrop"
+        app:layout_collapseMode="parallax"
         tools:src="@drawable/img_bestbucket_banner_1"/>
 
       <android.support.constraint.ConstraintLayout
         android:id="@+id/layout_select_bucket"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:paddingStart="80dp"
         android:paddingEnd="80dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -72,15 +76,28 @@
           app:layout_constraintTop_toTopOf="parent"
           tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"/>
       </android.support.constraint.ConstraintLayout>
-    </android.support.constraint.ConstraintLayout>
+
+      <android.support.v7.widget.Toolbar
+        android:id="@+id/flexible.example.toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="137dp"
+        android:background="@null"
+        app:layout_collapseMode="pin"
+        app:layout_scrollFlags="scroll|enterAlways"
+        android:elevation="0dp"
+        app:elevation="0dp"
+        />
+
+    </android.support.design.widget.CollapsingToolbarLayout>
 
     <LinearLayout
       android:id="@+id/layout_tags"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:layout_gravity="bottom"
+      android:background="@color/CFFFFFF"
       android:orientation="vertical"
-      app:layout_constraintTop_toBottomOf="@+id/layout_bucket_detail_header"
-      >
+      app:layout_scrollFlags="exitUntilCollapsed">
 
       <LinearLayout
         android:layout_width="match_parent"
@@ -103,8 +120,7 @@
 
       <HorizontalScrollView
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scrollbars="">
+        android:layout_height="wrap_content">
 
         <LinearLayout
           android:id="@+id/layout_contents"
@@ -117,16 +133,13 @@
         </LinearLayout>
       </HorizontalScrollView>
     </LinearLayout>
+  </android.support.design.widget.AppBarLayout>
 
-    <android.support.v7.widget.RecyclerView
-      android:id="@+id/recycler_view_bucket_list_detail"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingTop="25dp"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/layout_tags"
-      />
-  </android.support.constraint.ConstraintLayout>
-</android.support.v4.widget.NestedScrollView>
+
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/recycler_view_bucket_list_detail"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="25dp"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+</android.support.design.widget.CoordinatorLayout>

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

@@ -374,14 +374,14 @@
   <string name="contents_category1"><b>주말에</b> 뭐하지</string>
   <string name="contents_category1_action_bar_title">주말에 뭐하지</string>
   <string name="contents_category2_action_bar_title">여행 어디가지</string>
-  <string name="contents_category3_action_bar_title">취미생활 뭐있지</string>
+  <string name="contents_category3_action_bar_title">취미생활 뭐하지</string>
   <string name="contents_category4_action_bar_title">트렌드 이슈 뭐있지</string>
   <string name="contents_category5_action_bar_title">This Week</string>
 
 
   <string name="contents_category1_tab_title">주말에\n뭐하지</string>
   <string name="contents_category2_tab_title">여행\n어디가지</string>
-  <string name="contents_category3_tab_title">취미생활\n뭐있지</string>
+  <string name="contents_category3_tab_title">취미생활\n뭐하지</string>
   <string name="contents_category4_tab_title">트렌드이슈\n뭐있지</string>
   <string name="contents_category5_tab_title">This\nWeek</string>