From 123d40dbf3921c5b39938f3b18460eb4a11bf3d6 Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 7 Aug 2018 00:10:26 +0200
Subject: New app color scheme

---
 app/src/main/res/drawable/horizontal_line.xml              |  2 +-
 app/src/main/res/drawable/ic_build_primary_24dp.xml        |  2 +-
 app/src/main/res/drawable/ic_help_primary_24dp.xml         |  2 +-
 app/src/main/res/drawable/ic_link_off_primary_24dp.xml     |  2 +-
 .../res/drawable/ic_pause_circle_filled_primary_24dp.xml   |  2 +-
 .../res/drawable/ic_pause_circle_outline_primary_24dp.xml  |  2 +-
 app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml |  4 ++--
 app/src/main/res/drawable/ic_receipt_primary_24dp.xml      |  2 +-
 app/src/main/res/drawable/ic_share_primary_24dp.xml        |  2 +-
 app/src/main/res/drawable/ic_warning_primary_24dp.xml      |  2 +-
 app/src/main/res/layout/common_progress_dialog.xml         |  3 ++-
 app/src/main/res/layout/dialog_node_details.xml            |  3 ++-
 app/src/main/res/layout/page_viewlog.xml                   |  2 +-
 app/src/main/res/menu/menu_base.xml                        |  2 +-
 app/src/main/res/menu/menu_start.xml                       |  2 +-
 app/src/main/res/menu/menu_status.xml                      |  4 ++--
 app/src/main/res/menu/menu_viewlog.xml                     |  4 ++--
 app/src/main/res/values/colors.xml                         | 14 ++++++++------
 app/src/main/res/values/styles.xml                         | 10 +++++-----
 19 files changed, 35 insertions(+), 31 deletions(-)

(limited to 'app')

diff --git a/app/src/main/res/drawable/horizontal_line.xml b/app/src/main/res/drawable/horizontal_line.xml
index a95e4f1..e9e9fab 100644
--- a/app/src/main/res/drawable/horizontal_line.xml
+++ b/app/src/main/res/drawable/horizontal_line.xml
@@ -20,5 +20,5 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 	<size android:height="1dp"/>
-	<solid android:color="@color/colorPrimaryLighter"/>
+	<solid android:color="@color/separator"/>
 </shape>
diff --git a/app/src/main/res/drawable/ic_build_primary_24dp.xml b/app/src/main/res/drawable/ic_build_primary_24dp.xml
index 187b4c0..bf42151 100644
--- a/app/src/main/res/drawable/ic_build_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_build_primary_24dp.xml
@@ -23,6 +23,6 @@
 				android:viewportWidth="24.0"
 				android:viewportHeight="24.0">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_help_primary_24dp.xml b/app/src/main/res/drawable/ic_help_primary_24dp.xml
index 6baef6e..6f1cf22 100644
--- a/app/src/main/res/drawable/ic_help_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_help_primary_24dp.xml
@@ -23,6 +23,6 @@
 				android:viewportWidth="24.0"
 				android:viewportHeight="24.0">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_link_off_primary_24dp.xml b/app/src/main/res/drawable/ic_link_off_primary_24dp.xml
index c88096d..e58d740 100644
--- a/app/src/main/res/drawable/ic_link_off_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_link_off_primary_24dp.xml
@@ -23,6 +23,6 @@
 				android:viewportHeight="24"
 				android:viewportWidth="24">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1 0,1.43 -0.98,2.63 -2.31,2.98l1.46,1.46C20.88,15.61 22,13.95 22,12c0,-2.76 -2.24,-5 -5,-5zM16,11h-2.19l2,2L16,13zM2,4.27l3.11,3.11C3.29,8.12 2,9.91 2,12c0,2.76 2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1 0,-1.59 1.21,-2.9 2.76,-3.07L8.73,11L8,11v2h2.73L13,15.27L13,17h1.73l4.01,4L20,19.74 3.27,3 2,4.27z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_circle_filled_primary_24dp.xml b/app/src/main/res/drawable/ic_pause_circle_filled_primary_24dp.xml
index 85e5da1..3e7b3df 100644
--- a/app/src/main/res/drawable/ic_pause_circle_filled_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_pause_circle_filled_primary_24dp.xml
@@ -23,6 +23,6 @@
 				android:viewportHeight="24.0"
 				android:viewportWidth="24.0">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,16L9,16L9,8h2v8zM15,16h-2L13,8h2v8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_circle_outline_primary_24dp.xml b/app/src/main/res/drawable/ic_pause_circle_outline_primary_24dp.xml
