From 47ad0038ccb8fdb77c2423d4ca58e6ea7a1c1cad Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 28 Jan 2020 12:12:01 +0100
Subject: [PATCH] Simplification of new toolbar

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../java/com/nextcloud/talk/activities/MainActivity.kt |  2 --
 .../nextcloud/talk/controllers/base/BaseController.kt  |  7 +------
 app/src/main/res/layout/activity_main.xml              | 10 ++++++----
 app/src/main/res/layout/search_layout.xml              |  6 ++++--
 4 files changed, 11 insertions(+), 14 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 9b320d82a..adcda22ab 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -67,9 +67,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         setContentView(R.layout.activity_main)
-
         ButterKnife.bind(this)
         setSupportActionBar(toolbar)
 
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
index fa14f4986..9700f27e6 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
@@ -110,18 +110,13 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
             if (it is MainActivity) {
                 it.searchCardView?.isVisible = value
                 it.floatingActionButton?.isVisible = value
-
-                val layoutParams = it.toolbar.layoutParams as AppBarLayout.LayoutParams
+                it.toolbar.isVisible = !value
 
                 if (value) {
-                    layoutParams.scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
                     it.appBar?.setBackgroundResource(R.color.transparent)
                 } else {
-                    layoutParams.scrollFlags = 0
                     it.appBar?.setBackgroundResource(R.color.colorPrimary)
                 }
-
-                it.toolbar.layoutParams = layoutParams
             }
         }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2339bcb8a..2710a3704 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -34,8 +34,13 @@
         android:layout_height="56dp"
         android:background="@color/transparent"
         android:elevation="0dp"
+        android:windowContentOverlay="@null"
         app:elevation="0dp">
 
+        <include
+            layout="@layout/search_layout"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
@@ -43,11 +48,8 @@
             android:background="@color/transparent"
             android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
             app:contentInsetStartWithNavigation="0dp"
-            app:layout_scrollFlags="scroll|enterAlways|snap"
-            app:popupTheme="@style/appActionBarPopupMenu">
+            app:popupTheme="@style/appActionBarPopupMenu" />
 
-            <include layout="@layout/search_layout" />
-        </com.google.android.material.appbar.MaterialToolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
 
diff --git a/app/src/main/res/layout/search_layout.xml b/app/src/main/res/layout/search_layout.xml
index d6ef1caf7..97b5795a6 100644
--- a/app/src/main/res/layout/search_layout.xml
+++ b/app/src/main/res/layout/search_layout.xml
@@ -26,7 +26,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipChildren="false"
-    android:clipToPadding="false">
+    android:clipToPadding="false"
+    >
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/searchCardView"
@@ -39,7 +40,8 @@
         app:cardBackgroundColor="@color/transparent"
         android:elevation="2dp"
         app:cardElevation="2dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        app:layout_scrollFlags="scroll|enterAlways|snap">
 
         <RelativeLayout
             android:layout_width="match_parent"