gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-16 17:25:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to search

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-20 23:32:13 +01:00
parent 4e5f69c9da
commit 6520327c01
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
View File

@ -127,6 +127,7 @@ class ConversationsListView : BaseView() {
viewModel.apply { viewModel.apply {
avatar.observe(this@ConversationsListView) { avatar -> avatar.observe(this@ConversationsListView) { avatar ->
activity?.settingsButton?.imageTintList = null
activity?.settingsButton?.setImageDrawable(avatar) activity?.settingsButton?.setImageDrawable(avatar)
} }

2
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt
View File

@ -60,7 +60,7 @@ class ConversationsListViewModel constructor(
var messageData: String? = null var messageData: String? = null
val networkStateLiveData: MutableLiveData<ConversationsListViewNetworkState> = MutableLiveData(ConversationsListViewNetworkState.LOADING) val networkStateLiveData: MutableLiveData<ConversationsListViewNetworkState> = MutableLiveData(ConversationsListViewNetworkState.LOADING)
val avatar: MutableLiveData<Drawable> = MutableLiveData(DisplayUtils.getRoundedDrawable(context.getDrawable(R.drawable.ic_settings_white_24dp))) val avatar: MutableLiveData<Drawable> = MutableLiveData()
val filterLiveData: MutableLiveData<CharSequence?> = MutableLiveData(null) val filterLiveData: MutableLiveData<CharSequence?> = MutableLiveData(null)
val conversationsLiveData = Transformations.switchMap(globalService.currentUserLiveData) { user -> val conversationsLiveData = Transformations.switchMap(globalService.currentUserLiveData) { user ->
if (networkStateLiveData.value != ConversationsListViewNetworkState.LOADING) { if (networkStateLiveData.value != ConversationsListViewNetworkState.LOADING) {

6
app/src/main/res/layout/search_layout.xml
View File

@ -61,7 +61,7 @@
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_arrow_back_black_24dp" android:src="@drawable/ic_arrow_back_black_24dp"
android:tint="@color/fg_inverse" android:tint="@color/fg_default"
android:visibility="visible" android:visibility="visible"
tools:src="@drawable/ic_arrow_back_black_24dp" /> tools:src="@drawable/ic_arrow_back_black_24dp" />
@ -87,6 +87,7 @@
android:layout_toStartOf="@id/rightContainer" android:layout_toStartOf="@id/rightContainer"
android:layout_toEndOf="@id/leftContainer" android:layout_toEndOf="@id/leftContainer"
android:background="@null" android:background="@null"
android:textColor="@color/conversation_item_header"
android:imeOptions="actionSearch|flagNoExtractUi" android:imeOptions="actionSearch|flagNoExtractUi"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:lines="1" android:lines="1"
@ -112,7 +113,7 @@
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_baseline_clear_24" android:src="@drawable/ic_baseline_clear_24"
android:tint="@color/white" android:tint="@color/fg_default"
android:transitionName="userAvatar.transitionTag" android:transitionName="userAvatar.transitionTag"
android:visibility="gone" android:visibility="gone"
tools:src="@tools:sample/avatars[0]" /> tools:src="@tools:sample/avatars[0]" />
@ -125,6 +126,7 @@
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_settings_white_24dp" android:src="@drawable/ic_settings_white_24dp"
android:tint="@color/fg_default"
android:transitionName="userAvatar.transitionTag" android:transitionName="userAvatar.transitionTag"
android:visibility="visible" android:visibility="visible"
tools:src="@tools:sample/avatars[0]" /> tools:src="@tools:sample/avatars[0]" />