irisandClaude Opus 5
edc39c7371
The same pass the server had, on the Kotlin side: comments restating what the code says are gone, and the ones recording a measurement, a constraint or an incident are kept but cut to a few lines each. 6540 comment lines to 5674, and 920 lines off the app. Two doc comments had drifted onto the item above the one they describe -- `contextAfter`'s onto `sessionWorking` in Events.kt, and `UsageMonitor`'s equivalent on the server was fixed in the previous commit. Each is back on its own item, which is the only non-comment line this diff moves. The comments are reflowed to the column limit at their own indentation: several were written wide, and ktfmt re-wrapped them into lines holding a single orphan word. `/tmp` script, not kept -- ktfmt is idempotent over the result, which is the check. Left alone deliberately: this codebase's remaining comment density is high because the comments carry things the code cannot say -- what a null means, what a number was measured against, which bug a guard exists for. Of the 238 one-line doc comments in the app, five were pure restatement of the name and were removed; the rest each say something the signature does not. ktfmtFormat, compileDebugKotlin, lintDebug and testDebugUnitTest pass; cargo test (127), clippy --all-targets and fmt still clean. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
66 lines
2.2 KiB
Kotlin
66 lines
2.2 KiB
Kotlin
package com.example.aiapp
|
|
|
|
import androidx.compose.foundation.background
|
|
import androidx.compose.foundation.layout.padding
|
|
import androidx.compose.material3.MaterialTheme
|
|
import androidx.compose.material3.Text
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.draw.clip
|
|
import androidx.compose.ui.text.font.FontFamily
|
|
import androidx.compose.ui.text.style.TextOverflow
|
|
import androidx.compose.ui.unit.dp
|
|
|
|
/**
|
|
* Whether [ref] names an image the server stored as one -- `<hex>.<extension>`, with an extension
|
|
* from the list it writes -- rather than a file kept under its own name. Mirrors the server's
|
|
* `media` table, which is the one other place the list lives.
|
|
*/
|
|
fun isImageRef(ref: String): Boolean = ref.substringAfterLast('.', "") in IMAGE_EXTENSIONS
|
|
|
|
private val IMAGE_EXTENSIONS = setOf("png", "jpg", "gif", "webp")
|
|
|
|
/**
|
|
* The name a file was attached under: the ref less the hex the server put before it. The hex has no
|
|
* dash in it, so the first one is the boundary however many the name has.
|
|
*/
|
|
fun attachmentName(ref: String): String = ref.substringAfter('-', ref)
|
|
|
|
/**
|
|
* One attachment on a sent message, drawn as what it is: an image inline, a file as its name. A
|
|
* file is not fetched -- there is nothing on this phone to open a trace with -- so the name is all
|
|
* of it.
|
|
*/
|
|
@Composable
|
|
fun Attachment(
|
|
settings: ServerSettings,
|
|
sessionId: String,
|
|
ref: String,
|
|
onOpenImage: (String) -> Unit,
|
|
) {
|
|
if (isImageRef(ref)) SessionImage(settings, sessionId, ref, onOpenImage)
|
|
else
|
|
FileName(
|
|
attachmentName(ref),
|
|
Modifier.clip(MaterialTheme.shapes.extraSmall)
|
|
.background(rawSurface)
|
|
.padding(horizontal = 8.dp, vertical = 4.dp),
|
|
)
|
|
}
|
|
|
|
/**
|
|
* A file's name, one line, in the face names are read in. Overlong names lose their middle: a name
|
|
* is identified by both ends -- what it is at the front, what kind at the back.
|
|
*/
|
|
@Composable
|
|
fun FileName(name: String, modifier: Modifier = Modifier) {
|
|
Text(
|
|
name,
|
|
modifier = modifier,
|
|
style = MaterialTheme.typography.bodySmall,
|
|
fontFamily = FontFamily.Monospace,
|
|
maxLines = 1,
|
|
overflow = TextOverflow.MiddleEllipsis,
|
|
)
|
|
}
|