Merge branch 'ui_fixes' into 'master'

UI fixes

Closes #9051 and #9015

See merge request leap/bitmask_android!148

5 files changed, 16 insertions, 6 deletions

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"