Skip to content

Commit b603436

Browse files
committed
chore(UI): tweak opacity of list summaries
1 parent e3244e4 commit b603436

4 files changed

Lines changed: 12 additions & 27 deletions

File tree

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/components/Layouts.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fun <E> SimpleListLayout(
121121
require(items.isNotEmpty()) { "Items list cannot be empty" }
122122

123123
var selectedItem by remember {
124-
mutableStateOf<E>(
124+
mutableStateOf(
125125
items.firstOrNull { getItemId(it) == currentId }
126126
?: items.firstOrNull { getItemId(it) == defaultId }
127127
?: items.first()

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/game/DownloadGameElements.kt

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ import androidx.compose.ui.unit.Dp
4646
import androidx.compose.ui.unit.dp
4747
import com.movtery.zalithlauncher.R
4848
import com.movtery.zalithlauncher.game.addons.modloader.ModLoader
49-
import com.movtery.zalithlauncher.game.addons.modloader.fabriclike.fabric.FabricVersion
50-
import com.movtery.zalithlauncher.game.addons.modloader.fabriclike.quilt.QuiltVersion
49+
import com.movtery.zalithlauncher.game.addons.modloader.fabriclike.FabricLikeVersion
5150
import com.movtery.zalithlauncher.game.addons.modloader.forgelike.forge.ForgeVersion
5251
import com.movtery.zalithlauncher.game.addons.modloader.forgelike.neoforge.NeoForgeVersion
5352
import com.movtery.zalithlauncher.game.addons.modloader.optifine.OptiFineVersion
@@ -406,7 +405,7 @@ fun OptiFineVersionSummary(optifine: OptiFineVersion) {
406405
}
407406

408407
Row(
409-
modifier = Modifier.alpha(alpha = 0.8f)
408+
modifier = Modifier.alpha(alpha = 0.7f)
410409
) {
411410
Text(text = typeText, style = MaterialTheme.typography.labelSmall)
412411
Spacer(modifier = Modifier.width(12.dp))
@@ -427,7 +426,7 @@ fun ForgeVersionSummary(forgeVersion: ForgeVersion) {
427426
val dateText = stringResource(R.string.download_game_addon_date, forgeVersion.releaseTime)
428427

429428
Row(
430-
modifier = Modifier.alpha(alpha = 0.8f)
429+
modifier = Modifier.alpha(alpha = 0.7f)
431430
) {
432431
recommendedText?.let {
433432
Text(text = it, style = MaterialTheme.typography.labelSmall)
@@ -446,37 +445,22 @@ fun NeoForgeSummary(neoforgeVersion: NeoForgeVersion) {
446445
}
447446

448447
Row(
449-
modifier = Modifier.alpha(alpha = 0.8f)
448+
modifier = Modifier.alpha(alpha = 0.7f)
450449
) {
451450
Text(text = typeText, style = MaterialTheme.typography.labelSmall)
452451
}
453452
}
454453

455454
@Composable
456-
fun FabricSummary(fabricVersion: FabricVersion) {
457-
val typeText = if (fabricVersion.stable) {
455+
fun FabricLikeSummary(fabricLikeVersion: FabricLikeVersion) {
456+
val typeText = if (fabricLikeVersion.stable) {
458457
stringResource(R.string.download_game_addon_stable)
459458
} else {
460459
stringResource(R.string.download_game_addon_debug)
461460
}
462461

463462
Row(
464-
modifier = Modifier.alpha(alpha = 0.8f)
465-
) {
466-
Text(text = typeText, style = MaterialTheme.typography.labelSmall)
467-
}
468-
}
469-
470-
@Composable
471-
fun QuiltSummary(quiltVersion: QuiltVersion) {
472-
val typeText = if (quiltVersion.stable) {
473-
stringResource(R.string.download_game_addon_stable)
474-
} else {
475-
stringResource(R.string.download_game_addon_debug)
476-
}
477-
478-
Row(
479-
modifier = Modifier.alpha(alpha = 0.8f)
463+
modifier = Modifier.alpha(alpha = 0.7f)
480464
) {
481465
Text(text = typeText, style = MaterialTheme.typography.labelSmall)
482466
}

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/download/game/DownloadGameWithAddonScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ private fun FabricList(
638638
}
639639
},
640640
getItemText = { it.version },
641-
summary = { FabricSummary(it) },
641+
summary = { FabricLikeSummary(it) },
642642
onValueChange = { version ->
643643
currentAddon.fabricVersion = version
644644
},
@@ -689,7 +689,7 @@ private fun QuiltList(
689689
}
690690
},
691691
getItemText = { it.version },
692-
summary = { QuiltSummary(it) },
692+
summary = { FabricLikeSummary(it) },
693693
onValueChange = { version ->
694694
currentAddon.quiltVersion = version
695695
},

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/settings/RendererSettingsScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.compose.runtime.remember
2121
import androidx.compose.runtime.setValue
2222
import androidx.compose.ui.Alignment
2323
import androidx.compose.ui.Modifier
24+
import androidx.compose.ui.draw.alpha
2425
import androidx.compose.ui.platform.LocalContext
2526
import androidx.compose.ui.res.stringResource
2627
import androidx.compose.ui.unit.IntOffset
@@ -192,7 +193,7 @@ fun RendererSettingsScreen() {
192193
@Composable
193194
@OptIn(ExperimentalLayoutApi::class)
194195
fun RendererSummaryLayout(renderer: RendererInterface) {
195-
FlowRow {
196+
FlowRow(modifier = Modifier.alpha(0.7f)) {
196197
with(renderer) {
197198
getRendererSummary()?.let { summary ->
198199
Text(text = summary, style = MaterialTheme.typography.labelSmall)

0 commit comments

Comments
 (0)