From 1e9202c3d929083220924f7c76ea01a2b6f6af9f Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 22 Jul 2021 15:31:08 +0200
Subject: first implementation of the gateway button, started to remove labels
 from EipFragment, implement method to get the avearage load of a location as
 an enum value

---
 .../res/drawable/cust_button_primary_hard_rect.xml | 21 ++++++++++
 .../main/res/drawable/cust_button_primary_rect.xml |  3 --
 app/src/main/res/layout-xlarge/f_eip.xml           | 46 ++++----------------
 app/src/main/res/layout/f_eip.xml                  | 46 +++-----------------
 app/src/main/res/layout/v_location_button.xml      | 38 +++++++++++++++++
 .../res/layout/v_location_status_indicator.xml     | 49 ++++++++++++++++++++++
 app/src/main/res/values/strings.xml                |  4 +-
 7 files changed, 123 insertions(+), 84 deletions(-)
 create mode 100644 app/src/main/res/drawable/cust_button_primary_hard_rect.xml
 create mode 100644 app/src/main/res/layout/v_location_button.xml
 create mode 100644 app/src/main/res/layout/v_location_status_indicator.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/cust_button_primary_hard_rect.xml b/app/src/main/res/drawable/cust_button_primary_hard_rect.xml
new file mode 100644
index 00000000..93be5c18
--- /dev/null
+++ b/app/src/main/res/drawable/cust_button_primary_hard_rect.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorPrimaryDark"/>
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorPrimaryDark"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/colorPrimary"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_button_primary_rect.xml b/app/src/main/res/drawable/cust_button_primary_rect.xml
index c83d4e62..93be5c18 100644
--- a/app/src/main/res/drawable/cust_button_primary_rect.xml
+++ b/app/src/main/res/drawable/cust_button_primary_rect.xml
@@ -2,21 +2,18 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:state_pressed="true" >
         <shape android:shape="rectangle"  >
-            <corners android:radius="8dp" />
             <padding android:left="8dp" android:right="8dp"/>
             <solid android:color="@color/colorPrimaryDark"/>
         </shape>
     </item>
     <item android:state_focused="true">
         <shape android:shape="rectangle"  >
-            <corners android:radius="8dp" />
             <padding android:left="8dp" android:right="8dp"/>
             <solid android:color="@color/colorPrimaryDark"/>
         </shape>
     </item>
     <item >
         <shape android:shape="rectangle"  >
-            <corners android:radius="8dp" />
             <padding android:left="8dp" android:right="8dp"/>
             <solid android:color="@color/colorPrimary"/>
         </shape>
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index d4a51b8d..bef2d635 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -80,53 +80,21 @@
         app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top"
         app:layout_constraintDimensionRatio="1:1" />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/vpn_main_button"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:minWidth="200dp"
+
+    <se.leap.bitmaskclient.base.views.LocationButton
+        android:id="@+id/gateway_location_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/stdpadding"
         android:layout_marginEnd="@dimen/stdpadding"
         android:layout_marginStart="@dimen/stdpadding"
         android:layout_marginTop="@dimen/stdpadding"
         android:layout_marginLeft="@dimen/stdpadding"
         android:layout_marginRight="@dimen/stdpadding"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
         app:layout_constraintBottom_toBottomOf="@+id/background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:text="@string/vpn.button.turn.on"
-        tools:text="Turn on in another language"
-        style="@style/BitmaskButtonBlack"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/routed_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:text="@string/vpn_securely_routed"
-        android:gravity="center"
-        android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/eipLabel" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/vpn_route"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/routed_text" />
+        tools:text="SEATTLE"
+        android:gravity="center_vertical" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index 3309eb5d..8dc1e33b 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -82,54 +82,20 @@
         app:layout_constraintDimensionRatio="1:1"
         />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/vpn_main_button"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:minWidth="150dp"
+    <se.leap.bitmaskclient.base.views.LocationButton
+        android:id="@+id/gateway_location_button"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
         android:layout_marginBottom="@dimen/stdpadding"
         android:layout_marginEnd="@dimen/stdpadding"
         android:layout_marginStart="@dimen/stdpadding"
         android:layout_marginTop="@dimen/stdpadding"
         android:layout_marginLeft="@dimen/stdpadding"
         android:layout_marginRight="@dimen/stdpadding"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
         app:layout_constraintBottom_toBottomOf="@+id/background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:text="@string/vpn.button.turn.on"
-        tools:text="Turn on in another language"
-        style="@style/BitmaskButtonBlack"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/routed_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:paddingTop="@dimen/stdpadding"
-        android:text="@string/vpn_securely_routed"
-        android:gravity="center"
-        android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/eipLabel" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/vpn_route"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/routed_text" />
+        tools:text="SEATTLE"
+        android:gravity="center_vertical" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
new file mode 100644
index 00000000..7425231e
--- /dev/null
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_gravity="center_vertical"
+    android:clickable="true"
+    android:focusable="true"
+    android:padding="@dimen/stdpadding"
+    android:background="@drawable/cust_button_primary_rect"
+    android:layout_height="wrap_content">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/text_location"
+        android:padding="@dimen/stdpadding"
+        android:layout_weight="1"
+        android:layout_width="0dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        tools:text="Seattle"
+        />
+
+    <se.leap.bitmaskclient.base.views.LocationIndicator
+        android:id="@+id/load_indicator"
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:visibility="visible"
+        android:layout_gravity="center_vertical"
+        />
+
+
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_location_status_indicator.xml b/app/src/main/res/layout/v_location_status_indicator.xml
new file mode 100644
index 00000000..97b55917
--- /dev/null
+++ b/app/src/main/res/layout/v_location_status_indicator.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:weightSum="100"
+    android:layout_margin="8dp"
+    >
+
+    <View
+        android:id="@+id/level3"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="30"
+        android:background="@color/green200"
+        android:visibility="invisible"
+        />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="5"
+        />
+
+    <View
+        android:id="@+id/level2"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="30"
+        android:background="@color/green200"
+        android:visibility="invisible"
+        />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="5"
+        />
+
+    <View
+        android:id="@+id/level1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="30"
+        android:background="@color/green200"
+        android:visibility="invisible"
+    />
+
+</LinearLayout>
\ 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 22696c12..b6bdafa8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,7 +155,8 @@
   <string name="gateway_selection_best_location">Location with best connection</string>
   <string name="gateway_selection_automatic">Automatic</string>
   <string name="gateway_selection_current_location">Your traffic is currently routed through: </string>
-
+  <string name="finding_best_connection">Finding best connection…</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>
@@ -181,5 +182,4 @@
   <string name="hide_connection_details">Hide connection details</string>
   <string name="error_network_connection">%s has no internet connection. Please check your WiFi and cellular data settings.</string>
 
-
 </resources>
-- 
cgit v1.2.3


From ff427f2863dd2c3c46030968f4d034553f09d0bf Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 23 Jul 2021 23:50:02 +0200
Subject: add click listener to gateway selection button, open the gateway
 selection fragment

---
 app/src/main/res/layout/v_location_button.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 7425231e..9e5445a4 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -4,8 +4,6 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_gravity="center_vertical"
-    android:clickable="true"
-    android:focusable="true"
     android:padding="@dimen/stdpadding"
     android:background="@drawable/cust_button_primary_rect"
     android:layout_height="wrap_content">
-- 
cgit v1.2.3


From 05934715fec39cb22937e82acecd4add4fccd724 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 29 Jul 2021 18:23:55 +0200
Subject: implement location load indicator in gateway selection cell

---
 app/src/main/res/layout/v_select_text_list_item.xml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml
index 07187016..36075424 100644
--- a/app/src/main/res/layout/v_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_select_text_list_item.xml
@@ -19,20 +19,13 @@
         tools:visibility="visible"
         />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <se.leap.bitmaskclient.base.views.LocationIndicator
         android:id="@+id/quality"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        android:gravity="center_vertical"
-        android:paddingStart="@dimen/standard_margin"
-        android:paddingLeft="@dimen/standard_margin"
-        android:paddingEnd="@dimen/standard_margin"
-        android:paddingRight="@dimen/standard_margin"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:layout_toLeftOf="@id/checked_icon"
-        android:layout_toStartOf="@id/checked_icon"
-        tools:text="GOOD"
+        android:layout_width="56dp"
+        android:layout_height="match_parent"
+        android:layout_toLeftOf="@+id/checked_icon"
+        android:layout_toStartOf="@+id/checked_icon"
+        tools:visibility="visible"
         />
 
     <androidx.appcompat.widget.AppCompatTextView
-- 
cgit v1.2.3


From 645545a86bdd1bc832ad2d14f17f5727e352356c Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 30 Jul 2021 15:46:40 +0200
Subject: draft gateway selection UI according to simlpy secure's proposals

---
 app/src/main/res/layout/f_drawer_main.xml          |  2 +-
 app/src/main/res/layout/f_gateway_selection.xml    | 34 +++++++---------------
 .../main/res/layout/v_select_text_list_item.xml    | 16 ++--------
 app/src/main/res/values/strings.xml                |  7 +++--
 4 files changed, 18 insertions(+), 41 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 1f1df7f2..95e6169b 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -101,7 +101,7 @@
         <se.leap.bitmaskclient.base.views.IconTextEntry
             android:id="@+id/manualGatewaySelection"
             app:text="@string/gateway_selection_title"
-            app:subtitle="@string/gateway_selection_best_location"
+            app:subtitle="@string/gateway_selection_recommended_location"
             app:icon="@drawable/ic_map_marker_star_black_36dp"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml
index f96b9c08..5a384163 100644
--- a/app/src/main/res/layout/f_gateway_selection.xml
+++ b/app/src/main/res/layout/f_gateway_selection.xml
@@ -11,8 +11,9 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
+        android:visibility="visible"
         tools:visibility="visible"
+        android:layout_alignParentTop="true"
         >
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/current_location_description"
@@ -25,7 +26,8 @@
             android:paddingEnd="@dimen/activity_horizontal_margin"
             android:paddingRight="@dimen/activity_horizontal_margin"
             android:paddingBottom="@dimen/activity_vertical_margin"
-            android:text="@string/vpn_securely_routed" />
+
+            android:text="@string/gateway_selection_automatic_location" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/current_location"
@@ -43,26 +45,9 @@
 
     </LinearLayout>
 
-
-
-    <se.leap.bitmaskclient.base.views.IconSwitchEntry
-        android:id="@+id/automatic_gateway_switch"
-        android:layout_below="@id/current_location_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        app:text="@string/gateway_selection_automatic"
-        app:subtitle="@string/gateway_selection_warning"
-        app:icon="@drawable/ic_map_marker_star_black_36dp"
-        />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/gatewaySelection_list"
-        android:layout_below="@id/automatic_gateway_switch"
+        android:layout_below="@id/current_location_container"
         android:layout_above="@+id/vpn_button_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -87,12 +72,13 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/activity_margin"
         >
+
         <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/vpn_button"
-            android:layout_width="wrap_content"
+            android:id="@+id/automatic_gateway_selection_btn"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:text="@string/vpn.button.turn.on" />
+            android:text="@string/gateway_selection_recommended_location"
+            />
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml
index 36075424..1d7054a4 100644
--- a/app/src/main/res/layout/v_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_select_text_list_item.xml
@@ -6,25 +6,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <!-- views are composed right to left -->
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/checked_icon"
-        android:layout_width="?android:attr/listPreferredItemHeightSmall"
-        android:layout_height="?android:attr/listPreferredItemHeightSmall"
-        android:layout_gravity="center"
-        android:padding="10dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        tools:src="@drawable/ic_check_bold"
-        android:visibility="visible"
-        tools:visibility="visible"
-        />
 
     <se.leap.bitmaskclient.base.views.LocationIndicator
         android:id="@+id/quality"
         android:layout_width="56dp"
         android:layout_height="match_parent"
-        android:layout_toLeftOf="@+id/checked_icon"
-        android:layout_toStartOf="@+id/checked_icon"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         tools:visibility="visible"
         />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b6bdafa8..7c0c46f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,9 +152,12 @@
   <string name="version_update_error_permissions">No permissions to install app.</string>
   <string name="gateway_selection_title">Select location</string>
   <string name="gateway_selection_warning">%s will find the best connection for you.</string>
-  <string name="gateway_selection_best_location">Location with best connection</string>
+  <string name="gateway_selection_recommended_location">Use recommended location</string>
   <string name="gateway_selection_automatic">Automatic</string>
-  <string name="gateway_selection_current_location">Your traffic is currently routed through: </string>
+  <string name="gateway_selection_manual_location">Your traffic is currently routed through: </string>
+  <string name="gateway_selection_manual_not_connected">Your traffic will be routed through: </string>
+  <string name="gateway_selection_automatic_location">Your traffic is automatically routed through the best location:</string>
+  <string name="gateway_selection_automatic_not_connected">Your traffic will be automatically routed through the best location.</string>
   <string name="finding_best_connection">Finding best connection…</string>
   <string name="reconnecting">Reconnecting…</string>
   <string name="tor_starting">Starting bridges for censorship circumvention…</string>
