feat: 引入 miuix 双主题 UI（KMP commonMain，与 Material 3 页面级分流）

.github/workflows/other-branches-test.yml

@@ -19,6 +19,13 @@ jobs:
       - name: Set repository name as env variable
         run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
 
+      # 先装 21 再装 17：JAVA_HOME 最终指向 17（项目工具链），21 留给 :shared:jvmTest 用。
+      # latex-* 依赖发布的是 class file 65 的字节码，17 的运行时加载不了。
+      - name: Set Up JDK 21 for jvmTest
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
       - name: Set Up JDK
         uses: actions/setup-java@v4
         with:
@@ -57,8 +64,14 @@ jobs:
       # Run Tests Build
       - name: Run KtLint
         run: ./gradlew ktlintCheck
+      # `test` 是 JVM 插件的生命周期任务，不含 KMP 的 jvmTest，shared 的单元测试一直没在 CI 跑过。
+      # 插桩测试源码同理没有任何编译覆盖，这里只编译不执行（执行需要模拟器）。
       - name: Run gradle tests
-        run: ./gradlew test
+        run: |
+          ./gradlew test
+          ./gradlew :shared:jvmTest -Porg.gradle.java.installations.fromEnv=JAVA_HOME_21_X64
+      - name: Compile instrumented test sources
+        run: ./gradlew compileLiteDebugAndroidTestKotlin compileFullDebugAndroidTestKotlin
       - name: Build App
         # Build .apk
         run: |

.gitignore

@@ -59,6 +59,9 @@ __pycache__/
 app/lite
 app/full
 
+# IDE / build output
+bin/
+
 # Local replay corpus contains complete third-party Zhihu responses.
 shared/src/jvmTest/resources/zhihu-formula-corpus/raw/
 tools/zhihu-formula-corpus/

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

app/build.gradle.kts

@@ -149,6 +149,11 @@ android {
 //                    "META-INF/*.kotlin_module",
                 )
         }
+        dex {
+            // minSdk ≥ 28 时 AGP 默认不压缩 dex（设备上可 mmap，但 APK 体积翻倍）。
+            // 本应用走 Telegram 侧载分发，下载体积优先 → 强制压缩 dex（APK 减半，仅首次安装略慢）。
+            useLegacyPackaging = true
+        }
     }
 
     androidComponents {
@@ -266,4 +271,12 @@ dependencies {
     androidTestImplementation("androidx.test.ext:junit:1.3.0")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
     androidTestImplementation("io.ktor:ktor-client-mock:$ktor")
+
+    // ===== miuix 0.9.3 =====
+    val miuixVersion = "0.9.3"
+    implementation("top.yukonga.miuix.kmp:miuix-core-android:$miuixVersion")
+    implementation("top.yukonga.miuix.kmp:miuix-ui-android:$miuixVersion")
+    implementation("top.yukonga.miuix.kmp:miuix-preference-android:$miuixVersion")
+    implementation("top.yukonga.miuix.kmp:miuix-icons-android:$miuixVersion")
+    implementation("top.yukonga.miuix.kmp:miuix-blur:$miuixVersion")
 }

app/proguard-rules.pro

@@ -16,6 +16,17 @@
 # debugging stack traces.
 -keepattributes SourceFile,LineNumberTable
 
+##
+## 共享模块通过反射按方法名调用 MainActivity 的这些方法（shared 不能直接依赖 app 模块）。
+## release 下 R8 会重命名方法，导致反射 method.name=="navigateMainTab" / getMethod("navigate")
+## 失效（表现：账号页"浏览历史"点击无反应、部分页内跳转失效）。保留这些方法名。
+## 见 AndroidUiRuntimes.navigateMainTab、WebviewComp.navigateInMainActivity。
+##
+-keepclassmembers class com.github.zly2006.zhihu.MainActivity {
+    public void navigateMainTab(...);
+    public void navigate(...);
+}
+
 ##
 ## Kotlin Serialization
 ##
@@ -62,8 +73,8 @@
 }
 
 -keepnames class ** implements com.github.zly2006.zhihu.data.Feed$Target
