From 0cf31d76c9f48cc73446b3fde478a46cd29c7594 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Tue, 29 Nov 2022 00:58:36 +0100
Subject: split EipFragment and MainButon into normal and custom flavor,
 implement new on-off button design for Bitmask

---
 app/src/main/res/values/colors.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 40b51436..dbc7326f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,6 +14,7 @@
     <color name="black800_secondary">#3b3b3b</color>
     <color name="black800_transparent">#AA424242</color>
     <color name="black800_high_transparent">#22424242</color>
+    <color name="transparent">#00000000</color>
 
     <color name="red200">#ef9a9a</color>
     <color name="pink200">#f48fb1</color>
@@ -45,5 +46,11 @@
     <color name="colorLocationButtonTint">@color/black800</color>
     <color name="colorLocationButtonTintTransparent">@color/black800_high_transparent</color>
     <color name="colorWarning">#B33A3A</color>
+    <color name="btn_red">#FF7D7D</color>
+    <color name="btn_red_dark">#c84c51</color>
+    <color name="btn_yellow">#FFBF00</color>
+    <color name="btn_yellow_dark">#C78F00</color>
+    <color name="btn_green">#9FC17F</color>
+    <color name="btn_green_dark">#709152</color>
 
 </resources>
-- 
cgit v1.2.3


From c2f6bc4e2098265fb1fc8f671dbdecbb5917c6fc Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Tue, 29 Nov 2022 14:01:05 +0100
Subject: new EipFragment layout for Bitmask - portrait

---
 app/src/main/res/values/colors.xml  | 5 +++++
 app/src/main/res/values/strings.xml | 3 +++
 2 files changed, 8 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dbc7326f..7ec2e81a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -52,5 +52,10 @@
     <color name="btn_yellow_dark">#C78F00</color>
     <color name="btn_green">#9FC17F</color>
     <color name="btn_green_dark">#709152</color>
+    <color name="btn_white_transparent">#CCFFFEFE</color>
+    <color name="btn_white_transparent_dark">#CCCCCBCB</color>
+    <color name="bg_red_1">#EC6767</color>
+    <color name="bg_red_2">#DB6F66</color>
+    <color name="bg_red_3">#D05D59</color>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92229e44..722f10ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,6 +67,9 @@
   <string name="authentication_failed_message">Authentication failed</string>
   <string name="registration_failed_message">Registration failed</string>
   <string name="eip_status_start_pending">Initiating connection</string>
+  <string name="eip_status_connecting">Connecting VPN</string>
+  <string name="eip_status_unsecured">Unsecured Connection</string>
+  <string name="eip_status_secured">Secured Connection</string>
   <string name="eip_cancel_connect_title">Cancel connection?</string>
   <string name="eip_cancel_connect_text">There is a connection attempt in progress.  Do you wish to cancel it?</string>
   <string name="eip.warning.browser_inconsistency">Turn off VPN connection? When the VPN is off, you may leak personal information to your Internet provider or local network.</string>
-- 
cgit v1.2.3


From 980a6986db013304e02589c41020cdfa67215854 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Tue, 29 Nov 2022 18:43:12 +0100
Subject: tint action bar according to connection state

---
 app/src/main/res/values/colors.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7ec2e81a..b6971138 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -54,8 +54,12 @@
     <color name="btn_green_dark">#709152</color>
     <color name="btn_white_transparent">#CCFFFEFE</color>
     <color name="btn_white_transparent_dark">#CCCCCBCB</color>
-    <color name="bg_red_1">#EC6767</color>
-    <color name="bg_red_2">#DB6F66</color>
-    <color name="bg_red_3">#D05D59</color>
-
+    <color name="bg_red_top">#EC6767</color>
+    <color name="bg_red_top_light_transparent">#CCff9895</color>
+    <color name="bg_yellow_top">#FADD85</color>
+    <color name="bg_yellow_top_light_transparent">#CCffffb6</color>
+    <color name="bg_green_top">#CCDCB8</color>
+    <color name="bg_green_top_light_transparent">#ffffea</color>
+    <color name="actionbar_dark_color">@color/black800</color>
+    <color name="actionbar_light_color">@color/white</color>
 </resources>
