Merge branch 'first_run_improvements' into 'master'

update design and UX for provider setup

See merge request leap/bitmask_android!252

4 files changed, 258 insertions, 217 deletions

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0189bacf..10d802cd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#b39ddb</color>
-    <color name="colorPrimaryDark">#ac97d2</color>
-    <color name="colorPrimary_transparent">#20000000</color>
+    <color name="colorPrimary">#ff1b8b</color>
+    <color name="colorPrimaryLight">#FF69B4</color>
+    <color name="colorPrimaryDark">#ef0072</color>
+    <color name="colorPrimary_transparent">#0B000000</color>
     <color name="colorBackground">#fffafafa</color>
     <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="black">#000000</color>
     <color name="black800_dark">#1b1b1b</color>
@@ -43,8 +42,8 @@
     <!-- button text colors in Alerts etc. -->
     <color name="color_font_btn">@color/black800</color>
     <!-- pill style button text colors -->
-    <color name="color_font_btn_primary">@color/black800</color>
-    <color name="color_font_btn_secondary">@color/black800</color>
+    <color name="color_font_btn_primary">@color/white</color>
+    <color name="color_font_btn_secondary">@color/white</color>
     <color name="colorLocationButtonTint">@color/black</color>
     <color name="colorLocationButtonTintTransparent">@color/black800_high_transparent</color>
     <color name="colorWarning">#B33A3A</color>
@@ -67,6 +66,8 @@
     <color name="bg_running">#CCDCB8</color>
 
     <!-- actionbar and status bar colors for different connection states -->
+    <color name="bg_setup_action_bar">@color/colorPrimary</color>
+    <color name="bg_setup_status_bar">@color/colorPrimaryDark</color>
     <color name="bg_disconnected_top">#EC6767</color>
     <color name="bg_disconnected_top_light_transparent">#CCff9895</color>
     <color name="bg_connecting_top">#FADD85</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f15fbcf9..b17683ae 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,9 +9,7 @@
     <dimen name="compact_padding">3dp</dimen>
     <dimen name="standard_margin">8dp</dimen>
     <bool name="logSildersAlwaysVisible">false</bool>
-    <!-- landscape layout dimens -->
-    <dimen name="footer_text_padding">12dp</dimen>
-    <dimen name="splash_text_top_padding">80dp</dimen>
+
 
     <dimen name="diameter">48dp</dimen>
     <dimen name="elevation_low">1dp</dimen>
@@ -48,4 +46,5 @@
     <dimen name="mainbutton_padding">8dp</dimen>
     <dimen name="donation_reminder_padding">8dp</dimen>
 
