Merge branch 'rc_fixes' into 'master'

Rc fixes

See merge request leap/bitmask_android!235

12 files changed, 20 insertions, 19 deletions

diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml
index 80f42f91..e14c7a10 100644
--- a/app/src/main/res/layout-port/f_eip.xml
+++ b/app/src/main/res/layout-port/f_eip.xml
@@ -64,8 +64,6 @@
         android:scaleType="fitXY"
         />
 
-
-
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/main_description"
         android:layout_width="wrap_content"
@@ -78,9 +76,7 @@
         android:layout_marginTop="@dimen/activity_margin"
         android:textAppearance="@android:style/TextAppearance.Large"
         android:textStyle="bold"
-        android:textSize="34sp"
-        app:autoSizeMinTextSize="28sp"
-        app:autoSizeTextType="uniform"
+        android:textSize="32sp"
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="Connection secure"
@@ -122,7 +118,7 @@
         android:id="@+id/main_button"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_margin="@dimen/stdpadding"
+        android:layout_margin="@dimen/mainbutton_padding"
         app:layout_constraintTop_toBottomOf="@+id/guideline_horizontal_bottom"
         app:layout_constraintBottom_toTopOf="@id/gateway_location_button"
         app:layout_constraintDimensionRatio="1:1"
diff --git a/app/src/main/res/layout-sw600dp-port/f_eip.xml b/app/src/main/res/layout-sw600dp-port/f_eip.xml
index 93393565..88e51652 100644
--- a/app/src/main/res/layout-sw600dp-port/f_eip.xml
+++ b/app/src/main/res/layout-sw600dp-port/f_eip.xml
@@ -77,13 +77,11 @@
         android:textAppearance="@android:style/TextAppearance.Large"
         android:textStyle="bold"
         android:textSize="48sp"
-        app:autoSizeMinTextSize="32sp"
-        app:autoSizeTextType="uniform"
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="Connection secure"
         android:gravity="center"
-        android:maxLines="1"
+        android:maxLines="2"
         />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -120,7 +118,7 @@
         android:id="@+id/main_button"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_margin="@dimen/stdpadding"
+        android:layout_margin="@dimen/mainbutton_padding"
         app:layout_constraintTop_toBottomOf="@+id/guideline_horizontal_bottom"
         app:layout_constraintBottom_toTopOf="@id/gateway_location_button"
         app:layout_constraintDimensionRatio="1:1"
diff --git a/app/src/main/res/layout-xlarge-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml
index ee0fbac9..590cf1a4 100644
--- a/app/src/main/res/layout-xlarge-port/f_eip.xml
+++ b/app/src/main/res/layout-xlarge-port/f_eip.xml
@@ -83,6 +83,7 @@
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="Connection secure"
+        android:maxLines="2"
         />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -123,7 +124,7 @@
         android:id="@+id/main_button"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_margin="@dimen/stdpadding"
+        android:layout_margin="@dimen/mainbutton_padding"
         app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_bottom"
         app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_button_top"
         app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml
index 17eaf009..1260a99e 100644
--- a/app/src/main/res/layout/donation_reminder_dialog.xml
+++ b/app/src/main/res/layout/donation_reminder_dialog.xml
@@ -30,7 +30,7 @@
             android:id="@+id/tvMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/standard_margin"
+            android:layout_margin="@dimen/donation_reminder_padding"
             android:gravity="center"
             android:text="@string/donate_message" />
 
@@ -57,7 +57,7 @@
             android:id="@+id/btnLater"
             android:layout_width="200dp"
             android:layout_height="38dp"
-            android:layout_marginBottom="@dimen/mainbutton_padding"
+            android:layout_marginBottom="20dp"
             android:layout_marginLeft="@dimen/add_button_margin"
             android:layout_marginRight="@dimen/add_button_margin"
             android:layout_marginTop="@dimen/standard_margin"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b38c5506..47d10ed6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -206,5 +206,5 @@
   <string name="advanced_settings">Paramètres avancés</string>
   <string name="cancel_connection">Se déconnecter</string>
   <string name="unknown_location">Site inconnu</string>
