mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 19:49:33 +01:00
WIP filter conversations feature, added close button + detekt issues
Signed-off-by: Julius Linus julius.linus@nextcloud.com Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
715cbedcfe
commit
73dce166b9
@ -1489,10 +1489,12 @@ class ConversationsListActivity :
|
||||
if (filterState.containsValue(true)) {
|
||||
binding.filterConversationsButton.let { viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) }
|
||||
} else {
|
||||
binding.filterConversationsButton.let { viewThemeUtils.platform.colorImageView(
|
||||
it,
|
||||
ColorRole.ON_SURFACE_VARIANT
|
||||
) }
|
||||
binding.filterConversationsButton.let {
|
||||
viewThemeUtils.platform.colorImageView(
|
||||
it,
|
||||
ColorRole.ON_SURFACE_VARIANT
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -79,7 +79,7 @@ class FilterConversationFragment(
|
||||
private fun setUpColors() {
|
||||
binding.run {
|
||||
listOf(
|
||||
binding.root,
|
||||
binding.root
|
||||
)
|
||||
}.forEach(viewThemeUtils.platform::colorViewBackground)
|
||||
|
||||
@ -105,6 +105,10 @@ class FilterConversationFragment(
|
||||
binding.mentionedFilterChip.isChecked = isChecked
|
||||
processSubmit()
|
||||
}
|
||||
|
||||
binding.closeButton.setOnClickListener {
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
private fun setUpChips() {
|
||||
|
@ -26,13 +26,29 @@
|
||||
tools:background="@color/white"
|
||||
tools:visibility="visible">
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_margin="@dimen/standard_margin"
|
||||
android:text="@string/nc_filter"
|
||||
android:textSize="@dimen/md_title_textsize" />
|
||||
android:orientation="horizontal">
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
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
|
||||
android:layout_width="match_parent"
|
||||
|
Loading…
Reference in New Issue
Block a user