From 5afe57ab868ee9e2e27f5b26b9b14de3519c0402 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 2 Dec 2022 02:08:55 +0100
Subject: rearranging assets, split them into normal and custom flavor

---
 app/src/main/res/drawable/bg_connected.png          | Bin 90299 -> 0 bytes
 app/src/main/res/drawable/bg_connecting.png         | Bin 112042 -> 0 bytes
 app/src/main/res/drawable/bg_disconnected.png       | Bin 143331 -> 0 bytes
 app/src/main/res/drawable/green_mask.png            | Bin 47593 -> 0 bytes
 app/src/main/res/drawable/logo.png                  | Bin 0 -> 18877 bytes
 app/src/main/res/drawable/red_mask.png              | Bin 40172 -> 0 bytes
 app/src/main/res/drawable/rotate_progress_image.xml |  12 ------------
 app/src/main/res/drawable/yellow_mask.png           | Bin 47055 -> 0 bytes
 8 files changed, 12 deletions(-)
 delete mode 100644 app/src/main/res/drawable/bg_connected.png
 delete mode 100644 app/src/main/res/drawable/bg_connecting.png
 delete mode 100644 app/src/main/res/drawable/bg_disconnected.png
 delete mode 100644 app/src/main/res/drawable/green_mask.png
 create mode 100644 app/src/main/res/drawable/logo.png
 delete mode 100644 app/src/main/res/drawable/red_mask.png
 delete mode 100644 app/src/main/res/drawable/rotate_progress_image.xml
 delete mode 100644 app/src/main/res/drawable/yellow_mask.png

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

diff --git a/app/src/main/res/drawable/bg_connected.png b/app/src/main/res/drawable/bg_connected.png
deleted file mode 100644
index 6da7878d..00000000
Binary files a/app/src/main/res/drawable/bg_connected.png and /dev/null differ
diff --git a/app/src/main/res/drawable/bg_connecting.png b/app/src/main/res/drawable/bg_connecting.png
deleted file mode 100644
index c371f3f0..00000000
Binary files a/app/src/main/res/drawable/bg_connecting.png and /dev/null differ
diff --git a/app/src/main/res/drawable/bg_disconnected.png b/app/src/main/res/drawable/bg_disconnected.png
deleted file mode 100644
index de96be57..00000000
Binary files a/app/src/main/res/drawable/bg_disconnected.png and /dev/null differ
diff --git a/app/src/main/res/drawable/green_mask.png b/app/src/main/res/drawable/green_mask.png
deleted file mode 100644
index e515f3f5..00000000
Binary files a/app/src/main/res/drawable/green_mask.png and /dev/null differ
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
new file mode 100644
index 00000000..773937ff
Binary files /dev/null and b/app/src/main/res/drawable/logo.png differ
diff --git a/app/src/main/res/drawable/red_mask.png b/app/src/main/res/drawable/red_mask.png
deleted file mode 100644
index a4bd4a78..00000000
Binary files a/app/src/main/res/drawable/red_mask.png and /dev/null differ
diff --git a/app/src/main/res/drawable/rotate_progress_image.xml b/app/src/main/res/drawable/rotate_progress_image.xml
deleted file mode 100644
index 7b539720..00000000
--- a/app/src/main/res/drawable/rotate_progress_image.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:name="circle"
-    android:viewportWidth="91"
-    android:viewportHeight="91"
-    android:width="91dp"
-    android:height="91dp">
-
-<!--
-    // implement your rotation animation vector image here
--->
-
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/yellow_mask.png b/app/src/main/res/drawable/yellow_mask.png
deleted file mode 100644
index 98dd7978..00000000
Binary files a/app/src/main/res/drawable/yellow_mask.png and /dev/null differ
-- 
cgit v1.2.3


From 091487bfe760aacd8d4dc8eedcf5a07e4e5b53e3 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 2 Dec 2022 18:33:28 +0100
Subject: replace button pngs with vector graphics

