From 32420a0781191c8b3e256bb7cf33c2e0c38eebc6 Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Fri, 3 Aug 2018 15:44:21 -0300 Subject: [PATCH] Give names to colors and clean them up --- .../briar/android/blog/BlogFragment.java | 2 +- .../briar/android/blog/FeedFragment.java | 2 +- .../android/forum/ForumListFragment.java | 2 +- .../privategroup/list/GroupListFragment.java | 2 +- .../src/main/res/layout/power_view.xml | 2 +- .../src/main/res/layout/text_avatar_view.xml | 2 +- .../src/main/res/values-night/color.xml | 18 +++--- briar-android/src/main/res/values/color.xml | 58 +++++++++++-------- briar-android/src/main/res/values/styles.xml | 8 +-- 9 files changed, 54 insertions(+), 42 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java index 49260920dd..265df11081 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java @@ -335,7 +335,7 @@ public class BlogFragment extends BaseFragment View.OnClickListener onClick = v -> list.smoothScrollToPosition(0); snackbar.setActionTextColor(ContextCompat .getColor(getContext(), - R.color.briar_button_positive)); + R.color.briar_button_text_positive)); snackbar.setAction(R.string.blogs_blog_post_scroll_to, onClick); } snackbar.show(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java index cab53ff014..6d82236814 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java @@ -250,7 +250,7 @@ public class FeedFragment extends BaseFragment implements OnClickListener onClick = v -> list.smoothScrollToPosition(0); s.setActionTextColor(ContextCompat .getColor(getContext(), - R.color.briar_button_positive)); + R.color.briar_button_text_positive)); s.setAction(R.string.blogs_blog_post_scroll_to, onClick); } s.show(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java index 66bd2aad6a..7817169b18 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java @@ -103,7 +103,7 @@ public class ForumListFragment extends BaseEventFragment implements snackbar.getView().setBackgroundResource(R.color.briar_primary); snackbar.setAction(R.string.show, this); snackbar.setActionTextColor(ContextCompat - .getColor(getContext(), R.color.briar_button_positive)); + .getColor(getContext(), R.color.briar_button_text_positive)); return contentView; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java index 548fa95336..d12ee90873 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java @@ -77,7 +77,7 @@ public class GroupListFragment extends BaseFragment implements snackbar.getView().setBackgroundResource(R.color.briar_primary); snackbar.setAction(R.string.show, this); snackbar.setActionTextColor(ContextCompat - .getColor(getContext(), R.color.briar_button_positive)); + .getColor(getContext(), R.color.briar_button_text_positive)); return v; } diff --git a/briar-android/src/main/res/layout/power_view.xml b/briar-android/src/main/res/layout/power_view.xml index c35e47ca27..2a288c217b 100644 --- a/briar-android/src/main/res/layout/power_view.xml +++ b/briar-android/src/main/res/layout/power_view.xml @@ -52,7 +52,7 @@ android:layout_margin="8dp" android:contentDescription="@string/help" android:src="@drawable/ic_help_outline_white" - android:tint="@color/briar_button_positive" + android:tint="@color/briar_button_text_positive" app:layout_constraintBottom_toBottomOf="@+id/button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/button"/> diff --git a/briar-android/src/main/res/layout/text_avatar_view.xml b/briar-android/src/main/res/layout/text_avatar_view.xml index de7f3b868f..215bc510c3 100644 --- a/briar-android/src/main/res/layout/text_avatar_view.xml +++ b/briar-android/src/main/res/layout/text_avatar_view.xml @@ -10,7 +10,7 @@ android:layout_width="@dimen/avatar_forum_size" android:layout_height="@dimen/avatar_forum_size" android:layout_gravity="bottom|left" - android:src="@color/briar_button_positive"/> + android:src="@color/briar_button_text_positive"/> <android.support.v7.widget.AppCompatTextView android:id="@+id/textAvatarView" diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml index c6c0565cc4..420a5fdf5d 100644 --- a/briar-android/src/main/res/values-night/color.xml +++ b/briar-android/src/main/res/values-night/color.xml @@ -4,26 +4,26 @@ <color name="briar_accent">@color/briar_green</color> <color name="preference_category">@color/briar_accent</color> - <color name="preference_category_background">#080C10</color> + <color name="preference_category_background">@color/briar_black_almost</color> - <color name="color_primary">#ffffff</color> + <color name="color_primary">@color/briar_white</color> <color name="msg_in">@color/briar_blue</color> - <color name="msg_out">#3C80A9</color> + <color name="msg_out">@color/briar_blue_elio_light</color> <color name="notice_in">@color/briar_blue_dark</color> - <color name="notice_out">#236087</color> + <color name="notice_out">@color/briar_blue_elio</color> <color name="window_background">@color/briar_blue_very_dark</color> <color name="card_background">@color/briar_blue_dark</color> <color name="item_background_highlight">@color/briar_blue</color> - <color name="briar_button_color">@color/briar_blue_light</color> - <color name="briar_button_neutral">@color/briar_link</color> + <color name="briar_button_background_color">@color/briar_blue_medium</color> + <color name="briar_button_text_neutral">@color/briar_blue_light</color> <color name="briar_button_text_disabled">#23cccccc</color> - <color name="thread_indicator">#2D3E50</color> + <color name="thread_indicator">@color/briar_blue</color> <color name="thread_item_background">@color/window_background</color> - <color name="thread_item_highlight">#000000</color> + <color name="thread_item_highlight">@color/briar_black</color> - <color name="divider">#000000</color> + <color name="divider">@color/briar_black</color> </resources> \ No newline at end of file diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml index b3bd7403d1..86f7345596 100644 --- a/briar-android/src/main/res/values/color.xml +++ b/briar-android/src/main/res/values/color.xml @@ -3,48 +3,60 @@ <color name="briar_blue">#2D3E50</color> <color name="briar_blue_dark">#222E3C</color> <color name="briar_blue_very_dark">#0F1720</color> - <color name="briar_blue_light">#4F6C8C</color> + <color name="briar_blue_medium">#4F6C8C</color> + <color name="briar_blue_elio">#236087</color> + <color name="briar_blue_elio_light">#3C80A9</color> + <color name="briar_blue_light">#2A93C6</color> + <color name="briar_blue_grey">#EBEFF2</color> <color name="briar_green">#5C940D</color> <color name="briar_green_light">#95D220</color> - <color name="briar_link">#2A93C6</color> + <color name="briar_red">#ff0000</color> + <color name="briar_white">#FFFFFF</color> + <color name="briar_black">#000000</color> + <color name="briar_black_almost">#080C10</color> - <color name="window_background">#E3EBEF</color> - <color name="card_background">@color/cardview_light_background</color> - <color name="item_background_highlight">#DCDCDC</color> - <color name="action_bar_text">#FFFFFF</color> - <color name="private_message_date_inverse">#e0e0e0</color> - <color name="forum_avatar_shadow">#99000000</color> + <color name="m_grey_300">#e0e0e0</color> + <color name="m_grey_500">#9e9e9e</color> + <color name="m_blue_grey_50">#eceff1</color> <color name="briar_primary">@color/briar_blue</color> <color name="briar_primary_dark">@color/briar_blue_very_dark</color> <color name="briar_accent">@color/briar_blue</color> + <color name="window_background">#E3EBEF</color> + <color name="card_background">@color/cardview_light_background</color> + <color name="item_background_highlight">#DCDCDC</color> + <color name="briar_warning_background">@color/briar_red</color> + <color name="action_bar_text">@color/briar_white</color> + <color name="private_message_date_inverse">@color/m_grey_300</color> + <color name="forum_avatar_shadow">#99000000</color> + <color name="color_primary">#dd000000</color> - <color name="msg_in">#FFFFFF</color> - <color name="msg_out">#3C7FA9</color> - <color name="notice_in">#EBEFF2</color> - <color name="notice_out">#236087</color> + <color name="msg_in">@color/briar_white</color> + <color name="msg_out">@color/briar_blue_elio_light</color> + <color name="notice_in">@color/briar_blue_grey</color> + <color name="notice_out">@color/briar_blue_elio</color> <!-- text colors --> - <color name="briar_text_link">@color/briar_link</color> + <color name="briar_text_link">@color/briar_blue_light</color> <color name="briar_text_primary">#df000000</color> - <color name="briar_text_primary_inverse">#ffffff</color> + <color name="briar_text_primary_inverse">@color/briar_white</color> <color name="briar_text_secondary_inverse">#b4ffffff</color> <color name="briar_text_tertiary_inverse">#80ffffff</color> - <color name="preference_category">@color/briar_blue_light</color> + + <color name="preference_category">@color/briar_blue_medium</color> <color name="preference_category_background">@color/window_background</color> - <color name="briar_button_color">@color/briar_accent</color> - <color name="briar_button_positive">@color/briar_link</color> - <color name="briar_button_neutral">@color/briar_blue_light</color> - <color name="briar_button_negative">#ff0000</color> + <color name="briar_button_background_color">@color/briar_accent</color> + <color name="briar_button_text_positive">@color/briar_blue_light</color> + <color name="briar_button_text_neutral">@color/briar_blue_medium</color> + <color name="briar_button_text_negative">@color/briar_red</color> <color name="briar_button_text_disabled">#28000000</color> - <color name="briar_warning_background">#ff0000</color> - <color name="thread_indicator">#9e9e9e</color> - <color name="thread_item_background">#eceff1</color> - <color name="thread_item_highlight">#ffffff</color> + <color name="thread_indicator">@color/m_grey_500</color> + <color name="thread_item_background">@color/m_blue_grey_50</color> + <color name="thread_item_highlight">@color/briar_white</color> <color name="divider">#c1c1c1</color> </resources> \ No newline at end of file diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml index 9ec935a2d1..2e697d5152 100644 --- a/briar-android/src/main/res/values/styles.xml +++ b/briar-android/src/main/res/values/styles.xml @@ -30,7 +30,7 @@ <style name="ButtonTheme" parent="Theme.AppCompat.DayNight"> <!-- A strange hack needed only to override button color on all API levels --> - <item name="colorAccent">@color/briar_button_color</item> + <item name="colorAccent">@color/briar_button_background_color</item> </style> <style name="BriarButton" parent="Widget.AppCompat.Button.Colored"> @@ -41,17 +41,17 @@ </style> <style name="BriarButtonFlat.Negative" parent="Widget.AppCompat.Button.Borderless"> - <item name="android:textColor">@color/briar_button_negative</item> + <item name="android:textColor">@color/briar_button_text_negative</item> <item name="android:textSize">@dimen/text_size_medium</item> </style> <style name="BriarButtonFlat.Positive" parent="Widget.AppCompat.Button.Borderless"> - <item name="android:textColor">@color/briar_button_positive</item> + <item name="android:textColor">@color/briar_button_text_positive</item> <item name="android:textSize">@dimen/text_size_medium</item> </style> <style name="BriarButtonFlat.Neutral" parent="Widget.AppCompat.Button.Borderless"> - <item name="android:textColor">@color/briar_button_neutral</item> + <item name="android:textColor">@color/briar_button_text_neutral</item> <item name="android:textSize">@dimen/text_size_medium</item> </style> -- GitLab