Skip to content

Optimize searchbar and make it M3 styled #5380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mahibi merged 3 commits into from
Sep 16, 2025
Merged

Optimize searchbar and make it M3 styled #5380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
604b2c9
style(searchbar): Optimize layout for hint text
AndyScherzinger Sep 15, 2025
71aa54a
style(searchbar): icon/text color updated to M3 style - on-surface-va…
AndyScherzinger Sep 15, 2025
869456f
fix(detekt): Remove duplicate theming call
AndyScherzinger Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2231,7 +2231,7 @@ class ConversationsListActivity :
binding.filterConversationsButton.let {
viewThemeUtils.platform.colorImageView(
it,
ColorRole.ON_SURFACE
ColorRole.ON_SURFACE_VARIANT
)
}
}
Expand Down
16 changes: 9 additions & 7 deletions app/src/main/res/layout/activity_conversations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Loading