---
 .../res/drawable/button_circle_cancel_pressed.xml  |   6 +-----
 .../res/drawable/button_circle_cancel_released.xml |   5 ++---
 .../res/drawable/button_circle_start_pressed.xml   |   5 +----
 .../res/drawable/button_circle_start_released.xml  |   4 +---
 .../res/drawable/button_circle_stop_pressed.xml    |   5 +----
 .../res/drawable/button_circle_stop_released.xml   |   5 ++---
 app/src/main/res/drawable/ic_btn_cancel.png        | Bin 338 -> 0 bytes
 app/src/main/res/drawable/ic_btn_cancel.xml        |   9 ++++++++
 app/src/main/res/drawable/ic_btn_on.png            | Bin 777 -> 0 bytes
 app/src/main/res/drawable/ic_btn_on.xml            |  10 +++++++++
 app/src/main/res/drawable/main_btn_glow.xml        |  12 -----------
 app/src/main/res/drawable/main_btn_shadow.xml      |   5 -----
 app/src/main/res/drawable/on_off_btn_an1.png       | Bin 16186 -> 0 bytes
 app/src/main/res/drawable/on_off_btn_an2.png       | Bin 12771 -> 0 bytes
 app/src/main/res/drawable/on_off_btn_an3.png       | Bin 10006 -> 0 bytes
 app/src/main/res/drawable/on_off_btn_an4.png       | Bin 9308 -> 0 bytes
 app/src/main/res/drawable/on_off_btn_fill.png      | Bin 41384 -> 0 bytes
 .../res/drawable/on_off_btn_start_2_disabled.png   | Bin 33323 -> 0 bytes
 .../res/drawable/on_off_btn_start_2_enabled.png    | Bin 31261 -> 0 bytes
 .../res/drawable/on_off_btn_start_2_no_shadow.png  | Bin 20182 -> 0 bytes
 .../res/drawable/on_off_btn_start_2_pressed.png    | Bin 28721 -> 0 bytes
 app/src/main/res/drawable/progressbar_circle.xml   |  24 ---------------------
 22 files changed, 27 insertions(+), 63 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_btn_cancel.png
 create mode 100644 app/src/main/res/drawable/ic_btn_cancel.xml
 delete mode 100644 app/src/main/res/drawable/ic_btn_on.png
 create mode 100644 app/src/main/res/drawable/ic_btn_on.xml
 delete mode 100644 app/src/main/res/drawable/main_btn_glow.xml
 delete mode 100644 app/src/main/res/drawable/main_btn_shadow.xml
 delete mode 100644 app/src/main/res/drawable/on_off_btn_an1.png
 delete mode 100644 app/src/main/res/drawable/on_off_btn_an2.png
 delete mode 100644 app/src/main/res/drawable/on_off_btn_an3.png
 delete mode 100644 app/src/main/res/drawable/on_off_btn_an4.png
 delete mode 100644 app/src/main/res/drawable/on_off_btn_fill.png
 delete mode 100644 app/src/main/res/drawable/on_off_btn_start_2_disabled.png
 delete mode 100644 app/src/main/res/drawable/on_off_btn_start_2_enabled.png
 delete mode 100644 app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png
 delete mode 100644 app/src/main/res/drawable/on_off_btn_start_2_pressed.png
 delete mode 100644 app/src/main/res/drawable/progressbar_circle.xml

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

diff --git a/app/src/main/res/drawable/button_circle_cancel_pressed.xml b/app/src/main/res/drawable/button_circle_cancel_pressed.xml
index 690baa0c..b2efa78b 100644
--- a/app/src/main/res/drawable/button_circle_cancel_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_cancel_pressed.xml
@@ -55,10 +55,6 @@
         android:bottom="62dp"
         android:left="50dp"
         android:right="50dp"
-        >
-        <bitmap android:src="@drawable/ic_btn_cancel"
-            />
-    </item>
-
+        android:drawable="@drawable/ic_btn_cancel" />
 
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_cancel_released.xml b/app/src/main/res/drawable/button_circle_cancel_released.xml
index 833a9076..efe0cc14 100644
--- a/app/src/main/res/drawable/button_circle_cancel_released.xml
+++ b/app/src/main/res/drawable/button_circle_cancel_released.xml
@@ -56,7 +56,6 @@
         android:bottom="65dp"
         android:left="50dp"
         android:right="50dp"
-        >
-        <bitmap android:src="@drawable/ic_btn_cancel" />
-    </item>
+        android:drawable="@drawable/ic_btn_cancel"
+        />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_start_pressed.xml b/app/src/main/res/drawable/button_circle_start_pressed.xml
index 4157ffe0..dd8496c3 100644
--- a/app/src/main/res/drawable/button_circle_start_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_start_pressed.xml
@@ -40,8 +40,5 @@
         android:bottom="62dp"
         android:left="50dp"
         android:right="50dp"
