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/normal/res/drawable/bg_connected.png         | Bin 0 -> 90299 bytes
 app/src/normal/res/drawable/bg_connecting.png        | Bin 0 -> 112042 bytes
 app/src/normal/res/drawable/bg_disconnected.png      | Bin 0 -> 143331 bytes
 app/src/normal/res/drawable/ic_splash_background.xml |   4 ++++
 app/src/normal/res/drawable/state_connected.png      | Bin 0 -> 47593 bytes
 app/src/normal/res/drawable/state_connecting.png     | Bin 0 -> 47055 bytes
 app/src/normal/res/drawable/state_disconnected.png   | Bin 0 -> 40172 bytes
 7 files changed, 4 insertions(+)
 create mode 100644 app/src/normal/res/drawable/bg_connected.png
 create mode 100644 app/src/normal/res/drawable/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable/bg_disconnected.png
 create mode 100644 app/src/normal/res/drawable/ic_splash_background.xml
 create mode 100644 app/src/normal/res/drawable/state_connected.png
 create mode 100644 app/src/normal/res/drawable/state_connecting.png
 create mode 100644 app/src/normal/res/drawable/state_disconnected.png

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

diff --git a/app/src/normal/res/drawable/bg_connected.png b/app/src/normal/res/drawable/bg_connected.png
new file mode 100644
index 00000000..6da7878d
Binary files /dev/null and b/app/src/normal/res/drawable/bg_connected.png differ
diff --git a/app/src/normal/res/drawable/bg_connecting.png b/app/src/normal/res/drawable/bg_connecting.png
new file mode 100644
index 00000000..c371f3f0
Binary files /dev/null and b/app/src/normal/res/drawable/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable/bg_disconnected.png b/app/src/normal/res/drawable/bg_disconnected.png
new file mode 100644
index 00000000..de96be57
Binary files /dev/null and b/app/src/normal/res/drawable/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable/ic_splash_background.xml b/app/src/normal/res/drawable/ic_splash_background.xml
new file mode 100644
index 00000000..aa2618c1
--- /dev/null
+++ b/app/src/normal/res/drawable/ic_splash_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/background_main"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/state_connected.png b/app/src/normal/res/drawable/state_connected.png
new file mode 100644
index 00000000..e515f3f5
Binary files /dev/null and b/app/src/normal/res/drawable/state_connected.png differ
diff --git a/app/src/normal/res/drawable/state_connecting.png b/app/src/normal/res/drawable/state_connecting.png
new file mode 100644
index 00000000..98dd7978
Binary files /dev/null and b/app/src/normal/res/drawable/state_connecting.png differ
diff --git a/app/src/normal/res/drawable/state_disconnected.png b/app/src/normal/res/drawable/state_disconnected.png
new file mode 100644
index 00000000..a4bd4a78
Binary files /dev/null and b/app/src/normal/res/drawable/state_disconnected.png differ
-- 
cgit v1.2.3


From 9ec59148a926a5c8e5fecfbb64b6418d1dbb852d Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 2 Dec 2022 15:37:59 +0100
Subject: implement transition animation between connected and disconnected
 state for RiseupVPn

---
 .../state_transition_connected_disconnected.png         | Bin 0 -> 40172 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/src/normal/res/drawable/state_transition_connected_disconnected.png

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

diff --git a/app/src/normal/res/drawable/state_transition_connected_disconnected.png b/app/src/normal/res/drawable/state_transition_connected_disconnected.png
new file mode 100644
index 00000000..a4bd4a78
Binary files /dev/null and b/app/src/normal/res/drawable/state_transition_connected_disconnected.png differ
-- 
cgit v1.2.3


From 7bb9d4210d1411294bc2d8152d6d56a5e5f8e207 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Sun, 4 Dec 2022 04:08:12 +0100
Subject: replace vpn state background pngs for Bitmask with vector graphics

---
 app/src/normal/res/drawable/bg_connected.png       | Bin 90299 -> 0 bytes
 app/src/normal/res/drawable/bg_connected.xml       |  14 +++++++
 .../normal/res/drawable/bg_connected_effect.xml    |  44 +++++++++++++++++++++
 app/src/normal/res/drawable/bg_connecting.png      | Bin 112042 -> 0 bytes
 app/src/normal/res/drawable/bg_connecting.xml      |  13 ++++++
 .../normal/res/drawable/bg_connecting_effect.xml   |  44 +++++++++++++++++++++
 app/src/normal/res/drawable/bg_disconnected.png    | Bin 143331 -> 0 bytes
 app/src/normal/res/drawable/bg_disconnected.xml    |  13 ++++++
 .../normal/res/drawable/bg_disconnected_effect.xml |  33 ++++++++++++++++
 9 files changed, 161 insertions(+)
 delete mode 100644 app/src/normal/res/drawable/bg_connected.png
 create mode 100644 app/src/normal/res/drawable/bg_connected.xml
 create mode 100644 app/src/normal/res/drawable/bg_connected_effect.xml
 delete mode 100644 app/src/normal/res/drawable/bg_connecting.png
 create mode 100644 app/src/normal/res/drawable/bg_connecting.xml
 create mode 100644 app/src/normal/res/drawable/bg_connecting_effect.xml
 delete mode 100644 app/src/normal/res/drawable/bg_disconnected.png
 create mode 100644 app/src/normal/res/drawable/bg_disconnected.xml
 create mode 100644 app/src/normal/res/drawable/bg_disconnected_effect.xml

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

