summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-02-05 05:57:42 +0000
committercyberta <cyberta@riseup.net>2022-02-05 05:57:42 +0000
commit93071764fbc133996d7f7d52db13eea6939a50bf (patch)
tree971b985f24498d6488c41caba252f64395f25b2f /app/src/main/res
parent09b3c509223cc3dedcc09763b570f5016d73857f (diff)
parent2375f6a9f2ec395391cca524176d9c54635a14de (diff)
Merge branch 'improve_load_animation' into 'master'
Improve load animation Closes #9066 and #9071 See merge request leap/bitmask_android!173
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/main_btn_glow.xml21
-rw-r--r--app/src/main/res/drawable/on_off_btn_an1.pngbin0 -> 16186 bytes
-rw-r--r--app/src/main/res/drawable/on_off_btn_an2.pngbin0 -> 12771 bytes
-rw-r--r--app/src/main/res/drawable/on_off_btn_an3.pngbin0 -> 10006 bytes
-rw-r--r--app/src/main/res/drawable/on_off_btn_an4.pngbin0 -> 9308 bytes
-rw-r--r--app/src/main/res/drawable/on_off_btn_start_animation1.pngbin32481 -> 0 bytes
-rw-r--r--app/src/main/res/drawable/on_off_btn_start_animation2.pngbin36701 -> 0 bytes
-rw-r--r--app/src/main/res/drawable/on_off_btn_start_animation3.pngbin39980 -> 0 bytes
-rw-r--r--app/src/main/res/drawable/on_off_btn_start_animation4.pngbin41982 -> 0 bytes
-rw-r--r--app/src/main/res/drawable/on_off_btn_start_animation5.pngbin43093 -> 0 bytes
10 files changed, 9 insertions, 12 deletions
diff --git a/app/src/main/res/drawable/main_btn_glow.xml b/app/src/main/res/drawable/main_btn_glow.xml
index 76b2268a..5ed57dd5 100644
--- a/app/src/main/res/drawable/main_btn_glow.xml
+++ b/app/src/main/res/drawable/main_btn_glow.xml
@@ -1,15 +1,12 @@
<?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="100" />
- <item android:drawable="@drawable/on_off_btn_start_animation2" android:duration="125" />
- <item android:drawable="@drawable/on_off_btn_start_animation3" android:duration="150" />
- <item android:drawable="@drawable/on_off_btn_start_animation4" android:duration="175" />
- <item android:drawable="@drawable/on_off_btn_start_animation3" android:duration="150" />
- <item android:drawable="@drawable/on_off_btn_start_animation2" android:duration="120" />
- <item android:drawable="@drawable/on_off_btn_start_animation3" android:duration="150" />
- <item android:drawable="@drawable/on_off_btn_start_animation4" android:duration="200" />
- <item android:drawable="@drawable/on_off_btn_start_animation5" android:duration="250" />
- <item android:drawable="@drawable/on_off_btn_start_animation4" android:duration="200" />
- <item android:drawable="@drawable/on_off_btn_start_animation3" android:duration="150" />
- <item android:drawable="@drawable/on_off_btn_start_animation2" android:duration="125" />
+ <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/on_off_btn_an1.png b/app/src/main/res/drawable/on_off_btn_an1.png
new file mode 100644
index 00000000..c80feeb7
--- /dev/null
+++ b/app/src/main/res/drawable/on_off_btn_an1.png
Binary files 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
new file mode 100644
index 00000000..73f4cb7e
--- /dev/null
+++ b/app/src/main/res/drawable/on_off_btn_an2.png
Binary files 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
new file mode 100644
index 00000000..98ad0220
--- /dev/null
+++ b/app/src/main/res/drawable/on_off_btn_an3.png
Binary files 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
new file mode 100644
index 00000000..49070e5f
--- /dev/null
+++ b/app/src/main/res/drawable/on_off_btn_an4.png
Binary files 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
deleted file mode 100644
index f9d18488..00000000
--- a/app/src/main/res/drawable/on_off_btn_start_animation1.png
+++ /dev/null
Binary files 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
deleted file mode 100644
index 33b600c9..00000000
--- a/app/src/main/res/drawable/on_off_btn_start_animation2.png
+++ /dev/null
Binary files 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
deleted file mode 100644
index 2172107a..00000000
--- a/app/src/main/res/drawable/on_off_btn_start_animation3.png
+++ /dev/null
Binary files 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
deleted file mode 100644
index 8b744462..00000000
--- a/app/src/main/res/drawable/on_off_btn_start_animation4.png
+++ /dev/null
Binary files 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
deleted file mode 100644
index 11bb16cd..00000000
--- a/app/src/main/res/drawable/on_off_btn_start_animation5.png
+++ /dev/null
Binary files differ