-        >
-        <bitmap android:src="@drawable/ic_btn_on"
-            />
-    </item>
+        android:drawable="@drawable/ic_btn_on" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_start_released.xml b/app/src/main/res/drawable/button_circle_start_released.xml
index 671d06dc..700ded89 100644
--- a/app/src/main/res/drawable/button_circle_start_released.xml
+++ b/app/src/main/res/drawable/button_circle_start_released.xml
@@ -40,7 +40,5 @@
         android:bottom="65dp"
         android:left="50dp"
         android:right="50dp"
-        >
-        <bitmap android:src="@drawable/ic_btn_on" />
-    </item>
+        android:drawable="@drawable/ic_btn_on" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_stop_pressed.xml b/app/src/main/res/drawable/button_circle_stop_pressed.xml
index ce7583f1..79f794b2 100644
--- a/app/src/main/res/drawable/button_circle_stop_pressed.xml
+++ b/app/src/main/res/drawable/button_circle_stop_pressed.xml
@@ -40,8 +40,5 @@
         android:bottom="62dp"
         android:left="50dp"
         android:right="50dp"
-        >
-        <bitmap android:src="@drawable/ic_btn_cancel"
-            />
-    </item>
+        android:drawable="@drawable/ic_btn_cancel" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_circle_stop_released.xml b/app/src/main/res/drawable/button_circle_stop_released.xml
index ed786ee0..b0d47d78 100644
--- a/app/src/main/res/drawable/button_circle_stop_released.xml
+++ b/app/src/main/res/drawable/button_circle_stop_released.xml
@@ -40,7 +40,6 @@
         android:bottom="65dp"
         android:left="50dp"
         android:right="50dp"
