From 1af65a68d4cc1bd3dd6e8c06f521090d80b938a8 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Tue, 3 Jun 2025 16:37:12 +0200 Subject: [PATCH 1/4] consistent color to text and icon Signed-off-by: sowjanyakch --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 2 ++ app/src/main/res/layout/remainder_to_delete_conversation.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 4b441e6c3..80faeff53 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -1237,6 +1237,8 @@ class ChatActivity : resources.getString(R.string.nc_conversation_auto_delete_notice), retentionPeriod ) + viewThemeUtils.material.colorMaterialButtonPrimaryTonal(binding.conversationDeleteNotice + .findViewById(R.id.keep_button)) if (ConversationUtils.isParticipantOwnerOrModerator(currentConversation!!)) { binding.conversationDeleteNotice.findViewById(R.id.delete_now_button).visibility = diff --git a/app/src/main/res/layout/remainder_to_delete_conversation.xml b/app/src/main/res/layout/remainder_to_delete_conversation.xml index 30fe63629..02629b197 100644 --- a/app/src/main/res/layout/remainder_to_delete_conversation.xml +++ b/app/src/main/res/layout/remainder_to_delete_conversation.xml @@ -39,6 +39,7 @@ android:textColor="@color/white" app:icon="@drawable/ic_delete" app:iconPadding="8dp" + app:iconTint="@color/white" app:iconGravity="textStart" android:backgroundTint="@color/nc_darkRed" android:layout_marginEnd="16dp" /> From 9e54aadea82bc3fa525f292553472edce0132473 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Tue, 3 Jun 2025 17:53:01 +0200 Subject: [PATCH 2/4] popup menu color Signed-off-by: sowjanyakch --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 2 +- app/src/main/res/layout/item_event_schedule.xml | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 80faeff53..65e045595 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -1232,6 +1232,7 @@ class ChatActivity : bringToFront() } val deleteNoticeText = binding.conversationDeleteNotice.findViewById(R.id.deletion_message) + viewThemeUtils.material.themeCardView(binding.conversationDeleteNotice) deleteNoticeText.text = String.format( resources.getString(R.string.nc_conversation_auto_delete_notice), @@ -3140,7 +3141,6 @@ class ChatActivity : private fun showPopupWindow(anchorView: View) { val popupView = layoutInflater.inflate(R.layout.item_event_schedule, null) - val titleTextView = popupView.findViewById(R.id.event_scheduled) val subtitleTextView = popupView.findViewById(R.id.meetingTime) val popupWindow = PopupWindow( diff --git a/app/src/main/res/layout/item_event_schedule.xml b/app/src/main/res/layout/item_event_schedule.xml index d365073d0..2dc61d967 100644 --- a/app/src/main/res/layout/item_event_schedule.xml +++ b/app/src/main/res/layout/item_event_schedule.xml @@ -12,13 +12,12 @@ xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:padding="16dp" - android:background="@color/grey_600"> + android:background="@color/bg_bottom_sheet"> @@ -27,7 +26,6 @@ android:id="@+id/meetingTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" android:textSize="16sp" tools:text="Meeting at 8:00 pm"/> @@ -46,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/archive_conversation" - android:textColor="@color/black" android:visibility = "gone" android:textSize="18sp" @@ -57,7 +54,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/unarchive_conversation" - android:textColor="@color/black" android:visibility = "gone" android:textSize="18sp" android:paddingTop="24dp"/> From a0ad34c479e8128043c7a201f0d0ca10ee842400 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Tue, 3 Jun 2025 18:32:58 +0200 Subject: [PATCH 3/4] remove menu item after pressing keep button Signed-off-by: sowjanyakch --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 65e045595..8bf6ca6c3 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -276,6 +276,8 @@ class ChatActivity : lateinit var conversationInfoViewModel: ConversationInfoViewModel lateinit var messageInputViewModel: MessageInputViewModel + private var chatMenu: Menu? = null + private val startSelectContactForResult = registerForActivityResult( ActivityResultContracts .StartActivityForResult() @@ -1097,6 +1099,8 @@ class ChatActivity : context.getString(R.string.nc_room_retention), Snackbar.LENGTH_LONG ).show() + + chatMenu?.removeItem(R.id.conversation_event) } is ChatViewModel.UnbindRoomUiState.Error -> { Snackbar.make( @@ -3037,6 +3041,7 @@ class ChatActivity : override fun onCreateOptionsMenu(menu: Menu): Boolean { super.onCreateOptionsMenu(menu) menuInflater.inflate(R.menu.menu_conversation, menu) + chatMenu = menu if (currentConversation?.objectType == ConversationEnums.ObjectType.EVENT) { eventConversationMenuItem = menu.findItem(R.id.conversation_event) @@ -3050,10 +3055,11 @@ class ChatActivity : loadAvatarForStatusBar() setActionBarTitle() } - return true } + + override fun onPrepareOptionsMenu(menu: Menu): Boolean { super.onPrepareOptionsMenu(menu) From 3a71de3964b5e260165f8f3123e389dc08c42841 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Tue, 3 Jun 2025 18:34:10 +0200 Subject: [PATCH 4/4] format Signed-off-by: sowjanyakch --- .../main/java/com/nextcloud/talk/chat/ChatActivity.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 8bf6ca6c3..3f3289e10 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -1100,7 +1100,7 @@ class ChatActivity : Snackbar.LENGTH_LONG ).show() - chatMenu?.removeItem(R.id.conversation_event) + chatMenu?.removeItem(R.id.conversation_event) } is ChatViewModel.UnbindRoomUiState.Error -> { Snackbar.make( @@ -1242,8 +1242,10 @@ class ChatActivity : resources.getString(R.string.nc_conversation_auto_delete_notice), retentionPeriod ) - viewThemeUtils.material.colorMaterialButtonPrimaryTonal(binding.conversationDeleteNotice - .findViewById(R.id.keep_button)) + viewThemeUtils.material.colorMaterialButtonPrimaryTonal( + binding.conversationDeleteNotice + .findViewById(R.id.keep_button) + ) if (ConversationUtils.isParticipantOwnerOrModerator(currentConversation!!)) { binding.conversationDeleteNotice.findViewById(R.id.delete_now_button).visibility = @@ -3058,8 +3060,6 @@ class ChatActivity : return true } - - override fun onPrepareOptionsMenu(menu: Menu): Boolean { super.onPrepareOptionsMenu(menu)