chore(ui): use MarqueeText for button texts

MovTery · MovTery · commit b3497aa18bba · 2025-08-10T00:39:16.000+08:00
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/components/Buttons.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/components/Buttons.kt
@@ -3,6 +3,7 @@ package com.movtery.zalithlauncher.ui.components
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.spring
 import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
@@ -91,6 +92,18 @@ fun ScalingActionButton(
     )
 }
 
+@Composable
+fun MarqueeText(
+    modifier: Modifier = Modifier,
+    text: String
+) {
+    Text(
+        modifier = modifier.basicMarquee(Int.MAX_VALUE),
+        text = text,
+        maxLines = 1
+    )
+}
+
 @Composable
 fun IconTextButton(
     onClick: () -> Unit,
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/components/ColorPicker.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/components/ColorPicker.kt
@@ -189,15 +189,15 @@ fun ColorPickerDialog(
                             onDismissRequest()
                         }
                     ) {
-                        Text(text = stringResource(R.string.generic_cancel))
+                        MarqueeText(text = stringResource(R.string.generic_cancel))
                     }
                     Button(
                         modifier = Modifier.weight(1f),
                         onClick = {
                             onConfirm(selectedColor)
                         }
                     ) {
-                        Text(text = stringResource(R.string.generic_confirm))
+                        MarqueeText(text = stringResource(R.string.generic_confirm))
                     }
                 }
             }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/components/Dialogs.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/components/Dialogs.kt
@@ -75,12 +75,12 @@ fun SimpleAlertDialog(
         },
         confirmButton = {
             Button(onClick = onConfirm) {
-                Text(text = confirmText)
+                MarqueeText(text = confirmText)
             }
         },
         dismissButton = {
             Button(onClick = onDismiss) {
-                Text(text = dismissText)
+                MarqueeText(text = dismissText)
             }
         }
     )
@@ -115,7 +115,7 @@ fun SimpleAlertDialog(
         },
         confirmButton = {
             Button(onClick = onDismiss) {
-                Text(text = confirmText)
+                MarqueeText(text = confirmText)
             }
         }
     )
@@ -146,12 +146,12 @@ fun SimpleAlertDialog(
         },
         confirmButton = {
             Button(onClick = onConfirm) {
-                Text(text = confirmText)
+                MarqueeText(text = confirmText)
             }
         },
         dismissButton = {
             Button(onClick = onCancel) {
-                Text(text = dismissText)
+                MarqueeText(text = dismissText)
             }
         }
     )
@@ -233,13 +233,13 @@ fun SimpleEditDialog(
                         modifier = Modifier.weight(1f),
                         onClick = onDismissRequest
                     ) {
-                        Text(text = stringResource(R.string.generic_cancel))
+                        MarqueeText(text = stringResource(R.string.generic_cancel))
                     }
                     Button(
                         modifier = Modifier.weight(1f),
                         onClick = onConfirm
                     ) {
-                        Text(text = stringResource(R.string.generic_confirm))
+                        MarqueeText(text = stringResource(R.string.generic_confirm))
                     }
                 }
             }
@@ -363,7 +363,7 @@ fun <T> SimpleListDialog(
                             }
                         }
                     ) {
-                        Text(stringResource(R.string.generic_confirm))
+                        MarqueeText(text = stringResource(R.string.generic_confirm))
                     }
                 }
             }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/AccountManageScreen.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/AccountManageScreen.kt
@@ -64,6 +64,7 @@ import com.movtery.zalithlauncher.path.UrlManager
 import com.movtery.zalithlauncher.state.ObjectStates
 import com.movtery.zalithlauncher.ui.base.BaseScreen
 import com.movtery.zalithlauncher.ui.components.IconTextButton
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.ScalingActionButton
 import com.movtery.zalithlauncher.ui.components.ScalingLabel
 import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog
@@ -234,9 +235,7 @@ private fun ServerTypeMenu(
                     .fillMaxWidth(),
                 onClick = { updateServerOperation(ServerOperation.AddNew) }
             ) {
-                Text(
-                    text = stringResource(R.string.account_add_new_server_button)
-                )
+                MarqueeText(text = stringResource(R.string.account_add_new_server_button))
             }
         }
     }
