gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 03:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4497 from nextcloud/add_clear_icon

Browse Source 
Add clear icon for search view in open conversations
This commit is contained in:
Marcel Hibbe 2024-12-13 13:04:56 +01:00 committed by GitHub
commit f41efd9303
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt
View File

@ -58,7 +58,7 @@ class ListOpenConversationsActivity : BaseActivity() {
setContentView(binding.root) setContentView(binding.root)
setupSystemColors() setupSystemColors()
viewThemeUtils.platform.colorImageView(binding.searchOpenConversations, ColorRole.ON_SURFACE) viewThemeUtils.platform.colorImageView(binding.searchOpenConversations, ColorRole.ON_SURFACE)
viewThemeUtils.platform.colorEditText(binding.searchEdit) viewThemeUtils.material.colorTextInputLayout(binding.textInputLayout)
val user = currentUserProvider.currentUser.blockingGet() val user = currentUserProvider.currentUser.blockingGet()
@ -68,7 +68,7 @@ class ListOpenConversationsActivity : BaseActivity() {
searching = !searching searching = !searching
handleSearchUI(searching) handleSearchUI(searching)
} }
binding.searchEdit.doOnTextChanged { text, _, _, count -> binding.editText.doOnTextChanged { text, _, _, count ->
adapter.filter(text.toString()) adapter.filter(text.toString())
} }
@ -78,11 +78,11 @@ class ListOpenConversationsActivity : BaseActivity() {
private fun handleSearchUI(show: Boolean) { private fun handleSearchUI(show: Boolean) {
if (show) { if (show) {
binding.searchOpenConversations.visibility = View.GONE binding.searchOpenConversations.visibility = View.GONE
binding.searchEdit.visibility = View.VISIBLE binding.textInputLayout.visibility = View.VISIBLE
binding.searchEdit.showKeyboardAndFocus() binding.editText.showKeyboardAndFocus()
} else { } else {
binding.searchOpenConversations.visibility = View.VISIBLE binding.searchOpenConversations.visibility = View.VISIBLE
binding.searchEdit.visibility = View.GONE binding.textInputLayout.visibility = View.GONE
} }
} }

22
app/src/main/res/layout/activity_open_conversations.xml
View File

@ -7,6 +7,7 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
@ -38,13 +39,28 @@
android:layout_marginHorizontal="@dimen/standard_margin" android:layout_marginHorizontal="@dimen/standard_margin"
android:src="@drawable/ic_search_white_24dp" /> android:src="@drawable/ic_search_white_24dp" />
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputLayout
android:id="@+id/search_edit" android:id="@+id/textInputLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:endIconMode="clear_text"
app:boxBackgroundMode="none"
android:visibility="gone" android:visibility="gone"
/> tools:visibility="visible"
app:hintEnabled="false"
app:endIconTint="@color/icon_on_bg_default"
android:layout_marginEnd = "8dp">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/editText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/nc_search"
android:textColorHint="@color/low_emphasis_text"
android:textColor = "@color/high_emphasis_text"/>
</com.google.android.material.textfield.TextInputLayout>
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView