Add dev/production update channels, clearer Euchre table, bolder Sequence highlight
Update channels - ci.yml now publishes each green push to dev as a prerelease tagged v1.0.<n>-dev, so the dev channel has something to install. Workflow artifacts could not serve this: downloading one needs authentication, which the app does not have. - Prereleases specifically, because GitHub's "latest release" endpoint skips them — a production install can never be handed a dev build. Pull requests build and check but never publish. - Settings gains a channel picker. The two channels are numbered by separate workflow run counters, so versions are only compared within a channel; the app reads the -dev suffix in its own versionName to know where it stands, and treats a channel change as an explicit switch. The screen warns that such a switch can be a downgrade Android will refuse. - PLG_RELEASE becomes PLG_CHANNEL, naming the channel rather than a flag. Euchre - Cards in a trick now sit on the side of the table belonging to whoever played them, rotated to face them, labelled You / Left / Partner / Right. Previously they were a flat row tagged with seat numbers, which made it hard to tell who had played what. - Bidding says what it will actually do. As dealer the button reads "Pick it up" rather than "Order up", since the turn card comes to your hand, and a line of explanatory text spells out the consequence either way. Sequence - Playable squares get a much heavier outline, scaled off cell size and in a fixed amber that reads against a white card, a green corner and a chip alike. The old 2dp theme-coloured border was hard to see. Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_015qjfMiPUDshdKEUa6vxqzN
This commit is contained in:
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.Divider
|
||||
import androidx.compose.material3.FilterChip
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Slider
|
||||
@@ -25,6 +26,7 @@ import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import kotlinx.coroutines.launch
|
||||
import org.prolibertate.games.settings.Settings
|
||||
import org.prolibertate.games.update.UpdateChannel
|
||||
import org.prolibertate.games.update.Updater
|
||||
|
||||
@Composable
|
||||
@@ -98,11 +100,44 @@ fun SettingsScreen(
|
||||
|
||||
Text("Updates", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium)
|
||||
Text(
|
||||
text = "Installed: v${env.updater.installedVersionName()}. Updates come from " +
|
||||
"the latest release published on the project's main branch.",
|
||||
text = "Installed: v${env.updater.installedVersionName()} " +
|
||||
"(${env.updater.installedChannel().label} channel).",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
|
||||
Column {
|
||||
Text("Update channel", fontWeight = FontWeight.Bold)
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
UpdateChannel.entries.forEach { channel ->
|
||||
FilterChip(
|
||||
selected = settings.updateChannel == channel,
|
||||
onClick = {
|
||||
scope.launch {
|
||||
env.settingsRepository.setUpdateChannel(channel)
|
||||
}
|
||||
updateStatus = null
|
||||
pendingRelease = null
|
||||
},
|
||||
label = { Text(channel.label) },
|
||||
)
|
||||
}
|
||||
}
|
||||
Text(
|
||||
text = settings.updateChannel.blurb + ".",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
if (settings.updateChannel != env.updater.installedChannel()) {
|
||||
// The channels are numbered independently, so a switch can
|
||||
// be a downgrade as far as Android is concerned.
|
||||
Text(
|
||||
text = "You're on a ${env.updater.installedChannel().label} build. " +
|
||||
"Switching channels installs a different build rather than a " +
|
||||
"newer one — if Android refuses it, uninstall this copy first.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
SettingRow(
|
||||
title = "Check on launch",
|
||||
subtitle = "Look for a newer release when the app starts",
|
||||
@@ -117,16 +152,22 @@ fun SettingsScreen(
|
||||
|
||||
PrimaryAction(text = "Check for updates now") {
|
||||
scope.launch {
|
||||
updateStatus = "Checking…"
|
||||
when (val result = env.updater.check()) {
|
||||
updateStatus = "Checking the ${settings.updateChannel.label} channel…"
|
||||
when (val result = env.updater.check(settings.updateChannel)) {
|
||||
is Updater.Result.UpToDate -> {
|
||||
updateStatus = "You're on the latest version."
|
||||
updateStatus =
|
||||
"You're on the latest ${settings.updateChannel.label} build."
|
||||
pendingRelease = null
|
||||
}
|
||||
|
||||
is Updater.Result.Available -> {
|
||||
pendingRelease = result.release
|
||||
updateStatus = "Version ${result.release.tag} is available."
|
||||
updateStatus = if (result.isChannelSwitch) {
|
||||
"${result.release.tag} is the current " +
|
||||
"${result.release.channel.label} build."
|
||||
} else {
|
||||
"Version ${result.release.tag} is available."
|
||||
}
|
||||
}
|
||||
|
||||
is Updater.Result.Failed -> {
|
||||
|
||||
@@ -22,6 +22,8 @@ import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.draw.rotate
|
||||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.dp
|
||||
import org.prolibertate.games.game.euchre.CallTrump
|
||||
import org.prolibertate.games.game.euchre.Discard
|
||||
@@ -35,7 +37,6 @@ import org.prolibertate.games.game.euchre.teamOf
|
||||
import org.prolibertate.games.net.MatchController
|
||||
import org.prolibertate.games.ui.PrimaryAction
|
||||
import org.prolibertate.games.ui.ScreenScaffold
|
||||
import org.prolibertate.games.ui.common.CardBackView
|
||||
import org.prolibertate.games.ui.common.PlayingCardView
|
||||
import org.prolibertate.games.ui.theme.FeltGreenDark
|
||||
|
||||
@@ -83,7 +84,7 @@ fun EuchreScreen(
|
||||
.background(FeltGreenDark),
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
TrickArea(current, cardWidth)
|
||||
TrickArea(current, localSeat, cardWidth)
|
||||
}
|
||||
|
||||
notice?.let {
|
||||
@@ -93,7 +94,7 @@ fun EuchreScreen(
|
||||
when (current.phase) {
|
||||
EuchrePhase.BID_ROUND_1,
|
||||
EuchrePhase.BID_ROUND_2,
|
||||
-> BiddingControls(current, legal) { controller.submit(it) }
|
||||
-> BiddingControls(current, localSeat, legal) { controller.submit(it) }
|
||||
|
||||
EuchrePhase.HAND_OVER -> Text(
|
||||
text = current.log.lastOrNull().orEmpty(),
|
||||
@@ -146,40 +147,96 @@ private fun ScoreBar(state: EuchreState, localSeat: Int) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Where a seat sits relative to you: 0 is you, then clockwise round the table.
|
||||
* Euchre seats are numbered clockwise and partners sit opposite, so 2 is always
|
||||
* your partner.
|
||||
*/
|
||||
private fun relativePosition(seat: Int, localSeat: Int): Int = ((seat - localSeat) % 4 + 4) % 4
|
||||
|
||||
private fun seatLabel(relative: Int): String = when (relative) {
|
||||
0 -> "You"
|
||||
1 -> "Left"
|
||||
2 -> "Partner"
|
||||
else -> "Right"
|
||||
}
|
||||
|
||||
/**
|
||||
* The table. Each card sits on the side of the player who played it and is
|
||||
* turned to face them, so you can read a trick at a glance instead of matching
|
||||
* seat numbers to cards.
|
||||
*/
|
||||
@Composable
|
||||
private fun TrickArea(state: EuchreState, cardWidth: androidx.compose.ui.unit.Dp) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
private fun TrickArea(state: EuchreState, localSeat: Int, cardWidth: Dp) {
|
||||
Box(modifier = Modifier.fillMaxSize().padding(4.dp)) {
|
||||
|
||||
// The turn card sits in the middle of the table during bidding.
|
||||
state.upCard?.let { up ->
|
||||
Text("Turned up", color = MaterialTheme.colorScheme.onPrimary)
|
||||
PlayingCardView(card = up, width = cardWidth)
|
||||
}
|
||||
if (state.trick.isNotEmpty()) {
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
state.trick.forEach { played ->
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Text(
|
||||
text = "Seat ${played.seat}",
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = MaterialTheme.colorScheme.onPrimary,
|
||||
)
|
||||
PlayingCardView(card = played.card, width = cardWidth)
|
||||
}
|
||||
}
|
||||
Column(
|
||||
modifier = Modifier.align(Alignment.Center),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
Text(
|
||||
text = "Turned up",
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = MaterialTheme.colorScheme.onPrimary,
|
||||
)
|
||||
PlayingCardView(card = up, width = cardWidth)
|
||||
}
|
||||
} else if (state.upCard == null && state.phase == EuchrePhase.PLAYING) {
|
||||
Text("Lead a card", color = MaterialTheme.colorScheme.onPrimary)
|
||||
}
|
||||
|
||||
// Opponents' hands are only ever card counts on this device.
|
||||
Row(
|
||||
modifier = Modifier.padding(top = 12.dp),
|
||||
horizontalArrangement = Arrangement.spacedBy(4.dp),
|
||||
) {
|
||||
state.handCounts.forEachIndexed { seat, count ->
|
||||
if (seat != state.turn) return@forEachIndexed
|
||||
repeat(count.coerceAtMost(5)) {
|
||||
CardBackView(width = cardWidth * 0.4f)
|
||||
}
|
||||
if (state.upCard == null && state.trick.isEmpty() && state.phase == EuchrePhase.PLAYING) {
|
||||
Text(
|
||||
text = if (state.turn == localSeat) "Lead a card" else "Waiting…",
|
||||
color = MaterialTheme.colorScheme.onPrimary,
|
||||
modifier = Modifier.align(Alignment.Center),
|
||||
)
|
||||
}
|
||||
|
||||
state.trick.forEach { played ->
|
||||
val relative = relativePosition(played.seat, localSeat)
|
||||
val alignment = when (relative) {
|
||||
0 -> Alignment.BottomCenter
|
||||
1 -> Alignment.CenterStart
|
||||
2 -> Alignment.TopCenter
|
||||
else -> Alignment.CenterEnd
|
||||
}
|
||||
// Rotate to face the player who played it: the side seats end up
|
||||
// landscape, the partner's card upside down from your side.
|
||||
val rotation = when (relative) {
|
||||
1 -> 90f
|
||||
2 -> 180f
|
||||
3 -> -90f
|
||||
else -> 0f
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = Modifier.align(alignment),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
PlayingCardView(
|
||||
card = played.card,
|
||||
width = cardWidth,
|
||||
modifier = Modifier.rotate(rotation),
|
||||
)
|
||||
Text(
|
||||
text = seatLabel(relative),
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = MaterialTheme.colorScheme.onPrimary,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Who is on the clock, shown where they sit rather than as a seat number.
|
||||
if (state.phase == EuchrePhase.PLAYING && state.trick.size < state.activeSeatCount) {
|
||||
val waitingOn = relativePosition(state.turn, localSeat)
|
||||
if (waitingOn != 0 && state.trick.none { it.seat == state.turn }) {
|
||||
Text(
|
||||
text = "${seatLabel(waitingOn)} to play",
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = MaterialTheme.colorScheme.onPrimary,
|
||||
modifier = Modifier.align(Alignment.BottomStart),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -188,22 +245,43 @@ private fun TrickArea(state: EuchreState, cardWidth: androidx.compose.ui.unit.Dp
|
||||
@Composable
|
||||
private fun BiddingControls(
|
||||
state: EuchreState,
|
||||
localSeat: Int,
|
||||
legal: List<EuchreMove>,
|
||||
onMove: (EuchreMove) -> Unit,
|
||||
) {
|
||||
if (legal.isEmpty()) {
|
||||
Text("Waiting for seat ${state.turn}…")
|
||||
val waitingOn = relativePosition(state.turn, localSeat)
|
||||
Text("Waiting for ${seatLabel(waitingOn).lowercase()} to bid…")
|
||||
return
|
||||
}
|
||||
|
||||
// Controls only render on your turn, so the seat on the clock is you —
|
||||
// which means being the dealer is what decides whether ordering up hands
|
||||
// the turn card to somebody else or to yourself.
|
||||
val youAreDealer = state.turn == state.dealer
|
||||
val upCard = state.upCard
|
||||
|
||||
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
Text(
|
||||
text = if (state.phase == EuchrePhase.BID_ROUND_1) {
|
||||
"Order up ${state.upCard?.label.orEmpty()}?"
|
||||
} else {
|
||||
"Name a suit"
|
||||
text = when {
|
||||
state.phase != EuchrePhase.BID_ROUND_1 -> "Name a suit for trump"
|
||||
youAreDealer -> "Pick up ${upCard?.label.orEmpty()} for trump, or pass?"
|
||||
else -> "Order up ${upCard?.label.orEmpty()} for trump, or pass?"
|
||||
},
|
||||
fontWeight = FontWeight.Bold,
|
||||
)
|
||||
if (state.phase == EuchrePhase.BID_ROUND_1 && upCard != null) {
|
||||
Text(
|
||||
text = if (youAreDealer) {
|
||||
"Taking it makes ${upCard.suit.symbol} trump and puts that card " +
|
||||
"in your hand — you'll then discard one."
|
||||
} else {
|
||||
"Ordering it up makes ${upCard.suit.symbol} trump and gives that " +
|
||||
"card to the dealer."
|
||||
},
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
}
|
||||
Row(
|
||||
modifier = Modifier.horizontalScroll(rememberScrollState()),
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp),
|
||||
@@ -211,11 +289,16 @@ private fun BiddingControls(
|
||||
legal.forEach { move ->
|
||||
val label = when (move) {
|
||||
is Pass -> "Pass"
|
||||
is OrderUp -> if (move.alone) "Order up alone" else "Order up"
|
||||
is CallTrump -> {
|
||||
(if (move.alone) "Alone " else "") + move.suit.symbol
|
||||
is OrderUp -> when {
|
||||
youAreDealer && move.alone -> "Pick it up, alone"
|
||||
youAreDealer -> "Pick it up"
|
||||
move.alone -> "Order up alone"
|
||||
else -> "Order up ${upCard?.suit?.symbol.orEmpty()}"
|
||||
}
|
||||
|
||||
is CallTrump ->
|
||||
if (move.alone) "${move.suit.symbol} alone" else "Make it ${move.suit.symbol}"
|
||||
|
||||
is Discard -> "Discard ${move.card.label}"
|
||||
is PlayCard -> move.card.label
|
||||
}
|
||||
@@ -234,7 +317,7 @@ private fun HandRow(
|
||||
state: EuchreState,
|
||||
seat: Int,
|
||||
legal: List<EuchreMove>,
|
||||
cardWidth: androidx.compose.ui.unit.Dp,
|
||||
cardWidth: Dp,
|
||||
onPlay: (EuchreMove) -> Unit,
|
||||
) {
|
||||
val hand = state.hands.getOrNull(seat).orEmpty()
|
||||
|
||||
@@ -47,6 +47,13 @@ import org.prolibertate.games.ui.ScreenScaffold
|
||||
import org.prolibertate.games.ui.theme.FeltGreenDark
|
||||
import org.prolibertate.games.ui.theme.TeamColours
|
||||
|
||||
/**
|
||||
* Outline for a square the selected card can be played on. Deliberately not a
|
||||
* theme colour: it must contrast with both team chip colours and with the
|
||||
* board in either light or dark mode.
|
||||
*/
|
||||
private val HighlightAmber = Color(0xFFFFC107)
|
||||
|
||||
/**
|
||||
* The Sequence board.
|
||||
*
|
||||
@@ -191,8 +198,16 @@ private fun BoardCell(
|
||||
.clip(RoundedCornerShape(size * 0.12f))
|
||||
.background(if (card == null) MaterialTheme.colorScheme.primary else Color.White)
|
||||
.border(
|
||||
width = if (highlighted) 2.dp else 0.5.dp,
|
||||
color = if (highlighted) MaterialTheme.colorScheme.tertiary else Color(0x33000000),
|
||||
// Playable squares are outlined heavily rather than tinted: the
|
||||
// outline has to read against a white card, a green corner and
|
||||
// a chip sitting on top of it. Scaled off the cell so it stays
|
||||
// visible on a small screen without swamping a large one.
|
||||
width = if (highlighted) {
|
||||
(size * 0.10f).coerceIn(3.dp, 6.dp)
|
||||
} else {
|
||||
0.5.dp
|
||||
},
|
||||
color = if (highlighted) HighlightAmber else Color(0x33000000),
|
||||
shape = RoundedCornerShape(size * 0.12f),
|
||||
)
|
||||
.clickable { onClick() },
|
||||
|
||||
Reference in New Issue
Block a user