index 5613f25..245cb7e 100644
--- a/app/src/main/res/drawable/ic_pause_circle_outline_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_pause_circle_outline_primary_24dp.xml
@@ -23,6 +23,6 @@
 				android:viewportHeight="24.0"
 				android:viewportWidth="24.0">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M9,16h2L11,8L9,8v8zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM13,16h2L15,8h-2v8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml b/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
index 7ac9983..b511a87 100644
--- a/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
@@ -23,9 +23,9 @@
 				android:viewportHeight="24.0"
 				android:viewportWidth="24.0">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_receipt_primary_24dp.xml b/app/src/main/res/drawable/ic_receipt_primary_24dp.xml
index 35d339f..42fd1b4 100644
--- a/app/src/main/res/drawable/ic_receipt_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_receipt_primary_24dp.xml
@@ -23,6 +23,6 @@
 				android:viewportHeight="24.0"
 				android:viewportWidth="24.0">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M18,17L6,17v-2h12v2zM18,13L6,13v-2h12v2zM18,9L6,9L6,7h12v2zM3,22l1.5,-1.5L6,22l1.5,-1.5L9,22l1.5,-1.5L12,22l1.5,-1.5L15,22l1.5,-1.5L18,22l1.5,-1.5L21,22L21,2l-1.5,1.5L18,2l-1.5,1.5L15,2l-1.5,1.5L12,2l-1.5,1.5L9,2 7.5,3.5 6,2 4.5,3.5 3,2v20z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share_primary_24dp.xml b/app/src/main/res/drawable/ic_share_primary_24dp.xml
index 2514fec..33d36ee 100644
--- a/app/src/main/res/drawable/ic_share_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_share_primary_24dp.xml
@@ -23,6 +23,6 @@
 				android:viewportHeight="24.0"
 				android:viewportWidth="24.0">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_warning_primary_24dp.xml b/app/src/main/res/drawable/ic_warning_primary_24dp.xml
index d8fa0fe..9409c08 100644
--- a/app/src/main/res/drawable/ic_warning_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_warning_primary_24dp.xml
@@ -23,6 +23,6 @@
 				android:viewportHeight="24.0"
 				android:viewportWidth="24.0">
 	<path
-		android:fillColor="@color/textPrimary"
+		android:fillColor="@color/textTitle"
 		android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
 </vector>
diff --git a/app/src/main/res/layout/common_progress_dialog.xml b/app/src/main/res/layout/common_progress_dialog.xml
index 2c76cd1..fa2f37d 100644
--- a/app/src/main/res/layout/common_progress_dialog.xml
+++ b/app/src/main/res/layout/common_progress_dialog.xml
@@ -35,6 +35,7 @@
 		android:id="@+id/common_progress_dialog_text"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="20dp"/>
+		android:layout_marginStart="20dp"
+		android:textColor="@color/textSecondary"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_node_details.xml b/app/src/main/res/layout/dialog_node_details.xml
index 030c189..938c2a2 100644
--- a/app/src/main/res/layout/dialog_node_details.xml
+++ b/app/src/main/res/layout/dialog_node_details.xml
@@ -31,6 +31,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:fontFamily="monospace"
-		android:text="@string/message_loading"/>
+		android:text="@string/message_loading"
+		android:textColor="@color/textSecondary"/>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/page_viewlog.xml b/app/src/main/res/layout/page_viewlog.xml
index 2cffb16..4eea176 100644
--- a/app/src/main/res/layout/page_viewlog.xml
+++ b/app/src/main/res/layout/page_viewlog.xml
@@ -33,6 +33,6 @@
 		android:paddingLeft="@dimen/activity_horizontal_margin"
 		android:paddingRight="@dimen/activity_horizontal_margin"
 		android:paddingTop="@dimen/activity_vertical_margin"
-		android:textColor="@color/colorPrimary"
+		android:textColor="@color/textSecondary"
 		android:textSize="12sp"/>
 </ScrollView>
diff --git a/app/src/main/res/menu/menu_base.xml b/app/src/main/res/menu/menu_base.xml
index 1ebe0fc..4a39baf 100644
--- a/app/src/main/res/menu/menu_base.xml
+++ b/app/src/main/res/menu/menu_base.xml
@@ -27,7 +27,7 @@
 		android:id="@+id/menu_about"
 		android:icon="@drawable/ic_help_primary_24dp"
 		android:onClick="aboutDialog"
