From 750579b1c2e9debfa29aae23780e62050cf7a301 Mon Sep 17 00:00:00 2001 From: sk Date: Thu, 22 Dec 2022 00:57:12 +0100 Subject: [PATCH] use color attributes instead of fixed colors --- .../org/joinmastodon/android/PushNotificationReceiver.java | 2 +- .../android/fragments/BaseStatusListFragment.java | 4 ++-- .../main/res/color/button_text_secondary_light_on_dark.xml | 2 +- mastodon/src/main/res/drawable/bg_edittext_dark.xml | 2 +- mastodon/src/main/res/drawable/bg_edittext_light.xml | 2 +- mastodon/src/main/res/drawable/edit_avatar_overlay.xml | 2 +- .../main/res/drawable/ic_fluent_image_edit_24_regular.xml | 2 +- mastodon/src/main/res/drawable/ic_post_more.xml | 2 +- mastodon/src/main/res/drawable/profile_ava_bg.xml | 2 +- mastodon/src/main/res/drawable/seekbar_video_player.xml | 6 +++--- .../src/main/res/drawable/seekbar_video_player_thumb.xml | 2 +- mastodon/src/main/res/drawable/upload_progress.xml | 2 +- mastodon/src/main/res/layout/fragment_profile.xml | 2 +- mastodon/src/main/res/layout/photo_viewer_ui.xml | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java index 664cc5c8f..49393ce5f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java +++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java @@ -142,7 +142,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{ .setShowWhen(true) .setCategory(Notification.CATEGORY_SOCIAL) .setAutoCancel(true) - .setColor(context.getColor(R.color.primary_700)); + .setColor(UiUtils.getThemeColor(context, R.attr.colorPrimary700)); switch (pn.notificationType) { case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled); case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java index c44e371df..00e577c4c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java @@ -787,7 +787,7 @@ public abstract class BaseStatusListFragment exten currentMediaHiddenLayoutsWidth=width; String title=getString(R.string.sensitive_content); TextPaint titlePaint=new TextPaint(Paint.ANTI_ALIAS_FLAG); - titlePaint.setColor(getResources().getColor(R.color.gray_50)); + titlePaint.setColor(UiUtils.getThemeColor(getContext(), R.attr.colorGray50)); titlePaint.setTextSize(V.dp(22)); titlePaint.setTypeface(mediumTypeface); mediaHiddenTitleLayout=StaticLayout.Builder.obtain(title, 0, title.length(), titlePaint, width) @@ -798,7 +798,7 @@ public abstract class BaseStatusListFragment exten .setAlignment(Layout.Alignment.ALIGN_CENTER) .build(); TextPaint textPaint=new TextPaint(Paint.ANTI_ALIAS_FLAG); - textPaint.setColor(getResources().getColor(R.color.gray_200)); + textPaint.setColor(UiUtils.getThemeColor(getContext(), R.attr.colorGray200)); textPaint.setTextSize(V.dp(16)); String text=getString(R.string.sensitive_content_explain); mediaHiddenTextLayout=StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, width) diff --git a/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml b/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml index 4a6b1e796..75b51c18d 100644 --- a/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml +++ b/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/mastodon/src/main/res/drawable/bg_edittext_dark.xml b/mastodon/src/main/res/drawable/bg_edittext_dark.xml index 15df6506a..c5edd128f 100644 --- a/mastodon/src/main/res/drawable/bg_edittext_dark.xml +++ b/mastodon/src/main/res/drawable/bg_edittext_dark.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/mastodon/src/main/res/drawable/bg_edittext_light.xml b/mastodon/src/main/res/drawable/bg_edittext_light.xml index ecff06a8e..32db5c78e 100644 --- a/mastodon/src/main/res/drawable/bg_edittext_light.xml +++ b/mastodon/src/main/res/drawable/bg_edittext_light.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/mastodon/src/main/res/drawable/edit_avatar_overlay.xml b/mastodon/src/main/res/drawable/edit_avatar_overlay.xml index 5ce6af708..150427c3a 100644 --- a/mastodon/src/main/res/drawable/edit_avatar_overlay.xml +++ b/mastodon/src/main/res/drawable/edit_avatar_overlay.xml @@ -1,7 +1,7 @@ - + diff --git a/mastodon/src/main/res/drawable/ic_fluent_image_edit_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_image_edit_24_regular.xml index 9be92cb2e..07e3008a4 100644 --- a/mastodon/src/main/res/drawable/ic_fluent_image_edit_24_regular.xml +++ b/mastodon/src/main/res/drawable/ic_fluent_image_edit_24_regular.xml @@ -1,3 +1,3 @@ - + diff --git a/mastodon/src/main/res/drawable/ic_post_more.xml b/mastodon/src/main/res/drawable/ic_post_more.xml index a1bef7ea2..8b5f7aead 100644 --- a/mastodon/src/main/res/drawable/ic_post_more.xml +++ b/mastodon/src/main/res/drawable/ic_post_more.xml @@ -5,5 +5,5 @@ android:viewportHeight="4"> + android:fillColor="?colorGray500"/> diff --git a/mastodon/src/main/res/drawable/profile_ava_bg.xml b/mastodon/src/main/res/drawable/profile_ava_bg.xml index 83b8d031e..185224c88 100644 --- a/mastodon/src/main/res/drawable/profile_ava_bg.xml +++ b/mastodon/src/main/res/drawable/profile_ava_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/mastodon/src/main/res/drawable/seekbar_video_player.xml b/mastodon/src/main/res/drawable/seekbar_video_player.xml index c8c056870..d3c7ce58d 100644 --- a/mastodon/src/main/res/drawable/seekbar_video_player.xml +++ b/mastodon/src/main/res/drawable/seekbar_video_player.xml @@ -2,14 +2,14 @@ - + - + @@ -19,7 +19,7 @@ - + diff --git a/mastodon/src/main/res/drawable/seekbar_video_player_thumb.xml b/mastodon/src/main/res/drawable/seekbar_video_player_thumb.xml index 1dc6de334..eb8bc3bc4 100644 --- a/mastodon/src/main/res/drawable/seekbar_video_player_thumb.xml +++ b/mastodon/src/main/res/drawable/seekbar_video_player_thumb.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/mastodon/src/main/res/drawable/upload_progress.xml b/mastodon/src/main/res/drawable/upload_progress.xml index 2e6a105f4..fe4e64586 100644 --- a/mastodon/src/main/res/drawable/upload_progress.xml +++ b/mastodon/src/main/res/drawable/upload_progress.xml @@ -6,7 +6,7 @@ android:shape="ring" android:thickness="4dp" android:useLevel="true"> - + \ No newline at end of file diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml index 2b4088da7..7828f92be 100644 --- a/mastodon/src/main/res/layout/fragment_profile.xml +++ b/mastodon/src/main/res/layout/fragment_profile.xml @@ -42,7 +42,7 @@ android:layout_margin="16dp" android:paddingRight="8dp" android:paddingLeft="8dp" - android:textColor="@color/gray_50t" + android:textColor="?colorGray50t" android:textAllCaps="true" android:fontFamily="sans-serif-medium" android:textSize="14dp" diff --git a/mastodon/src/main/res/layout/photo_viewer_ui.xml b/mastodon/src/main/res/layout/photo_viewer_ui.xml index 97d0f8c09..4b50087ef 100644 --- a/mastodon/src/main/res/layout/photo_viewer_ui.xml +++ b/mastodon/src/main/res/layout/photo_viewer_ui.xml @@ -55,7 +55,7 @@ android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:src="@drawable/ic_pause_24" - android:tint="@color/gray_50" + android:tint="?colorGray50" android:contentDescription="@string/pause" android:background="?android:selectableItemBackgroundBorderless"/>