zapstore-mirror/com.darkwisp.app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38 from dmnyc/fix/compose-uploading-pill

Browse Source 
fix(compose): move uploading indicator to its own line as a capsule pill
This commit is contained in:
Barry Deen
2026-06-26 14:11:35 -04:00
committed by GitHub
parent 2ae8a3a1af ba13d53279
commit 8083521e04
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/darkwisp/app/ui/screen/ComposeScreen.kt
+35 -15
View File
@@ -816,21 +816,6 @@ fun ComposeScreen(
)
}
if (uploadProgress != null) {
Spacer(Modifier.width(8.dp))
CircularProgressIndicator(
modifier = Modifier.size(20.dp),
strokeWidth = 2.dp,
color = MaterialTheme.colorScheme.primary
)
Spacer(Modifier.width(6.dp))
Text(
stringResource(R.string.compose_uploading),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
Spacer(Modifier.weight(1f))
if (content.text.isNotBlank()) {
@@ -842,6 +827,41 @@ fun ComposeScreen(
}
}
// Uploading indicator on its own line as a capsule pill, so
// the label never has to wrap inside the crowded icon row.
AnimatedVisibility(
visible = uploadProgress != null,
enter = expandVertically() + fadeIn(),
exit = shrinkVertically() + fadeOut()
) {
Row(
modifier = Modifier.padding(start = 4.dp, top = 4.dp, bottom = 4.dp)
) {
Surface(
color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
shape = RoundedCornerShape(50)
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp)
) {
CircularProgressIndicator(
modifier = Modifier.size(16.dp),
strokeWidth = 2.dp,
color = MaterialTheme.colorScheme.primary
)
Spacer(Modifier.width(8.dp))
Text(
stringResource(R.string.compose_uploading),
style = MaterialTheme.typography.bodySmall,
maxLines = 1,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
}
}
// Hashtag chips
AnimatedVisibility(
visible = hashtags.isNotEmpty(),