diff --git a/app/src/normal/res/drawable/bg_connected.png b/app/src/normal/res/drawable/bg_connected.png
deleted file mode 100644
index 6da7878d..00000000
Binary files a/app/src/normal/res/drawable/bg_connected.png and /dev/null differ
diff --git a/app/src/normal/res/drawable/bg_connected.xml b/app/src/normal/res/drawable/bg_connected.xml
new file mode 100644
index 00000000..19dac103
--- /dev/null
+++ b/app/src/normal/res/drawable/bg_connected.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_running"/>
+        </shape>
+    </item>
+    <item
+        android:top="80dp"
+        android:gravity="fill"
+        android:drawable="@drawable/bg_connected_effect"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_connected_effect.xml b/app/src/normal/res/drawable/bg_connected_effect.xml
new file mode 100644
index 00000000..08ef8172
--- /dev/null
+++ b/app/src/normal/res/drawable/bg_connected_effect.xml
@@ -0,0 +1,44 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="411"
+    android:viewportHeight="703"
+    android:width="411dp"
+    android:height="703dp">
+    <path
+        android:pathData="M628.549 500.593C751.417 416.034 654.462 61.8767 411.994 -290.44C169.527 -642.756 -126.637 -859.816 -249.505 -775.257C-372.373 -690.697 -275.418 -336.54 -32.9505 15.7764C209.517 368.093 505.681 585.153 628.549 500.593Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="415.099"
+                android:startY="-19.956"
+                android:endX="685.832"
+                android:endY="373.431"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00A6C28A"
+                    android:offset="0" />
+                <item
+                    android:color="#44669933"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M-186.124 473.683C-63.0333 557.917 232.557 340.077 474.094 -12.8776C715.632 -365.832 811.653 -720.244 688.562 -804.479C565.471 -888.714 269.881 -670.874 28.3433 -317.919C-213.195 35.0357 -309.215 389.448 -186.124 473.683Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="222.826"
+                android:startY="87.2986"
+                android:endX="-46.8688"
+                android:endY="481.398"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00A6C28A"
+                    android:offset="0" />
+                <item
+                    android:color="#44669933"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/app/src/normal/res/drawable/bg_connecting.png b/app/src/normal/res/drawable/bg_connecting.png
deleted file mode 100644
index c371f3f0..00000000
Binary files a/app/src/normal/res/drawable/bg_connecting.png and /dev/null differ
diff --git a/app/src/normal/res/drawable/bg_connecting.xml b/app/src/normal/res/drawable/bg_connecting.xml
new file mode 100644
index 00000000..8482d30e
--- /dev/null
+++ b/app/src/normal/res/drawable/bg_connecting.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_connecting"/>
+        </shape>
+    </item>
+    <item android:gravity="fill"
+        android:bottom="80dp"
+        android:drawable="@drawable/bg_connecting_effect"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_connecting_effect.xml b/app/src/normal/res/drawable/bg_connecting_effect.xml
new file mode 100644
index 00000000..fd462a54
--- /dev/null
+++ b/app/src/normal/res/drawable/bg_connecting_effect.xml
@@ -0,0 +1,44 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="375"
+    android:viewportHeight="629"
+    android:width="375dp"
+    android:height="629dp">
+    <path
+        android:pathData="M96.6338 471.305C226.719 515.286 420.512 289.654 529.484 -32.658C638.456 -354.97 621.341 -651.909 491.256 -695.89C361.172 -739.871 167.378 -514.239 58.4058 -191.927C-50.5662 130.385 -33.4509 427.324 96.6338 471.305Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="132.695"
+                android:startY="21.7787"
+                android:endX="11.0197"
+                android:endY="381.664"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00FFAA33"
+                    android:offset="0" />
+                <item
+                    android:color="#33FFAA33"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M183.501 628.837C313.565 628.837 419.003 353.304 419.003 13.4182C419.003 -326.468 313.565 -602 183.501 -602C53.4376 -602 -52 -326.468 -52 13.4182C-52 353.304 53.4376 628.837 183.501 628.837Z">
+        <aapt:attr
+            name="android:fillColor">
+            <gradient
+                android:startX="183.501"
+                android:startY="255.483"
+                android:endX="183.501"
+                android:endY="634.991"
+                android:tileMode="clamp">
+                <item
+                    android:color="#00FFAA33"
+                    android:offset="0" />
+                <item
+                    android:color="#33FFAA33"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_disconnected.png b/app/src/normal/res/drawable/bg_disconnected.png
deleted file mode 100644
index de96be57..00000000
Binary files a/app/src/normal/res/drawable/bg_disconnected.png and /dev/null differ
diff --git a/app/src/normal/res/drawable/bg_disconnected.xml b/app/src/normal/res/drawable/bg_disconnected.xml
new file mode 100644
index 00000000..a5729185
--- /dev/null
+++ b/app/src/normal/res/drawable/bg_disconnected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="fill">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bg_disconnected"/>
+        </shape>
+    </item>
+    <item
+        android:gravity="fill"
+        android:drawable="@drawable/bg_disconnected_effect"
+        >
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_disconnected_effect.xml b/app/src/normal/res/drawable/bg_disconnected_effect.xml
new file mode 100644
index 00000000..bcc6064a
--- /dev/null
+++ b/app/src/normal/res/drawable/bg_disconnected_effect.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="375"
+    android:viewportHeight="636"
+    android:width="375dp"
+    android:height="636dp"
+    >
+    <group
+        android:scaleY="0.8"
+        android:scaleX="1.25"
+        android:translateX="-46.875"
+        >
+        <path
+            android:pathData="M183.514 458.837C313.578 458.837 419.016 183.305 419.016 -156.582C419.016 -496.468 313.578 -772 183.514 -772C53.4506 -772 -51.9869 -496.468 -51.9869 -156.582C-51.9869 183.305 53.4506 458.837 183.514 458.837Z">
+            <aapt:attr
+                name="android:fillColor">
+                <gradient
+                    android:startX="183.514"
+                    android:startY="0"
+                    android:endX="183.514"
+                    android:endY="212"
+                    android:tileMode="clamp">
+                    <item
+                        android:color="#55D3635C"
+                        android:offset="0" />
+                    <item
+                        android:color="#33AF0909"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
+
+</vector>
\ No newline at end of file
-- 
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/normal/res/drawable/splash_branding.xml |  3 +++
 app/src/normal/res/drawable/splash_icon.xml     | 14 ++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 app/src/normal/res/drawable/splash_branding.xml
 create mode 100644 app/src/normal/res/drawable/splash_icon.xml

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

