Merge branch 'ui_fixes' into 'master'

UI fixes

Closes #9051 and #9015

See merge request leap/bitmask_android!148

12 files changed, 28 insertions, 16 deletions

diff --git a/app/src/main/res/font/sofiapro_regular.otf b/app/src/main/res/font/sofiapro_regular.otf
deleted file mode 100644
index 66d25156..00000000
--- a/app/src/main/res/font/sofiapro_regular.otf
+++ /dev/null
diff --git a/app/src/main/res/font/sofiapro_regular.ttf b/app/src/main/res/font/sofiapro_regular.ttf
new file mode 100644
index 00000000..d7e5f95b
--- /dev/null
+++ b/app/src/main/res/font/sofiapro_regular.ttf
diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml
index a261c8ea..99004387 100644
--- a/app/src/main/res/layout-port/f_eip.xml
+++ b/app/src/main/res/layout-port/f_eip.xml
@@ -64,10 +64,11 @@
         app:layout_constraintBottom_toTopOf="@+id/sub_description"
         android:padding="@dimen/activity_margin"
         android:textAppearance="@android:style/TextAppearance.Large"
+        android:textSize="26sp"
         android:textStyle="bold"
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
-        tools:text="CONNETION"
+        tools:text="Connection secure"
         android:gravity="center"
         android:maxLines="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 839753e6..c3d3fd36 100644
--- a/app/src/main/res/layout-xlarge-port/f_eip.xml
+++ b/app/src/main/res/layout-xlarge-port/f_eip.xml
@@ -63,7 +63,7 @@
         app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
         app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
         app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top"
-        app:layout_constraintVertical_bias="0.4" />
+        app:layout_constraintVertical_bias="0.425" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/main_description"
@@ -75,10 +75,11 @@
         app:layout_constraintBottom_toTopOf="@+id/sub_description"
         android:padding="@dimen/activity_margin"
         android:textAppearance="@android:style/TextAppearance.Large"
+        android:textSize="45sp"
         android:textStyle="bold"
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
-        tools:text="CONNETION"
+        tools:text="Connection Secure"
         android:gravity="center"
         android:maxLines="1"
         />
@@ -92,7 +93,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/gateway_location_button"
         android:padding="@dimen/activity_margin"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
         android:textStyle="bold"
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
@@ -105,7 +106,7 @@
     <se.leap.bitmaskclient.base.views.LocationButton
         android:id="@+id/gateway_location_button"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="64dp"
         android:layout_marginBottom="@dimen/stdpadding"
         android:layout_marginEnd="@dimen/stdpadding"
         android:layout_marginStart="@dimen/stdpadding"
@@ -117,5 +118,4 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:text="SEATTLE"
         android:gravity="center_vertical" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index 34d74805..4042933e 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -79,6 +79,7 @@
         app:layout_constraintBottom_toTopOf="@+id/sub_description"
         android:padding="@dimen/stdpadding"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
+        android:textSize="45sp"
         android:textStyle="bold"
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
@@ -95,7 +96,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/gateway_location_button"
         android:padding="@dimen/stdpadding"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
         android:textStyle="bold"
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
@@ -109,7 +110,7 @@
     <se.leap.bitmaskclient.base.views.LocationButton
         android:id="@+id/gateway_location_button"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="64dp"
         android:layout_marginBottom="@dimen/stdpadding"
         android:layout_marginEnd="@dimen/stdpadding"
         android:layout_marginStart="@dimen/stdpadding"
diff --git a/app/src/main/res/layout-xlarge/v_loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml
index 24b44f9a..2ecb8f42 100644
--- a/app/src/main/res/layout-xlarge/v_loading_screen.xml
+++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml
@@ -80,7 +80,7 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:visibility="visible"
-            tools:text="@string/hide_connection_details"
+            tools:text="@string/hide"
             />
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/connection_details_title"
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index bd7e66ae..bf418bc0 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -116,6 +116,12 @@
             app:text="@string/about_fragment_title"
             app:icon="@drawable/ic_about_36"
             />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/black800_high_transparent"
+            android:layout_weight="1"
+            />
 
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index b5af785d..fa2d4ded 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -96,10 +96,11 @@
         android:paddingRight="@dimen/stdpadding"
         android:paddingEnd="@dimen/stdpadding"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
+        android:textSize="26sp"
         android:textStyle="bold"
         android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
-        tools:text="CONNETION SECURE"
+        tools:text="Connection secure"
         />
 
     <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml
index a4d86fa6..ada74e12 100644
--- a/app/src/main/res/layout/f_settings.xml
+++ b/app/src/main/res/layout/f_settings.xml
@@ -17,7 +17,6 @@
             android:layout_height="wrap_content"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:text="@string/vpn_settings"
-            android:paddingTop="@dimen/activity_margin"
             />
 
         <se.leap.bitmaskclient.base.views.IconTextEntry
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 8cba9d70..11410c62 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_gravity="center_vertical"
@@ -14,7 +15,7 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/text_location"
         android:layout_alignBottom="@+id/text_location"
-        android:scaleType="fitXY"
+        android:scaleType="fitCenter"
         android:src="@drawable/ic_web"
         android:layout_gravity="center"
         />
@@ -42,7 +43,10 @@
         android:maxLines="1"
         android:ellipsize="end"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
+        app:autoSizeTextType="uniform"
+        android:gravity="center_vertical"
+        app:autoSizeMinTextSize="15sp"
         android:layout_toEndOf="@id/recommended_icn"
         android:layout_toRightOf="@+id/recommended_icn"
         android:layout_toLeftOf="@+id/bridge_icn"
diff --git a/app/src/main/res/layout/v_location_status_indicator.xml b/app/src/main/res/layout/v_location_status_indicator.xml
index 548a965f..a8ba905e 100644
--- a/app/src/main/res/layout/v_location_status_indicator.xml
+++ b/app/src/main/res/layout/v_location_status_indicator.xml
@@ -130,7 +130,7 @@
         android:id="@+id/level2"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@color/yellow200"
+        android:background="@color/amber200"
         android:visibility="visible"
         app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_third"
         app:layout_constraintLeft_toRightOf="@id/guideline_vertical_second"
@@ -146,7 +146,7 @@
         android:id="@+id/level2_2"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@color/yellow200"
+        android:background="@color/amber200"
         android:visibility="visible"
         app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_fourth"
         app:layout_constraintLeft_toRightOf="@id/guideline_vertical_third"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9ef0b9a5..df37b5ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,7 +182,7 @@
   <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_connection_details">Hide connection details</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>