chore: release v1.1.7

lanlinju · Apr 23, 2024 · ef8f8ae · ef8f8ae
1 parent aee8149
commit ef8f8ae
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "com.sakura.anime"
         minSdk = 26
         targetSdk = 34
-        versionCode = 17
-        versionName = "1.1.6"
+        versionCode = 18
+        versionName = "1.1.7"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/sakura/anime/MainActivity.kt b/app/src/main/java/com/sakura/anime/MainActivity.kt
@@ -28,7 +28,7 @@ import com.sakura.anime.presentation.navigation.Screen
 import com.sakura.anime.presentation.theme.AnimeTheme
 import com.sakura.anime.util.KEY_SOURCE_MODE
 import com.sakura.anime.util.SourceHolder
-import com.sakura.anime.util.SourceMode
+import com.sakura.anime.util.SourceHolder.DEFAULT_ANIME_SOURCE
 import com.sakura.anime.util.getEnum
 import com.sakura.anime.util.preferences
 import dagger.hilt.android.AndroidEntryPoint
@@ -41,7 +41,7 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
-        SourceHolder.setDefaultSource(preferences.getEnum(KEY_SOURCE_MODE, SourceMode.Yhdm))
+        SourceHolder.setDefaultSource(preferences.getEnum(KEY_SOURCE_MODE, DEFAULT_ANIME_SOURCE))
 
         setContent {
             AnimeTheme {

diff --git a/...src/main/java/com/sakura/anime/presentation/screen/downloaddetail/DownloadDetailScreen.kt b/...src/main/java/com/sakura/anime/presentation/screen/downloaddetail/DownloadDetailScreen.kt
@@ -47,6 +47,7 @@ import com.sakura.anime.presentation.component.StateHandler
 import com.sakura.anime.util.CROSSFADE_DURATION
 import com.sakura.anime.util.KEY_FROM_LOCAL_VIDEO
 import com.sakura.anime.util.LOW_CONTENT_ALPHA
+import com.sakura.anime.util.SourceHolder.DEFAULT_ANIME_SOURCE
 import com.sakura.anime.util.SourceMode
 import com.sakura.anime.util.VIDEO_ASPECT_RATIO
 import com.sakura.download.Progress
@@ -123,7 +124,10 @@ fun DownloadDetailScreen(
                                         val params =
                                             "$KEY_FROM_LOCAL_VIDEO:${detailUrl}:${title}:${episodeName}"
 
-                                        onNavigateToVideoPlay(Uri.encode(params), SourceMode.Yhdm)
+                                        onNavigateToVideoPlay(
+                                            Uri.encode(params),
+                                            DEFAULT_ANIME_SOURCE
+                                        )
                                     }
 
                                     state.isStarted() -> state.stop()

diff --git a/app/src/main/java/com/sakura/anime/presentation/screen/week/WeekScreen.kt b/app/src/main/java/com/sakura/anime/presentation/screen/week/WeekScreen.kt
@@ -80,6 +80,7 @@ import com.sakura.anime.util.GITHUB_ADDRESS
 import com.sakura.anime.util.KEY_ENABLE_AUTO_ORIENTATION
 import com.sakura.anime.util.KEY_SOURCE_MODE
 import com.sakura.anime.util.SourceHolder
+import com.sakura.anime.util.SourceHolder.DEFAULT_ANIME_SOURCE
 import com.sakura.anime.util.SourceMode
 import com.sakura.anime.util.TABS
 import com.sakura.anime.util.rememberPreference
@@ -372,7 +373,7 @@ private fun LoadingIndicationDialog() {
 private fun SwitchSourceDialog(
     onDismissRequest: (Boolean) -> Unit,
 ) {
-    var currentSourceMode by rememberPreference(KEY_SOURCE_MODE, SourceMode.Yhdm)
+    var currentSourceMode by rememberPreference(KEY_SOURCE_MODE, DEFAULT_ANIME_SOURCE)
 
     val radioOptions = SourceMode.values().map { it.name }
     val (selectedOption, onOptionSelected) = remember { mutableStateOf(currentSourceMode.name) }

diff --git a/app/src/main/java/com/sakura/anime/util/SourceHolder.kt b/app/src/main/java/com/sakura/anime/util/SourceHolder.kt
@@ -12,6 +12,11 @@ object SourceHolder {
     private lateinit var _currentSource: AnimeSource
     private lateinit var _currentSourceMode: SourceMode
 
+    /**
+     * 默认动漫源
+     */
+    val DEFAULT_ANIME_SOURCE = SourceMode.Silisili
+
     val currentSource: AnimeSource
         get() = _currentSource
 

diff --git a/app/src/main/java/com/sakura/anime/util/SourceMode.kt b/app/src/main/java/com/sakura/anime/util/SourceMode.kt
@@ -1,8 +1,8 @@
 package com.sakura.anime.util
 
 enum class SourceMode {
-    Yhdm,
     Silisili,
+    Yhdm,
     Agedm,
     Anfuns,
     Girigiri,