Give names to colors and clean them up

parent b6c85c8b
......@@ -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();
......
......@@ -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();
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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"/>
......
......@@ -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"
......
......@@ -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
......@@ -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
......@@ -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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment