From 6520327c0123a7a5cfd417bc252e7d9941c0527d Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 20 Jan 2020 23:32:13 +0100 Subject: [PATCH] Improvements to search Signed-off-by: Mario Danic --- .../features/conversationsList/ConversationsListView.kt | 1 + .../conversationsList/ConversationsListViewModel.kt | 2 +- app/src/main/res/layout/search_layout.xml | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt index 9d7390ca1..8b5ed18ac 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt @@ -127,6 +127,7 @@ class ConversationsListView : BaseView() { viewModel.apply { avatar.observe(this@ConversationsListView) { avatar -> + activity?.settingsButton?.imageTintList = null activity?.settingsButton?.setImageDrawable(avatar) } diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt index f97669ff0..997bdc2ab 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt @@ -60,7 +60,7 @@ class ConversationsListViewModel constructor( var messageData: String? = null val networkStateLiveData: MutableLiveData = MutableLiveData(ConversationsListViewNetworkState.LOADING) - val avatar: MutableLiveData = MutableLiveData(DisplayUtils.getRoundedDrawable(context.getDrawable(R.drawable.ic_settings_white_24dp))) + val avatar: MutableLiveData = MutableLiveData() val filterLiveData: MutableLiveData = MutableLiveData(null) val conversationsLiveData = Transformations.switchMap(globalService.currentUserLiveData) { user -> if (networkStateLiveData.value != ConversationsListViewNetworkState.LOADING) { diff --git a/app/src/main/res/layout/search_layout.xml b/app/src/main/res/layout/search_layout.xml index 31939ffee..d91856b78 100644 --- a/app/src/main/res/layout/search_layout.xml +++ b/app/src/main/res/layout/search_layout.xml @@ -61,7 +61,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitCenter" android:src="@drawable/ic_arrow_back_black_24dp" - android:tint="@color/fg_inverse" + android:tint="@color/fg_default" android:visibility="visible" tools:src="@drawable/ic_arrow_back_black_24dp" /> @@ -87,6 +87,7 @@ android:layout_toStartOf="@id/rightContainer" android:layout_toEndOf="@id/leftContainer" android:background="@null" + android:textColor="@color/conversation_item_header" android:imeOptions="actionSearch|flagNoExtractUi" android:inputType="textNoSuggestions" android:lines="1" @@ -112,7 +113,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitCenter" android:src="@drawable/ic_baseline_clear_24" - android:tint="@color/white" + android:tint="@color/fg_default" android:transitionName="userAvatar.transitionTag" android:visibility="gone" tools:src="@tools:sample/avatars[0]" /> @@ -125,6 +126,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitCenter" android:src="@drawable/ic_settings_white_24dp" + android:tint="@color/fg_default" android:transitionName="userAvatar.transitionTag" android:visibility="visible" tools:src="@tools:sample/avatars[0]" />