@@ -666,7 +665,7 @@ private fun AccountSkinOperation(
                             updateOperation(AccountSkinOperation.None)
                         }
                     ) {
-                        Text(text = stringResource(R.string.generic_go_it))
+                        MarqueeText(text = stringResource(R.string.generic_go_it))
                     }
                 }
             )
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/FileSelectorScreen.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/FileSelectorScreen.kt
@@ -37,6 +37,7 @@ import com.movtery.zalithlauncher.R
 import com.movtery.zalithlauncher.state.FilePathSelectorData
 import com.movtery.zalithlauncher.state.MutableStates
 import com.movtery.zalithlauncher.ui.base.BaseScreen
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.ScalingActionButton
 import com.movtery.zalithlauncher.ui.components.ScalingLabel
 import com.movtery.zalithlauncher.ui.components.itemLayoutColor
@@ -208,19 +209,19 @@ private fun LeftActionMenu(
                 modifier = Modifier.fillMaxWidth(),
                 onClick = backToParent
             ) {
-                Text(text = stringResource(R.string.files_back_to_parent))
+                MarqueeText(text = stringResource(R.string.files_back_to_parent))
             }
             ScalingActionButton(
                 modifier = Modifier.fillMaxWidth(),
                 onClick = createDir
             ) {
-                Text(text = stringResource(R.string.files_create_dir))
+                MarqueeText(text = stringResource(R.string.files_create_dir))
             }
             ScalingActionButton(
                 modifier = Modifier.fillMaxWidth(),
                 onClick = selectDir
             ) {
-                Text(text = stringResource(R.string.files_select_dir))
+                MarqueeText(text = stringResource(R.string.files_select_dir))
             }
         }
     }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/LauncherScreen.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/LauncherScreen.kt
@@ -45,6 +45,7 @@ import com.movtery.zalithlauncher.game.version.installed.Version
 import com.movtery.zalithlauncher.game.version.installed.VersionsManager
 import com.movtery.zalithlauncher.info.InfoDistributor
 import com.movtery.zalithlauncher.ui.base.BaseScreen
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.ScalingActionButton
 import com.movtery.zalithlauncher.ui.screens.NormalNavKey
 import com.movtery.zalithlauncher.ui.screens.content.elements.AccountAvatar
@@ -248,7 +249,7 @@ private fun RightMenu(
                     )
                 },
             ) {
-                Text(text = stringResource(R.string.main_launch_game))
+                MarqueeText(text = stringResource(R.string.main_launch_game))
             }
         }
     }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/VersionsManageScreen.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/VersionsManageScreen.kt
@@ -22,7 +22,6 @@ import androidx.compose.material3.Card
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -46,6 +45,7 @@ import com.movtery.zalithlauncher.state.MutableStates
 import com.movtery.zalithlauncher.ui.activities.MainActivity
 import com.movtery.zalithlauncher.ui.base.BaseScreen
 import com.movtery.zalithlauncher.ui.components.IconTextButton
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.ScalingActionButton
 import com.movtery.zalithlauncher.ui.components.ScalingLabel
 import com.movtery.zalithlauncher.ui.screens.NormalNavKey
@@ -206,7 +206,7 @@ private fun GamePathLayout(
                 }
             }
         ) {
-            Text(text = stringResource(R.string.versions_manage_game_path_add_new))
+            MarqueeText(text = stringResource(R.string.versions_manage_game_path_add_new))
         }
     }
 }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/DownloadGameScreen.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/DownloadGameScreen.kt
@@ -39,6 +39,7 @@ import com.movtery.zalithlauncher.game.download.jvm_server.JvmCrashException
 import com.movtery.zalithlauncher.game.version.download.DownloadFailedException
 import com.movtery.zalithlauncher.game.version.installed.VersionsManager
 import com.movtery.zalithlauncher.notification.NotificationManager
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.NotificationCheck
 import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog
 import com.movtery.zalithlauncher.ui.screens.NestedNavKey
@@ -263,7 +264,7 @@ private fun GameInstallOperation(
                 },
                 confirmButton = {
                     Button(onClick = dismiss) {
-                        Text(text = stringResource(R.string.generic_confirm))
+                        MarqueeText(text = stringResource(R.string.generic_confirm))
                     }
                 }
             )
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/DownloadModPackScreen.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/DownloadModPackScreen.kt
@@ -39,6 +39,7 @@ import com.movtery.zalithlauncher.game.download.modpack.install.ModPackInstaller
 import com.movtery.zalithlauncher.game.version.download.DownloadFailedException
 import com.movtery.zalithlauncher.game.version.installed.VersionsManager
 import com.movtery.zalithlauncher.notification.NotificationManager
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.NotificationCheck
 import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog
 import com.movtery.zalithlauncher.ui.screens.NestedNavKey
