From 6dc20ce5127195646824612f65b0e5186c32f721 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 20 Jan 2020 23:14:02 +0100
Subject: [PATCH] Much better

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../nextcloud/talk/activities/MainActivity.kt | 10 ++++++++
 .../talk/controllers/ContactsController.kt    |  2 +-
 .../ConversationsListView.kt                  | 10 --------
 app/src/main/res/layout/activity_main.xml     | 23 ++++++++++++++----
 .../res/layout/conversations_list_view.xml    | 24 +++++++------------
 5 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index 501593d06..b3c6e23cc 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -100,6 +100,16 @@ class MainActivity : BaseActivity(), ActionBarProvider {
         }
     }
 
+    @OnClick(R.id.floatingActionButton)
+    fun onFloatingActionButtonClick() {
+        val bundle = Bundle()
+        bundle.putBoolean(BundleKeys.KEY_NEW_CONVERSATION, true)
+        router?.pushController(
+                RouterTransaction.with(ContactsController(bundle))
+                        .pushChangeHandler(HorizontalChangeHandler())
+                        .popChangeHandler(HorizontalChangeHandler()))
+    }
+
     override fun onStart() {
         super.onStart()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt
index 2c02a065d..1f75c9d9a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt
@@ -134,7 +134,7 @@ class ContactsController : BaseController,
 
     @JvmField
     @BindView(R.id.generic_rv_layout)
-    var genericRvLayout: FrameLayout? = null
+    var genericRvLayout: CoordinatorLayout? = null
 
     private var credentials: String? = null
     private var currentUser: UserNgEntity? = null
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
index 33adfc567..9d7390ca1 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
@@ -138,16 +138,6 @@ class ConversationsListView : BaseView() {
         return view
     }
 
-    @OnClick(R.id.floatingActionButton)
-    fun onFloatingActionButtonClick() {
-        val bundle = Bundle()
-        bundle.putBoolean(BundleKeys.KEY_NEW_CONVERSATION, true)
-        router?.pushController(
-                RouterTransaction.with(ContactsController(bundle))
-                        .pushChangeHandler(HorizontalChangeHandler())
-                        .popChangeHandler(HorizontalChangeHandler()))
-    }
-
     override fun onChangeStarted(changeHandler: ControllerChangeHandler, changeType: ControllerChangeType) {
         actionBar?.setIcon(null)
         super.onChangeStarted(changeHandler, changeType)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dffa0a1f3..c9e44d8ee 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,23 +24,24 @@
     android:id="@+id/mainActivityCoordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.MainActivity"
     android:animateLayoutChanges="true"
-    android:fitsSystemWindows="true">
+    tools:context=".activities.MainActivity">
+
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="@color/transparent"
+        android:elevation="0dp"
         app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
             android:background="@color/transparent"
+            android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
             app:contentInsetStartWithNavigation="0dp"
             app:layout_scrollFlags="scroll|enterAlways|snap"
             app:popupTheme="@style/appActionBarPopupMenu">
@@ -49,9 +50,21 @@
         </com.google.android.material.appbar.MaterialToolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
+
+    <com.nextcloud.talk.newarch.utils.ChangeHandlerCoordinatorLayout
         android:id="@+id/controller_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        app:backgroundTint="@color/colorPrimary"
+        app:srcCompat="@drawable/ic_add_white_24px"
+        app:tint="@color/white" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/conversations_list_view.xml b/app/src/main/res/layout/conversations_list_view.xml
index 5db9bf4bd..554266f48 100644
--- a/app/src/main/res/layout/conversations_list_view.xml
+++ b/app/src/main/res/layout/conversations_list_view.xml
@@ -18,30 +18,22 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.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/generic_rv_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:animateLayoutChanges="true">
+    android:clipToPadding="false"
+    android:animateLayoutChanges="true"
+    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:listitem="@layout/rv_item_conversation_with_last_message" />
+            tools:listitem="@layout/rv_item_conversation_with_last_message"
+            android:paddingBottom="80dp"
+            android:clipToPadding="false"/>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/floatingActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="16dp"
-            android:nestedScrollingEnabled="true"
-            android:paddingBottom="16dp"
-            app:backgroundTint="@color/colorPrimary"
-            app:srcCompat="@drawable/ic_add_white_24px"
-            app:tint="@color/white" />
-
-</FrameLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>