From 03ed790f1d3e8f1e1913238d92bb5c6afefb779e Mon Sep 17 00:00:00 2001 From: Julius Linus Date: Thu, 28 Mar 2024 09:36:04 -0500 Subject: [PATCH] theme federation invitations panel Signed-off-by: Marcel Hibbe --- .../conversationlist/ConversationsListActivity.kt | 11 ++++++----- app/src/main/res/layout/federated_invitation_hint.xml | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 388ba6235..8c9273f77 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -115,11 +115,15 @@ import com.nextcloud.talk.ui.dialog.ConversationsListBottomDialog import com.nextcloud.talk.ui.dialog.FilterConversationFragment import com.nextcloud.talk.users.UserManager import com.nextcloud.talk.utils.ApiUtils -import com.nextcloud.talk.utils.SpreedFeatures +import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability +import com.nextcloud.talk.utils.CapabilitiesUtil.isServerEOL +import com.nextcloud.talk.utils.CapabilitiesUtil.isUnifiedSearchAvailable +import com.nextcloud.talk.utils.CapabilitiesUtil.isUserStatusAvailable import com.nextcloud.talk.utils.ClosedInterfaceImpl import com.nextcloud.talk.utils.FileUtils import com.nextcloud.talk.utils.Mimetype import com.nextcloud.talk.utils.ParticipantPermissions +import com.nextcloud.talk.utils.SpreedFeatures import com.nextcloud.talk.utils.UserIdUtils import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.bundle.BundleKeys.ADD_ADDITIONAL_ACCOUNT @@ -131,10 +135,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_NEW_CONVERSATION import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SHARED_TEXT -import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability -import com.nextcloud.talk.utils.CapabilitiesUtil.isServerEOL -import com.nextcloud.talk.utils.CapabilitiesUtil.isUnifiedSearchAvailable -import com.nextcloud.talk.utils.CapabilitiesUtil.isUserStatusAvailable import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil import com.nextcloud.talk.utils.power.PowerManagerUtils import com.nextcloud.talk.utils.rx.SearchViewObservable.Companion.observeSearchView @@ -295,6 +295,7 @@ class ConversationsListActivity : loadUserAvatar(binding.switchAccountButton) viewThemeUtils.material.colorMaterialTextButton(binding.switchAccountButton) + viewThemeUtils.material.themeCardView(binding.conversationListHintInclude.hintLayoutCardview) searchBehaviorSubject.onNext(false) fetchRooms() fetchPendingInvitations() diff --git a/app/src/main/res/layout/federated_invitation_hint.xml b/app/src/main/res/layout/federated_invitation_hint.xml index 5f1867c9d..87f0364bd 100644 --- a/app/src/main/res/layout/federated_invitation_hint.xml +++ b/app/src/main/res/layout/federated_invitation_hint.xml @@ -28,6 +28,7 @@ android:orientation="vertical">