Merge pull request #5380 from nextcloud/style/noid/searchBar

Optimize searchbar and make it M3 styled

Author: mahibi

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -269,7 +269,7 @@ class ConversationsListActivity :
         setContentView(binding.root)
         initSystemBars()
         viewThemeUtils.material.themeSearchCardView(binding.searchToolbar)
-        viewThemeUtils.material.colorMaterialButtonContent(binding.menuButton, ColorRole.ON_SURFACE)
+        viewThemeUtils.material.colorMaterialButtonContent(binding.menuButton, ColorRole.ON_SURFACE_VARIANT)
         viewThemeUtils.platform.colorTextView(binding.searchText, ColorRole.ON_SURFACE_VARIANT)
 
         forwardMessage = intent.getBooleanExtra(KEY_FORWARD_MSG_FLAG, false)
@@ -1013,7 +1013,7 @@ class ConversationsListActivity :
     private fun showSearchBar() {
         val layoutParams = binding.searchToolbar.layoutParams as AppBarLayout.LayoutParams
         binding.searchToolbar.visibility = View.VISIBLE
-        binding.searchText.hint = getString(R.string.appbar_search_in, getString(R.string.nc_app_product_name))
+        binding.searchText.text = getString(R.string.appbar_search_in, getString(R.string.nc_app_product_name))
         binding.conversationListToolbar.visibility = View.GONE
         // layoutParams.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout
         // .LayoutParams.SCROLL_FLAG_SNAP | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS);
@@ -1327,7 +1327,7 @@ class ConversationsListActivity :
             openFollowedThreadsOverview()
         }
         binding.threadsButton.let {
-            viewThemeUtils.platform.colorImageView(it, ColorRole.ON_SURFACE)
+            viewThemeUtils.platform.colorImageView(it, ColorRole.ON_SURFACE_VARIANT)
         }
 
         binding.newMentionPopupBubble.visibility = View.GONE
@@ -2231,7 +2231,7 @@ class ConversationsListActivity :
             binding.filterConversationsButton.let {
                 viewThemeUtils.platform.colorImageView(
                     it,
-                    ColorRole.ON_SURFACE
+                    ColorRole.ON_SURFACE_VARIANT
                 )
             }
         }

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

@@ -86,7 +86,7 @@
                     android:layout_width="0dp"
                     android:layout_height="48dp"
                     android:layout_marginStart="20dp"
-                    android:layout_marginEnd="18dp"
+                    android:layout_marginEnd="0dp"
                     android:ellipsize="end"
                     android:gravity="start|center_vertical"
                     android:lines="1"
@@ -101,9 +101,10 @@
 
                 <ImageView
                     android:id="@+id/filter_conversations_button"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:padding="12dp"
+                    android:layout_width="40dp"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
                     android:contentDescription="@string/nc_filter"
                     android:src="@drawable/ic_baseline_filter_list_24"
                     app:layout_constraintBaseline_toTopOf="parent"
@@ -113,10 +114,11 @@
 
                 <ImageView
                     android:id="@+id/threads_button"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
+                    android:layout_width="40dp"
+                    android:layout_height="match_parent"
                     android:contentDescription="@string/followed_threads"
-                    android:padding="12dp"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
                     android:src="@drawable/outline_forum_24"
                     android:visibility="gone"
                     app:layout_constraintBaseline_toTopOf="parent"