From ea758940ded9f8604d327575454bad5a93070ddf Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 16 Jan 2020 00:54:01 +0100
Subject: [PATCH] Good work on search box

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/src/main/res/layout/activity_main.xml     | 12 ++--
 .../res/layout/conversations_list_view.xml    |  1 -
 app/src/main/res/layout/search_layout.xml     | 63 +++++++++----------
 3 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 157a97ad1..15fa8ee5d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,25 +25,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".activities.MainActivity"
-    android:animateLayoutChanges="true">
+    android:animateLayoutChanges="true"
+    android:background="@color/transparent">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
+        android:layout_height="48dp"
         android:background="@color/transparent"
         app:elevation="0dp">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_height="match_parent"
             android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
-            app:contentInsetEnd="12dp"
-            app:contentInsetStart="12dp"
+            android:background="@color/transparent"
             app:contentInsetStartWithNavigation="0dp"
-            app:elevation="0dp"
             app:layout_scrollFlags="scroll|enterAlways|snap"
             app:popupTheme="@style/appActionBarPopupMenu">
 
diff --git a/app/src/main/res/layout/conversations_list_view.xml b/app/src/main/res/layout/conversations_list_view.xml
index 23b34548b..c2c7b16dc 100644
--- a/app/src/main/res/layout/conversations_list_view.xml
+++ b/app/src/main/res/layout/conversations_list_view.xml
@@ -40,7 +40,6 @@
             android:layout_height="match_parent"
             tools:listitem="@layout/rv_item_conversation_with_last_message" />
 
-
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/search_layout.xml b/app/src/main/res/layout/search_layout.xml
index 72241bca6..1d1109937 100644
--- a/app/src/main/res/layout/search_layout.xml
+++ b/app/src/main/res/layout/search_layout.xml
@@ -22,31 +22,28 @@
 
 <merge 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/searchCardView"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_centerHorizontal="true"
+        android:layout_height="match_parent"
         android:layout_marginHorizontal="12dp"
+        app:contentPaddingLeft="16dp"
+        app:contentPaddingRight="16dp"
         android:background="@color/transparent"
-        android:clickable="true"
-        android:elevation="0dp"
-        android:focusable="true"
         app:cardBackgroundColor="@color/transparent"
-        app:cardCornerRadius="4dp"
-        app:cardElevation="0dp"
-        app:cardUseCompatPadding="false"
-        tools:cardCornerRadius="4dp"
-        tools:cardElevation="0dp"
-        >
+        android:elevation="4dp"
+        app:cardElevation="4dp"
+        android:visibility="gone">
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
-            android:clipToPadding="true">
+            android:layout_height="match_parent">
 
             <FrameLayout
                 android:id="@+id/leftContainer"
@@ -54,7 +51,6 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="16dp"
                 android:visibility="gone">
 
                 <ImageButton
@@ -85,16 +81,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignWithParentIfMissing="true"
+                android:layout_centerVertical="true"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_toStartOf="@id/rightContainer"
                 android:layout_toEndOf="@id/leftContainer"
                 android:background="@null"
-                android:layout_centerVertical="true"
                 android:imeOptions="actionSearch|flagNoExtractUi"
                 android:inputType="textNoSuggestions"
                 android:lines="1"
                 android:maxLines="1"
+                android:singleLine="true"
                 android:textCursorDrawable="@null"
                 android:textSize="16sp"
                 tools:hint="Search" />
@@ -105,8 +102,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="16dp">
+                android:layout_centerVertical="true">
 
                 <ImageView
                     android:id="@+id/clearButton"
@@ -122,18 +118,19 @@
                     tools:src="@tools:sample/avatars[0]" />
 
                 <ImageView
-                android:id="@+id/settingsButton"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_gravity="center"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_settings_white_24dp"
-                android:transitionName="userAvatar.transitionTag"
-                android:visibility="visible"
-                tools:src="@tools:sample/avatars[0]" />
+                    android:id="@+id/settingsButton"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_gravity="center"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_settings_white_24dp"
+                    android:transitionName="userAvatar.transitionTag"
+                    android:visibility="visible"
+                    tools:src="@tools:sample/avatars[0]" />
 
-        </FrameLayout>
-    </RelativeLayout>
+            </FrameLayout>
+        </RelativeLayout>
 
-</androidx.cardview.widget.CardView></merge>
\ No newline at end of file
+    </com.google.android.material.card.MaterialCardView>
+</merge>
\ No newline at end of file