Merge branch 'last_tweaks_before_release' into 'master'

Last tweaks before release

See merge request leap/bitmask_android!262

11 files changed, 44 insertions, 17 deletions

diff --git a/app/src/main/res/drawable/cust_setup_button_primary_pressed.xml b/app/src/main/res/drawable/cust_setup_button_primary_pressed.xml
index 6fb664d9..69f6e056 100644
--- a/app/src/main/res/drawable/cust_setup_button_primary_pressed.xml
+++ b/app/src/main/res/drawable/cust_setup_button_primary_pressed.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
+    <item
+        android:bottom="@dimen/button_bevel_pressed"
+        >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="8dp" />
+            <solid android:color="@color/colorPrimary_transparent_dark"/>
+        </shape>
+    </item>
+    <item
+        android:bottom="@dimen/button_bevel"
+        >
         <shape android:shape="rectangle"  >
             <corners android:radius="8dp" />
             <padding android:left="8dp" android:right="8dp"/>
diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index 90a263a0..4e0d7342 100644
--- a/app/src/main/res/layout-xlarge/f_about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
@@ -6,16 +6,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:layout_marginLeft="@dimen/stdpadding"
-    android:layout_marginStart="@dimen/stdpadding"
-    android:layout_marginEnd="@dimen/stdpadding"
-    android:layout_marginRight="@dimen/stdpadding"
     tools:context=".base.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/activity_horizontal_margin"
+        android:paddingVertical="@dimen/activity_vertical_margin"
+        >
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/version"
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 6a2c5209..a63592f4 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -169,7 +169,8 @@
             android:layout_centerVertical="true"
             android:text="@string/next"
             tools:visibility="visible"
-
+            android:gravity="top|center_horizontal"
+            android:paddingTop="@dimen/setup_button_top_padding"
             />
 
         <androidx.appcompat.widget.AppCompatButton
@@ -179,6 +180,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
+            android:gravity="top|center_horizontal"
+            android:paddingTop="@dimen/setup_button_top_padding"
             android:text="@string/cancel"
             android:visibility="gone"
             tools:visibility="visible"
diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml
index 190ac758..28f89adf 100644
--- a/app/src/main/res/layout/f_about.xml
+++ b/app/src/main/res/layout/f_about.xml
@@ -6,16 +6,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:layout_marginLeft="@dimen/stdpadding"
-    android:layout_marginStart="@dimen/stdpadding"
-    android:layout_marginRight="@dimen/stdpadding"
-    android:layout_marginEnd="@dimen/stdpadding"
     tools:context=".base.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/activity_horizontal_margin"
+        android:paddingVertical="@dimen/activity_vertical_margin"
+        >
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/version"
diff --git a/app/src/main/res/layout/f_configure_provider.xml b/app/src/main/res/layout/f_configure_provider.xml
index 5841ee13..644ae7d1 100644
--- a/app/src/main/res/layout/f_configure_provider.xml
+++ b/app/src/main/res/layout/f_configure_provider.xml
@@ -137,6 +137,7 @@
                             app:layout_constraintTop_toBottomOf="@id/tv_tor_status"
                             app:layout_constraintStart_toStartOf="parent"
                             android:padding="4dp"
+                            android:layout_marginStart="@dimen/tor_icon_margin_start"
                             android:src="@drawable/ic_tor" />
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tor_state"
@@ -151,7 +152,7 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toEndOf="@id/tor_icon"
                             app:layout_constraintHorizontal_bias="0"
-                            android:paddingHorizontal="@dimen/stdpadding"
+                            android:paddingHorizontal="@dimen/compact_padding"
                             android:gravity="bottom"
                             tools:text="test 12321 123 \n sdf,sdf,m\nn 123 "
                             android:ellipsize="end"
@@ -181,6 +182,7 @@
                             android:layout_alignParentStart="true"
                             android:layout_marginBottom="@dimen/stdpadding"
                             android:padding="4dp"
+                            android:layout_marginStart="@dimen/snowflake_icon_margin_start"
                             />
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/snowflake_state"
@@ -192,7 +194,7 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="0"
                             android:paddingBottom="1dp"