@@ -286,7 +287,7 @@ private fun ModPackInstallOperation(
                 },
                 confirmButton = {
                     Button(onClick = dismiss) {
-                        Text(text = stringResource(R.string.generic_confirm))
+                        MarqueeText(text = stringResource(R.string.generic_confirm))
                     }
                 }
             )
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/assets/elements/_Download.Single.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/assets/elements/_Download.Single.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.window.Dialog
 import com.movtery.zalithlauncher.R
 import com.movtery.zalithlauncher.game.version.installed.Version
 import com.movtery.zalithlauncher.game.version.installed.VersionsManager
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog
 import com.movtery.zalithlauncher.ui.components.itemLayoutColor
 import com.movtery.zalithlauncher.ui.screens.content.elements.CommonVersionInfoLayout
@@ -138,7 +139,7 @@ fun SelectVersionToDownloadDialog(
                             modifier = Modifier.weight(0.5f),
                             onClick = onDismiss
                         ) {
-                            Text(text = stringResource(R.string.generic_cancel))
+                            MarqueeText(text = stringResource(R.string.generic_cancel))
                         }
                         Button(
                             modifier = Modifier.weight(0.5f),
@@ -148,7 +149,7 @@ fun SelectVersionToDownloadDialog(
                                 }
                             }
                         ) {
-                            Text(text = stringResource(R.string.download_install))
+                            MarqueeText(text = stringResource(R.string.download_install))
                         }
                     }
                 }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/common/DownloadGameElements.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/common/DownloadGameElements.kt
@@ -34,6 +34,7 @@ import com.movtery.zalithlauncher.coroutine.Task
 import com.movtery.zalithlauncher.coroutine.TaskState
 import com.movtery.zalithlauncher.game.download.game.GameDownloadInfo
 import com.movtery.zalithlauncher.game.download.game.GameInstallTask
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.utils.animation.getAnimateTween
 
 /** 游戏安装状态操作 */
@@ -94,7 +95,7 @@ fun GameInstallingDialog(
                     modifier = Modifier.fillMaxWidth(),
                     onClick = onCancel
                 ) {
-                    Text(text = stringResource(R.string.generic_cancel))
+                    MarqueeText(text = stringResource(R.string.generic_cancel))
                 }
             }
         }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/elements/AccountElements.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/elements/AccountElements.kt
@@ -82,6 +82,7 @@ import com.movtery.zalithlauncher.game.skin.SkinModelType
 import com.movtery.zalithlauncher.info.InfoDistributor
 import com.movtery.zalithlauncher.path.UrlManager
 import com.movtery.zalithlauncher.ui.components.IconTextButton
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog
 import com.movtery.zalithlauncher.ui.components.SimpleEditDialog
 import com.movtery.zalithlauncher.ui.components.itemLayoutColor
@@ -654,20 +655,19 @@ fun OtherServerLoginDialog(
 
                 Row(
                     modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween
+                    horizontalArrangement = Arrangement.spacedBy(16.dp)
                 ) {
                     Button(
                         modifier = Modifier.weight(1f),
                         onClick = onDismissRequest
                     ) {
-                        Text(text = stringResource(R.string.generic_cancel))
+                        MarqueeText(text = stringResource(R.string.generic_cancel))
                     }
-                    Spacer(modifier = Modifier.width(16.dp))
                     Button(
                         modifier = Modifier.weight(1f),
                         onClick = confirmAction
                     ) {
-                        Text(text = stringResource(R.string.generic_confirm))
+                        MarqueeText(text = stringResource(R.string.generic_confirm))
                     }
                 }
             }
