增加字体加载时的提示

Author: ForteScarlet

composeApp/src/wasmJsMain/kotlin/love/forte/simbot/codegen/App.kt

@@ -1,11 +1,17 @@
 package love.forte.simbot.codegen
 
+import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
@@ -14,9 +20,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.unit.dp
 import love.forte.simbot.codegen.gen.view.GradleSettingsView
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.preloadFont
+import simbot_codegen.composeapp.generated.resources.JetBrainsMono_Medium
 import simbot_codegen.composeapp.generated.resources.LXGWNeoXiHeiScreen
 import simbot_codegen.composeapp.generated.resources.Res
 
@@ -26,8 +34,8 @@ import simbot_codegen.composeapp.generated.resources.Res
 @Composable
 fun App() {
     @OptIn(ExperimentalResourceApi::class)
-    val font by preloadFont(resource = Res.font.LXGWNeoXiHeiScreen)
-    val fm = font?.let { FontFamily(it) }
+    val lxgwNeo by preloadFont(resource = Res.font.LXGWNeoXiHeiScreen)
+    val fm = lxgwNeo?.let { FontFamily(it) }
 
     val darkTheme = isSystemInDarkTheme()
 
@@ -67,32 +75,43 @@ fun App() {
         )
     }
 
-    if (fm == null) {
-        Box(modifier = Modifier.fillMaxSize()) {
-            CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
-        }
-    } else {
-        MaterialTheme(
-            colorScheme = colorScheme,
-            typography = MaterialTheme.typography.copy(
-                displayLarge = MaterialTheme.typography.displayLarge.copy(fontFamily = fm),
-                displayMedium = MaterialTheme.typography.displayMedium.copy(fontFamily = fm),
-                displaySmall = MaterialTheme.typography.displaySmall.copy(fontFamily = fm),
-                headlineLarge = MaterialTheme.typography.headlineLarge.copy(fontFamily = fm),
-                headlineMedium = MaterialTheme.typography.headlineMedium.copy(fontFamily = fm),
-                headlineSmall = MaterialTheme.typography.headlineSmall.copy(fontFamily = fm),
-                titleLarge = MaterialTheme.typography.titleLarge.copy(fontFamily = fm),
-                titleMedium = MaterialTheme.typography.titleMedium.copy(fontFamily = fm),
-                titleSmall = MaterialTheme.typography.titleSmall.copy(fontFamily = fm),
-                bodyLarge = MaterialTheme.typography.bodyLarge.copy(fontFamily = fm),
-                bodyMedium = MaterialTheme.typography.bodyMedium.copy(fontFamily = fm),
-                bodySmall = MaterialTheme.typography.bodySmall.copy(fontFamily = fm),
-                labelLarge = MaterialTheme.typography.labelLarge.copy(fontFamily = fm),
-                labelMedium = MaterialTheme.typography.labelMedium.copy(fontFamily = fm),
-                labelSmall = MaterialTheme.typography.labelSmall.copy(fontFamily = fm),
-            )
-        ) {
-            GradleSettingsView()
+    AnimatedContent(fm) { fm ->
+        if (fm == null) {
+            Box(modifier = Modifier.fillMaxSize()) {
+                Column(
+                    modifier = Modifier.align(Alignment.Center),
+                    verticalArrangement = Arrangement.Center,
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    CircularProgressIndicator(modifier = Modifier.align(Alignment.CenterHorizontally))
+                    Spacer(Modifier.padding(8.dp))
+                    Text("Font loading...")
+                }
+            }
+        } else {
+            MaterialTheme(
+                colorScheme = colorScheme,
+                typography = MaterialTheme.typography.copy(
+                    displayLarge = MaterialTheme.typography.displayLarge.copy(fontFamily = fm),
+                    displayMedium = MaterialTheme.typography.displayMedium.copy(fontFamily = fm),
+                    displaySmall = MaterialTheme.typography.displaySmall.copy(fontFamily = fm),
+                    headlineLarge = MaterialTheme.typography.headlineLarge.copy(fontFamily = fm),
+                    headlineMedium = MaterialTheme.typography.headlineMedium.copy(fontFamily = fm),
+                    headlineSmall = MaterialTheme.typography.headlineSmall.copy(fontFamily = fm),
+                    titleLarge = MaterialTheme.typography.titleLarge.copy(fontFamily = fm),
+                    titleMedium = MaterialTheme.typography.titleMedium.copy(fontFamily = fm),
+                    titleSmall = MaterialTheme.typography.titleSmall.copy(fontFamily = fm),
+                    bodyLarge = MaterialTheme.typography.bodyLarge.copy(fontFamily = fm),
+                    bodyMedium = MaterialTheme.typography.bodyMedium.copy(fontFamily = fm),
+                    bodySmall = MaterialTheme.typography.bodySmall.copy(fontFamily = fm),
+                    labelLarge = MaterialTheme.typography.labelLarge.copy(fontFamily = fm),
+                    labelMedium = MaterialTheme.typography.labelMedium.copy(fontFamily = fm),
+                    labelSmall = MaterialTheme.typography.labelSmall.copy(fontFamily = fm),
+                )
+            ) {
+                GradleSettingsView()
+            }
         }
     }
+
 }