新增歌词动画插值器、歌词动画持续时间和动画淡出淡入效果

app/src/main/java/statusbar/lyric/activity/page/LyricPage.kt

@@ -341,6 +341,7 @@ class LyricPage : BasePage() {
             this["Bottom"] = getString(R.string.lyrics_animation_bottom)
             this["Start"] = getString(R.string.lyrics_animation_start)
             this["End"] = getString(R.string.lyrics_animation_end)
+            this["Fade"] = getString(R.string.lyrics_animation_fade)
             this["ScaleX"] = getString(R.string.lyrics_animation_scale_x)
             this["ScaleY"] = getString(R.string.lyrics_animation_scale_y)
             this["ScaleXY"] = getString(R.string.lyrics_animation_scale_x_y)
@@ -354,5 +355,46 @@ class LyricPage : BasePage() {
                 }
             }
         })
+        val interpolatorMaps: LinkedHashMap<String, String> = LinkedHashMap<String, String>().apply {
+            this["Linear"] = getString(R.string.lyrics_interpolator_linear)
+            this["Accelerate"] = getString(R.string.lyrics_interpolator_accelerate)
+            this["Decelerate"] = getString(R.string.lyrics_interpolator_decelerate)
+            this["Accelerate&Decelerate"] = getString(R.string.lyrics_interpolator_accelerate_decelerate)
+            this["Overshoot"] = getString(R.string.lyrics_interpolator_overshoot)
+            this["Bounce"] = getString(R.string.lyrics_interpolator_bounce)
+        }
+        TextSSp(textId = R.string.lyrics_animation_interpolator, currentValue = interpolatorMaps[config.interpolator].toString(), data = {
+            interpolatorMaps.forEach {
+                add(it.value) {
+                    config.interpolator = (it.key)
+                    changeConfig()
+                }
+            }
+        })
+        TextSA(textId = R.string.lyrics_animation_duration, onClickListener = {
+            MIUIDialog(activity) {
+                setTitle(getString(R.string.lyrics_animation_duration))
+                setMessage(getString(R.string.lyric_animation_duration_tips))
+                setEditText(config.animationDuration.toString(), "500", config = {
+                    it.inputType = InputType.TYPE_NUMBER_FLAG_SIGNED
+                    it.filters = arrayOf(InputFilter.LengthFilter(4))
+                })
+                setRButton(getString(R.string.ok)) {
+                    try {
+                        val value = getEditText().toInt()
+                        if (value in 300..1000) {
+                            config.animationDuration = value
+                            changeConfig()
+                        } else {
+                            throw Exception()
+                        }
+                    } catch (_: Exception) {
+                        ActivityTools.showToastOnLooper(getString(R.string.input_error))
+                    }
+                }
+                setLButton(getString(R.string.cancel))
+                finally { dismiss() }
+            }.show()
+        })
     }
 }

app/src/main/java/statusbar/lyric/config/Config.kt