@@ -716,21 +716,21 @@ fun SelectSkinModelDialog(
                             onSelected(SkinModelType.STEVE)
                         }
                     ) {
-                        Text(text = stringResource(R.string.account_change_skin_model_steve))
+                        MarqueeText(text = stringResource(R.string.account_change_skin_model_steve))
                     }
                     Button(
                         modifier = Modifier.fillMaxWidth(),
                         onClick = {
                             onSelected(SkinModelType.ALEX)
                         }
                     ) {
-                        Text(text = stringResource(R.string.account_change_skin_model_alex))
+                        MarqueeText(text = stringResource(R.string.account_change_skin_model_alex))
                     }
                     Button(
                         modifier = Modifier.fillMaxWidth(),
                         onClick = onDismissRequest
                     ) {
-                        Text(text = stringResource(R.string.generic_cancel))
+                        MarqueeText(text = stringResource(R.string.generic_cancel))
                     }
                 }
             }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/main/ErrorScreen.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/main/ErrorScreen.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.zIndex
 import com.movtery.zalithlauncher.R
 import com.movtery.zalithlauncher.info.InfoDistributor
 import com.movtery.zalithlauncher.ui.activities.CrashType
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.ScalingActionButton
 
 @Composable
@@ -185,7 +186,7 @@ private fun ActionContext(
                     modifier = Modifier.fillMaxWidth(),
                     onClick = onShareLogsClick
                 ) {
-                    Text(text = stringResource(R.string.crash_share_logs))
+                    MarqueeText(text = stringResource(R.string.crash_share_logs))
                 }
                 Spacer(modifier = Modifier.height(4.dp))
             }
@@ -194,15 +195,15 @@ private fun ActionContext(
                     modifier = Modifier.fillMaxWidth(),
                     onClick = onRestartClick
                 ) {
-                    Text(text = stringResource(R.string.crash_restart))
+                    MarqueeText(text = stringResource(R.string.crash_restart))
                 }
                 Spacer(modifier = Modifier.height(4.dp))
             }
             ScalingActionButton(
                 modifier = Modifier.fillMaxWidth(),
                 onClick = onExitClick
             ) {
-                Text(text = stringResource(R.string.crash_exit))
+                MarqueeText(text = stringResource(R.string.crash_exit))
             }
         }
     }
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/splash/UnpackScreen.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/splash/UnpackScreen.kt
@@ -38,6 +38,7 @@ import androidx.navigation3.runtime.NavKey
 import com.movtery.zalithlauncher.R
 import com.movtery.zalithlauncher.components.InstallableItem
 import com.movtery.zalithlauncher.ui.base.BaseScreen
+import com.movtery.zalithlauncher.ui.components.MarqueeText
 import com.movtery.zalithlauncher.ui.components.ScalingActionButton
 import com.movtery.zalithlauncher.ui.components.itemLayoutColor
 import com.movtery.zalithlauncher.ui.screens.splash.elements.splashScreenKey
