Sg/wizard with steps

app/shared/app-data/src/commonMain/kotlin/data/models/preference/ThemeSettings.kt

@@ -14,8 +14,7 @@ import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-
-val DEFAULT_SEED_COLOR = Color(0xFF4F378B)
+import me.him188.ani.app.ui.theme.DefaultSeedColor
 
 @Serializable
 enum class DarkMode {
@@ -29,13 +28,13 @@ data class ThemeSettings(
     val useDynamicTheme: Boolean = false, // only supported on Android with Build.VERSION.SDK_INT >= 31
     // TODO: Default "true" if supported (on Android, Build.VERSION.SDK_INT >= 31)
     val useBlackBackground: Boolean = false,
-    val seedColorValue: ULong = DEFAULT_SEED_COLOR.value,
+    val seedColorValue: ULong = DefaultSeedColor.value,
     @Suppress("PropertyName") @Transient val _placeholder: Int = 0,
 ) {
     @Transient
     val seedColor: Color = Color(seedColorValue).let {
         // 4.4.0-alpha01 的默认是 Color.Unspecified, 4.4.0-alpha02 默认是 DEFAULT_SEED_COLOR. 所以要替换一下
-        if (it == Color.Unspecified) DEFAULT_SEED_COLOR else it
+        if (it == Color.Unspecified) DefaultSeedColor else it
     }
 
     companion object {

app/shared/app-data/src/commonMain/kotlin/domain/settings/ProxyProvider.kt

@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.isActive
 import me.him188.ani.app.data.models.preference.ProxyConfig
 import me.him188.ani.app.data.models.preference.ProxyMode
+import me.him188.ani.app.data.models.preference.ProxySettings
 import me.him188.ani.app.data.repository.user.SettingsRepository
 import me.him188.ani.app.domain.media.fetch.toClientProxyConfig
 import me.him188.ani.app.platform.SystemProxyDetector
@@ -87,9 +88,16 @@ class SystemProxyProvider(
 class SettingsBasedProxyProvider(
     private val settingsRepository: SettingsRepository,
     backgroundScope: CoroutineScope,
+) : ProxyProvider by ProxySettingsFlowProxyProvider(
+    settingsRepository.proxySettings.flow, backgroundScope,
+)
+
+class ProxySettingsFlowProxyProvider(
+    private val flow: Flow<ProxySettings>,
+    backgroundScope: CoroutineScope,
 ) : ProxyProvider {
     override val proxy: Flow<ProxyConfig?> by lazy {
-        settingsRepository.proxySettings.flow.map { it.default }
+        flow.map { it.default }
             .distinctUntilChanged()
             .transformLatest { settings ->
                 coroutineScope {
@@ -104,5 +112,4 @@ class SettingsBasedProxyProvider(
             }
             .shareIn(backgroundScope, started = SharingStarted.WhileSubscribed(), replay = 1)
     }
-
 }

app/shared/app-platform/src/commonMain/kotlin/platform/PermissionManager.kt

@@ -1,19 +1,51 @@
+/*
+ * Copyright (C) 2024-2025 OpenAni and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link.
+ *
+ * https://github.com/open-ani/ani/blob/main/LICENSE
+ */
+
 package me.him188.ani.app.platform
 
 interface PermissionManager {
+    /**
+     * 检查应用是否有通知权限
+     */
+    fun checkNotificationPermission(context: ContextMP): Boolean
+
+    /**
+     * 请求应用通知权限
+     *
+     * @return `true` 成功授权, `false` 拒绝授权或保持现状
+     */
     suspend fun requestNotificationPermission(context: ContextMP): Boolean
 
+    /**
+     * 打开系统设置手动授权通知权限
+     */
+    fun openSystemNotificationSettings(context: ContextMP)
+
     /**
      * Android only. 请求一个完全授予可读写权限的外部共享空间路径，返回其 URL string
      */
     suspend fun requestExternalDocumentTree(context: ContextMP): String?
 }
 
 object GrantedPermissionManager : PermissionManager {
+    override fun checkNotificationPermission(context: ContextMP): Boolean {
+        return true
+    }
+
     override suspend fun requestNotificationPermission(context: ContextMP): Boolean {
         return true
     }
 
+    override fun openSystemNotificationSettings(context: ContextMP) {
+
+    }
+
     override suspend fun requestExternalDocumentTree(context: ContextMP): String? {
         return null
     }

app/shared/app-platform/src/commonMain/kotlin/ui/theme/Color.kt

@@ -0,0 +1,22 @@
+@file:JvmName("ColorKt_platform")
+/*
+ * Copyright (C) 2024-2025 OpenAni and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link.
+ *
+ * https://github.com/open-ani/ani/blob/main/LICENSE
+ */
+
+package me.him188.ani.app.ui.theme
+
+import androidx.compose.ui.graphics.Color
+import kotlin.jvm.JvmName
+
+// region Note: You should only add UI properties when it is accessed both `ui-foundation` and `app-data`
+
+val DefaultSeedColor = Color(0xFF4F378B)
+val AnimekoIconColor = Color(0, 88, 160)
+val BangumiNextIconColor = Color(240, 145, 153)
+
+// endregion

app/shared/application/src/androidMain/kotlin/platform/AndroidPermissionManager.kt

@@ -1,23 +1,51 @@
+/*
+ * Copyright (C) 2024-2025 OpenAni and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link.
+ *
+ * https://github.com/open-ani/ani/blob/main/LICENSE
+ */
+
 package me.him188.ani.app.platform
 
 import android.Manifest
+import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Build
+import android.provider.Settings
+import androidx.core.app.NotificationManagerCompat
 import me.him188.ani.utils.logging.info
 import me.him188.ani.utils.logging.logger
 
 class AndroidPermissionManager : PermissionManager {
     private val logger = logger<AndroidPermissionManager>()
+
+    override fun checkNotificationPermission(context: ContextMP): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return true
+        val activity = context.findActivity() as? BaseComponentActivity ?: return false
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            activity.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) ==
+                    PackageManager.PERMISSION_GRANTED
+        } else {
+            NotificationManagerCompat.from(activity).areNotificationsEnabled()
+        }
+    }
+
     override suspend fun requestNotificationPermission(context: ContextMP): Boolean {
         // To send notifications on API levels below 32, you don't need to request the POST_NOTIFICATIONS permission,
         // as it is only required for API level 33 (Android 13) and above.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return true
-
-        return requestPermission(context, Manifest.permission.POST_NOTIFICATIONS)
+        val activity = context.findActivity() as? BaseComponentActivity ?: return false
+        return activity.requestPermission(Manifest.permission.POST_NOTIFICATIONS)
     }
 
-    private suspend fun requestPermission(context: ContextMP, permission: String): Boolean {
-        val activity = context.findActivity() as? BaseComponentActivity ?: return false
-        return activity.requestPermission(permission)
+    override fun openSystemNotificationSettings(context: ContextMP) {
+        val openSystemNotificationIntent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+        }
+        context.startActivity(openSystemNotificationIntent)
     }
 
     override suspend fun requestExternalDocumentTree(context: ContextMP): String? {

app/shared/src/androidUnitTest/kotlin/ui/settings/tabs/media/AndroidTorrentCacheViewModelTest.kt

@@ -1,3 +1,12 @@
+/*
+ * Copyright (C) 2024-2025 OpenAni and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link.
+ *
+ * https://github.com/open-ani/ani/blob/main/LICENSE
+ */
+
 package me.him188.ani.app.ui.settings.tabs.media
 
 import android.content.Context
@@ -208,6 +217,14 @@ private fun createTestPermissionManager(
     return object : PermissionManager {
         var requested = false
 
+        override fun checkNotificationPermission(context: ContextMP): Boolean {
+            error("unreachable test")
+        }
+
+        override fun openSystemNotificationSettings(context: ContextMP) {
+            error("unreachable test")
+        }
+
         override suspend fun requestNotificationPermission(context: ContextMP): Nothing {
             error("unreachable test")
         }

app/shared/src/desktopTest/kotlin/ui/wizard/navigation/WizardNavHostTest.kt

@@ -9,7 +9,6 @@
 
 package me.him188.ani.app.ui.wizard.navigation
 
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -51,29 +50,6 @@ class WizardNavHostTest {
         WizardNavHost(
             wizardController,
             modifier = Modifier.fillMaxSize(),
-            indicatorBar = {
-                WizardDefaults.StepTopAppBar(
-                    currentStep = it.currentStepIndex + 1,
-                    totalStep = it.stepCount,
-                    indicatorStepTextTestTag = TAG_INDICATOR_TEXT,
-                ) {
-                    it.currentStep.stepName.invoke()
-                }
-            },
-            controlBar = {
-                WizardDefaults.StepControlBar(
-                    forwardAction = {
-                        Box(Modifier.testTag(TAG_BUTTON_NEXT_STEP)) {
-                            it.currentStep.forwardButton.invoke()
-                        }
-                    },
-                    backwardAction = {
-                        Box(Modifier.testTag(TAG_BUTTON_PREV_STEP)) {
-                            it.currentStep.backwardButton.invoke()
-                        }
-                    },
-                )
-            },
         ) {
             step(
                 "step_1",

app/shared/ui-foundation/src/androidMain/kotlin/ui/foundation/theme/AppTheme.android.kt

@@ -13,7 +13,6 @@ import android.os.Build
 import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
@@ -23,7 +22,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import com.materialkolor.PaletteStyle
 import com.materialkolor.dynamicColorScheme
-import me.him188.ani.app.data.models.preference.DarkMode
 import me.him188.ani.app.platform.findActivity
 
 @Composable
@@ -57,13 +55,7 @@ actual fun appColorScheme(
 }
 
 @Composable
-fun SystemBarColorEffect(
-    isDark: Boolean = when (LocalThemeSettings.current.darkMode) {
-        DarkMode.LIGHT -> false
-        DarkMode.DARK -> true
-        DarkMode.AUTO -> isSystemInDarkTheme()
-    },
-) {
+actual fun SystemBarColorEffect(isDark: Boolean) {
     // Set statusBarStyle & navigationBarStyle
     val activity = LocalContext.current.findActivity() as? ComponentActivity
     if (activity != null) {

app/shared/ui-foundation/src/androidMain/kotlin/ui/theme/ColorButton.android.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024-2025 OpenAni and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link.
+ *
+ * https://github.com/open-ani/ani/blob/main/LICENSE
+ */
+
+package me.him188.ani.app.ui.theme
+
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.tooling.preview.Preview
+import me.him188.ani.app.ui.foundation.ProvideFoundationCompositionLocalsForPreview
+import me.him188.ani.app.ui.foundation.theme.AniThemeDefaults
+
+@Preview
+@Composable
+fun PreviewColorButton() {
+    ProvideFoundationCompositionLocalsForPreview {
+        FlowRow {
+            var currentColor by remember { mutableStateOf(AniThemeDefaults.themeColorOptions[0]) }
+            AniThemeDefaults.themeColorOptions.forEach {
+                me.him188.ani.app.ui.settings.tabs.theme.ColorButton(
+                    onClick = { currentColor = it },
+                    baseColor = it,
+                    selected = currentColor == it,
+                )
+            }
+        }
+    }
+}

app/shared/ui-foundation/src/androidMain/kotlin/ui/theme/ThemePreviewPanel.android.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024-2025 OpenAni and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link.
+ *
+ * https://github.com/open-ani/ani/blob/main/LICENSE
+ */
+
+package me.him188.ani.app.ui.theme
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import me.him188.ani.app.ui.foundation.ProvideFoundationCompositionLocalsForPreview
+import me.him188.ani.app.ui.foundation.theme.appColorScheme
+
+@Preview
+@Composable
+fun PreviewThemePreviewPanel() {
+    ProvideFoundationCompositionLocalsForPreview {
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            me.him188.ani.app.ui.settings.tabs.theme.ThemePreviewPanel(
+                colorScheme = appColorScheme(isDark = false),
+                modifier = Modifier.size(96.dp, 146.dp),
+            )
+            me.him188.ani.app.ui.settings.tabs.theme.ThemePreviewPanel(
+                colorScheme = appColorScheme(isDark = true),
+                modifier = Modifier.size(96.dp, 146.dp),
+            )
+            me.him188.ani.app.ui.settings.tabs.theme.DiagonalMixedThemePreviewPanel(
+                leftTopColorScheme = appColorScheme(isDark = false),
+                rightBottomColorScheme = appColorScheme(isDark = true),
+                modifier = Modifier.size(96.dp, 146.dp),
+            )
+        }
+    }
+}