将 tv 播放器代码拆分到 :player:tv

Author: aaa1115910

app/build.gradle.kts

@@ -202,7 +202,6 @@ dependencies {
     implementation(androidx.webkit)
     implementation(libs.accompanist.systemuicontroller)
     implementation(libs.akdanmaku)
-    implementation(libs.androidSvg)
     implementation(libs.coil.compose)
     implementation(libs.coil.gif)
     implementation(libs.coil.svg)
@@ -231,6 +230,7 @@ dependencies {
     implementation(project(mapOf("path" to ":bili-api")))
     implementation(project(mapOf("path" to ":bili-subtitle")))
     implementation(project(mapOf("path" to ":player")))
+    implementation(project(mapOf("path" to ":utils")))
     testImplementation(androidx.room.testing)
     testImplementation(libs.kotlin.test)
     androidTestImplementation(androidx.compose.ui.test.junit4)

app/src/main/AndroidManifest.xml

@@ -127,12 +127,6 @@
             android:exported="false"
             android:label="@string/title_activity_favorite"
             android:theme="@style/Theme.BV" />
-        <activity
-            android:name=".activities.video.VideoPlayerActivity"
-            android:enableOnBackInvokedCallback="false"
-            android:exported="false"
-            android:label="@string/title_activity_video_player"
-            android:theme="@style/Theme.BV" />
         <activity
             android:name=".activities.video.UpInfoActivity"
             android:enableOnBackInvokedCallback="false"

app/src/main/kotlin/dev/aaa1115910/bv/BVApp.kt

@@ -14,12 +14,12 @@ import dev.aaa1115910.biliapi.repositories.ChannelRepository
 import dev.aaa1115910.biliapi.repositories.CommentRepository
 import dev.aaa1115910.biliapi.repositories.FavoriteRepository
 import dev.aaa1115910.biliapi.repositories.HistoryRepository
-import dev.aaa1115910.biliapi.repositories.ToViewRepository
 import dev.aaa1115910.biliapi.repositories.LoginRepository
 import dev.aaa1115910.biliapi.repositories.PgcRepository
 import dev.aaa1115910.biliapi.repositories.RecommendVideoRepository
 import dev.aaa1115910.biliapi.repositories.SearchRepository
 import dev.aaa1115910.biliapi.repositories.SeasonRepository
+import dev.aaa1115910.biliapi.repositories.ToViewRepository
 import dev.aaa1115910.biliapi.repositories.UgcRepository
 import dev.aaa1115910.biliapi.repositories.VideoDetailRepository
 import dev.aaa1115910.biliapi.repositories.VideoPlayRepository
@@ -36,7 +36,6 @@ import dev.aaa1115910.bv.screen.user.UserSwitchViewModel
 import dev.aaa1115910.bv.util.FirebaseUtil
 import dev.aaa1115910.bv.util.LogCatcherUtil
 import dev.aaa1115910.bv.util.Prefs
-import dev.aaa1115910.bv.viewmodel.PlayerViewModel
 import dev.aaa1115910.bv.viewmodel.TagViewModel
 import dev.aaa1115910.bv.viewmodel.UserViewModel
 import dev.aaa1115910.bv.viewmodel.VideoPlayerV3ViewModel
@@ -177,7 +176,6 @@ val appModule = module {
     viewModel { PopularViewModel(get()) }
     viewModel { AppQrLoginViewModel(get(), get()) }
     viewModel { SmsLoginViewModel(get(), get()) }
-    viewModel { PlayerViewModel(get()) }
     viewModel { UserViewModel(get()) }
     viewModel { HistoryViewModel(get(), get()) }
     viewModel { ToViewViewModel(get(), get()) }

app/src/main/kotlin/dev/aaa1115910/bv/activities/video/VideoPlayerActivity.kt

@@ -27,7 +27,9 @@ import androidx.tv.material3.Text
 import dev.aaa1115910.biliapi.entity.pgc.PgcType
 import dev.aaa1115910.biliapi.entity.ugc.UgcType
 import dev.aaa1115910.bv.BVApp
+import dev.aaa1115910.bv.util.createCustomInitialFocusRestorerModifiers
 import dev.aaa1115910.bv.util.getDisplayName
+import dev.aaa1115910.bv.util.ifElse
 
 @Composable
 fun TopNav(