Merge branch 'UI_tweaks' into 'master'

Ui tweaks

See merge request leap/bitmask_android!90

6 files changed, 38 insertions, 37 deletions

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 40ab06c5..d8873017 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,11 +2,16 @@
 <resources>
     <color name="colorPrimary">#b39ddb</color>
     <color name="colorPrimaryDark">#ac97d2</color>
+    <color name="colorPrimary_transparent">#20000000</color>
     <color name="colorBackground">#fffafafa</color>
     <color name="colorError">#ef9a9a</color>
     <color name="colorSuccess">#a5d6a7</color>
+    <color name="colorDisabled">#AAAAAA</color>
 
     <color name="black800">#424242</color>
+    <color name="black800_secondary">#3b3b3b</color>
+    <color name="black800_transparent">#AA424242</color>
+    <color name="black800_high_transparent">#22424242</color>
 
     <color name="red200">#ef9a9a</color>
     <color name="pink200">#f48fb1</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 338ad4d5..3adf6cf6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -41,4 +41,6 @@
     <dimen name="constraint_bottom_compact">0.9</dimen>
 
     <dimen name="toast_bottom_padding">20dp</dimen>
+    <dimen name="button_bevel">3dp</dimen>
+    <dimen name="button_radius">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba4ef949..551b7cb1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,11 +49,11 @@
   <string name="setup_error_title">Configuration Error</string>
   <string name="setup_error_configure_button">Configure</string>
   <string name="setup_error_close_button">Exit</string>
-  <string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
+  <string name="setup_error_text">There was an error configuring %s with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
   <string name="server_unreachable_message">The server is unreachable, please try again.</string>
   <string name="error.security.pinnedcertificate">Security error, upgrade the app or choose another provider.</string>
-  <string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string>
-  <string name="certificate_error">This is not a trusted Bitmask provider.</string>
+  <string name="malformed_url">It doesn\'t seem to be a %s provider.</string>
+  <string name="certificate_error">This is not a trusted %s provider.</string>
   <string name="service_is_down_error">The service is down.</string>
   <string name="configuring_provider">Configuring provider</string>
   <string name="incorrectly_downloaded_certificate_message">Your anonymous certificate was not downloaded</string>
@@ -72,29 +72,20 @@
   <string name="provider_problem">It seems there is a problem with the provider.</string>
   <string name="try_another_provider">Please try another provider, or contact yours.</string>
   <string name="default_username">Anonymous</string>
-  <string name="logged_in_user_status">is logged in.</string>
-  <string name="logged_out_user_status">logged out.</string>
-  <string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or with the provider. Should it persist, wipe the Bitmask data from the Android settings.</string>
-  <string name="not_logged_in_user_status">have not logged in.</string>
-  <string name="logging_in_user_status">is logging in.</string>
   <string name="logging_in">Logging in</string>
   <string name="signing_up">Signing up</string>
-  <string name="logging_out_user_status">is logging out.</string>
-  <string name="signingup_message">is being registered.</string>
   <string name="vpn.button.turn.on">Turn on</string>
   <string name="vpn.button.turn.off">Turn off</string>
   <string name="vpn_button_turn_off_blocking">Stop blocking</string>
   <string name="vpn_securely_routed">Your traffic is securely routed through:</string>
   <string name="vpn_securely_routed_no_internet">No internet connection detected, when it comes back we\'ll route your traffic securely through:</string>
-  <string name="bitmask_log">Bitmask Log</string>
-  <string name="title_activity_main">Bitmask</string>
   <string name="log_fragment_title">Log</string>
   <string name="vpn_fragment_title">VPN</string>
   <string name="navigation_drawer_open">Open navigation drawer</string>
   <string name="navigation_drawer_close">Close navigation drawer</string>
   <string name="action_example">Example action</string>
   <string name="action_settings">Settings</string>
-  <string name="void_vpn_establish">Bitmask blocks all outgoing internet traffic.</string>
+  <string name="void_vpn_establish">%s blocks all outgoing internet traffic.</string>
   <string name="void_vpn_error_establish">Failed to establish blocking VPN.</string>
   <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string>
   <string name="void_vpn_title">Blocking traffic</string>
@@ -102,9 +93,9 @@
   <string name="update_certificate">Update certificate</string>
   <string name="warning_eip_json_corrupted">Updating provider configuration failed.</string>
   <string name="eip_json_corrupted_user_message">Updating provider configuration failed. Please log in to try again.</string>
-  <string name="warning_corrupted_provider_details">Stored provider details are corrupted. You can either update Bitmask (recommended) or update the provider details using a commercial CA certificate.</string>
-  <string name="warning_corrupted_provider_cert">Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string>
-  <string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string>
+  <string name="warning_corrupted_provider_details">Stored provider details are corrupted. You can either update %s (recommended) or update the provider details using a commercial CA certificate.</string>
+  <string name="warning_corrupted_provider_cert">Stored provider certificate is invalid. You can either update %s (recommended) or update the provider certificate using a commercial CA certificate.</string>
+  <string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update %s (recommended) or update the provider certificate using a commercial CA certificate.</string>
   <string name="downloading_vpn_certificate_failed">Downloading the VPN certificate failed. Try again or choose another provider.</string>
   <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string>
   <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4e845384..b8c0bc59 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -62,6 +62,9 @@
 
     <style name="BitmaskButton" parent="android:Widget.Button">
         <item name="android:textAllCaps">true</item>