-                            android:paddingHorizontal="@dimen/stdpadding"
+                            android:paddingHorizontal="@dimen/compact_padding"
                             android:fadingEdge="horizontal"
                             android:maxLines="2"
                             android:text="@string/configuring_provider"
diff --git a/app/src/main/res/layout/f_motd.xml b/app/src/main/res/layout/f_motd.xml
index 6e763c75..2308c62c 100644
--- a/app/src/main/res/layout/f_motd.xml
+++ b/app/src/main/res/layout/f_motd.xml
@@ -104,7 +104,7 @@
         android:layout_alignParentBottom="true"
         android:src="@drawable/ic_arrow_right"
         android:background="?attr/selectableItemBackground"
-        android:text="next"
+        android:text="@string/next"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9d83ff49..c162690f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -67,6 +67,9 @@
   <string name="authentication_failed_message">Falha na Autenticação</string>
   <string name="registration_failed_message">Falha no cadastro</string>
   <string name="eip_status_start_pending">Inicializando conexão</string>
+  <string name="eip_status_connecting">Conectando VPN</string>
+  <string name="eip_status_unsecured">Conexão insegura</string>
+  <string name="eip_status_secured">Conexão segura</string>
   <string name="eip_cancel_connect_title">Cancelar conexão?</string>
   <string name="eip_cancel_connect_text">Há uma tentativa de conexão em andamento. Você deseja cancelar?</string>
   <string name="eip.warning.browser_inconsistency">Desligar conexão VPN? Quando a VPN está desligada, você pode vazar informações pessoais para o seu provedor de internet ou na rede local.</string>
@@ -202,4 +205,6 @@
   <string name="disabled_while_udp_on">Desabilitado enquanto UDP estiver ligado.</string>
   <string name="advanced_settings">Configurações avançadas</string>
   <string name="cancel_connection">Desconectar</string>
+  <string name="unknown_location">Local desconhecido</string>
+  <string name="splash_footer">Desenvolvido pela LEAP</string>
 </resources>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index ad0fae2c..94eab553 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -16,4 +16,8 @@
     <dimen name="donation_reminder_padding">24dp</dimen>
 
     <dimen name="setup_bottom_bar">75dp</dimen>
+    <dimen name="setup_button_top_padding">10dp</dimen>
+    <dimen name="tor_icon_margin_start">8dp</dimen>
+    <dimen name="snowflake_icon_margin_start">8dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0ad20a63..84a2d9f0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,8 @@
     <color name="colorPrimary">#ff1b8b</color>
     <color name="colorPrimaryLight">#FF69B4</color>
     <color name="colorPrimaryDark">#ef0072</color>
-    <color name="colorPrimary_transparent">#0B000000</color>
+    <color name="colorPrimary_transparent">#0D000000</color>
+    <color name="colorPrimary_transparent_dark">#1F000000</color>
     <color name="colorBackground">#fffafafa</color>
     <color name="colorError">#ef9a9a</color>
     <color name="colorSuccess">#a5d6a7</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index edda28c7..94f9339f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -42,9 +42,13 @@
 
     <dimen name="toast_bottom_padding">20dp</dimen>
     <dimen name="button_bevel">3dp</dimen>
+    <dimen name="button_bevel_pressed">1dp</dimen>
     <dimen name="button_radius">16dp</dimen>
     <dimen name="mainbutton_padding">8dp</dimen>
     <dimen name="donation_reminder_padding">8dp</dimen>
 
     <dimen name="setup_bottom_bar">50dp</dimen>
+    <dimen name="setup_button_top_padding">5dp</dimen>
+    <dimen name="tor_icon_margin_start">0dp</dimen>
+    <dimen name="snowflake_icon_margin_start">2dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8ee40614..3a4dbe40 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -68,7 +68,7 @@
         <item name="android:textColor">@color/color_font_btn</item>
     </style>
 
-    <style name="BitmaskSetupButton" parent="Widget.AppCompat.Button">
+    <style name="BitmaskSetupButton" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:background">@drawable/cust_setup_button_primary</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:height">36dp</item>