-        >
-        <bitmap android:src="@drawable/ic_btn_cancel" />
-    </item>
+        android:drawable="@drawable/ic_btn_cancel"
+        />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_cancel.png b/app/src/main/res/drawable/ic_btn_cancel.png
deleted file mode 100644
index 0b55460a..00000000
Binary files a/app/src/main/res/drawable/ic_btn_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_btn_cancel.xml b/app/src/main/res/drawable/ic_btn_cancel.xml
new file mode 100644
index 00000000..9870cd4f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_cancel.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="35"
+    android:viewportHeight="35"
+    android:width="35dp"
+    android:height="35dp">
+    <path
+        android:pathData="M4.9 35L17.5 22.4L30.1 35L35 30.1L22.4 17.5L35 4.9L30.1 0L17.5 12.6L4.9 0L0 4.9L12.6 17.5L0 30.1L4.9 35Z"
+        android:fillColor="#FFFFFF" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_on.png b/app/src/main/res/drawable/ic_btn_on.png
deleted file mode 100644
index be160a33..00000000
Binary files a/app/src/main/res/drawable/ic_btn_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_btn_on.xml b/app/src/main/res/drawable/ic_btn_on.xml
new file mode 100644
index 00000000..0f3fc0f4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_on.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="40"
+    android:viewportHeight="43"
+    android:width="40dp"
+    android:height="43dp">
+    <path
+        android:pathData="M33.0178 7.38594C32.1199 6.61398 30.7913 6.74461 29.9562 7.58411C28.8438 8.70244 29.0811 10.5681 30.2333 11.6454C33.1633 14.3851 35 18.2798 35 22.6203C35 26.6198 33.4196 30.4556 30.6066 33.2836C27.7936 36.1117 23.9782 37.7005 20 37.7005C16.0218 37.7005 12.2064 36.1117 9.3934 33.2836C6.58035 30.4556 5 26.6198 5 22.6203C5 18.2699 6.84513 14.3673 9.77413 11.6139C10.9153 10.5411 11.1444 8.69064 10.0399 7.58018C9.20708 6.74295 7.88204 6.6127 6.98641 7.38232C2.70788 11.0589 0 16.5193 0 22.6203C0 27.953 2.10714 33.0673 5.85786 36.8381C9.60859 40.6089 14.6957 42.7273 20 42.7273C25.3043 42.7273 30.3914 40.6089 34.1421 36.8381C37.8929 33.0673 40 27.953 40 22.6203C40 16.5213 37.2939 11.0625 33.0178 7.38594ZM22.5 0C19.7386 0 17.5 2.23858 17.5 5V20.1337C17.5 22.8951 19.7386 25.1337 22.5 25.1337"
+        android:fillColor="#FFFFFF" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/main_btn_glow.xml b/app/src/main/res/drawable/main_btn_glow.xml
deleted file mode 100644
index 5ed57dd5..00000000
--- a/app/src/main/res/drawable/main_btn_glow.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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_2_enabled" android:duration="150" />
-    <item android:drawable="@drawable/on_off_btn_an4" android:duration="75" />
-    <item android:drawable="@drawable/on_off_btn_an3" android:duration="100" />
-    <item android:drawable="@drawable/on_off_btn_an2" android:duration="125" />
-    <item android:drawable="@drawable/on_off_btn_an1" android:duration="400" />
-    <item android:drawable="@drawable/on_off_btn_an2" android:duration="125" />
-    <item android:drawable="@drawable/on_off_btn_an3" android:duration="100" />
-    <item android:drawable="@drawable/on_off_btn_an4" android:duration="75" />
-</animation-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/main_btn_shadow.xml b/app/src/main/res/drawable/main_btn_shadow.xml
deleted file mode 100644
index 94cf379f..00000000
--- a/app/src/main/res/drawable/main_btn_shadow.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: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/drawable/on_off_btn_an1.png b/app/src/main/res/drawable/on_off_btn_an1.png
deleted file mode 100644
index c80feeb7..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_an1.png and /dev/null differ
diff --git a/app/src/main/res/drawable/on_off_btn_an2.png b/app/src/main/res/drawable/on_off_btn_an2.png
deleted file mode 100644
index 73f4cb7e..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_an2.png and /dev/null differ
diff --git a/app/src/main/res/drawable/on_off_btn_an3.png b/app/src/main/res/drawable/on_off_btn_an3.png
deleted file mode 100644
index 98ad0220..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_an3.png and /dev/null differ
diff --git a/app/src/main/res/drawable/on_off_btn_an4.png b/app/src/main/res/drawable/on_off_btn_an4.png
deleted file mode 100644
index 49070e5f..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_an4.png and /dev/null differ
diff --git a/app/src/main/res/drawable/on_off_btn_fill.png b/app/src/main/res/drawable/on_off_btn_fill.png
deleted file mode 100644
index 8394ccfb..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_fill.png and /dev/null 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
deleted file mode 100644
index 4675e48d..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_start_2_disabled.png and /dev/null 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
deleted file mode 100644
index 383e1076..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_start_2_enabled.png and /dev/null 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
deleted file mode 100644
index 941bdef1..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_start_2_no_shadow.png and /dev/null 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
deleted file mode 100644
index 7ff60cdb..00000000
Binary files a/app/src/main/res/drawable/on_off_btn_start_2_pressed.png and /dev/null differ
diff --git a/app/src/main/res/drawable/progressbar_circle.xml b/app/src/main/res/drawable/progressbar_circle.xml
deleted file mode 100644
index 3d5f6026..00000000
--- a/app/src/main/res/drawable/progressbar_circle.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <scale
-            android:scaleHeight="125%"
-            android:scaleWidth="125%"
-            android:scaleGravity="center"
-            >
-            <shape
-                android:shape="oval"
-                android:useLevel="true"
-                >
-                <gradient
-                    android:startColor="@color/colorPrimaryDark"
-                    android:centerColor="@color/colorPrimary"
-                    android:endColor="@color/black800_high_transparent"
-                    android:gradientRadius="100dp"
-                    android:type="radial"
-                    />
-            </shape>
-        </scale>
-    </item>
-</layer-list>
\ No newline at end of file
-- 
cgit v1.2.3


From ed85b09daec4e36db366264bba644982abda3291 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 2 Dec 2022 20:09:24 +0100
Subject: increase shadow of main button

---
 .../main/res/drawable/button_circle_cancel_released.xml    | 14 +++++++-------
 app/src/main/res/drawable/button_circle_start_released.xml |  6 +++---
 app/src/main/res/drawable/button_circle_stop_released.xml  |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/app/src/main/res/drawable/button_circle_cancel_released.xml b/app/src/main/res/drawable/button_circle_cancel_released.xml