-- 
cgit v1.2.3


From da824fa125a5583d07e8ac2f6585459956d87ac1 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Wed, 30 Nov 2022 01:37:33 +0100
Subject: rename drawables and colors according to the state they're
 representing

---
 app/src/main/res/values/colors.xml | 43 +++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 17 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b6971138..c3a519cf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,34 +32,43 @@
     <color name="amber200">#ffe082</color>
     <color name="orange200">#ffcc80</color>
     <color name="deepOrange200">#ffab91</color>
-
     <color name="white">#ffffff</color>
     <color name="white_transparent">#20ffffff</color>
     <color name="black_transparent">#20000000</color>
     <color name="black_high_transparent">#05000000</color>
 
-    <color name="colorActionBarTitleFont">@color/white</color>
-    <color name="colorActionBarSubtitleFont">@color/black800</color>
+
     <color name="colorEipFragmentFont">@color/black800</color>
     <color name="colorFontBtn">@color/black800</color>
     <color name="colorFontBtnEnabled">@color/white</color>
     <color name="colorLocationButtonTint">@color/black800</color>
     <color name="colorLocationButtonTintTransparent">@color/black800_high_transparent</color>
     <color name="colorWarning">#B33A3A</color>
-    <color name="btn_red">#FF7D7D</color>
-    <color name="btn_red_dark">#c84c51</color>
-    <color name="btn_yellow">#FFBF00</color>
-    <color name="btn_yellow_dark">#C78F00</color>
-    <color name="btn_green">#9FC17F</color>
-    <color name="btn_green_dark">#709152</color>
-    <color name="btn_white_transparent">#CCFFFEFE</color>
-    <color name="btn_white_transparent_dark">#CCCCCBCB</color>
-    <color name="bg_red_top">#EC6767</color>
-    <color name="bg_red_top_light_transparent">#CCff9895</color>
-    <color name="bg_yellow_top">#FADD85</color>
-    <color name="bg_yellow_top_light_transparent">#CCffffb6</color>
-    <color name="bg_green_top">#CCDCB8</color>
-    <color name="bg_green_top_light_transparent">#ffffea</color>
+
+    <!-- main UI on/off button colors -->
+    <color name="btn_start">#FF7D7D</color>
+    <color name="btn_start_dark">#c84c51</color>
+    <color name="btn_cancel">#FFBF00</color>
+    <color name="btn_cancel_dark">#C78F00</color>
+    <color name="btn_stop">#9FC17F</color>
+    <color name="btn_stop_dark">#709152</color>
+
+    <!-- location button background colors -->
+    <color name="btn_light_transparent">#CCFFFEFE</color>
+    <color name="btn_light_transparent_dark">#CCCCCBCB</color>
+
+    <!-- actionbar and status bar colors for different connection states -->
+    <color name="bg_disconnected_top">#EC6767</color>
+    <color name="bg_disconnected_top_light_transparent">#CCff9895</color>
+    <color name="bg_connecting_top">#FADD85</color>
+    <color name="bg_connecting_top_light_transparent">#CCffffb6</color>
+    <color name="bg_running_top">#CCDCB8</color>
+    <color name="bg_running_top_light_transparent">#ffffea</color>
+
+    <!-- action bar text colors for per state colored action bar -->
     <color name="actionbar_dark_color">@color/black800</color>
     <color name="actionbar_light_color">@color/white</color>
+    <!-- default action bar colors used in other fragments than EipFragment -->
+    <color name="colorActionBarTitleFont">@color/white</color>
+    <color name="colorActionBarSubtitleFont">@color/black800</color>
 </resources>
-- 
cgit v1.2.3