From 43da62f7185c34ead9464fd996ff178e64235f35 Mon Sep 17 00:00:00 2001 From: tom79 Date: Thu, 7 Nov 2019 17:46:19 +0100 Subject: [PATCH] Improve colors --- .../android/drawers/StatusListAdapter.java | 39 +++-------- .../app/fedilab/android/helper/Helper.java | 10 ++- .../res/layout-sw600dp/activity_about.xml | 8 +-- .../layout-sw600dp/activity_show_account.xml | 2 +- .../main/res/layout-sw600dp/activity_toot.xml | 2 +- app/src/main/res/layout/activity_about.xml | 8 +-- app/src/main/res/layout/activity_login.xml | 2 +- .../res/layout/activity_opencollective.xml | 4 +- .../res/layout/activity_peertube_edit.xml | 2 +- .../res/layout/activity_pixelfed_compose.xml | 4 +- .../main/res/layout/activity_show_account.xml | 2 +- app/src/main/res/layout/activity_toot.xml | 4 +- app/src/main/res/layout/add_filter.xml | 8 +-- app/src/main/res/layout/drawer_filters.xml | 4 +- .../main/res/layout/drawer_how_to_videos.xml | 2 +- app/src/main/res/layout/drawer_peertube.xml | 2 +- app/src/main/res/layout/drawer_status.xml | 10 +-- .../main/res/layout/drawer_status_compact.xml | 10 +-- .../main/res/layout/drawer_status_focused.xml | 6 +- .../layout/drawer_who_to_follow_account.xml | 2 +- .../res/layout/fragment_settings_reveal.xml | 64 +++++++++---------- .../main/res/layout/layout_quick_reply.xml | 2 +- app/src/main/res/layout/popup_cache.xml | 12 ++-- .../res/layout/stats_owner_notifications.xml | 12 ++-- app/src/main/res/layout/stats_owner_toots.xml | 24 +++---- 25 files changed, 116 insertions(+), 129 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 08d682de0..4b2a79690 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -1361,47 +1361,26 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct if (theme == Helper.THEME_BLACK) { iconColor = R.color.action_black; iconColorCompat = ContextCompat.getColor(context, iconColor); - holder.status_cardview.setBackgroundResource(R.drawable.card_border_black); - Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.dark_text); - Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.dark_text); - holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header)); - holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); - holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header)); - Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.black); - Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.black); - Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.black); - } else if (theme == Helper.THEME_DARK) { iconColor = R.color.action_dark; iconColorCompat = ContextCompat.getColor(context, iconColor); - Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4); - Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.mastodonC4); - Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.mastodonC4); - holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header)); - holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); - holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header)); - holder.status_cardview.setBackgroundResource(R.drawable.card_border_dark); - - Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.mastodonC1); - Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.mastodonC1); - Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.mastodonC1); } else { iconColor = R.color.action_light; iconColorCompat = ContextCompat.getColor(context, iconColor); - holder.status_cardview.setBackgroundResource(R.drawable.card_border_light); - Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4); - Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.mastodonC4); - holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.light_black)); - holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.light_black)); - holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.light_black)); - Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.white); - Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.white); - Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.white); } } + + holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header)); + holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); + holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header)); + holder.status_cardview.setBackgroundResource(R.drawable.card_border_dark); + Helper.changeDrawableColor(context, R.drawable.ic_audio_wave, iconColor); + Helper.changeDrawableColor(context, R.drawable.ic_photo, R.attr.colorAccent); + Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.attr.colorAccent); + Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.attr.colorAccent); Helper.changeDrawableColor(context, holder.status_remove, iconColor); Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, iconColor); diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 3a3b4be80..f76b2b356 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -91,6 +91,7 @@ import android.text.style.URLSpan; import android.util.DisplayMetrics; import android.util.Log; import android.util.Patterns; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -2663,7 +2664,14 @@ public class Helper { try { color = Color.parseColor(context.getString(hexaColor)); }catch (Resources.NotFoundException e){ - color = hexaColor; + try { + TypedValue typedValue = new TypedValue(); + Resources.Theme theme = context.getTheme(); + theme.resolveAttribute(hexaColor, typedValue, true); + color = typedValue.data; + }catch (Resources.NotFoundException ed) { + color = hexaColor; + } } assert mDrawable != null; mDrawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP); diff --git a/app/src/main/res/layout-sw600dp/activity_about.xml b/app/src/main/res/layout-sw600dp/activity_about.xml index e170a8b13..9fd6b5042 100644 --- a/app/src/main/res/layout-sw600dp/activity_about.xml +++ b/app/src/main/res/layout-sw600dp/activity_about.xml @@ -53,7 +53,7 @@ android:gravity="center_vertical" android:padding="5dp" android:text="@string/about_developer" - android:textColor="?colorAccent" + android:textColor="?attr/colorAccent" android:textSize="16sp" android:focusable="true" /> @@ -130,7 +130,7 @@ android:gravity="center_vertical|center_horizontal" android:padding="5dp" android:text="@string/thanks_text_ux" - android:textColor="?colorAccent" + android:textColor="?attr/colorAccent" android:textSize="16sp" /> + android:textColor="?attr/colorAccent" />