-  <string name="splash_footer">Développé par : LEAP</string>
+  <string name="splash_footer">Développé par LEAP</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 057ced21..9b0539ab 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -111,7 +111,7 @@
   <string name="require_root">Require permiso root</string>
   <string name="show_experimental">Mostrar funcións experimentais</string>
   <string name="hide_experimental">Agochar funcións experimentais</string>
-  <string name="tethering_enabled_message">Asegúrate de ter antes activada a compartición da conexión en <![CDATA[1system settings1]]>.</string>
+  <string name="tethering_enabled_message">Asegúrate de ter antes activada a compartición da conexión en <![CDATA[<b>system settings</b>]]>.</string>
   <string name="tethering_message">Comparte a túa VPN con outros dispositivos vía:</string>
   <string name="tethering_wifi">Punto de acceso Wi-Fi</string>
   <string name="tethering_usb">Compartición USB</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 68005365..9d83ff49 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -114,7 +114,7 @@
   <string name="show_experimental">Mostrar recursos experimentais</string>
   <string name="hide_experimental">Esconder recursos experimentais</string>
   <string name="experimental_features">Funcionalidades experimentais</string>
-  <string name="tethering_enabled_message">Por favor tenha certeza de primeiro habilitar tethering nas &lt;![CDATA[&lt;b&gt;configurações de sistema&lt;/b&gt;]].</string>
+  <string name="tethering_enabled_message">Por favor tenha certeza de primeiro habilitar tethering nas <![CDATA[<b>configurações de sistema</b>]]>.</string>
   <string name="tethering_message">Compartilhe sua VPN com outros dispositivos através de:</string>
   <string name="tethering_wifi">Hotspot Wi-Fi</string>
   <string name="tethering_usb">Tethering USB</string>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index a046dac6..4c726da5 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -14,5 +14,7 @@
     <!-- landscape dimens -->
     <dimen name="footer_text_padding">20dp</dimen>
     <dimen name="splash_text_top_padding">140dp</dimen>
+    <dimen name="mainbutton_padding">32dp</dimen>
+    <dimen name="donation_reminder_padding">24dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index b38b10a6..822259ca 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -11,5 +11,7 @@
     <!-- landscape dimens -->
     <dimen name="footer_text_padding">12dp</dimen>
     <dimen name="splash_text_top_padding">90dp</dimen>
+    <dimen name="mainbutton_padding">32dp</dimen>
+    <dimen name="donation_reminder_padding">24dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c737d759..564f15f3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2,7 +2,7 @@
 <resources>
   <string name="retry">重试</string>
   <string name="repository_url_text">源代码可在 https://0xacab.org/leap/bitmask_android 找到</string>
-  <string name="leap_tracker">问题追踪器可在 https://0xacab.org/leap/bitmask_android 找到</string>
+  <string name="leap_tracker">问题追踪器可在 https://0xacab.org/leap/bitmask_android/issues 找到</string>
   <string name="translation_project_text">我们鼓励并感谢诸位提供翻译。请在 https://www.transifex.com/projects/p/bitmask/ 参阅我们的 Transifex 项目</string>
   <string name="switch_provider_menu_option">切换提供商</string>
   <string name="info">信息</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ead4785e..3e33c72b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,7 +39,7 @@
     <color name="black_transparent">#20000000</color>
     <color name="black_high_transparent">#05000000</color>
 
-    <color name="colorEipFragmentFont">@color/black800</color>
+    <color name="colorEipFragmentFont">@color/black800_dark</color>
     <!-- button text colors in Alerts etc. -->
     <color name="color_font_btn">@color/black800</color>
     <!-- pill style button text colors -->
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9ef6c3e0..f15fbcf9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="stdpadding">8dp</dimen>
     <dimen name="compact_padding">3dp</dimen>
     <dimen name="standard_margin">8dp</dimen>
-    <dimen name="mainbutton_padding">20dp</dimen>
     <bool name="logSildersAlwaysVisible">false</bool>
     <!-- landscape layout dimens -->
     <dimen name="footer_text_padding">12dp</dimen>
@@ -46,4 +45,7 @@
     <dimen name="toast_bottom_padding">20dp</dimen>
     <dimen name="button_bevel">3dp</dimen>
     <dimen name="button_radius">16dp</dimen>
+    <dimen name="mainbutton_padding">8dp</dimen>
+    <dimen name="donation_reminder_padding">8dp</dimen>
+
 </resources>
\ No newline at end of file