diff --git a/app/src/normal/res/drawable/splash_branding.xml b/app/src/normal/res/drawable/splash_branding.xml
new file mode 100644
index 00000000..8c4ee21c
--- /dev/null
+++ b/app/src/normal/res/drawable/splash_branding.xml
@@ -0,0 +1,3 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/footer_text_drawable" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/splash_icon.xml b/app/src/normal/res/drawable/splash_icon.xml
new file mode 100644
index 00000000..f882d322
--- /dev/null
+++ b/app/src/normal/res/drawable/splash_icon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/rotate_progress_image"
+        android:height="198dp"
+        android:width="198dp"
+        android:gravity="fill"/>
+    <item
+        android:gravity="center"
+        android:height="52.75dp"
+        android:width="80dp"
+        >
+        <bitmap android:src="@drawable/logo"/>
+    </item>
+</layer-list>
\ No newline at end of file
-- 
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/normal/res/drawable/background_eip.xml     |  52 -----------
 app/src/normal/res/drawable/background_main.png    | Bin 0 -> 39702 bytes
 app/src/normal/res/drawable/background_main.xml    |  52 -----------
 app/src/normal/res/drawable/bg_connected.png       | Bin 0 -> 50250 bytes
 app/src/normal/res/drawable/bg_connected.xml       |  14 ---
 .../normal/res/drawable/bg_connected_effect.xml    |  44 ---------
 app/src/normal/res/drawable/bg_connecting.png      | Bin 0 -> 68160 bytes
 app/src/normal/res/drawable/bg_connecting.xml      |  13 ---
 .../normal/res/drawable/bg_connecting_effect.xml   |  44 ---------
 app/src/normal/res/drawable/bg_disconnected.png    | Bin 0 -> 59917 bytes
 app/src/normal/res/drawable/bg_disconnected.xml    |  13 ---
 .../normal/res/drawable/bg_disconnected_effect.xml |  33 -------
 .../normal/res/drawable/rotate_progress_image.png  | Bin 0 -> 4945 bytes
 .../normal/res/drawable/rotate_progress_image.xml  | 103 ---------------------
 app/src/normal/res/drawable/splash_icon.xml        |  14 ---
 15 files changed, 382 deletions(-)
 delete mode 100644 app/src/normal/res/drawable/background_eip.xml
 create mode 100644 app/src/normal/res/drawable/background_main.png
 delete mode 100644 app/src/normal/res/drawable/background_main.xml
 create mode 100644 app/src/normal/res/drawable/bg_connected.png
 delete mode 100644 app/src/normal/res/drawable/bg_connected.xml
 delete mode 100644 app/src/normal/res/drawable/bg_connected_effect.xml
 create mode 100644 app/src/normal/res/drawable/bg_connecting.png
 delete mode 100644 app/src/normal/res/drawable/bg_connecting.xml
 delete mode 100644 app/src/normal/res/drawable/bg_connecting_effect.xml
 create mode 100644 app/src/normal/res/drawable/bg_disconnected.png
 delete mode 100644 app/src/normal/res/drawable/bg_disconnected.xml
 delete mode 100644 app/src/normal/res/drawable/bg_disconnected_effect.xml
 create mode 100644 app/src/normal/res/drawable/rotate_progress_image.png
 delete mode 100644 app/src/normal/res/drawable/rotate_progress_image.xml
 delete mode 100644 app/src/normal/res/drawable/splash_icon.xml

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

