[build|chore] Update dependencies; clean code

SkyD666 · Jul 3, 2024 · 19b9dba · 19b9dba
1 parent d508097
commit 19b9dba
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 172 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,7 +22,7 @@ android {
         minSdk = 24
         targetSdk = 34
         versionCode = 18
-        versionName = "1.1-beta48"
+        versionName = "1.1-beta49"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -163,16 +163,16 @@ dependencies {
     implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
     implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
     implementation("androidx.navigation:navigation-compose:2.7.7")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.1")
-    implementation("androidx.compose.ui:ui:1.7.0-beta01")
-    implementation("androidx.compose.material:material:1.7.0-beta01")
-    implementation("androidx.compose.material3:material3:1.3.0-beta01")
-    implementation("androidx.compose.material3:material3-window-size-class:1.3.0-beta01")
-    implementation("androidx.compose.material3.adaptive:adaptive:1.0.0-beta01")
-    implementation("androidx.compose.material3.adaptive:adaptive-layout:1.0.0-beta01")
-    implementation("androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-beta01")
-    implementation("androidx.compose.material:material-icons-extended:1.6.7")
-    implementation("com.materialkolor:material-kolor:1.6.2")
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.3")
+    implementation("androidx.compose.ui:ui:1.7.0-beta04")
+    implementation("androidx.compose.material:material:1.7.0-beta04")
+    implementation("androidx.compose.material3:material3:1.3.0-beta04")
+    implementation("androidx.compose.material3:material3-window-size-class:1.3.0-beta04")
+    implementation("androidx.compose.material3.adaptive:adaptive:1.0.0-beta04")
+    implementation("androidx.compose.material3.adaptive:adaptive-layout:1.0.0-beta04")
+    implementation("androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-beta04")
+    implementation("androidx.compose.material:material-icons-extended:1.6.8")
+    implementation("com.materialkolor:material-kolor:1.7.0")
     implementation("androidx.room:room-runtime:2.6.1")
     implementation("androidx.room:room-ktx:2.6.1")
     implementation("androidx.room:room-paging:2.6.1")
@@ -196,7 +196,7 @@ dependencies {
     implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1")
 
     implementation("com.github.aniyomiorg:aniyomi-mpv-lib:1.15.n")
@@ -219,6 +219,6 @@ dependencies {
 
 //    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.13")
     testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 }
diff --git a/app/src/main/java/com/skyd/anivu/ui/component/Dialog.kt b/app/src/main/java/com/skyd/anivu/ui/component/Dialog.kt
diff --git a/app/src/main/java/com/skyd/anivu/ui/mpv/controller/PlayerController.kt b/app/src/main/java/com/skyd/anivu/ui/mpv/controller/PlayerController.kt
@@ -1,5 +1,9 @@
 package com.skyd.anivu.ui.mpv.controller
 
+import android.content.Context
+import android.os.Build
+import android.os.Vibrator
+import android.os.VibratorManager
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
@@ -28,10 +32,12 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.core.view.WindowInsetsControllerCompat
+import com.skyd.anivu.ext.tickVibrate
 import com.skyd.anivu.ui.component.rememberSystemUiController
 import com.skyd.anivu.ui.local.LocalPlayerShow85sButton
 import com.skyd.anivu.ui.local.LocalPlayerShowScreenshotButton
@@ -80,6 +86,7 @@ internal fun PlayerController(
     var controllerHeight by remember { mutableIntStateOf(0) }
     var controllerLayoutCoordinates by remember { mutableStateOf<LayoutCoordinates?>(null) }
 
+    val context = LocalContext.current
     val view = LocalView.current
     val autoHideControllerRunnable = remember { Runnable { showController = false } }
     val cancelAutoHideControllerRunnable = { view.removeCallbacks(autoHideControllerRunnable) }
@@ -229,6 +236,18 @@ internal fun PlayerController(
             }
             // Long press speed preview
             if (isLongPressing) {
+                LaunchedEffect(Unit) {
+                    if (isLongPressing) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                            val vibratorManager =
+                                context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager
+                            vibratorManager.defaultVibrator
+                        } else {
+                            @Suppress("DEPRECATION")
+                            context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+                        }.tickVibrate()
+                    }
+                }
                 LongPressSpeedPreview(speed = { playState().speed })
             }
 

diff --git a/app/src/main/java/com/skyd/anivu/ui/mpv/controller/preview/LongPressSpeedPreview.kt b/app/src/main/java/com/skyd/anivu/ui/mpv/controller/preview/LongPressSpeedPreview.kt
@@ -49,5 +49,6 @@ internal fun BoxScope.LongPressSpeedPreview(speed: () -> Float) {
             fontSize = TextUnit(18f, TextUnitType.Sp),
             color = Color.White,
         )
+        Spacer(modifier = Modifier.width(6.dp))
     }
 }
diff --git a/app/src/main/java/com/skyd/anivu/ui/theme/Theme.kt b/app/src/main/java/com/skyd/anivu/ui/theme/Theme.kt
@@ -56,6 +56,7 @@ fun AniVuTheme(
                         value = ThemePreference.values[0],
                     ),
                     isDark = darkTheme,
+                    isAmoled = false,
                 )
             }
         },