-- 
cgit v1.2.3


From d366b98aafdb0b211ed7b3870354477ffc250462 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 30 Jul 2021 18:22:12 +0200
Subject: show bridges icon in gateway selector for locations supporting them

---
 app/src/main/res/layout/v_select_text_list_item.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml
index 1d7054a4..373de14f 100644
--- a/app/src/main/res/layout/v_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_select_text_list_item.xml
@@ -16,14 +16,25 @@
         tools:visibility="visible"
         />
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/bridge_image"
+        android:layout_width="56dp"
+        android:layout_height="match_parent"
+        android:layout_toStartOf="@id/quality"
+        android:layout_toLeftOf="@id/quality"
+        android:src="@drawable/ic_bridge_36"
+        tools:visibility="visible"
+        android:visibility="gone"
+        />
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/location"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
-        android:layout_toStartOf="@id/quality"
-        android:layout_toLeftOf="@id/quality"
+        android:layout_toStartOf="@id/bridge_image"
+        android:layout_toLeftOf="@id/bridge_image"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:minHeight="?android:attr/listPreferredItemHeightLarge"
-- 
cgit v1.2.3


From 5ab54104c6c701789e59963fcdfda05da5a83a45 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 30 Jul 2021 20:38:23 +0200
Subject: ask user to change location or disable bridges if manually selected
 location doesn't support bridges

---
 app/src/main/res/values/untranslatable.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index a08857c1..a288d9a5 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -47,6 +47,9 @@
    <!-- gateway selector, move to strings.xml, once the wording is clear -->
     <string name="warning_no_more_gateways_manual_gw_selection" translatable="false">%1$s could not connect to %2$s. Do you want to try to connect automatically with best location?</string>
     <string name="warning_option_try_best" translatable="false">Try best location</string>
+    <string name="warning_bridges_not_supported" translatable="false">%1$s doesn\'t support bridges to circumvent VPN filtering. Do you want to choose a different location or disable bridges?</string>
+    <string name="option_disable_bridges" translatable="false">Disable bridges</string>
+    <string name="option_different_location" translatable="false">Choose different location</string>
 
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 6d3c122bebf0ad4f7dc22d4963dc73dea4248251 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 31 Jul 2021 16:34:09 +0200
Subject: adapt EIP main screen and strings to simply secure proposals

---
 app/src/main/res/layout-port/f_eip.xml        | 108 +++++++++++++++++++++++
 app/src/main/res/layout-xlarge-port/f_eip.xml | 119 ++++++++++++++++++++++++++
 app/src/main/res/layout-xlarge/f_eip.xml      |  61 +++++++++----
 app/src/main/res/layout/f_eip.xml             | 103 +++++++++++++++-------
 app/src/main/res/layout/v_location_button.xml |   3 +-
 app/src/main/res/values/untranslatable.xml    |   8 +-
 6 files changed, 349 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/res/layout-port/f_eip.xml
 create mode 100644 app/src/main/res/layout-xlarge-port/f_eip.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml
new file mode 100644
index 00000000..4dae126c
--- /dev/null
+++ b/app/src/main/res/layout-port/f_eip.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/eipServiceFragment">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_left"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.225"
+        />
+
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_horizontal_bottom"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintGuide_percent="0.66"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_right"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.775"
+        />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"
+        app:srcCompat="@drawable/background_eip" />
+
+    <se.leap.bitmaskclient.base.views.VpnStateImage
+        android:id="@+id/vpn_state_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_margin="@dimen/stdpadding"
+        app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right"
+        app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left"
+        app:layout_constraintTop_toTopOf="parent"
+         />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/main_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/vpn_state_image"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/sub_description"
+        android:padding="@dimen/activity_margin"
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:textStyle="bold"
+        app:layout_constraintDimensionRatio="1:1"
+        tools:text="CONNETION"
+        android:gravity="center"
+        android:maxLines="1"
+        />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/sub_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/main_description"
+        app:layout_constraintStart_toStartOf="parent"
+        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:textStyle="bold"
+        app:layout_constraintDimensionRatio="1:1"
+        tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk \n kdjfkj \n kjdfkjdf"
+        android:gravity="center"
+        android:maxLines="3"
+        android:ellipsize="end"
+        />
+
+    <se.leap.bitmaskclient.base.views.LocationButton
+        android:id="@+id/gateway_location_button"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginBottom="@dimen/stdpadding"
+        android:layout_marginEnd="@dimen/stdpadding"
+        android:layout_marginStart="@dimen/stdpadding"
+        android:layout_marginTop="@dimen/stdpadding"
+        android:layout_marginLeft="@dimen/stdpadding"
+        android:layout_marginRight="@dimen/stdpadding"
+        app:layout_constraintBottom_toBottomOf="@+id/background"
+        app:layout_constraintEnd_toEndOf="parent"
+        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-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml
new file mode 100644
index 00000000..5325d6a6
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-port/f_eip.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/eipServiceFragment"
+    >
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.0"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_left"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.2"
+        />
+
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_horizontal_bottom"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintGuide_percent="0.7"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_right"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.8"
+        />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"
+        app:srcCompat="@drawable/background_eip" />
+
+
+    <se.leap.bitmaskclient.base.views.VpnStateImage
+        android:id="@+id/vpn_state_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_margin="@dimen/stdpadding"
+        app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom"
+        app:layout_constraintDimensionRatio="1:1"
+        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" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/main_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/vpn_state_image"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/sub_description"
+        android:padding="@dimen/activity_margin"
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:textStyle="bold"
+        app:layout_constraintDimensionRatio="1:1"
+        tools:text="CONNETION"
+        android:gravity="center"
+        android:maxLines="1"
+        />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/sub_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/main_description"
+        app:layout_constraintStart_toStartOf="parent"
+        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:textStyle="bold"
+        app:layout_constraintDimensionRatio="1:1"
+        tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk"
+        android:gravity="center"
+        android:maxLines="2"
+        android:ellipsize="end"
+        />
+
+    <se.leap.bitmaskclient.base.views.LocationButton
+        android:id="@+id/gateway_location_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/stdpadding"
+        android:layout_marginEnd="@dimen/stdpadding"
+        android:layout_marginStart="@dimen/stdpadding"
+        android:layout_marginTop="@dimen/stdpadding"
+        android:layout_marginLeft="@dimen/stdpadding"
+        android:layout_marginRight="@dimen/stdpadding"
+        app:layout_constraintBottom_toBottomOf="@+id/background"
+        app:layout_constraintEnd_toEndOf="parent"
+        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 bef2d635..8ed9a57c 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    This is the layout for extra large landscape, extra large portrait
+    can be found in layout-xlarge-port
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -14,7 +18,7 @@
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintGuide_percent="0.3"
+        app:layout_constraintGuide_percent="0.0"
         />
 
     <androidx.constraintlayout.widget.Guideline
@@ -23,7 +27,7 @@
         android:layout_height="0dp"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.3"
+        app:layout_constraintGuide_percent="0.2"
         />
 
 
@@ -34,7 +38,7 @@
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintGuide_percent="0.7"
+        app:layout_constraintGuide_percent="0.66"
         />
 
     <androidx.constraintlayout.widget.Guideline
@@ -43,7 +47,7 @@
         android:layout_height="0dp"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.7"
+        app:layout_constraintGuide_percent="0.8"
         />
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -54,21 +58,6 @@
         app:srcCompat="@drawable/background_eip" />
 
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/eipLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:text="@string/eip_service_label"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <se.leap.bitmaskclient.base.views.VpnStateImage
         android:id="@+id/vpn_state_image"
         android:layout_width="0dp"
@@ -80,6 +69,40 @@
         app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top"
         app:layout_constraintDimensionRatio="1:1" />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/main_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_bottom"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/sub_description"
+        android:padding="@dimen/stdpadding"
+        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
+        android:textStyle="bold"
+        app:layout_constraintDimensionRatio="1:1"
+        tools:text="CONNETION SECURE"
+        android:maxLines="1"
+        />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/sub_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/main_description"
+        app:layout_constraintStart_toStartOf="parent"
+        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:textStyle="bold"
+        app:layout_constraintDimensionRatio="1:1"
+        android:maxLines="5"
+        android:ellipsize="end"
+        tools:text="Your traffic is securly routed through"
+        android:gravity="center"
+
+        />
 
     <se.leap.bitmaskclient.base.views.LocationButton
         android:id="@+id/gateway_location_button"
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index 8dc1e33b..0cefcd6c 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    This is the default layout for landscape, portrait can be found
+    in layout-port
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -12,9 +16,8 @@
         android:layout_height="0dp"
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintGuide_percent="0.225"
-        />
+        app:layout_constraintGuide_percent="0.1"
+        app:layout_constraintRight_toRightOf="parent" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_vertical_left"
@@ -22,8 +25,7 @@
         android:layout_height="0dp"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.225"
-        />
+        app:layout_constraintGuide_percent="0.3" />
 
 
     <androidx.constraintlayout.widget.Guideline
@@ -32,18 +34,34 @@
         android:layout_height="0dp"
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintGuide_percent="0.775"
+        app:layout_constraintGuide_percent="0.55"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_horizontal_button_top"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.8"
         />
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_horizontal_button_bottom"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.98"
+        app:layout_constraintRight_toRightOf="parent" />
+
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_vertical_right"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintGuide_percent="0.775"
-        />
+        app:layout_constraintGuide_percent="0.7" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/background"
@@ -53,48 +71,71 @@
         app:srcCompat="@drawable/background_eip" />
 
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/eipLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/stdpadding"
-        android:paddingRight="@dimen/stdpadding"
-        android:paddingStart="@dimen/stdpadding"
-        android:paddingEnd="@dimen/stdpadding"
-        android:paddingTop="@dimen/stdpadding"
-        android:text="@string/eip_service_label"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
     <se.leap.bitmaskclient.base.views.VpnStateImage
         android:id="@+id/vpn_state_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="@dimen/stdpadding"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_top"
         app:layout_constraintBottom_toTopOf="@+id/guideline_horizontal_bottom"
         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_constraintDimensionRatio="1:1"
         />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/main_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_bottom"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/sub_description"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
+        android:textStyle="bold"
+        app:layout_constraintDimensionRatio="1:1"
+        tools:text="CONNETION SECURE"
+        />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/sub_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/main_description"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/gateway_location_button"
+        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:textStyle="bold"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:paddingBottom="@dimen/stdpadding"
+
+        app:layout_constraintDimensionRatio="1:1"
+        tools:text="Your traffic is securly routed through \n another"
+        android:maxLines="2"
+        android:gravity="center"
+        />
+
     <se.leap.bitmaskclient.base.views.LocationButton
         android:id="@+id/gateway_location_button"
         android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginBottom="@dimen/stdpadding"
+        android:layout_height="0dp"
         android:layout_marginEnd="@dimen/stdpadding"
         android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginTop="@dimen/stdpadding"
+
         android:layout_marginLeft="@dimen/stdpadding"
         android:layout_marginRight="@dimen/stdpadding"
-        app:layout_constraintBottom_toBottomOf="@+id/background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_button_top"
+        app:layout_constraintBottom_toBottomOf="@+id/guideline_horizontal_button_bottom"
         tools:text="SEATTLE"
         android:gravity="center_vertical" />
 
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 9e5445a4..d8eed9a3 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -6,11 +6,10 @@
     android:layout_gravity="center_vertical"
     android:padding="@dimen/stdpadding"
     android:background="@drawable/cust_button_primary_rect"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
-        android:padding="@dimen/stdpadding"
         android:layout_weight="1"
         android:layout_width="0dp"
         android:maxLines="1"
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index a288d9a5..ec795f57 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -50,6 +50,12 @@
     <string name="warning_bridges_not_supported" translatable="false">%1$s doesn\'t support bridges to circumvent VPN filtering. Do you want to choose a different location or disable bridges?</string>
     <string name="option_disable_bridges" translatable="false">Disable bridges</string>
     <string name="option_different_location" translatable="false">Choose different location</string>
-
+    <string name="eip_state_insecure" translatable="false">Connection Insecure</string>
+    <string name="eip_state_connected_recommended" translatable="false">You are connected to the recommended location</string>
+    <string name="eip_state_connected_manual" translatable="false">You are connected to</string>
+    <string name="eip_state_connecting" translatable="false">Connecting...</string>
+    <string name="connection_not_connected" translatable="false">You may be leaking information to your internet provider or local network.</string>
+    <string name="eip_state_no_network" translatable="false">You have no working Internet connection. Once you get it back, you will be automatically connected to</string>
+    <string name="eip_state_blocking" translatable="false">%1$s is blocking all internet traffic.</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 033ac24155bf9b56fbf8a247ab582ecd2b934e9a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 31 Jul 2021 18:32:01 +0200
Subject: initial implementation of classic on-off push button