-		android:tint="@color/colorAccent"
+		android:tint="@color/textAccent"
 		android:title="@string/menu_about"
 		app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_start.xml b/app/src/main/res/menu/menu_start.xml
index 8e90229..9d2ba25 100644
--- a/app/src/main/res/menu/menu_start.xml
+++ b/app/src/main/res/menu/menu_start.xml
@@ -27,7 +27,7 @@
 		android:id="@+id/menu_about"
 		android:icon="@drawable/ic_build_primary_24dp"
 		android:onClick="openConfigureActivity"
-		android:tint="@color/colorAccent"
+		android:tint="@color/textAccent"
 		android:title="@string/menu_configure"
 		app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_status.xml b/app/src/main/res/menu/menu_status.xml
index 1595845..e6baf0f 100644
--- a/app/src/main/res/menu/menu_status.xml
+++ b/app/src/main/res/menu/menu_status.xml
@@ -27,7 +27,7 @@
 		android:id="@+id/menu_disconnect"
 		android:icon="@drawable/ic_link_off_primary_24dp"
 		android:onClick="stopVpn"
-		android:tint="@color/colorAccent"
+		android:tint="@color/textAccent"
 		android:title="@string/menu_disconnect"
 		app:showAsAction="ifRoom"/>
 
@@ -35,7 +35,7 @@
 		android:id="@+id/menu_show_log"
 		android:icon="@drawable/ic_receipt_primary_24dp"
 		android:onClick="openLogViewer"
-		android:tint="@color/colorAccent"
+		android:tint="@color/textAccent"
 		android:title="@string/menu_show_log"
 		app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_viewlog.xml b/app/src/main/res/menu/menu_viewlog.xml
index 3fb9d2c..7b1ce6d 100644
--- a/app/src/main/res/menu/menu_viewlog.xml
+++ b/app/src/main/res/menu/menu_viewlog.xml
@@ -27,14 +27,14 @@
 		android:id="@+id/log_viewer_action_toggle"
 		android:icon="@drawable/ic_pause_circle_outline_primary_24dp"
 		android:onClick="toggleLogging"
-		android:tint="@color/colorAccent"
+		android:tint="@color/textAccent"
 		android:title="@string/menu_toggle_logging"
 		app:showAsAction="ifRoom"/>
 
 	<item
 		android:icon="@drawable/ic_share_primary_24dp"
 		android:onClick="share"
-		android:tint="@color/colorAccent"
+		android:tint="@color/textAccent"
 		android:title="@string/menu_share_log"
 		app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2d686cc..71a04b7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,12 +19,14 @@
 -->
 
 <resources>
-	<color name="textPrimary">#FFFFFFFF</color>
-	<color name="colorPrimary">#424242</color>
-	<color name="colorPrimaryDark">#212121</color>
-	<color name="colorPrimaryLight">#757575</color>
-	<color name="colorPrimaryLighter">#d9d9d9</color>
-	<color name="colorAccent">#f9a825</color>
+	<color name="headerBackgroundPrimary">#13af96</color>
+	<color name="headerBackgroundPrimaryDark">#007f68</color>
+
+	<color name="textTitle">#FFFFFFFF</color>
+	<color name="textAccent">#007f68</color>
+	<color name="textSecondary">#212121</color>
+
+	<color name="separator">#d9d9d9</color>
 
 	<color name="backgroundPrimary">#FFFFFF</color>
 	<color name="backgroundSecondary">#d9d9d9</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 445326b..859d4ee 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,9 +20,9 @@
 
 <resources>
 	<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-		<item name="colorPrimary">@color/colorPrimary</item>
-		<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-		<item name="colorAccent">@color/colorAccent</item>
+		<item name="colorPrimary">@color/headerBackgroundPrimary</item>
+		<item name="colorPrimaryDark">@color/headerBackgroundPrimaryDark</item>
+		<item name="colorAccent">@color/textAccent</item>
 	</style>
 
 	<style name="AppTheme.NoActionBar">
@@ -35,7 +35,7 @@
 	<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
 	<style name="AppTheme.SectionTitle">
-		<item name="android:textColor">@color/colorAccent</item>
+		<item name="android:textColor">@color/textAccent</item>
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
@@ -79,6 +79,6 @@
 	<style name="AppTheme.BlockContent">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="android:textColor">@color/colorPrimaryLight</item>
+		<item name="android:textColor">@color/textSecondary</item>
 	</style>
 </resources>
-- 
cgit v1.2.3