@@ -134,7 +135,7 @@ private fun ActionMenu(
                     onAgreeClick()
                 }
             ) {
-                Text(text = stringResource(R.string.splash_screen_agree))
+                MarqueeText(text = stringResource(R.string.splash_screen_agree))
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -189,15 +189,15 @@ fun ColorPickerDialog(`
`189`	`189`	`onDismissRequest()`
`190`	`190`	`}`
`191`	`191`	`) {`
`192`		`- Text(text = stringResource(R.string.generic_cancel))`
	`192`	`+ MarqueeText(text = stringResource(R.string.generic_cancel))`
`193`	`193`	`}`
`194`	`194`	`Button(`
`195`	`195`	`modifier = Modifier.weight(1f),`
`196`	`196`	`onClick = {`
`197`	`197`	`onConfirm(selectedColor)`
`198`	`198`	`}`
`199`	`199`	`) {`
`200`		`- Text(text = stringResource(R.string.generic_confirm))`
	`200`	`+ MarqueeText(text = stringResource(R.string.generic_confirm))`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ fun SimpleAlertDialog(`
`75`	`75`	`},`
`76`	`76`	`confirmButton = {`
`77`	`77`	`Button(onClick = onConfirm) {`
`78`		`- Text(text = confirmText)`
	`78`	`+ MarqueeText(text = confirmText)`
`79`	`79`	`}`
`80`	`80`	`},`
`81`	`81`	`dismissButton = {`
`82`	`82`	`Button(onClick = onDismiss) {`
`83`		`- Text(text = dismissText)`
	`83`	`+ MarqueeText(text = dismissText)`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`)`
`@@ -115,7 +115,7 @@ fun SimpleAlertDialog(`
`115`	`115`	`},`
`116`	`116`	`confirmButton = {`
`117`	`117`	`Button(onClick = onDismiss) {`
`118`		`- Text(text = confirmText)`
	`118`	`+ MarqueeText(text = confirmText)`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`)`
`@@ -146,12 +146,12 @@ fun SimpleAlertDialog(`
`146`	`146`	`},`
`147`	`147`	`confirmButton = {`
`148`	`148`	`Button(onClick = onConfirm) {`
`149`		`- Text(text = confirmText)`
	`149`	`+ MarqueeText(text = confirmText)`
`150`	`150`	`}`
`151`	`151`	`},`
`152`	`152`	`dismissButton = {`
`153`	`153`	`Button(onClick = onCancel) {`
`154`		`- Text(text = dismissText)`
	`154`	`+ MarqueeText(text = dismissText)`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`)`
`@@ -233,13 +233,13 @@ fun SimpleEditDialog(`
`233`	`233`	`modifier = Modifier.weight(1f),`
`234`	`234`	`onClick = onDismissRequest`
`235`	`235`	`) {`
`236`		`- Text(text = stringResource(R.string.generic_cancel))`
	`236`	`+ MarqueeText(text = stringResource(R.string.generic_cancel))`
`237`	`237`	`}`
`238`	`238`	`Button(`
`239`	`239`	`modifier = Modifier.weight(1f),`
`240`	`240`	`onClick = onConfirm`
`241`	`241`	`) {`
`242`		`- Text(text = stringResource(R.string.generic_confirm))`
	`242`	`+ MarqueeText(text = stringResource(R.string.generic_confirm))`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`	`}`
`@@ -363,7 +363,7 @@ fun <T> SimpleListDialog(`
`363`	`363`	`}`
`364`	`364`	`}`
`365`	`365`	`) {`
`366`		`- Text(stringResource(R.string.generic_confirm))`
	`366`	`+ MarqueeText(text = stringResource(R.string.generic_confirm))`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ import com.movtery.zalithlauncher.path.UrlManager`
`64`	`64`	`import com.movtery.zalithlauncher.state.ObjectStates`
`65`	`65`	`import com.movtery.zalithlauncher.ui.base.BaseScreen`
`66`	`66`	`import com.movtery.zalithlauncher.ui.components.IconTextButton`
	`67`	`+import com.movtery.zalithlauncher.ui.components.MarqueeText`
`67`	`68`	`import com.movtery.zalithlauncher.ui.components.ScalingActionButton`
`68`	`69`	`import com.movtery.zalithlauncher.ui.components.ScalingLabel`
`69`	`70`	`import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog`
`@@ -234,9 +235,7 @@ private fun ServerTypeMenu(`
`234`	`235`	`.fillMaxWidth(),`
`235`	`236`	`onClick = { updateServerOperation(ServerOperation.AddNew) }`
`236`	`237`	`) {`
`237`		`- Text(`
`238`		`- text = stringResource(R.string.account_add_new_server_button)`
`239`		`- )`
	`238`	`+ MarqueeText(text = stringResource(R.string.account_add_new_server_button))`
`240`	`239`	`}`
`241`	`240`	`}`
`242`	`241`	`}`
`@@ -666,7 +665,7 @@ private fun AccountSkinOperation(`
`666`	`665`	`updateOperation(AccountSkinOperation.None)`
`667`	`666`	`}`
`668`	`667`	`) {`
`669`		`- Text(text = stringResource(R.string.generic_go_it))`
	`668`	`+ MarqueeText(text = stringResource(R.string.generic_go_it))`
`670`	`669`	`}`
`671`	`670`	`}`
`672`	`671`	`)`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ import com.movtery.zalithlauncher.game.version.installed.Version`
`45`	`45`	`import com.movtery.zalithlauncher.game.version.installed.VersionsManager`
`46`	`46`	`import com.movtery.zalithlauncher.info.InfoDistributor`
`47`	`47`	`import com.movtery.zalithlauncher.ui.base.BaseScreen`
	`48`	`+import com.movtery.zalithlauncher.ui.components.MarqueeText`
`48`	`49`	`import com.movtery.zalithlauncher.ui.components.ScalingActionButton`
`49`	`50`	`import com.movtery.zalithlauncher.ui.screens.NormalNavKey`
`50`	`51`	`import com.movtery.zalithlauncher.ui.screens.content.elements.AccountAvatar`
`@@ -248,7 +249,7 @@ private fun RightMenu(`
`248`	`249`	`)`
`249`	`250`	`},`
`250`	`251`	`) {`
`251`		`- Text(text = stringResource(R.string.main_launch_game))`
	`252`	`+ MarqueeText(text = stringResource(R.string.main_launch_game))`
`252`	`253`	`}`
`253`	`254`	`}`
`254`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ import androidx.compose.material3.Card`
`22`	`22`	`import androidx.compose.material3.CircularProgressIndicator`
`23`	`23`	`import androidx.compose.material3.HorizontalDivider`
`24`	`24`	`import androidx.compose.material3.MaterialTheme`
`25`		`-import androidx.compose.material3.Text`
`26`	`25`	`import androidx.compose.runtime.Composable`
`27`	`26`	`import androidx.compose.runtime.collectAsState`
`28`	`27`	`import androidx.compose.runtime.getValue`
`@@ -46,6 +45,7 @@ import com.movtery.zalithlauncher.state.MutableStates`
`46`	`45`	`import com.movtery.zalithlauncher.ui.activities.MainActivity`
`47`	`46`	`import com.movtery.zalithlauncher.ui.base.BaseScreen`
`48`	`47`	`import com.movtery.zalithlauncher.ui.components.IconTextButton`
	`48`	`+import com.movtery.zalithlauncher.ui.components.MarqueeText`
