diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index 491e7afe5..210250074 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -1,5 +1,9 @@ package com.droiddeck.launcher.ui +import coil.compose.AsyncImage +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.graphics.Brush +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement @@ -79,68 +83,69 @@ private fun DownloadList(s: FrontEndState, a: FrontEndActions) { @Composable private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) { val ctx = LocalContext.current - val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - Column( - verticalArrangement = Arrangement.spacedBy(7.dp), - modifier = Modifier.fillMaxWidth().clip(Shape12).background(colors.surface).border(1.dp, pal.line, Shape12).padding(horizontal = 14.dp, vertical = 10.dp), - ) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth()) { - // The game's art, small and fixed, so the row stays one line tall on a narrow page. - CardArt(CatalogItem(d.store, d.id, d.name, d.cover), Modifier.width(96.dp).height(54.dp).clip(RoundedCornerShape(6.dp))) - Column(modifier = Modifier.weight(1f)) { - Text(d.name, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = 2.dp)) { + val narrow = LocalNarrowPane.current + val ink = Color.White + val dim = Color.White.copy(alpha = 0.72f) + // The game's wide art is the row: cropped to it, a dark wash from the left so the copy reads + // in white there, the art clear on the right. + Box(Modifier.fillMaxWidth().heightIn(min = 88.dp).clip(Shape12).background(Color(0xFF101318)).border(1.dp, pal.line, Shape12)) { + if (!d.cover.isNullOrEmpty()) AsyncImage(model = d.cover, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) + else Spacer(Modifier.matchParentSize().background(artBrush(hueOf(d.name)))) + Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0f to Color.Black.copy(alpha = 0.92f), 0.5f to Color.Black.copy(alpha = 0.7f), 1f to Color.Black.copy(alpha = 0.15f)))) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().padding(horizontal = 14.dp, vertical = 10.dp)) { + Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.weight(1f)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(d.name, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = ink, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) SourceChip(d.store.id, small = true) - if (d.location.isNotBlank()) Text(d.location, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (d.location.isNotBlank()) Text(d.location, fontSize = 11.sp, color = dim, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + if (!narrow) Stages(d) + ProgressBarThin( + if (d.state == DownloadState.INSTALLED) 1f else d.fraction, paused = d.state == DownloadState.PAUSED, + verify = d.stage == DownloadStage.VERIFY, height = 6.dp, done = d.state == DownloadState.INSTALLED, + ) + Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) { + val meta = when (d.state) { + DownloadState.INSTALLED -> stringResource(R.string.stores_installed_chip) + DownloadState.CANCELLED -> stringResource(R.string.stores_dl_cancelled) + DownloadState.FAILED -> d.error?.let { stringResource(R.string.stores_dl_failed_reason, it) } ?: stringResource(R.string.stores_dl_failed) + DownloadState.PAUSED -> stringResource(R.string.stores_dl_paused) + DownloadState.QUEUED -> if (d.queuePosition > 0) stringResource(R.string.stores_dl_queued_at, d.queuePosition) else stringResource(R.string.stores_dl_queued) + DownloadState.RUNNING -> when { + d.stage == DownloadStage.DOWNLOAD && d.bytesTotal > 0 -> stringResource(R.string.stores_dl_bytes, formatBytes(d.bytesDone), formatBytes(d.bytesTotal), d.percent) + else -> stageLabel(d.stage) + } + } + Text(meta, fontSize = 12.sp, color = dim, maxLines = 2, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + if (d.state == DownloadState.RUNNING && d.speedBps > 0) { + Text(formatSpeed(d.speedBps), fontSize = 12.sp, color = dim, maxLines = 1) + if (d.etaSeconds >= 0) Text(eta(d.etaSeconds), fontSize = 12.sp, color = dim, maxLines = 1) + } } } - if (!LocalNarrowPane.current) Stages(d) - } - if (LocalNarrowPane.current) Stages(d) - ProgressBarThin( - if (d.state == DownloadState.INSTALLED) 1f else d.fraction, paused = d.state == DownloadState.PAUSED, - verify = d.stage == DownloadStage.VERIFY, height = 8.dp, done = d.state == DownloadState.INSTALLED, - ) - Row(horizontalArrangement = Arrangement.spacedBy(16.dp), modifier = Modifier.fillMaxWidth()) { - val meta = when (d.state) { - DownloadState.INSTALLED -> stringResource(R.string.stores_installed_chip) - DownloadState.CANCELLED -> stringResource(R.string.stores_dl_cancelled) - DownloadState.FAILED -> d.error?.let { stringResource(R.string.stores_dl_failed_reason, it) } ?: stringResource(R.string.stores_dl_failed) - DownloadState.PAUSED -> stringResource(R.string.stores_dl_paused) - DownloadState.QUEUED -> if (d.queuePosition > 0) stringResource(R.string.stores_dl_queued_at, d.queuePosition) else stringResource(R.string.stores_dl_queued) - DownloadState.RUNNING -> when { - d.stage == DownloadStage.DOWNLOAD && d.bytesTotal > 0 -> stringResource(R.string.stores_dl_bytes, formatBytes(d.bytesDone), formatBytes(d.bytesTotal), d.percent) - else -> stageLabel(d.stage) + // The row's actions on the right, over the art. + Column(verticalArrangement = Arrangement.spacedBy(6.dp), horizontalAlignment = Alignment.End) { + when (d.state) { + DownloadState.RUNNING, DownloadState.QUEUED -> { + SecondaryButton(stringResource(R.string.stores_dl_pause), compact = true) { DownloadQueue.pause(d.key) } + SecondaryButton(stringResource(R.string.stores_dl_cancel), compact = true) { DownloadQueue.cancel(ctx, d.key) } + } + DownloadState.PAUSED -> { + PrimaryButton(stringResource(R.string.stores_dl_resume), compact = true) { DownloadQueue.resume(ctx, d.key) } + SecondaryButton(stringResource(R.string.stores_dl_cancel), compact = true) { DownloadQueue.cancel(ctx, d.key) } + } + DownloadState.FAILED -> { + PrimaryButton(stringResource(R.string.stores_dl_retry), compact = true) { DownloadQueue.retry(ctx, d.key) } + SecondaryButton(stringResource(R.string.stores_dl_clear), compact = true) { DownloadQueue.dismiss(d.key) } + } + DownloadState.INSTALLED -> { + PrimaryButton(stringResource(R.string.stores_play), compact = true, icon = Icons.Filled.PlayArrow) { launchStoreGame(ctx, d.store, d.id, s, a) } + SecondaryButton(stringResource(R.string.stores_dl_clear), compact = true) { DownloadQueue.dismiss(d.key) } + } + DownloadState.CANCELLED -> SecondaryButton(stringResource(R.string.stores_dl_clear), compact = true) { DownloadQueue.dismiss(d.key) } } } - Text(meta, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) - if (d.state == DownloadState.RUNNING && d.speedBps > 0) { - Text(formatSpeed(d.speedBps), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) - if (d.etaSeconds >= 0) Text(eta(d.etaSeconds), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) - } - } - if (d.detail.isNotBlank() && d.state == DownloadState.RUNNING) Text(d.detail, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) - Actions { - when (d.state) { - DownloadState.RUNNING, DownloadState.QUEUED -> { - SecondaryButton(stringResource(R.string.stores_dl_pause), compact = true) { DownloadQueue.pause(d.key) } - SecondaryButton(stringResource(R.string.stores_dl_cancel), compact = true) { DownloadQueue.cancel(ctx, d.key) } - } - DownloadState.PAUSED -> { - PrimaryButton(stringResource(R.string.stores_dl_resume), compact = true) { DownloadQueue.resume(ctx, d.key) } - SecondaryButton(stringResource(R.string.stores_dl_cancel), compact = true) { DownloadQueue.cancel(ctx, d.key) } - } - DownloadState.FAILED -> { - PrimaryButton(stringResource(R.string.stores_dl_retry), compact = true) { DownloadQueue.retry(ctx, d.key) } - SecondaryButton(stringResource(R.string.stores_dl_clear), compact = true) { DownloadQueue.dismiss(d.key) } - } - DownloadState.INSTALLED -> { - PrimaryButton(stringResource(R.string.stores_play), compact = true, icon = Icons.Filled.PlayArrow) { launchStoreGame(ctx, d.store, d.id, s, a) } - SecondaryButton(stringResource(R.string.stores_dl_clear), compact = true) { DownloadQueue.dismiss(d.key) } - } - DownloadState.CANCELLED -> SecondaryButton(stringResource(R.string.stores_dl_clear), compact = true) { DownloadQueue.dismiss(d.key) } - } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt index db61b6d07..e7d645a03 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt @@ -41,8 +41,8 @@ import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.formatBytes /** - * "Install to": a small card with one tile per place - internal storage, the card - each the - * action itself: icon, name, free space. Asked only when a card is there. The tile picked last time + * "Install :" over one row per place - internal storage, the card - each the action + * itself: icon, name, free space. Asked only when a card is there. The row picked last time * starts focused, so a pad confirms the usual place with one press; nothing is chosen for the user. */ @Composable @@ -59,10 +59,10 @@ internal fun InstallWhereDialog(item: CatalogItem, onDismiss: () -> Unit) { AppDialog(shown, close, "installWhere", wide = false, maxWidth = 440.dp) { Rise(0) { Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { - Column(Modifier.weight(1f)) { - Eyebrow(item.title) - Text(stringResource(R.string.stores_install_where), fontSize = 18.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - } + Text( + stringResource(R.string.stores_install_title, item.title), fontSize = 15.sp, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), + ) Text( stringResource(R.string.common_cancel), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant, modifier = Modifier.clip(Shape12).clickable(role = Role.Button, onClick = close).padding(horizontal = 10.dp, vertical = 6.dp), @@ -70,12 +70,12 @@ internal fun InstallWhereDialog(item: CatalogItem, onDismiss: () -> Unit) { } } Rise(1) { - Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth()) { + Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { targets.forEachIndexed { i, t -> - TargetTile( + TargetRow( label = if (t.removable) t.label else stringResource(R.string.stores_target_internal), free = stringResource(R.string.stores_target_free, formatBytes(t.freeBytes)), - removable = t.removable, focus = focus[i], modifier = Modifier.weight(1f), + removable = t.removable, focus = focus[i], ) { SessionPrefs.setStoresInstallTarget(ctx, t.root.absolutePath) StoresState.install(ctx, item, t.root) @@ -88,25 +88,22 @@ internal fun InstallWhereDialog(item: CatalogItem, onDismiss: () -> Unit) { } @Composable -private fun TargetTile(label: String, free: String, removable: Boolean, focus: FocusRequester, modifier: Modifier, onPick: () -> Unit) { +private fun TargetRow(label: String, free: String, removable: Boolean, focus: FocusRequester, onPick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) - Box( - modifier.focusRequester(focus).clip(Shape12) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.fillMaxWidth().focusRequester(focus).clip(Shape12) .background(if (hot) pal.signal.copy(alpha = 0.14f) else colors.surface.copy(alpha = 0.6f)) .glideBorder(hot, Shape12, pal.signal, pal.line) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onPick) .controllerConfirm(onClick = onPick) - .padding(horizontal = 12.dp, vertical = 12.dp), + .padding(horizontal = 14.dp, vertical = 10.dp), ) { - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - Icon(if (removable) Icons.Outlined.SdCard else Icons.Outlined.Smartphone, null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(22.dp)) - Column { - Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text(free, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) - } - } + Icon(if (removable) Icons.Outlined.SdCard else Icons.Outlined.Smartphone, null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(22.dp)) + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(free, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index b859f0444..f91aa715a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1,5 +1,9 @@ package com.droiddeck.launcher.ui +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.draw.blur +import androidx.compose.foundation.layout.wrapContentHeight import androidx.activity.compose.BackHandler import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animateFloatAsState @@ -441,23 +445,49 @@ private fun GameCard(item: CatalogItem, store: Store, s: FrontEndState, a: Front val open = { onOpen(item.key) } Column( modifier = Modifier.fillMaxWidth().paneItem("card:${item.key}").then(if (first) Modifier.firstTile() else Modifier).graphicsLayer { scaleX = scale; scaleY = scale } - .clip(RoundedCornerShape(10.dp)).background(colors.surface).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line) + .clip(RoundedCornerShape(10.dp)).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, onClick = open).controllerConfirm(onClick = open), ) { - Box { - CardArt(item, Modifier.fillMaxWidth().aspectRatio(16f / 9f)) - if (download != null) Box(Modifier.align(Alignment.BottomCenter).padding(horizontal = 6.dp, vertical = 5.dp)) { + CardFace(item, download) { CardMarker(item, installed, download) } + } +} + +/** How tall the card's one line is, over the blurred foot of its art. */ +private val CardStrip = 28.dp + +/** + * The card is its art: sharp above, and under the one line a blurred, darkened copy of the same + * picture, placed so the two meet without a seam. Blur needs API 31; below it the copy is only + * darkened, more strongly. + */ +@Composable +private fun CardFace(item: CatalogItem, download: com.droiddeck.launcher.stores.download.DownloadEntry?, marker: @Composable () -> Unit) { + val url = item.imageUrl ?: item.tallImageUrl + val blurs = android.os.Build.VERSION.SDK_INT >= 31 + BoxWithConstraints(Modifier.fillMaxWidth()) { + val total = maxWidth * 9f / 16f + CardStrip + Box(Modifier.fillMaxWidth().height(total).background(Color(0xFF101318)).then(if (url == null) Modifier.background(artBrush(hueOf(item.title))) else Modifier)) { + if (url != null) AsyncImage(model = url, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) + Box(Modifier.align(Alignment.BottomCenter).fillMaxWidth().height(CardStrip).clipToBounds()) { + if (url != null) AsyncImage( + model = url, contentDescription = null, contentScale = ContentScale.Crop, + modifier = Modifier.fillMaxWidth().wrapContentHeight(Alignment.Bottom, unbounded = true).height(total).blur(24.dp), + ) + Spacer(Modifier.matchParentSize().background(Color.Black.copy(alpha = if (blurs) 0.45f else 0.7f))) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.matchParentSize().padding(horizontal = 8.dp), + ) { + Text(item.title, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + marker() + } + } + // A soft edge where the sharp art meets the strip. + Spacer(Modifier.align(Alignment.BottomCenter).padding(bottom = CardStrip).fillMaxWidth().height(14.dp).background(Brush.verticalGradient(0f to Color.Transparent, 1f to Color.Black.copy(alpha = 0.35f)))) + if (download != null) Box(Modifier.align(Alignment.BottomCenter).padding(start = 6.dp, end = 6.dp, bottom = CardStrip + 5.dp)) { ProgressBarThin(download.fraction, paused = download.state == DownloadState.PAUSED, verify = download.stage == DownloadStage.VERIFY) } } - // One line: the title, and on the right the one thing the tab does not already say. - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 7.dp), - ) { - Text(item.title, fontSize = 11.sp, lineHeight = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) - CardMarker(item, installed, download) - } } } @@ -471,13 +501,13 @@ private fun CardMarker(item: CatalogItem, installed: Boolean, download: com.droi installed -> Icon(Icons.Filled.Check, stringResource(R.string.stores_installed_chip), tint = pal.good, modifier = Modifier.size(14.dp)) download != null -> Text("${download.percent}%", fontSize = small, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) item.owned && StoresState.isUnfinished(item) -> Text(stringResource(R.string.stores_resume), fontSize = small, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) - item.owned -> if (item.sizeBytes > 0) Text(formatBytes(item.sizeBytes), fontSize = small, color = colors.onSurfaceVariant, maxLines = 1) + item.owned -> if (item.sizeBytes > 0) Text(formatBytes(item.sizeBytes), fontSize = small, color = Color.White.copy(alpha = 0.8f), maxLines = 1) item.isFree -> Text(stringResource(R.string.stores_free), fontSize = small, fontWeight = FontWeight.Bold, color = pal.good, maxLines = 1) item.isDiscounted -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { StateChip("-${item.discountPercent}%", ChipTone.DEAL, small = true) - Text(item.finalPrice, fontSize = small, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) + Text(item.finalPrice, fontSize = small, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1) } - item.hasPrice -> Text(item.finalPrice, fontSize = small, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) + item.hasPrice -> Text(item.finalPrice, fontSize = small, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a69150d80..184c85e52 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2065,6 +2065,7 @@ Download manager Downloads at a time Install to + Install %1$s: Internal %1$s free Engine log diff --git a/docs/progress-log.md b/docs/progress-log.md index cef1ae0a0..712b933cb 100644 --- a/docs/progress-log.md +++ b/docs/progress-log.md @@ -136,6 +136,12 @@ without it and Setup says "Stores engine not built"). when installed, Resume, the download percentage, the install size, or Free / price / discount. A thin bar over the art while downloading. Install, Resume, Uninstall, Get and Buy live on the game page; A on a card opens it. +- **The art is the card** (maintainer feedback): a store card is its art edge to edge, sharp above + and, under the one line, a blurred and darkened copy of the same picture (blur on API 31+, a + stronger scrim below it). A Downloads row is the game's wide art cropped to the row with a dark + wash from the left, the copy in white there and the actions on the right; no thumbnail. +- **Install dialog:** one plain line "Install :", then one row per place (icon, name, free + space), Cancel small in the title line; 440 dp wide. - **No flavor text** (standing rule from the maintainer): Setup › Stores and the cog popup keep only control labels; the download-controls caption, the Downloads footnote, the sign-in blurbs and footnote, the engine note and the Install-to caption are gone; empty states read "No games",