From d605e1cae476d3088cbc44b4f1a218a86176c131 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 15 Mar 2016 20:46:24 +0000
Subject: [PATCH] Reverted text colour to black.

@color/briar_text_primary is used in a lot of places other than the settings screen - if we want to use grey text in the settings screen we'll need to find another way.

Also fixed some misspelled resource names and included the colours from the Briar palette in color.xml.
---
 briar-android/res/layout/navigation_menu.xml |  8 ++---
 briar-android/res/values/color.xml           | 32 +++++++++++---------
 briar-android/res/values/dimens.xml          |  4 +--
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/briar-android/res/layout/navigation_menu.xml b/briar-android/res/layout/navigation_menu.xml
index 51360c675..f605fcbf7 100644
--- a/briar-android/res/layout/navigation_menu.xml
+++ b/briar-android/res/layout/navigation_menu.xml
@@ -43,7 +43,7 @@
 			<View
 				style="@style/Divider"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/nav_seperator_height"
+				android:layout_height="@dimen/nav_separator_height"
 				android:layout_marginLeft="@dimen/margin_large"/>
 
 			<android.support.v7.widget.AppCompatButton
@@ -58,7 +58,7 @@
 			<View
 				style="@style/Divider"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/margin_seperator"
+				android:layout_height="@dimen/margin_separator"
 				android:layout_marginLeft="@dimen/margin_large"/>
 
 			<android.support.v7.widget.AppCompatButton
@@ -73,7 +73,7 @@
 			<View
 				style="@style/Divider"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/margin_seperator"
+				android:layout_height="@dimen/margin_separator"
 				android:layout_marginLeft="@dimen/margin_large"/>
 
 			<android.support.v7.widget.AppCompatButton
@@ -88,7 +88,7 @@
 			<View
 				style="@style/Divider"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/margin_seperator"
+				android:layout_height="@dimen/margin_separator"
 				android:layout_marginLeft="@dimen/margin_large"/>
 
 			<FrameLayout
diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml
index 52bb1feb1..bcb8d2b0a 100644
--- a/briar-android/res/values/color.xml
+++ b/briar-android/res/values/color.xml
@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<color name="briar_blue">#2D3E50</color>
+	<color name="briar_blue_dark">#0F1720</color>
+	<color name="briar_gold">#FCCF1C</color>
+	<color name="briar_green_light">#95D220</color>
+	<color name="briar_green_dark">#87C214</color>
+	<color name="briar_red">#C1392B</color>
+
 	<color name="window_background">#EEEEEE</color>
 	<color name="action_bar_text">#FFFFFF</color>
-	<color name="action_bar_background">#2D3E50</color>
+	<color name="action_bar_background">@color/briar_blue</color>
 	<color name="button_bar_background">#FFFFFF</color>
 	<color name="dashboard_background">#FFFFFF</color>
 	<color name="private_message_date">#AAAAAA</color>
 	<color name="unread_background">#FFFFFF</color>
 	<color name="horizontal_border">#CCCCCC</color>
-	<color name="forums_available_background">#FCCF1C</color>
+	<color name="forums_available_background">@color/briar_gold</color>
 	<color name="no_private_messages">#AAAAAA</color>
 	<color name="no_posts">#AAAAAA</color>
-	<color name="settings_title_text">#2D3E50</color>
-	<color name="settings_title_underline">#2D3E50</color>
 
-	<color name="briar_primary">#2D3E50</color>
-	<color name="briar_primary_dark">#0f1720</color>
-	<color name="briar_accent">#2D3E50</color>
-	<color name="briar_accent_dark">#0f1720</color>
+	<color name="briar_primary">@color/briar_blue</color>
+	<color name="briar_primary_dark">@color/briar_blue_dark</color>
 
-	<color name="briar_text_link">#75ab0d</color>
-	<color name="briar_green_light">#95d220</color>
-	<color name="briar_green_dark">#75ab0d</color>
-	<color name="briar_text_primary">#808080</color>
+	<color name="briar_accent">@color/briar_blue</color>
+	<color name="briar_accent_dark">@color/briar_blue_dark</color>
+
+	<color name="briar_text_link">@color/briar_green_dark</color>
+	<color name="briar_text_primary">@color/briar_primary</color>
 	<color name="briar_text_primary_inverse">#ffffff</color>
 
 	<!-- this is needed as preference_category_material layout uses this color as the text color -->
 	<color name="preference_fallback_accent_color">@color/briar_accent</color>
 	<color name="default_background">#ffffff</color>
-	<color name="default_seperator">#000000</color>
-	<color name="default_seperator_inverted">#ffffff</color>
+	<color name="default_separator">#000000</color>
+	<color name="default_separator_inverted">#ffffff</color>
 	<color name="menu_background">#FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/briar-android/res/values/dimens.xml b/briar-android/res/values/dimens.xml
index e38fa64d2..41af17d52 100644
--- a/briar-android/res/values/dimens.xml
+++ b/briar-android/res/values/dimens.xml
@@ -4,7 +4,7 @@
 	<dimen name="margin_activity_horizontal">16dp</dimen>
 	<dimen name="margin_activity_vertical">16dp</dimen>
 
-	<dimen name="margin_seperator">1dp</dimen>
+	<dimen name="margin_separator">1dp</dimen>
 	<dimen name="margin_tiny">2dp</dimen>
 	<dimen name="margin_small">4dp</dimen>
 	<dimen name="margin_medium">8dp</dimen>
@@ -18,7 +18,7 @@
 	<dimen name="text_size_large">20sp</dimen>
 	<dimen name="text_size_xlarge">34sp</dimen>
 	<dimen name="nav_drawer_width">300dp</dimen>
-	<dimen name="nav_seperator_height">1dp</dimen>
+	<dimen name="nav_separator_height">1dp</dimen>
 
 	<dimen name="listitem_horizontal_margin">16dp</dimen>
 	<dimen name="listitem_text_left_margin">72dp</dimen>