`49`	`49`	`import com.movtery.zalithlauncher.ui.components.ScalingActionButton`
`50`	`50`	`import com.movtery.zalithlauncher.ui.components.ScalingLabel`
`51`	`51`	`import com.movtery.zalithlauncher.ui.screens.NormalNavKey`
`@@ -206,7 +206,7 @@ private fun GamePathLayout(`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`	`) {`
`209`		`- Text(text = stringResource(R.string.versions_manage_game_path_add_new))`
	`209`	`+ MarqueeText(text = stringResource(R.string.versions_manage_game_path_add_new))`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ import com.movtery.zalithlauncher.game.download.jvm_server.JvmCrashException`
`39`	`39`	`import com.movtery.zalithlauncher.game.version.download.DownloadFailedException`
`40`	`40`	`import com.movtery.zalithlauncher.game.version.installed.VersionsManager`
`41`	`41`	`import com.movtery.zalithlauncher.notification.NotificationManager`
	`42`	`+import com.movtery.zalithlauncher.ui.components.MarqueeText`
`42`	`43`	`import com.movtery.zalithlauncher.ui.components.NotificationCheck`
`43`	`44`	`import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog`
`44`	`45`	`import com.movtery.zalithlauncher.ui.screens.NestedNavKey`
`@@ -263,7 +264,7 @@ private fun GameInstallOperation(`
`263`	`264`	`},`
`264`	`265`	`confirmButton = {`
`265`	`266`	`Button(onClick = dismiss) {`
`266`		`- Text(text = stringResource(R.string.generic_confirm))`
	`267`	`+ MarqueeText(text = stringResource(R.string.generic_confirm))`
`267`	`268`	`}`
`268`	`269`	`}`
`269`	`270`	`)`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ import androidx.compose.ui.window.Dialog`
`36`	`36`	`import com.movtery.zalithlauncher.R`
`37`	`37`	`import com.movtery.zalithlauncher.game.version.installed.Version`
`38`	`38`	`import com.movtery.zalithlauncher.game.version.installed.VersionsManager`
	`39`	`+import com.movtery.zalithlauncher.ui.components.MarqueeText`
`39`	`40`	`import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog`
`40`	`41`	`import com.movtery.zalithlauncher.ui.components.itemLayoutColor`
`41`	`42`	`import com.movtery.zalithlauncher.ui.screens.content.elements.CommonVersionInfoLayout`
`@@ -138,7 +139,7 @@ fun SelectVersionToDownloadDialog(`
`138`	`139`	`modifier = Modifier.weight(0.5f),`
`139`	`140`	`onClick = onDismiss`
`140`	`141`	`) {`
`141`		`- Text(text = stringResource(R.string.generic_cancel))`
	`142`	`+ MarqueeText(text = stringResource(R.string.generic_cancel))`
`142`	`143`	`}`
`143`	`144`	`Button(`
`144`	`145`	`modifier = Modifier.weight(0.5f),`
`@@ -148,7 +149,7 @@ fun SelectVersionToDownloadDialog(`
`148`	`149`	`}`
`149`	`150`	`}`
`150`	`151`	`) {`
`151`		`- Text(text = stringResource(R.string.download_install))`
	`152`	`+ MarqueeText(text = stringResource(R.string.download_install))`
`152`	`153`	`}`
`153`	`154`	`}`
`154`	`155`	`}`