Merge branch 'simply_secure_UI_changes' into 'master'

Gateway selection UI overhaul

Closes #9047

See merge request leap/bitmask_android!140

5 files changed, 25 insertions, 6 deletions

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a8cdb28e..c1039f70 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,6 +7,8 @@
     <color name="colorError">#ef9a9a</color>
     <color name="colorSuccess">#a5d6a7</color>
     <color name="colorDisabled">#AAAAAA</color>
+    <color name="colorMainBtnHighlight">#03DAC6</color>
+    <color name="colorMainBtnError">#eF2222</color>
 
     <color name="black800">#424242</color>
     <color name="black800_secondary">#3b3b3b</color>
@@ -31,9 +33,14 @@
     <color name="deepOrange200">#ffab91</color>
 
     <color name="white">#ffffff</color>
+    <color name="white_transparent">#20ffffff</color>
+    <color name="black_transparent">#20000000</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="colorWarning">#B33A3A</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22696c12..9d62cc3b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,10 +152,13 @@
   <string name="version_update_error_permissions">No permissions to install app.</string>
   <string name="gateway_selection_title">Select location</string>
   <string name="gateway_selection_warning">%s will find the best connection for you.</string>
-  <string name="gateway_selection_best_location">Location with best connection</string>
+  <string name="gateway_selection_recommended_location">Use recommended location</string>
+  <string name="gateway_selection_recommended">Recommended</string>
+  <string name="gateway_selection_manually">Manually select</string>
+  <string name="gateway_selection_automatic_location">Automatically use best connection.</string>
   <string name="gateway_selection_automatic">Automatic</string>
-  <string name="gateway_selection_current_location">Your traffic is currently routed through: </string>
-
+  <string name="finding_best_connection">Finding best connection…</string>
+  <string name="reconnecting">Reconnecting…</string>
   <string name="tor_starting">Starting bridges for censorship circumvention…</string>
   <string name="tor_stopping">Stopping bridges.</string>
   <string name="tor_started">Using bridges for censorship circumvention.</string>
@@ -181,5 +184,4 @@
   <string name="hide_connection_details">Hide connection details</string>
   <string name="error_network_connection">%s has no internet connection. Please check your WiFi and cellular data settings.</string>
 
-
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b8c0bc59..9b05d3fe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,6 +65,7 @@
         <item name="android:background">@drawable/cust_button_primary</item>
         <item name="android:height">36dp</item>
         <item name="android:minWidth">75dp</item>
+        <item name="android:textColor">@color/colorFontBtn</item>
     </style>
 
     <style name="BitmaskActivity">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ab489fc6..e54feaff 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,9 +3,9 @@
     <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:fontFamily">@font/sofiapro_regular</item>
 
         <item name="textColorError">@color/colorError</item>
-
         <!-- progressBar color -->
         <item name="colorAccent">@color/colorPrimary</item>
 
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index a08857c1..ec795f57 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -47,6 +47,15 @@
    <!-- gateway selector, move to strings.xml, once the wording is clear -->
     <string name="warning_no_more_gateways_manual_gw_selection" translatable="false">%1$s could not connect to %2$s. Do you want to try to connect automatically with best location?</string>
     <string name="warning_option_try_best" translatable="false">Try best location</string>
-
+    <string name="warning_bridges_not_supported" translatable="false">%1$s doesn\'t support bridges to circumvent VPN filtering. Do you want to choose a different location or disable bridges?</string>
+    <string name="option_disable_bridges" translatable="false">Disable bridges</string>
+    <string name="option_different_location" translatable="false">Choose different location</string>
+    <string name="eip_state_insecure" translatable="false">Connection Insecure</string>
+    <string name="eip_state_connected_recommended" translatable="false">You are connected to the recommended location</string>
+    <string name="eip_state_connected_manual" translatable="false">You are connected to</string>
+    <string name="eip_state_connecting" translatable="false">Connecting...</string>
+    <string name="connection_not_connected" translatable="false">You may be leaking information to your internet provider or local network.</string>
+    <string name="eip_state_no_network" translatable="false">You have no working Internet connection. Once you get it back, you will be automatically connected to</string>
+    <string name="eip_state_blocking" translatable="false">%1$s is blocking all internet traffic.</string>
 
 </resources>
\ No newline at end of file