index efe0cc14..70d47257 100644
--- a/app/src/main/res/drawable/button_circle_cancel_released.xml
+++ b/app/src/main/res/drawable/button_circle_cancel_released.xml
@@ -8,10 +8,10 @@
     </item>-->
 
     <item
-        android:left="-23dp"
-        android:right="-23dp"
-        android:top="-8dp"
-        android:bottom="-8dp"
+        android:left="-25dp"
+        android:right="-25dp"
+        android:top="-10dp"
+        android:bottom="-10dp"
         >
         <animated-rotate
             android:drawable="@drawable/rotate_progress_image"
@@ -37,14 +37,14 @@
         >
         <shape
             android:shape="ring"
-            android:innerRadius="125dp"
+            android:innerRadius="123dp"
             android:useLevel="false"
-            android:thickness="10dp">
+            android:thickness="15dp">
             <gradient
                 android:type="radial"
                 android:gradientRadius="125dp"
                 android:centerX="0.51"
-                android:centerY="0.54"
+                android:centerY="0.58"
                 android:startColor="#000000"
                 android:centerColor="#000000"
                 android:endColor="@color/transparent" />
diff --git a/app/src/main/res/drawable/button_circle_start_released.xml b/app/src/main/res/drawable/button_circle_start_released.xml
index 700ded89..ad748e9c 100644
--- a/app/src/main/res/drawable/button_circle_start_released.xml
+++ b/app/src/main/res/drawable/button_circle_start_released.xml
@@ -21,14 +21,14 @@
         >
         <shape
             android:shape="ring"
-            android:innerRadius="125dp"
+            android:innerRadius="122dp"
             android:useLevel="false"
-            android:thickness="10dp">
+            android:thickness="15dp">
             <gradient
                 android:type="radial"
                 android:gradientRadius="125dp"
                 android:centerX="0.51"
-                android:centerY="0.54"
+                android:centerY="0.58"
                 android:startColor="#000000"
                 android:centerColor="#000000"
                 android:endColor="@color/transparent" />
diff --git a/app/src/main/res/drawable/button_circle_stop_released.xml b/app/src/main/res/drawable/button_circle_stop_released.xml
index b0d47d78..62827b66 100644
--- a/app/src/main/res/drawable/button_circle_stop_released.xml
+++ b/app/src/main/res/drawable/button_circle_stop_released.xml
@@ -21,14 +21,14 @@
         >
         <shape
             android:shape="ring"
-            android:innerRadius="125dp"
+            android:innerRadius="122dp"
             android:useLevel="false"
-            android:thickness="10dp">
+            android:thickness="15dp">
             <gradient
                 android:type="radial"
                 android:gradientRadius="125dp"
                 android:centerX="0.51"
-                android:centerY="0.54"
+                android:centerY="0.58"
                 android:startColor="#000000"
                 android:centerColor="#000000"
                 android:endColor="@color/transparent" />
-- 
cgit v1.2.3


From 8510b91343e234d559b39e8e5e14acc7a975506a Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Mon, 5 Dec 2022 14:31:21 +0100
Subject: Bitmask splash screen for Android 12+

---
 app/src/main/res/drawable/footer_text_drawable.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/app/src/main/res/drawable/footer_text_drawable.xml b/app/src/main/res/drawable/footer_text_drawable.xml
index 801746df..e3ec5005 100644
--- a/app/src/main/res/drawable/footer_text_drawable.xml
+++ b/app/src/main/res/drawable/footer_text_drawable.xml
@@ -13,6 +13,8 @@
         android:gravity="center"
         android:top="@dimen/footer_text_padding"
         android:bottom="@dimen/footer_text_padding"
+        android:left="20dp"
+        android:right="20dp"
         >
         <bitmap android:src="@drawable/leap_footer_en"/>
     </item>
-- 
cgit v1.2.3


From ec380e8b8913835cc50448aa51b75b3925644957 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Tue, 6 Dec 2022 03:17:15 +0100
Subject: re-adding pngs as fallback for pre-API 24, appearantly Android 6's
 vector graphic rendering is really broken

