From 68525a028369c2a0dca8d669fb5872ee2ff6166c Mon Sep 17 00:00:00 2001
From: thofx <127162817+thofx@users.noreply.github.com>
Date: Sat, 27 May 2023 18:37:43 +0800
Subject: [PATCH] feat: add volume and brightness change animation (#377)

* volume and brightness change animation

* lint: remove redundant curly braces

---------

Co-authored-by: usnail <fuyouyuan@cloudwalk.com>
Co-authored-by: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
---
 .../jellyfin/utils/PlayerGestureHelper.kt     |  8 ++-
 .../src/main/res/layout/activity_player.xml   |  4 +-
 core/src/main/res/drawable/ic_sun_0.xml       | 13 ++++
 core/src/main/res/drawable/ic_sun_12.xml      | 20 ++++++
 core/src/main/res/drawable/ic_sun_25.xml      | 27 ++++++++
 core/src/main/res/drawable/ic_sun_37.xml      | 34 ++++++++++
 core/src/main/res/drawable/ic_sun_50.xml      | 41 ++++++++++++
 core/src/main/res/drawable/ic_sun_62.xml      | 48 ++++++++++++++
 core/src/main/res/drawable/ic_sun_75.xml      | 55 ++++++++++++++++
 core/src/main/res/drawable/ic_sun_87.xml      | 62 +++++++++++++++++++
 core/src/main/res/drawable/ic_sun_level.xml   | 39 ++++++++++++
 core/src/main/res/drawable/ic_volume_0.xml    | 21 +++++++
 core/src/main/res/drawable/ic_volume_50.xml   | 20 ++++++
 .../src/main/res/drawable/ic_volume_level.xml | 15 +++++
 14 files changed, 403 insertions(+), 4 deletions(-)
 create mode 100644 core/src/main/res/drawable/ic_sun_0.xml
 create mode 100644 core/src/main/res/drawable/ic_sun_12.xml
 create mode 100644 core/src/main/res/drawable/ic_sun_25.xml
 create mode 100644 core/src/main/res/drawable/ic_sun_37.xml
 create mode 100644 core/src/main/res/drawable/ic_sun_50.xml
 create mode 100644 core/src/main/res/drawable/ic_sun_62.xml
 create mode 100644 core/src/main/res/drawable/ic_sun_75.xml
 create mode 100644 core/src/main/res/drawable/ic_sun_87.xml
 create mode 100644 core/src/main/res/drawable/ic_sun_level.xml
 create mode 100644 core/src/main/res/drawable/ic_volume_0.xml
 create mode 100644 core/src/main/res/drawable/ic_volume_50.xml
 create mode 100644 core/src/main/res/drawable/ic_volume_level.xml

diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
index a7ff8ce8..9ec93fb1 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
@@ -162,7 +162,9 @@ class PlayerGestureHelper(
                     activity.binding.gestureVolumeLayout.visibility = View.VISIBLE
                     activity.binding.gestureVolumeProgressBar.max = maxVolume
                     activity.binding.gestureVolumeProgressBar.progress = swipeGestureValueTrackerVolume.toInt()
-                    activity.binding.gestureVolumeText.text = "${(swipeGestureValueTrackerVolume / maxVolume.toFloat()).times(100).toInt()}%"
+                    val process = (swipeGestureValueTrackerVolume / maxVolume.toFloat()).times(100).toInt()
+                    activity.binding.gestureVolumeText.text = "$process%"
+                    activity.binding.gestureVolumeImage.setImageLevel(process)
 
                     swipeGestureVolumeOpen = true
                 } else {
@@ -187,7 +189,9 @@ class PlayerGestureHelper(
                     activity.binding.gestureBrightnessLayout.visibility = View.VISIBLE
                     activity.binding.gestureBrightnessProgressBar.max = BRIGHTNESS_OVERRIDE_FULL.times(100).toInt()
                     activity.binding.gestureBrightnessProgressBar.progress = lp.screenBrightness.times(100).toInt()
-                    activity.binding.gestureBrightnessText.text = "${(lp.screenBrightness / BRIGHTNESS_OVERRIDE_FULL).times(100).toInt()}%"
+                    val process = (lp.screenBrightness / BRIGHTNESS_OVERRIDE_FULL).times(100).toInt()
+                    activity.binding.gestureBrightnessText.text = "$process%"
+                    activity.binding.gestureBrightnessImage.setImageLevel(process)
 
                     swipeGestureBrightnessOpen = true
                 }
diff --git a/app/phone/src/main/res/layout/activity_player.xml b/app/phone/src/main/res/layout/activity_player.xml
index 683f441d..ec44e30f 100644
--- a/app/phone/src/main/res/layout/activity_player.xml
+++ b/app/phone/src/main/res/layout/activity_player.xml
@@ -70,7 +70,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginVertical="16dp"
-            android:src="@drawable/ic_volume"
+            android:src="@drawable/ic_volume_level"
             tools:ignore="ContentDescription" />
     </LinearLayout>
 
@@ -109,7 +109,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginVertical="16dp"
-            android:src="@drawable/ic_sun"
+            android:src="@drawable/ic_sun_level"
             tools:ignore="ContentDescription" />
     </LinearLayout>
 
diff --git a/core/src/main/res/drawable/ic_sun_0.xml b/core/src/main/res/drawable/ic_sun_0.xml
new file mode 100644
index 00000000..1c507b28
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_0.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,12m -4,0 a4,4 0,1 1,8 0 a4,4 0,1 1,-8 0"
+        android:strokeWidth="2"
+        android:strokeColor="@android:color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/core/src/main/res/drawable/ic_sun_12.xml b/core/src/main/res/drawable/ic_sun_12.xml
new file mode 100644
index 00000000..dce645de
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_12.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="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,2v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sun_25.xml b/core/src/main/res/drawable/ic_sun_25.xml
new file mode 100644
index 00000000..4bd9e14e
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_25.xml
@@ -0,0 +1,27 @@
+<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="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,2v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,6.5L19,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sun_37.xml b/core/src/main/res/drawable/ic_sun_37.xml
new file mode 100644
index 00000000..89477a83
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_37.xml
@@ -0,0 +1,34 @@
+<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="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,2v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,6.5L19,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20,12h2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sun_50.xml b/core/src/main/res/drawable/ic_sun_50.xml
new file mode 100644
index 00000000..0a7865a7
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_50.xml
@@ -0,0 +1,41 @@
+<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="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,2v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,6.5L19,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20,12h2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,17.5L19,19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sun_62.xml b/core/src/main/res/drawable/ic_sun_62.xml
new file mode 100644
index 00000000..1914ac7a
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_62.xml
@@ -0,0 +1,48 @@
+<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="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,2v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,6.5L19,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20,12h2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,17.5L19,19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,20v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sun_75.xml b/core/src/main/res/drawable/ic_sun_75.xml
new file mode 100644
index 00000000..c4a04974
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_75.xml
@@ -0,0 +1,55 @@
+<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="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,2v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,6.5L19,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20,12h2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,17.5L19,19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,20v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5,19l1.5,-1.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sun_87.xml b/core/src/main/res/drawable/ic_sun_87.xml
new file mode 100644
index 00000000..8ed1c088
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_87.xml
@@ -0,0 +1,62 @@
+<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="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,2v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,6.5L19,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20,12h2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.5,17.5L19,19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,20v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5,19l1.5,-1.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M2,12h2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sun_level.xml b/core/src/main/res/drawable/ic_sun_level.xml
new file mode 100644
index 00000000..4db20174
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sun_level.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/ic_sun_0"
+        android:maxLevel="0"
+        android:minLevel="0" />
+    <item
+        android:drawable="@drawable/ic_sun_12"
+        android:maxLevel="12"
+        android:minLevel="0" />
+    <item
+        android:drawable="@drawable/ic_sun_25"
+        android:maxLevel="25"
+        android:minLevel="12" />
+    <item
+        android:drawable="@drawable/ic_sun_37"
+        android:maxLevel="37"
+        android:minLevel="12" />
+    <item
+        android:drawable="@drawable/ic_sun_50"
+        android:maxLevel="50"
+        android:minLevel="37" />
+    <item
+        android:drawable="@drawable/ic_sun_62"
+        android:maxLevel="62"
+        android:minLevel="50" />
+    <item
+        android:drawable="@drawable/ic_sun_75"
+        android:maxLevel="75"
+        android:minLevel="62" />
+    <item
+        android:drawable="@drawable/ic_sun_87"
+        android:maxLevel="87"
+        android:minLevel="75" />
+    <item
+        android:drawable="@drawable/ic_sun"
+        android:maxLevel="100"
+        android:minLevel="87" />
+</level-list>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_volume_0.xml b/core/src/main/res/drawable/ic_volume_0.xml
new file mode 100644
index 00000000..98fdb1aa
--- /dev/null
+++ b/core/src/main/res/drawable/ic_volume_0.xml
@@ -0,0 +1,21 @@
+<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="M11,5l-5,4l-4,0l0,6l4,0l5,4l0,-14z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+
+  <path
+      android:pathData="M15,9 L21,15 M21,9 L15,15"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_volume_50.xml b/core/src/main/res/drawable/ic_volume_50.xml
new file mode 100644
index 00000000..4f068f4f
--- /dev/null
+++ b/core/src/main/res/drawable/ic_volume_50.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="M11,5l-5,4l-4,0l0,6l4,0l5,4l0,-14z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M15.54,8.46a5,5 0,0 1,0 7.07"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@android:color/white"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_volume_level.xml b/core/src/main/res/drawable/ic_volume_level.xml
new file mode 100644
index 00000000..fcadaf16
--- /dev/null
+++ b/core/src/main/res/drawable/ic_volume_level.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/ic_volume_0"
+        android:maxLevel="0"
+        android:minLevel="0" />
+    <item
+        android:drawable="@drawable/ic_volume_50"
+        android:maxLevel="50"
+        android:minLevel="1" />
+    <item
+        android:drawable="@drawable/ic_volume"
+        android:maxLevel="100"
+        android:minLevel="51" />
+</level-list>
\ No newline at end of file