Skip to content

Commit 19b9dba

Browse files
committed
[build|chore] Update dependencies; clean code
1 parent d508097 commit 19b9dba

File tree

5 files changed

+35
-172
lines changed

5 files changed

+35
-172
lines changed

app/build.gradle.kts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
minSdk = 24
2323
targetSdk = 34
2424
versionCode = 18
25-
versionName = "1.1-beta48"
25+
versionName = "1.1-beta49"
2626

2727
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2828

@@ -163,16 +163,16 @@ dependencies {
163163
implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
164164
implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
165165
implementation("androidx.navigation:navigation-compose:2.7.7")
166-
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.1")
167-
implementation("androidx.compose.ui:ui:1.7.0-beta01")
168-
implementation("androidx.compose.material:material:1.7.0-beta01")
169-
implementation("androidx.compose.material3:material3:1.3.0-beta01")
170-
implementation("androidx.compose.material3:material3-window-size-class:1.3.0-beta01")
171-
implementation("androidx.compose.material3.adaptive:adaptive:1.0.0-beta01")
172-
implementation("androidx.compose.material3.adaptive:adaptive-layout:1.0.0-beta01")
173-
implementation("androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-beta01")
174-
implementation("androidx.compose.material:material-icons-extended:1.6.7")
175-
implementation("com.materialkolor:material-kolor:1.6.2")
166+
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.3")
167+
implementation("androidx.compose.ui:ui:1.7.0-beta04")
168+
implementation("androidx.compose.material:material:1.7.0-beta04")
169+
implementation("androidx.compose.material3:material3:1.3.0-beta04")
170+
implementation("androidx.compose.material3:material3-window-size-class:1.3.0-beta04")
171+
implementation("androidx.compose.material3.adaptive:adaptive:1.0.0-beta04")
172+
implementation("androidx.compose.material3.adaptive:adaptive-layout:1.0.0-beta04")
173+
implementation("androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-beta04")
174+
implementation("androidx.compose.material:material-icons-extended:1.6.8")
175+
implementation("com.materialkolor:material-kolor:1.7.0")
176176
implementation("androidx.room:room-runtime:2.6.1")
177177
implementation("androidx.room:room-ktx:2.6.1")
178178
implementation("androidx.room:room-paging:2.6.1")
@@ -196,7 +196,7 @@ dependencies {
196196
implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
197197
implementation("com.squareup.retrofit2:retrofit:2.11.0")
198198
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
199-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
199+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
200200
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1")
201201

202202
implementation("com.github.aniyomiorg:aniyomi-mpv-lib:1.15.n")
@@ -219,6 +219,6 @@ dependencies {
219219

220220
// debugImplementation("com.squareup.leakcanary:leakcanary-android:2.13")
221221
testImplementation("junit:junit:4.13.2")
222-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
223-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
222+
androidTestImplementation("androidx.test.ext:junit:1.2.1")
223+
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
224224
}

app/src/main/java/com/skyd/anivu/ui/component/Dialog.kt

Lines changed: 0 additions & 158 deletions
This file was deleted.

app/src/main/java/com/skyd/anivu/ui/mpv/controller/PlayerController.kt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package com.skyd.anivu.ui.mpv.controller
22

3+
import android.content.Context
4+
import android.os.Build
5+
import android.os.Vibrator
6+
import android.os.VibratorManager
37
import androidx.compose.animation.AnimatedVisibility
48
import androidx.compose.animation.core.Spring
59
import androidx.compose.animation.core.spring
@@ -28,10 +32,12 @@ import androidx.compose.ui.geometry.Offset
2832
import androidx.compose.ui.graphics.Color
2933
import androidx.compose.ui.layout.LayoutCoordinates
3034
import androidx.compose.ui.layout.onGloballyPositioned
35+
import androidx.compose.ui.platform.LocalContext
3136
import androidx.compose.ui.platform.LocalView
3237
import androidx.compose.ui.unit.dp
3338
import androidx.constraintlayout.compose.ConstraintLayout
3439
import androidx.core.view.WindowInsetsControllerCompat
40+
import com.skyd.anivu.ext.tickVibrate
3541
import com.skyd.anivu.ui.component.rememberSystemUiController
3642
import com.skyd.anivu.ui.local.LocalPlayerShow85sButton
3743
import com.skyd.anivu.ui.local.LocalPlayerShowScreenshotButton
@@ -80,6 +86,7 @@ internal fun PlayerController(
8086
var controllerHeight by remember { mutableIntStateOf(0) }
8187
var controllerLayoutCoordinates by remember { mutableStateOf<LayoutCoordinates?>(null) }
8288

89+
val context = LocalContext.current
8390
val view = LocalView.current
8491
val autoHideControllerRunnable = remember { Runnable { showController = false } }
8592
val cancelAutoHideControllerRunnable = { view.removeCallbacks(autoHideControllerRunnable) }
@@ -229,6 +236,18 @@ internal fun PlayerController(
229236
}
230237
// Long press speed preview
231238
if (isLongPressing) {
239+
LaunchedEffect(Unit) {
240+
if (isLongPressing) {
241+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
242+
val vibratorManager =
243+
context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager
244+
vibratorManager.defaultVibrator
245+
} else {
246+
@Suppress("DEPRECATION")
247+
context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
248+
}.tickVibrate()
249+
}
250+
}
232251
LongPressSpeedPreview(speed = { playState().speed })
233252
}
234253

app/src/main/java/com/skyd/anivu/ui/mpv/controller/preview/LongPressSpeedPreview.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@ internal fun BoxScope.LongPressSpeedPreview(speed: () -> Float) {
4949
fontSize = TextUnit(18f, TextUnitType.Sp),
5050
color = Color.White,
5151
)
52+
Spacer(modifier = Modifier.width(6.dp))
5253
}
5354
}

app/src/main/java/com/skyd/anivu/ui/theme/Theme.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ fun AniVuTheme(
5656
value = ThemePreference.values[0],
5757
),
5858
isDark = darkTheme,
59+
isAmoled = false,
5960
)
6061
}
6162
},

0 commit comments

Comments
 (0)