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

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

@@ -1375,13 +1375,7 @@ private fun UserBubble(
             modifier = Modifier.align(Alignment.CenterEnd).padding(start = 48.dp),
         ) {
             Column(Modifier.padding(12.dp)) {
-                // Above the words, in the order they were composed: the picture was attached
-                // before the sentence about it was typed, and it is what the sentence refers to.
-                images.forEach { ref ->
-                    SessionImage(settings, sessionId, ref)
-                    Spacer(Modifier.height(4.dp))
-                }
-                // A message can be nothing but an attachment, and an empty line under a picture
+                // A message can be nothing but an attachment, and an empty line above a picture
                 // is a bubble with a gap in it for a sentence nobody wrote.
                 if (text.isNotEmpty()) {
                     Text(
@@ -1391,6 +1385,13 @@ private fun UserBubble(
                             else MaterialTheme.colorScheme.onPrimaryContainer,
                     )
                 }
+                // Under the words: what somebody wrote is what the bubble is, and the picture is
+                // what they attached to it. It also keeps the first line of every bubble at the
+                // same place down the transcript, whether or not there is an image in it.
+                images.forEachIndexed { index, ref ->
+                    if (index > 0 || text.isNotEmpty()) Spacer(Modifier.height(4.dp))
+                    SessionImage(settings, sessionId, ref)
+                }
             }
         }
     }