---
 app/src/main/res/drawable/ic_btn_cancel.png        | Bin 0 -> 1009 bytes
 app/src/main/res/drawable/ic_btn_cancel.xml        |   9 ---------
 app/src/main/res/drawable/ic_btn_on.png            | Bin 0 -> 2211 bytes
 app/src/main/res/drawable/ic_btn_on.xml            |  10 ----------
 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 ---------------------
 7 files changed, 83 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_btn_cancel.png
 delete mode 100644 app/src/main/res/drawable/ic_btn_cancel.xml
 create mode 100644 app/src/main/res/drawable/ic_btn_on.png
 delete mode 100644 app/src/main/res/drawable/ic_btn_on.xml
 delete mode 100644 app/src/main/res/drawable/ic_btn_on_connecting.xml
 delete mode 100644 app/src/main/res/drawable/ic_btn_on_disabled.xml
 delete mode 100644 app/src/main/res/drawable/ic_btn_on_primary_color.xml

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

diff --git a/app/src/main/res/drawable/ic_btn_cancel.png b/app/src/main/res/drawable/ic_btn_cancel.png
new file mode 100644
index 00000000..af604d9b
Binary files /dev/null and b/app/src/main/res/drawable/ic_btn_cancel.png differ
diff --git a/app/src/main/res/drawable/ic_btn_cancel.xml b/app/src/main/res/drawable/ic_btn_cancel.xml
deleted file mode 100644
index 9870cd4f..00000000
--- a/app/src/main/res/drawable/ic_btn_cancel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="35"
-    android:viewportHeight="35"
-    android:width="35dp"
-    android:height="35dp">
-    <path
-        android:pathData="M4.9 35L17.5 22.4L30.1 35L35 30.1L22.4 17.5L35 4.9L30.1 0L17.5 12.6L4.9 0L0 4.9L12.6 17.5L0 30.1L4.9 35Z"
-        android:fillColor="#FFFFFF" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_on.png b/app/src/main/res/drawable/ic_btn_on.png
new file mode 100644
index 00000000..d6cfc10b
Binary files /dev/null and b/app/src/main/res/drawable/ic_btn_on.png differ
diff --git a/app/src/main/res/drawable/ic_btn_on.xml b/app/src/main/res/drawable/ic_btn_on.xml
deleted file mode 100644
index 0f3fc0f4..00000000
--- a/app/src/main/res/drawable/ic_btn_on.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="40"
-    android:viewportHeight="43"
-    android:width="40dp"
-    android:height="43dp">
-    <path
-        android:pathData="M33.0178 7.38594C32.1199 6.61398 30.7913 6.74461 29.9562 7.58411C28.8438 8.70244 29.0811 10.5681 30.2333 11.6454C33.1633 14.3851 35 18.2798 35 22.6203C35 26.6198 33.4196 30.4556 30.6066 33.2836C27.7936 36.1117 23.9782 37.7005 20 37.7005C16.0218 37.7005 12.2064 36.1117 9.3934 33.2836C6.58035 30.4556 5 26.6198 5 22.6203C5 18.2699 6.84513 14.3673 9.77413 11.6139C10.9153 10.5411 11.1444 8.69064 10.0399 7.58018C9.20708 6.74295 7.88204 6.6127 6.98641 7.38232C2.70788 11.0589 0 16.5193 0 22.6203C0 27.953 2.10714 33.0673 5.85786 36.8381C9.60859 40.6089 14.6957 42.7273 20 42.7273C25.3043 42.7273 30.3914 40.6089 34.1421 36.8381C37.8929 33.0673 40 27.953 40 22.6203C40 16.5213 37.2939 11.0625 33.0178 7.38594ZM22.5 0C19.7386 0 17.5 2.23858 17.5 5V20.1337C17.5 22.8951 19.7386 25.1337 22.5 25.1337"
-        android:fillColor="#FFFFFF" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_btn_on_connecting.xml b/app/src/main/res/drawable/ic_btn_on_connecting.xml
deleted file mode 100644
index 4b3d1384..00000000
--- a/app/src/main/res/drawable/ic_btn_on_connecting.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<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
deleted file mode 100644
index 9c83422d..00000000
--- a/app/src/main/res/drawable/ic_btn_on_disabled.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<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
deleted file mode 100644
index 9f449299..00000000
--- a/app/src/main/res/drawable/ic_btn_on_primary_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<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>
-- 
cgit v1.2.3