From cb9ee66251a2b622c762592e975049b3c60518c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Thu, 1 Jan 2026 16:59:59 +0800
Subject: [PATCH] Move uptime display into stop button

---
 .../sfa/compose/component/ServiceStatusBar.kt       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sfa/compose/component/ServiceStatusBar.kt b/app/src/main/java/io/nekohasekai/sfa/compose/component/ServiceStatusBar.kt
index cc65c99..d79621a 100644
--- a/app/src/main/java/io/nekohasekai/sfa/compose/component/ServiceStatusBar.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/compose/component/ServiceStatusBar.kt
@@ -136,11 +136,6 @@ fun ServiceStatusBar(
                     }
                 }
 
-                // Uptime
-                if (startTime != null) {
-                    UptimeDisplay(startTime = startTime)
-                }
-
                 // Stop button
                 Row(
                     modifier =
@@ -152,6 +147,10 @@ fun ServiceStatusBar(
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.Center,
                 ) {
+                    if (startTime != null) {
+                        UptimeText(startTime = startTime)
+                        Spacer(modifier = Modifier.width(4.dp))
+                    }
                     Icon(
                         imageVector = Icons.Default.Stop,
                         contentDescription = stringResource(R.string.stop),
@@ -179,7 +178,7 @@ private fun StatusItem(
 }
 
 @Composable
-private fun UptimeDisplay(
+private fun UptimeText(
     startTime: Long,
     modifier: Modifier = Modifier,
 ) {
@@ -208,7 +207,7 @@ private fun UptimeDisplay(
         text = formattedTime,
         style = MaterialTheme.typography.labelLarge,
         fontWeight = FontWeight.Medium,
-        color = MaterialTheme.colorScheme.onSurfaceVariant,
+        color = MaterialTheme.colorScheme.onPrimaryContainer,
         modifier = modifier,
     )
 }