diff --git a/app/src/normal/res/drawable/background_eip.xml b/app/src/normal/res/drawable/background_eip.xml
deleted file mode 100644
index 9b20a8fd..00000000
--- a/app/src/normal/res/drawable/background_eip.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:pathData="M50,33m-82000,0a82000,82000 0,1 1,164000 0a82000,82000 0,1 1,-164000 0"/>
-    <path android:fillAlpha="1" android:fillColor="#b39ddb"
-        android:pathData="M50,33 L30664.67,-73860.37A80000,80000 0,0 0,50 -79950Z"
-        android:strokeColor="#b39ddb" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#9fa8da"
-        android:pathData="m50,33 l56568.54,-56568.54a80000,80000 0,0 0,-25953.87 -17341.82z"
-        android:strokeColor="#9fa8da" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#90caf9"
-        android:pathData="m50,33 l73910.37,-30614.67a80000,80000 0,0 0,-17341.82 -25953.87z"
-        android:strokeColor="#90caf9" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#81d4fa"
-        android:pathData="M50,33L80050,50A80000,80000 0,0 0,73960.37 -30564.67Z"
-        android:strokeColor="#81d4fa" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#80deea"
-        android:pathData="M50,33 L73960.37,30664.67A80000,80000 0,0 0,80050 50Z"
-        android:strokeColor="#80deea" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#80cbc4"
-        android:pathData="m50,33 l56568.54,56568.54a80000,80000 0,0 0,17341.82 -25953.87z"
-        android:strokeColor="#80cbc4" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#a5d6a7"
-        android:pathData="m50,33 l30614.67,73910.37a80000,80000 0,0 0,25953.87 -17341.82z"
-        android:strokeColor="#a5d6a7" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#c5e1a5"
-        android:pathData="M50,33L50,80050A80000,80000 0,0 0,30664.67 73960.37Z"
-        android:strokeColor="#c5e1a5" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#e6ee9c"
-        android:pathData="M50,33 L-30564.67,73960.37A80000,80000 0,0 0,50 80050Z"
-        android:strokeColor="#e6ee9c" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#fff59d"
-        android:pathData="m50,33 l-56568.54,56568.54a80000,80000 0,0 0,25953.87 17341.82z"
-        android:strokeColor="#fff59d" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffe082"
-        android:pathData="m50,33 l-73910.37,30614.67a80000,80000 0,0 0,17341.82 25953.87z"
-        android:strokeColor="#ffe082" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffcc80"
-        android:pathData="m50,33l-80000,0a80000,80000 0,0 0,6089.64 30614.67z"
-        android:strokeColor="#ffcc80" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffab91"
-        android:pathData="M50,33 L-73860.37,-30564.67A80000,80000 0,0 0,-79950 50Z"
-        android:strokeColor="#ffab91" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ef9a9a"
-        android:pathData="m50,33 l-56568.54,-56568.54a80000,80000 0,0 0,-17341.82 25953.87z"
-        android:strokeColor="#ef9a9a" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#f48fb1"
-        android:pathData="m50,33 l-30614.67,-73910.37a80000,80000 0,0 0,-25953.87 17341.82z"
-        android:strokeColor="#f48fb1" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ce93d8"
-        android:pathData="m50,33l0,-80000a80000,80000 0,0 0,-30614.67 6089.64z"
-        android:strokeColor="#ce93d8" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/normal/res/drawable/background_main.png b/app/src/normal/res/drawable/background_main.png
new file mode 100644
index 00000000..3e5f7871
Binary files /dev/null and b/app/src/normal/res/drawable/background_main.png differ
diff --git a/app/src/normal/res/drawable/background_main.xml b/app/src/normal/res/drawable/background_main.xml
deleted file mode 100644
index 4b60e9dc..00000000
--- a/app/src/normal/res/drawable/background_main.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:pathData="M50,50m-82000,0a82000,82000 0,1 1,164000 0a82000,82000 0,1 1,-164000 0"/>
-    <path android:fillAlpha="1" android:fillColor="#e6ee9c"
-        android:pathData="M50,50 L30664.67,-73860.37A80000,80000 0,0 0,50 -79950Z"
-        android:strokeColor="#e6ee9c" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#fff59d"
-        android:pathData="m50,50 l56568.54,-56568.54a80000,80000 0,0 0,-25953.87 -17341.82z"
-        android:strokeColor="#fff59d" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffe082"
-        android:pathData="m50,50 l73910.37,-30614.67a80000,80000 0,0 0,-17341.82 -25953.87z"
-        android:strokeColor="#ffe082" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffcc80"
-        android:pathData="M50,50L80050,50A80000,80000 0,0 0,73960.37 -30564.67Z"
-        android:strokeColor="#ffcc80" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ffab91"
-        android:pathData="M50,50 L73960.37,30664.67A80000,80000 0,0 0,80050 50Z"
-        android:strokeColor="#ffab91" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ef9a9a"
-        android:pathData="m50,50 l56568.54,56568.54a80000,80000 0,0 0,17341.82 -25953.87z"
-        android:strokeColor="#ef9a9a" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#f48fb1"
-        android:pathData="m50,50 l30614.67,73910.37a80000,80000 0,0 0,25953.87 -17341.82z"
-        android:strokeColor="#f48fb1" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#ce93d8"
-        android:pathData="M50,50L50,80050A80000,80000 0,0 0,30664.67 73960.37Z"
-        android:strokeColor="#ce93d8" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#b39ddb"
-        android:pathData="M50,50 L-30564.67,73960.37A80000,80000 0,0 0,50 80050Z"
-        android:strokeColor="#b39ddb" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#9fa8da"
-        android:pathData="m50,50 l-56568.54,56568.54a80000,80000 0,0 0,25953.87 17341.82z"
-        android:strokeColor="#9fa8da" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#90caf9"
-        android:pathData="m50,50 l-73910.37,30614.67a80000,80000 0,0 0,17341.82 25953.87z"
-        android:strokeColor="#90caf9" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#81d4fa"
-        android:pathData="m50,50l-80000,0a80000,80000 0,0 0,6089.64 30614.67z"
-        android:strokeColor="#81d4fa" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#80deea"
-        android:pathData="M50,50 L-73860.37,-30564.67A80000,80000 0,0 0,-79950 50Z"
-        android:strokeColor="#80deea" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#80cbc4"
-        android:pathData="m50,50 l-56568.54,-56568.54a80000,80000 0,0 0,-17341.82 25953.87z"
-        android:strokeColor="#80cbc4" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#a5d6a7"
-        android:pathData="m50,50 l-30614.67,-73910.37a80000,80000 0,0 0,-25953.87 17341.82z"
-        android:strokeColor="#a5d6a7" android:strokeWidth="0"/>
-    <path android:fillAlpha="1" android:fillColor="#c5e1a5"
-        android:pathData="m50,50l0,-80000a80000,80000 0,0 0,-30614.67 6089.64z"
-        android:strokeColor="#c5e1a5" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/normal/res/drawable/bg_connected.png b/app/src/normal/res/drawable/bg_connected.png
new file mode 100644
index 00000000..9741dcba
Binary files /dev/null and b/app/src/normal/res/drawable/bg_connected.png differ
diff --git a/app/src/normal/res/drawable/bg_connected.xml b/app/src/normal/res/drawable/bg_connected.xml
deleted file mode 100644
index 19dac103..00000000
--- a/app/src/normal/res/drawable/bg_connected.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_running"/>
-        </shape>
-    </item>
-    <item
-        android:top="80dp"
-        android:gravity="fill"
-        android:drawable="@drawable/bg_connected_effect"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_connected_effect.xml b/app/src/normal/res/drawable/bg_connected_effect.xml
deleted file mode 100644
index 08ef8172..00000000
--- a/app/src/normal/res/drawable/bg_connected_effect.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="411"
-    android:viewportHeight="703"
-    android:width="411dp"
-    android:height="703dp">
-    <path
-        android:pathData="M628.549 500.593C751.417 416.034 654.462 61.8767 411.994 -290.44C169.527 -642.756 -126.637 -859.816 -249.505 -775.257C-372.373 -690.697 -275.418 -336.54 -32.9505 15.7764C209.517 368.093 505.681 585.153 628.549 500.593Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="415.099"
-                android:startY="-19.956"
-                android:endX="685.832"
-                android:endY="373.431"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00A6C28A"
-                    android:offset="0" />
-                <item
-                    android:color="#44669933"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:pathData="M-186.124 473.683C-63.0333 557.917 232.557 340.077 474.094 -12.8776C715.632 -365.832 811.653 -720.244 688.562 -804.479C565.471 -888.714 269.881 -670.874 28.3433 -317.919C-213.195 35.0357 -309.215 389.448 -186.124 473.683Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="222.826"
-                android:startY="87.2986"
-                android:endX="-46.8688"
-                android:endY="481.398"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00A6C28A"
-                    android:offset="0" />
-                <item
-                    android:color="#44669933"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
diff --git a/app/src/normal/res/drawable/bg_connecting.png b/app/src/normal/res/drawable/bg_connecting.png
new file mode 100644
index 00000000..d85ddd4b
Binary files /dev/null and b/app/src/normal/res/drawable/bg_connecting.png differ
diff --git a/app/src/normal/res/drawable/bg_connecting.xml b/app/src/normal/res/drawable/bg_connecting.xml
deleted file mode 100644
index 8482d30e..00000000
--- a/app/src/normal/res/drawable/bg_connecting.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_connecting"/>
-        </shape>
-    </item>
-    <item android:gravity="fill"
-        android:bottom="80dp"
-        android:drawable="@drawable/bg_connecting_effect"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_connecting_effect.xml b/app/src/normal/res/drawable/bg_connecting_effect.xml
deleted file mode 100644
index fd462a54..00000000
--- a/app/src/normal/res/drawable/bg_connecting_effect.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="375"
-    android:viewportHeight="629"
-    android:width="375dp"
-    android:height="629dp">
-    <path
-        android:pathData="M96.6338 471.305C226.719 515.286 420.512 289.654 529.484 -32.658C638.456 -354.97 621.341 -651.909 491.256 -695.89C361.172 -739.871 167.378 -514.239 58.4058 -191.927C-50.5662 130.385 -33.4509 427.324 96.6338 471.305Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="132.695"
-                android:startY="21.7787"
-                android:endX="11.0197"
-                android:endY="381.664"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00FFAA33"
-                    android:offset="0" />
-                <item
-                    android:color="#33FFAA33"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:pathData="M183.501 628.837C313.565 628.837 419.003 353.304 419.003 13.4182C419.003 -326.468 313.565 -602 183.501 -602C53.4376 -602 -52 -326.468 -52 13.4182C-52 353.304 53.4376 628.837 183.501 628.837Z">
-        <aapt:attr
-            name="android:fillColor">
-            <gradient
-                android:startX="183.501"
-                android:startY="255.483"
-                android:endX="183.501"
-                android:endY="634.991"
-                android:tileMode="clamp">
-                <item
-                    android:color="#00FFAA33"
-                    android:offset="0" />
-                <item
-                    android:color="#33FFAA33"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_disconnected.png b/app/src/normal/res/drawable/bg_disconnected.png
new file mode 100644
index 00000000..a22b7097
Binary files /dev/null and b/app/src/normal/res/drawable/bg_disconnected.png differ
diff --git a/app/src/normal/res/drawable/bg_disconnected.xml b/app/src/normal/res/drawable/bg_disconnected.xml
deleted file mode 100644
index a5729185..00000000
--- a/app/src/normal/res/drawable/bg_disconnected.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:gravity="fill">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bg_disconnected"/>
-        </shape>
-    </item>
-    <item
-        android:gravity="fill"
-        android:drawable="@drawable/bg_disconnected_effect"
-        >
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/bg_disconnected_effect.xml b/app/src/normal/res/drawable/bg_disconnected_effect.xml
deleted file mode 100644
index bcc6064a..00000000
--- a/app/src/normal/res/drawable/bg_disconnected_effect.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="375"
-    android:viewportHeight="636"
-    android:width="375dp"
-    android:height="636dp"
-    >
-    <group
-        android:scaleY="0.8"
-        android:scaleX="1.25"
-        android:translateX="-46.875"
-        >
-        <path
-            android:pathData="M183.514 458.837C313.578 458.837 419.016 183.305 419.016 -156.582C419.016 -496.468 313.578 -772 183.514 -772C53.4506 -772 -51.9869 -496.468 -51.9869 -156.582C-51.9869 183.305 53.4506 458.837 183.514 458.837Z">
-            <aapt:attr
-                name="android:fillColor">
-                <gradient
-                    android:startX="183.514"
-                    android:startY="0"
-                    android:endX="183.514"
-                    android:endY="212"
-                    android:tileMode="clamp">
-                    <item
-                        android:color="#55D3635C"
-                        android:offset="0" />
-                    <item
-                        android:color="#33AF0909"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/rotate_progress_image.png b/app/src/normal/res/drawable/rotate_progress_image.png
new file mode 100644
index 00000000..fe7f3526
Binary files /dev/null and b/app/src/normal/res/drawable/rotate_progress_image.png differ
diff --git a/app/src/normal/res/drawable/rotate_progress_image.xml b/app/src/normal/res/drawable/rotate_progress_image.xml
deleted file mode 100644
index 44a35ba9..00000000
--- a/app/src/normal/res/drawable/rotate_progress_image.xml
+++ /dev/null
@@ -1,103 +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">
-    <path
-        android:pathData="M83.9459 61.7492C81.6735 67.1718 78.2509 72.0496 73.9091 76.0535L45.5808 46.0417L83.9459 61.7492Z"
-        android:fillColor="#FFCC80" />
-    <path
-        android:pathData="M74.9439 75.0657C70.7802 79.1812 65.7785 82.3744 60.2709 84.4334L45.5806 46.0421L74.9439 75.0657Z"
-        android:fillColor="#FFE082" />
-    <path
-        android:pathData="M61.4719 83.9632C55.9543 86.2222 50.0087 87.2783 44.0406 87.0594L45.5806 46.0421L61.4719 83.9632Z"
-        android:fillColor="#FFF59D" />
-    <path
-        android:pathData="M45.5803 87.088C39.516 87.088 33.5253 85.7751 28.0292 83.2417L45.5803 46.0425L45.5803 87.088Z"
-        android:fillColor="#E6EE9C" />
-    <path
-        android:pathData="M29.6888 83.9635C24.2224 81.7254 19.303 78.3586 15.2601 74.0885L45.5801 46.0424L29.6888 83.9635Z"
-        android:fillColor="#C5E1A5" />
-    <path
-        android:pathData="M16.2165 75.0658C11.9261 70.825 8.62802 65.7065 6.55433 60.0703L45.5798 46.0422L16.2165 75.0658Z"
-        android:fillColor="#A5D6A7" />
-    <path
-        android:pathData="M7.21455 61.7497C4.89145 56.2061 3.82625 50.2265 4.09398 44.232L45.5796 46.0422L7.21455 61.7497Z"
-        android:fillColor="#80CBC4" />
-    <path
-        android:pathData="M4.05357 46.0421C4.05357 40.2602 5.28944 34.5435 7.68023 29.2665L45.5796 46.0421L4.05357 46.0421Z"
-        android:fillColor="#80DEEA" />
-    <path
-        android:pathData="M7.21454 30.3342C9.56893 24.716 13.1569 19.685 17.7191 15.6051L45.5796 46.0416L7.21454 30.3342Z"
-        android:fillColor="#81D4FA" />
-    <path
-        android:pathData="M16.216 17.0181C20.5162 12.7677 25.7084 9.50267 31.4256 7.45389L45.5793 46.0416L16.216 17.0181Z"
-        android:fillColor="#90CAF9" />
-    <path
-        android:pathData="M29.6883 8.12016C35.3597 5.79816 41.4814 4.7479 47.6127 5.04498L45.5796 46.0413L29.6883 8.12016Z"
-        android:fillColor="#9FA8DA" />
-    <path
-        android:pathData="M45.5798 4.99576C51.3771 4.99576 57.1101 6.19555 62.4099 8.51791L45.5798 46.0413L45.5798 4.99576Z"
-        android:fillColor="#B39DDB" />
-    <path
-        android:pathData="M61.4714 8.11991C66.8116 10.3063 71.6312 13.5706 75.6218 17.7038L45.5801 46.041L61.4714 8.11991Z"
-        android:fillColor="#CE93D8" />
-    <path
-        android:pathData="M74.9437 17.0175C79.0466 21.0729 82.2441 25.9333 84.3301 31.2851L45.5803 46.041L74.9437 17.0175Z"
-        android:fillColor="#F48FB1" />
-    <path
-        android:pathData="M83.9456 30.3337C86.2094 35.7356 87.2793 41.5533 87.0839 47.3971L45.5806 46.0411L83.9456 30.3337Z"
-        android:fillColor="#EF9A9A" />
-    <path
-        android:pathData="M87.1066 46.0416C87.1066 51.4632 86.02 56.831 83.9094 61.8351L45.5806 46.0416L87.1066 46.0416Z"
-        android:fillColor="#FFAB91" />
-    <path
-        android:pathData="M83.8543 60.835C81.5944 66.2576 78.1907 71.1354 73.8728 75.1393L45.7004 45.1276L83.8543 60.835Z"
-        android:fillColor="#FFCC80" />
-    <path
-        android:pathData="M74.9019 74.1516C70.7611 78.2671 65.787 81.4604 60.3097 83.5193L45.7002 45.1281L74.9019 74.1516Z"
-        android:fillColor="#FFE082" />
-    <path
-        android:pathData="M61.5041 83.0491C56.0168 85.3082 50.1039 86.3642 44.1687 86.1453L45.7002 45.1281L61.5041 83.0491Z"
-        android:fillColor="#FFF59D" />
-    <path
-        android:pathData="M45.7002 86.1734C39.6693 86.1734 33.7115 84.8606 28.2457 82.3272L45.7002 45.1279L45.7002 86.1734Z"
-        android:fillColor="#E6EE9C" />
-    <path
-        android:pathData="M29.8961 83.049C24.4598 80.811 19.5675 77.4442 15.5469 73.1741L45.7 45.1279L29.8961 83.049Z"
-        android:fillColor="#C5E1A5" />
-    <path
-        android:pathData="M16.4977 74.1517C12.231 69.911 8.95103 64.7924 6.88875 59.1563L45.6995 45.1282L16.4977 74.1517Z"
-        android:fillColor="#A5D6A7" />
-    <path
-        android:pathData="M7.54558 60.8351C5.23527 55.2915 4.17593 49.3119 4.44219 43.3175L45.6995 45.1277L7.54558 60.8351Z"
-        android:fillColor="#80CBC4" />
-    <path
-        android:pathData="M4.40175 45.1277C4.40175 39.3457 5.63082 33.6291 8.00845 28.3521L45.6992 45.1277L4.40175 45.1277Z"
-        android:fillColor="#80DEEA" />
-    <path
-        android:pathData="M7.54533 29.4201C9.88677 23.8019 13.455 18.7709 17.992 14.691L45.6992 45.1276L7.54533 29.4201Z"
-        android:fillColor="#81D4FA" />
-    <path
-        android:pathData="M16.4972 16.104C20.7738 11.8536 25.9374 8.5886 31.6231 6.53981L45.699 45.1276L16.4972 16.104Z"
-        android:fillColor="#90CAF9" />
-    <path
-        android:pathData="M29.8956 7.20611C35.5358 4.88411 41.6238 3.83384 47.7214 4.13092L45.6995 45.1272L29.8956 7.20611Z"
-        android:fillColor="#9FA8DA" />
-    <path
-        android:pathData="M45.6997 4.08133C51.465 4.08133 57.1665 5.28113 62.4371 7.60349L45.6997 45.1268L45.6997 4.08133Z"
-        android:fillColor="#B39DDB" />
-    <path
-        android:pathData="M61.5036 7.20587C66.8144 9.39225 71.6074 12.6565 75.576 16.7898L45.6997 45.127L61.5036 7.20587Z"
-        android:fillColor="#CE93D8" />
-    <path
-        android:pathData="M74.9017 16.1034C78.982 20.1589 82.162 25.0192 84.2365 30.3711L45.7 45.127L74.9017 16.1034Z"
-        android:fillColor="#F48FB1" />
-    <path
-        android:pathData="M83.8541 29.4196C86.1054 34.8216 87.1695 40.6392 86.9751 46.4831L45.7002 45.1271L83.8541 29.4196Z"
-        android:fillColor="#EF9A9A" />
-    <path
-        android:pathData="M86.9979 45.1272C86.9979 50.5487 85.9172 55.9166 83.8183 60.9207L45.7004 45.1272L86.9979 45.1272Z"
-        android:fillColor="#FFAB91" />
-</vector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/splash_icon.xml b/app/src/normal/res/drawable/splash_icon.xml
deleted file mode 100644
index f882d322..00000000
--- a/app/src/normal/res/drawable/splash_icon.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rotate_progress_image"
-        android:height="198dp"
-        android:width="198dp"
-        android:gravity="fill"/>
-    <item
-        android:gravity="center"
-        android:height="52.75dp"
-        android:width="80dp"
-        >
-        <bitmap android:src="@drawable/logo"/>
-    </item>
-</layer-list>
\ No newline at end of file
-- 
cgit v1.2.3