Merge branch 'refs/heads/develop' into feature/mobile

# Conflicts:
#	app/src/main/kotlin/dev/aaa1115910/bv/viewmodel/home/RecommendViewModel.kt
#	gradle/androidx.versions.toml

Author: aaa1115910

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -52,8 +52,8 @@ body:
     attributes:
       label: 请确认已更新到以下所示的最新版本
       description: |
-        ![App Center Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2F%3Ftype%3Drelease)
-        ![App Center Alpha](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2F%3Ftype%3Dalpha)
+        ![GitHub Release Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2Fgithub%3Fprerelease%3Dfalse)
+        ![GitHub Release Pre-Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2Fgithub%3Fprerelease%3Dtrue)
       options:
         - '我正在使用旧版本'
         - '已更新到最新 Release 版'

.github/workflows/alpha.yml

@@ -25,6 +25,11 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
+      - name: Setup Gradle to generate and submit dependency graphs
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          dependency-graph: generate-and-submit
+
       - name: Write google-services.json
         env:
           DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}

.idea/kotlinc.xml

@@ -6,12 +6,12 @@
 
 ~~Bug Video~~
 
-[![App Center Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2F%3Ftype%3Drelease)](https://install.appcenter.ms/users/aaa1115910-gmail.com/apps/bv/distribution_groups/public)
-[![App Center Alpha](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2F%3Ftype%3Dalpha)](https://install.appcenter.ms/users/aaa1115910-gmail.com/apps/bv/distribution_groups/alpha)
+[![GitHub Release Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2Fgithub%3Fprerelease%3Dfalse)](https://github.com/aaa1115910/bv/releases?q=prerelease%3Afalse)
+[![GitHub Release Pre-Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2Fgithub%3Fprerelease%3Dtrue)](https://github.com/aaa1115910/bv/releases?q=prerelease%3Atrue)
 
 [![Workflow Release](https://github.com/aaa1115910/bv/actions/workflows/release.yml/badge.svg)](https://github.com/aaa1115910/bv/actions/workflows/release.yml)
 [![Workflow Alpha](https://github.com/aaa1115910/bv/actions/workflows/alpha.yml/badge.svg)](https://github.com/aaa1115910/bv/actions/workflows/alpha.yml)
-[![Android Sdk Require](https://img.shields.io/badge/android-5.0%2B-informational)](https://developer.android.com/jetpack/compose/interop/adding#:~:text=minimum%20API%20level%20to%2021%20or%20higher%2C)
+[![Android Sdk Require](https://img.shields.io/badge/Android-5.0%2B-informational?logo=android)](https://apilevels.com/#:~:text=Jetpack%20Compose%20requires%20a%20minSdk%20of%2021%20or%20higher)
 [![GitHub](https://img.shields.io/github/license/aaa1115910/bv)](https://github.com/aaa1115910/bv)
 
 **BV 不支持在中国大陆地区内的智能电视上使用，如有相关使用需求请使用 [云视听小电视](https://app.bilibili.com)**
@@ -36,13 +36,11 @@ BV ~~(Bug Video)~~ 是一款 [哔哩哔哩](https://www.bilibili.com) 的第三
 
 ### Release
 
-- [Github Actions](https://github.com/aaa1115910/bv/actions/workflows/release.yml)
-- [AppCenter](https://install.appcenter.ms/users/aaa1115910-gmail.com/apps/bv/distribution_groups/public)
+- [Github Release](https://github.com/aaa1115910/bv/releases?q=prerelease%3Afalse)
 
 ### Alpha
 
-- [Github Actions](https://github.com/aaa1115910/bv/actions/workflows/alpha.yml)
-- [AppCenter](https://install.appcenter.ms/users/aaa1115910-gmail.com/apps/bv/distribution_groups/alpha)
+- [Github Release](https://github.com/aaa1115910/bv/releases?q=prerelease%3Atrue)
 
 ## License
 

README.md

@@ -7,6 +7,7 @@ import java.util.Properties
 
 plugins {
     alias(gradleLibs.plugins.android.application)
+    alias(gradleLibs.plugins.compose.compiler)
     alias(gradleLibs.plugins.firebase.crashlytics)
     alias(gradleLibs.plugins.google.ksp)
     alias(gradleLibs.plugins.google.services)
@@ -106,9 +107,6 @@ android {
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = androidx.compose.compiler.get().version
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

app/build.gradle.kts

@@ -101,4 +101,14 @@
 -dontwarn com.google.protobuf.GeneratedMessageV3$BuilderParent
 -dontwarn com.google.protobuf.GeneratedMessageV3$FieldAccessorTable
 -dontwarn com.google.protobuf.GeneratedMessageV3
--dontwarn com.google.protobuf.RepeatedFieldBuilderV3
+-dontwarn com.google.protobuf.RepeatedFieldBuilderV3
+
+# bv
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn dev.aaa1115910.bv.player.AbstractVideoPlayer
+-dontwarn dev.aaa1115910.bv.player.BvVideoPlayerKt
+-dontwarn dev.aaa1115910.bv.player.VideoPlayerListener
+-dontwarn dev.aaa1115910.bv.player.VideoPlayerOptions
+-dontwarn dev.aaa1115910.bv.player.impl.exo.ExoMediaPlayer
+-dontwarn dev.aaa1115910.bv.player.impl.exo.ExoPlayerFactory

app/proguard-rules.pro

@@ -17,6 +17,10 @@
         android:name="android.hardware.wifi"
         android:required="false" />
 
+    <queries>
+        <package android:name="tw.com.gamer.android.animad" />
+    </queries>
+
     <application
         android:name=".BVApp"
         android:allowBackup="true"

app/src/main/AndroidManifest.xml

@@ -19,8 +19,8 @@ class RemoteControllerPanelDemoActivity : ComponentActivity() {
     companion object {
         fun actionStart(
             context: Context,
-            avid: Int,
-            cid: Int,
+            avid: Long,
+            cid: Long,
             title: String,
             partTitle: String,
             played: Int,
@@ -70,8 +70,8 @@ fun RemoteControllerPanelDemoScreen(
         Prefs.showedRemoteControllerPanelDemo = true
         VideoPlayerV3Activity.actionStart(
             context = context,
-            avid = intent.getIntExtra("avid", 0),
-            cid = intent.getIntExtra("cid", 0),
+            avid = intent.getLongExtra("avid", 0),
+            cid = intent.getLongExtra("cid", 0),
             title = intent.getStringExtra("title") ?: "",
             partTitle = intent.getStringExtra("partTitle") ?: "",
             played = intent.getIntExtra("played", 0),

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

@@ -12,7 +12,7 @@ import dev.aaa1115910.bv.ui.theme.BVTheme
 class VideoInfoActivity : ComponentActivity() {
     companion object {
         fun actionStart(
-            context: Context, aid: Int,
+            context: Context, aid: Long,
             fromSeason: Boolean = false,
             proxyArea: ProxyArea = ProxyArea.MainLand
         ) {

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

@@ -13,7 +13,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.media3.exoplayer.ExoPlayer
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Text
 import dev.aaa1115910.bv.R
 import dev.aaa1115910.bv.screen.VideoPlayerScreen
@@ -28,8 +27,8 @@ class VideoPlayerActivity : ComponentActivity() {
         private val logger = KotlinLogging.logger { }
         fun actionStart(
             context: Context,
-            avid: Int,
-            cid: Int,
+            avid: Long,
+            cid: Long,
             title: String,
             partTitle: String,
             played: Int,
@@ -56,7 +55,6 @@ class VideoPlayerActivity : ComponentActivity() {
 
     private val playerViewModel: PlayerViewModel by viewModel()
 
-    @OptIn(ExperimentalTvMaterial3Api::class)
     @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -70,8 +68,8 @@ class VideoPlayerActivity : ComponentActivity() {
         playerViewModel.preparePlayer(player)
 
         if (intent.hasExtra("avid")) {
-            val aid = intent.getIntExtra("avid", 170001)
-            val cid = intent.getIntExtra("cid", 170001)
+            val aid = intent.getLongExtra("avid", 170001)
+            val cid = intent.getLongExtra("cid", 170001)
             val title = intent.getStringExtra("title") ?: "Unknown Title"
             val partTitle = intent.getStringExtra("partTitle") ?: "Unknown Part Title"
             val played = intent.getIntExtra("played", 0)