+    <dimen name="setup_bottom_bar">50dp</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 cb9a843b..90d06333 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,209 +1,240 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="retry">Retry</string>
-  <string name="repository_url_text">Source code available at https://0xacab.org/leap/bitmask_android</string>
-  <string name="leap_tracker">Issue tracker available at https://0xacab.org/leap/bitmask_android/issues</string>
-  <string name="translation_project_text">Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask/</string>
-  <string name="switch_provider_menu_option">Switch provider</string>
-  <string name="info">info</string>
-  <string name="show_connection_details">Show connection details</string>
-  <string name="connection_details">Connection details</string>
-  <string name="routes_info">Routes: %s</string>
-  <string name="routes_info6">IPv6 routes: %s</string>
-  <string name="error_empty_username">The username must not be empty.</string>
-  <string name="cert_from_keystore">Got certificate \'%s\' from keystore</string>
-  <string name="provider_label">Provider:</string>
-  <string name="provider_label_none">No provider configured</string>
-  <string name="status_unknown">Status unknown.</string>
-  <string name="eip_service_label">Encrypted VPN Internet Access</string>
-  <string name="configuration_wizard_title">Select a service provider</string>
-  <string name="add_provider">Add new Provider</string>
-  <string name="introduce_new_provider">Add a new service provider</string>
-  <string name="save">Save</string>
-  <string name="new_provider_uri">Domain name</string>
-  <string name="valid_url_entered">The URL is valid</string>
-  <string name="not_valid_url_entered">Malformed URL</string>
-  <string name="provider_details_title">Provider details</string>
-  <string name="use_anonymously_button">Use anonymously</string>
-  <string name="username_hint">username</string>
-  <string name="username_ask">Please enter your username</string>
-  <string name="password_ask">Please enter your password</string>
-  <string name="password_hint">password</string>
-  <string name="password_match">Passwords match</string>
-  <string name="password_mismatch">Passwords do not match</string>
-  <string name="user_message">User message</string>
-  <string name="about_fragment_title">About</string>
-  <string name="exclude_apps_fragment_title">Exclude apps from VPN</string>
-  <string name="error_srp_math_error_user_message">Try again: Server math error</string>
-  <string name="error_bad_user_password_user_message">Incorrect username or password</string>
-  <string name="error_not_valid_password_user_message">It must be at least 8 characters long</string>
-  <string name="error_client_http_user_message">Try again: Client HTTP error</string>
-  <string name="error_io_exception_user_message">Try again: I/O error</string>
-  <string name="error_json_exception_user_message">Try again: Bad response from the server</string>
-  <string name="error_no_such_algorithm_exception_user_message">Encryption algorithm not found. Please upgrade Android!</string>
-  <string name="signup_or_login_button">Sign Up/Log In</string>
-  <string name="login_button">Log In</string>
-  <string name="login_to_profile">Log in to profile</string>
-  <string name="logout_button">Log Out</string>
-  <string name="signup_button">Sign Up</string>
-  <string name="create_profile">Create profile</string>
-  <string name="setup_provider">Set up provider</string>
-  <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 %s 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_custom">There was an error configuring %s.\n\nYou may choose to reconfigure, or exit.</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 %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>
-  <string name="downloading_certificate_message">Downloading VPN certificate</string>
-  <string name="updating_certificate_message">Updating VPN certificate</string>
-  <string name="login.riseup.warning">Riseup users will need to create a separate account to use the VPN service</string>
-  <string name="succesful_authentication_message">Authenticated</string>
-  <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>
-  <string name="eip_state_not_connected">Not running! Insecure connection!</string>
-  <string name="eip_state_connected">Connection Secure</string>
-  <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="logging_in">Logging in</string>
-  <string name="signing_up">Signing up</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="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">%s blocks all outgoing internet traffic.</string>
-  <string name="void_vpn_error_establish">Blocking all internet traffic failed.</string>
-  <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string>
-  <string name="void_vpn_title">Blocking traffic</string>
-  <string name="update_provider_details">Update provider details</string>
-  <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_client_parsing_error_gateways">The provider gateways could not be recognized. They may be configured incorrectly.</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>
-  <string name="save_battery">Save battery</string>
-  <string name="subtitle_save_battery">Disabled while VPN Hotspot is on</string>
-  <string name="save_battery_message">Background data connections will hibernate when your phone is inactive.</string>
-  <string name="always_on_vpn">Always-on VPN</string>
-  <string name="subtitle_always_on_vpn">Open Android System Settings</string>
-  <string name="tethering">VPN Hotspot</string>
-  <string name="ipv6Firewall">Block IPv6</string>
-  <string name="require_root">Requires root permissions</string>
-  <string name="show_experimental">Show experimental features</string>
-  <string name="hide_experimental">Hide experimental features</string>
-  <string name="experimental_features">Experimental features</string>
-  <string name="tethering_enabled_message">Please make sure to enable tethering in the <![CDATA[<b>system settings</b>]]> first.</string>
-  <string name="tethering_message">Share your VPN with other devices via:</string>
-  <string name="tethering_wifi">Wi-Fi hotspot</string>
-  <string name="tethering_usb">USB tethering</string>
-  <string name="tethering_bluetooth">Bluetooth tethering</string>
-  <string name="do_not_show_again">Do not show again</string>
-  <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on.</string>
-  <string name="always_on_blocking_vpn_user_message">To protect your privacy optimally, you should also activate the option \"Block connections without VPN\".</string>
-  <string name="donate_title">Donate</string>
-  <string name="donate_default_message">Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>
-  <string name="donate_message">LEAP depends on donations and grants. Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>
-  <string name="donate_button_remind_later">Remind me later</string>
-  <string name="donate_button_donate">Donate</string>
-  <string name="obfuscated_connection">Using an obfuscated connection.</string>
-  <string name="obfuscated_connection_try">Trying an obfuscated connection.</string>
-  <string name="nav_drawer_obfuscated_connection">Use Bridges</string>
-  <string name="nav_drawer_subtitle_obfuscated_connection">Circumvent VPN filtering</string>
-  <string name="warning_exclude_apps_message">Be careful of excluding apps from VPN. This will reveal your identity and compromise your security.</string>
-  <plurals name="subtitle_exclude_apps">
-    <item quantity="one">%d unprotected app</item>
-    <item quantity="other">%d unprotected apps</item>
-  </plurals>
-  <string name="warning_no_more_gateways_use_pt">%s could not connect. It might be that VPN connections get blocked. Do you want to try to connect using obfuscated connections?</string>
-  <string name="warning_no_more_gateways_no_pt">%s could not connect. Do you want to retry?</string>
-  <string name="warning_no_more_gateways_use_ovpn">%s could not connect using obfuscated VPN connections. Do you want to try to connect using a standard VPN?</string>
-  <string name="warning_no_more_gateways_manual_gw_selection">%1$s could not connect to %2$s. Do you want to try to connect automatically to the best location?</string>
-  <string name="warning_option_try_best">Try best location</string>
-  <string name="warning_option_try_pt">Try obfuscated connection</string>
-  <string name="warning_option_try_ovpn">Try standard connection</string>
-  <string name="vpn_error_establish">Android failed to establish the VPN service.</string>
-  <string name="root_permission_error">%s cannot execute features like VPN Hotspot or IPv6 firewall without root permissions.</string>
-  <string name="qs_enable_vpn">Start %s</string>
-  <string name="version_update_found">Tap here to start the download.</string>
-  <string name="version_update_title">A new %s version has been found.</string>
-  <string name="version_update_apk_description">Downloading a new %s version</string>
-  <string name="version_update_download_title">A new %s version has been downloaded.</string>
-  <string name="version_update_download_description">Tap here to install the update.</string>
-  <string name="version_update_error_pgp_verification">PGP verification error. Ignoring download.</string>
-  <string name="version_update_error">Update failed.</string>
-  <string name="version_update_error_permissions">No permissions to install app.</string>
-  <string name="gateway_selection_title">Select location</string>
-  <string name="gateway_selection_recommended_location">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="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>
-  <string name="log_conn_done_pt">Connected to pluggable transport</string>
-  <string name="log_conn_pt">Connecting to pluggable transport</string>
-  <string name="log_conn_done">Connected to a relay</string>
-  <string name="log_handshake">Negotiating connection with a relay</string>
-  <string name="log_handshake_done">Connection with relay negotiated</string>
-  <string name="log_onehop_create">Establishing an encrypted directory connection</string>
-  <string name="log_requesting_status">Asking for network status consensus</string>
-  <string name="log_loading_status">Loading network status consensus</string>
-  <string name="log_loading_keys">Loading authority certificates</string>
-  <string name="log_requesting_descriptors">Asking for relay descriptors</string>
-  <string name="log_loading_descriptors">Loading relay descriptors</string>
-  <string name="log_enough_dirinfo">Loaded enough directory info to build circuits</string>
-  <string name="log_ap_handshake_done">Negotiation finished with a relay to build circuits</string>
-  <string name="log_circuit_create">Establishing a Tor circuit</string>
-  <string name="log_done">Running</string>
-  <string name="channel_name_tor_service">%s Bridges Service</string>
-  <string name="channel_description_tor_service">Informs about usage of bridges while configuring %s.</string>
-  <string name="error_tor_timeout">Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure %s?</string>
-  <string name="retry_unobfuscated">Retry unobfuscated</string>
-  <string name="hide">Hide</string>
-  <string name="error_network_connection">%s has no internet connection. Please check your WiFi and cellular data settings.</string>
-  <string name="censorship_circumvention">Censorship circumvention</string>
-  <string name="use_snowflake">Use Snowflake</string>
-  <string name="snowflake_description">Protect configuration process against censorship.</string>
-  <string name="vpn_settings">VPN settings</string>
-  <string name="prefer_udp">Use UDP if available</string>
-  <string name="prefer_udp_subtitle">UDP can be faster and better for streaming, but does not work for all networks.</string>
-  <string name="disabled_while_bridges_on">Disabled while using bridges.</string>
-  <string name="hint_bridges">Only locations supporting bridges are currently selectable.</string>
-  <string name="option_disable_bridges">Disable bridges</string>
-  <string name="eip_state_insecure">Connection insecure</string>
-  <string name="connection_not_connected">You may be leaking information to your internet provider or local network.</string>
-  <string name="eip_state_no_network">You have no working Internet connection. Once you get it back, you will be automatically connected to</string>
-  <string name="eip_state_blocking">%1$s is blocking all internet traffic.</string>
-  <string name="disabled_while_udp_on">Disabled while UDP is on.</string>
-  <string name="advanced_settings">Advanced settings</string>
-  <string name="cancel_connection">Disconnect</string>
-  <string name="unknown_location">Unknown location</string>
-  <string name="splash_footer">Developed by LEAP</string>
+    <string name="retry">Retry</string>
+    <string name="repository_url_text">Source code available at https://0xacab.org/leap/bitmask_android</string>
+    <string name="leap_tracker">Issue tracker available at https://0xacab.org/leap/bitmask_android/issues</string>
+    <string name="translation_project_text">Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask/</string>
+    <string name="switch_provider_menu_option">Switch provider</string>
+    <string name="info">info</string>
+    <string name="show_connection_details">Show connection details</string>
+    <string name="connection_details">Connection details</string>
+    <string name="routes_info">Routes: %s</string>
+    <string name="routes_info6">IPv6 routes: %s</string>
+    <string name="error_empty_username">The username must not be empty.</string>
+    <string name="cert_from_keystore">Got certificate \'%s\' from keystore</string>
+    <string name="provider_label">Provider:</string>
+    <string name="provider_label_none">No provider configured</string>
+    <string name="status_unknown">Status unknown.</string>
+    <string name="eip_service_label">Encrypted VPN Internet Access</string>
+    <string name="configuration_wizard_title">Select a service provider</string>
+    <string name="add_provider">Add new Provider</string>
+    <string name="introduce_new_provider">Add a new service provider</string>
+    <string name="save">Save</string>
+    <string name="new_provider_uri">Domain name</string>
+    <string name="valid_url_entered">The URL is valid</string>
+    <string name="not_valid_url_entered">Malformed URL</string>
+    <string name="provider_details_title">Provider details</string>
+    <string name="use_anonymously_button">Use anonymously</string>
+    <string name="username_hint">username</string>
+    <string name="username_ask">Please enter your username</string>
+    <string name="password_ask">Please enter your password</string>
+    <string name="password_hint">password</string>
+    <string name="password_match">Passwords match</string>
+    <string name="password_mismatch">Passwords do not match</string>
+    <string name="user_message">User message</string>
+    <string name="about_fragment_title">About</string>
+    <string name="exclude_apps_fragment_title">Exclude apps from VPN</string>
+    <string name="error_srp_math_error_user_message">Try again: Server math error</string>
+    <string name="error_bad_user_password_user_message">Incorrect username or password</string>
+    <string name="error_not_valid_password_user_message">It must be at least 8 characters long</string>
+    <string name="error_client_http_user_message">Try again: Client HTTP error</string>
+    <string name="error_io_exception_user_message">Try again: I/O error</string>
+    <string name="error_json_exception_user_message">Try again: Bad response from the server</string>
+    <string name="error_no_such_algorithm_exception_user_message">Encryption algorithm not found. Please upgrade Android!</string>
+    <string name="signup_or_login_button">Sign Up/Log In</string>
+    <string name="login_button">Log In</string>
+    <string name="login_to_profile">Log in to profile</string>
+    <string name="logout_button">Log Out</string>
+    <string name="signup_button">Sign Up</string>
+    <string name="create_profile">Create profile</string>
+    <string name="setup_provider">Set up provider</string>
+    <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 %s 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_custom">There was an error configuring %s.\n\nYou may choose to reconfigure, or exit.</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 %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>
+    <string name="downloading_certificate_message">Downloading VPN certificate</string>
+    <string name="updating_certificate_message">Updating VPN certificate</string>
+    <string name="login.riseup.warning">Riseup users will need to create a separate account to use the VPN service</string>
+    <string name="succesful_authentication_message">Authenticated</string>
+    <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>
+    <string name="eip_state_not_connected">Not running! Insecure connection!</string>
+    <string name="eip_state_connected">Connection Secure</string>
+    <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="logging_in">Logging in</string>
+    <string name="signing_up">Signing up</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="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">%s blocks all outgoing internet traffic.</string>
+    <string name="void_vpn_error_establish">Blocking all internet traffic failed.</string>
+    <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string>
+    <string name="void_vpn_title">Blocking traffic</string>
+    <string name="update_provider_details">Update provider details</string>
+    <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_client_parsing_error_gateways">The provider gateways could not be recognized. They may be configured incorrectly.</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>
+    <string name="save_battery">Save battery</string>
+    <string name="subtitle_save_battery">Disabled while VPN Hotspot is on</string>
+    <string name="save_battery_message">Background data connections will hibernate when your phone is inactive.</string>
+    <string name="always_on_vpn">Always-on VPN</string>
+    <string name="subtitle_always_on_vpn">Open Android System Settings</string>
+    <string name="tethering">VPN Hotspot</string>
+    <string name="ipv6Firewall">Block IPv6</string>
+    <string name="require_root">Requires root permissions</string>
+    <string name="show_experimental">Show experimental features</string>
+    <string name="hide_experimental">Hide experimental features</string>
+    <string name="experimental_features">Experimental features</string>
+    <string name="tethering_enabled_message">Please make sure to enable tethering in the <![CDATA[<b>system settings</b>]]> first.</string>
+    <string name="tethering_message">Share your VPN with other devices via:</string>
+    <string name="tethering_wifi">Wi-Fi hotspot</string>
+    <string name="tethering_usb">USB tethering</string>
+    <string name="tethering_bluetooth">Bluetooth tethering</string>
+    <string name="do_not_show_again">Do not show again</string>
+    <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on.</string>
+    <string name="always_on_blocking_vpn_user_message">To protect your privacy optimally, you should also activate the option \"Block connections without VPN\".</string>
+    <string name="donate_title">Donate</string>
+    <string name="donate_default_message">Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>
+    <string name="donate_message">LEAP depends on donations and grants. Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>
+    <string name="donate_button_remind_later">Remind me later</string>
+    <string name="donate_button_donate">Donate</string>
+    <string name="obfuscated_connection">Using an obfuscated connection.</string>
+    <string name="obfuscated_connection_try">Trying an obfuscated connection.</string>
+    <string name="nav_drawer_obfuscated_connection">Use Bridges</string>
+    <string name="nav_drawer_subtitle_obfuscated_connection">Circumvent VPN filtering</string>
+    <string name="warning_exclude_apps_message">Be careful of excluding apps from VPN. This will reveal your identity and compromise your security.</string>
+    <plurals name="subtitle_exclude_apps">
+        <item quantity="one">%d unprotected app</item>
+        <item quantity="other">%d unprotected apps</item>
+    </plurals>
+    <string name="warning_no_more_gateways_use_pt">%s could not connect. It might be that VPN connections get blocked. Do you want to try to connect using obfuscated connections?</string>
+    <string name="warning_no_more_gateways_no_pt">%s could not connect. Do you want to retry?</string>
+    <string name="warning_no_more_gateways_use_ovpn">%s could not connect using obfuscated VPN connections. Do you want to try to connect using a standard VPN?</string>
+    <string name="warning_no_more_gateways_manual_gw_selection">%1$s could not connect to %2$s. Do you want to try to connect automatically to the best location?</string>
+    <string name="warning_option_try_best">Try best location</string>
+    <string name="warning_option_try_pt">Try obfuscated connection</string>
+    <string name="warning_option_try_ovpn">Try standard connection</string>
+    <string name="vpn_error_establish">Android failed to establish the VPN service.</string>
+    <string name="root_permission_error">%s cannot execute features like VPN Hotspot or IPv6 firewall without root permissions.</string>
+    <string name="qs_enable_vpn">Start %s</string>
+    <string name="version_update_found">Tap here to start the download.</string>
+    <string name="version_update_title">A new %s version has been found.</string>
+    <string name="version_update_apk_description">Downloading a new %s version</string>
+    <string name="version_update_download_title">A new %s version has been downloaded.</string>
+    <string name="version_update_download_description">Tap here to install the update.</string>
+    <string name="version_update_error_pgp_verification">PGP verification error. Ignoring download.</string>
+    <string name="version_update_error">Update failed.</string>
+    <string name="version_update_error_permissions">No permissions to install app.</string>
+    <string name="gateway_selection_title">Select location</string>
+    <string name="gateway_selection_recommended_location">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="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>
+    <string name="log_conn_done_pt">Connected to pluggable transport</string>
+    <string name="log_conn_pt">Connecting to pluggable transport</string>
+    <string name="log_conn_done">Connected to a relay</string>
+    <string name="log_handshake">Negotiating connection with a relay</string>
+    <string name="log_handshake_done">Connection with relay negotiated</string>
+    <string name="log_onehop_create">Establishing an encrypted directory connection</string>
+    <string name="log_requesting_status">Asking for network status consensus</string>
+    <string name="log_loading_status">Loading network status consensus</string>
+    <string name="log_loading_keys">Loading authority certificates</string>
+    <string name="log_requesting_descriptors">Asking for relay descriptors</string>
+    <string name="log_loading_descriptors">Loading relay descriptors</string>
+    <string name="log_enough_dirinfo">Loaded enough directory info to build circuits</string>
+    <string name="log_ap_handshake_done">Negotiation finished with a relay to build circuits</string>
+    <string name="log_circuit_create">Establishing a Tor circuit</string>
+    <string name="log_done">Running</string>
+    <string name="channel_name_tor_service">%s Bridges Service</string>
+    <string name="channel_description_tor_service">Informs about usage of bridges while configuring %s.</string>
+    <string name="error_tor_timeout">Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure %s?</string>
+    <string name="retry_unobfuscated">Retry unobfuscated</string>
+    <string name="hide">Hide</string>
+    <string name="error_network_connection">%s has no internet connection. Please check your WiFi and cellular data settings.</string>
+    <string name="censorship_circumvention">Censorship circumvention</string>
+    <string name="use_snowflake">Use Snowflake</string>
+    <string name="snowflake_description">Protect configuration process against censorship.</string>
+    <string name="vpn_settings">VPN settings</string>
+    <string name="prefer_udp">Use UDP if available</string>
+    <string name="prefer_udp_subtitle">UDP can be faster and better for streaming, but does not work for all networks.</string>
+    <string name="disabled_while_bridges_on">Disabled while using bridges.</string>
+    <string name="hint_bridges">Only locations supporting bridges are currently selectable.</string>
+    <string name="option_disable_bridges">Disable bridges</string>
+    <string name="eip_state_insecure">Connection insecure</string>
+    <string name="connection_not_connected">You may be leaking information to your internet provider or local network.</string>
+    <string name="eip_state_no_network">You have no working Internet connection. Once you get it back, you will be automatically connected to</string>
+    <string name="eip_state_blocking">%1$s is blocking all internet traffic.</string>
+    <string name="disabled_while_udp_on">Disabled while UDP is on.</string>
+    <string name="advanced_settings">Advanced settings</string>
+    <string name="cancel_connection">Disconnect</string>
+    <string name="unknown_location">Unknown location</string>
+    <string name="splash_footer">Developed by LEAP</string>
+    <string name="welcome">Welcome!</string>
+    <string name="select_provider">Select Your Provider</string>
+    <string name="select_provider_description">When using a VPN you are transferring your trust from your Internet Service Provider to your VPN provider. Bitmask only connects to providers with a clear history of privacy protection and advocacy.</string>
+    <string name="provider_description_riseup">Riseup provides online communication tools for people and groups working on liberatory social change. We are a project to create democratic alternatives and practice self-determination by controlling our own secure means of communications.</string>
+    <string name="next">Next</string>
+    <string name="add_provider_description">Bitmask connects to trusted providers that are not publicly listed. Enter your provider’s url below.</string>
+    <string name="provider_description_calyx">Calyx is a non-profit education and research organization devoted to studying, testing, developing and implementing privacy technology and tools to promote free speech, free expression, civic engagement and privacy rights on the internet and in the mobile communications industry.</string>
+    <string name="title_circumvention_setup">Do You Require Censorship Circumvention?</string>
+    <string name="circumvention_setup_description">If you live where the internet is censored you can use our censorship circumvention options to access all internet services. These options will slow down your connection!</string>
+    <string name="circumvention_setup_hint">Bitmask will automatically try to connect you to the internet using a variety of circumvention technologies. You can fine tune this in the advanced settings.</string>
+    <string name="use_standard_vpn">Use standard Bitmask VPN</string>
+    <string name="use_circumvention_tech">Use circumvention tech (slower)</string>
+    <string name="description_configure_provider">To connect to your provider Bitmask is fetching all the required configuration information. This only happens during first setup.</string>
+    <string name="description_configure_provider_circumvention">Bitmask is attempting to collect all required configuration data from the provider. This only happens during first setup. You selected to use circumvention technology, so this might take some time.</string>
+    <string name="percentage" translatable="false">%d%</string>
+    <string name="details">Details</string>
+    <string name="tor_status">Tor Status</string>
+    <string name="snowflake_status">Snowflake Status</string>
+    <string name="snowflake_started">Snowflake client started</string>
+    <string name="snowflake_negotiating_rendezvous_http">Negotiating Snowflake proxy rendezvous (http)</string>
+    <string name="snowflake_negotiating_rendezvous_amp_cache">Negotiating Snowflake proxy rendezvous (amp cache)</string>
+    <string name="snowflake_socks_error">Snowflake SOCKS error</string>
+    <string name="snowflake_broker_success">Snowflake proxy rendezvous successful</string>
+    <string name="snowflake_sending_data">Sending data via Snowflake</string>
+    <string name="title_upcoming_connection_request">Upcoming Connection Request</string>
+    <string name="upcoming_connection_request_description">In the next panel Android will remind you that it’s essential to trust your VPN provider. Bitmask only partners with providers that adhere to strict privacy best practices for VPNs and have a verifiable history of protecting user’s data and identities.</string>
+    <string name="title_upcoming_notifications_request">Upcoming Notifications Request</string>
+    <string name="upcoming_notifications_request_description">In the next panel Android will ask if you want to allow notifications. This will ensure a stable background connection and enable you to see your data usage from within Android’s notification center.</string>
+    <string name="title_setup_success">You\'re all set!</string>
+    <string name="setup_success_description">Click the button below to connect</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f42be3c1..8ee40614 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="blinkt.baseTheme" parent="android:Theme.DeviceDefault.Light" />
     <style name="blinkt" parent="blinkt.baseTheme" />
 
@@ -68,6 +68,16 @@
         <item name="android:textColor">@color/color_font_btn</item>
     </style>
 
+    <style name="BitmaskSetupButton" parent="Widget.AppCompat.Button">
+        <item name="android:background">@drawable/cust_setup_button_primary</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:height">36dp</item>
+        <item name="android:minWidth">75dp</item>
+        <item name="android:textColor">@color/colorActionBarTitleFont</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:letterSpacing">0.05</item>
+    </style>
+
     <style name="BitmaskActivity">
     </style>