From 4a0027c638f59a12a8a14618fbf2ff9db1c87e57 Mon Sep 17 00:00:00 2001 From: zt64 Date: Tue, 2 Aug 2022 16:45:25 -0400 Subject: [PATCH] Fix multi-author plugin appearance --- .../ui/component/plugins/PluginCard.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt index a89ef18..b51318a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt @@ -23,7 +23,6 @@ import androidx.compose.ui.unit.dp import com.aliucord.manager.R import com.aliucord.manager.model.Plugin -@OptIn(ExperimentalMaterial3Api::class) @Composable fun PluginCard( plugin: Plugin, @@ -60,18 +59,24 @@ fun PluginCard( // Authors val authors = buildAnnotatedString { - pushStyle(SpanStyle(color = MaterialTheme.colorScheme.secondary)) - append("By ") + withStyle(SpanStyle(color = MaterialTheme.colorScheme.secondary)) { + append("By ") + } - val authors = plugin.manifest.authors - authors.forEachIndexed { i, author -> + val iterator = plugin.manifest.authors.iterator() + + iterator.forEach { author -> withStyle(SpanStyle(color = MaterialTheme.colorScheme.primary)) { val start = this@buildAnnotatedString.length append(author.name) addStringAnnotation("authorId", author.id.toString(), start, start + author.name.length) } - if (authors.size < i) - append(',') + + if (iterator.hasNext()) { + withStyle(SpanStyle(color = MaterialTheme.colorScheme.secondary)) { + append(", ") + } + } } } ClickableText(