---
 app/src/main/res/drawable/ic_btn_on_connecting.xml | 22 ++++++++++++++++++++++
 app/src/main/res/drawable/ic_btn_on_disabled.xml   | 20 ++++++++++++++++++++
 .../main/res/drawable/ic_btn_on_primary_color.xml  | 22 ++++++++++++++++++++++
 app/src/main/res/layout/v_main_button.xml          | 14 +++++++++-----
 4 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_btn_on_connecting.xml
 create mode 100644 app/src/main/res/drawable/ic_btn_on_disabled.xml
 create mode 100644 app/src/main/res/drawable/ic_btn_on_primary_color.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/ic_btn_on_connecting.xml b/app/src/main/res/drawable/ic_btn_on_connecting.xml
new file mode 100644
index 00000000..4b3d1384
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_on_connecting.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeLineCap="round"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillAlpha="0.5"
+      android:fillColor="@color/colorPrimary"/>
+  <path
+      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeLineCap="round"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillAlpha="0.5"
+      android:fillColor="@color/colorPrimary"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_btn_on_disabled.xml b/app/src/main/res/drawable/ic_btn_on_disabled.xml
new file mode 100644
index 00000000..9c83422d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_on_disabled.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeWidth="0.3"
+      android:fillAlpha="0.5"
+      android:strokeLineJoin="round"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:fillAlpha="0.5"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_btn_on_primary_color.xml b/app/src/main/res/drawable/ic_btn_on_primary_color.xml
new file mode 100644
index 00000000..9f449299
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_on_primary_color.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,4.0089C13.0002,3.4567 12.5527,3.0088 12.0004,3.0085C11.4481,3.0083 11.0002,3.4559 11,4.0082L10.9968,12.0116C10.9966,12.5639 11.4442,13.0118 11.9965,13.012C12.5487,13.0122 12.9966,12.5647 12.9968,12.0124L13,4.0089Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeLineCap="round"
+      android:strokeAlpha="0.8"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillColor="@color/colorPrimary"/>
+  <path
+      android:pathData="M4,12.9917C4,10.7826 4.8954,8.7826 6.3431,7.3349L7.7573,8.7491C6.6715,9.8349 6,11.3349 6,12.9917C6,16.3054 8.6863,18.9917 12,18.9917C15.3137,18.9917 18,16.3054 18,12.9917C18,11.3348 17.3284,9.8348 16.2426,8.749L17.6568,7.3348C19.1046,8.7825 20,10.7825 20,12.9917C20,17.41 16.4183,20.9917 12,20.9917C7.5817,20.9917 4,17.41 4,12.9917Z"
+      android:strokeColor="@color/colorPrimary_transparent"
+      android:strokeLineCap="round"
+      android:strokeAlpha="0.8"
+      android:strokeWidth="0.3"
+      android:strokeLineJoin="round"
+      android:fillColor="@color/colorPrimary"/>
+</vector>
diff --git a/app/src/main/res/layout/v_main_button.xml b/app/src/main/res/layout/v_main_button.xml
index d8ae211c..741fc88f 100644
--- a/app/src/main/res/layout/v_main_button.xml
+++ b/app/src/main/res/layout/v_main_button.xml
@@ -102,6 +102,7 @@
         app:layout_constraintEnd_toEndOf="@id/border_guideline_right"
         app:layout_constraintStart_toStartOf="@id/border_guideline_left"
         app:layout_constraintTop_toTopOf="@id/border_guideline_top"
+        app:layout_constraintDimensionRatio="1:1"
         android:indeterminate="true"
         android:indeterminateDuration="800"
         android:indeterminateDrawable="@drawable/progressbar_circle"
@@ -117,16 +118,19 @@
         app:layout_constraintEnd_toStartOf="@+id/vpn_btn_guideline_right"
         app:layout_constraintStart_toStartOf="@+id/vpn_btn_guideline_left"
         app:layout_constraintTop_toTopOf="@+id/vpn_btn_guideline_top"
+        app:layout_constraintDimensionRatio="1:1"
         app:srcCompat="@drawable/black_circle" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/vpn_state_key"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/icn_guideline_bottom"
-        app:layout_constraintEnd_toStartOf="@id/icn_guideline_right"
-        app:layout_constraintStart_toStartOf="@id/icn_guideline_left"
-        app:layout_constraintTop_toTopOf="@id/icn_guideline_top"
-        app:srcCompat="@drawable/vpn_connected" />
+        app:layout_constraintBottom_toTopOf="@+id/icn_guideline_bottom"
+        app:layout_constraintEnd_toStartOf="@+id/icn_guideline_right"
+        app:layout_constraintStart_toStartOf="@+id/icn_guideline_left"
+        app:layout_constraintTop_toTopOf="@+id/icn_guideline_top"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintVertical_bias="0.35"
+        app:srcCompat="@drawable/ic_btn_on_disabled" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 41cb3b4adb137b9a1e0affea42e7f4e9cfa1d7dd Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 31 Jul 2021 18:45:00 +0200
Subject: remove some padding in gateway selection fragment

---
 app/src/main/res/layout/f_gateway_selection.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml
index 5a384163..70a2bb1d 100644
--- a/app/src/main/res/layout/f_gateway_selection.xml
+++ b/app/src/main/res/layout/f_gateway_selection.xml
@@ -35,7 +35,6 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:paddingTop="@dimen/activity_vertical_margin"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingLeft="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
-- 
cgit v1.2.3


From a2067cd5b56387405cb653de8940e7afc448449d Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 31 Jul 2021 19:30:54 +0200
Subject: Add BuildConfig to disable color filtering of the main screen
 background, if VPN is turned off. Make EipFragment's text colors customizable

---
 app/src/main/res/layout-port/f_eip.xml        | 2 ++
 app/src/main/res/layout-xlarge-port/f_eip.xml | 2 ++
 app/src/main/res/layout-xlarge/f_eip.xml      | 2 ++
 app/src/main/res/layout/f_eip.xml             | 3 ++-
 app/src/main/res/values/colors.xml            | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml
index 4dae126c..03401d16 100644
--- a/app/src/main/res/layout-port/f_eip.xml
+++ b/app/src/main/res/layout-port/f_eip.xml
@@ -65,6 +65,7 @@
         android:padding="@dimen/activity_margin"
         android:textAppearance="@android:style/TextAppearance.Large"
         android:textStyle="bold"
+        android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="CONNETION"
         android:gravity="center"
@@ -82,6 +83,7 @@
         android:padding="@dimen/activity_margin"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
         android:textStyle="bold"
+        android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk \n kdjfkj \n kjdfkjdf"
         android:gravity="center"
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 5325d6a6..6a115a8b 100644
--- a/app/src/main/res/layout-xlarge-port/f_eip.xml
+++ b/app/src/main/res/layout-xlarge-port/f_eip.xml
@@ -76,6 +76,7 @@
         android:padding="@dimen/activity_margin"
         android:textAppearance="@android:style/TextAppearance.Large"
         android:textStyle="bold"
+        android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="CONNETION"
         android:gravity="center"
@@ -93,6 +94,7 @@
         android:padding="@dimen/activity_margin"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
         android:textStyle="bold"
+        android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk"
         android:gravity="center"
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index 8ed9a57c..1ea7ba4b 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -80,6 +80,7 @@
         android:padding="@dimen/stdpadding"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
         android:textStyle="bold"
+        android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="CONNETION SECURE"
         android:maxLines="1"
@@ -96,6 +97,7 @@
         android:padding="@dimen/stdpadding"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
         android:textStyle="bold"
+        android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         android:maxLines="5"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index 0cefcd6c..e3e8fe0a 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -97,6 +97,7 @@
         android:paddingEnd="@dimen/stdpadding"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
         android:textStyle="bold"
+        android:textColor="@color/colorEipFragmentFont"
         app:layout_constraintDimensionRatio="1:1"
         tools:text="CONNETION SECURE"
         />
@@ -111,12 +112,12 @@
         app:layout_constraintBottom_toTopOf="@+id/gateway_location_button"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
         android:textStyle="bold"
+        android:textColor="@color/colorEipFragmentFont"
         android:paddingLeft="@dimen/stdpadding"
         android:paddingStart="@dimen/stdpadding"
         android:paddingRight="@dimen/stdpadding"
         android:paddingEnd="@dimen/stdpadding"
         android:paddingBottom="@dimen/stdpadding"
-
         app:layout_constraintDimensionRatio="1:1"
         tools:text="Your traffic is securly routed through \n another"
         android:maxLines="2"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a8cdb28e..e911a6d1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,6 +34,7 @@
 
     <color name="colorActionBarTitleFont">@color/white</color>
     <color name="colorActionBarSubtitleFont">@color/black800</color>
+    <color name="colorEipFragmentFont">@color/black800</color>
 
     <color name="colorWarning">#B33A3A</color>
 
-- 
cgit v1.2.3


From 739e0f16c80da1bad574890d6d8c8f09fa7bbbc0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 1 Aug 2021 00:50:06 +0200
Subject: make button text color customizable

