From 83896ba0fcbeaf43e14b650eacd5992ef284d7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Fern=C3=A1ndez?= Date: Thu, 12 Nov 2026 22:35:56 +0100 Subject: [PATCH 1/7] Wear OS: the rest screen like the Apple Watch's (#1100) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The time left is the screen's one number: in the accent, sized to the room the rest leaves (both ways, 28 to 76), no "Rest" label over it. The heart rate was already by the clock. - −15, Skip and +15 move up to the middle, where a round screen is widest; the effort chips get a fixed place under them, so rating moves nothing; Up next last. - Up next in the accent with the workout's time at its end (standing still while the phone has the workout paused), then the set and what to load. - Always On keeps the same layout: the buttons and chips are hidden but keep their place. The 40/41 mm rule stays as measured: without room for both, the effort question comes first. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp --- .../duartesantos/opengym/wear/ui/Screens.kt | 55 +++++++++++++------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt index 9e7e840835..801f68568d 100644 --- a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt +++ b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt @@ -8,6 +8,7 @@ import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.ColorMatrix import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.draw.alpha +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.Image import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn @@ -734,28 +735,35 @@ fun RestView(rest: Rest) { // Measured: up next and the effort chips together need 222 dp at the normal text size (and ~60 dp of it is text). // Without that (a 40/41 mm watch) the question comes first, then what's next. val both = roomy || maxHeight.value >= 222 + (LocalDensity.current.fontScale - 1f) * 60 + val rate = WearStore.canRateLast() && (both || rated == null) + val next = s.settings.show?.showNext != false && (both || !rate) Column(Modifier.fillMaxSize().padding(start = if (round) 20.dp else 6.dp, end = if (round) 20.dp else 6.dp, top = 22.dp, bottom = if (round) 26.dp else 6.dp), - horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(2.dp)) { - Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) { + // The time left, the screen's one number (#1100): in the accent, as big as the room the rest leaves. + Row(Modifier.fillMaxWidth().weight(1f), verticalAlignment = Alignment.CenterVertically) { if (last != null && !dim) ArrowButton(true, true) { WearStore.fixLast() } else Spacer(Modifier.width(32.dp)) - Column(Modifier.weight(1f), horizontalAlignment = Alignment.CenterHorizontally) { - Quiet(stringResource(R.string.rest), 11.sp, lines = 1) - Text(clock(kotlin.math.ceil(left).toLong()), style = Og.Number, fontSize = if (roomy) 42.sp else 36.sp, maxLines = 1, - color = Og.Text.copy(alpha = if (dim) 0.75f else 1f)) + val text = clock(kotlin.math.ceil(left).toLong()) + BoxWithConstraints(Modifier.weight(1f).fillMaxHeight(), contentAlignment = Alignment.Center) { + // Digits are ~0.72 of the font size tall and ~0.62 wide: the number fits the box both ways. + val px = minOf(maxHeight.value / 0.78f, maxWidth.value / (text.length * 0.62f)).coerceIn(28f, 76f) + Text(text, style = Og.Number, fontSize = with(LocalDensity.current) { px.dp.toSp() }, maxLines = 1, fontWeight = FontWeight.SemiBold, + color = a.accent.copy(alpha = if (dim) 0.75f else 1f), + modifier = Modifier.semantics { contentDescription = text }) } Spacer(Modifier.width(32.dp)) } if (s.settings.show?.rest != "plain") TimeBar(rest.startedAt, rest.endsAt, a.accent, Modifier.padding(horizontal = 8.dp)) - val rate = WearStore.canRateLast() && !dim && (both || rated == null) - if (s.settings.show?.showNext != false && (both || !rate)) UpNext(roomy) - Spacer(Modifier.weight(1f)) - if (rate) EffortChips(roomy) - // Round: the row sits low, where the circle narrows, so −15 and +15 step in from the edge. - if (!dim) Row(Modifier.fillMaxWidth().padding(horizontal = if (LocalRound.current) 8.dp else 0.dp), horizontalArrangement = Arrangement.spacedBy(4.dp), verticalAlignment = Alignment.CenterVertically) { - EdgeButton("−15 s", text = "−15", size = 40.dp) { WearStore.minusRest() } - RowButton(stringResource(R.string.skip), Modifier.weight(1f).height(40.dp), icon = G.NEXT, iconWhenTight = true) { WearStore.skipRest() } - EdgeButton("+15 s", text = "+15", size = 40.dp) { WearStore.addRest(15) } - } else Spacer(Modifier.height(40.dp)) + // −15, Skip, +15 mid-screen, where a round screen is widest. Always On hides them but keeps their place. + Row(Modifier.fillMaxWidth().alpha(if (dim) 0f else 1f), horizontalArrangement = Arrangement.spacedBy(4.dp), verticalAlignment = Alignment.CenterVertically) { + EdgeButton("−15 s", text = "−15", size = 40.dp, enabled = !dim) { WearStore.minusRest() } + RowButton(stringResource(R.string.skip), Modifier.weight(1f).height(40.dp), icon = G.NEXT, iconWhenTight = true, enabled = !dim) { WearStore.skipRest() } + EdgeButton("+15 s", text = "+15", size = 40.dp, enabled = !dim) { WearStore.addRest(15) } + } + // A fixed place for the effort, so rating it moves nothing below. + if (rate) Box(Modifier.fillMaxWidth().height(if (roomy) 46.dp else 30.dp).alpha(if (dim) 0f else 1f), contentAlignment = Alignment.Center) { + if (!dim) EffortChips(roomy) + } + if (next) UpNext(roomy) } } } @@ -768,7 +776,20 @@ private fun UpNext(roomy: Boolean) { val e = WearStore.entry() ?: return val si = WearStore.setIndex() ?: return val side = e.sets[si].sideUp - val line = stringResource(R.string.up_next) + ": " + stringResource(R.string.up_next_set, e.name, SetNav.place(e, si).first) + + val a = LocalAccent.current + val dim = LocalAmbient.current + // "Up next" in the accent with the workout's time at its end (#1100), then the set, then what to load. + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.up_next), color = a.accent.copy(alpha = if (dim) 0.75f else 1f), fontSize = 12.sp, fontWeight = FontWeight.Bold, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + WearStore.workoutStart()?.let { start -> + val now = rememberNow() + val at = w.pausedAt?.takeIf { it > 0 }?.toLong() ?: now + Text(clock(((at - start) / 1000).coerceAtLeast(0)), color = Og.Label2.copy(alpha = if (dim) 0.75f else 1f), fontSize = 12.sp, + fontWeight = FontWeight.Bold, style = Og.Number, maxLines = 1) + } + } + val line = stringResource(R.string.up_next_set, e.name, SetNav.place(e, si).first) + (side?.let { " · " + stringResource(if (it == "L") R.string.left else R.string.right) } ?: "") Quiet(line, 11.sp, lines = if (roomy) 2 else 1) nextSetNumbers(e, si, w.unit)?.let { Text(it, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, style = Og.Number) } From 709d3ba3ff15581d0832be1fa1dfc935a6f2868b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Fern=C3=A1ndez?= Date: Thu, 12 Nov 2026 22:54:27 +0100 Subject: [PATCH 2/7] =?UTF-8?q?Wear=20OS=20rest:=20the=20=E2=80=B9=20stays?= =?UTF-8?q?=20inside=20a=20round=20screen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Seen on a 40 mm watch (Wear OS 3 emulator): with Up next in the chips' place the countdown row was under 48 dp and ‹ was cut at its corner under the clock. The row is never shorter than ‹, which steps 6 dp in from the curve on a round screen. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp --- .../main/java/ch/duartesantos/opengym/wear/ui/Screens.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt index 801f68568d..dc4c55e778 100644 --- a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt +++ b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt @@ -740,7 +740,11 @@ fun RestView(rest: Rest) { Column(Modifier.fillMaxSize().padding(start = if (round) 20.dp else 6.dp, end = if (round) 20.dp else 6.dp, top = 22.dp, bottom = if (round) 26.dp else 6.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) { // The time left, the screen's one number (#1100): in the accent, as big as the room the rest leaves. - Row(Modifier.fillMaxWidth().weight(1f), verticalAlignment = Alignment.CenterVertically) { + // Never shorter than ‹, and on a round screen ‹ steps in from the curve (seen on a 40 mm watch: it + // was cut at its corner under the clock once Up next took the chips' place). + val inset = if (round) 6.dp else 0.dp + Row(Modifier.fillMaxWidth().weight(1f).heightIn(min = Og.Tap), verticalAlignment = Alignment.CenterVertically) { + Spacer(Modifier.width(inset)) if (last != null && !dim) ArrowButton(true, true) { WearStore.fixLast() } else Spacer(Modifier.width(32.dp)) val text = clock(kotlin.math.ceil(left).toLong()) BoxWithConstraints(Modifier.weight(1f).fillMaxHeight(), contentAlignment = Alignment.Center) { @@ -750,7 +754,7 @@ fun RestView(rest: Rest) { color = a.accent.copy(alpha = if (dim) 0.75f else 1f), modifier = Modifier.semantics { contentDescription = text }) } - Spacer(Modifier.width(32.dp)) + Spacer(Modifier.width(32.dp + inset)) } if (s.settings.show?.rest != "plain") TimeBar(rest.startedAt, rest.endsAt, a.accent, Modifier.padding(horizontal = 8.dp)) // −15, Skip, +15 mid-screen, where a round screen is widest. Always On hides them but keeps their place. From 6c65f9f1a199b5313ece180dc8105d1f6143dc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Fern=C3=A1ndez?= Date: Thu, 12 Nov 2026 22:55:42 +0100 Subject: [PATCH 3/7] Wear OS rest: 6 dp more under the clock on a round screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The clock's arc reaches lower at its ends, where ‹ sits (40 mm emulator, Up next showing). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp --- .../src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt index dc4c55e778..70fbdcf782 100644 --- a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt +++ b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt @@ -737,7 +737,8 @@ fun RestView(rest: Rest) { val both = roomy || maxHeight.value >= 222 + (LocalDensity.current.fontScale - 1f) * 60 val rate = WearStore.canRateLast() && (both || rated == null) val next = s.settings.show?.showNext != false && (both || !rate) - Column(Modifier.fillMaxSize().padding(start = if (round) 20.dp else 6.dp, end = if (round) 20.dp else 6.dp, top = 22.dp, bottom = if (round) 26.dp else 6.dp), + // Round: the clock's arc reaches lower at its ends, where ‹ sits: 6 dp more under it. + Column(Modifier.fillMaxSize().padding(start = if (round) 20.dp else 6.dp, end = if (round) 20.dp else 6.dp, top = if (round) 28.dp else 22.dp, bottom = if (round) 26.dp else 6.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) { // The time left, the screen's one number (#1100): in the accent, as big as the room the rest leaves. // Never shorter than ‹, and on a round screen ‹ steps in from the curve (seen on a 40 mm watch: it From 29dbf27cebbb36f99e36668a035f9af88f57d17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Fern=C3=A1ndez?= Date: Thu, 12 Nov 2026 22:57:17 +0100 Subject: [PATCH 4/7] Wear OS rest: Up next in two lines on a small watch, the countdown never over the bar Seen on a 40 mm watch (Wear OS 3 emulator): with Up next in the chips' place the screen needed ~209 dp of its 192. There Up next is one line again ("Up next: the set") with what to load and the workout's time on the next; a roomy watch keeps three. The countdown is sized to a line of text (~1.1 of its size), not to the digits alone. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp --- .../duartesantos/opengym/wear/ui/Screens.kt | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt index 70fbdcf782..1138427998 100644 --- a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt +++ b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt @@ -749,8 +749,9 @@ fun RestView(rest: Rest) { if (last != null && !dim) ArrowButton(true, true) { WearStore.fixLast() } else Spacer(Modifier.width(32.dp)) val text = clock(kotlin.math.ceil(left).toLong()) BoxWithConstraints(Modifier.weight(1f).fillMaxHeight(), contentAlignment = Alignment.Center) { - // Digits are ~0.72 of the font size tall and ~0.62 wide: the number fits the box both ways. - val px = minOf(maxHeight.value / 0.78f, maxWidth.value / (text.length * 0.62f)).coerceIn(28f, 76f) + // Digits are ~0.62 of the font size wide: the number fits the box both ways. + // A line of text is ~1.1 of its size tall (not just the digits): it never runs into the bar. + val px = minOf(maxHeight.value / 1.1f, maxWidth.value / (text.length * 0.62f)).coerceIn(28f, 76f) Text(text, style = Og.Number, fontSize = with(LocalDensity.current) { px.dp.toSp() }, maxLines = 1, fontWeight = FontWeight.SemiBold, color = a.accent.copy(alpha = if (dim) 0.75f else 1f), modifier = Modifier.semantics { contentDescription = text }) @@ -783,10 +784,11 @@ private fun UpNext(roomy: Boolean) { val side = e.sets[si].sideUp val a = LocalAccent.current val dim = LocalAmbient.current - // "Up next" in the accent with the workout's time at its end (#1100), then the set, then what to load. - Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { - Text(stringResource(R.string.up_next), color = a.accent.copy(alpha = if (dim) 0.75f else 1f), fontSize = 12.sp, fontWeight = FontWeight.Bold, - maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + val set = stringResource(R.string.up_next_set, e.name, SetNav.place(e, si).first) + + (side?.let { " · " + stringResource(if (it == "L") R.string.left else R.string.right) } ?: "") + val numbers = nextSetNumbers(e, si, w.unit) + // The workout's time (#1100), standing still while the phone has the workout paused. + val time: @Composable () -> Unit = { WearStore.workoutStart()?.let { start -> val now = rememberNow() val at = w.pausedAt?.takeIf { it > 0 }?.toLong() ?: now @@ -794,10 +796,23 @@ private fun UpNext(roomy: Boolean) { fontWeight = FontWeight.Bold, style = Og.Number, maxLines = 1) } } - val line = stringResource(R.string.up_next_set, e.name, SetNav.place(e, si).first) + - (side?.let { " · " + stringResource(if (it == "L") R.string.left else R.string.right) } ?: "") - Quiet(line, 11.sp, lines = if (roomy) 2 else 1) - nextSetNumbers(e, si, w.unit)?.let { Text(it, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, style = Og.Number) } + if (roomy) { + // "Up next" in the accent with the time at its end, then the set, then what to load. + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.up_next), color = a.accent.copy(alpha = if (dim) 0.75f else 1f), fontSize = 12.sp, fontWeight = FontWeight.Bold, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + time() + } + Quiet(set, 11.sp, lines = 2) + numbers?.let { Text(it, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, style = Og.Number) } + } else { + // A 40/41 mm watch has two lines for it (measured on the emulator): "Up next: the set", then what to load and the time. + Quiet(stringResource(R.string.up_next) + ": " + set, 11.sp, lines = 1) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically) { + numbers?.let { Text(it, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, style = Og.Number); Spacer(Modifier.width(8.dp)) } + time() + } + } } /** "RIR · How hard was that set?" and four chips; once rated, the rating in a small capsule that opens the chips again. */ From 4c7ed69d2bdeb4e83ade13e1d4c869a895ac5933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Fern=C3=A1ndez?= Date: Thu, 12 Nov 2026 23:10:18 +0100 Subject: [PATCH 5/7] Wear OS rest: the effort chips step in from a round screen's edge Seen on a 45 mm Wear OS 5 emulator at the largest font: under the buttons the chips sit where the circle narrows, and 0 and 3+ lost their outer corners. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp --- .../src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt index 1138427998..214881ff36 100644 --- a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt +++ b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt @@ -766,7 +766,8 @@ fun RestView(rest: Rest) { EdgeButton("+15 s", text = "+15", size = 40.dp, enabled = !dim) { WearStore.addRest(15) } } // A fixed place for the effort, so rating it moves nothing below. - if (rate) Box(Modifier.fillMaxWidth().height(if (roomy) 46.dp else 30.dp).alpha(if (dim) 0f else 1f), contentAlignment = Alignment.Center) { + // Round: the chips sit low, where the circle narrows; at a large font their outer corners met the edge (45 mm emulator). + if (rate) Box(Modifier.fillMaxWidth().padding(horizontal = if (round) 10.dp else 0.dp).height(if (roomy) 46.dp else 30.dp).alpha(if (dim) 0f else 1f), contentAlignment = Alignment.Center) { if (!dim) EffortChips(roomy) } if (next) UpNext(roomy) From 3bf4cc3c4ad81955ad1e2cdbcda2cbcf63e17ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Fern=C3=A1ndez?= Date: Thu, 12 Nov 2026 23:30:32 +0100 Subject: [PATCH 6/7] Wear OS rest: in Always On, Up next takes the hidden chips' place on a small watch Seen on a 40 mm Wear OS 5 emulator: the chips kept their place in Always On, so a watch without room for both showed an empty space where release-1.4.5 showed what's next and what to load. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp --- .../src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt index 214881ff36..2e5a6acbaa 100644 --- a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt +++ b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt @@ -735,7 +735,9 @@ fun RestView(rest: Rest) { // Measured: up next and the effort chips together need 222 dp at the normal text size (and ~60 dp of it is text). // Without that (a 40/41 mm watch) the question comes first, then what's next. val both = roomy || maxHeight.value >= 222 + (LocalDensity.current.fontScale - 1f) * 60 - val rate = WearStore.canRateLast() && (both || rated == null) + // Always On: no chips to tap, so Up next takes their place on a watch without room for both + // (40 mm emulator: the hidden chips left the screen empty where release-1.4.5 showed what's next). + val rate = WearStore.canRateLast() && (both || (rated == null && !dim)) val next = s.settings.show?.showNext != false && (both || !rate) // Round: the clock's arc reaches lower at its ends, where ‹ sits: 6 dp more under it. Column(Modifier.fillMaxSize().padding(start = if (round) 20.dp else 6.dp, end = if (round) 20.dp else 6.dp, top = if (round) 28.dp else 22.dp, bottom = if (round) 26.dp else 6.dp), From 20df287f3aad90537302a3b00c5cda3088646b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Fern=C3=A1ndez?= Date: Fri, 13 Nov 2026 06:37:39 +0100 Subject: [PATCH 7/7] Wear OS rest: keep the clock visible when the set numbers are long on a small watch Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LXHs9Pg1EhvFPo2LUFWwrp --- .../src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt index 2e5a6acbaa..0515b6fa04 100644 --- a/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt +++ b/frontend/android/wear/src/main/java/ch/duartesantos/opengym/wear/ui/Screens.kt @@ -812,7 +812,7 @@ private fun UpNext(roomy: Boolean) { // A 40/41 mm watch has two lines for it (measured on the emulator): "Up next: the set", then what to load and the time. Quiet(stringResource(R.string.up_next) + ": " + set, 11.sp, lines = 1) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically) { - numbers?.let { Text(it, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, style = Og.Number); Spacer(Modifier.width(8.dp)) } + numbers?.let { Text(it, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, style = Og.Number, modifier = Modifier.weight(1f, fill = false)); Spacer(Modifier.width(8.dp)) } time() } }