recycle

2 files changed, 21 insertions, 17 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
index 7c7928f2..2a8dee26 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
@@ -69,7 +69,6 @@ class UserDetailDialogFragment : StackableDialogFragment() {
         val lm = LinearLayoutManager(activity)
         lm.orientation = LinearLayoutManager.VERTICAL
         user_timeline.layoutManager = lm
-        user_timeline.isNestedScrollingEnabled = false
         val adapter = UserTimelineAdapter()
         user_timeline.adapter = adapter
 
diff --git a/app/src/main/res/layout/dialog_user_detail.xml b/app/src/main/res/layout/dialog_user_detail.xml
index a6369987..324e3f5b 100644
--- a/app/src/main/res/layout/dialog_user_detail.xml
+++ b/app/src/main/res/layout/dialog_user_detail.xml
@@ -1,21 +1,18 @@
-<com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout
+<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/user_detail_refresh_layout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:srl_direction="both">
+    android:layout_height="wrap_content">
 
-    <android.support.v4.widget.NestedScrollView
+    <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scrollbars="vertical">
+        android:layout_height="wrap_content">
 
-        <LinearLayout
+        <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <android.support.constraint.ConstraintLayout
                 android:layout_width="match_parent"
@@ -273,11 +270,19 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/toggle_follow" />
             </android.support.constraint.ConstraintLayout>
+        </android.support.design.widget.CollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/user_timeline"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout>
+    <com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout
+        android:id="@+id/user_detail_refresh_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:srl_direction="both"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/user_timeline"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout>
+</android.support.design.widget.CoordinatorLayout>