@@ -294,6 +294,20 @@ class Config {
         set(value) {
             config.put("animation", value)
         }
+    var interpolator: String
+        get() {
+            return config.opt("interpolator", "Linear")
+        }
+        set(value) {
+            config.put("interpolator", value)
+        }
+    var animationDuration: Int
+        get() {
+            return config.opt("animationDuration", 500)
+        }
+        set(value) {
+            config.put("animationDuration", value)
+        }
     var viewIndex: Int
         get() {
             return config.opt("viewIndex", 0)

app/src/main/java/statusbar/lyric/hook/app/SystemUILyric.kt

@@ -402,10 +402,12 @@ class SystemUILyric : BaseHook() {
             if (this::mCarrierLabel.isInitialized) mCarrierLabel.hideView()
             if (this::mMIUINetworkSpeedView.isInitialized) mMIUINetworkSpeedView.hideView()
             lyricView.apply {
+                val interpolator = config.interpolator
+                val duration = config.animationDuration
                 if (config.animation == "Random") {
-                    val effect = arrayListOf("Top", "Bottom", "Start", "End", "ScaleXY", "ScaleX", "ScaleY").random()
-                    inAnimation = ViewTools.switchViewInAnima(effect)
-                    outAnimation = ViewTools.switchViewOutAnima(effect)
+                    val effect = arrayListOf("Top", "Bottom", "Start", "End", "Fade", "ScaleXY", "ScaleX", "ScaleY").random()
+                    inAnimation = ViewTools.switchViewInAnima(effect, interpolator, duration)
+                    outAnimation = ViewTools.switchViewOutAnima(effect, duration)
                 }
                 width = getLyricWidth(paint, lyric)
                 if (config.dynamicLyricSpeed && delay == 0) {
@@ -479,9 +481,11 @@ class SystemUILyric : BaseHook() {
                     setBackgroundColor(Color.parseColor(config.lyricBackgroundColor))
                 }
                 val animation = config.animation
+                val interpolator = config.interpolator
+                val duration = config.animationDuration
                 if (animation != "Random") {
-                    inAnimation = ViewTools.switchViewInAnima(animation)
-                    outAnimation = ViewTools.switchViewOutAnima(animation)
+                    inAnimation = ViewTools.switchViewInAnima(animation, interpolator, duration)
+                    outAnimation = ViewTools.switchViewOutAnima(animation, duration)
                 }
                 runCatching {
                     val file = File("${context.filesDir.path}/font")

app/src/main/java/statusbar/lyric/tools/ViewTools.kt

@@ -4,9 +4,15 @@ import android.animation.ArgbEvaluator
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.view.View
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.AccelerateInterpolator
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.AnimationSet
+import android.view.animation.BounceInterpolator
+import android.view.animation.DecelerateInterpolator
+import android.view.animation.LinearInterpolator
+import android.view.animation.OvershootInterpolator
 import android.view.animation.ScaleAnimation
 import android.view.animation.TranslateAnimation
 import android.widget.ImageView
@@ -22,40 +28,57 @@ object ViewTools {
         }
     }
 
-    fun switchViewInAnima(str: String?): Animation? {
-        val translateAnimation: Animation = when (str) {
+    fun switchViewInAnima(str: String?, interpolator: String?, time: Int?): Animation? {
+        val t = time?.toLong() ?: 500L
+        val translateAnimation: Animation? = when (str) {
             "Top" -> TranslateAnimation(0F, 0F, 100F, 0F)
             "Bottom" -> TranslateAnimation(0F, 0F, -100F, 0F)
             "Start" -> TranslateAnimation(100F, 0F, 0F, 0F)
             "End" -> TranslateAnimation(-100F, 0F, 0F, 0F)
+            "Fade" -> null
             "ScaleXY" -> ScaleAnimation(0f, 1f, 0f, 1f)
             "ScaleX" -> ScaleAnimation(0f, 1f, 1f, 1f)
             "ScaleY" -> ScaleAnimation(1f, 1f, 0f, 1f)
             else -> return null
-        }.apply {
-            duration = 300
+        }?.apply {
+            duration = t
         }
-        return getAlphaAnimation(true).apply {
-            addAnimation(translateAnimation)
+        return getAlphaAnimation(true, t).apply {
+            translateAnimation?.let { addAnimation(it) }
+            switchInterpolator(interpolator)
         }
     }
 
 
-    fun switchViewOutAnima(str: String?): Animation? {
-        val translateAnimation: Animation = when (str) {
+    fun switchViewOutAnima(str: String?, time: Int?): Animation? {
+        val t = time?.toLong() ?: 500L
+        val translateAnimation: Animation? = when (str) {
             "Top" -> TranslateAnimation(0F, 0F, 0F, -100F)
             "Bottom" -> TranslateAnimation(0F, 0F, 0F, 100F)
             "Start" -> TranslateAnimation(0F, -100F, 0F, 0F)
             "End" -> TranslateAnimation(0F, 100F, 0F, 0F)
+            "Fade" -> null
             "ScaleXY" -> ScaleAnimation(1f, 0f, 1f, 0f)
             "ScaleX" -> ScaleAnimation(1f, 0f, 1f, 1f)
             "ScaleY" -> ScaleAnimation(1f, 1f, 1f, 0f)
             else -> return null
-        }.apply {
-            duration = 300
+        }?.apply {
+            duration = t
         }
-        return getAlphaAnimation(false).apply {
-            addAnimation(translateAnimation)
+        return getAlphaAnimation(false, t).apply {
+            translateAnimation?.let { addAnimation(it) }
+        }
+    }
+
+    private fun Animation.switchInterpolator(str: String?) {
+        interpolator = when (str) {
+            "Linear" -> LinearInterpolator()
+            "Accelerate" -> AccelerateInterpolator()
+            "Decelerate" -> DecelerateInterpolator()
+            "Accelerate&Decelerate" -> AccelerateDecelerateInterpolator()
+            "Overshoot" -> OvershootInterpolator()
+            "Bounce" -> BounceInterpolator()
+            else -> LinearInterpolator()
         }
     }
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -112,10 +112,20 @@
     <string name="lyrics_animation_bottom">下划效果</string>
     <string name="lyrics_animation_start">左划效果</string>
     <string name="lyrics_animation_end">右划效果</string>
+    <string name="lyrics_animation_fade">淡出淡入</string>
     <string name="lyrics_animation_scale_x_y">吸收效果</string>
     <string name="lyrics_animation_scale_x">X轴翻页</string>
     <string name="lyrics_animation_scale_y">Y轴翻页</string>
     <string name="lyrics_animation_random">随机效果</string>
+    <string name="lyrics_animation_interpolator">歌词动画插值器</string>
+    <string name="lyrics_interpolator_linear">线性效果</string>
+    <string name="lyrics_interpolator_accelerate">加速效果</string>
+    <string name="lyrics_interpolator_decelerate">减速效果</string>
+    <string name="lyrics_interpolator_accelerate_decelerate">加速+减速</string>
+    <string name="lyrics_interpolator_overshoot">越界效果</string>
+    <string name="lyrics_interpolator_bounce">弹跳效果</string>
+    <string name="lyrics_animation_duration">歌词动画时间</string>
+    <string name="lyric_animation_duration_tips">范围： 300~1000</string>
     <string name="lyric_add_location">* 歌词添加位置</string>
     <string name="add_location_start">靠左</string>
     <string name="add_location_end">靠右</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -112,10 +112,20 @@
     <string name="lyrics_animation_bottom">下滑效果</string>
     <string name="lyrics_animation_start">左劃效果</string>
     <string name="lyrics_animation_end">右劃效果</string>
+    <string name="lyrics_animation_fade">淡出淡入</string>
     <string name="lyrics_animation_scale_x_y">吸收效果</string>
     <string name="lyrics_animation_scale_x">X軸翻頁</string>
     <string name="lyrics_animation_scale_y">Y軸翻頁</string>
     <string name="lyrics_animation_random">隨機效果</string>
+    <string name="lyrics_animation_interpolator">歌詞動畫插值器</string>
+    <string name="lyrics_interpolator_linear">线性效果</string>
+    <string name="lyrics_interpolator_accelerate">加速效果</string>
+    <string name="lyrics_interpolator_decelerate">減速效果</string>
+    <string name="lyrics_interpolator_accelerate_decelerate">加速+減速</string>
+    <string name="lyrics_interpolator_overshoot">越界效果</string>
+    <string name="lyrics_interpolator_bounce">彈跳效果</string>
+    <string name="lyrics_animation_duration">歌詞動畫時間</string>
+    <string name="lyric_animation_duration_tips">範圍： 300~1000</string>
     <string name="lyric_add_location">* 歌詞添加位置</string>
     <string name="add_location_start">靠左</string>
     <string name="add_location_end">靠右</string>

app/src/main/res/values/strings.xml

@@ -113,10 +113,20 @@
     <string name="lyrics_animation_bottom">Bottom</string>
     <string name="lyrics_animation_start">Start</string>
     <string name="lyrics_animation_end">End</string>
+    <string name="lyrics_animation_fade">Fade</string>
     <string name="lyrics_animation_scale_x_y">ScaleXY</string>
     <string name="lyrics_animation_scale_x">ScaleX</string>
     <string name="lyrics_animation_scale_y">ScaleY</string>
     <string name="lyrics_animation_random">Random</string>
+    <string name="lyrics_animation_interpolator">Lyric Animation Interpolator</string>
+    <string name="lyrics_interpolator_linear">Linear</string>
+    <string name="lyrics_interpolator_accelerate">Accelerate</string>
+    <string name="lyrics_interpolator_decelerate">Decelerate</string>
+    <string name="lyrics_interpolator_accelerate_decelerate">Accelerate+Decelerate</string>
+    <string name="lyrics_interpolator_overshoot">Overshoot</string>
+    <string name="lyrics_interpolator_bounce">Bounce</string>
+    <string name="lyrics_animation_duration">Lyric Animation Duration</string>
+    <string name="lyric_animation_duration_tips">Range 300~1000</string>
     <string name="lyric_add_location">* Lyric Add Location</string>
     <string name="add_location_start">Start</string>
     <string name="add_location_end">End</string>