From fd788846357d9170a1a9cc0d1427cc0cbe66dc64 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 10 Jan 2025 12:03:38 -0500 Subject: [PATCH 1/8] Fix announcement group text link color. Ended up reorganizing some theme colors too, but didn't change any. --- .../thoughtcrime/securesms/util/SpanUtil.java | 1 + app/src/main/res/values/themes.xml | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java index 0a67a630f3..99a7931b35 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java @@ -218,6 +218,7 @@ public void onClick(@NonNull View widget) { public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); ds.setUnderlineText(false); + ds.setColor(context.getResources().getColor(R.color.signal_accent_primary)); } }, start, start + clickable.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 148de0f597..398fb526eb 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -150,6 +150,7 @@ @color/signal_colorPrimary + @color/signal_colorPrimary @color/signal_colorPrimaryContainer @color/signal_colorSecondary @color/signal_colorSecondaryContainer @@ -164,6 +165,10 @@ @color/signal_colorOnSurfaceVariant @color/signal_colorOnBackground @color/signal_colorOutline + @color/signal_colorPrimary + @color/signal_colorPrimary + @color/transparent_black_10 + @style/Signal.Text.BodyMedium @style/Signal.Text.BodyLarge @style/Signal.Text.LabelLarge @@ -190,10 +195,6 @@ @style/TextSecure.ActionModeStyle @color/text_color_light_theme @color/text_color_secondary_light_theme - @color/signal_colorPrimary - @color/signal_colorPrimary - @color/signal_colorPrimary - @color/transparent_black_10 @color/signal_colorBackground @null @style/AppCompatAlertDialogStyleLight @@ -242,6 +243,7 @@ @color/signal_colorPrimary + @color/signal_colorPrimary @color/signal_colorPrimaryContainer @color/signal_colorSecondary @color/signal_colorSecondaryContainer @@ -256,6 +258,10 @@ @color/signal_colorOnSurfaceVariant @color/signal_colorOnBackground @color/signal_colorOutline + @color/signal_colorPrimary + @color/signal_colorPrimary + @color/transparent_white_10 + @style/Signal.Text.BodyMedium @style/Signal.Text.BodyLarge @style/Signal.Text.LabelLarge @@ -279,9 +285,6 @@ @style/TextSecure.ActionModeStyle @color/text_color_dark_theme @color/text_color_secondary_dark_theme - @color/signal_colorPrimary - @color/signal_colorPrimary - @color/transparent_white_10 @color/transparent_white_10 @color/signal_colorBackground @null From 24cacad503d3db7976b6892583635ddd8c7e3c8c Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 10 Jan 2025 12:19:00 -0500 Subject: [PATCH 2/8] Fix text highlight color. --- app/src/main/res/values/themes.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 398fb526eb..e147675142 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -168,6 +168,7 @@ @color/signal_colorPrimary @color/signal_colorPrimary @color/transparent_black_10 + @color/signal_colorPrimaryContainer @style/Signal.Text.BodyMedium @style/Signal.Text.BodyLarge @@ -261,6 +262,7 @@ @color/signal_colorPrimary @color/signal_colorPrimary @color/transparent_white_10 + @color/signal_colorPrimaryContainer @style/Signal.Text.BodyMedium @style/Signal.Text.BodyLarge From df51702a2c5d38287741c9b929ffcf40424f5507 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 10 Jan 2025 12:26:00 -0500 Subject: [PATCH 3/8] Fix calendar background color. --- app/src/main/res/values/signal_styles.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/signal_styles.xml b/app/src/main/res/values/signal_styles.xml index 3bd57dbecf..8c0c107419 100644 --- a/app/src/main/res/values/signal_styles.xml +++ b/app/src/main/res/values/signal_styles.xml @@ -269,11 +269,13 @@ @color/signal_colorPrimary @color/signal_colorOnPrimary @color/signal_accent_primary + @color/signal_colorSurface + @color/signal_colorSurface @style/MaterialCalendar.Signal.HeaderTitle @style/MaterialCalendar.Signal.HeaderSelection - @style/Signal.Widget.Button.Dialog @style/Signal.Widget.Button.Dialog + false @@ -227,10 +226,8 @@ @style/ThemeOverlay.Signal.MaterialAlertDialog @style/Signal.ThemeOverlay.TimePicker @style/Signal.Widget.TimePicker - @style/Signal.Widget.Calendar @style/Signal.ThemeOverlay.Calendar - @style/Widget.Material3.CardView.Filled @@ -323,10 +320,8 @@ @style/ThemeOverlay.Signal.MaterialAlertDialog @style/Signal.ThemeOverlay.TimePicker @style/Signal.Widget.TimePicker - @style/Signal.Widget.Calendar @style/Signal.ThemeOverlay.Calendar - @style/Widget.Material3.CardView.Filled From 358bb8a2ecd291ca2d95571e95030f38aa7c2457 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 10 Jan 2025 14:33:40 -0500 Subject: [PATCH 5/8] Fix unread filter visibility. --- app/src/main/res/values/signal_styles.xml | 4 ++++ app/src/main/res/values/themes.xml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/src/main/res/values/signal_styles.xml b/app/src/main/res/values/signal_styles.xml index 8c0c107419..4de7028842 100644 --- a/app/src/main/res/values/signal_styles.xml +++ b/app/src/main/res/values/signal_styles.xml @@ -259,6 +259,10 @@ @color/signal_colorOnSurfaceVariant + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index e528034eba..f5d346d168 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -229,6 +229,7 @@ @style/Signal.Widget.Calendar @style/Signal.ThemeOverlay.Calendar @style/Widget.Material3.CardView.Filled + @style/Signal.Widget.CollapsingToolbar