---
 app/src/main/res/values/colors.xml | 1 +
 app/src/main/res/values/styles.xml | 1 +
 2 files changed, 2 insertions(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e911a6d1..86ac1128 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,6 +35,7 @@
     <color name="colorActionBarTitleFont">@color/white</color>
     <color name="colorActionBarSubtitleFont">@color/black800</color>
     <color name="colorEipFragmentFont">@color/black800</color>
+    <color name="colorFontBtn">@color/black800</color>
 
     <color name="colorWarning">#B33A3A</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b8c0bc59..9b05d3fe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,6 +65,7 @@
         <item name="android:background">@drawable/cust_button_primary</item>
         <item name="android:height">36dp</item>
         <item name="android:minWidth">75dp</item>
+        <item name="android:textColor">@color/colorFontBtn</item>
     </style>
 
     <style name="BitmaskActivity">
-- 
cgit v1.2.3


From 580c97e368cd0d9fa47691f70cc31e9b711581ec Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 14:09:17 +0100
Subject: implement a new fancy on-off-button

---
 app/src/main/res/drawable/main_btn_glow.xml        |  15 ++++++
 app/src/main/res/drawable/on_off_btn_fill.png      | Bin 0 -> 41384 bytes
 .../res/drawable/on_off_btn_start_2_disabled.png   | Bin 0 -> 33323 bytes
 .../res/drawable/on_off_btn_start_2_enabled.png    | Bin 0 -> 31261 bytes
 .../res/drawable/on_off_btn_start_2_no_shadow.png  | Bin 0 -> 20182 bytes
 .../res/drawable/on_off_btn_start_2_pressed.png    | Bin 0 -> 28721 bytes
 .../res/drawable/on_off_btn_start_animation1.png   | Bin 0 -> 32481 bytes
 .../res/drawable/on_off_btn_start_animation2.png   | Bin 0 -> 36701 bytes
 .../res/drawable/on_off_btn_start_animation3.png   | Bin 0 -> 39980 bytes
 .../res/drawable/on_off_btn_start_animation4.png   | Bin 0 -> 41982 bytes
 .../res/drawable/on_off_btn_start_animation5.png   | Bin 0 -> 43093 bytes
 app/src/main/res/layout-port/f_eip.xml             |   6 +--
 app/src/main/res/layout-xlarge-port/f_eip.xml      |   6 +--
 app/src/main/res/layout-xlarge/f_eip.xml           |   4 +-
 app/src/main/res/layout/f_eip.xml                  |   4 +-
 app/src/main/res/layout/v_main_btn.xml             |  52 +++++++++++++++++++++
 app/src/main/res/values/colors.xml                 |   1 +
 17 files changed, 78 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable/main_btn_glow.xml
 create mode 100644 app/src/main/res/drawable/on_off_btn_fill.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_2_disabled.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_2_enabled.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_2_pressed.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation1.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation2.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation3.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation4.png
 create mode 100644 app/src/main/res/drawable/on_off_btn_start_animation5.png
 create mode 100644 app/src/main/res/layout/v_main_btn.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/main_btn_glow.xml b/app/src/main/res/drawable/main_btn_glow.xml
new file mode 100644
index 00000000..e740e96f
--- /dev/null
+++ b/app/src/main/res/drawable/main_btn_glow.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
+    <item android:drawable="@drawable/on_off_btn_start_animation1" android:duration="140" />
+    <item android:drawable="@drawable/on_off_btn_start_animation2" android:duration="120" />
+    <item android:drawable="@drawable/on_off_btn_start_animation3" android:duration="100" />
+    <item android:drawable="@drawable/on_off_btn_start_animation4" android:duration="75" />
+    <item android:drawable="@drawable/on_off_btn_start_animation3" android:duration="90" />
+    <item android:drawable="@drawable/on_off_btn_start_animation2" android:duration="90" />
+    <item android:drawable="@drawable/on_off_btn_start_animation3" android:duration="100" />
+    <item android:drawable="@drawable/on_off_btn_start_animation4" android:duration="150" />
+    <item android:drawable="@drawable/on_off_btn_start_animation5" android:duration="200" />
+    <item android:drawable="@drawable/on_off_btn_start_animation4" android:duration="150" />
+    <item android:drawable="@drawable/on_off_btn_start_animation3" android:duration="100" />
+    <item android:drawable="@drawable/on_off_btn_start_animation2" android:duration="120" />
+</animation-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/on_off_btn_fill.png b/app/src/main/res/drawable/on_off_btn_fill.png
new file mode 100644
index 00000000..8394ccfb
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_fill.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_2_disabled.png b/app/src/main/res/drawable/on_off_btn_start_2_disabled.png
new file mode 100644
index 00000000..4675e48d
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_2_disabled.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_2_enabled.png b/app/src/main/res/drawable/on_off_btn_start_2_enabled.png
new file mode 100644
index 00000000..383e1076
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_2_enabled.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png b/app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png
new file mode 100644
index 00000000..941bdef1
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_2_pressed.png b/app/src/main/res/drawable/on_off_btn_start_2_pressed.png
new file mode 100644
index 00000000..7ff60cdb
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_2_pressed.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_animation1.png b/app/src/main/res/drawable/on_off_btn_start_animation1.png
new file mode 100644
index 00000000..f9d18488
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation1.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_animation2.png b/app/src/main/res/drawable/on_off_btn_start_animation2.png
new file mode 100644
index 00000000..33b600c9
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation2.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_animation3.png b/app/src/main/res/drawable/on_off_btn_start_animation3.png
new file mode 100644
index 00000000..2172107a
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation3.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_animation4.png b/app/src/main/res/drawable/on_off_btn_start_animation4.png
new file mode 100644
index 00000000..8b744462
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation4.png differ
diff --git a/app/src/main/res/drawable/on_off_btn_start_animation5.png b/app/src/main/res/drawable/on_off_btn_start_animation5.png
new file mode 100644
index 00000000..11bb16cd
Binary files /dev/null and b/app/src/main/res/drawable/on_off_btn_start_animation5.png differ
diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml
index 03401d16..a261c8ea 100644
--- a/app/src/main/res/layout-port/f_eip.xml
+++ b/app/src/main/res/layout-port/f_eip.xml
@@ -42,8 +42,8 @@
         android:scaleType="fitXY"
         app:srcCompat="@drawable/background_eip" />
 
-    <se.leap.bitmaskclient.base.views.VpnStateImage
-        android:id="@+id/vpn_state_image"
+    <se.leap.bitmaskclient.base.views.MainButton
+        android:id="@+id/main_button"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="@dimen/stdpadding"
@@ -58,7 +58,7 @@
         android:id="@+id/main_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/vpn_state_image"
+        app:layout_constraintTop_toBottomOf="@id/main_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/sub_description"
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 6a115a8b..839753e6 100644
--- a/app/src/main/res/layout-xlarge-port/f_eip.xml
+++ b/app/src/main/res/layout-xlarge-port/f_eip.xml
@@ -53,8 +53,8 @@
         app:srcCompat="@drawable/background_eip" />
 
 
-    <se.leap.bitmaskclient.base.views.VpnStateImage
-        android:id="@+id/vpn_state_image"
+    <se.leap.bitmaskclient.base.views.MainButton
+        android:id="@+id/main_button"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="@dimen/stdpadding"
@@ -69,7 +69,7 @@
         android:id="@+id/main_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/vpn_state_image"
+        app:layout_constraintTop_toBottomOf="@id/main_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/sub_description"
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index 1ea7ba4b..34d74805 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -58,8 +58,8 @@
         app:srcCompat="@drawable/background_eip" />
 
 
-    <se.leap.bitmaskclient.base.views.VpnStateImage
-        android:id="@+id/vpn_state_image"
+    <se.leap.bitmaskclient.base.views.MainButton
+        android:id="@+id/main_button"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="@dimen/stdpadding"
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index e3e8fe0a..b5af785d 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -71,8 +71,8 @@
         app:srcCompat="@drawable/background_eip" />
 
 
-    <se.leap.bitmaskclient.base.views.VpnStateImage
-        android:id="@+id/vpn_state_image"
+    <se.leap.bitmaskclient.base.views.MainButton
+        android:id="@+id/main_button"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="@dimen/stdpadding"
diff --git a/app/src/main/res/layout/v_main_btn.xml b/app/src/main/res/layout/v_main_btn.xml
new file mode 100644
index 00000000..cf2a3e33
--- /dev/null
+++ b/app/src/main/res/layout/v_main_btn.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:id="@+id/vpn_btn_container"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/vpn_btn_glow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/main_btn_glow"
+        tools:visibility="visible"
+        android:visibility="gone"
+        android:backgroundTint="@color/colorSecondary"
+        />
+
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/vpn_btn_shadow_dark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/on_off_btn_start_2_enabled"
+        android:visibility="visible"
+        />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/vpn_btn_shadow_light"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:visibility="gone"
+        android:visibility="gone"
+        />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/vpn_btn_fill"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/on_off_btn_start_2_no_shadow"
+        android:visibility="visible"
+        android:tint="@color/colorPrimaryDark"
+        />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/vpn_btn_fill_overlay"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/on_off_btn_fill"
+        tools:visibility="visible"
+        />
+</RelativeLayout>
\ 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 86ac1128..4b77decb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@
     <color name="colorError">#ef9a9a</color>
     <color name="colorSuccess">#a5d6a7</color>
     <color name="colorDisabled">#AAAAAA</color>
+    <color name="colorSecondary">#03DAC6</color>
 
     <color name="black800">#424242</color>
     <color name="black800_secondary">#3b3b3b</color>
-- 
cgit v1.2.3


From 78b06a47b6c7e3de5706893eeebb01bef89060d8 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 14:23:23 +0100
Subject: only use two button pressed states

---
 app/src/main/res/drawable/main_btn_shadow.xml | 5 +++++
 app/src/main/res/layout/v_main_btn.xml        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/main_btn_shadow.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/main_btn_shadow.xml b/app/src/main/res/drawable/main_btn_shadow.xml
new file mode 100644
index 00000000..94cf379f
--- /dev/null
+++ b/app/src/main/res/drawable/main_btn_shadow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/on_off_btn_start_2_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/on_off_btn_start_2_enabled"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_main_btn.xml b/app/src/main/res/layout/v_main_btn.xml
index cf2a3e33..259edb5b 100644
--- a/app/src/main/res/layout/v_main_btn.xml
+++ b/app/src/main/res/layout/v_main_btn.xml
@@ -21,7 +21,7 @@
         android:id="@+id/vpn_btn_shadow_dark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:srcCompat="@drawable/on_off_btn_start_2_enabled"
+        app:srcCompat="@drawable/main_btn_shadow"
         android:visibility="visible"
         />
 
-- 
cgit v1.2.3


From 427a41a35205b1948da37727eb21b66e2c518b0c Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 16:02:09 +0100
Subject: tweak an rename main button higlight colores

---
 app/src/main/res/layout/v_main_btn.xml | 2 +-
 app/src/main/res/values/colors.xml     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_main_btn.xml b/app/src/main/res/layout/v_main_btn.xml
index 259edb5b..c4c7a600 100644
--- a/app/src/main/res/layout/v_main_btn.xml
+++ b/app/src/main/res/layout/v_main_btn.xml
@@ -13,7 +13,7 @@
         android:background="@drawable/main_btn_glow"
         tools:visibility="visible"
         android:visibility="gone"
-        android:backgroundTint="@color/colorSecondary"
+        android:backgroundTint="@color/colorMainBtnHighlight"
         />
 
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4b77decb..bba7f1b5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,7 +7,8 @@
     <color name="colorError">#ef9a9a</color>
     <color name="colorSuccess">#a5d6a7</color>
     <color name="colorDisabled">#AAAAAA</color>
-    <color name="colorSecondary">#03DAC6</color>
+    <color name="colorMainBtnHighlight">#03DAC6</color>
+    <color name="colorMainBtnError">#eF2222</color>
 
     <color name="black800">#424242</color>
     <color name="black800_secondary">#3b3b3b</color>
-- 
cgit v1.2.3


From 31ef0e2a1b39a2aaa9e8b43609f6786e31e44eeb Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 17:36:51 +0100
Subject: improve location button layout with rounded corners, gradient and
 shadow

---
 .../main/res/drawable/cust_button_primary_rect.xml | 82 ++++++++++++++++++----
 app/src/main/res/values/colors.xml                 |  2 +
 2 files changed, 72 insertions(+), 12 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/cust_button_primary_rect.xml b/app/src/main/res/drawable/cust_button_primary_rect.xml
index 93be5c18..cb77b578 100644
--- a/app/src/main/res/drawable/cust_button_primary_rect.xml
+++ b/app/src/main/res/drawable/cust_button_primary_rect.xml
@@ -1,21 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:state_pressed="true" >
-        <shape android:shape="rectangle"  >
-            <padding android:left="8dp" android:right="8dp"/>
-            <solid android:color="@color/colorPrimaryDark"/>
-        </shape>
+        <layer-list
+            android:paddingLeft="@dimen/button_bevel"
+            android:paddingRight="@dimen/button_bevel">
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/colorPrimaryDark"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/black_transparent"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+        </layer-list>
     </item>
     <item android:state_focused="true">
-        <shape android:shape="rectangle"  >
-            <padding android:left="8dp" android:right="8dp"/>
-            <solid android:color="@color/colorPrimaryDark"/>
-        </shape>
+        <layer-list
+            android:paddingLeft="@dimen/button_bevel"
+            android:paddingRight="@dimen/button_bevel">
+            <item>
+                <shape android:shape="rectangle"  >
+                    <solid android:color="@color/colorPrimaryDark"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/black_transparent"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+
+        </layer-list>
     </item>
     <item >
-        <shape android:shape="rectangle"  >
-            <padding android:left="8dp" android:right="8dp"/>
-            <solid android:color="@color/colorPrimary"/>
-        </shape>
+        <layer-list
+            android:paddingLeft="@dimen/button_bevel"
+            android:paddingRight="@dimen/button_bevel">
+            <!-- shadow -->
+            <item
+                android:top="@dimen/button_bevel"
+                android:left="1dp"
+                >
+                <shape android:shape="rectangle"  >
+                    <corners android:radius="10dp" />
+                    <solid android:color="@color/colorPrimary_transparent"/>
+                </shape>
+            </item>
+            <!-- fill -->
+            <item
+                android:bottom="@dimen/button_bevel"
+                android:right="1dp"
+                >
+                <shape android:shape="rectangle"  >
+                    <solid android:color="@color/colorPrimary"/>
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+            <!-- gradient -->
+            <item
+                android:bottom="@dimen/button_bevel"
+                android:right="1dp"
+                >
+                <shape android:shape="rectangle">
+                    <gradient android:startColor="@color/black_transparent"
+                        android:endColor="@color/white_transparent"
+                        android:angle="90"
+                        />
+                    <corners android:radius="@dimen/stdpadding"/>
+                </shape>
+            </item>
+        </layer-list>
     </item>
 </selector>
\ 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 bba7f1b5..f1da0785 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -33,6 +33,8 @@
     <color name="deepOrange200">#ffab91</color>
 
     <color name="white">#ffffff</color>
+    <color name="white_transparent">#20ffffff</color>
+    <color name="black_transparent">#20000000</color>
 
     <color name="colorActionBarTitleFont">@color/white</color>
     <color name="colorActionBarSubtitleFont">@color/black800</color>
-- 
cgit v1.2.3


From 2dd1e9f5bed2c5d1bf7158f674d6f49ac0fd6ed7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 18:09:39 +0100
Subject: change button text color depending on enabled state

---
 app/src/main/res/color/button_color.xml | 5 +++++
 app/src/main/res/values/colors.xml      | 1 +
 app/src/main/res/values/styles.xml      | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/color/button_color.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/color/button_color.xml b/app/src/main/res/color/button_color.xml
new file mode 100644
index 00000000..f7fed335
--- /dev/null
+++ b/app/src/main/res/color/button_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorFontBtnEnabled" android:state_enabled="true"/>
+    <item android:color="@color/colorFontBtn"/>
+</selector>
\ 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 f1da0785..c1039f70 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -40,6 +40,7 @@
     <color name="colorActionBarSubtitleFont">@color/black800</color>
     <color name="colorEipFragmentFont">@color/black800</color>
     <color name="colorFontBtn">@color/black800</color>
+    <color name="colorFontBtnEnabled">@color/white</color>
 
     <color name="colorWarning">#B33A3A</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9b05d3fe..df08916b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,7 +65,7 @@
         <item name="android:background">@drawable/cust_button_primary</item>
         <item name="android:height">36dp</item>
         <item name="android:minWidth">75dp</item>
-        <item name="android:textColor">@color/colorFontBtn</item>
+        <item name="android:textColor">@color/button_color</item>
     </style>
 
     <style name="BitmaskActivity">
-- 
cgit v1.2.3


From 96a397b01da596204e3e9d1ff2dd2c176f76e5b3 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 20:42:58 +0100
Subject: improve location status indicator, adapt according to desktop

---
 .../res/layout/v_location_status_indicator.xml     | 196 ++++++++++++++++++---
 1 file changed, 170 insertions(+), 26 deletions(-)

(limited to 'app/src/main/res')

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 97b55917..22453167 100644
--- a/app/src/main/res/layout/v_location_status_indicator.xml
+++ b/app/src/main/res/layout/v_location_status_indicator.xml
@@ -1,49 +1,193 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:weightSum="100"
-    android:layout_margin="8dp"
-    >
+    android:layout_margin="8dp">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_first"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.166"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_second"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.334"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_third"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.5"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_fourth"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.666"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_fifth"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.833"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.166"
+        />
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_horizontal_upper"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.333"
+        />
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_hoizontal_mid"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.5"
+        />
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_hoizontal_lower"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.666"
+        />
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_hoizontal_bottom"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.833"
+        />
+
 
     <View
-        android:id="@+id/level3"
-        android:layout_width="match_parent"
+        android:id="@+id/level1"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_weight="30"
-        android:background="@color/green200"
-        android:visibility="invisible"
+        android:background="@color/red200"
+        android:visibility="visible"
+        app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_first"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_hoizontal_bottom"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginEnd="1dp"
         />
 
-    <Space
-        android:layout_width="match_parent"
+    <View
+        android:id="@+id/level1_2"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_weight="5"
+        android:background="@color/red200"
+        android:visibility="visible"
+        app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_second"
+        app:layout_constraintLeft_toRightOf="@id/guideline_vertical_first"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_hoizontal_lower"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginEnd="1dp"
         />
 
     <View
         android:id="@+id/level2"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_weight="30"
-        android:background="@color/green200"
-        android:visibility="invisible"
+        android:background="@color/yellow200"
+        android:visibility="visible"
+        app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_third"
+        app:layout_constraintLeft_toRightOf="@id/guideline_vertical_second"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_hoizontal_mid"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginEnd="1dp"
         />
 
-    <Space
-        android:layout_width="match_parent"
+    <View
+        android:id="@+id/level2_2"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_weight="5"
+        android:background="@color/yellow200"
+        android:visibility="visible"
+        app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_fourth"
+        app:layout_constraintLeft_toRightOf="@id/guideline_vertical_third"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_upper"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginEnd="1dp"
         />
 
     <View
-        android:id="@+id/level1"
-        android:layout_width="match_parent"
+        android:id="@+id/level3"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@color/green200"
+        android:visibility="visible"
+        app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_fifth"
+        app:layout_constraintLeft_toRightOf="@id/guideline_vertical_fourth"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal_top"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginEnd="1dp"
+        />
+
+    <View
+        android:id="@+id/level3_2"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_weight="30"
         android:background="@color/green200"
-        android:visibility="invisible"
-    />
+        android:visibility="visible"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="@id/guideline_vertical_fifth"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginEnd="1dp"
+        />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 4ebc200dc2f7bcded3047fca26d427c5248587f7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 20:52:33 +0100
Subject: add horizontal padding to location button text

---
 app/src/main/res/layout/v_location_button.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index d8eed9a3..b0180ee5 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -10,6 +10,10 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
         android:layout_weight="1"
         android:layout_width="0dp"
         android:maxLines="1"
-- 
cgit v1.2.3


From 3fc8ce49531d475886b27921155c94fc3cabd177 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 21:53:26 +0100
Subject: replace location marker icon by www/globe icon, similar to desktop

---
 .../res/drawable-hdpi/ic_map_marker_star_black_36dp.png  | Bin 919 -> 0 bytes
 app/src/main/res/drawable-hdpi/ic_web.png                | Bin 0 -> 1938 bytes
 app/src/main/res/drawable-ldpi/ic_web.png                | Bin 0 -> 1011 bytes
 .../res/drawable-mdpi/ic_map_marker_star_black_36dp.png  | Bin 645 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_web.png                | Bin 0 -> 1357 bytes
 .../res/drawable-xhdpi/ic_map_marker_star_black_36dp.png | Bin 1182 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_web.png               | Bin 0 -> 2574 bytes
 .../drawable-xxhdpi/ic_map_marker_star_black_36dp.png    | Bin 1809 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/ic_web.png              | Bin 0 -> 3852 bytes
 .../drawable-xxxhdpi/ic_map_marker_star_black_36dp.png   | Bin 2284 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/ic_web.png             | Bin 0 -> 5418 bytes
 app/src/main/res/layout/f_drawer_main.xml                |   2 +-
 app/src/main/res/layout/v_location_button.xml            |   6 ++++++
 13 files changed, 7 insertions(+), 1 deletion(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_map_marker_star_black_36dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_web.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_web.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_map_marker_star_black_36dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_web.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_map_marker_star_black_36dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_web.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_map_marker_star_black_36dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_web.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_map_marker_star_black_36dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_web.png

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-hdpi/ic_map_marker_star_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_map_marker_star_black_36dp.png
deleted file mode 100644
index 0d395564..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_map_marker_star_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_web.png b/app/src/main/res/drawable-hdpi/ic_web.png
new file mode 100644
index 00000000..b84e7cad
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_web.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_web.png b/app/src/main/res/drawable-ldpi/ic_web.png
new file mode 100644
index 00000000..bdaf12aa
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_web.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_map_marker_star_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_map_marker_star_black_36dp.png
deleted file mode 100644
index 3065f57e..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_map_marker_star_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_web.png b/app/src/main/res/drawable-mdpi/ic_web.png
new file mode 100644
index 00000000..bbacd404
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_web.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_map_marker_star_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_map_marker_star_black_36dp.png
deleted file mode 100644
index 57016c8c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_map_marker_star_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_web.png b/app/src/main/res/drawable-xhdpi/ic_web.png
new file mode 100644
index 00000000..1af146ad
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_web.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_map_marker_star_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_map_marker_star_black_36dp.png
deleted file mode 100644
index 3f0cdaba..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_map_marker_star_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_web.png b/app/src/main/res/drawable-xxhdpi/ic_web.png
new file mode 100644
index 00000000..0b6e767b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_web.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_map_marker_star_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_map_marker_star_black_36dp.png
deleted file mode 100644
index a4afda4d..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_map_marker_star_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_web.png b/app/src/main/res/drawable-xxxhdpi/ic_web.png
new file mode 100644
index 00000000..7ed01c26
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_web.png differ
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 95e6169b..97479ec3 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -102,7 +102,7 @@
             android:id="@+id/manualGatewaySelection"
             app:text="@string/gateway_selection_title"
             app:subtitle="@string/gateway_selection_recommended_location"
-            app:icon="@drawable/ic_map_marker_star_black_36dp"
+            app:icon="@drawable/ic_web"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:visibility="gone"
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index b0180ee5..6bc8637f 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -8,6 +8,12 @@
     android:background="@drawable/cust_button_primary_rect"
     android:layout_height="match_parent">
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_web"
+        android:layout_gravity="center"
+        />
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
         android:paddingStart="@dimen/stdpadding"
-- 
cgit v1.2.3


From 7436008db89d4ddf4f918fc220dc813b3289d0d7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 16 Nov 2021 00:12:38 +0100
Subject: add bridge indicator to bottom panel

---
 app/src/main/res/layout/v_location_button.xml      | 44 +++++++++++++++++++---
 .../res/layout/v_location_status_indicator.xml     |  2 +-
 2 files changed, 39 insertions(+), 7 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 6bc8637f..6a7214c8 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
@@ -9,8 +9,12 @@
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/world_icn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:scaleType="fitXY"
         android:src="@drawable/ic_web"
         android:layout_gravity="center"
         />
@@ -20,26 +24,54 @@
         android:paddingLeft="@dimen/stdpadding"
         android:paddingEnd="@dimen/stdpadding"
         android:paddingRight="@dimen/stdpadding"
-        android:layout_weight="1"
-        android:layout_width="0dp"
         android:maxLines="1"
         android:ellipsize="end"
         android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_toEndOf="@id/world_icn"
+        android:layout_toRightOf="@+id/world_icn"
+        android:layout_toLeftOf="@+id/bridge_icn"
+        android:layout_toStartOf="@+id/bridge_icn"
         android:layout_gravity="center_vertical"
+        android:layout_centerInParent="true"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textStyle="bold"
         android:textColor="@color/white"
-        tools:text="Seattle"
+        tools:text="Seattle along message"
+        />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/bridge_icn"
+        android:paddingRight="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingLeft="@dimen/stdpadding"
+        android:layout_marginBottom="-5dp"
+        android:layout_marginTop="-5dp"
+        android:scaleType="fitXY"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:layout_toStartOf="@id/load_indicator"
+        android:layout_toLeftOf="@id/load_indicator"
+        android:src="@drawable/ic_bridge_36"
+        android:visibility="gone"
         />
 
     <se.leap.bitmaskclient.base.views.LocationIndicator
         android:id="@+id/load_indicator"
+        android:layout_marginBottom="4dp"
         android:layout_width="48dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/text_location"
+        android:layout_alignBottom="@id/text_location"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:visibility="visible"
         android:layout_gravity="center_vertical"
         />
 
 
 
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
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 22453167..548a965f 100644
--- a/app/src/main/res/layout/v_location_status_indicator.xml
+++ b/app/src/main/res/layout/v_location_status_indicator.xml
@@ -5,7 +5,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="8dp">
+    >
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_vertical_first"
-- 
cgit v1.2.3


From a4ef804b3148cfc5df56b585133a071b24f5e3fc Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 16 Nov 2021 00:16:24 +0100
Subject: adapt location indicator margin in gateway selector list item

---
 app/src/main/res/layout/v_select_text_list_item.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml
index 373de14f..663b5b4d 100644
--- a/app/src/main/res/layout/v_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_select_text_list_item.xml
@@ -13,6 +13,7 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:layout_margin="10dp"
         tools:visibility="visible"
         />
 
-- 
cgit v1.2.3


From ca00d7454ad412bc3cf54159a87caa0ffb349502 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 16 Nov 2021 03:51:55 +0100
Subject: replace all TextViews with AppCompatTextViews

---
 app/src/main/res/font/sofiapro_light.otf           | Bin 0 -> 161884 bytes
 app/src/main/res/layout-xlarge/f_about.xml         |  56 +++++++++----------
 .../res/layout-xlarge/v_icon_text_list_item.xml    |   4 +-
 .../res/layout-xlarge/v_provider_list_item.xml     |   4 +-
 .../main/res/layout-xlarge/v_single_list_item.xml  |   2 +-
 .../main/res/layout-xlarge/v_switch_list_item.xml  |   4 +-
 app/src/main/res/layout-xlarge/v_vpn_status.xml    |  12 ++--
 .../main/res/layout/allowed_application_layout.xml |   6 +-
 app/src/main/res/layout/allowed_vpn_apps.xml       |   4 +-
 app/src/main/res/layout/custom_toast.xml           |   2 +-
 .../main/res/layout/donation_reminder_dialog.xml   |   4 +-
 app/src/main/res/layout/f_about.xml                |  62 ++++++++++-----------
 app/src/main/res/layout/f_drawer_main.xml          |   2 +-
 app/src/main/res/layout/f_log.xml                  |   2 +-
 app/src/main/res/layout/f_log_sliders.xml          |   4 +-
 app/src/main/res/layout/v_custom_notification.xml  |   4 +-
 .../res/layout/v_icon_select_text_list_item.xml    |   2 +-
 app/src/main/res/layout/v_icon_text_list_item.xml  |   4 +-
 app/src/main/res/layout/v_log_item.xml             |   2 +-
 app/src/main/res/layout/v_provider_list_item.xml   |   4 +-
 app/src/main/res/layout/v_single_list_item.xml     |   2 +-
 app/src/main/res/layout/v_switch_list_item.xml     |   4 +-
 app/src/main/res/layout/v_vpn_status.xml           |  12 ++--
 23 files changed, 101 insertions(+), 101 deletions(-)
 create mode 100644 app/src/main/res/font/sofiapro_light.otf

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/font/sofiapro_light.otf b/app/src/main/res/font/sofiapro_light.otf
new file mode 100644
index 00000000..9316c9aa
Binary files /dev/null and b/app/src/main/res/font/sofiapro_light.otf differ
diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index 704a7319..e018c8fc 100644
--- a/app/src/main/res/layout-xlarge/f_about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/version"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="12sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/terms_of_service"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
             android:paddingBottom="12dp"
             />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -42,14 +42,14 @@
             android:layout_width="match_parent"
             android:layout_height="12sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
             android:autoLink="all"
             android:text="@string/repository_url_text" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -60,7 +60,7 @@
             android:layout_width="match_parent"
             android:layout_height="18sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -71,7 +71,7 @@
             android:layout_width="match_parent"
             android:layout_height="12sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -82,7 +82,7 @@
             android:layout_width="match_parent"
             android:layout_height="18sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -92,7 +92,7 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="24sp"
@@ -106,7 +106,7 @@
         android:src="@drawable/openvpnLogo" />
         -->
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -116,14 +116,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="24sp"
             android:text="@string/lzo"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -133,14 +133,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="24sp"
             android:text="@string/openssl"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -149,14 +149,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/okhttp"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -166,14 +166,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/mbetTLS"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -184,14 +184,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/asio"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -201,14 +201,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/openvpn3"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -218,14 +218,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/shapeshifter_library"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -235,14 +235,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/shapeshifter_dispatcher"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
@@ -252,14 +252,14 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/shapeshifter_transports"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
diff --git a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
index 7d679ae3..b39540a6 100644
--- a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
@@ -15,7 +15,7 @@
         tools:src="@drawable/ic_add_circle_outline_grey600_24dp"
         />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
         android:layout_above="@+id/subtitle"
         />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-xlarge/v_provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml
index ec1e1242..eea55be2 100644
--- a/app/src/main/res/layout-xlarge/v_provider_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml
@@ -10,7 +10,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
 >
 
-    <TextView android:id="@+id/provider_domain"
+    <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
@@ -21,7 +21,7 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
     />
 
-    <TextView android:id="@+id/provider_name"
+    <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
diff --git a/app/src/main/res/layout-xlarge/v_single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml
index ad3de093..6a318ff5 100644
--- a/app/src/main/res/layout-xlarge/v_single_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-xlarge/v_switch_list_item.xml b/app/src/main/res/layout-xlarge/v_switch_list_item.xml
index 02e52d6d..f4c3e892 100644
--- a/app/src/main/res/layout-xlarge/v_switch_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_switch_list_item.xml
@@ -27,7 +27,7 @@
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             android:textAppearance="?android:attr/textAppearanceListItem"
             tools:text=".,m.,msdflksdjflksjdflkjsdflksdlsdflkj lskjdf lkjsdf lkjsdf fsdls" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-xlarge/v_vpn_status.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml
index 3b464b62..ce8e6928 100644
--- a/app/src/main/res/layout-xlarge/v_vpn_status.xml
+++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml
@@ -13,20 +13,20 @@
             android:layout_height="wrap_content"/>
 
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/uploaded_data"
             style="@style/logWindowStatusTitle"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             style="@style/logWindowStatusText"
             android:id="@+id/speedUp"
             tools:text="4 Mbit/s 6.7 GB"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/downloaded_data"
             style="@style/logWindowStatusTitle"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             style="@style/logWindowStatusText"
             android:id="@+id/speedDown"
             tools:text="2 Mbit/s 4.7 GB"/>
@@ -38,11 +38,11 @@
             android:layout_height="wrap_content"/>
 
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/vpn_status"
             style="@style/logWindowStatusTitle"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
 
             android:id="@+id/speedStatus"
             tools:text="Connected to a very long ipv4 and 3483489348238824829482384928"
diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml
index d8d846f9..f1556875 100644
--- a/app/src/main/res/layout/allowed_application_layout.xml
+++ b/app/src/main/res/layout/allowed_application_layout.xml
@@ -26,7 +26,7 @@
         tools:background="@drawable/icon"
         android:contentDescription="@null" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         tools:text="@string/app"
         android:id="@+id/app_name"
         android:layout_width="0dip"
@@ -45,14 +45,14 @@
         android:layout_rowSpan="1"
         android:visibility="visible" />
 
-<!--    <TextView
+<!--    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/app_size"
         android:layout_width="0dip"
         android:layout_gravity="fill_horizontal|top"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart" /> -->
 
-    <!-- <TextView
+    <!-- <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/app_disabled"
         android:layout_marginStart="8dip"
         android:layout_gravity="top"
diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml
index c1711d56..f76b5f4f 100644
--- a/app/src/main/res/layout/allowed_vpn_apps.xml
+++ b/app/src/main/res/layout/allowed_vpn_apps.xml
@@ -10,7 +10,7 @@
     tools:ignore="RtlCompat"
     android:layout_height="match_parent">
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -50,7 +50,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/app/src/main/res/layout/custom_toast.xml b/app/src/main/res/layout/custom_toast.xml
index 70a9df8c..c267fb86 100644
--- a/app/src/main/res/layout/custom_toast.xml
+++ b/app/src/main/res/layout/custom_toast.xml
@@ -13,7 +13,7 @@
         android:layout_marginRight="8dp"
         android:layout_gravity="center"
         />
-    <TextView android:id="@+id/text"
+    <androidx.appcompat.widget.AppCompatTextView android:id="@+id/text"
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml
index 3af36086..d6b6ea80 100644
--- a/app/src/main/res/layout/donation_reminder_dialog.xml
+++ b/app/src/main/res/layout/donation_reminder_dialog.xml
@@ -11,7 +11,7 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             android:textSize="28sp"
             android:textStyle="bold" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml
index ec7369ef..b10cc555 100644
--- a/app/src/main/res/layout/f_about.xml
+++ b/app/src/main/res/layout/f_about.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/version"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="10sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/terms_of_service"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
             android:paddingBottom="12dp"
             />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
@@ -41,7 +41,7 @@
             android:layout_width="match_parent"
             android:layout_height="10sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
@@ -52,13 +52,13 @@
             android:layout_width="match_parent"
             android:layout_height="10sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
             android:text="@string/repository_url_text" />
 
-	<TextView
+	<androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
@@ -68,7 +68,7 @@
             android:layout_width="match_parent"
             android:layout_height="10sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
@@ -78,7 +78,7 @@
             android:layout_width="match_parent"
             android:layout_height="10sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
@@ -88,7 +88,7 @@
             android:layout_width="match_parent"
             android:layout_height="10sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_others" />
@@ -97,7 +97,7 @@
             android:layout_width="match_parent"
             android:layout_height="10sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/openvpn"
@@ -110,7 +110,7 @@
         android:src="@drawable/openvpnLogo" />
         -->
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/opevpn_copyright" />
@@ -119,13 +119,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/lzo"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/lzo_copyright" />
@@ -134,13 +134,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/openssl"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_openssl" />
@@ -149,13 +149,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/okhttp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_okhttp" />
@@ -164,13 +164,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/mbetTLS"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="web"
@@ -180,13 +180,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/asio"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_asio" />
@@ -195,13 +195,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/openvpn3"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_openvpn3" />
@@ -210,13 +210,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/shapeshifter_library"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_shapeshifter_library" />
@@ -225,13 +225,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/shapeshifter_dispatcher"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_shapeshifter_dispatcher" />
@@ -240,13 +240,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/shapeshifter_transports"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_shapeshifter_transports" />
@@ -255,13 +255,13 @@
             android:layout_width="match_parent"
             android:layout_height="20sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/circleImageView"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_circleImageView" />
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 97479ec3..65179857 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -108,7 +108,7 @@
             android:visibility="gone"
             />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/show_experimental_features"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml
index 47a80e50..ac77abd5 100644
--- a/app/src/main/res/layout/f_log.xml
+++ b/app/src/main/res/layout/f_log.xml
@@ -21,7 +21,7 @@
 
         <include layout="@layout/f_log_sliders"/>
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/speed_waiting"
             android:singleLine="true"
             android:id="@+id/speed"
diff --git a/app/src/main/res/layout/f_log_sliders.xml b/app/src/main/res/layout/f_log_sliders.xml
index 4196e243..ea444b3d 100644
--- a/app/src/main/res/layout/f_log_sliders.xml
+++ b/app/src/main/res/layout/f_log_sliders.xml
@@ -16,7 +16,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/log_verbosity_level"/>
@@ -29,7 +29,7 @@
             tools:max="5"
             android:indeterminate="false"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/timestamps"/>
diff --git a/app/src/main/res/layout/v_custom_notification.xml b/app/src/main/res/layout/v_custom_notification.xml
index e97fcbe2..e3996dcc 100644
--- a/app/src/main/res/layout/v_custom_notification.xml
+++ b/app/src/main/res/layout/v_custom_notification.xml
@@ -28,7 +28,7 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
             tools:text="Bitmask - Amsterdam"
             />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v_icon_select_text_list_item.xml b/app/src/main/res/layout/v_icon_select_text_list_item.xml
index f38bac6e..801a372a 100644
--- a/app/src/main/res/layout/v_icon_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_icon_select_text_list_item.xml
@@ -15,7 +15,7 @@
         tools:src="@drawable/ic_bluetooth"
         />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml
index 0b2d5b11..06b70a2e 100644
--- a/app/src/main/res/layout/v_icon_text_list_item.xml
+++ b/app/src/main/res/layout/v_icon_text_list_item.xml
@@ -14,7 +14,7 @@
         android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
         tools:src="@drawable/ic_add_circle_outline_grey600_24dp"
         />
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
         android:layout_above="@+id/subtitle"
         />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v_log_item.xml b/app/src/main/res/layout/v_log_item.xml
index 713c3b1f..5f809523 100644
--- a/app/src/main/res/layout/v_log_item.xml
+++ b/app/src/main/res/layout/v_log_item.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     >
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v_provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml
index 1f0e135b..b4f41793 100644
--- a/app/src/main/res/layout/v_provider_list_item.xml
+++ b/app/src/main/res/layout/v_provider_list_item.xml
@@ -10,7 +10,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
 >
 
-    <TextView android:id="@+id/provider_domain"
+    <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
@@ -21,7 +21,7 @@
         android:textAppearance="?android:attr/textAppearanceListItem"
     />
 
-    <TextView android:id="@+id/provider_name"
+    <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
diff --git a/app/src/main/res/layout/v_single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml
index 652cb693..7b35bf7f 100644
--- a/app/src/main/res/layout/v_single_list_item.xml
+++ b/app/src/main/res/layout/v_single_list_item.xml
@@ -1,4 +1,4 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml
index 1686a99d..5bd4de1b 100644
--- a/app/src/main/res/layout/v_switch_list_item.xml
+++ b/app/src/main/res/layout/v_switch_list_item.xml
@@ -27,7 +27,7 @@
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             android:textAppearance="?android:attr/textAppearanceListItemSmall"
             tools:text=".,m.,msdflksdjflksjdflkjsdflksdlsdflkj lskjdf lkjsdf lkjsdf fsdls" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/v_vpn_status.xml b/app/src/main/res/layout/v_vpn_status.xml
index 3b464b62..ce8e6928 100644
--- a/app/src/main/res/layout/v_vpn_status.xml
+++ b/app/src/main/res/layout/v_vpn_status.xml
@@ -13,20 +13,20 @@
             android:layout_height="wrap_content"/>
 
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/uploaded_data"
             style="@style/logWindowStatusTitle"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             style="@style/logWindowStatusText"
             android:id="@+id/speedUp"
             tools:text="4 Mbit/s 6.7 GB"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/downloaded_data"
             style="@style/logWindowStatusTitle"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             style="@style/logWindowStatusText"
             android:id="@+id/speedDown"
             tools:text="2 Mbit/s 4.7 GB"/>
@@ -38,11 +38,11 @@
             android:layout_height="wrap_content"/>
 
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/vpn_status"
             style="@style/logWindowStatusTitle"/>
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
 
             android:id="@+id/speedStatus"
             tools:text="Connected to a very long ipv4 and 3483489348238824829482384928"
-- 
cgit v1.2.3


From 948bc99196a05efa33072f0cc6776b81165ed06a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 19 Nov 2021 14:26:43 +0100
Subject: use custom font for some languages

---
 app/src/main/res/font/sofiapro_light.otf   | Bin 161884 -> 0 bytes
 app/src/main/res/font/sofiapro_regular.otf | Bin 0 -> 140748 bytes
 app/src/main/res/values-v21/themes.xml     |   2 +-
 app/src/main/res/values/themes.xml         |   2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 app/src/main/res/font/sofiapro_light.otf
 create mode 100644 app/src/main/res/font/sofiapro_regular.otf

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/font/sofiapro_light.otf b/app/src/main/res/font/sofiapro_light.otf
deleted file mode 100644
index 9316c9aa..00000000
Binary files a/app/src/main/res/font/sofiapro_light.otf and /dev/null differ
diff --git a/app/src/main/res/font/sofiapro_regular.otf b/app/src/main/res/font/sofiapro_regular.otf
new file mode 100644
index 00000000..66d25156
Binary files /dev/null and b/app/src/main/res/font/sofiapro_regular.otf differ
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 0a426ced..233eec9d 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -3,7 +3,7 @@
     <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-
+        <item name="android:fontFamily">@font/sofiapro_regular</item>
         <item name="textColorError">@color/colorError</item>
 
         <!-- progressBar color -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ab489fc6..e54feaff 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,9 +3,9 @@
     <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:fontFamily">@font/sofiapro_regular</item>
 
         <item name="textColorError">@color/colorError</item>
-
         <!-- progressBar color -->
         <item name="colorAccent">@color/colorPrimary</item>
 
-- 
cgit v1.2.3


From e7644ab562df6fb53c912977d89987b36e04702e Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 19 Nov 2021 15:12:49 +0100
Subject: right align select preferred location

---
 app/src/main/res/layout/f_gateway_selection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml
index 70a2bb1d..91354104 100644
--- a/app/src/main/res/layout/f_gateway_selection.xml
+++ b/app/src/main/res/layout/f_gateway_selection.xml
@@ -74,7 +74,7 @@
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/automatic_gateway_selection_btn"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/gateway_selection_recommended_location"
             />
-- 
cgit v1.2.3


From 72ab8da066b4ef4b11c7758b1aac691956d1f160 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 19 Nov 2021 15:27:41 +0100
Subject: fix font coloring for buttons, ensure the location selection button
 font color is white

---
 app/src/main/res/color/button_color.xml            | 5 -----
 app/src/main/res/color/button_state_font_color.xml | 5 +++++
 app/src/main/res/layout/f_gateway_selection.xml    | 1 +
 app/src/main/res/values/styles.xml                 | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 app/src/main/res/color/button_color.xml
 create mode 100644 app/src/main/res/color/button_state_font_color.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/color/button_color.xml b/app/src/main/res/color/button_color.xml
deleted file mode 100644
index f7fed335..00000000
--- a/app/src/main/res/color/button_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorFontBtnEnabled" android:state_enabled="true"/>
-    <item android:color="@color/colorFontBtn"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/button_state_font_color.xml b/app/src/main/res/color/button_state_font_color.xml
new file mode 100644
index 00000000..f7fed335
--- /dev/null
+++ b/app/src/main/res/color/button_state_font_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorFontBtnEnabled" android:state_enabled="true"/>
+    <item android:color="@color/colorFontBtn"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml
index 91354104..a5034182 100644
--- a/app/src/main/res/layout/f_gateway_selection.xml
+++ b/app/src/main/res/layout/f_gateway_selection.xml
@@ -77,6 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/gateway_selection_recommended_location"
+            android:textColor="@color/button_state_font_color"
             />
     </LinearLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index df08916b..9b05d3fe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,7 +65,7 @@
         <item name="android:background">@drawable/cust_button_primary</item>
         <item name="android:height">36dp</item>
         <item name="android:minWidth">75dp</item>
-        <item name="android:textColor">@color/button_color</item>
+        <item name="android:textColor">@color/colorFontBtn</item>
     </style>
 
     <style name="BitmaskActivity">
-- 
cgit v1.2.3


From 9cf45bbcc1e707525fecdac5e691adebf0c28cb5 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 20 Nov 2021 13:42:59 +0100
Subject: show lightning bold instead of text 'You're connected to the
 recommended location'

---
 app/src/main/res/drawable-hdpi/ic_lightning_bolt.png | Bin 0 -> 533 bytes
 app/src/main/res/drawable-ldpi/ic_lightning_bolt.png | Bin 0 -> 418 bytes
 app/src/main/res/drawable-mdpi/ic_lightning_bolt.png | Bin 0 -> 478 bytes
 .../main/res/drawable-xhdpi/ic_lightning_bolt.png    | Bin 0 -> 679 bytes
 .../main/res/drawable-xxhdpi/ic_lightning_bolt.png   | Bin 0 -> 821 bytes
 .../main/res/drawable-xxxhdpi/ic_lightning_bolt.png  | Bin 0 -> 1054 bytes
 app/src/main/res/layout/v_location_button.xml        |  19 +++++++++++++++++--
 7 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_lightning_bolt.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_lightning_bolt.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_lightning_bolt.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_lightning_bolt.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_lightning_bolt.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_lightning_bolt.png

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-hdpi/ic_lightning_bolt.png b/app/src/main/res/drawable-hdpi/ic_lightning_bolt.png
new file mode 100644
index 00000000..ade9565c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_lightning_bolt.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_lightning_bolt.png b/app/src/main/res/drawable-ldpi/ic_lightning_bolt.png
new file mode 100644
index 00000000..8209e93f
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_lightning_bolt.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lightning_bolt.png b/app/src/main/res/drawable-mdpi/ic_lightning_bolt.png
new file mode 100644
index 00000000..021cd490
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_lightning_bolt.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lightning_bolt.png b/app/src/main/res/drawable-xhdpi/ic_lightning_bolt.png
new file mode 100644
index 00000000..f1852f68
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_lightning_bolt.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lightning_bolt.png b/app/src/main/res/drawable-xxhdpi/ic_lightning_bolt.png
new file mode 100644
index 00000000..23914343
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_lightning_bolt.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_lightning_bolt.png b/app/src/main/res/drawable-xxxhdpi/ic_lightning_bolt.png
new file mode 100644
index 00000000..53ed1873
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_lightning_bolt.png differ
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 6a7214c8..8cba9d70 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -18,6 +18,21 @@
         android:src="@drawable/ic_web"
         android:layout_gravity="center"
         />
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/recommended_icn"
+        android:scaleType="fitXY"
+        android:layout_marginRight="-13dp"
+        android:layout_marginEnd="-13dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:layout_toEndOf="@id/world_icn"
+        android:layout_toRightOf="@id/world_icn"
+        android:src="@drawable/ic_lightning_bolt"
+        android:visibility="gone"
+        tools:visibility="visible"
+        />
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
         android:paddingStart="@dimen/stdpadding"
@@ -28,8 +43,8 @@
         android:ellipsize="end"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_toEndOf="@id/world_icn"
-        android:layout_toRightOf="@+id/world_icn"
+        android:layout_toEndOf="@id/recommended_icn"
+        android:layout_toRightOf="@+id/recommended_icn"
         android:layout_toLeftOf="@+id/bridge_icn"
         android:layout_toStartOf="@+id/bridge_icn"
         android:layout_gravity="center_vertical"
-- 
cgit v1.2.3


From d536ef7bd7199deefab859faed3e85f9d7316b4f Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 20 Nov 2021 13:45:14 +0100
Subject: improve location button shadow corner radius

---
 app/src/main/res/drawable/cust_button_primary_rect.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/cust_button_primary_rect.xml b/app/src/main/res/drawable/cust_button_primary_rect.xml
index cb77b578..1587caf4 100644
--- a/app/src/main/res/drawable/cust_button_primary_rect.xml
+++ b/app/src/main/res/drawable/cust_button_primary_rect.xml
@@ -47,7 +47,7 @@
                 android:left="1dp"
                 >
                 <shape android:shape="rectangle"  >
-                    <corners android:radius="10dp" />
+                    <corners android:radius="@dimen/stdpadding" />
                     <solid android:color="@color/colorPrimary_transparent"/>
                 </shape>
             </item>
-- 
cgit v1.2.3


From e4cd4773651ef4080a2e8853c5e348e24153467d Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 20 Nov 2021 16:35:30 +0100
Subject: implement a selection indicator for location list

---
 .../main/res/layout/v_select_text_list_item.xml    | 29 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml
index 663b5b4d..b0cfac34 100644
--- a/app/src/main/res/layout/v_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_select_text_list_item.xml
@@ -1,26 +1,45 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_container"
     android:layout_height="?android:attr/listPreferredItemHeightSmall"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:clickable="true"
+    android:focusable="true"
+    android:background="?attr/selectableItemBackground">
 
     <!-- views are composed right to left -->
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/selected"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:src="@drawable/ic_check_bold"
+        android:tint="@color/green200"
+        android:visibility="invisible"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:paddingRight="10dp"
+        android:paddingEnd="10dp"
+        tools:visibility="visible"
+        />
     <se.leap.bitmaskclient.base.views.LocationIndicator
         android:id="@+id/quality"
-        android:layout_width="56dp"
+        android:layout_width="30dp"
         android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
+        android:layout_toLeftOf="@id/selected"
+        android:layout_toStartOf="@id/selected"
         android:layout_margin="10dp"
         tools:visibility="visible"
         />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/bridge_image"
-        android:layout_width="56dp"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:scaleType="fitXY"
         android:layout_toStartOf="@id/quality"
         android:layout_toLeftOf="@id/quality"
         android:src="@drawable/ic_bridge_36"
-- 
cgit v1.2.3


From a6cd31ae8624f830454adc627ac3a6be323a5333 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 21 Nov 2021 19:36:46 +0100
Subject: implement new gateway selection UI, using same UX principles as for
 desktop

---
 app/src/main/res/drawable/check_bold.xml           |  8 ++
 app/src/main/res/drawable/cust_checkbox.xml        | 27 +++++++
 app/src/main/res/layout/f_gateway_selection.xml    | 80 ++++++++++----------
 app/src/main/res/layout/s_layout.xml               | 12 ---
 .../main/res/layout/v_select_text_list_item.xml    | 86 +++++++++++++++-------
 app/src/main/res/layout/v_simple_checkbox.xml      | 32 ++++++++
 app/src/main/res/values/strings.xml                |  7 +-
 7 files changed, 166 insertions(+), 86 deletions(-)
 create mode 100644 app/src/main/res/drawable/check_bold.xml
 create mode 100644 app/src/main/res/drawable/cust_checkbox.xml
 delete mode 100644 app/src/main/res/layout/s_layout.xml
 create mode 100644 app/src/main/res/layout/v_simple_checkbox.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/check_bold.xml b/app/src/main/res/drawable/check_bold.xml
new file mode 100644
index 00000000..836bd3bf
--- /dev/null
+++ b/app/src/main/res/drawable/check_bold.xml
@@ -0,0 +1,8 @@
+<!-- drawable/check_bold.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cust_checkbox.xml b/app/src/main/res/drawable/cust_checkbox.xml
new file mode 100644
index 00000000..1fa45d09
--- /dev/null
+++ b/app/src/main/res/drawable/cust_checkbox.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dp" />
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/black800_high_transparent"/>
+            <stroke android:width="1dp" android:color="@color/colorPrimaryDark"/>
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dp" />
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@color/black_transparent"/>
+            <stroke android:width="1dp" android:color="@color/black800_transparent"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dp" />
+            <padding android:left="8dp" android:right="8dp"/>
+            <solid android:color="@android:color/transparent"/>
+            <stroke android:width="1dp" android:color="@color/black800_transparent"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml
index a5034182..643ae988 100644
--- a/app/src/main/res/layout/f_gateway_selection.xml
+++ b/app/src/main/res/layout/f_gateway_selection.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:padding="@dimen/stdpadding"
     tools:context=".base.fragments.GatewaySelectionFragment">
 
     <LinearLayout
@@ -15,39 +15,53 @@
         tools:visibility="visible"
         android:layout_alignParentTop="true"
         >
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/current_location_description"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingStart="@dimen/activity_horizontal_margin"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingEnd="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:orientation="horizontal">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/recommended_title"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textStyle="bold"
+                android:text="@string/gateway_selection_recommended"
+                android:layout_gravity="bottom"
+                />
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_lightning_bolt"
+                />
 
-            android:text="@string/gateway_selection_automatic_location" />
+        </LinearLayout>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/current_location"
+        <se.leap.bitmaskclient.base.views.SelectLocationEntry
+            android:id="@+id/recommended_location"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:paddingStart="@dimen/activity_horizontal_margin"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingEnd="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            tools:text="Paris" />
+            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
+            android:clickable="true"
+            android:focusable="true"
+            />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/manual_title"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="normal"
+            android:paddingTop="15dp"
+            android:text="@string/gateway_selection_manually"
+            android:layout_gravity="bottom"
+            />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/gatewaySelection_list"
         android:layout_below="@id/current_location_container"
-        android:layout_above="@+id/vpn_button_container"
+        android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/stdpadding"
@@ -58,28 +72,8 @@
         android:visibility="gone"
         tools:visibility="visible"
         android:scrollbars="vertical"
+        tools:listitem="@layout/v_select_text_list_item"
         >
-
     </androidx.recyclerview.widget.RecyclerView>
 
-    <LinearLayout
-        android:id="@+id/vpn_button_container"
-        android:orientation="horizontal"
-        android:gravity="end"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/activity_margin"
-        >
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/automatic_gateway_selection_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/gateway_selection_recommended_location"
-            android:textColor="@color/button_state_font_color"
-            />
-    </LinearLayout>
-
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/s_layout.xml b/app/src/main/res/layout/s_layout.xml
deleted file mode 100644
index d5717a5b..00000000
--- a/app/src/main/res/layout/s_layout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:id="@+id/buttontest"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="A"/>
-
-</ScrollView>
diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml
index b0cfac34..a6f78b3f 100644
--- a/app/src/main/res/layout/v_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_select_text_list_item.xml
@@ -1,75 +1,107 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_container"
-    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:clickable="true"
-    android:focusable="true"
     android:background="?attr/selectableItemBackground">
 
     <!-- views are composed right to left -->
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/selected"
-        android:layout_width="40dp"
-        android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:src="@drawable/ic_check_bold"
-        android:tint="@color/green200"
-        android:visibility="invisible"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        android:paddingRight="10dp"
-        android:paddingEnd="10dp"
-        tools:visibility="visible"
-        />
     <se.leap.bitmaskclient.base.views.LocationIndicator
         android:id="@+id/quality"
         android:layout_width="30dp"
-        android:layout_height="match_parent"
-        android:layout_toLeftOf="@id/selected"
-        android:layout_toStartOf="@id/selected"
-        android:layout_margin="10dp"
+        android:layout_height="25dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="12dp"
+        android:layout_marginLeft="@dimen/standard_margin"
+        android:layout_marginRight="@dimen/standard_margin"
         tools:visibility="visible"
+        android:visibility="visible"
+        android:layout_alignBottom="@+id/location"
         />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/bridge_image"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="40dp"
+        android:paddingBottom="5dp"
         android:scaleType="fitXY"
         android:layout_toStartOf="@id/quality"
         android:layout_toLeftOf="@id/quality"
         android:src="@drawable/ic_bridge_36"
         tools:visibility="visible"
         android:visibility="gone"
+        android:layout_alignBottom="@+id/location"
+        />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/selected"
+        android:layout_toRightOf="@+id/selected"
+        android:layout_toStartOf="@id/bridge_image"
+        android:layout_toLeftOf="@id/bridge_image"
+        android:layout_alignParentTop="true"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:paddingStart="@dimen/standard_margin"
+        android:paddingLeft="@dimen/standard_margin"
+        android:paddingEnd="@dimen/standard_margin"
+        android:paddingRight="@dimen/standard_margin"
+        android:paddingTop="10dp"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        tools:text="this is an interesting text"
+        android:visibility="gone"
+        tools:visibility="gone"
         />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/location"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
+        android:layout_toEndOf="@+id/selected"
+        android:layout_toRightOf="@+id/selected"
         android:layout_toStartOf="@id/bridge_image"
         android:layout_toLeftOf="@id/bridge_image"
+        android:layout_below="@id/title"
         android:ellipsize="end"
         android:gravity="center_vertical"
-        android:minHeight="?android:attr/listPreferredItemHeightLarge"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"
         android:paddingStart="@dimen/standard_margin"
         android:paddingLeft="@dimen/standard_margin"
         android:paddingEnd="@dimen/standard_margin"
         android:paddingRight="@dimen/standard_margin"
+        android:paddingTop="8dp"
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:textStyle="bold"
+        tools:visibility="visible"
+        android:visibility="visible"
         tools:text="Paris" />
 
+
+      <se.leap.bitmaskclient.base.views.SimpleCheckBox
+          android:id="@+id/selected"
+          android:layout_width="32dp"
+          android:layout_height="32dp"
+          android:layout_marginStart="4dp"
+          android:layout_marginLeft="4dp"
+          android:layout_marginBottom="@dimen/stdpadding"
+          android:layout_centerVertical="true"
+          android:src="@drawable/ic_check_bold"
+          android:tint="@color/green200"
+          android:visibility="visible"
+          tools:visibility="visible" />
+
+
     <View
+        android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1px"
         android:background="@android:color/darker_gray"
-        android:layout_alignParentBottom="true"
+        android:layout_below="@id/location"
+        android:visibility="visible"
         />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/v_simple_checkbox.xml b/app/src/main/res/layout/v_simple_checkbox.xml
new file mode 100644
index 00000000..57f6f816
--- /dev/null
+++ b/app/src/main/res/layout/v_simple_checkbox.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent" android:layout_height="match_parent"
+    >
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/check_view"
+        android:layout_alignBottom="@+id/check_view"
+        android:layout_alignLeft="@+id/check_view"
+        android:layout_alignRight="@+id/check_view"
+        android:layout_alignStart="@+id/check_view"
+        android:layout_alignEnd="@+id/check_view"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="2dp"
+        android:background="@drawable/cust_checkbox"
+        />
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/check_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:srcCompat="@drawable/check_bold"
+        android:tint="@color/colorSuccess"
+        android:layout_centerInParent="true"
+        />
+
+
+</RelativeLayout>
\ 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 7c0c46f0..9d62cc3b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,11 +153,10 @@
   <string name="gateway_selection_title">Select location</string>
   <string name="gateway_selection_warning">%s will find the best connection for you.</string>
   <string name="gateway_selection_recommended_location">Use 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="gateway_selection_manual_location">Your traffic is currently routed through: </string>
-  <string name="gateway_selection_manual_not_connected">Your traffic will be routed through: </string>
-  <string name="gateway_selection_automatic_location">Your traffic is automatically routed through the best location:</string>
-  <string name="gateway_selection_automatic_not_connected">Your traffic will be automatically routed through the best location.</string>
   <string name="finding_best_connection">Finding best connection…</string>
   <string name="reconnecting">Reconnecting…</string>
   <string name="tor_starting">Starting bridges for censorship circumvention…</string>
-- 
cgit v1.2.3


From ecbf65eeb79a0172b19881beb3805c8f3ebff132 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 22 Nov 2021 21:21:23 +0100
Subject: fix app crash on Android 4 when setting a custom notification view

---
 app/src/main/res/layout/v_custom_notification.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_custom_notification.xml b/app/src/main/res/layout/v_custom_notification.xml
index e3996dcc..e97fcbe2 100644
--- a/app/src/main/res/layout/v_custom_notification.xml
+++ b/app/src/main/res/layout/v_custom_notification.xml
@@ -28,7 +28,7 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
             tools:text="Bitmask - Amsterdam"
             />
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
             android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-- 
cgit v1.2.3


From b77d6364c0975230e9e0a5acdc59cd4782c91538 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 23 Nov 2021 15:43:08 +0100
Subject: default SimpleCheckBox to unchecked

---
 app/src/main/res/layout/v_simple_checkbox.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_simple_checkbox.xml b/app/src/main/res/layout/v_simple_checkbox.xml
index 57f6f816..8bae20b9 100644
--- a/app/src/main/res/layout/v_simple_checkbox.xml
+++ b/app/src/main/res/layout/v_simple_checkbox.xml
@@ -26,6 +26,7 @@
         app:srcCompat="@drawable/check_bold"
         android:tint="@color/colorSuccess"
         android:layout_centerInParent="true"
+        android:visibility="invisible"
         />
 
 
-- 
cgit v1.2.3


From 75fabe51badee54ab1de372d0eb667342e5924d0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 23 Nov 2021 15:44:35 +0100
Subject: use SimpleCheckBox in ExcludeAppsFragment

---
 .../main/res/layout/allowed_application_layout.xml | 23 ++++++----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml
index f1556875..61fc12c3 100644
--- a/app/src/main/res/layout/allowed_application_layout.xml
+++ b/app/src/main/res/layout/allowed_application_layout.xml
@@ -23,11 +23,11 @@
         android:layout_rowSpan="1"
         android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
-        tools:background="@drawable/icon"
+        tools:background="@drawable/ic_btn_on_connecting"
         android:contentDescription="@null" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        tools:text="@string/app"
+        tools:text="@string/app_name"
         android:id="@+id/app_name"
         android:layout_width="0dip"
         android:layout_columnSpan="2"
@@ -39,23 +39,12 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textAlignment="viewStart" />
 
-    <CheckBox android:id="@+id/app_selected"
-        android:layout_marginStart="8dip"
+    <se.leap.bitmaskclient.base.views.SimpleCheckBox
+        android:id="@+id/app_selected"
+        android:layout_height="32dp"
+        android:layout_width="32dp"
         android:layout_gravity="center_vertical"
         android:layout_rowSpan="1"
         android:visibility="visible" />
 
-<!--    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/app_size"
-        android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal|top"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textAlignment="viewStart" /> -->
-
-    <!-- <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/app_disabled"
-        android:layout_marginStart="8dip"
-        android:layout_gravity="top"
-        android:textAppearance="?android:attr/textAppearanceSmall" /> -->
-
 </GridLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 6d24e0c721038bb6f7a5c34703e5cf405166bf6b Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 23 Nov 2021 19:06:24 +0100
Subject: improve location selection list entry layout

---
 .../main/res/layout/v_select_text_list_item.xml    | 180 ++++++++++-----------
 1 file changed, 89 insertions(+), 91 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml
index a6f78b3f..44e82906 100644
--- a/app/src/main/res/layout/v_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_select_text_list_item.xml
@@ -1,107 +1,105 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_container"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:background="?attr/selectableItemBackground">
 
-    <!-- views are composed right to left -->
-
-    <se.leap.bitmaskclient.base.views.LocationIndicator
-        android:id="@+id/quality"
-        android:layout_width="30dp"
-        android:layout_height="25dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="12dp"
-        android:layout_marginLeft="@dimen/standard_margin"
-        android:layout_marginRight="@dimen/standard_margin"
-        tools:visibility="visible"
-        android:visibility="visible"
-        android:layout_alignBottom="@+id/location"
-        />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/bridge_image"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:paddingBottom="5dp"
-        android:scaleType="fitXY"
-        android:layout_toStartOf="@id/quality"
-        android:layout_toLeftOf="@id/quality"
-        android:src="@drawable/ic_bridge_36"
-        tools:visibility="visible"
-        android:visibility="gone"
-        android:layout_alignBottom="@+id/location"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/selected"
-        android:layout_toRightOf="@+id/selected"
-        android:layout_toStartOf="@id/bridge_image"
-        android:layout_toLeftOf="@id/bridge_image"
-        android:layout_alignParentTop="true"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:paddingStart="@dimen/standard_margin"
-        android:paddingLeft="@dimen/standard_margin"
-        android:paddingEnd="@dimen/standard_margin"
-        android:paddingRight="@dimen/standard_margin"
-        android:paddingTop="10dp"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall"
-        tools:text="this is an interesting text"
-        android:visibility="gone"
-        tools:visibility="gone"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/location"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/selected"
-        android:layout_toRightOf="@+id/selected"
-        android:layout_toStartOf="@id/bridge_image"
-        android:layout_toLeftOf="@id/bridge_image"
-        android:layout_below="@id/title"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:paddingStart="@dimen/standard_margin"
-        android:paddingLeft="@dimen/standard_margin"
-        android:paddingEnd="@dimen/standard_margin"
-        android:paddingRight="@dimen/standard_margin"
-        android:paddingTop="8dp"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        android:textStyle="bold"
-        tools:visibility="visible"
-        android:visibility="visible"
-        tools:text="Paris" />
-
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        >
+        <se.leap.bitmaskclient.base.views.SimpleCheckBox
+            android:id="@+id/selected"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_check_bold"
+            android:tint="@color/green200"
+            android:visibility="visible"
+            tools:visibility="visible" />
 
-      <se.leap.bitmaskclient.base.views.SimpleCheckBox
-          android:id="@+id/selected"
-          android:layout_width="32dp"
-          android:layout_height="32dp"
-          android:layout_marginStart="4dp"
-          android:layout_marginLeft="4dp"
-          android:layout_marginBottom="@dimen/stdpadding"
-          android:layout_centerVertical="true"
-          android:src="@drawable/ic_check_bold"
-          android:tint="@color/green200"
-          android:visibility="visible"
-          tools:visibility="visible" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingEnd="@dimen/standard_margin"
+            android:paddingRight="@dimen/standard_margin"
+            android:paddingStart="@dimen/standard_margin"
+            android:paddingLeft="@dimen/standard_margin"
+            >
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:paddingTop="10dp"
+                android:textAppearance="?android:attr/textAppearanceListItemSmall"
+                tools:text="this is an interesting text"
+                android:visibility="gone"
+                tools:visibility="visible"
+                />
 
+            <LinearLayout
+                android:id="@+id/location_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:weightSum="1"
+                android:visibility="visible"
+                tools:visibility="visible"
+                >
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/location"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:minHeight="?android:attr/listPreferredItemHeightSmall"
 
+                    android:paddingTop="8dp"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textStyle="bold"
+                    tools:visibility="visible"
+                    android:visibility="visible"
+                    tools:text="Paris"
+                    android:layout_weight="1"
+                    />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/bridge_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="32dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_bridge_36"
+                    tools:visibility="visible"
+                    android:visibility="visible"
+                    android:layout_gravity="center_vertical"
+                    />
+                <se.leap.bitmaskclient.base.views.LocationIndicator
+                    android:id="@+id/quality"
+                    android:layout_width="30dp"
+                    android:layout_height="25dp"
+                    android:layout_marginLeft="@dimen/standard_margin"
+                    android:layout_marginRight="@dimen/standard_margin"
+                    tools:visibility="visible"
+                    android:visibility="visible"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="center_vertical"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1px"
         android:background="@android:color/darker_gray"
-        android:layout_below="@id/location"
+        android:layout_marginTop="@dimen/stdpadding"
         android:visibility="visible"
         />
-</RelativeLayout>
+</LinearLayout>
-- 
cgit v1.2.3