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

WIP filter conversations feature, added close button + detekt issues

Browse Source 
Signed-off-by: Julius Linus julius.linus@nextcloud.com

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
rapterjet2004 2023-06-14 15:03:24 -05:00 committed by Andy Scherzinger
parent 715cbedcfe
commit 73dce166b9
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1489,10 +1489,12 @@ class ConversationsListActivity :
if (filterState.containsValue(true)) { if (filterState.containsValue(true)) {
binding.filterConversationsButton.let { viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) } binding.filterConversationsButton.let { viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) }
} else { } else {
binding.filterConversationsButton.let { viewThemeUtils.platform.colorImageView( binding.filterConversationsButton.let {
it, viewThemeUtils.platform.colorImageView(
ColorRole.ON_SURFACE_VARIANT it,
) } ColorRole.ON_SURFACE_VARIANT
)
}
} }
} }

6
app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
View File

@ -79,7 +79,7 @@ class FilterConversationFragment(
private fun setUpColors() { private fun setUpColors() {
binding.run { binding.run {
listOf( listOf(
binding.root, binding.root
) )
}.forEach(viewThemeUtils.platform::colorViewBackground) }.forEach(viewThemeUtils.platform::colorViewBackground)
@ -105,6 +105,10 @@ class FilterConversationFragment(
binding.mentionedFilterChip.isChecked = isChecked binding.mentionedFilterChip.isChecked = isChecked
processSubmit() processSubmit()
} }
binding.closeButton.setOnClickListener {
dismiss()
}
} }
private fun setUpChips() { private fun setUpChips() {

28
app/src/main/res/layout/dialog_filter_conversation.xml
View File

@ -26,13 +26,29 @@
tools:background="@color/white" tools:background="@color/white"
tools:visibility="visible"> tools:visibility="visible">
<com.google.android.material.textview.MaterialTextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:orientation="horizontal">
android:layout_margin="@dimen/standard_margin"
android:text="@string/nc_filter" <com.google.android.material.textview.MaterialTextView
android:textSize="@dimen/md_title_textsize" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:layout_margin="@dimen/standard_margin"
android:text="@string/nc_filter"
android:textSize="@dimen/md_title_textsize" />
<ImageView
android:id="@+id/close_button"
android:layout_width="36dp"
android:layout_height="36dp"
android:src="@drawable/ic_close_search"
android:layout_margin="@dimen/standard_margin"
/>
</LinearLayout>
<com.google.android.material.divider.MaterialDivider <com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent" android:layout_width="match_parent"