+        <item name="android:background">@drawable/cust_button_primary</item>
+        <item name="android:height">36dp</item>
+        <item name="android:minWidth">75dp</item>
     </style>
 
     <style name="BitmaskActivity">
@@ -69,8 +72,14 @@
 
     <style name="BitmaskButtonBlack" parent="android:Widget.Button">
         <item name="android:textAllCaps">true</item>
-        <item name="android:background">@color/black800</item>
+        <item name="android:background">@drawable/cust_button_primary_black</item>
         <item name="android:textColor">@color/white</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="error_appearance" parent="@android:style/TextAppearance">
+        <item name="android:textColor">@color/colorError</item>
+        <item name="android:textSize">11sp</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f3c55f41..51a8ea0e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,7 +2,7 @@
 <resources>
     <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
 
         <item name="textColorError">@color/colorError</item>
 
@@ -11,18 +11,13 @@
 
         <!-- button and controls -->
         <item name="android:buttonStyle">@style/BitmaskButton</item>
-        <item name="colorButtonNormal">@color/colorPrimaryDark</item>
-        <item name="colorControlHighlight">@color/colorPrimaryDark</item>
+        <item name="buttonStyle">@style/BitmaskButton</item>
     </style>
 
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:windowBackground">@drawable/splash_page</item>
     </style>
 
-    <style name="foo">
-        <item name="textColorError">@color/colorPrimary</item>
-    </style>
-
 </resources>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 07cca36e..a92cd176 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="notifcation_title_bitmask">%s - %s</string>
-    <string name="copyright_leapgui" translatable="false">Copyright 2012-2018\nLEAP Encryption Access Project &lt;info@leap.se></string>
-    <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
+    <string name="notifcation_title_bitmask" translatable="false">%s - %s</string>
+    <string name="copyright_leapgui" translatable="false">Copyright 2012-2019\nLEAP Encryption Access Project &lt;info@leap.se></string>
+    <string name="opevpn_copyright" translatable="false">Copyright © 2002–2019 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
 	  "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
     <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
-    <string name="copyright_openssl" translatable="false">        This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
-        Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
+    <string name="copyright_openssl" translatable="false"> Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.\n\n
         This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
         Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string>
-    <string name="copyright_okhttp" translatable="false">Copyright © 2016 Square, Inc.</string>
+    <string name="copyright_okhttp" translatable="false">Copyright © 2019 Square, Inc.</string>
     <string name="okhttp" translatable="false">OkHttp</string>
     <string name="openvpn" translatable="false">OpenVPN</string>
     <string name="lzo" translatable="false">LZO</string>
@@ -18,18 +17,18 @@
     <string name="copyright_mbetTLS" translatable="false">Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license, as can be found in: apache-2.0.txt. \n
         https://github.com/schwabe/polarssl/blob/icsopenvpn_270/apache-2.0.txt
     </string>
-    <string name="asio">Asio</string>
-    <string name="copyright_asio">Boost Software License - Version 1.0 - August 17th, 2003</string>
-    <string name="openvpn3">OpenVPN 3</string>
-    <string name="copyright_openvpn3">GNU AFFERO GENERAL PUBLIC LICENSE\n
+    <string name="asio" translatable="false">Asio</string>
+    <string name="copyright_asio" translatable="false">Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com).\n\nDistributed under the Boost Software License, Version 1.0.</string>
+    <string name="openvpn3" translatable="false">OpenVPN 3</string>
+    <string name="copyright_openvpn3" translatable="false">GNU AFFERO GENERAL PUBLIC LICENSE\n
         Version 3, 19 November 2007</string>
     <string name="unknown_state" translatable="false">Unknown state</string>
-    <string name="copyright_blinktgui" translatable="false">Copyright 2012–2017 Arne Schwabe &lt;arne@rfc2549.org></string>
+    <string name="copyright_blinktgui" translatable="false">Copyright 2012–2019 Arne Schwabe &lt;arne@rfc2549.org></string>
     <string name="defaultserver" translatable="false">openvpn.uni-paderborn.de</string>
     <string name="defaultport" translatable="false">1194</string>
     <string name="copyright_file_dialog" translatable="false">File Dialog based on work by Alexander Ponomarev</string>
     <string name="file_dialog" translatable="false">File Dialog</string>
-    <string name="permission_description">Allows another app to control OpenVPN</string>
+    <string name="permission_description" translatable="false">Allows another app to control OpenVPN</string>
     <string name="bouncy_castle" translatable="false">Bouncy Castle Crypto APIs</string>
     <string name="copyright_bouncycastle" translatable="false">Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string>
     <string name="state_user_vpn_permission" translatable="false">Waiting for user permission to use VPN API</string>