-# Keep all enums
--keep enum ** {
+# Keep app's own enums (used via kotlinx.serialization / reflection)
+-keep enum com.github.zly2006.** {
     <fields>;
     public static **[] values();
     public static ** valueOf(java.lang.String);

app/src/androidTest/java/com/github/zly2006/zhihu/ReadingPlayerUiInstrumentedTest.kt

@@ -31,12 +31,12 @@ import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.test.swipe
 import androidx.core.content.edit
-import androidx.navigation.NavHostController
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.zly2006.zhihu.navigation.Account
 import com.github.zly2006.zhihu.navigation.Article
 import com.github.zly2006.zhihu.navigation.ArticleType
 import com.github.zly2006.zhihu.navigation.Home
+import com.github.zly2006.zhihu.navigation.NavDestination
 import com.github.zly2006.zhihu.navigation.Search
 import com.github.zly2006.zhihu.reading.AndroidReadingPlayerBridge
 import com.github.zly2006.zhihu.reading.ContentReadingService
@@ -66,6 +66,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import top.yukonga.miuix.kmp.nav.core.NavController
 
 @RunWith(AndroidJUnit4::class)
 class ReadingPlayerUiInstrumentedTest {
@@ -150,16 +151,16 @@ class ReadingPlayerUiInstrumentedTest {
      */
     @Test
     fun leavingDetailCompactsTheExpandedPlayer() {
-        lateinit var navController: NavHostController
+        lateinit var navController: NavController<NavDestination>
         composeRule.setZhihuMainContent { navController = it }
         composeRule.runOnIdle {
-            navController.navigate(Article(type = ArticleType.Answer, id = 987654L))
+            navController.push(Article(type = ArticleType.Answer, id = 987654L))
         }
 
         composeRule.waitForTag(READING_PLAYER_BAR_TAG)
         composeRule.onNodeWithTag(READING_PLAYER_COMPACT_TAG).assertDoesNotExist()
 
-        composeRule.runOnIdle { assertTrue(navController.popBackStack()) }
+        composeRule.runOnIdle { assertTrue(navController.pop()) }
 
         composeRule.waitForTag(READING_PLAYER_COMPACT_TAG)
         composeRule.onNodeWithTag(READING_PLAYER_BAR_TAG).assertDoesNotExist()
@@ -171,10 +172,10 @@ class ReadingPlayerUiInstrumentedTest {
      */
     @Test
     fun changingThePlayingItemReplacesTheVisibleReadingDetail() {
-        lateinit var navController: NavHostController
+        lateinit var navController: NavController<NavDestination>
         composeRule.setZhihuMainContent { navController = it }
         composeRule.runOnIdle {
-            navController.navigate(Article(type = ArticleType.Answer, id = PLAYER_STATE.queue.first().id))
+            navController.push(Article(type = ArticleType.Answer, id = PLAYER_STATE.queue.first().id))
         }
         composeRule.waitForTag(READING_PLAYER_BAR_TAG)
 

app/src/androidTest/java/com/github/zly2006/zhihu/test/ComposeScreenTestHost.kt

@@ -29,16 +29,17 @@ import androidx.compose.ui.test.swipeLeft
 import androidx.compose.ui.test.swipeRight
 import androidx.compose.ui.test.swipeUp
 import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.github.zly2006.zhihu.MainActivity
 import com.github.zly2006.zhihu.navigation.LocalNavigator
+import com.github.zly2006.zhihu.navigation.MainTabs
 import com.github.zly2006.zhihu.navigation.NavDestination
 import com.github.zly2006.zhihu.navigation.Navigator
 import com.github.zly2006.zhihu.navigation.TopLevelDestination
 import com.github.zly2006.zhihu.theme.ZhihuTheme
 import com.github.zly2006.zhihu.ui.AndroidZhihuMain
+import top.yukonga.miuix.kmp.nav.core.NavController
+import top.yukonga.miuix.kmp.nav.core.rememberNavController
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -98,15 +99,17 @@ fun MainActivityComposeRule.setScreenContent(
 }
 
 fun MainActivityComposeRule.setZhihuMainContent(
-    onNavControllerReady: (NavHostController) -> Unit = {},
+    onNavControllerReady: (NavController<NavDestination>) -> Unit = {},
 ) {
     activity.setContent { }
     waitForIdle()
     activity.setContent {
         ZhihuTheme {
-            val navController = rememberNavController()
+            // 与生产一致：activity.navController 必须是 AndroidZhihuMain 实际渲染的同一实例，
+            // 否则 activity.navigate() 操作的是 onCreate 旧栈，openFrom 等基于 backStack 的判定会出错。
+            val navController = rememberNavController<NavDestination>(MainTabs)
+            activity.navController = navController
             LaunchedEffect(navController) {
-                activity.navController = navController
                 onNavControllerReady(navController)
             }
             AndroidZhihuMain(navController = navController)

app/src/main/AndroidManifest.xml

@@ -2,6 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- miuix-blur 声明 minSdk 33，但其 33+ API（RuntimeShader）已在运行时由
+         rememberMiuixBlurBackdrop 的 isRuntimeShaderSupported() 守卫，低版本自动无模糊，
+         故放行该库以支持 minSdk 27 设备安装。 -->
+    <uses-sdk tools:overrideLibrary="top.yukonga.miuix.kmp.blur"/>
+
     <uses-feature
             android:name="android.hardware.camera"
             android:required="false"/>

app/src/main/java/com/github/zly2006/zhihu/MainActivity.kt

@@ -34,9 +34,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
 import coil3.ImageLoader
 import coil3.SingletonImageLoader
 import coil3.disk.DiskCache
@@ -92,6 +89,8 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import top.yukonga.miuix.kmp.nav.core.NavController
+import top.yukonga.miuix.kmp.nav.core.rememberNavController
 import java.util.concurrent.TimeUnit
 
 class MainActivity : ComponentActivity() {
@@ -102,7 +101,7 @@ class MainActivity : ComponentActivity() {
             .client
             .httpClient()
 
-    lateinit var navController: NavHostController
+    lateinit var navController: NavController<NavDestination>
     private lateinit var continuousUsageReminderManager: ContinuousUsageReminderManager
     private var currentMainTabOpenFrom: String? = null
     var mainTabNavigationTarget by mutableStateOf<TopLevelDestination?>(null)
@@ -197,7 +196,7 @@ class MainActivity : ComponentActivity() {
         }
 
         setContent {
-            navController = rememberNavController()
+            navController = rememberNavController<NavDestination>(MainTabs)
             ZhihuTheme {
                 Box(Modifier.semantics { testTagsAsResourceId = true }) {
                     AndroidZhihuMain(navController = navController)
@@ -342,11 +341,8 @@ class MainActivity : ComponentActivity() {
         preparePendingContentOpen(route)
         history.add(route)
         if (route is Video) {
-            val current = runCatching {
-                navController.currentBackStackEntry?.toRoute<Article>()
-            }.getOrNull() ?: runCatching {
-                navController.currentBackStackEntry?.toRoute<Question>()
-            }.getOrNull()
+            val top = navController.backStack.lastOrNull()
+            val current = top as? Article ?: top as? Question
             if (current == null) {
                 androidUserMessageSink(this).showShortMessage("无法打开视频：未知的内容类型")
                 return
@@ -383,20 +379,16 @@ class MainActivity : ComponentActivity() {
             navigateToMainTabs()
             return
         }
-        navController.navigate(route) {
-            if (popup) {
-                launchSingleTop = true
-                popUpTo(MainTabs) {
-                    // clear the back stack and viewModels
-                    saveState = true
-                }
-            }
+        if (popup) {
+            // deeplink/剪贴板跳转：清栈回到 MainTabs 根再 push（MainTabs 是 startDestination，pager 状态随根 entry 保留）。
+            navController.popUntil { it is MainTabs }
         }
+        navController.push(route)
     }
 
     private fun preparePendingContentOpen(target: NavDestination) {
         val openFrom = if (
-            runCatching { navController.currentBackStackEntry?.toRoute<MainTabs>() }.getOrNull() != null
+            navController.backStack.lastOrNull() is MainTabs
         ) {
             currentMainTabOpenFrom
         } else {
@@ -407,13 +399,8 @@ class MainActivity : ComponentActivity() {
     }
 
     private fun navigateToMainTabs() {
-        navController.navigate(MainTabs) {
-            launchSingleTop = true
-            restoreState = true
-            popUpTo(MainTabs) {
-                saveState = true
-            }
-        }
+        // 清栈回到 MainTabs 根（pager 状态保存在根 entry 内，随之保留）。
+        navController.popUntil { it is MainTabs }
     }
 
     fun setCurrentMainTabOpenFrom(openFrom: String?) {
@@ -426,21 +413,9 @@ class MainActivity : ComponentActivity() {
         }
     }
 
-    private fun currentContentOpenSource(): NavDestination? {
-        val currentEntry = navController.currentBackStackEntry
-        return runCatching {
-            currentEntry?.toRoute<Article>()
-        }.getOrNull() ?: runCatching {
-            currentEntry?.toRoute<Question>()
-        }.getOrNull() ?: runCatching {
-            currentEntry?.toRoute<Pin>()
-        }.getOrNull() ?: runCatching {
-            currentEntry?.toRoute<CollectionContent>()
-        }.getOrNull() ?: runCatching {
-            currentEntry?.toRoute<History>()
-        }.getOrNull() ?: runCatching {
-            currentEntry?.toRoute<Notification>()
-        }.getOrNull()
+    private fun currentContentOpenSource(): NavDestination? = when (val top = navController.backStack.lastOrNull()) {
+        is Article, is Question, is Pin, is CollectionContent, is History, is Notification -> top
+        else -> null
     }
 
     override fun onDestroy() {

app/src/main/java/com/github/zly2006/zhihu/QRCodeScanActivity.kt

@@ -63,7 +63,10 @@ import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import com.github.zly2006.zhihu.QRCodeScanActivity.Companion.LOGIN_PREFIX
 import com.github.zly2006.zhihu.platform.rememberUserMessageSink
+import com.github.zly2006.zhihu.theme.ThemeManager
+import com.github.zly2006.zhihu.theme.ThemeStyle
 import com.github.zly2006.zhihu.theme.ZhihuTheme
+import com.github.zly2006.zhihu.ui.miuix.MiuixQRCodeScanScreen
 import com.github.zly2006.zhihu.util.clipboardManager
 import com.github.zly2006.zhihu.util.enableEdgeToEdgeCompat
 import com.journeyapps.barcodescanner.ScanContract
@@ -77,19 +80,22 @@ class QRCodeScanActivity : ComponentActivity() {
 
         setContent {
             ZhihuTheme {
-                QRCodeScanScreen(
-                    onBack = { finish() },
-                    onScanResult = { result ->
-                        // 仅当是知乎登陆URL，返回扫描结果
-                        if (result.startsWith(LOGIN_PREFIX)) {
-                            val resultIntent = Intent().apply {
-                                putExtra(EXTRA_SCAN_RESULT, result)
-                            }
-                            setResult(RESULT_OK, resultIntent)
+                val onBack = { finish() }
+                val onScanResult = { result: String ->
+                    // 仅当是知乎登陆URL，返回扫描结果
+                    if (result.startsWith(LOGIN_PREFIX)) {
+                        val resultIntent = Intent().apply {
+                            putExtra(EXTRA_SCAN_RESULT, result)
                         }
-                        finish()
-                    },
-                )
+                        setResult(RESULT_OK, resultIntent)
+                    }
+                    finish()
+                }
+                if (ThemeManager.getThemeStyle() == ThemeStyle.Miuix) {
+                    MiuixQRCodeScanScreen(onBack = onBack, onScanResult = onScanResult)
+                } else {
+                    QRCodeScanScreen(onBack = onBack, onScanResult = onScanResult)
+                }
             }
         }
     }