From d91f130238169ba4dbe7895eca4af944713d36c2 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 5 May 2026 14:04:13 -0400 Subject: [PATCH] Update color and styling of release note update items. --- .../conversation/ConversationUpdateItem.java | 19 +++++++++++++------ ...rsation_update_release_note_background.xml | 9 +++++++++ ...ion_update_wallpaper_background_bottom.xml | 4 ++-- ...n_update_wallpaper_background_singular.xml | 2 +- app/src/main/res/values-night/dark_colors.xml | 4 ++-- 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable/conversation_update_release_note_background.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java index 3180e574f1..af0be1b506 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java @@ -221,13 +221,16 @@ public final class ConversationUpdateItem extends FrameLayout observeDisplayBody(lifecycleOwner, spannableMessage); observeDisplayBodyWithTimer(lifecycleOwner); + boolean donationRequest = conversationMessage.getMessageRecord().isReleaseChannelDonationRequest(); + present(conversationMessage, nextMessageRecord, conversationRecipient, isMessageRequestAccepted); presentTimer(updateDescription); presentBackground(shouldCollapse(messageRecord, previousMessageRecord), shouldCollapse(messageRecord, nextMessageRecord), - hasWallpaper); + hasWallpaper, + donationRequest); - presentActionButton(hasWallpaper, conversationMessage.getMessageRecord().isReleaseChannelDonationRequest()); + presentActionButton(hasWallpaper, donationRequest); presentCollapsedHead(conversationMessage.getMessageRecord().getCollapsedState()); updateSelectedState(); @@ -785,7 +788,7 @@ public final class ConversationUpdateItem extends FrameLayout (messageRecord.isGroupV2JoinRequest(toBlock.requireServiceId()) && previousMessageRecord.map(m -> m.isCollapsedGroupV2JoinUpdate(toBlock.requireServiceId())).orElse(false)); } - private void presentBackground(boolean collapseAbove, boolean collapseBelow, boolean hasWallpaper) { + private void presentBackground(boolean collapseAbove, boolean collapseBelow, boolean hasWallpaper, boolean isDonationRequest) { int marginDefault = getContext().getResources().getDimensionPixelOffset(R.dimen.conversation_update_vertical_margin); int marginCollapsed = 0; int paddingDefault = getContext().getResources().getDimensionPixelOffset(R.dimen.conversation_update_vertical_padding); @@ -843,7 +846,11 @@ public final class ConversationUpdateItem extends FrameLayout ViewUtil.updateLayoutParams(background, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); if (hasWallpaper) { - background.setBackgroundResource(R.drawable.conversation_update_wallpaper_background_singular); + if (isDonationRequest) { + background.setBackgroundResource(R.drawable.conversation_update_release_note_background); + } else { + background.setBackgroundResource(R.drawable.conversation_update_wallpaper_background_singular); + } } else { background.setBackground(null); } @@ -852,8 +859,8 @@ public final class ConversationUpdateItem extends FrameLayout private void presentActionButton(boolean hasWallpaper, boolean isBoostRequest) { if (isBoostRequest) { - actionButton.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(getContext(), org.signal.core.ui.R.color.signal_colorSecondaryContainer))); - actionButton.setTextColor(ColorStateList.valueOf(ContextCompat.getColor(getContext(), org.signal.core.ui.R.color.signal_colorOnSecondaryContainer))); + actionButton.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(getContext(), R.color.release_notes_cta_background))); + actionButton.setTextColor(ColorStateList.valueOf(ContextCompat.getColor(getContext(), org.signal.core.ui.R.color.signal_colorOnSurface))); } else if (hasWallpaper) { actionButton.setBackgroundTintList(AppCompatResources.getColorStateList(getContext(), R.color.conversation_update_item_button_background_wallpaper)); actionButton.setTextColor(AppCompatResources.getColorStateList(getContext(), R.color.conversation_update_item_button_text_color_wallpaper)); diff --git a/app/src/main/res/drawable/conversation_update_release_note_background.xml b/app/src/main/res/drawable/conversation_update_release_note_background.xml new file mode 100644 index 0000000000..fb2214dac2 --- /dev/null +++ b/app/src/main/res/drawable/conversation_update_release_note_background.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/app/src/main/res/drawable/conversation_update_wallpaper_background_bottom.xml b/app/src/main/res/drawable/conversation_update_wallpaper_background_bottom.xml index 15e6273b78..9f0434081f 100644 --- a/app/src/main/res/drawable/conversation_update_wallpaper_background_bottom.xml +++ b/app/src/main/res/drawable/conversation_update_wallpaper_background_bottom.xml @@ -4,6 +4,6 @@ android:shape="rectangle"> - + diff --git a/app/src/main/res/drawable/conversation_update_wallpaper_background_singular.xml b/app/src/main/res/drawable/conversation_update_wallpaper_background_singular.xml index c95f561dfa..0742bed643 100644 --- a/app/src/main/res/drawable/conversation_update_wallpaper_background_singular.xml +++ b/app/src/main/res/drawable/conversation_update_wallpaper_background_singular.xml @@ -4,5 +4,5 @@ android:shape="rectangle"> - + diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml index 4d7ce63817..43f1a92a18 100644 --- a/app/src/main/res/values-night/dark_colors.xml +++ b/app/src/main/res/values-night/dark_colors.xml @@ -204,9 +204,9 @@ #FFFFFFFF #FF636583 #FF272C3C - #FF3A3F4E + #FF2E3342 #FF353A49 - #FF2F3240 + #FF3A3F4E #FF424757 #00424757