Merge branch 'main' of git.arirex.me:iris/ai-app

app/androidApp/src/main/kotlin/com/example/aiapp/SessionScreen.kt

@@ -5,7 +5,6 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
@@ -1283,10 +1282,12 @@ fun SessionScreen(settings: ServerSettings, summary: SessionSummary, onBack: ()
     Column(Modifier.fillMaxSize()) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 4.dp),
+            modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp),
         ) {
             GlyphButton(BACK_GLYPH, "Back", onBack)
-            Spacer(Modifier.width(8.dp))
+            // A ring's worth, which is what the arrow already keeps on its other three sides --
+            // the pair of glyph buttons at the far end of this row get theirs from each other.
+            Spacer(Modifier.width(GLYPH_BUTTON_MARGIN))
             Column(Modifier.weight(1f)) {
                 Text(title, style = MaterialTheme.typography.titleMedium)
                 // Machine first, then what runs on it -- the same order and the same wording
@@ -1318,7 +1319,7 @@ fun SessionScreen(settings: ServerSettings, summary: SessionSummary, onBack: ()
             // yellow or red near a limit -- and the theme's plain control colour whenever there
             // is no measurement, since blue is the low end of the scale here and would read as
             // "checked, and fine" about a machine nobody could reach.
-            Row(horizontalArrangement = Arrangement.spacedBy(GLYPH_BUTTON_GAP)) {
+            Row {
                 GlyphButton(
                     USAGE_GLYPH,
                     "Usage",