From 64e4619915084866564dbc0fbe0a6e1205a063a0 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:25:58 +0400 Subject: [PATCH 01/27] =?UTF-8?q?Glow=20=C3=97=20Glass=20wave=200:=20blend?= =?UTF-8?q?s,=20squircle=20shapes,=20glass=20materials,=20screen=20light?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds squircle-shape 5.4.0, the 17 blends with chart tones and muted screen lights, the card materials as modifiers, the #030304 ground, squircle cards, sheets and tiles, and dotted numbers grouped by a gap. Co-Authored-By: Claude Opus 5.5 --- app/build.gradle.kts | 1 + .../org/openstrap/app/ui/glow/GlowLayout.kt | 14 +- .../org/openstrap/app/ui/glow/draw/DotSpec.kt | 19 +- .../org/openstrap/app/ui/theme/Blends.kt | 137 +++++++++++++++ .../org/openstrap/app/ui/theme/Materials.kt | 166 ++++++++++++++++++ .../org/openstrap/app/ui/theme/Shapes.kt | 43 +++++ .../org/openstrap/app/ui/theme/Theme.kt | 6 +- .../org/openstrap/app/ui/theme/BlendsTest.kt | 44 +++++ gradle/libs.versions.toml | 3 + 9 files changed, 420 insertions(+), 13 deletions(-) create mode 100644 app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt create mode 100644 app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt create mode 100644 app/src/main/kotlin/org/openstrap/app/ui/theme/Shapes.kt create mode 100644 app/src/test/kotlin/org/openstrap/app/ui/theme/BlendsTest.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 192025ed..d7862d20 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -237,6 +237,7 @@ dependencies { implementation(libs.core.ktx) implementation(libs.window) implementation(libs.haze.blur) + implementation(libs.squircle.shape) // Workout maps: open source, no API key; tiles from OpenFreeMap (README, Network use). implementation(libs.maplibre) // Home screen widgets. diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt index da1758bb..b751639c 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt @@ -14,7 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape +import org.openstrap.app.ui.theme.screenLight import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -45,12 +45,12 @@ object GlowLayout { /** Every card's corner, on every tier: glow, edge, list, strip and page panels. */ val CardCorner = 28.dp - val CardShape = RoundedCornerShape(CardCorner) + val CardShape: androidx.compose.ui.graphics.Shape = org.openstrap.app.ui.theme.GlowShapes.Card /** A sheet's top corners match the cards'. */ - val SheetShape = RoundedCornerShape(topStart = CardCorner, topEnd = CardCorner) + val SheetShape: androidx.compose.ui.graphics.Shape = org.openstrap.app.ui.theme.GlowShapes.Sheet /** Sport tiles, chart pills, text fields: rounded, but a step tighter than a card. */ val TileCorner = 16.dp - val TileShape = RoundedCornerShape(TileCorner) + val TileShape: androidx.compose.ui.graphics.Shape = org.openstrap.app.ui.theme.GlowShapes.Tile /** From a card's edge to its content, on every side and every tier. */ val CardInset = 20.dp @@ -216,9 +216,11 @@ fun GlowScreenList( state: LazyListState, focus: Boolean = false, onFocused: () -> Unit = {}, + /** The screen's light (Matrix board): the hero's blend, drawn behind the list and fixed to the screen. */ + light: org.openstrap.app.ui.theme.ScreenLight? = null, content: GlowBlocks.() -> Unit, ) { - BoxWithConstraints(Modifier.fillMaxSize()) { + BoxWithConstraints(Modifier.fillMaxSize().then(if (light != null) Modifier.screenLight(light) else Modifier)) { val wide = maxWidth >= GlowLayout.TwoColumnWidth val gutter = GlowLayout.dashboardGutter(maxWidth) val built = GlowBlocks(smallsAcross = GlowLayout.smallsAcross(maxWidth)).apply(content) @@ -499,7 +501,7 @@ internal fun TitleMark(marker: String?, tag: TitleTag?, modifier: Modifier = Mod */ @Composable internal fun OutlineTag(text: String, modifier: Modifier = Modifier, onClick: (() -> Unit)? = null) { - val shape = RoundedCornerShape(50) + val shape = org.openstrap.app.ui.theme.GlowShapes.Pill val about = stringResource(R.string.glow_tag_about, text.lowercase()) Text( text, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/DotSpec.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/DotSpec.kt index 10c4f40b..12d37593 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/DotSpec.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/DotSpec.kt @@ -24,7 +24,8 @@ object DotFont { '8' to listOf(".###.", "#...#", "#...#", ".###.", "#...#", "#...#", ".###."), '9' to listOf(".###.", "#...#", "#...#", ".####", "....#", "...#.", ".##.."), '.' to listOf(".", ".", ".", ".", ".", ".", "#"), - ',' to listOf(".", ".", ".", ".", ".", "#", "#"), + // A group mark draws as a gap of half a digit, not a comma (Numbers board). See [DotFont.grouped]. + ',' to listOf("..", "..", "..", "..", "..", "..", ".."), ':' to listOf(".", ".", "#", ".", ".", "#", "."), '-' to listOf("...", "...", "...", "###", "...", "...", "..."), // The real minus sign of signed values (spec 2.3), drawn as the dash is. @@ -44,12 +45,20 @@ object DotFont { /** The glyph for [c], a space when the font has none. */ fun glyph(c: Char): List = GLYPHS[c] ?: GLYPHS.getValue(' ') + /** + * [text] as the dots show it (Numbers board): four digits read without a gap ("8412"), five or more keep a gap of + * half a digit before each group of three ("12 480"). Grouping comes in as commas ([Units.DOT_LOCALE] is ROOT). + */ + fun grouped(text: String): String = GROUPED.replace(text) { m -> if (m.value.count { it.isDigit() } <= 4) m.value.replace(",", "") else m.value } + + private val GROUPED = Regex("\\d{1,3}(,\\d{3})+") + /** Whether [c] has a glyph of its own. */ fun has(c: Char): Boolean = c in GLYPHS /** Dot columns [text] takes, with one empty column between glyphs. */ fun columns(text: String): Int { - val glyphs = text.map(::glyph) + val glyphs = grouped(text).map(::glyph) return glyphs.sumOf { it[0].length } + (glyphs.size - 1).coerceAtLeast(0) } } @@ -69,7 +78,7 @@ class DotLayout(val width: Float, val height: Float, val dot: Float, val centers */ fun dotLayout(text: String, dot: Float, density: Float): DotLayout { val gap = dot * DotSize.DOT_GAP - val glyphs = text.map(DotFont::glyph) + val glyphs = DotFont.grouped(text).map(DotFont::glyph) val columns = glyphs.sumOf { it[0].length } + (glyphs.size - 1).coerceAtLeast(0) val pitch = dot + gap val d = dot * density @@ -101,8 +110,8 @@ enum class DotSize(val dot: Dp) { /** Edge cards and Smalls. */ Edge(3.dp), - /** Talls, the second glow, glow cards that aren't the hero. */ - Second(3.6.dp), + /** Talls and every other card in the grid: the same 3 dp as a Small (Numbers board, four sizes by dot). */ + Second(3.dp), /** The hero's number. */ Hero(4.5.dp), diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt new file mode 100644 index 00000000..a601723f --- /dev/null +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt @@ -0,0 +1,137 @@ +package org.openstrap.app.ui.theme + +import androidx.compose.runtime.Immutable +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.luminance +import kotlin.math.max +import kotlin.math.min + +/** + * A two-stop blend (Glow × Glass, Palette board). [first] sits where the light comes from and is the row icon's colour, + * [second] lands on the answer (now, the top, the value). [chart] is [first] lightened until it reads at 4.5:1 on dark + * glass, for chart marks and small text. [light] and [lightSecond] are both stops muted for the screen's light (Matrix + * board): same hue, 60% of the saturation, 40% lightness, which is what keeps white text on glass at 4.5:1. + * + * A blend says which metric or place, never how it is going. Values stay white. + */ +@Immutable +class Blend(val first: Color, val second: Color) { + val chart: Color = chartTone(first) + val chartSecond: Color = chartTone(second) + val light: Color = muted(first) + val lightSecond: Color = muted(second) + + /** The blend along a line or bar, first stop at the start, second on the answer. */ + fun brush(): Brush = Brush.horizontalGradient(listOf(first, second)) + + /** The chart version of [brush], for marks on dark glass. */ + fun chartBrush(): Brush = Brush.horizontalGradient(listOf(chart, chartSecond)) + + override fun equals(other: Any?) = other is Blend && other.first == first && other.second == second + override fun hashCode() = first.hashCode() * 31 + second.hashCode() + override fun toString() = "Blend($first, $second)" +} + +/** Every blend in the app (Palette board). A screen's light is its hero's blend. */ +object Blends { + val Recovery = Blend(Color(0xFF7CF2C9), Color(0xFF2FC79A)) + val Hrv = Blend(Color(0xFF2DD4BF), Color(0xFF1B8FA8)) + val Spo2 = Blend(Color(0xFF38BDF8), Color(0xFF5AD1FF)) + val Breathing = Blend(Color(0xFFE6ECF5), Color(0xFFC9B8FF)) + val Sleep = Blend(Color(0xFF4C6FFF), Color(0xFF2E3FC9)) + val Load = Blend(Color(0xFFA78BFA), Color(0xFF796AFF)) + /** A moment, not a metric: the evening hero. */ + val Evening = Blend(Color(0xFFA274F2), Color(0xFF5B2A86)) + val HabitAge = Blend(Color(0xFFD86BEA), Color(0xFF6FE3F0)) + val Stress = Blend(Color(0xFFF062C0), Color(0xFFFF9AD5)) + val Heart = Blend(Color(0xFFFF5A5F), Color(0xFFD9233F)) + /** Ember into violet. */ + val Energy = Blend(Color(0xFFFF7A2E), Color(0xFFB05CFF)) + /** Cool into warm. */ + val Temperature = Blend(Color(0xFF6FC3FF), Color(0xFFFF8A3D)) + val Calories = Blend(Color(0xFFFFD23F), Color(0xFFF2A93B)) + val Steps = Blend(Color(0xFFC3F53C), Color(0xFFEEF04A)) + + /** Places, not metrics: they light their own pages and never a chart. Strap also lights setup. */ + val Strap = Blend(Color(0xFFAEB6C2), Color(0xFF4A5262)) + val You = Blend(Color(0xFFF0B48C), Color(0xFFA8613F)) + val Goals = Blend(Color(0xFF9BFFB0), Color(0xFF7C6BFF)) + + /** Flat Deep for small marks (legend dots), lightened to 3:1. The stage bars keep [MetricColors.sleepDeep]. */ + val SleepDeepMark = Color(0xFF5A7BFF) + + /** + * The blend for a v2 ink ([MetricColors]), so parts that still take one colour light with the right blend while + * they move over. Null for colours that aren't a metric's (status green and amber, neutrals). + */ + fun forInk(ink: Color): Blend? = when (ink) { + MetricColors.readiness -> Recovery + MetricColors.hrv -> Hrv + MetricColors.spo2 -> Spo2 + MetricColors.sleepLight -> Breathing + MetricColors.sleepDeep -> Sleep + MetricColors.load -> Load + MetricColors.evening -> Evening + MetricColors.habitAge -> HabitAge + MetricColors.stress -> Stress + MetricColors.heart -> Heart + MetricColors.charge -> Energy + MetricColors.temperature -> Temperature + MetricColors.calories -> Calories + MetricColors.steps -> Steps + else -> all.firstOrNull { it.second.first == ink }?.second + } + + /** Every blend, for tests and the debug gallery. */ + val all: List> = listOf( + "Recovery" to Recovery, "HRV" to Hrv, "Blood oxygen" to Spo2, "Breathing rate" to Breathing, "Sleep" to Sleep, + "Load" to Load, "Evening" to Evening, "Habit Age" to HabitAge, "Stress" to Stress, "Heart rate" to Heart, + "Energy" to Energy, "Skin temperature" to Temperature, "Calories" to Calories, "Steps" to Steps, + "Strap" to Strap, "You" to You, "Goals" to Goals, + ) +} + +/** The darkest glass a chart sits on: white 7% over a lit ground. Chart tones are checked against it. */ +val ChartGlass = Color(0xFF26282C) + +/** WCAG contrast ratio of [a] on [b]. */ +fun contrast(a: Color, b: Color): Float { + val la = a.luminance() + 0.05f + val lb = b.luminance() + 0.05f + return max(la, lb) / min(la, lb) +} + +/** [c] with its HSL lightness raised until it reads at 4.5:1 on [ChartGlass]. Already light colours come back as they are. */ +internal fun chartTone(c: Color, on: Color = ChartGlass, target: Float = 4.5f): Color { + if (contrast(c, on) >= target) return c + val (h, s, l) = hsl(c) + var light = l + while (light < 1f) { + light = min(1f, light + 0.01f) + val next = Color.hsl(h, s, light) + if (contrast(next, on) >= target) return next + } + return Color.White +} + +/** [c] for the screen's light: same hue, 60% of its saturation, 40% lightness (Matrix board). */ +internal fun muted(c: Color): Color { + val (h, s, _) = hsl(c) + return Color.hsl(h, s * 0.6f, 0.4f) +} + +internal fun hsl(c: Color): Triple { + val r = c.red; val g = c.green; val b = c.blue + val mx = max(r, max(g, b)); val mn = min(r, min(g, b)) + val l = (mx + mn) / 2f + if (mx == mn) return Triple(0f, 0f, l) + val d = mx - mn + val s = if (l > 0.5f) d / (2f - mx - mn) else d / (mx + mn) + val h = when (mx) { + r -> ((g - b) / d + (if (g < b) 6f else 0f)) + g -> ((b - r) / d + 2f) + else -> ((r - g) / d + 4f) + } * 60f + return Triple(h, s, l) +} diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt new file mode 100644 index 00000000..c80bd520 --- /dev/null +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt @@ -0,0 +1,166 @@ +package org.openstrap.app.ui.theme + +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.compositionLocalOf +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.graphics.drawOutline +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.scale +import androidx.compose.ui.unit.dp +import kotlin.math.PI +import kotlin.math.cos +import kotlin.math.sin + +/* + * The card materials of Glow × Glass (System and Elements boards, plan section 1, Materials). The boards' cards don't + * blur what's behind them: the screen's light is already soft, so a card is a see-through fill with a lit top edge, + * and only the nav bar, sheets and popups blur (Haze, in components/Glass.kt). That keeps a long scroll cheap and looks + * the same on Android 11, which can't blur. + */ + +/** The page ground under the screen's light. */ +val Ground = Color(0xFF030304) + +/** Clear glass's fill: white at 7%. */ +const val CLEAR_GLASS_FILL = 0.07f + +/** + * A lit edge that follows [shape]: [top] white along the top, falling to [ring] white by [reach] down the card, as the + * boards' `inset 0 1px 0` highlight over a 1 px ring. + */ +fun Modifier.litEdge(shape: Shape, top: Float, ring: Float, reach: Float = 28f): Modifier = drawWithCache { + val outline = shape.createOutline(size, layoutDirection, this) + val stroke = Stroke(1.dp.toPx()) + val fall = (reach.dp.toPx() / size.height.coerceAtLeast(1f)).coerceIn(0.01f, 1f) + val brush = Brush.verticalGradient( + 0f to Color.White.copy(alpha = top), fall to Color.White.copy(alpha = ring), 1f to Color.White.copy(alpha = ring), + ) + onDrawWithContent { + drawContent() + drawOutline(outline, brush, style = stroke) + } +} + +/** Clear glass (every card but the hero): white 7% over the screen's light, lit top edge 16%, ring 5%. */ +fun Modifier.clearGlass(shape: Shape = GlowShapes.Card, fill: Float = CLEAR_GLASS_FILL): Modifier = + this.drawWithCache { + val outline = shape.createOutline(size, layoutDirection, this) + val color = Color.White.copy(alpha = fill) + onDrawBehind { drawOutline(outline, color) } + }.litEdge(shape, top = 0.16f, ring = 0.05f) + +/** + * Tinted glass (the hero): the blend at low alpha across the card, first stop where the light comes from, fading to + * white 5% at the far corner. Lit top edge 35%, ring 10%. + */ +fun Modifier.tintedGlass(blend: Blend, shape: Shape = GlowShapes.Card, strength: Float = 1f): Modifier = + this.drawWithCache { + val outline = shape.createOutline(size, layoutDirection, this) + // The boards' linear-gradient(40deg ...): from lower left to upper right. + val brush = Brush.linearGradient( + 0f to blend.first.copy(alpha = 0.30f * strength), + 0.55f to blend.second.copy(alpha = 0.20f * strength), + 1f to Color.White.copy(alpha = 0.05f), + start = Offset(0f, size.height), end = Offset(size.width, size.height - size.width * 0.84f), + ) + onDrawBehind { drawOutline(outline, brush) } + }.litEdge(shape, top = 0.35f, ring = 0.10f) + +/** + * Solid light, where the colour is the value (the Energy level card): the blend filling the card from the bottom up to + * [level], second stop on top, dark behind the number so white reads on it. At most two on a screen. + */ +fun Modifier.solidLight(blend: Blend, level: Float = 1f, shape: Shape = GlowShapes.Card): Modifier = + this.drawWithCache { + val outline = shape.createOutline(size, layoutDirection, this) + val top = (1f - level.coerceIn(0f, 1f)) + val edge = (top + 0.04f).coerceAtMost(1f) + val fill = Brush.verticalGradient( + 0f to DarkGlowFill, top to DarkGlowFill.copy(alpha = 0.85f), + edge to blend.second, 1f to blend.first, + ) + // A dark pool behind the number, upper left, as the boards' radial-gradient. + val pool = Brush.radialGradient( + 0f to DarkGlowFill.copy(alpha = 0.97f), 0.5f to DarkGlowFill.copy(alpha = 0.88f), 1f to Color.Transparent, + center = Offset(size.width * 0.3f, size.height * 0.22f), radius = size.width * 1.1f, + ) + onDrawBehind { + drawOutline(outline, fill) + scale(1f, 0.52f / 1.1f, pivot = Offset(size.width * 0.3f, size.height * 0.22f)) { drawOutline(outline, pool) } + } + }.litEdge(shape, top = 0.25f, ring = 0.05f) + +/** Dark glow's ground: deep violet-black, so a blend rising from below reads as light, not paint. */ +val DarkGlowFill = Color(0xFF1E0A2E) + +/** Dark glow (strips and moments that rise from below): near black, with the blend lit from the bottom edge. */ +fun Modifier.darkGlow(blend: Blend, shape: Shape = GlowShapes.Card, strength: Float = 1f): Modifier = + this.drawWithCache { + val outline = shape.createOutline(size, layoutDirection, this) + val base = Color(0xFF0B0812) + val rise = Brush.radialGradient( + 0f to blend.second.copy(alpha = 0.75f * strength), 0.55f to blend.first.copy(alpha = 0.25f * strength), 1f to Color.Transparent, + center = Offset(size.width / 2, size.height * 1.05f), radius = size.width * 0.75f, + ) + onDrawBehind { + drawOutline(outline, base) + drawOutline(outline, rise) + } + }.litEdge(shape, top = 0.12f, ring = 0.05f) + +/* ------------------------------------------- The screen's light ----------------------------------------- */ + +/** + * The screen's light (Matrix board): the hero's blend, both stops muted, spilled behind the screen. [angle] is where the + * hero's light comes from, in degrees counterclockwise from the right (as LightAngle): the first stop sits that way, + * the second opposite and lower, smaller, at 90% of the strength. [strength] is the mood (Day 1, Evening 0.8, Night + * 0.65). [heroCenterY] is the hero's centre from the top of the screen, in dp. + */ +@Immutable +data class ScreenLight(val blend: Blend, val angle: Float = 225f, val strength: Float = 1f, val heroCenterY: Float = 200f) { + companion object { + /** The mood's strength (Matrix board, The rule: How strong). */ + const val DAY = 1f + const val EVENING = 0.8f + const val NIGHT = 0.65f + } +} + +/** The light a screen is lit by, for parts (sheets, the nav bar) that want to know. Null when the screen has none. */ +val LocalScreenLight = compositionLocalOf { null } + +/** The boards' blob opacity at full strength. */ +private const val LIGHT_OPACITY = 0.6f + +/** + * Draws [light] behind this (fixed to the screen, not scrolled), over [Ground]. With no light, just the ground: "no + * light until there's a hero to light" (Matrix board, No data yet). + */ +fun Modifier.screenLight(light: ScreenLight?): Modifier = drawBehind { + drawRect(Ground) + if (light == null) return@drawBehind + val w = size.width + val r = light.angle / 180f * PI.toFloat() + val vx = cos(r); val vy = -sin(r) + val heroY = light.heroCenterY.dp.toPx() + val reachX = w * 0.32f; val reachY = 90.dp.toPx() + val a = light.strength * LIGHT_OPACITY + blob(Offset(w / 2 + vx * reachX, heroY + vy * reachY), w * 0.82f + 120.dp.toPx(), 260.dp.toPx() + 120.dp.toPx(), light.blend.light, a) + blob(Offset(w / 2 - vx * reachX, heroY - vy * reachY + 360.dp.toPx()), w * 0.51f + 120.dp.toPx(), 190.dp.toPx() + 120.dp.toPx(), light.blend.lightSecond, a * 0.9f) +} + +/** A blurred ellipse [rx] by [ry] around [c]: what the boards draw as a circle under `filter: blur(120px)`. */ +private fun androidx.compose.ui.graphics.drawscope.DrawScope.blob(c: Offset, rx: Float, ry: Float, color: Color, alpha: Float) { + val brush = Brush.radialGradient( + 0f to color.copy(alpha = alpha), 0.35f to color.copy(alpha = alpha * 0.9f), 0.6f to color.copy(alpha = alpha * 0.55f), + 0.8f to color.copy(alpha = alpha * 0.2f), 1f to Color.Transparent, + center = c, radius = rx, + ) + scale(1f, ry / rx, pivot = c) { drawCircle(brush, rx, c) } +} diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Shapes.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Shapes.kt new file mode 100644 index 00000000..f518581c --- /dev/null +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Shapes.kt @@ -0,0 +1,43 @@ +package org.openstrap.app.ui.theme + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Shapes +import androidx.compose.foundation.shape.CornerBasedShape +import androidx.compose.ui.unit.dp +import sv.lib.squircleshape.SquircleShape + +/** + * Every corner in the app (Glow × Glass, System board; plan section 1, Corners). Squircles at smoothing 50, with fixed + * dp radii so a Small card and a tall hero in one column share a corner. Built once, never during composition. + */ +object GlowShapes { + /** How far the squircle's curve reaches into the straight edge (the library's 0 to 100). */ + const val SMOOTHING = 50 + + /** Cards, panels and strips. */ + val Card: CornerBasedShape = SquircleShape(radius = 28.dp, smoothing = SMOOTHING) + + /** Sheets: the top corners only. */ + val Sheet: CornerBasedShape = SquircleShape(topStart = 28.dp, topEnd = 28.dp, bottomStart = 0.dp, bottomEnd = 0.dp, smoothing = SMOOTHING) + + /** Tiles inside a card. */ + val Tile: CornerBasedShape = SquircleShape(radius = 16.dp, smoothing = SMOOTHING) + + /** Text buttons, chips, tags and the tab pill: half the height. */ + val Pill: CornerBasedShape = SquircleShape(percent = 50, smoothing = SMOOTHING) + + /** Square icon buttons and text fields. */ + val Icon: CornerBasedShape = SquircleShape(radius = 14.dp, smoothing = SMOOTHING) + + /** Small inner parts, bars and swatches: too small for a squircle to show, so plain rounded. */ + val Small: CornerBasedShape = RoundedCornerShape(4.dp) + + /** What Material's own controls (switches, menus, text fields, dialogs) pick up. */ + val Material = Shapes( + extraSmall = Small, + small = SquircleShape(radius = 14.dp, smoothing = SMOOTHING), + medium = SquircleShape(radius = 16.dp, smoothing = SMOOTHING), + large = SquircleShape(radius = 28.dp, smoothing = SMOOTHING), + extraLarge = Pill, + ) +} diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Theme.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Theme.kt index 93a6c941..57b7309d 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/theme/Theme.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Theme.kt @@ -77,9 +77,10 @@ private val Dark = darkColorScheme( // Elevation would tint raised surfaces with the primary; white would lift them to grey. surfaceTint = Color.Transparent, // OLED black page with neutral grey cards, so the metric accents carry all the colour. - background = Color(0xFF000000), + // The Glow × Glass ground (#030304), a hair off black so the screen's light has something to sit in. + background = Color(0xFF030304), onBackground = Color(0xFFFFFFFF), - surface = Color(0xFF000000), + surface = Color(0xFF030304), onSurface = Color(0xFFFFFFFF), surfaceContainerLowest = Color(0xFF000000), surfaceContainerLow = Color(0xFF0A0A0A), @@ -146,6 +147,7 @@ fun OpenStrapTheme(content: @Composable () -> Unit) { MaterialTheme( colorScheme = Dark, typography = AppTypography, + shapes = GlowShapes.Material, content = content, ) } diff --git a/app/src/test/kotlin/org/openstrap/app/ui/theme/BlendsTest.kt b/app/src/test/kotlin/org/openstrap/app/ui/theme/BlendsTest.kt new file mode 100644 index 00000000..51db63e5 --- /dev/null +++ b/app/src/test/kotlin/org/openstrap/app/ui/theme/BlendsTest.kt @@ -0,0 +1,44 @@ +package org.openstrap.app.ui.theme + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.compositeOver +import androidx.compose.ui.graphics.toArgb +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class BlendsTest { + @Test + fun everyChartToneReadsOnDarkGlass() { + Blends.all.forEach { (name, b) -> + assertTrue("$name chart ${contrast(b.chart, ChartGlass)}", contrast(b.chart, ChartGlass) >= 4.5f) + assertTrue("$name second ${contrast(b.chartSecond, ChartGlass)}", contrast(b.chartSecond, ChartGlass) >= 4.5f) + } + } + + @Test + fun screenLightIsMutedAsTheMatrixBoardDraws() { + // Matrix board: Recovery #349875, second stop #408C75. + assertClose(Color(0xFF349875), Blends.Recovery.light) + assertClose(Color(0xFF408C75), Blends.Recovery.lightSecond) + } + + @Test + fun whiteReadsOnEveryScreenLight() { + // The light is drawn at 60% over the ground at full strength (Matrix board), with clear glass on top. + Blends.all.forEach { (name, b) -> + val lit = b.light.copy(alpha = 0.6f).compositeOver(Ground) + val glass = Color.White.copy(alpha = CLEAR_GLASS_FILL).compositeOver(lit) + assertTrue("$name ${contrast(Color.White, glass)}", contrast(Color.White, glass) >= 4.5f) + } + } + + private fun assertClose(want: Color, got: Color) { + val w = want.toArgb(); val g = got.toArgb() + for (shift in listOf(16, 8, 0)) { + assertEquals("channel $shift of ${Integer.toHexString(g)}", (w shr shift) and 0xFF, (g shr shift) and 0xFF, 3) + } + } + + private fun assertEquals(msg: String, a: Int, b: Int, tol: Int) = assertTrue("$msg: $a vs $b", kotlin.math.abs(a - b) <= tol) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a44bb3fd..55968eec 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,8 @@ androidxTestCore = "1.7.0" bouncycastle = "1.86" coreKtx = "1.19.1" haze = "2.0.1" +# Squircle corners for the Glow × Glass design (docs/design/glow-glass/plan.md section 1). +squircleShape = "5.4.0" window = "1.5.1" maplibre = "13.7.1" glance = "1.2.0" @@ -72,6 +74,7 @@ androidx-test-core = { group = "androidx.test", name = "core-ktx", version.ref = compose-rules-detekt = { group = "io.nlopez.compose.rules", name = "detekt", version.ref = "composeRulesDetekt" } slack-compose-lint = { group = "com.slack.lint.compose", name = "compose-lint-checks", version.ref = "slackComposeLint" } haze-blur = { group = "dev.chrisbanes.haze", name = "haze-blur", version.ref = "haze" } +squircle-shape = { group = "com.stoyanvuchev", name = "squircle-shape", version.ref = "squircleShape" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } From 2f615ffaf9aaa24729d7da430072893e3ac152c7 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:26:22 +0400 Subject: [PATCH 02/27] =?UTF-8?q?Glow=20=C3=97=20Glass=20build=20plan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- docs/design/glow-glass/plan.md | 184 +++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) create mode 100644 docs/design/glow-glass/plan.md diff --git a/docs/design/glow-glass/plan.md b/docs/design/glow-glass/plan.md new file mode 100644 index 00000000..f96d1b5c --- /dev/null +++ b/docs/design/glow-glass/plan.md @@ -0,0 +1,184 @@ +# Glow × Glass: build plan + +Written 2026-11-13. The design is the Glow × Glass canvas, https://claude.ai/artifact/AqjcQrgM6ZEiAmoybqvN4f (71 boards in six sections). This plan moves the app from the v2 look to that canvas. It adds no features and changes no algorithms. Where a board and this plan disagree, the board wins, and the gap goes into "Open design calls" below. + +## 1. What changes + +| Area | Now (v2, develop 3.0.7) | Glow × Glass | +|---|---|---| +| Colour | One ink per metric (`MetricColors` in `ui/theme/Theme.kt`) | A two-stop blend per metric, plus three place blends (Strap, You, Goals) | +| Screen light | Card glows and edge light in the metric ink | The hero's blend, muted (60% saturation, 40% lightness), spilled behind the screen from where the hero's light comes from, at the mood's strength | +| Corners | `RoundedCornerShape`, 91 uses in 24 files, card corner 28 dp | Squircles from `com.stoyanvuchev:squircle-shape` 5.4.0, smoothing 50 | +| Materials | OLED black cards, glass only on the nav bar and popups | Four card materials (clear glass, tinted glass, solid light, dark glow) plus heavy glass for sheets | +| Numbers | Dotted numbers drawn by `ui/glow/draw/DotSpec.kt` (own 5×7 font) | Doto 700, four sizes by dot, groups split by a gap, not a comma | +| Type | Funnel Display and Funnel Sans | Same families. Titles in Display 600, body and labels in Sans 400 | +| Ground | #000000 | #030304 | + +### Blends (Palette board) + +Each entry is first stop → second stop, then the v2 ink it replaces. + +| Blend | Stops | Replaces | +|---|---|---| +| Recovery | #7CF2C9 → #2FC79A | `readiness` #7CF2C9 | +| HRV | #2DD4BF → #1B8FA8 | `hrv` | +| Blood oxygen | #38BDF8 → #5AD1FF | `spo2` | +| Breathing rate | #E6ECF5 → #C9B8FF | shared Sleep light #8FA8FF (now its own) | +| Sleep | #4C6FFF → #2E3FC9 | `sleepDeep` as the metric light (stage colours stay flat) | +| Load | #A78BFA → #796AFF | `load` | +| Evening (moment) | #A274F2 → #5B2A86 | `evening` | +| Habit Age | #D86BEA → #6FE3F0 | `habitAge` | +| Stress | #F062C0 → #FF9AD5 | `stress` | +| Heart rate | #FF5A5F → #D9233F | `heart` | +| Energy | #FF7A2E → #B05CFF | `charge` #F66C28 | +| Skin temperature | #6FC3FF → #FF8A3D | `temperature` | +| Calories | #FFD23F → #F2A93B | `calories` (the shade stays for walking bars) | +| Steps | #C3F53C → #EEF04A | `steps` | +| Strap (place) | #AEB6C2 → #4A5262 | `StrapLight` #7DE0C0 in `ui/glow/StrapDrawing.kt`, also on setup | +| You (place) | #F0B48C → #A8613F | the grey on You pages | +| Goals (place) | #9BFFB0 → #7C6BFF | `good` #3DDC97 wherever it lights goals and rewards | + +Rules kept and added: + +- A blend says which metric, never how it is going. Values and dotted numbers stay white. +- Green #3DDC97 and amber #FFB547 stay, for the strap and sync status dots only. `good` keeps its name for that job and stops lighting goals. +- Strap, You and Goals are places, not metrics. They light their own pages and never a chart. +- A chart line or ring draws the blend along its length, and the second stop lands on the answer (now, the top, the value). A row icon uses the first stop. +- Chart marks on dark glass use a lighter version of each blend, with lightness raised until 4.5:1 (Charts board). The deep stop stays for the screen light. +- Categories (sleep stages, heart zones) keep their flat colours. +- Copy never uses em dash, semicolon or middle dot. Never two cards in a row with the same look. + +### Corners + +The library's API, from its source (`sv.lib.squircleshape`): + +- `SquircleShape(percent: Int, smoothing: Int)`: percent runs 0 to 50 of the shortest side. Anything above 50 is clamped to a pill. +- `SquircleShape(radius: Dp, smoothing: Int)`: fixed radius, clamped to half the shortest side. +- Per-corner versions take Int, Dp or Float. `CornerSmoothing` presets are None 0, Small 20, Medium 48, High 67, Full 100. + +Smoothing is 50 everywhere. Radii are fixed dp (decided 2026-11-13), not percent: a percent radius grows with the card, so a Small card and a tall hero in one column would have different corners. Built once in `ui/theme/Shapes.kt`: + +| Surface | Radius | +|---|---| +| Cards, panels, strips | 28 dp | +| Sheets (top corners) | 28 dp | +| Tiles | 16 dp | +| Buttons, chips, tags, the tab pill | pill: `SquircleShape(percent = 50, smoothing = 50)`. The boards draw every text button this way (44, 52 and 56 dp tall at half-height radius). `percent = 100`, as in the library's sample, gives the same shape because it clamps at 50 | +| Square icon buttons, inputs | 14 dp | +| Small inner parts (bars, swatches) | 4 dp, plain rounded | + +Shapes are `val`s, never built during composition. They also go into `MaterialTheme(shapes = …)` (small 14 dp, medium 16 dp, large 28 dp, extraLarge pill), so Material controls such as switches, menus and text fields pick them up too. Widgets (Glance) can't take a Compose shape, so they keep rounded corners from the launcher (section 4E). + +### Materials (System and Elements boards) + +| Material | Use | Build | +|---|---|---| +| Clear glass | Every card except the hero: lists, strips, picture cards | Haze blur of the screen light behind, white 7% fill, lit top edge white 14% | +| Tinted glass | The hero | The blend's first stop at low alpha over the blur | +| Solid light | Where the colour is the value (the Energy level card) | Solid blend fill, fading to dark behind the number. At most two per screen | +| Dark glow | Strips and moments that rise from below | The current GlowStyle core, lit from below | +| Heavy glass | Sheets and popups | `GlassPanel` with blur 28 dp and saturation 170% | + +Blur cost: one `HazeState` source per screen (the screen light layer), with every glass card a child of it. Cards never blur one another. Android 11 (minSdk 30) has no RenderEffect blur, so glass falls back to the tinted fill, as `GlassPanelAlpha` does today. + +## 2. Screens by section + +| Canvas section | Boards | Code | +|---|---|---| +| 1 Foundations | Palette, Matrix, Elements, System, Charts, Numbers | `ui/theme/*`, `ui/glow/draw/*`, `ui/components/Glass.kt`, `ui/glow/GlowLayout.kt`, `GlowType.kt`, `GlowCharts.kt`, `pictures/*` | +| 2 Today, through the day | Morning, Midday, Workout time, During, After, Evening, Night | `GlowTodayScreen.kt`, `TodayCards.kt`, `dashboard/TodayLooks.kt`, `TodayPlan.kt`, `MomentHeader.kt`, `root/TodayMoment.kt` | +| 3 Tabs, details and sheets | Recovery, Sleep, Activity tabs, seven details, All metrics, Edit Today, Info sheets | `GlowRecoveryScreen.kt`, `GlowSleepScreen.kt`, `GlowActivityScreen.kt`, `ScoreDetail.kt`, `SleepDetail.kt`, `GlowMetricDetail.kt`, `ActivityDetail.kt`, `GlowHealthspan*.kt`, `dashboard/WeekStory.kt`, `AllMetricsScreen.kt`, `EditTodaySheet.kt`, `InfoSheet.kt` | +| 4 Workouts | Choose, Ready, Zones, Live (7), Summary (6), Celebration, Rewards, Share | `ChooseScreen.kt`, `Ready*.kt`, `GlowWorkoutMode.kt`, `live/*`, `GlowWorkoutSummary.kt`, `SummarySections.kt`, `Celebrations.kt`, `Medals.kt`, `Badge*.kt`, `GoalsAndBests.kt`, `ShareCards.kt`, `ShareScreen.kt`, `WorkoutCapsule.kt`, `HeartZonesScreen.kt` | +| 5 You and the strap | 8 You pages, 6 Strap pages | `ui/device/*`, `ui/alarms/*`, `ui/firmware/*`, `ui/zepp/*`, `StrapDrawing.kt`, `root/StrapHeader.kt`, `dashboard/StrapPill.kt` | +| 6 Setup, states, widgets, notifications | Sign in, Pair, Permissions, Lock screen, States, Widgets, Notification | `root/PermissionGates.kt`, `root/LockScreen.kt`, `device/SetupStep.kt`, `dashboard/DataStates.kt`, `glow/DataStateParts.kt`, `dashboard/SyncStates.kt`, `widget/*`, `device/*Notifier.kt`, `presentation/NotificationCopy.kt` | + +## 3. Branch and rules + +- `design/glow-glass` is cut from the latest `origin/develop` (3.0.7, d3151480), not main. Wave branches merge back into it, and it goes to `develop` by PR when the user says so. +- Wave tasks run in worktrees on `design/gg-w-` branches, each owning its files exclusively (section 4). +- Every Gradle build goes through `.claude/tools/gradle-queue.sh`, one at a time on this machine. +- Agents write code and tests only. They never run adb. The coordinator merges a wave into `design/glow-glass`, then runs unit tests, lint and detekt once. +- The main thread does every phone and emulator check: build, install with `-PphoneApp`, and screenshot each screen next to its board. The emulator with the Fold database copy covers moments and states the phone isn't in. +- Each agent keeps a progress file in the scratchpad (Root cause, Decisions, Done, Next, Open questions). +- Nothing is pushed and no PR opens without asking. + +## 4. Waves + +### Wave 0: foundations (coordinator, alone) + +Everything else builds on this, so it runs first and alone. + +1. Add `squircle-shape` 5.4.0 to `libs.versions.toml` and the app, and add the Doto font (OFL) to `res/font` and `licenses/`. +2. `ui/theme/Blends.kt`: a `Blend(first, second, chart)` type and all 17 blends, with each chart colour computed to 4.5:1 on dark glass and checked by a unit test. `MetricColors` stays as a deprecated bridge to the first stops until wave 3. +3. `ui/theme/Shapes.kt`: the shapes in section 1, and `GlowLayout.CardShape`, `SheetShape` and `TileShape` pointed at them. That changes most cards at once. +4. `ui/theme/Materials.kt`: the five materials as modifiers, and a `ScreenLight` layer that takes the hero's blend, mood and light direction (Matrix board) and is the Haze source. +5. Ground #030304 in the colour scheme. Doto in `GlowType`, with `DotSpec`'s grouping (gap, no comma) and its four sizes. +6. Build Today morning on the new parts, as the proof screen. + +**Gate 0 (user):** Today morning on the phone next to its board. Check the 28 dp squircle corners at smoothing 50 on the real screen, and decide whether Doto replaces `DotSpec` everywhere, widgets included (widgets draw on a Canvas, so they need the Doto typeface there too). + +### Wave 1: shared parts (parallel, 4 agents) + +| Task | Owns | +|---|---| +| 1A Cards | `GlowCard.kt`, `PictureCard.kt`, `CardLight.kt`, `CardLooks.kt`, `draw/LightSpec.kt`, `draw/EdgeSpec.kt`, `draw/PictureRim.kt`, `MovingBorder.kt` | +| 1B Charts | `GlowCharts.kt`, `draw/ChartSpec.kt`, `pictures/*`, `DetailPicture.kt`, `TrimBar.kt` (blend along length, second stop on the answer, ghost and band rules) | +| 1C Lists, strips, controls | `GlowList.kt`, `TabParts.kt`, `PageParts.kt`, `NewsPill.kt`, `GlowParts.kt`, `GlowShared.kt`, `root/TabsPager.kt` tab pill | +| 1D Glass and sheets | `components/Glass.kt` (heavy glass, sheet shape), `InfoSheet.kt`, `EditTodaySheet.kt`, `AllMetricsScreen.kt` | + +Then the merge, one test run, and the main thread checks the Elements and Charts boards against the Live parts gallery (debug build). + +### Wave 2: screens (parallel, 5 agents) + +| Task | Owns | Boards | +|---|---|---| +| 2A Today | section 2 row 2 files | the 7 Today boards | +| 2B Tabs and details | section 2 row 3 files | 13 boards | +| 2C Workouts | section 2 row 4 files | 22 boards | +| 2D You and Strap | section 2 row 5 files | 14 boards (graphite and copper lights) | +| 2E Setup, states, widgets, notifications | section 2 row 6 files | 7 boards (setup in graphite) | + +Each agent works through its boards one at a time, matching the copy as drawn (the copy was already aligned: HRV 44 Below normal, the run 17:20 to 17:58, 37:42). 2E keeps widgets on system sans and launcher corners (widgets spec), and only changes their colours and dotted numbers. + +**Gate 2 (user):** every section on the phone, side by side with the canvas. + +### Wave 3: clean-up (coordinator) + +- Remove `MetricColors`' single inks, `StrapLight`, and every use of `good` that lights a goal. A lint check or test fails on any `Color(0x…)` literal in `ui/` outside `ui/theme`. +- Remove `RoundedCornerShape` from cards (20 files still use the old colours, 24 use rounded shapes). +- Baseline profile update (`baseline-prof.txt` names RoundedCornerShape), a frame-time check on Today scroll with glass on a mid-range phone, a TalkBack pass, and a font-scale 1.3 pass. +- `docs/design/v2/spec.md` sections 2.x are rewritten to point at the canvas, and the release notes are written. + +## 5. Design calls (decided 2026-11-13) + +All settled by the user. Where a call changes a board, the canvas is fixed in the same pass as the code, so board and app stay one. + +1. **Row chevrons:** raised to pass 4.5:1, one alpha per material (45 to 67%), not decoration. +2. **Activity tab steps:** the tab reads after the run, 14,820 steps, with copy to match, as Today After does. +3. **Share card:** tells the same run, Sat 7 Nov evening, 6.42 km, 37:42. +4. **Load's second stop:** #796AFF, as the boards draw it. The Palette changes. +5. **Heart zones:** categories, like sleep stages, so they keep their flat colours, zone green and amber included. They're drawn small (a bar or chip), never as a large area. That applies to Today During and the workout notification. +6. **Widget status:** an amber dot with the words in white or grey, as in the app. No amber text. +7. **Rewards Goals fill:** fades out softly just past 3 of 4, like the Energy level card, instead of a hard stop. +8. **"Something new" badges:** white glass chips at 12 to 14%, no lavender, so nothing competes with Aurora. +9. **Strap page hero:** a small green status dot beside "Connected", amber when it isn't, matching the chip. +10. **Today During "Goal met":** in the hero only. The card below shows what's next instead (time left in zone, or distance). +11. **Sleep Deep stage:** the flat Deep colour is lightened just enough to reach 3:1 wherever it's a small mark. The bars stay the same. +12. **Today After "78":** the hero glow behind it is dimmed until 4.5:1, as on Waking, Recovery and Activity. +13. **Info sheet HRV range:** the board's 46 to 58 ms is only an example. The app shows the user's own range, as it does now. + +The boards were updated to match on 2026-11-13 (canvas version 44). That pass turned up these points, still to decide: + +- **Workout families lit by zone colours:** the Indoor cardio share card and summary are lit in zone blue and cyan, and Strength in zone amber, following Matrix's rule ("the zone into the next one up"). Zones are categories now, so these lights may need the family's blend instead. +- **Share, Run lit:** most of the text fails 4.5:1 on its bright lime light, and did before the copy changed too. It needs a darker light or a heavier glass block. +- **Hero title chevrons** ("Recovery ›" on Elements and Charts) and the note on the solid Energy card on States can't reach 4.5:1 even at full white. +- **Older contrast failures:** DetailRecovery's dotted 77 at 2.5:1, six labels on DetailHabitAge, and Month and Year on DetailMetric. +- States is dated Fri 13 Nov, not Sat 7 Nov. + +## 6. Risks + +- **Blur cost.** Many glass cards on a long scroll. One Haze source per screen. Wave 3 measures frame time and drops to tinted glass if it janks. +- **Android 11.** No blur, so glass has to look right as a flat tint too. Check on the emulator at API 30. +- **Squircle borders.** Lit top edges and blend rims must follow the squircle path (`Modifier.border(shape = …)` with the same shape, or `drawSquircle` on Canvas), never a rounded rect drawn over it. +- **Doto metrics.** Its digits are wider than the 5×7 `DotSpec` font, so Small cards (173 dp) need a fit check at the largest dot size. +- **Merge drift.** develop moves on for protocol and fix work. Merge the latest develop into `design/glow-glass` once per wave, before the wave's branches are cut, not per task. From 887e8ef64e0c13425299df69158de696ca713136 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:26:59 +0400 Subject: [PATCH 03/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20workout=20family?= =?UTF-8?q?=20blends?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../kotlin/org/openstrap/app/ui/theme/Blends.kt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt index a601723f..546498d4 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt @@ -58,6 +58,18 @@ object Blends { val You = Blend(Color(0xFFF0B48C), Color(0xFFA8613F)) val Goals = Blend(Color(0xFF9BFFB0), Color(0xFF7C6BFF)) + /** + * Workout families (Workouts board): the family's blend lights Ready, live, summary, share and the notification. + * Zones never light a screen. Distance is Steps' blend and Mind and body is the Evening's. + */ + val Distance = Steps + val IndoorCardio = Blend(Color(0xFFC04FE0), Color(0xFF6B3FD8)) + val Strength = Blend(Color(0xFFB98A4E), Color(0xFF5A4636)) + /** Flare pink for work, deep teal for rest: the light that means the phase. */ + val Intervals = Blend(Color(0xFFFF44B0), Color(0xFF0E8A87)) + val Games = Blend(Color(0xFF4CB85C), Color(0xFF2F6B3F)) + val MindAndBody = Evening + /** Flat Deep for small marks (legend dots), lightened to 3:1. The stage bars keep [MetricColors.sleepDeep]. */ val SleepDeepMark = Color(0xFF5A7BFF) @@ -89,6 +101,7 @@ object Blends { "Load" to Load, "Evening" to Evening, "Habit Age" to HabitAge, "Stress" to Stress, "Heart rate" to Heart, "Energy" to Energy, "Skin temperature" to Temperature, "Calories" to Calories, "Steps" to Steps, "Strap" to Strap, "You" to You, "Goals" to Goals, + "Indoor cardio" to IndoorCardio, "Strength" to Strength, "Intervals" to Intervals, "Games" to Games, ) } From d55947c6f0c2bd40a7002709a4d4bf5f3e658281 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:28:33 +0400 Subject: [PATCH 04/27] =?UTF-8?q?Glow=20=C3=97=20Glass=20plan:=20decisions?= =?UTF-8?q?=2014=20to=2018=20and=20the=20night's=20gate=20calls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- docs/design/glow-glass/plan.md | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/docs/design/glow-glass/plan.md b/docs/design/glow-glass/plan.md index f96d1b5c..56e02d63 100644 --- a/docs/design/glow-glass/plan.md +++ b/docs/design/glow-glass/plan.md @@ -37,6 +37,10 @@ Each entry is first stop → second stop, then the v2 ink it replaces. | Strap (place) | #AEB6C2 → #4A5262 | `StrapLight` #7DE0C0 in `ui/glow/StrapDrawing.kt`, also on setup | | You (place) | #F0B48C → #A8613F | the grey on You pages | | Goals (place) | #9BFFB0 → #7C6BFF | `good` #3DDC97 wherever it lights goals and rewards | +| Indoor cardio (family) | #C04FE0 → #6B3FD8 | zone blue and cyan | +| Strength (family) | #B98A4E → #5A4636 | zone amber | +| Intervals (family) | #FF44B0 → #0E8A87 | work red, rest teal | +| Games (family) | #4CB85C → #2F6B3F | sky into mint | Rules kept and added: @@ -167,13 +171,23 @@ All settled by the user. Where a call changes a board, the canvas is fixed in th 12. **Today After "78":** the hero glow behind it is dimmed until 4.5:1, as on Waking, Recovery and Activity. 13. **Info sheet HRV range:** the board's 46 to 58 ms is only an example. The app shows the user's own range, as it does now. -The boards were updated to match on 2026-11-13 (canvas version 44). That pass turned up these points, still to decide: +The boards were updated to match on 2026-11-13 (canvas version 44). That pass turned up five more points, settled by the user the same night (canvas version 45): -- **Workout families lit by zone colours:** the Indoor cardio share card and summary are lit in zone blue and cyan, and Strength in zone amber, following Matrix's rule ("the zone into the next one up"). Zones are categories now, so these lights may need the family's blend instead. -- **Share, Run lit:** most of the text fails 4.5:1 on its bright lime light, and did before the copy changed too. It needs a darker light or a heavier glass block. -- **Hero title chevrons** ("Recovery ›" on Elements and Charts) and the note on the solid Energy card on States can't reach 4.5:1 even at full white. -- **Older contrast failures:** DetailRecovery's dotted 77 at 2.5:1, six labels on DetailHabitAge, and Month and Year on DetailMetric. -- States is dated Fri 13 Nov, not Sat 7 Nov. +14. **Workout families have their own blends.** The family's blend lights Ready, live, summary, share and the notification, and zones never light a screen. Four families had zone colours as their light, so they got new blends, each at least 0.10 OKLab from every other blend, zone and status colour: Indoor cardio #C04FE0 → #6B3FD8 (violet into indigo), Strength #B98A4E → #5A4636 (bronze into iron), Intervals #FF44B0 → #0E8A87 (flare pink for work, deep teal for rest), Games #4CB85C → #2F6B3F (turf into pitch). Distance keeps Steps' blend and Mind and body the Evening's. +15. **Share cards:** a heavier, darker glass block (dark gradient 0.46 to 0.74, blur 44) under the text on every lit share card, so the bright light stays and the text passes 4.5:1. +16. **Hero titles and notes on bright light:** a soft dark scrim behind them (hero title and chevron on Elements, Charts and States, the note on the solid Energy card, the Goals and Weekly recap heroes, the widget notes). +17. **Older contrast failures fixed:** DetailRecovery's 77 moved clear of the arc, DetailHabitAge and DetailMetric labels raised to 0.7 to 0.82 white, and similar raises on PageHeartZones, PageBackup, PageProfile and DetailWorkout. +18. **States is dated Sat 7 Nov**, like the rest of the canvas. + +### Decided by the coordinator (2026-11-13 night, the user asleep, all recommended options) + +The user asked for the waves to run through without them, picking the recommended option at each gate and reporting it. + +- **Gate 0, numbers:** our own dot font (`DotSpec`) stays instead of Doto. It already draws round 5 by 7 dots like Doto, the widgets share its geometry (Canvas, no font needed there), and it can't drift between app and widgets. It takes the Numbers board's rules: a gap of half a digit before each group of three from five digits up, four digits with no gap, and grid cards at 3 dp (the Second size moves from 3.6 to 3). +- **Gate 0, corners:** 28 dp squircles at smoothing 50, as decided. Checked on the emulator rather than the phone. +- **Cards don't blur.** The boards' cards are a see-through fill with a lit edge over an already soft light, so only the nav bar, sheets and popups blur. That removes the blur-cost risk and makes Android 11 look the same. +- **The screen's light is fixed to the screen**, not scrolled with the list, so lower cards stay lit. +- **Gate 2** is the coordinator's emulator pass against every board, with the user's phone check left for the morning. ## 6. Risks From b93bf3e90ed693df33625ddbc9dc9bbb21647d2a Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:31:49 +0400 Subject: [PATCH 05/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20shared=20cards?= =?UTF-8?q?=20draw=20glass,=20tinted=20glass,=20solid=20light=20and=20dark?= =?UTF-8?q?=20glow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../org/openstrap/app/ui/glow/CardLight.kt | 8 +- .../org/openstrap/app/ui/glow/GlowCard.kt | 437 ++++++------------ .../org/openstrap/app/ui/glow/MovingBorder.kt | 22 +- .../org/openstrap/app/ui/glow/PictureCard.kt | 53 ++- .../org/openstrap/app/ui/glow/TodayCards.kt | 5 +- .../openstrap/app/ui/glow/draw/GlowStyle.kt | 5 + 6 files changed, 182 insertions(+), 348 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/CardLight.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/CardLight.kt index 80f83006..a0ad1329 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/CardLight.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/CardLight.kt @@ -1,7 +1,5 @@ package org.openstrap.app.ui.glow -import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope @@ -18,7 +16,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.graphics.drawscope.scale import androidx.compose.ui.unit.dp -import org.openstrap.app.ui.glow.draw.EdgeSurface +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass import org.openstrap.app.ui.glow.draw.GlowStyle import org.openstrap.app.ui.glow.draw.LightAngle import org.openstrap.app.ui.glow.draw.chart @@ -57,12 +56,11 @@ internal fun LitPanel( content: @Composable ColumnScope.() -> Unit, ) { Column( - modifier.fillMaxWidth().clip(GlowLayout.CardShape).background(EdgeSurface) + modifier.fillMaxWidth().clip(GlowShapes.Card).clearGlass(GlowShapes.Card) .drawBehind { val r = reach(size) drawCardLight(color, lightCenter(size), r.width, r.height, stops) } - .border(1.dp, color.copy(alpha = 0.3f), GlowLayout.CardShape) .padding(horizontal = 20.dp, vertical = 18.dp), verticalArrangement = verticalArrangement, content = content, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCard.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCard.kt index 2909f847..82aebb18 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCard.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCard.kt @@ -1,97 +1,74 @@ package org.openstrap.app.ui.glow -import android.graphics.Paint -import android.graphics.RectF import android.provider.Settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.produceState import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState -import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.CacheDrawScope -import androidx.compose.ui.draw.DrawResult import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.draw.drawWithCache -import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.CompositingStrategy -import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.graphics.drawOutline +import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.graphics.drawscope.Stroke -import androidx.compose.ui.graphics.drawscope.drawIntoCanvas -import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.ui.graphics.lerp -import androidx.compose.ui.graphics.nativeCanvas -import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.graphics.drawscope.scale import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.unit.Density -import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp -import kotlin.math.PI -import kotlin.math.cos import kotlin.math.exp import kotlin.math.floor -import kotlin.math.roundToInt -import kotlin.math.sin -import kotlin.random.Random -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.first -import kotlinx.coroutines.withContext import org.openstrap.app.ui.components.LocalCardNumbers import org.openstrap.app.ui.components.cardOpening import org.openstrap.app.ui.components.pressClickable -import org.openstrap.app.ui.glow.draw.brush -import org.openstrap.app.ui.glow.draw.drawGlowBase -import org.openstrap.app.ui.glow.draw.drawGlowCore -import org.openstrap.app.ui.glow.draw.glowPaint -import org.openstrap.app.ui.glow.draw.grainShader -import org.openstrap.app.ui.glow.draw.randomGrainSeed import org.openstrap.app.ui.glow.draw.GlowMotion import org.openstrap.app.ui.glow.draw.GlowStyle -import org.openstrap.app.ui.glow.draw.CoreBox -import org.openstrap.app.ui.glow.draw.GlowPalette -import org.openstrap.app.ui.glow.draw.light +import org.openstrap.app.ui.glow.draw.LightAngle +import org.openstrap.app.ui.glow.draw.glowLevel +import org.openstrap.app.ui.glow.draw.lightVector +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.DarkGlowFill +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.darkGlow +import org.openstrap.app.ui.theme.litEdge /** - * A card in the glow language (see [GlowStyle]). Layers, back to front: rim-coloured fill, rim light, - * second-tone band, dark core, [content], film grain, hairline edge. + * A card in the Glow x Glass language (System and Matrix boards). The v2 rendered glow (rim light, dark core, tone band, + * grain) is gone. What a [GlowStyle] draws now: * - * The dark core holds still unless the style's [GlowMotion] is a [GlowMotion.Heartbeat] (live heart rate), - * and always when the system's animations are off. The screen's [LocalGlowMood] is applied on top of the style. + * - a level style ([GlowStyle.lightLevel]): solid light, the style colour's blend filling the card's long side up to + * the level (upward on a Small or Tall, left to right on a Wide or the hero) with a dark pool behind the number; + * - [GlowStyle.second] or [GlowStyle.dark]: dark glow, the blend rising from the bottom edge; + * - [GlowStyle.outline]: clear glass with a ring in the colour (a workout on hold); + * - anything else (the hero): tinted glass, the blend's first stop on the side the light comes from. * - * Built to stay cheap while scrolling: everything blurred is rendered once per style and size, off the - * main thread, into GPU bitmaps that are cached across cards (see [GlowCache]). The core moves on its - * own layers by changing their position, scale and opacity only, so a moving card never re-draws its - * text or charts and never re-blurs anything. + * The blend is [Blends.forInk] of [GlowStyle.color], or the colour on its own where none matches. The screen's + * [LocalGlowMood] dims tinted and dark glow (a level ignores it). A live [GlowMotion.Heartbeat] lifts the tint's + * brightness gently with each beat, and never moves anything. */ /** * Whether glow cards should hold still right now; a scrolling screen provides its scroll state, so - * the cores pause while the list moves and the scroll gets every frame to itself. + * the pulse pauses while the list moves and the scroll gets every frame to itself. */ val LocalGlowPaused = staticCompositionLocalOf<() -> Boolean> { { false } } /** * Whether the page holding these cards is off screen or the tab pager is moving; provided by the pager, apart from - * [LocalGlowPaused] so a screen's own scroll state doesn't override it. Cores hold still then, so a swipe between - * tabs gets every frame to itself and the pages kept ready either side don't animate unseen. + * [LocalGlowPaused] so a screen's own scroll state doesn't override it. */ val LocalGlowPagePaused = staticCompositionLocalOf<() -> Boolean> { { false } } @@ -101,35 +78,28 @@ fun GlowCard( modifier: Modifier = Modifier, onClick: (() -> Unit)? = null, contentPadding: PaddingValues = GlowLayout.CardPadding, - /** A passing lift of the light (a personal best), faded over the card's own layers, so it never renders anew. */ + /** A passing lift of a level card (a personal best) to its [GlowSwell.peak], drawn as the level rises. */ swell: GlowSwell? = null, content: @Composable BoxScope.() -> Unit, ) { - val lit = style.copy(mood = LocalGlowMood.current) - val shape = remember(lit.radius) { RoundedCornerShape(lit.radius) } - val palette = remember(lit) { GlowPalette(lit) } - val core = remember(lit) { lit.light().core } - val slab = remember(palette) { lerp(palette.mid, Color.Black, 0.55f) } - // Each card samples the grain tile from its own spot, so neighbouring cards never share a pattern. - val grainSeed = remember { randomGrainSeed(Random) } - val drift = remember { CoreDrift(Random) } - val seconds = remember { mutableFloatStateOf(0f) } - // Beats so far, counted frame by frame at the bpm of the moment, so a new reading changes the pace from here on - // rather than jumping the heart to another point in its cycle. + val mood = LocalGlowMood.current + val shape = GlowShapes.Card + val blend = remember(style.color) { Blends.forInk(style.color) ?: Blend(style.color, style.color) } + val level = glowLevel(style.lightLevel) + val angle = remember(style, mood) { cardAngle(style, mood.belowOnly) } + val strength = if (level != null) 1f else style.glowStrength * mood.glow + + // The heartbeat: beats counted frame by frame at the bpm of the moment, read only while drawing. val beats = remember { mutableFloatStateOf(0f) } - val bpm by rememberUpdatedState((lit.motion as? GlowMotion.Heartbeat)?.bpm ?: 0) + val bpm by rememberUpdatedState((style.motion as? GlowMotion.Heartbeat)?.bpm ?: 0) val context = LocalContext.current - val density = LocalDensity.current - // When the system's animator scale is 0 the heart doesn't beat: the core sits at its resting state. - val animate = lit.motion is GlowMotion.Heartbeat && remember(context) { + val animate = style.motion is GlowMotion.Heartbeat && level == null && remember(context) { Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) > 0f } - // Read through state, so the running loop follows a newly provided lambda rather than the first one it saw. val listPaused by rememberUpdatedState(LocalGlowPaused.current) val pagePaused by rememberUpdatedState(LocalGlowPagePaused.current) - val paused = { listPaused() || pagePaused() } if (animate) LaunchedEffect(Unit) { - // Time only advances while the card isn't paused, so the core picks up where it stopped. + val paused = { listPaused() || pagePaused() } var last = withFrameNanos { it } while (true) { if (paused()) { @@ -137,287 +107,149 @@ fun GlowCard( last = withFrameNanos { it } } withFrameNanos { now -> - val dt = (now - last) / 1e9f - seconds.floatValue += dt - beats.floatValue += dt * bpm / 60f + beats.floatValue += (now - last) / 1e9f * bpm / 60f last = now } } } - var size by remember { mutableStateOf(IntSize.Zero) } - // The motion doesn't change how the card looks at rest, so it isn't part of the cache key. - // A live heart rate changes the motion every reading; keyed on it, each new bpm would drop the drawn layers and - // show the plain body colour until they're redrawn, a flash on every beat update. - val still = remember(lit) { lit.copy(motion = GlowMotion.Still) } - val key = GlowCache.Key(still, size, density.density) - val bitmaps by produceState(GlowCache.peek(key) ?: GlowCache.latest(still, density.density), key) { - // The layers for this key once there are some. Until then the last ones stay, or the last made for this look - // at any size, stretched to the card's (a detail opening or closing beside the tab rebuilds and resizes the - // cards): the plain body colour in between would flash. - GlowCache.peek(key)?.let { value = it; return@produceState } - if (value == null) value = GlowCache.latest(still, density.density) - if (key.size == IntSize.Zero || lit.outline) return@produceState - value = withContext(Dispatchers.Default) { GlowCache.get(key) } - } - // The swell's peak is one more cached look, rendered once: each frame of the swell only changes how much of it shows. - val peak = swell?.peak?.takeIf { it != still.lightLevel && !lit.outline } - val peakKey = peak?.let { GlowCache.Key(still.copy(lightLevel = it), size, density.density) } - val peakBitmaps by produceState(peakKey?.let(GlowCache::peek), peakKey) { - value = peakKey?.let(GlowCache::peek) - if (peakKey == null || value != null || peakKey.size == IntSize.Zero) return@produceState - value = withContext(Dispatchers.Default) { GlowCache.get(peakKey) } - } - val peakPaint = remember { Paint(FILTER) } - // Tapped, the card grows into what it opens (spec 3.5). val opening = cardOpening(onClick, shape) Box( modifier .then(opening?.modifier ?: Modifier) .let { if (onClick != null) it.pressClickable(opening?.onClick ?: onClick, shape) else it } - // The slab's edge: a darker copy of the card showing underneath, for a 3D look. + .clip(shape) .let { - if (lit.depth > 0.dp) it.drawBehind { - val d = lit.depth.toPx() - drawRoundRect(slab, topLeft = Offset(0f, d), size = this.size, cornerRadius = CornerRadius(lit.radius.toPx())) - } else it + when { + style.outline -> it.clearGlassRing(blend, shape) + level != null -> it.levelLight(blend, level, swell, shape) + style.second || style.dark -> it.darkGlow(blend, shape, strength) + else -> it.heroGlass(blend, angle, strength, shape) + } } - .clip(shape) - .onSizeChanged { size = it }, + .let { if (animate) it.beatPulse(blend, { beats.floatValue }) else it }, // Content gets the card's full size, e.g. to centre itself in a fixed-height card. propagateMinConstraints = true, ) { - val b = bitmaps.takeUnless { lit.outline } - // Base: fill and rim light. Until its bitmap is ready, the plain mid colour; an outline card is black. - Spacer( - Modifier.matchParentSize().drawBehind { - val w = this.size.width - val h = this.size.height - // A card built anew (a detail closing beside the tab) draws once before it knows its size: the layers - // already made for the size it's drawn at stand in, core and all, for that frame. - val first = if (b == null && !lit.outline) { - GlowCache.peek(GlowCache.Key(still, IntSize(w.roundToInt(), h.roundToInt()), density.density)) ?: GlowCache.latest(still, density.density) - } else null - when { - lit.outline -> drawRect(Color.Black) - first != null -> drawIntoCanvas { - it.nativeCanvas.drawBitmap(first.base, null, first.baseIn(w, h), FILTER) - it.nativeCanvas.drawBitmap(first.core, null, first.coreIn(w, h), Paint(FILTER).apply { alpha = (lit.coreOpacity * 255).roundToInt().coerceIn(0, 255) }) - } - b == null -> drawRect(palette.mid) - else -> drawIntoCanvas { it.nativeCanvas.drawBitmap(b.base, null, b.baseIn(w, h), FILTER) } - } - // Read here, so the swell redraws this layer each frame and composes nothing. - val lifted = peakBitmaps - val lift = if (b != null && lifted != null) swell?.amount?.invoke() ?: 0f else 0f - if (lifted != null && lift > 0f) drawIntoCanvas { - peakPaint.alpha = (lift.coerceIn(0f, 1f) * 255).roundToInt() - it.nativeCanvas.drawBitmap(lifted.base, null, lifted.baseIn(w, h), peakPaint) - } - }, - ) - if (b != null) { - // The core on its own layer: moved and scaled, never redrawn. - CoreLayer(b, lit, core) { drift.at(seconds.floatValue, beats.floatValue, lit.motion) } - } CompositionLocalProvider(LocalCardNumbers provides opening?.numbers, LocalCardOpens provides (onClick != null)) { Box(Modifier.padding(contentPadding), content = content) } - // Grain and the hairline edge, on top of everything; static. - Spacer(Modifier.matchParentSize().drawWithCache { overlay(lit, grainSeed) }) } } /** - * A passing lift of a card's light to [peak] (its [GlowStyle.lightLevel] at the top), shown as much as [amount] says, - * 0 to 1. [amount] is read only while drawing, so an animated swell recomposes nothing. + * A passing lift of a level card's light to [peak] (its [GlowStyle.lightLevel] at the top), shown as much as [amount] + * says, 0 to 1. [amount] is read only while drawing, so an animated swell recomposes nothing. */ @androidx.compose.runtime.Immutable class GlowSwell(val peak: Float, val amount: () -> Float) -/** The pre-blurred core, moved by the motion through layer properties only. */ -@Composable -private fun BoxScope.CoreLayer(b: GlowBitmaps, style: GlowStyle, core: CoreBox, motion: () -> Drift) { - Spacer( - Modifier - .matchParentSize() - .graphicsLayer { - // Read here, so motion only updates this layer's properties; nothing is redrawn. - val m = motion() - translationX = m.dx * size.width - translationY = m.dy * size.height - // A squash widens the core a touch and flattens it as much: a squeeze, not a resize. - scaleX = m.scale * (1f + m.squash) - scaleY = m.scale * (1f - m.squash) - transformOrigin = TransformOrigin(core.x, core.y) - alpha = (style.coreOpacity * m.fade).coerceIn(0f, 1f) - // Fade by scaling each pixel's alpha instead of rendering the layer offscreen first. - compositingStrategy = CompositingStrategy.ModulateAlpha - } - .drawBehind { drawIntoCanvas { it.nativeCanvas.drawBitmap(b.core, null, b.coreIn(size.width, size.height), FILTER) } }, - ) -} - -private val FILTER = Paint(Paint.FILTER_BITMAP_FLAG) - -/** Grain and the hairline edge with its gloss, from the shared light ([glowPaint], as a widget's background draws them). */ -private fun CacheDrawScope.overlay(style: GlowStyle, grainSeed: Int): DrawResult { - val spec = glowPaint(style, size.width, size.height, density) - val outline = RoundedCornerShape(style.radius).createOutline(size, layoutDirection, this) - // On hold: only the edge, in the card's colour. - spec.outline?.let { color -> return onDrawBehind { drawOutline(outline, color, style = Stroke(spec.outlineWidth)) } } - val grainPaint = Paint().apply { - shader = grainShader(grainSeed) - alpha = spec.grainAlpha - } - val hairline = Stroke(spec.hairlineWidth) - val gloss = spec.gloss.brush() - return onDrawBehind { - if (spec.grainAlpha > 0) drawIntoCanvas { it.nativeCanvas.drawPaint(grainPaint) } - drawOutline(outline, spec.hairline, style = hairline) - drawOutline(outline, gloss, style = hairline) +/** Where the light comes from for [style], degrees as [LightAngle]: its own angle, else the old top or bottom, else lower left. */ +private fun cardAngle(style: GlowStyle, belowOnly: Boolean): Float { + val own = style.lightAngle ?: when (style.lightFrom) { + org.openstrap.app.ui.glow.draw.LightFrom.Top -> LightAngle.Above + org.openstrap.app.ui.glow.draw.LightFrom.Bottom -> LightAngle.Below + org.openstrap.app.ui.glow.draw.LightFrom.All -> LightAngle.LowerLeft } -} - -/** A card's pre-rendered layers, and where to draw them (card coordinates). */ -private class GlowBitmaps( - val base: android.graphics.Bitmap, - val core: android.graphics.Bitmap, - val baseDst: RectF, - val coreDst: RectF, -) { - /** Where the base goes on a card [w] by [h]: its own place, or stretched over a card of another size. */ - fun baseIn(w: Float, h: Float): RectF = if (fits(w, h)) baseDst else RectF(0f, 0f, w, h) - - /** Where the core goes on a card [w] by [h], its margin stretched with the card. */ - fun coreIn(w: Float, h: Float): RectF { - if (fits(w, h)) return coreDst - val sx = w / baseDst.width() - val sy = h / baseDst.height() - return RectF(coreDst.left * sx, coreDst.top * sy, coreDst.right * sx, coreDst.bottom * sy) - } - - private fun fits(w: Float, h: Float) = w == baseDst.width() && h == baseDst.height() + return if (belowOnly) LightAngle.Below else own } /** - * Rendered glow layers, shared by every card with the same look and size. Rendering blurs is the - * expensive part of a glow card; with the cache, a card scrolling back into view costs nothing. + * Tinted glass lit from [angle] (the boards' `linear-gradient(40deg, first 30%, second 20%, white 5%)`): the first stop + * on the light's side, the second past the middle, white 5% at the far corner. Lit top edge 35%, ring 10%. */ -private object GlowCache { - data class Key(val style: GlowStyle, val size: IntSize, val density: Float) - - private val entries = object : LinkedHashMap(16, 0.75f, true) { - override fun removeEldestEntry(eldest: MutableMap.MutableEntry?) = size > MAX_ENTRIES - } - - fun peek(key: Key): GlowBitmaps? = synchronized(entries) { entries[key] } +private fun Modifier.heroGlass(blend: Blend, angle: Float, strength: Float, shape: androidx.compose.ui.graphics.Shape): Modifier = + drawWithCache { + val outline = shape.createOutline(size, layoutDirection, this) + val (vx, vy) = lightVector(angle) + // The gradient line runs through the centre, from the light's corner to the opposite one. + val c = Offset(size.width / 2f, size.height / 2f) + val reach = Offset(vx * size.width / 2f, vy * size.height / 2f) + val brush = Brush.linearGradient( + 0f to blend.first.copy(alpha = (HERO_FIRST * strength).coerceIn(0f, 1f)), + 0.55f to blend.second.copy(alpha = (HERO_SECOND * strength).coerceIn(0f, 1f)), + 1f to Color.White.copy(alpha = 0.05f), + start = c + reach, end = c - reach, + ) + onDrawBehind { drawOutline(outline, brush) } + }.litEdge(shape, top = 0.35f, ring = 0.10f) - /** The layers last used for [style] at any size, to stretch over a card until its own size's are made. */ - fun latest(style: GlowStyle, density: Float): GlowBitmaps? = synchronized(entries) { - entries.entries.lastOrNull { it.key.style == style && it.key.density == density }?.value - } +private const val HERO_FIRST = 0.30f +private const val HERO_SECOND = 0.20f - fun get(key: Key): GlowBitmaps { - peek(key)?.let { return it } - val built = render(key.style, key.size.width.toFloat(), key.size.height.toFloat(), Density(key.density)) - return synchronized(entries) { entries.getOrPut(key) { built } } +/** An outline card (on hold): clear glass with a 1.5 dp ring in the blend's first stop. */ +private fun Modifier.clearGlassRing(blend: Blend, shape: androidx.compose.ui.graphics.Shape): Modifier = + drawWithCache { + val outline = shape.createOutline(size, layoutDirection, this) + val ring = Stroke(3.dp.toPx()) + val fill = Color.White.copy(alpha = 0.04f) + val color = blend.first.copy(alpha = 0.85f) + onDrawBehind { + drawOutline(outline, fill) + // The card is clipped to its shape, so half the stroke shows. + drawOutline(outline, color, style = ring) + } } - /** Enough for every card on a screen and the tabs either side, plus the ones just scrolled past. */ - private const val MAX_ENTRIES = 16 -} - /** - * Renders the base and the core layer at half resolution (blur hides it), as GPU bitmaps, with the shared light - * drawing ([glowPaint], [drawGlowBase], [drawGlowCore]) a widget's background uses too. + * Solid light (Matrix board, Level fill): [blend] filling the card's long side up to [level], second stop at the value, + * then a short fade to dark, with a dark pool behind the number so white reads on it at any level. Upward on a Small + * or Tall, left to right where the card is wider than tall. A [swell] lifts the level toward its peak while drawing. */ -private fun render(style: GlowStyle, w: Float, h: Float, density: Density): GlowBitmaps { - val paint = glowPaint(style, w, h, density.density) - val base = halfResBitmap(w, h, 0f) { canvas -> drawGlowBase(canvas, paint) } - val margin = paint.coreMargin - val coreLayer = halfResBitmap(w, h, margin) { canvas -> drawGlowCore(canvas, paint) } - return GlowBitmaps( - base = base, - core = coreLayer, - baseDst = RectF(0f, 0f, w, h), - coreDst = RectF(-margin, -margin, w + margin, h + margin), - ) -} - -/** A bitmap at half the card's resolution covering the card plus [margin] on every side; [draw] gets card coordinates. */ -private fun halfResBitmap(w: Float, h: Float, margin: Float, draw: (android.graphics.Canvas) -> Unit): android.graphics.Bitmap { - val scale = 0.5f - val bmp = android.graphics.Bitmap.createBitmap( - ((w + margin * 2) * scale).roundToInt().coerceAtLeast(1), - ((h + margin * 2) * scale).roundToInt().coerceAtLeast(1), - android.graphics.Bitmap.Config.ARGB_8888, - ) - val canvas = android.graphics.Canvas(bmp) - canvas.scale(scale, scale) - canvas.translate(margin, margin) - draw(canvas) - // Upload to the GPU now, on this background thread, rather than on the first frame that draws it. - return bmp.copy(android.graphics.Bitmap.Config.HARDWARE, false)?.also { bmp.recycle() } ?: bmp -} - -/** How the dark core sits: offset (fractions of the card), scale, and [fade] on top of the style's core opacity. */ -private class Drift(val dx: Float, val dy: Float, val scale: Float, val fade: Float = 1f, val squash: Float = 0f) - -/** - * The core's motion over time. Under the heartbeat is a small never-repeating wander: each axis is two - * sine waves with unrelated periods (10 to 24 s), and every card gets its own periods and phases. - */ -private class CoreDrift(private val random: Random) { - private fun wave() = Wave(period = 10f + random.nextFloat() * 14f, phase = random.nextFloat() * 2f * PI.toFloat()) - private val x = wave() to wave() - private val y = wave() to wave() - private val breath = wave() - /** Where in its cycle each card starts, so two heart cards don't beat in lockstep. */ - private val offset = random.nextFloat() * 10f - - fun at(time: Float, beatsSoFar: Float, motion: GlowMotion): Drift { - val t = time + offset - return when (motion) { - GlowMotion.Still -> Drift(0f, 0f, 1f) - is GlowMotion.Heartbeat -> { - // The dark core is the heart: it squeezes on each beat (lub, then a smaller dub) and relaxes, - // always as dark, so nothing flashes. Each beat also pushes it a little off centre, a new way each - // time, and squashes it, so the colour around it surges past a different side, like blood. - val base = wander(t, amount = 0.4f) - val beats = beatsSoFar + offset - val c = contraction(beats) - val angle = beatAngle(floor(beats).toInt()) - Drift( - dx = base.dx + 0.022f * c * cos(angle), - dy = base.dy + 0.018f * c * sin(angle), - scale = base.scale * (1f - 0.075f * c), - squash = 0.025f * c * cos(2f * angle), - ) - } +private fun Modifier.levelLight(blend: Blend, level: Float, swell: GlowSwell?, shape: androidx.compose.ui.graphics.Shape): Modifier = + drawWithCache { + val outline = shape.createOutline(size, layoutDirection, this) + val across = size.width > size.height * 1.2f + onDrawBehind { + val lifted = swell?.let { s -> + val a = s.amount().coerceIn(0f, 1f) + if (a > 0f) level + (s.peak.coerceIn(level, 1f) - level) * a else level + } ?: level + drawLevel(blend, lifted, across) } - } + }.litEdge(shape, top = 0.25f, ring = 0.05f) - private fun wander(t: Float, amount: Float) = Drift( - dx = 0.035f * amount * (0.65f * x.first(t) + 0.35f * x.second(t)), - dy = 0.03f * amount * (0.65f * y.first(t) + 0.35f * y.second(t)), - // Breathing in: the core swells a little; breathing out, it settles. - scale = 1f + 0.025f * amount * breath(t), +private fun DrawScope.drawLevel(blend: Blend, level: Float, across: Boolean) { + val dark = DarkGlowFill + val edge = (level + 0.04f).coerceAtMost(1f) + val fill = if (across) { + Brush.horizontalGradient( + 0f to blend.first, level to blend.second, edge to dark.copy(alpha = 0.85f), 1f to dark.copy(alpha = 0.85f), + ) + } else { + val top = 1f - level + Brush.verticalGradient( + 0f to dark.copy(alpha = 0.85f), (top - 0.04f).coerceAtLeast(0f) to dark.copy(alpha = 0.85f), + top to blend.second, 1f to blend.first, + ) + } + drawRect(fill) + // The pool behind the number: 75% by 62% at 26% 40% across, 110% by 52% at 30% 22% up. + val c = if (across) Offset(size.width * 0.26f, size.height * 0.40f) else Offset(size.width * 0.30f, size.height * 0.22f) + val rx = size.width * (if (across) 0.75f else 1.10f) + val ry = size.height * (if (across) 0.62f else 0.52f) + val pool = Brush.radialGradient( + 0f to dark.copy(alpha = if (across) 0.9f else 0.97f), 0.55f to dark.copy(alpha = if (across) 0.62f else 0.88f), + 1f to Color.Transparent, center = c, radius = rx, ) + scale(1f, ry / rx, pivot = c) { drawCircle(pool, rx, c) } +} - private class Wave(val period: Float, val phase: Float) { - operator fun invoke(t: Float) = sin(2f * PI.toFloat() * t / period + phase) - } +/** A gentle lift of the tint with each heartbeat (live heart rate only): the blend's first stop, up to 12% over the card. */ +private fun Modifier.beatPulse(blend: Blend, beats: () -> Float): Modifier = drawBehind { + val c = contraction(beats()) + if (c > 0.01f) drawRect(blend.first.copy(alpha = BEAT_LIFT * c)) } +private const val BEAT_LIFT = 0.12f + /** * How hard the heart is squeezing over one beat (phase in beats), 0..1: a quick lub, a smaller dub just after, - * each tightening fast and letting go more slowly, then rest until the next beat. + * then rest until the next beat. */ private fun contraction(phase: Float): Float { val f = phase - floor(phase) - // Fast in, slow out: a skewed bump that rises over [rise] and decays over [fall]. fun squeeze(at: Float, rise: Float, fall: Float): Float { val d = f - at val w = if (d < 0f) rise else fall @@ -425,12 +257,3 @@ private fun contraction(phase: Float): Float { } return (squeeze(0.08f, 0.035f, 0.09f) + 0.55f * squeeze(0.30f, 0.03f, 0.08f)).coerceAtMost(1f) } - -/** Which way beat [n] pushes the core: a fixed scramble of the beat number, so each beat goes its own way. */ -private fun beatAngle(n: Int): Float { - var h = n * 0x9E3779B1.toInt() - h = h xor (h ushr 15) - h *= 0x85EBCA6B.toInt() - h = h xor (h ushr 13) - return (h ushr 8) / (1 shl 24).toFloat() * 2f * PI.toFloat() -} diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/MovingBorder.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/MovingBorder.kt index 91d2d37f..db8358e0 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/MovingBorder.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/MovingBorder.kt @@ -13,11 +13,11 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawWithCache -import androidx.compose.ui.geometry.CornerRadius -import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.addOutline import androidx.compose.ui.graphics.ShaderBrush +import androidx.compose.ui.graphics.drawscope.clipPath import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.lerp import androidx.compose.ui.graphics.toArgb @@ -27,7 +27,8 @@ import kotlin.math.abs import kotlin.math.floor import kotlin.math.sin import kotlinx.coroutines.flow.first -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes /** * A chroma ring round a card's border: a faint ring always there, with three lights sliding round it at their own @@ -61,12 +62,11 @@ fun Modifier.movingBorder(): Modifier { } } return drawWithCache { - val corner = GlowLayout.CardCorner.toPx() + val path = Path().apply { addOutline(GlowShapes.Card.createOutline(size, layoutDirection, this@drawWithCache)) } val ring = RingWidth.toPx() val halo = HaloWidth.toPx() val cx = size.width / 2f val cy = size.height / 2f - val inset = ring / 2f val colors = IntArray(RING_SAMPLES + 1) val glows = IntArray(RING_SAMPLES + 1) val stops = FloatArray(RING_SAMPLES + 1) { it.toFloat() / RING_SAMPLES } @@ -77,9 +77,11 @@ fun Modifier.movingBorder(): Modifier { // Starting at the top: the sweep's zero is at three o'clock. val ringShader = SweepGradient(cx, cy, colors, stops).apply { setLocalMatrix(matrix) } val glowShader = SweepGradient(cx, cy, glows, stops).apply { setLocalMatrix(matrix) } - val box = Size(size.width - ring, size.height - ring) - drawRoundRect(ShaderBrush(glowShader), Offset(inset, inset), box, CornerRadius(corner), style = Stroke(halo)) - drawRoundRect(ShaderBrush(ringShader), Offset(inset, inset), box, CornerRadius(corner - inset), style = Stroke(ring)) + // Clipped to the squircle, so half of each stroke shows: the ring and its halo follow the card's edge. + clipPath(path) { + drawPath(path, ShaderBrush(glowShader), style = Stroke(halo * 2f)) + drawPath(path, ShaderBrush(ringShader), style = Stroke(ring * 2f)) + } } } } @@ -138,7 +140,7 @@ private fun noise(x: Float, y: Float): Float { * The lights' colours: the cards' own colours in spectrum order, Heart's red, Energy's orange, Calories' gold, Steps' * lime, Recovery's teal, Sleep's blue and the evening's violet, looping back to red. */ -private val Rainbow = with(MetricColors) { listOf(heart, charge, calories, steps, readiness, sleepDeep, evening) } +private val Rainbow = with(Blends) { listOf(Heart, Energy, Calories, Steps, Recovery, Sleep, Evening).map { it.first } } /** The ring's dim base, and the white the lights are mixed with so they glow rather than shout. */ private val RingBase = Color(0xFF333340) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/PictureCard.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/PictureCard.kt index 8bccc005..50ef28ae 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/PictureCard.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/PictureCard.kt @@ -1,7 +1,5 @@ package org.openstrap.app.ui.glow -import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.PaddingValues @@ -9,11 +7,10 @@ import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.Immutable +import androidx.compose.runtime.remember import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.drawWithCache -import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Color @@ -25,13 +22,19 @@ import androidx.compose.ui.unit.dp import org.openstrap.app.ui.components.LocalCardNumbers import org.openstrap.app.ui.components.cardOpening import org.openstrap.app.ui.components.pressClickable -import org.openstrap.app.ui.glow.draw.EdgeSurface +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.drawOutline +import androidx.compose.ui.graphics.lerp +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass /* - * The middle tier (spec 2.5, Picture card): a dark card with a hairline that draws its metric's picture in the ink. - * Unlit when usual (L0). Off your normal it takes the rim (L2, spec 2.1): a 2 dp rim in the ink lit next to the part of - * the picture that is off, fading out across the card, with a faint wash of the ink inside. Static: the rim only - * changes when the data does. + * The middle tier (Picture card): clear glass (white 7%, lit top edge) that draws its metric's picture in the + * blend. Plain when usual. Off your normal it takes the rim (Matrix board, Rim and tag): a 2 dp rim in the metric's + * blend along the squircle edge, lit next to the part of the picture that is off and fading across the card, with a + * faint wash of the first stop inside. Static: the rim only changes when the data does. */ /** A cool soft white for things that speak for no one metric: info sheets, the zone dots with no reading. */ @@ -52,7 +55,7 @@ data class CardOverride(val plain: Boolean = false) @Suppress("CompositionLocalAllowlist", "ComposeCompositionLocalUsage") val LocalCardOverride = staticCompositionLocalOf { CardOverride() } -private val CardShape = GlowLayout.CardShape +private val CardShape = GlowShapes.Card /** The rim's stroke, and how strong the ink is at its point, halfway out and at the end. */ private val RimWidth = 2.dp @@ -78,6 +81,7 @@ fun PictureCard( content: @Composable ColumnScope.() -> Unit, ) { val plain = LocalCardOverride.current.plain + val blend = remember(ink) { Blends.forInk(ink) ?: Blend(ink, ink) } val mood = LocalGlowMood.current // Tapped, the card grows into what it opens (spec 3.5). val opening = cardOpening(onClick, CardShape) @@ -85,11 +89,9 @@ fun PictureCard( modifier .then(opening?.modifier ?: Modifier) .let { if (onClick != null) it.pressClickable(opening?.onClick ?: onClick, CardShape) else it } - .let { - if (plain) it.clip(CardShape).background(ListSurface, CardShape).border(1.dp, CardHairline, CardShape) - else it.clip(CardShape).background(EdgeSurface, CardShape).border(1.dp, CardHairline, CardShape) - .let { m -> if (rim != null) m.rimLight(rim, ink, mood.edge) else m } - } + .clip(CardShape) + .clearGlass(CardShape) + .let { if (!plain && rim != null) it.rimLight(rim, blend, mood.edge) else it } .padding(contentPadding), ) { CompositionLocalProvider(LocalCardNumbers provides opening?.numbers, LocalCardOpens provides (onClick != null)) { content() } @@ -107,24 +109,25 @@ private fun ellipse(c: Offset, rx: Float, ry: Float, colors: List, stops: } } -/** The L2 rim (spec 2.1) at [rim] in [ink], scaled by the mood's [strength], over the card's surface. */ -private fun Modifier.rimLight(rim: Rim, ink: Color, strength: Float): Modifier = drawWithCache { +/** + * The rim at [rim] in [blend], scaled by the mood's [strength]: a 2 dp stroke along the squircle edge, first stop at + * the lit point, a step toward the second stop part way, then gone, plus a faint wash of the first stop inside. + */ +private fun Modifier.rimLight(rim: Rim, blend: Blend, strength: Float): Modifier = drawWithCache { + val outline = CardShape.createOutline(size, layoutDirection, this) val c = Offset(rim.x * size.width, rim.y * size.height) val rx = (rim.reachX * size.width).coerceAtLeast(1f) val ry = (rim.reachY * size.height).coerceAtLeast(1f) - val wash = ellipse(c, rx * WASH_REACH_X, ry * WASH_REACH_Y, listOf(ink.copy(alpha = WASH_ALPHA * strength), Color.Transparent), listOf(0f, 1f)) + val wash = ellipse(c, rx * WASH_REACH_X, ry * WASH_REACH_Y, listOf(blend.first.copy(alpha = WASH_ALPHA * strength), Color.Transparent), listOf(0f, 1f)) val edge = ellipse( c, rx, ry, - listOf(ink.copy(alpha = strength), ink.copy(alpha = RIM_HALF_ALPHA * strength), Color.Transparent), + listOf(blend.first.copy(alpha = strength), lerp(blend.first, blend.second, 0.5f).copy(alpha = RIM_HALF_ALPHA * strength), Color.Transparent), listOf(0f, RIM_HALF_AT, 1f), ) - val w = RimWidth.toPx() - val corner = GlowLayout.CardCorner.toPx() + // The card is clipped to its shape, so half of this stroke shows: the 2 dp rim. + val stroke = Stroke(RimWidth.toPx() * 2f) onDrawBehind { drawRect(wash) - drawRoundRect( - edge, topLeft = Offset(w / 2, w / 2), size = Size(size.width - w, size.height - w), - cornerRadius = CornerRadius(corner - w / 2), style = Stroke(w), - ) + drawOutline(outline, edge, style = stroke) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/TodayCards.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/TodayCards.kt index 866b0487..be46a394 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/TodayCards.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/TodayCards.kt @@ -132,11 +132,14 @@ internal fun HeroNumber(value: String?, lines: List, modifier: Modifier Spacer(Modifier.width(12.dp)) } Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { - lines.forEach { Text(it, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, maxLines = 1) } + lines.forEach { Text(it, color = Color.White.copy(alpha = HERO_LINE_ALPHA), style = GlowType.secondary, maxLines = 1) } } } } +/** The words beside the hero number: white at 92% (Today boards). */ +private const val HERO_LINE_ALPHA = 0.92f + /* ---------------------------------------------- Strips ---------------------------------------------- */ /** A strip is only 68 dp high, so its words get less above and below than a card; the sides are a card's. */ diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/GlowStyle.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/GlowStyle.kt index 43ddeb1f..643a92de 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/GlowStyle.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/GlowStyle.kt @@ -140,6 +140,11 @@ data class GlowStyle( * (pattern D1). Nothing is rendered for it but the edge. */ val outline: Boolean = false, + /** + * Dark glow (Glow x Glass): the blend rising from the bottom edge of a near-black card, for a strip or a moment + * that comes up from below. [second] draws it too. + */ + val dark: Boolean = false, /** Set by [GlowCard] from [LocalGlowMood]; leave it to the screen. */ val mood: GlowMood = GlowMood.Day, ) { From 6cc17fdfd7e07698f220350fe62ffe94cf9473ee Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:35:03 +0400 Subject: [PATCH 06/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20lists,=20strips,?= =?UTF-8?q?=20buttons,=20chips,=20header=20chip=20and=20tab=20bar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../openstrap/app/ui/components/Insights.kt | 78 ++++++---- .../openstrap/app/ui/dashboard/StrapPill.kt | 138 ++++-------------- .../org/openstrap/app/ui/glow/GlowLayout.kt | 19 ++- .../org/openstrap/app/ui/glow/GlowList.kt | 60 ++++++-- .../org/openstrap/app/ui/glow/GlowParts.kt | 38 +++-- .../org/openstrap/app/ui/glow/NewsPill.kt | 13 +- .../org/openstrap/app/ui/glow/PageParts.kt | 105 +++++++------ .../org/openstrap/app/ui/glow/TabParts.kt | 3 +- .../org/openstrap/app/ui/root/TabsPager.kt | 8 +- 9 files changed, 224 insertions(+), 238 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt b/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt index 1fcc6ce7..84a23e74 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt @@ -8,7 +8,6 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.offset import androidx.compose.animation.core.tween -import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -26,7 +25,6 @@ import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.Icon import androidx.compose.ui.input.pointer.pointerInput import org.openstrap.app.ui.glow.GlowType @@ -47,9 +45,16 @@ import dev.chrisbanes.haze.blur.HazeBlurStyle import dev.chrisbanes.haze.blur.HazeColorEffect import dev.chrisbanes.haze.blur.hazeBlur import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.ColorMatrix +import androidx.compose.ui.graphics.Shape +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.LocalScreenLight +import org.openstrap.app.ui.theme.litEdge import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp /** One destination in [FloatingNavBar]; [tint] colours its capsule while it's the tab showing (white on Today). */ data class NavItem(val label: String, val icon: ImageVector, val selectedIcon: ImageVector = icon, val tint: Color = Color.White) @@ -69,16 +74,16 @@ fun FloatingNavBar( modifier.fillMaxWidth().drawBehind { val height = maxOf(TabBarFade.Height.toPx(), size.height) drawRect(TabBarFade.brush(size.height - height, size.height), Offset(0f, size.height - height), Size(size.width, height)) - }.navigationBarsPadding().padding(horizontal = 28.dp, vertical = 10.dp), + }.navigationBarsPadding().padding(start = 16.dp, end = 16.dp, bottom = 22.dp, top = 10.dp), contentAlignment = Alignment.Center, ) { // No shadow: it would show through the glass as a dark smudge. - Box(Modifier.widthIn(max = 440.dp).fillMaxWidth().glassPill(glass)) { + Box(Modifier.widthIn(max = 440.dp).fillMaxWidth().height(BarHeight).glassPill(glass, BarShape)) { // Measured width, so the pill knows how wide a cell is (BoxWithConstraints can't size to its row). var barWidth by remember { mutableIntStateOf(0) } val density = androidx.compose.ui.platform.LocalDensity.current Box( - Modifier.padding(6.dp).height(androidx.compose.foundation.layout.IntrinsicSize.Min) + Modifier.padding(5.dp).fillMaxHeight() .onSizeChanged { barWidth = it.width }, ) { // One capsule that slides to the selected tab, rather than each cell lighting up on its own. @@ -88,14 +93,16 @@ fun FloatingNavBar( (cell + gap) * selected, tween(Motion.SWIFT, easing = Motion.easing), label = "nav pill", ) Box( - Modifier.offset(x = x).width(cell).fillMaxHeight().clip(CircleShape) - .background(capsuleColor(items.getOrNull(selected)?.tint)).border(GlassChipEdge, CircleShape), + Modifier.offset(x = x).width(cell).fillMaxHeight().clip(GlowShapes.Pill) + .background(capsuleColor(items.getOrNull(selected)?.tint)).litEdge(GlowShapes.Pill, top = 0.22f, ring = 0f), ) - Row(horizontalArrangement = Arrangement.spacedBy(gap)) { + Row(Modifier.fillMaxHeight(), horizontalArrangement = Arrangement.spacedBy(gap)) { items.forEachIndexed { i, item -> - NavCell(item, i == selected, modifier = Modifier.clip(CircleShape).clickable { onSelect(i) } - .weight(1f) - .padding(vertical = 8.dp)) + NavCell( + item, i == selected, + modifier = Modifier.clip(GlowShapes.Pill).clickable { onSelect(i) }.weight(1f).fillMaxHeight(), + verticalArrangement = Arrangement.Center, + ) } } } @@ -116,24 +123,24 @@ fun FloatingNavRail( modifier.fillMaxHeight().systemBarsPadding().displayCutoutPadding().padding(horizontal = 10.dp, vertical = 20.dp), contentAlignment = Alignment.Center, ) { - Box(Modifier.width(NavRailWidth - 20.dp).heightIn(max = 380.dp).fillMaxHeight().glassPill(glass)) { + Box(Modifier.width(NavRailWidth - 20.dp).heightIn(max = 380.dp).fillMaxHeight().glassPill(glass, BarShape)) { var barHeight by remember { mutableIntStateOf(0) } val density = androidx.compose.ui.platform.LocalDensity.current - Box(Modifier.padding(6.dp).onSizeChanged { barHeight = it.height }) { + Box(Modifier.padding(5.dp).onSizeChanged { barHeight = it.height }) { val gap = 2.dp val cell = (with(density) { barHeight.toDp() } - gap * (items.size - 1)) / items.size val y by androidx.compose.animation.core.animateDpAsState( (cell + gap) * selected, tween(Motion.SWIFT, easing = Motion.easing), label = "nav pill", ) Box( - Modifier.offset(y = y).height(cell).fillMaxWidth().clip(CircleShape) - .background(capsuleColor(items.getOrNull(selected)?.tint)).border(GlassChipEdge, CircleShape), + Modifier.offset(y = y).height(cell).fillMaxWidth().clip(GlowShapes.Pill) + .background(capsuleColor(items.getOrNull(selected)?.tint)).litEdge(GlowShapes.Pill, top = 0.22f, ring = 0f), ) Column(Modifier.fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(gap)) { items.forEachIndexed { i, item -> NavCell( item, i == selected, - modifier = Modifier.clip(CircleShape).clickable { onSelect(i) }.weight(1f).fillMaxWidth(), + modifier = Modifier.clip(GlowShapes.Pill).clickable { onSelect(i) }.weight(1f).fillMaxWidth(), verticalArrangement = Arrangement.Center, ) } @@ -147,13 +154,22 @@ fun FloatingNavRail( * The bar's black glass pill: what scrolls under it blurred, the glass edge round it. It takes every touch inside it, * so a tap between two tabs never lands on the card under the bar. */ -private fun Modifier.glassPill(glass: HazeState): Modifier = - clip(CircleShape).hazeBlur(HazeInput.Sources(glass), GlassBlur).border(GlassEdge, CircleShape).pointerInput(Unit) {} +private fun Modifier.glassPill(glass: HazeState, shape: Shape): Modifier = + clip(shape).hazeBlur(HazeInput.Sources(glass), GlassBlur).litEdge(shape, top = 0.18f, ring = 0.06f).pointerInput(Unit) {} -/** The capsule under the tab showing: its section colour, eased as it slides; plain glass white on Today. */ +/** The bar's height and corner (TabTodayMorning): 68 dp, radius 34 dp as a squircle (a pill, half the height). */ +private val BarHeight = 68.dp +private val BarShape: Shape = GlowShapes.Pill + +/** + * The pill under the tab showing, eased as it slides: tinted with the screen's light (its first stop at 32%) when the + * screen gives one, else the tab's own blend ([tint]), else white 12% (on Today with no light). + */ @Composable private fun capsuleColor(tint: Color?): Color { - val target = if (tint == null || tint == Color.White) GlassChip else tint.copy(alpha = 0.22f) + val light = LocalScreenLight.current?.blend?.first + val ink = light ?: tint?.takeIf { it != Color.White } + val target = if (ink != null) ink.copy(alpha = 0.32f) else GlassChip val eased by androidx.compose.animation.animateColorAsState(target, tween(Motion.SWIFT), label = "nav capsule") return eased } @@ -214,9 +230,9 @@ val NavRailWidth = 92.dp /** One destination's icon and label, tinted for whether it's [on]. */ @Composable private fun NavCell(item: NavItem, on: Boolean, modifier: Modifier, verticalArrangement: Arrangement.Vertical = Arrangement.Top) { - Column(modifier, verticalArrangement = verticalArrangement, horizontalAlignment = Alignment.CenterHorizontally) { + Column(modifier, verticalArrangement = if (verticalArrangement == Arrangement.Center) Arrangement.spacedBy(3.dp, Alignment.CenterVertically) else verticalArrangement, horizontalAlignment = Alignment.CenterHorizontally) { val tint by androidx.compose.animation.animateColorAsState( - if (on) Color.White else Color.White.copy(alpha = 0.55f), + if (on) Color.White else Color.White.copy(alpha = 0.6f), tween(Motion.QUICK), label = "nav tint", ) val iconScale by animateFloatAsState(if (on) 1.08f else 1f, tween(Motion.SWIFT, easing = Motion.easing), label = "nav icon") @@ -224,19 +240,21 @@ private fun NavCell(item: NavItem, on: Boolean, modifier: Modifier, verticalArra if (on) item.selectedIcon else item.icon, item.label, tint = tint, modifier = Modifier.size(22.dp).graphicsLayer { scaleX = iconScale; scaleY = iconScale }, ) - Text(item.label, style = GlowType.caption, color = tint, maxLines = 1) + Text(item.label, style = GlowType.caption.copy(fontSize = 12.sp, lineHeight = 14.sp, fontWeight = androidx.compose.ui.text.font.FontWeight.Normal), color = tint, maxLines = 1) } } -/* Black glass: what passes under is blurred and darkened until only its colour shows; a light catching the top edge, shade along the bottom. */ +/* Heavy glass (TabTodayMorning): rgba(28,28,34,0.62) over a 24 dp blur at 160% saturation; the lit edge is drawn on top. */ private val GlassBlur = HazeBlurStyle { blurRadius(24.dp) backgroundColor(Color.Black) - colorEffects(listOf(HazeColorEffect.tint(Color(0xFF0B0B0D).copy(alpha = 0.7f)))) + colorEffects( + listOf( + HazeColorEffect.colorFilter(ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(1.6f) })), + HazeColorEffect.tint(Color(0xFF1C1C22).copy(alpha = 0.62f)), + ), + ) // Without blur (before Android 12), a near-opaque tint instead. - fallbackColorEffect(HazeColorEffect.tint(Color(0xFF0B0B0D).copy(alpha = 0.92f))) + fallbackColorEffect(HazeColorEffect.tint(Color(0xFF1C1C22).copy(alpha = 0.94f))) } -private val GlassChip = Color.White.copy(alpha = 0.1f) -private val GlassChipEdge = BorderStroke( - 1.dp, Brush.verticalGradient(0f to Color.White.copy(alpha = 0.16f), 1f to Color.Transparent), -) +private val GlassChip = Color.White.copy(alpha = 0.12f) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/dashboard/StrapPill.kt b/app/src/main/kotlin/org/openstrap/app/ui/dashboard/StrapPill.kt index 8ef11dfb..856cacc4 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/dashboard/StrapPill.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/dashboard/StrapPill.kt @@ -1,13 +1,6 @@ package org.openstrap.app.ui.dashboard -import androidx.compose.animation.core.LinearEasing -import androidx.compose.animation.core.animateFloat -import androidx.compose.animation.core.animateFloatAsState -import androidx.compose.animation.core.infiniteRepeatable -import androidx.compose.animation.core.rememberInfiniteTransition -import androidx.compose.animation.core.tween import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -22,81 +15,49 @@ import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.material3.minimumInteractiveComponentSize import androidx.compose.runtime.Composable -import androidx.compose.runtime.State -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.draw.drawBehind -import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.geometry.Size -import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.TileMode -import androidx.compose.ui.graphics.drawscope.DrawScope -import androidx.compose.ui.graphics.drawscope.clipRect import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import org.openstrap.app.R -import org.openstrap.app.ui.components.Motion -import org.openstrap.app.ui.components.rememberAnimationsOn import org.openstrap.app.ui.glow.GlowType import org.openstrap.app.ui.glow.StrapDrawing import org.openstrap.app.ui.theme.AppIcons -import org.openstrap.app.ui.theme.ControlSurface +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.litEdge import org.openstrap.app.ui.theme.MetricColors /* * The strap pill in the header (spec 3.1). The pill is the strap's state, not a dot with words: - * - connected: green as far as the battery, fading out into the pill, the percent in the middle (amber when low) - * - charging: the same green, flowing, with a bolt before the number - * - not synced: orange all over, with the (i) + * - connected: a green 7 dp dot and the battery percent in white (amber dot when low) + * - charging: the green dot, a bolt and the number + * - not synced: an amber dot and its words * - not connected, connecting or not paired: the strap as the Strap page draws it, dimmed, with its words ("2 h ago", * "Not connected"), which tell the three apart. Not connected is mostly out of range or Bluetooth off and passes, so * it isn't drawn as damage. * Green and amber are for the strap and the sync only, never a health value (spec 2.2). */ -/** A fill's two colours: rich where it starts, softer where it runs out. */ -private class Tint(val rich: Color, val soft: Color) - -/** The orange of a sync that failed: the sync amber, deepened. */ -private val OrangeDeep = Color(0xFFE5672A) - -private fun tintOf(dot: StrapChip.Dot): Tint? = when (dot) { - StrapChip.Dot.Fine, StrapChip.Dot.Charging -> Tint(MetricColors.good.copy(alpha = 0.62f), MetricColors.good.copy(alpha = 0.3f)) - StrapChip.Dot.Low -> Tint(MetricColors.warn.copy(alpha = 0.62f), MetricColors.warn.copy(alpha = 0.3f)) - StrapChip.Dot.Unsynced -> Tint(MetricColors.warn.copy(alpha = 0.55f), OrangeDeep.copy(alpha = 0.85f)) +/** The status dot's colour: green when fine or charging, amber when low or unsynced, none when the strap is away. */ +private fun dotColor(dot: StrapChip.Dot): Color? = when (dot) { + StrapChip.Dot.Fine, StrapChip.Dot.Charging -> MetricColors.good + StrapChip.Dot.Low, StrapChip.Dot.Unsynced -> MetricColors.warn StrapChip.Dot.Warn, StrapChip.Dot.Quiet -> null } -/** How much of the pill is filled: the battery, or all of it when there's no reading or the colour is the point. */ -private fun fillOf(chip: StrapChip): Float = when (chip.dot) { - StrapChip.Dot.Fine, StrapChip.Dot.Low, StrapChip.Dot.Charging -> (chip.battery?.toFloat() ?: FULL) / FULL - StrapChip.Dot.Unsynced -> 1f - StrapChip.Dot.Warn, StrapChip.Dot.Quiet -> 0f -} - -private const val FULL = 100f - @Composable internal fun StrapPill(chip: StrapChip, onClick: () -> Unit, modifier: Modifier = Modifier) { - val tint = tintOf(chip.dot) - // A change of level moves the fill rather than cutting. - val fill by animateFloatAsState(fillOf(chip), tween(FILL_MS, easing = Motion.easing), label = "strap fill") - val flow = rememberChargeFlow(chip.dot == StrapChip.Dot.Charging) Row( - // 48 dp tall to tap, the pill drawn 32 dp tall in the middle of it; the header row is 60 dp, so nothing moves. + // 48 dp tall to tap, the pill drawn 36 dp tall in the middle of it; the header row is 60 dp, so nothing moves. // [modifier] comes after, so the Strap page grows out of the pill as drawn, not the room round it. Modifier.minimumInteractiveComponentSize().then(modifier) - .clip(CircleShape).background(ControlSurface) - // Read where it is drawn, so the fill and its flow redraw without composing the pill again. - .drawBehind { if (tint != null) drawFill(tint, fill, flow.value) } - .border(1.dp, Color.White.copy(alpha = 0.07f), CircleShape) + .clip(GlowShapes.Pill).background(ControlGlass).litEdge(GlowShapes.Pill, top = 0.2f, ring = 0f) .clickable(onClickLabel = stringResource(R.string.day_header_open_strap), onClick = onClick) .semantics { contentDescription = chip.description } .defaultMinSize(minWidth = MIN_WIDTH, minHeight = HEIGHT) @@ -106,64 +67,26 @@ internal fun StrapPill(chip: StrapChip, onClick: () -> Unit, modifier: Modifier ) { PillContent(chip) } } -/** - * The colour from the left edge to [fill] of the width, then fading out into the pill's own surface over [FADE], so it - * ends in a soft edge like the lit cards, never a line. While charging ([flow] 0 to 1, -1 for still) the colour flows - * along the pill, swelling and thinning, and the fade holds it in. - */ -private fun DrawScope.drawFill(tint: Tint, fill: Float, flow: Float) { - val level = size.width * fill.coerceIn(0f, 1f) - if (level <= 0f) return - val full = fill >= 1f - val end = if (full) size.width else minOf(size.width, level + FADE.toPx()) - val body = if (flow < 0f) { - Brush.horizontalGradient(listOf(tint.rich, tint.soft), startX = 0f, endX = end) - } else { - // One swell is a period long and repeats, so sliding it along never shows a seam. - val period = size.width * FLOW_PERIOD - Brush.horizontalGradient( - listOf(tint.soft, tint.rich, tint.soft), startX = period * (flow - 1f), endX = period * flow, tileMode = TileMode.Repeated, - ) - } - clipRect(0f, 0f, end, size.height) { drawRect(body) } - if (!full) { - val from = maxOf(0f, level - FADE.toPx() * FADE_LEAD) - drawRect( - Brush.horizontalGradient(listOf(Color.Transparent, ControlSurface), startX = from, endX = end), - topLeft = Offset(from, 0f), size = Size(end - from, size.height), - ) - } -} - -/** How far along the pill the flow has come, 0 to 1, round and round while charging; -1 when it isn't flowing. */ -@Composable -private fun rememberChargeFlow(charging: Boolean): State { - val animate = rememberAnimationsOn() - if (!charging || !animate) return NoFlow - return rememberInfiniteTransition(label = "strap charge").animateFloat( - 0f, 1f, infiniteRepeatable(tween(FLOW_MS, easing = LinearEasing)), label = "strap charge flow", - ) -} - -private val NoFlow: State = mutableFloatStateOf(-1f) +/** The header chip's glass: white 12% (TabTodayMorning). */ +private val ControlGlass = Color.White.copy(alpha = 0.12f) @Composable private fun PillContent(chip: StrapChip) { - when (chip.dot) { - StrapChip.Dot.Fine, StrapChip.Dot.Low -> - if (chip.text.isNotEmpty()) PillText(chip.text) else Box(Modifier.size(6.dp).background(Color.White, CircleShape)) - StrapChip.Dot.Charging -> Row(verticalAlignment = Alignment.CenterVertically) { + val dot = dotColor(chip.dot) + // A 7 dp status dot, then white words: the colour is the dot's, never the text's (decision 9). + if (dot != null) Row(verticalAlignment = Alignment.CenterVertically) { + Box(Modifier.size(7.dp).background(dot, CircleShape)) + // Charging adds a bolt after the dot, and the number alone. + if (chip.dot == StrapChip.Dot.Charging) { + Spacer(Modifier.width(5.dp)) Icon(AppIcons.Bolt, null, Modifier.size(13.dp), tint = Color.White) - Spacer(Modifier.width(2.dp)) - PillText(chip.battery?.toString() ?: chip.text) } - StrapChip.Dot.Unsynced -> Row(verticalAlignment = Alignment.CenterVertically) { - Icon(AppIcons.Info, null, Modifier.size(15.dp), tint = Color.White) - Spacer(Modifier.width(6.dp)) - PillText(chip.text) + val words = if (chip.dot == StrapChip.Dot.Charging) chip.battery?.toString() ?: chip.text else chip.text + if (words.isNotEmpty()) { + Spacer(Modifier.width(if (chip.dot == StrapChip.Dot.Charging) 2.dp else 7.dp)) + PillText(words) } - StrapChip.Dot.Warn, StrapChip.Dot.Quiet -> StrapAndWords(chip.text) - } + } else StrapAndWords(chip.text) } /** The Strap page's strap drawing, small (its light out and the drawing dimmed, as it is when the strap isn't there). */ @@ -185,17 +108,12 @@ private fun StrapAndWords(text: String) { private fun PillText(text: String) { Text( text, maxLines = 1, softWrap = false, color = Color.White, - style = GlowType.secondary.copy(fontWeight = FontWeight.SemiBold, fontFeatureSettings = "tnum"), + style = GlowType.secondary.copy(fontSize = 14.sp, fontWeight = FontWeight.Normal, fontFeatureSettings = "tnum"), ) } -private const val FILL_MS = 600 -private const val FLOW_MS = 2600 -private const val FLOW_PERIOD = 0.9f -private const val FADE_LEAD = 0.5f private const val MARK_LINES = 4f private val MIN_WIDTH = 56.dp -private val HEIGHT = 32.dp -private val FADE = 22.dp +private val HEIGHT = 36.dp private val MARK_WIDTH = 19.dp private val MARK_HEIGHT = 24.dp diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt index b751639c..d48a4e17 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt @@ -313,7 +313,7 @@ internal fun uniqueKeys(keys: List): List { */ val LocalCardOpens = compositionLocalOf { false } -/** The tap caret (spec 2.5): 14 dp, at [alpha] white, 50% after a card's title and 30% at a row's end. */ +/** The tap caret: 14 dp, at [alpha] white. Raised to pass 4.5:1 (decision 1): 67% after a title, about 50% at a row's end. */ @Composable internal fun TapCaret(alpha: Float, modifier: Modifier = Modifier) = Icon(AppIcons.TapCaret, null, tint = Color.White.copy(alpha = alpha), modifier = modifier.size(CaretSize)) @@ -332,9 +332,9 @@ internal fun InfoButton(label: String, onClick: () -> Unit, modifier: Modifier = internal val InfoButtonSize = 32.dp /** A card's caret, right after its title. */ -internal const val CARD_CARET_ALPHA = 0.5f -/** A row's caret, at its end. */ -internal const val ROW_CARET_ALPHA = 0.3f +internal const val CARD_CARET_ALPHA = 0.67f +/** A row's caret, at its end, on clear glass and pages. */ +internal const val ROW_CARET_ALPHA = 0.5f /** * A card's title in [GlowType.cardTitle], on one line, with the tap caret 6 dp after the text when the card opens @@ -473,12 +473,17 @@ internal fun NoteText(text: String) = Text(text, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, maxLines = 1) /** - * A small sync marker next to a card's title, "Up to 09:40" (spec 4.3): amber, as the strap chip, since it's about - * the sync and not the body. + * A small sync marker next to a card's title, "Up to 09:40" (spec 4.3): an amber dot, as the strap chip, since it's + * about the sync and not the body. */ @Composable internal fun StateMarker(text: String, modifier: Modifier = Modifier) { - Text(text, modifier, color = MetricColors.warn, style = GlowType.caption, maxLines = 1) + // An amber dot and white words: amber is for the dot, never the text (decisions 6 and 9). + Row(modifier, verticalAlignment = Alignment.CenterVertically) { + androidx.compose.foundation.layout.Box(Modifier.size(6.dp).background(MetricColors.warn, androidx.compose.foundation.shape.CircleShape)) + androidx.compose.foundation.layout.Spacer(Modifier.width(6.dp)) + Text(text, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.caption, maxLines = 1) + } } /** diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt index 36e1dd17..d92d4028 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt @@ -1,7 +1,6 @@ package org.openstrap.app.ui.glow import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -13,7 +12,8 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.layout.heightIn import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -30,11 +30,16 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import org.openstrap.app.R import org.openstrap.app.ui.dashboard.Detail import org.openstrap.app.presentation.Metric import org.openstrap.app.ui.dashboard.Score import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.CLEAR_GLASS_FILL +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass import org.openstrap.app.ui.components.LocalCardNumbers import org.openstrap.app.ui.components.cardNumber import org.openstrap.app.ui.components.cardOpening @@ -44,8 +49,17 @@ import org.openstrap.app.ui.components.cardOpening * for lists of things (workouts, contributors, settings). No glow at all, so the cards above it keep the light. */ -internal val ListSurface = Color(0xFF0F0F11) -internal val RowHairline = Color.White.copy(alpha = GlowLayout.DividerAlpha) +/** A list's surface: clear glass, white 7% over the screen's light (System board). */ +internal val ListSurface = Color.White.copy(alpha = CLEAR_GLASS_FILL) +/** The divider between rows: white 7%, inset to the list's padding. */ +internal val RowHairline = Color.White.copy(alpha = 0.07f) + +/** A list row's height, and the side and top padding of a list panel (TabTodayMorning, PageStrap). */ +internal val ListRowHeight = 60.dp +internal val ListInset = 18.dp +/** A row icon's circle (36 dp, the blend's first stop at 16%). */ +internal val RowIconCircle = 36.dp +private const val ROW_ICON_FILL = 0.16f /** * A grouped list: a dark panel with a title row ([title] left, an optional [note] right) over its rows, usually @@ -68,7 +82,7 @@ fun ListPanel( // The first row's own padding sits under it, so the title row needs only a little below. The note drops // under the title when they can't share a line, so the title never wraps. if (title != null || note != null) TitleRow( - Modifier.padding(top = GlowLayout.RowPadding, bottom = 6.dp), + Modifier.padding(top = 8.dp, bottom = 2.dp), start = { Row(verticalAlignment = Alignment.CenterVertically) { Text( @@ -84,14 +98,15 @@ fun ListPanel( } // Rows reach out over the side padding, so a tap lights the whole row, edge to edge. The card clips them to its // corners. - val rows: @Composable ColumnScope.() -> Unit = { CompositionLocalProvider(LocalRowBleed provides GlowLayout.CardInset) { inner() } } + val rows: @Composable ColumnScope.() -> Unit = { CompositionLocalProvider(LocalRowBleed provides ListInset) { inner() } } + val titled = title != null || note != null Column( modifier .fillMaxWidth() - .clip(GlowLayout.CardShape) - .background(ListSurface, GlowLayout.CardShape) - .border(1.dp, CardHairline, GlowLayout.CardShape) - .padding(GlowLayout.ListPadding), + // Clear glass is drawn outside the clip, so its lit edge isn't cut in half. + .clearGlass(GlowShapes.Card) + .clip(GlowShapes.Card) + .padding(start = ListInset, end = ListInset, top = if (titled) 14.dp else 6.dp, bottom = if (titled) 4.dp else 6.dp), content = rows, ) } @@ -163,15 +178,26 @@ fun ListRow( .let { if (onClick != null) it.clickable(onClick = opening?.onClick ?: onClick) else it } // The hairline keeps to the list's padding, as before. .let { if (divider) it.drawBehind { val e = bleed.toPx(); drawLine(RowHairline, Offset(e, 0f), Offset(size.width - e, 0f), 1.dp.toPx()) } else it } - .padding(horizontal = bleed, vertical = GlowLayout.RowPadding), + .padding(horizontal = bleed) + .heightIn(min = ListRowHeight) + .padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { + // The icon sits in a 36 dp circle filled with the blend's first stop at 16% (a sport's white icon on white 8%). + val blend = Blends.forInk(color) + val circle = if (iconTint == color && blend != null) blend.first.copy(alpha = ROW_ICON_FILL) else Color.White.copy(alpha = 0.08f) + val glyph = if (iconTint == color && blend != null) blend.first else iconTint if (ring != null) { // A row's progress ring (spec 2.7): as thick as an icon's stroke reads at 20 dp, a dp in from its box. - ProgressRing({ ring }, color, Modifier.size(RowIcon).padding(1.dp), stroke = 2.5.dp, track = 0.12f) + Box(Modifier.size(RowIconCircle).background(circle, CircleShape), contentAlignment = Alignment.Center) { + ProgressRing({ ring }, glyph, Modifier.size(RowIcon).padding(1.dp), stroke = 2.5.dp, track = 0.12f) + } Spacer(Modifier.width(RowIconGap)) } else if (icon != null) { - Icon(icon, null, tint = iconTint.copy(alpha = iconTint.alpha * if (waiting) WAITING_ICON_ALPHA else 1f), modifier = Modifier.size(RowIcon)) + Box( + Modifier.size(RowIconCircle).background(circle.copy(alpha = circle.alpha * if (waiting) WAITING_ICON_ALPHA else 1f), CircleShape), + contentAlignment = Alignment.Center, + ) { Icon(icon, null, tint = glyph.copy(alpha = glyph.alpha * if (waiting) WAITING_ICON_ALPHA else 1f), modifier = Modifier.size(RowGlyph)) } Spacer(Modifier.width(RowIconGap)) } Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { @@ -198,8 +224,8 @@ private fun RowLine(status: String?, tag: org.openstrap.app.ui.dashboard.NewsTag if (status != null) Text( status, Modifier.weight(1f, fill = false), - color = if (waiting) Color.White.copy(alpha = 0.45f) else Color.White.copy(alpha = 0.6f), - style = GlowType.secondary, + color = if (waiting) Color.White.copy(alpha = 0.5f) else Color.White.copy(alpha = 0.65f), + style = GlowType.secondary.copy(fontSize = 12.sp), // Beside a tag the line stays on one row, the tag keeping its place. maxLines = if (tag != null) 1 else Int.MAX_VALUE, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis, @@ -211,6 +237,8 @@ private fun RowLine(status: String?, tag: org.openstrap.app.ui.dashboard.NewsTag /** A row's icon, and the gap after it, as on the You and Strap pages. */ internal val RowIcon = 20.dp +/** The glyph inside a row's icon circle. */ +internal val RowGlyph = 18.dp internal val RowIconGap = 14.dp /** From a row's value to its tap caret. */ internal val RowCaretGap = 8.dp @@ -268,7 +296,7 @@ fun WaitingDash(modifier: Modifier = Modifier) { Box( modifier .size(14.dp, 3.dp) - .background(Color.White.copy(alpha = 0.3f), RoundedCornerShape(2.dp)) + .background(Color.White.copy(alpha = 0.3f), GlowShapes.Small) .semantics { contentDescription = described }, ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowParts.kt index 1fe07052..e1295fdc 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowParts.kt @@ -7,6 +7,7 @@ import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.core.spring import androidx.compose.foundation.Canvas import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.offset @@ -22,13 +23,13 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.lerp import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import org.openstrap.app.ui.glow.draw.DotFont +import org.openstrap.app.ui.theme.GlowShapes import org.openstrap.app.ui.glow.draw.dotLayout import org.openstrap.app.ui.glow.draw.drawDots import org.openstrap.app.ui.glow.draw.DotSize @@ -67,37 +68,42 @@ fun DotMatrixText( /* ------------------------------------------------------------------------------------------------ */ /** - * The pill switch, monochrome like the workout buttons: white with a black knob when on, dim grey when off. - * Inside a glow card, pass the card's colour as [accent]: on, it's a deeper shade of that colour with a white knob. + * The switch as the boards draw it (PageStrap): 52 by 32 dp. On, a white pill with a dark 24 dp knob at the right; off, + * a 2 dp white 40% outline with a small 16 dp white 60% knob at the left. [accent] is kept for callers but no longer + * tints it: the boards' switch is white either way. */ @Composable +@Suppress("UNUSED_PARAMETER") fun GlowSwitch(checked: Boolean, onCheckedChange: (Boolean) -> Unit, modifier: Modifier = Modifier, enabled: Boolean = true, accent: Color? = null) { - val onTrack = accent?.let { lerp(it, Color.Black, 0.25f) } ?: Color.White - val track by animateColorAsState(if (checked) onTrack else Color.White.copy(alpha = 0.12f), label = "glow switch track") - val knobColor by animateColorAsState( - if (!checked) Color.White.copy(alpha = 0.6f) else if (accent != null) Color.White else Color.Black, - label = "glow switch knob colour", - ) - val knob by animateDpAsState(if (checked) 26.dp else 0.dp, spring(dampingRatio = 0.6f, stiffness = 500f), label = "glow switch knob") + val track by animateColorAsState(if (checked) Color.White else Color.Transparent, label = "glow switch track") + val outline by animateColorAsState(if (checked) Color.Transparent else Color.White.copy(alpha = 0.4f), label = "glow switch outline") + val knobColor by animateColorAsState(if (checked) SwitchKnobOn else Color.White.copy(alpha = 0.6f), label = "glow switch knob colour") + val spec = spring(dampingRatio = 0.6f, stiffness = 500f) + val knobSize by animateDpAsState(if (checked) 24.dp else 16.dp, spec, label = "glow switch knob size") + val knobX by animateDpAsState(if (checked) 24.dp else 8.dp, spec, label = "glow switch knob") Box( modifier - .size(60.dp, 34.dp) + .size(52.dp, 32.dp) .alpha(if (enabled) 1f else 0.4f) // Clipped so the press ripple stays inside the pill. - .clip(CircleShape) + .clip(GlowShapes.Pill) .background(track) - .toggleable(checked, enabled = enabled, interactionSource = null, indication = ripple(color = Color.Gray), role = Role.Switch, onValueChange = onCheckedChange) - .padding(3.dp), + .border(2.dp, outline, GlowShapes.Pill) + .toggleable(checked, enabled = enabled, interactionSource = null, indication = ripple(color = Color.Gray), role = Role.Switch, onValueChange = onCheckedChange), ) { Box( Modifier - .offset(x = knob) - .size(28.dp) + .align(Alignment.CenterStart) + .offset(x = knobX) + .size(knobSize) .background(knobColor, CircleShape), ) } } +/** The on switch's knob: the page ground's near-black. */ +private val SwitchKnobOn = org.openstrap.app.ui.theme.Ground + /** How wide a number of [digits] digits is in [dot] dots, so a space can be sized for the widest it will show. */ internal fun dotNumberWidth(digits: Int, dot: DotSize): Dp = dotTextWidth("0".repeat(digits), dot) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/NewsPill.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/NewsPill.kt index 80e13691..9469deb0 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/NewsPill.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/NewsPill.kt @@ -2,19 +2,20 @@ package org.openstrap.app.ui.glow import androidx.compose.foundation.background import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import org.openstrap.app.ui.theme.GlowShapes import org.openstrap.app.ui.dashboard.NewsTag -/** A news tag's fill: white at 12%, no border (spec 2.5, Tags). */ -internal val NewsPillFill = Color.White.copy(alpha = 0.12f) +/** A news tag's fill: white at 14%, no border (Elements board, Tags). */ +internal val NewsPillFill = Color.White.copy(alpha = 0.14f) /** - * A news tag (spec 2.5, Tags): a fully round pill, white at 12% with no border, its words in Caption type in white. + * A news tag (spec 2.5, Tags): a pill, white at 14% with no border, its words 12 sp in white. * It sits 8 dp after a number's unit, or under a list row's name. Apart from the outlined [OutlineTag] beside a title, * which is about the data, never about you. */ @@ -26,9 +27,9 @@ fun NewsPill(tag: NewsTag, modifier: Modifier = Modifier) = NewsPill(tag.text, m fun NewsPill(text: String, modifier: Modifier = Modifier) { Text( text, - modifier.background(NewsPillFill, CircleShape).padding(horizontal = 9.dp, vertical = 3.dp), + modifier.background(NewsPillFill, GlowShapes.Pill).padding(horizontal = 8.dp, vertical = 2.dp), color = Color.White, - style = GlowType.caption, + style = GlowType.caption.copy(fontSize = 12.sp, lineHeight = 16.sp), maxLines = 1, ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt index dacbc6c2..c9c1a6b7 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt @@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon @@ -69,13 +68,16 @@ import androidx.compose.ui.semantics.role import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import org.openstrap.app.ui.components.GlassSheet import org.openstrap.app.ui.components.pressClickable import org.openstrap.app.ui.theme.MetricColors import org.openstrap.app.ui.theme.AppIcons import java.time.ZoneId -import org.openstrap.app.ui.theme.ControlSurface +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass +import org.openstrap.app.ui.theme.litEdge /* * The settings pages (the Strap page and what it opens, Profile, You) in the glow language's quiet tier: black, with @@ -83,9 +85,14 @@ import org.openstrap.app.ui.theme.ControlSurface * app doesn't turn into another product at the strap's boundary. */ -private val PanelShape = GlowLayout.CardShape -private val PanelSurface = ListSurface -private val Hairline = Color.White.copy(alpha = 0.05f) +private val PanelShape = GlowShapes.Card +private val Hairline = RowHairline +/** The side padding of a page's panel of rows. */ +private val PanelInset = ListInset +/** What a page's buttons and chips are filled with: white 12% glass (Elements board, Controls). */ +private val ControlGlass = Color.White.copy(alpha = 0.12f) +/** A row's circle behind its icon on a page (PageStrap): white 8%. */ +private val RowIconFill = Color.White.copy(alpha = 0.08f) /** A [PageRow] whose page is open beside the list. */ private val SelectedTint = Color.White.copy(alpha = 0.08f) @@ -102,13 +109,13 @@ val BackButtonSize = 44.dp val PageHeaderHeight = 64.dp /** - * A page's way back (spec 3.4): a [BackButtonSize] round button on the [ControlSurface] with a 20 dp arrow, dimmed + * A page's way back (spec 3.4): a [BackButtonSize] round button on white 12% glass with a 20 dp arrow, dimmed * and still while not [enabled] (a firmware install running). */ @Composable fun BackButton(onBack: () -> Unit, enabled: Boolean = true) = RoundIconButton( - AppIcons.ArrowLeft, stringResource(R.string.glow_back), onBack, size = BackButtonSize, surface = ControlSurface, iconSize = 20.dp, + AppIcons.ArrowLeft, stringResource(R.string.glow_back), onBack, size = BackButtonSize, surface = ControlGlass, iconSize = 20.dp, enabled = enabled, ) @@ -127,7 +134,7 @@ fun RoundIconButton( onClick: () -> Unit, modifier: Modifier = Modifier, size: Dp = 38.dp, - surface: Color = Color.White.copy(alpha = 0.10f), + surface: Color = ControlGlass, iconSize: Dp = size * ROUND_ICON_SHARE, tint: Color = Color.White, clickLabel: String = label, @@ -136,7 +143,8 @@ fun RoundIconButton( ) { Box(modifier.size(size)) { Box( - Modifier.matchParentSize().clip(CircleShape).background(surface).alpha(if (enabled) 1f else 0.4f) + Modifier.matchParentSize().clip(CircleShape).background(surface).litEdge(CircleShape, top = 0.2f, ring = 0f) + .alpha(if (enabled) 1f else 0.4f) .clickable(enabled = enabled, onClickLabel = clickLabel, role = Role.Button, onClick = onClick), contentAlignment = Alignment.Center, ) { Icon(icon, label, Modifier.size(iconSize), tint = tint) } @@ -165,7 +173,7 @@ fun PageHeader( Spacer(Modifier.width(12.dp)) Column(Modifier.weight(1f)) { Row( - Modifier.clip(RoundedCornerShape(8.dp)) + Modifier.clip(GlowShapes.Small) .let { if (onTitle != null) it.clickable(onClickLabel = switchLabel, role = Role.Button, onClick = onTitle) else it }, verticalAlignment = Alignment.CenterVertically, ) { @@ -200,8 +208,7 @@ fun PagePanel(modifier: Modifier = Modifier, title: String? = null, note: String fun PageRows(modifier: Modifier = Modifier, content: @Composable ColumnScope.() -> Unit) { Column( // Clipped, so a selected row's tint keeps to the panel's corners. - modifier.fillMaxWidth().clip(PanelShape).background(PanelSurface, PanelShape).border(1.dp, CardHairline, PanelShape) - .padding(GlowLayout.ListPadding), + modifier.fillMaxWidth().clearGlass(PanelShape).clip(PanelShape).padding(horizontal = PanelInset, vertical = 6.dp), content = content, ) } @@ -234,14 +241,15 @@ fun PageRow( Modifier.fillMaxWidth() .let { if (!selected) it else it.semantics { this.selected = true }.drawBehind { - val inset = GlowLayout.CardInset.toPx() + val inset = PanelInset.toPx() drawRect(SelectedTint, Offset(-inset, 0f), Size(size.width + 2 * inset, size.height)) } } .let { if (onClick != null) it.clickable(enabled = enabled, onClick = onClick) else it } .topHairline(divider, Hairline) .alpha(if (enabled) 1f else 0.45f) - .padding(vertical = GlowLayout.RowPadding), + .heightIn(min = ListRowHeight) + .padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { if (icon != null) RowIcon(icon) @@ -266,8 +274,8 @@ fun PageRow( /** A settings row's [icon], quiet on the left and centred on the row, with the gap to its title after it. */ @Composable private fun RowIcon(icon: ImageVector) { - Box(Modifier.padding(end = 14.dp).width(20.dp), contentAlignment = Alignment.Center) { - Icon(icon, null, Modifier.size(20.dp), tint = Color.White.copy(alpha = 0.7f)) + Box(Modifier.padding(end = 12.dp).size(32.dp).background(RowIconFill, CircleShape), contentAlignment = Alignment.Center) { + Icon(icon, null, Modifier.size(18.dp), tint = Color.White.copy(alpha = 0.78f)) } } @@ -282,7 +290,7 @@ fun NoticeDot(modifier: Modifier = Modifier, ring: Color? = null) { } /** A row's value in Secondary, on the right or under the name. */ -private val RowValueColor = Color.White.copy(alpha = 0.6f) +private val RowValueColor = Color.White.copy(alpha = 0.65f) /** A row's name in Body, on one line (spec 2.3): ellipsized only when it alone is wider than the row. */ @Composable @@ -369,7 +377,8 @@ fun PageMenuRow( Modifier.fillMaxWidth() .clickable(enabled = enabled, onClickLabel = changeLabel, role = Role.DropdownList) { open = true } .alpha(if (enabled) 1f else 0.45f) - .padding(vertical = GlowLayout.RowPadding), + .heightIn(min = ListRowHeight) + .padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { val value = selected?.let(label) @@ -406,7 +415,7 @@ fun PageMenuRow( } } -private val MenuShape = RoundedCornerShape(18.dp) +private val MenuShape = GlowShapes.Tile private val MenuSurface = Color(0xFF232326) /** @@ -427,7 +436,8 @@ fun PageSwitchRow( Modifier.fillMaxWidth() .toggleable(checked, enabled = enabled, role = Role.Switch, onValueChange = onChange) .topHairline(divider, Hairline) - .padding(vertical = GlowLayout.RowPadding), + .heightIn(min = ListRowHeight) + .padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { if (icon != null) RowIcon(icon) @@ -443,8 +453,8 @@ fun PageSwitchRow( /** How big a [PageButton] is: its height, side padding, icon and type. */ enum class ButtonSize(val height: Dp, val padding: Dp, val icon: Dp) { - /** A page's own buttons. */ - Page(52.dp, 18.dp, 20.dp), + /** A page's own buttons (PageStrap: 56 dp, 20 dp sides, an 18 dp icon). */ + Page(56.dp, 20.dp, 18.dp), /** On a hero card, like Start or Try again. */ Hero(48.dp, 18.dp, 16.dp), @@ -454,8 +464,8 @@ enum class ButtonSize(val height: Dp, val padding: Dp, val icon: Dp) { } /** - * A page's button, fully round (spec 2.4): white with black text when it's the page's main action ([primary]), - * otherwise on the Control surface with white text, or on glass when it sits [onCard] and its colour shows through. + * A page's button, a pill: white with black text when it's the page's main action ([primary]), + * otherwise white 12% glass with white text, or 14% when it sits [onCard] and its colour shows through. * Body type (Secondary at [ButtonSize.Row]), an [icon] before the text when given. */ @Composable @@ -472,15 +482,16 @@ fun PageButton( ) { Row( // Dimmed before the pill is drawn, so a disabled button fades whole, pill and label (user, 2026-11-03). - modifier.height(size.height).alpha(if (enabled) 1f else 0.4f).clip(CircleShape) + modifier.height(size.height).alpha(if (enabled) 1f else 0.4f).clip(GlowShapes.Pill) .let { when { primary -> it.background(Color.White) - onCard -> it.background(Color.White.copy(alpha = 0.08f)).border(1.dp, Color.White.copy(alpha = 0.12f), CircleShape) - else -> it.background(ControlSurface) + // Secondary: white 12% glass with a lit top edge, a little brighter on a card (14%). + onCard -> it.background(Color.White.copy(alpha = 0.14f)).litEdge(GlowShapes.Pill, top = 0.2f, ring = 0f) + else -> it.background(ControlGlass).litEdge(GlowShapes.Pill, top = 0.2f, ring = 0f) } } - .let { if (enabled) it.pressClickable(onClick, CircleShape) else it } + .let { if (enabled) it.pressClickable(onClick, GlowShapes.Pill) else it } .semantics { role = Role.Button } .padding(horizontal = size.padding), horizontalArrangement = Arrangement.Center, @@ -490,7 +501,7 @@ fun PageButton( Icon(icon, null, Modifier.size(size.icon), tint = color) Spacer(Modifier.width(8.dp)) } - val style = if (size == ButtonSize.Row) GlowType.secondary else GlowType.body + val style = if (size == ButtonSize.Row) GlowType.secondary else GlowType.body.copy(fontWeight = FontWeight.Medium) Text(text, color = color, style = style, maxLines = 1, overflow = TextOverflow.Ellipsis) } } @@ -508,7 +519,7 @@ fun PageTextButton( color: Color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), ) { Box( - modifier.heightIn(min = 44.dp).clip(CircleShape) + modifier.heightIn(min = 44.dp).clip(GlowShapes.Pill) .alpha(if (enabled) 1f else 0.4f) .clickable(enabled = enabled, role = Role.Button, onClick = onClick) .padding(horizontal = 16.dp), @@ -517,7 +528,7 @@ fun PageTextButton( } /** - * A text field in the tile style (spec 2.4): the Control surface with 16 dp corners, the [label] over it in + * A text field in the input style: white 8% glass with 14 dp corners, the [label] over it in * Secondary, the text in Body, an optional [unit] after it. [error] draws an amber hairline round it. */ @Composable @@ -537,8 +548,8 @@ fun PageField( Column(modifier.alpha(if (enabled) 1f else 0.45f), verticalArrangement = Arrangement.spacedBy(6.dp)) { if (label != null) Text(label, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary) Row( - Modifier.fillMaxWidth().heightIn(min = 52.dp).clip(GlowLayout.TileShape).background(ControlSurface) - .let { if (error) it.border(1.dp, MetricColors.warn, GlowLayout.TileShape) else it } + Modifier.fillMaxWidth().heightIn(min = 52.dp).clip(GlowShapes.Icon).background(Color.White.copy(alpha = 0.08f)) + .let { if (error) it.border(1.dp, MetricColors.warn, GlowShapes.Icon) else it } .padding(start = 16.dp, end = if (trailing != null) 4.dp else 16.dp), verticalAlignment = Alignment.CenterVertically, ) { @@ -575,7 +586,7 @@ fun PageProgress(fraction: Float? = null, modifier: Modifier = Modifier.fillMaxW rememberInfiniteTransition(label = "page progress") .animateFloat(0f, 1f, infiniteRepeatable(tween(1200, easing = LinearEasing)), label = "page progress slide") } else null - Canvas(modifier.height(4.dp).clip(CircleShape)) { + Canvas(modifier.height(4.dp).clip(GlowShapes.Small)) { val r = CornerRadius(size.height / 2f) drawRoundRect(Color.White.copy(alpha = 0.1f), cornerRadius = r) if (fraction != null) { @@ -659,9 +670,9 @@ fun PageChip( description: String? = null, ) { Box( - modifier.heightIn(min = 36.dp).clip(CircleShape) - .background(if (selected) Color.White else if (filled) ControlSurface else Color.Transparent) - .let { if (selected || filled) it else it.border(1.dp, Color.White.copy(alpha = 0.16f), CircleShape) } + modifier.heightIn(min = 36.dp).clip(GlowShapes.Pill) + .background(if (selected) Color.White else if (filled) ControlGlass else Color.Transparent) + .let { if (selected || filled) it else it.border(1.dp, Color.White.copy(alpha = 0.16f), GlowShapes.Pill) } .alpha(if (enabled) 1f else 0.4f) .clickable(enabled = enabled, role = role, onClick = onClick) .semantics { @@ -681,7 +692,7 @@ fun PageChip( /** * A pill that names a choice or does one thing: an [icon] in [tint] or a [dot], the [label] in [style] (Body), and a - * [caret] when tapping opens a list. [height] tall on [surface] (the Control surface), with a [hairline] on a quiet + * [caret] when tapping opens a list. [height] tall on [surface] (white 12% glass), with a [hairline] on a quiet * card. Without [onClick] it's only a label, like the live screen's sport or a summary's earned best. A long label * ends in an ellipsis and leaves the caret its room. Small pills (Done over a summary, the earned chips) take * Secondary. @@ -696,15 +707,15 @@ internal fun IconPill( dot: Color? = null, caret: Boolean = false, height: Dp = 44.dp, - surface: Color = ControlSurface, + surface: Color = ControlGlass, hairline: Boolean = false, description: String? = null, style: TextStyle = GlowType.body, ) { Row( - modifier.height(height).clip(CircleShape).background(surface) - .let { if (hairline) it.border(1.dp, RowHairline, CircleShape) else it } - .let { if (onClick != null) it.pressClickable(onClick, CircleShape) else it } + modifier.height(height).clip(GlowShapes.Pill).background(surface) + .let { if (hairline) it.border(1.dp, RowHairline, GlowShapes.Pill) else it } + .let { if (onClick != null) it.pressClickable(onClick, GlowShapes.Pill) else it } .semantics { if (onClick != null) role = Role.Button if (description != null) contentDescription = description @@ -739,13 +750,13 @@ internal fun GlowSegments( modifier: Modifier = Modifier, role: Role = Role.RadioButton, ) { - Row(modifier.fillMaxWidth().clip(CircleShape).background(Color.White.copy(alpha = 0.06f)).padding(4.dp)) { + Row(modifier.fillMaxWidth().clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.08f)).padding(4.dp)) { options.forEachIndexed { i, label -> val on = i == selected Box( - Modifier.weight(1f).clip(CircleShape) + Modifier.weight(1f).clip(GlowShapes.Pill) .background(if (on) Color.White.copy(alpha = 0.16f) else Color.Transparent) - .pressClickable({ onSelect(i) }, CircleShape, scale = 0.97f) + .pressClickable({ onSelect(i) }, GlowShapes.Pill, scale = 0.97f) .semantics { this.role = role; this.selected = on } .padding(vertical = 9.dp), contentAlignment = Alignment.Center, @@ -785,13 +796,13 @@ internal fun StatusDot(text: String, dot: Color, modifier: Modifier = Modifier, } /** - * A secondary choice: a tile on the Control surface (spec 2.4) with a [caption] in Secondary over the [label] in Body, + * A secondary choice: a tile on white 12% glass with a [caption] in Secondary over the [label] in Body, * and the tap caret at its end, so it reads as something that opens. As wide as it's given. */ @Composable fun OptionButton(caption: String, label: String, onClick: () -> Unit, modifier: Modifier = Modifier) { Row( - modifier.fillMaxWidth().clip(GlowLayout.TileShape).background(ControlSurface).pressClickable(onClick, GlowLayout.TileShape) + modifier.fillMaxWidth().clip(GlowShapes.Tile).background(ControlGlass).pressClickable(onClick, GlowShapes.Tile) .padding(horizontal = 16.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically, ) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/TabParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/TabParts.kt index c1c67a0b..7104e7ca 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/TabParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/TabParts.kt @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -120,7 +119,7 @@ internal fun ContributorRow( modifier = Modifier.padding(top = 2.dp), ) Row(Modifier.fillMaxWidth().padding(top = 8.dp), verticalAlignment = Alignment.CenterVertically) { - val shape = RoundedCornerShape(3.dp) + val shape = org.openstrap.app.ui.theme.GlowShapes.Small Box(Modifier.weight(1f).height(6.dp).background(Color.White.copy(alpha = 0.07f), shape)) { Box(Modifier.fillMaxWidth(fraction.coerceIn(0f, 1f)).height(6.dp).background(accent, shape)) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt b/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt index 09d133df..94a2b7ff 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt @@ -74,16 +74,16 @@ import org.openstrap.app.ui.glow.TodayStrap import org.openstrap.app.ui.glow.draw.GlowMood import org.openstrap.app.ui.glow.metricIndex import org.openstrap.app.ui.theme.AppIcons -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends import org.openstrap.app.ui.workout.WorkoutsViewModel /** Each tab's place in the bar: its label, icons and the capsule's colour while it shows (spec 3.2). */ fun tabItems(): List = Tab.entries.map { tab -> when (tab) { Tab.Today -> NavItem(tab.label, AppIcons.HouseSimple, AppIcons.HouseSimpleFill, Color.White) - Tab.Recovery -> NavItem(tab.label, AppIcons.Plant, AppIcons.PlantFill, MetricColors.readiness) - Tab.Sleep -> NavItem(tab.label, AppIcons.Moon, AppIcons.MoonFill, MetricColors.sleepDeep) - Tab.Activity -> NavItem(tab.label, AppIcons.SneakerMove, AppIcons.SneakerMoveFill, MetricColors.steps) + Tab.Recovery -> NavItem(tab.label, AppIcons.Plant, AppIcons.PlantFill, Blends.Recovery.first) + Tab.Sleep -> NavItem(tab.label, AppIcons.Moon, AppIcons.MoonFill, Blends.Sleep.first) + Tab.Activity -> NavItem(tab.label, AppIcons.SneakerMove, AppIcons.SneakerMoveFill, Blends.Steps.first) } } From 26a18026cb9134dec3044a80751b42a4b4f618f0 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:36:49 +0400 Subject: [PATCH 07/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20charts=20and=20p?= =?UTF-8?q?ictures=20draw=20the=20metric's=20blend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../openstrap/app/ui/glow/DetailPicture.kt | 2 +- .../org/openstrap/app/ui/glow/GlowCharts.kt | 338 ++++++++++++++---- .../openstrap/app/ui/glow/draw/ChartSpec.kt | 45 ++- .../app/ui/glow/pictures/LevelPictures.kt | 159 ++++++-- .../app/ui/glow/pictures/LinePictures.kt | 134 +++++-- .../app/ui/glow/pictures/Pictures.kt | 2 +- 6 files changed, 546 insertions(+), 134 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/DetailPicture.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/DetailPicture.kt index 572c9096..9d0feb3a 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/DetailPicture.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/DetailPicture.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.unit.dp /* * A card's own picture on the page it opens (spec 2.7, "Each metric draws its own picture"): the page draws the same - * picture its card draws, from the same data in the same ink, so tapping the card leads somewhere that visibly + * picture its card draws, from the same data in the same blend, so tapping the card leads somewhere that visibly * continues it. It sits under the headline, across the page at Wide, and never carries the card's rim: a page has no * card edge to light. */ diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt index 9eadbbfb..1f27a206 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt @@ -54,12 +54,26 @@ import org.openstrap.app.ui.theme.FunnelSans import org.openstrap.app.ui.glow.draw.BAR_MAX_WIDTH_DP import org.openstrap.app.ui.glow.draw.ChartInk import org.openstrap.app.ui.glow.draw.chartHairline -import org.openstrap.app.ui.glow.draw.drawGhostLine +import org.openstrap.app.ui.glow.draw.chartBlend +import org.openstrap.app.ui.glow.draw.chartBrushAcross +import org.openstrap.app.ui.glow.draw.chartBrushUp +import org.openstrap.app.ui.glow.draw.composePath +import org.openstrap.app.ui.glow.draw.LineChartLook +import org.openstrap.app.ui.glow.draw.GhostLineLook +import org.openstrap.app.ui.glow.draw.mark +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.MetricColors +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.ClipOp +import androidx.compose.ui.graphics.drawscope.clipRect +import androidx.compose.ui.graphics.drawscope.rotate import org.openstrap.app.ui.glow.draw.drawHypnogramBands -import org.openstrap.app.ui.glow.draw.drawLineChartBody -import org.openstrap.app.ui.glow.draw.drawLineChartEnd import org.openstrap.app.ui.glow.draw.drawPillBar import org.openstrap.app.ui.glow.draw.ghostLinePaths +import org.openstrap.app.ui.glow.draw.smoothOps +import org.openstrap.app.ui.glow.draw.polylineOps import org.openstrap.app.ui.glow.draw.lineChartPaths import org.openstrap.app.ui.glow.draw.ghostLineGeometry import org.openstrap.app.ui.glow.draw.hypnogramGeometry @@ -72,12 +86,16 @@ import org.openstrap.app.presentation.StageSpan import org.openstrap.app.presentation.DetailCopy /* - * Charts for glow cards. The card's colour carries the mood, so the marks are white: lines get a soft halo, and grids, - * guides and bars are solid (spec 2.7). Only the digits are made of dots. + * Charts for Glow x Glass cards (Charts board). On clear glass a chart draws in its metric's [Blend] (first colour at + * the start or base, the second on the answer: now, the top, the value), in the blend's chart tones so marks reach + * 4.5:1. On a hero or a solid fill the card is the colour and the marks are white: pass white (or [Blend] built from + * it) and nothing is tinted. Callers that still pass a v2 ink get its blend through [chartBlend]. Grids, guides and + * bars are solid. Only the digits are made of dots. */ private val Ink = Color.White -private val Muted = Color.White.copy(alpha = 0.55f) +/** Axis labels: white at 68%, the board's 50% raised so they reach 4.5:1 on glass. */ +private val Muted = Color.White.copy(alpha = ChartInk.AXIS_ALPHA) /** Grid rows and stage guides: solid, white at 8%, 1 dp. */ private val Grid = ChartInk.Grid /** A target, goal or average across a chart: solid, white at 40%, 1 dp. */ @@ -100,6 +118,15 @@ internal val BarMaxWidth = BAR_MAX_WIDTH_DP.dp internal fun DrawScope.pillBar(color: Color, x: Float, pitch: Float, bottom: Float, height: Float) = drawPillBar(pillBar(x, pitch, bottom, height, BarMaxWidth.toPx()), color) +/** [pillBar] drawn in [blend]'s tones, first colour at its base and the second at its top. */ +internal fun DrawScope.pillBarBlend(blend: Blend, x: Float, pitch: Float, bottom: Float, height: Float, alpha: Float = 1f) { + val b = pillBar(x, pitch, bottom, height, BarMaxWidth.toPx()) + drawRoundRect( + brush = blend.chartBrushUp(b.topLeft.y + b.size.height, b.topLeft.y), topLeft = b.topLeft, size = b.size, + cornerRadius = CornerRadius(b.corner), alpha = alpha, + ) +} + /* * Chart text is measured in each chart's drawWithCache block, once per size and data, and only drawn on each frame: * measuring in draw churned the measurer's small cache on every scrub frame. @@ -153,8 +180,10 @@ private fun CacheDrawScope.nothing() = onDrawBehind {} /* ------------------------------------------------------------------------------------------------ */ /** - * A day of readings as one smooth white line with a faint halo, a soft fill, three hairline grid rows, a solid - * average line and a glowing dot on the latest value. [values] are evenly spaced; nulls break the line. + * A day of readings as one smooth line in the metric's blend (the first colour at the start, the second at now), a soft + * fill, three hairline grid rows, a solid average line and a dot with a halo on the latest value. Inside [band] the line + * dims; outside it is full. [values] are evenly spaced; nulls break the line. [color] is a v2 ink ([chartBlend]) or white + * for a hero; use the [Blend] overload for a metric's blend directly. */ @Composable fun GlowLineChart( @@ -163,16 +192,35 @@ fun GlowLineChart( height: Dp = 120.dp, labels: List = emptyList(), showAverage: Boolean = true, - /** The line's colour; white suits glow cards, a metric colour can suit a black panel. */ + /** The line's ink: white suits a hero card, a metric ink gets its blend. */ color: Color = Ink, /** A fixed value axis (e.g. 0..100 for scores); null fits the data. */ yRange: ClosedFloatingPointRange? = null, - /** A usual range drawn as a band of the colour at 12%, no edge lines (e.g. your normal). */ + /** A usual range drawn as a band of the first colour at 12%, no edge lines (e.g. your normal). */ band: ClosedFloatingPointRange? = null, /** The readings, by index, to shade lightly behind the line (e.g. the hours asleep); null for none. */ shade: IntRange? = null, /** How the average label prints a value. */ format: (Float) -> String = { it.roundToInt().toString() }, + onScrub: ((Int?) -> Unit)? = null, + describe: ((index: Int, value: Float) -> String)? = null, +) = GlowLineChart( + values, remember(color) { chartBlend(color) }, modifier, height, labels, showAverage, yRange, band, shade, format, onScrub, describe, +) + +/** [GlowLineChart] in [blend] (a metric's blend from [Blends], or `Blend(Color.White, Color.White)` on a hero). */ +@Composable +fun GlowLineChart( + values: List, + blend: Blend, + modifier: Modifier = Modifier, + height: Dp = 120.dp, + labels: List = emptyList(), + showAverage: Boolean = true, + yRange: ClosedFloatingPointRange? = null, + band: ClosedFloatingPointRange? = null, + shade: IntRange? = null, + format: (Float) -> String = { it.roundToInt().toString() }, /** * Scrubbing that moves the card's headline instead of a readout (spec 2.7): the reading under the finger, or null * on release. Used without [describe]. @@ -205,7 +253,12 @@ fun GlowLineChart( val g = lineChartGeometry( values, size.width, size.height, density, inset, axis = labels.isNotEmpty(), yRange = yRange, band = band, ) ?: return@drawWithCache nothing() - val paths = lineChartPaths(g, color, density) + val paths = lineChartPaths(g, blend.chartSecond, density) + // The blend runs along time and lands on now; the fill under it is the second colour fading out. + val lineBrush = blend.chartBrushAcross(0f, g.last.x) + val fillBrush = Brush.verticalGradient( + listOf(blend.chartSecond.copy(alpha = FILL_ALPHA), Color.Transparent), startY = g.top, endY = g.plotBottom, + ) val average = if (showAverage) { m.measure(resources.getString(R.string.glow_metrics_chart_average, format(g.average)), averageText) } else { @@ -219,7 +272,23 @@ fun GlowLineChart( val box = Size(g.xOf(shade.last) - x0, g.plotBottom - g.top) drawRect(Color.White.copy(alpha = SHADE_ALPHA), Offset(x0, g.top), box) } - drawLineChartBody(g, paths, color) + g.grid.forEach { gridLine(it) } + val bandTop = g.bandTopLeft + val bandSize = g.bandSize + if (bandTop != null && bandSize != null) drawRect(blend.chart.copy(alpha = NormalBandAlpha), bandTop, bandSize) + g.dots.forEach { drawCircle(blend.chart, LineChartLook.LONE_DOT_DP * density, it) } + paths.lines.forEachIndexed { i, line -> + drawPath(paths.fills[i], fillBrush) + if (bandTop != null && bandSize != null) { + // Inside your normal the line dims; outside it is full. + drawPath(line, lineBrush, alpha = ChartInk.INSIDE_ALPHA, style = paths.stroke) + clipRect(0f, bandTop.y, size.width, bandTop.y + bandSize.height, ClipOp.Difference) { + drawPath(line, lineBrush, style = paths.stroke) + } + } else { + drawPath(line, lineBrush, style = paths.stroke) + } + } if (average != null) { val y = g.averageY @@ -227,7 +296,8 @@ fun GlowLineChart( text(average, size.width, y - 16.dp.toPx(), align = 1f) } - drawLineChartEnd(g, color) + drawCircle(blend.chartSecond.copy(alpha = ChartInk.END_HALO_ALPHA), LineChartLook.END_HALO_DP * density, g.last) + drawCircle(blend.chartSecond, LineChartLook.END_DOT_DP * density, g.last) axis(axisLabels, h + 4.dp.toPx()) @@ -240,7 +310,7 @@ fun GlowLineChart( val p = Offset(g.xOf(i), g.yOf(values[i]!!)) guide(p.x, h) drawCircle(Color.Black.copy(alpha = 0.6f), 6.dp.toPx(), p) - drawCircle(color, 4.dp.toPx(), p) + drawCircle(blend.chartSecond, 4.dp.toPx(), p) if (describe != null) readout(m, describe(i, values[i]!!), p.x, p.y) } } @@ -249,6 +319,9 @@ fun GlowLineChart( ) } +/** The soft fill under a line chart: the second colour at 22% fading out (Charts board). */ +private const val FILL_ALPHA = 0.22f + /** The hours shaded behind a line chart, in white. */ private const val SHADE_ALPHA = 0.07f @@ -266,8 +339,10 @@ internal fun nearestReading(values: List, x: Float, width: Float, inset: /* ------------------------------------------------------------------------------------------------ */ /** - * Solid rounded bars (e.g. steps per hour, active minutes a day), each as tall as its value, on a hairline baseline. - * An empty column isn't drawn. The [highlight] column (default: the last one with data) is drawn in [accent]. + * Pill bars (e.g. steps per hour, active minutes a day), each as tall as its value, standing on a hairline baseline, + * the first colour at the base and the second at the top (Charts board). An empty column isn't drawn. The [highlight] + * column (default: the last one with data) is the one drawn in full. [accent] is a v2 ink ([chartBlend]); white on a hero + * draws the others at 60%. Use the [Blend] overload for a metric's blend directly. */ @Composable fun GlowBars( @@ -281,6 +356,23 @@ fun GlowBars( describe: ((index: Int, value: Float) -> String)? = null, /** Scrubbing that moves the headline instead of a readout (spec 2.7): the column under the finger, or null on release. */ onScrub: ((Int?) -> Unit)? = null, +) = GlowBars( + values, remember(accent) { chartBlend(accent) }, modifier, height, labels, highlight, describe, onScrub, + othersAlpha = if (accent == Ink) 0.6f else 1f, +) + +/** [GlowBars] in [blend]. [othersAlpha] dims the columns that aren't the [highlight] (1 draws every bar in full, as the board does). */ +@Composable +fun GlowBars( + values: List, + blend: Blend, + modifier: Modifier = Modifier, + height: Dp = 96.dp, + labels: List = emptyList(), + highlight: Int = values.indexOfLast { it > 0f }, + describe: ((index: Int, value: Float) -> String)? = null, + onScrub: ((Int?) -> Unit)? = null, + othersAlpha: Float = 1f, ) { val m = rememberTextMeasurer() var touchX by remember { mutableStateOf(null) } @@ -311,8 +403,8 @@ fun GlowBars( if (v <= 0f) return@forEachIndexed // While scrubbing, the other columns dim so the picked one stands out. val dim = if (picked == null || picked == i) 1f else 0.35f - val color = if (i == highlight || i == picked) accent else Ink.copy(alpha = 0.6f) - pillBar(color.copy(alpha = color.alpha * dim), pitchX * i, pitchX, h, (h - top) * v / max) + val own = if (i == highlight || i == picked) 1f else othersAlpha + pillBarBlend(blend, pitchX * i, pitchX, h, (h - top) * v / max, own * dim) } axis(axisLabels, h + 4.dp.toPx()) if (picked != null && describe != null) readout(m, describe(picked, values[picked]), pitchX * picked + pitchX / 2, 0f) @@ -327,8 +419,9 @@ fun GlowBars( data class GlowDay(val label: String, val value: Float?) /** - * A week as solid stems rising to each day's value, the value printed above. Today (the last day) gets a glowing - * ring. A day with no value is left empty. [average] draws a solid line across. + * A week as stems rising to each day's value (the first colour at the base, the second at the top), the value printed + * above in white. Today (the last day) gets a haloed dot. A day with no value is left empty. [average] draws a solid + * line across. [color] is a v2 ink ([chartBlend]); white on a hero. */ @Composable fun GlowTrend( @@ -336,6 +429,17 @@ fun GlowTrend( modifier: Modifier = Modifier, height: Dp = 130.dp, average: Float? = null, + color: Color = Ink, +) = GlowTrend(days, remember(color) { chartBlend(color) }, modifier, height, average) + +/** [GlowTrend] in [blend]. */ +@Composable +fun GlowTrend( + days: List, + blend: Blend, + modifier: Modifier = Modifier, + height: Dp = 130.dp, + average: Float? = null, ) { val m = rememberTextMeasurer() Spacer( @@ -362,14 +466,14 @@ fun GlowTrend( val v = d.value ?: return@forEachIndexed val y = yOf(v) drawLine( - Ink.copy(alpha = if (today) 0.9f else 0.45f), Offset(cx, h - 3.dp.toPx()), Offset(cx, y), - strokeWidth = 2.dp.toPx(), cap = StrokeCap.Round, + blend.chartBrushUp(h - 3.dp.toPx(), y), Offset(cx, h - 3.dp.toPx()), Offset(cx, y), + strokeWidth = 2.dp.toPx(), cap = StrokeCap.Round, alpha = if (today) 1f else 0.6f, ) if (today) { - drawCircle(Ink.copy(alpha = 0.18f), 11.dp.toPx(), Offset(cx, y)) - drawCircle(Ink, 6.dp.toPx(), Offset(cx, y)) + drawCircle(blend.chartSecond.copy(alpha = ChartInk.END_HALO_ALPHA), 11.dp.toPx(), Offset(cx, y)) + drawCircle(blend.chartSecond, 6.dp.toPx(), Offset(cx, y)) } else { - drawCircle(Ink, 4.dp.toPx(), Offset(cx, y)) + drawCircle(blend.chartSecond.copy(alpha = 0.8f), 4.dp.toPx(), Offset(cx, y)) } figures[i]?.let { text(it, cx, y - 20.dp.toPx(), align = 0.5f) } } @@ -383,7 +487,7 @@ fun GlowTrend( /** * The arc gauge (chart kit, spec 2.7), on the Recovery detail's header: a half circle open at the foot, round caps. A * track of white at [ARC_TRACK_ALPHA] the whole way over and, from the left foot clockwise to [progress] (0..1), the - * value in a light tint of the metric's [color]. [content], the score in dots, sits centred inside with its foot a + * value in the metric's blend, the second colour at the end of the value. [content], the score in dots, sits centred inside with its foot a * little above the arc's ends. A change of [progress] fills from the value shown to the new one, never from zero; * a new [key] (another day) draws the new value where it lands. */ @@ -394,9 +498,18 @@ fun ArcGauge( key: Any?, modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit = {}, +) = ArcGauge(progress, remember(color) { chartBlend(color) }, key, modifier, content) + +/** [ArcGauge] in [blend]: the first colour at the left foot, the second at the end of the value. */ +@Composable +fun ArcGauge( + progress: Float, + blend: Blend, + key: Any?, + modifier: Modifier = Modifier, + content: @Composable BoxScope.() -> Unit = {}, ) { val shown = rememberGaugeProgress(progress, key) - val tint = lerp(Ink, color, ARC_TINT) BoxWithConstraints(modifier) { // Scaled down only when the header is narrower than the gauge. val k = (maxWidth / (ArcRadius * 2 + ArcStroke)).coerceAtMost(1f) @@ -412,8 +525,16 @@ fun ArcGauge( val box = Size(rad * 2, rad * 2) drawArc(Ink.copy(alpha = ARC_TRACK_ALPHA), 180f, 180f, false, topLeft, box, style = Stroke(w, cap = StrokeCap.Round)) // Read here, so the fill animates by redrawing only. - val sweep = 180f * shown().coerceIn(0f, 1f) - if (sweep > 0f) drawArc(tint, 180f, sweep, false, topLeft, box, style = Stroke(w, cap = StrokeCap.Round)) + val f = shown().coerceIn(0f, 1f) + val sweep = 180f * f + if (sweep > 0f) { + // The sweep gradient starts at 3 o'clock, so the arc's 180 to 360 is the stops' 0.5 to 1. + val brush = Brush.sweepGradient( + 0.5f to blend.chart, (0.5f + 0.5f * f).coerceAtLeast(0.501f) to blend.chartSecond, 1f to blend.chartSecond, + center = Offset(size.width / 2, centreY.toPx()), + ) + drawArc(brush, 180f, sweep, false, topLeft, box, style = Stroke(w, cap = StrokeCap.Round)) + } } Box(Modifier.fillMaxWidth().height(centreY - r * ARC_NUMBER_LIFT), contentAlignment = Alignment.BottomCenter, content = content) } @@ -423,9 +544,8 @@ fun ArcGauge( /** The arc's radius to the middle of its stroke, and the stroke: about a tenth of the radius, as in the design. */ internal val ArcRadius = 124.dp internal val ArcStroke = 13.dp -/** The track's white, and how far the value's colour is from white: a near white with the metric's hue. */ +/** The track's white. */ internal const val ARC_TRACK_ALPHA = 0.11f -internal const val ARC_TINT = 0.16f /** How far above the arc's ends the number's foot sits, as a share of the radius. */ private const val ARC_NUMBER_LIFT = 0.11f @@ -433,7 +553,7 @@ private const val ARC_NUMBER_LIFT = 0.11f * The horizon arc (chart kit, spec 2.7), on the Sleep score detail's header: a night sky rising from the horizon. A * wide, shallow hill (half a sine wave, [HorizonRise] high over [HorizonWidth]) with round caps, its ends low at both * sides. Under it a flatter track over the same ends in white at [HORIZON_TRACK_ALPHA], and over that the value from - * the left end to [progress] (0..1) of the hill's length in a light tint of [color]. [content], the score in dots, + * the left end to [progress] (0..1) of the hill's length in the metric's blend. [content], the score in dots, * sits centred under the crest. Fills as [ArcGauge] does, never from zero. */ @Composable @@ -443,9 +563,18 @@ fun HorizonArc( key: Any?, modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit = {}, +) = HorizonArc(progress, remember(color) { chartBlend(color) }, key, modifier, content) + +/** [HorizonArc] in [blend]: the first colour at the left end, the second where the value ends. */ +@Composable +fun HorizonArc( + progress: Float, + blend: Blend, + key: Any?, + modifier: Modifier = Modifier, + content: @Composable BoxScope.() -> Unit = {}, ) { val shown = rememberGaugeProgress(progress, key) - val tint = lerp(Ink, color, HORIZON_TINT) BoxWithConstraints(modifier) { val k = (maxWidth / (HorizonWidth + HorizonStroke)).coerceAtMost(1f) val span = HorizonWidth * k @@ -476,10 +605,10 @@ fun HorizonArc( drawPath(track, Ink.copy(alpha = HORIZON_TRACK_ALPHA), style = trackStroke) // Read here, so the fill animates by redrawing only. At rest on a full hill it reuses the path. val f = shown().coerceIn(0f, 1f) - if (f >= 1f) drawPath(full, tint, style = valueStroke) + if (f >= 1f) drawPath(full, blend.chartBrushAcross(x0, x0 + width), style = valueStroke) else { val upTo = upToLength(value, f) - if (upTo.size > 1) drawPath(path(upTo), tint, style = valueStroke) + if (upTo.size > 1) drawPath(path(upTo), blend.chartBrushAcross(x0, upTo.last().x), style = valueStroke) } } }, @@ -500,8 +629,6 @@ internal val HorizonStroke = 12.dp internal const val HORIZON_TRACK_ALPHA = 0.12f private const val HORIZON_TRACK_STROKE = 0.85f private const val HORIZON_TRACK_RISE = 0.81f -/** How far the value's colour is from white: a light lavender with the sleep ink. */ -internal const val HORIZON_TINT = 0.32f /** How far above the ends the number's foot sits, as a share of the width. */ private const val HORIZON_NUMBER_LIFT = 0.035f private const val HORIZON_STEPS = 96 @@ -626,18 +753,29 @@ fun GlowHypnogram( /* ------------------------------------------------------------------------------------------------ */ /** - * The ghost line of your usual (chart kit): [today] so far as a solid line in [color] ending in a dot, and [usual] + * The ghost line of your usual (chart kit): [today] so far as a solid line in the blend of [color] ending in a dot, and [usual] * by this time of day as a solid ghost line at 35% white behind it, when there is one. Both are evenly spaced over the same span * (a day, say) on a value axis from 0 to [max]; nulls in [today] are the hours still to come. */ @Composable -fun GhostLine(today: List, color: Color, max: Float, modifier: Modifier = Modifier, usual: List? = null, height: Dp = 56.dp) { +fun GhostLine(today: List, color: Color, max: Float, modifier: Modifier = Modifier, usual: List? = null, height: Dp = 56.dp) = + GhostLine(today, remember(color) { chartBlend(color) }, max, modifier, usual, height) + +/** [GhostLine] in [blend]: today's line runs from the first colour to the second, which lands on the end dot. */ +@Composable +fun GhostLine(today: List, blend: Blend, max: Float, modifier: Modifier = Modifier, usual: List? = null, height: Dp = 56.dp) { Spacer( modifier.fillMaxWidth().height(height).drawWithCache { // The shared ghost line geometry ([ghostLineGeometry]), as a widget's chart draws it. val g = ghostLineGeometry(today, usual, max, size.width, size.height, density) ?: return@drawWithCache nothing() val paths = ghostLinePaths(g, density) - onDrawBehind { drawGhostLine(g, paths, color) } + val line = blend.chartBrushAcross(g.today.firstOrNull()?.x ?: 0f, g.today.lastOrNull()?.x ?: 1f) + onDrawBehind { + paths.usual?.let { drawPath(it, Color.White.copy(alpha = GhostLineLook.USUAL_ALPHA), style = paths.usualStroke) } + if (g.today.isEmpty()) return@onDrawBehind + paths.today?.let { drawPath(it, line, style = paths.todayStroke) } + drawCircle(blend.chartSecond, g.endDot, g.today.last()) + } }, ) } @@ -650,7 +788,12 @@ fun GhostLine(today: List, color: Color, max: Float, modifier: Modifier * outside it are lit up while those inside stay dim. */ @Composable -fun TrendDots(values: List, modifier: Modifier = Modifier, height: Dp = 52.dp, band: ClosedFloatingPointRange? = null) { +fun TrendDots(values: List, modifier: Modifier = Modifier, height: Dp = 52.dp, band: ClosedFloatingPointRange? = null, color: Color = Ink) = + TrendDots(values, remember(color) { chartBlend(color) }, modifier, height, band) + +/** [TrendDots] in [blend]: days inside your normal dim in the first colour, those outside and today in the second. */ +@Composable +fun TrendDots(values: List, blend: Blend, modifier: Modifier = Modifier, height: Dp = 52.dp, band: ClosedFloatingPointRange? = null) { Canvas(modifier.fillMaxWidth().height(height)) { val known = values.filterNotNull() if (known.isEmpty()) return@Canvas @@ -661,16 +804,17 @@ fun TrendDots(values: List, modifier: Modifier = Modifier, height: Dp = 52 fun yOf(v: Float) = ring + (size.height - ring * 2) * (1f - (v - lo) / (hi - lo)) band?.let { b -> val y0 = yOf(b.endInclusive) - drawRoundRect(Ink.copy(alpha = 0.10f), Offset(0f, y0), Size(size.width, yOf(b.start) - y0), CornerRadius(6.dp.toPx())) + drawRoundRect(blend.chart.copy(alpha = ChartInk.NORMAL_BAND_ALPHA), Offset(0f, y0), Size(size.width, yOf(b.start) - y0), CornerRadius(6.dp.toPx())) } val pts = values.mapIndexedNotNull { i, v -> v?.let { i to Offset(xOf(i), yOf(it.toFloat())) } } - pts.zipWithNext { (_, a), (_, b) -> drawLine(Ink.copy(alpha = 0.25f), a, b, 1.5.dp.toPx()) } + pts.zipWithNext { (_, a), (_, b) -> drawLine(blend.chart.copy(alpha = 0.3f), a, b, 1.5.dp.toPx()) } pts.forEach { (i, p) -> val outside = band != null && values[i]!!.toFloat() !in band if (i == values.lastIndex) { - drawCircle(Ink.copy(alpha = 0.5f), ring, p, style = Stroke(1.dp.toPx())) - drawCircle(Ink, 6.dp.toPx(), p) - } else drawCircle(Ink.copy(alpha = if (outside) 0.95f else 0.45f), 4.dp.toPx(), p) + drawCircle(blend.chartSecond.copy(alpha = 0.5f), ring, p, style = Stroke(1.dp.toPx())) + drawCircle(blend.chartSecond, 6.dp.toPx(), p) + } else if (outside) drawCircle(blend.chartSecond, 4.dp.toPx(), p) + else drawCircle(blend.chart.copy(alpha = ChartInk.INSIDE_ALPHA), 4.dp.toPx(), p) } } } @@ -694,6 +838,20 @@ internal fun NormalTrend( band: ClosedFloatingPointRange? = null, bandLabel: String? = null, onScrub: ((Int?) -> Unit)? = null, +) = NormalTrend(values, levels, remember(color) { chartBlend(color) }, modifier, height, labels, band, bandLabel, onScrub) + +/** [NormalTrend] in [blend]: the line runs from the first colour to the second at the latest day, outside days lit in the second. */ +@Composable +internal fun NormalTrend( + values: List, + @Suppress("UnstableCollections", "ComposeUnstableCollections") levels: List, + blend: Blend, + modifier: Modifier = Modifier, + height: Dp = 230.dp, + labels: List = emptyList(), + band: ClosedFloatingPointRange? = null, + bandLabel: String? = null, + onScrub: ((Int?) -> Unit)? = null, ) { val m = rememberTextMeasurer() var touchX by remember { mutableStateOf(null) } @@ -737,38 +895,38 @@ internal fun NormalTrend( fun yOf(v: Float) = top + (h - top) * (1f - (v - lo) / (hi - lo)) val pts = values.mapIndexedNotNull { i, v -> v?.let { i to Offset(xOf(i), yOf(it)) } } val stroke = 2.4.dp.toPx() * (0.6f + 0.4f * scale) - val dim = lerp(color, Color.Black, 0.5f) + val lineBrush = blend.chartBrushAcross(pts.firstOrNull()?.second?.x ?: 0f, pts.lastOrNull()?.second?.x ?: size.width) val perDay = labels.size == values.size val dayLabels = m.measureAll(labels, if (perDay) trendLabelText else axisText) onDrawBehind { band?.let { b -> val y0 = yOf(b.endInclusive) - drawRoundRect(color.copy(alpha = NormalBandAlpha), Offset(0f, y0), Size(size.width, yOf(b.start) - y0), CornerRadius(12.dp.toPx())) + drawRoundRect(blend.chart.copy(alpha = NormalBandAlpha), Offset(0f, y0), Size(size.width, yOf(b.start) - y0), CornerRadius(12.dp.toPx())) if (bandText != null && labelH != null) { val w = bandText.size.width val sw = 14.dp.toPx() val x = size.width - w - drawRoundRect(color.copy(alpha = 0.35f), Offset(x - sw - 6.dp.toPx(), labelH / 2 - 4.dp.toPx()), Size(sw, 8.dp.toPx()), CornerRadius(3.dp.toPx())) + drawRoundRect(blend.chart.copy(alpha = 0.35f), Offset(x - sw - 6.dp.toPx(), labelH / 2 - 4.dp.toPx()), Size(sw, 8.dp.toPx()), CornerRadius(3.dp.toPx())) text(bandText, size.width, 0f, align = 1f) } } pts.zipWithNext { (i, a), (j, b) -> // A missing day between two dots: the line stops there. - if (j - i == 1) drawLine(color.copy(alpha = 0.85f), a, b, stroke, StrokeCap.Round) + if (j - i == 1) drawLine(lineBrush, a, b, stroke, StrokeCap.Round, alpha = 0.85f) } pts.forEach { (i, p) -> when (levels.getOrNull(i)) { org.openstrap.app.presentation.DetailCopy.Level.Above, org.openstrap.app.presentation.DetailCopy.Level.Below, -> { - val lit = lerp(color, Color.White, 0.3f) - drawCircle(lit.copy(alpha = 0.35f), 14.dp.toPx() * scale, p) - drawCircle(lit, 7.dp.toPx() * scale, p) + // Outside your normal: full in the second colour, with a halo. + drawCircle(blend.chartSecond.copy(alpha = ChartInk.END_HALO_ALPHA), 14.dp.toPx() * scale, p) + drawCircle(blend.chartSecond, 7.dp.toPx() * scale, p) } else -> { - drawCircle(dim, 5.dp.toPx() * scale, p) - drawCircle(color, 5.dp.toPx() * scale, p, style = Stroke(2.dp.toPx() * scale.coerceAtLeast(0.6f))) + // Inside it: dim, in the first colour. + drawCircle(blend.chart.copy(alpha = ChartInk.INSIDE_ALPHA), 5.dp.toPx() * scale, p) } } } @@ -782,7 +940,7 @@ internal fun NormalTrend( val p = Offset(xOf(i), yOf(values[i]!!)) guide(p.x, h) drawCircle(Color.Black.copy(alpha = 0.6f), 8.dp.toPx(), p) - drawCircle(Ink, 5.dp.toPx(), p) + drawCircle(blend.chartSecond, 5.dp.toPx(), p) } } } @@ -799,6 +957,13 @@ internal fun NormalTrend( @androidx.compose.runtime.Immutable data class Segment(val weight: Float, val color: Color, val filled: Float = 0f, val fill: Color = Color.Unspecified) +/** A bar's corners from [corner] dp: square at 0, a pill at half the [height] or more, else the small 4 dp. */ +private fun barShape(corner: Dp, height: Dp): androidx.compose.ui.graphics.Shape = when { + corner <= 0.dp -> androidx.compose.ui.graphics.RectangleShape + corner >= height / 2 -> GlowShapes.Pill + else -> GlowShapes.Small +} + /** * The segment bar (chart kit): one bar split into parts side by side, [gap] apart, each rounded by [corner] and the * bar's two ends by [ends]. Zones, stages, effort steps, rounds and the goal's workouts are all drawn with it, so @@ -816,9 +981,9 @@ fun SegmentBar( ends: Dp = corner, ) { if (segments.none { it.weight > 0f }) return - val shape = androidx.compose.foundation.shape.RoundedCornerShape(corner) + val shape = barShape(corner, height) androidx.compose.foundation.layout.Row( - modifier.fillMaxWidth().height(height).clip(androidx.compose.foundation.shape.RoundedCornerShape(ends)), + modifier.fillMaxWidth().height(height).clip(barShape(ends, height)), horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(gap), ) { segments.forEach { s -> @@ -869,7 +1034,8 @@ fun Legend( val keys: @Composable () -> Unit = { items.forEach { (name, color) -> androidx.compose.foundation.layout.Row(verticalAlignment = Alignment.CenterVertically) { - Box(Modifier.size(8.dp).background(color, swatch)) + // Deep as a small mark is lightened to 3:1 on glass; the stage bars keep the flat colour. + Box(Modifier.size(8.dp).background(if (color == MetricColors.sleepDeep) Blends.SleepDeepMark else color, swatch)) Spacer(Modifier.width(6.dp)) androidx.compose.material3.Text( name, color = Ink.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, maxLines = 1, @@ -894,10 +1060,18 @@ fun Legend( * [share] of it. A day toward its goal, an edge card's progress, a stage's share of the night. */ @Composable -fun FillBar(share: Float, color: Color, modifier: Modifier = Modifier, height: Dp = 4.dp) { - val shape = androidx.compose.foundation.shape.RoundedCornerShape(height / 2) +fun FillBar(share: Float, color: Color, modifier: Modifier = Modifier, height: Dp = 4.dp) = + FillBar(share, remember(color) { chartBlend(color) }, modifier, height) + +/** [FillBar] in [blend]: the first colour at the start, the second at the end of the fill. */ +@Composable +fun FillBar(share: Float, blend: Blend, modifier: Modifier = Modifier, height: Dp = 4.dp) { + val shape = GlowShapes.Pill Box(modifier.fillMaxWidth().height(height).background(Ink.copy(alpha = FILL_TRACK_ALPHA), shape)) { - Box(Modifier.fillMaxWidth(share.coerceIn(0f, 1f)).fillMaxHeight().background(color, shape)) + Box( + Modifier.fillMaxWidth(share.coerceIn(0f, 1f)).fillMaxHeight() + .background(Brush.horizontalGradient(listOf(blend.chart, blend.chartSecond)), shape), + ) } } @@ -910,14 +1084,29 @@ private const val FILL_TRACK_ALPHA = 0.08f * ring that runs with a clock redraws without composing again. */ @Composable -fun ProgressRing(share: () -> Float, color: Color, modifier: Modifier = Modifier, stroke: Dp = 8.dp, track: Float = RING_TRACK_ALPHA) { +fun ProgressRing(share: () -> Float, color: Color, modifier: Modifier = Modifier, stroke: Dp = 8.dp, track: Float = RING_TRACK_ALPHA) = + ProgressRing(share, remember(color) { chartBlend(color) }, modifier, stroke, track) + +/** [ProgressRing] in [blend]: along the stroke from the first colour at the top to the second at the end of the value. */ +@Composable +fun ProgressRing(share: () -> Float, blend: Blend, modifier: Modifier = Modifier, stroke: Dp = 8.dp, track: Float = RING_TRACK_ALPHA) { Canvas(modifier) { val w = stroke.toPx() val at = Offset(w / 2, w / 2) val box = Size(size.width - w, size.height - w) drawArc(Ink.copy(alpha = track), 0f, FULL_TURN, false, at, box, style = Stroke(w)) - val sweep = FULL_TURN * share().coerceIn(0f, 1f) - if (sweep > 0f) drawArc(color, RING_START, sweep, false, at, box, style = Stroke(w, cap = StrokeCap.Round)) + val f = share().coerceIn(0f, 1f) + val sweep = FULL_TURN * f + if (sweep > 0f) { + val brush = Brush.sweepGradient( + 0f to blend.chart, f.coerceAtLeast(0.001f) to blend.chartSecond, 1f to blend.chartSecond, + center = Offset(size.width / 2, size.height / 2), + ) + // The gradient starts at 3 o'clock, the ring at the top. + rotate(RING_START, Offset(size.width / 2, size.height / 2)) { + drawArc(brush, 0f, sweep, false, at, box, style = Stroke(w, cap = StrokeCap.Round)) + } + } } } @@ -947,6 +1136,20 @@ fun PlainLine( smooth: Boolean = true, dots: LineDots = LineDots.None, stroke: Dp = 2.5.dp, +) = PlainLine(values, remember(color) { chartBlend(color) }, height, modifier, smooth, dots, stroke) + +/** [PlainLine] in [blend]: the first colour at the left, the second at the latest reading, which any dot takes. */ +@Composable +// The readings arrive whole with each update and never change in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +fun PlainLine( + values: List, + blend: Blend, + height: Dp, + modifier: Modifier = Modifier, + smooth: Boolean = true, + dots: LineDots = LineDots.None, + stroke: Dp = 2.5.dp, ) { val points = values.withIndex().mapNotNull { (i, v) -> v?.let { i to it } } if (points.size < 2) return @@ -968,7 +1171,8 @@ fun PlainLine( if (smooth) lineTo(p.last().x, p.last().y) } val line = Stroke(stroke.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round) - val dot = color.copy(alpha = 1f) + val dot = blend.chartSecond + val brush = blend.chartBrushAcross(p.first().x, p.last().x) val marked = when (dots) { LineDots.None -> emptyList() LineDots.Last -> listOf(p.last()) @@ -978,7 +1182,7 @@ fun PlainLine( val r = (if (dots == LineDots.Highest) 3.5.dp else 4.dp).toPx() onDrawBehind { if (dots == LineDots.Highest) gridLine(size.height - ChartInk.HAIRLINE_DP * density / 2, Ink.copy(alpha = 0.12f)) - drawPath(path, color, style = line) + drawPath(path, brush, style = line) marked.forEach { drawCircle(dot, r, it) } } }, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/ChartSpec.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/ChartSpec.kt index 09e8ef89..5fd0bbd0 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/ChartSpec.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/ChartSpec.kt @@ -9,6 +9,9 @@ import kotlin.math.sign import org.openstrap.app.data.db.SleepStage import org.openstrap.app.ui.glow.GlowLayout import org.openstrap.app.ui.glow.GlowStage +import androidx.compose.ui.graphics.Brush +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends import org.openstrap.app.ui.theme.MetricColors /* @@ -23,9 +26,27 @@ object ChartInk { val Grid = Color.White.copy(alpha = GlowLayout.HairlineAlpha) val Target = Color.White.copy(alpha = 0.40f) - /** Your normal behind a chart: a band of the ink at 12%. */ + /** Your normal behind a chart: a band of the metric's first colour at 12% (Charts board). */ const val NORMAL_BAND_ALPHA = 0.12f + /** Your usual band behind a level fill: the first colour flat at 22%. */ + const val LEVEL_BAND_ALPHA = 0.22f + + /** Your usual band behind a week of dots: the first colour at 8%. */ + const val DOTS_BAND_ALPHA = 0.08f + + /** The marks inside your normal (a line, dots), dimmed in the first colour. Outside it they are full in the second. */ + const val INSIDE_ALPHA = 0.45f + + /** The halo round a chart's end dot, in the second colour. */ + const val END_HALO_ALPHA = 0.25f + + /** Axis labels and tick text: white, raised from the board's 50% to reach 4.5:1 on glass. */ + const val AXIS_ALPHA = 0.68f + + /** The ghost line of your usual: white at 35%. */ + const val USUAL_ALPHA = 0.35f + /** Grid rows, guides and baselines, dp. */ const val HAIRLINE_DP = 1f } @@ -481,3 +502,25 @@ internal fun stageColor(stage: Int): Color = when (stage) { org.openstrap.app.data.db.SleepStage.AWAKE -> MetricColors.sleepAwake else -> MetricColors.sleepLight } + + +/* ------------------------------------------------------------------------------------------------ */ +/* Blends on charts (Glow x Glass, Charts board) */ +/* ------------------------------------------------------------------------------------------------ */ + +/** + * The blend a chart drawn in [ink] uses: the metric's blend for a v2 ink ([Blends.forInk]), else a flat one (white on + * a hero or a solid fill, a category colour) so the marks stay [ink] whole. + */ +fun chartBlend(ink: Color): Blend = Blends.forInk(ink) ?: Blend(ink, ink) + +/** [Blend.chartBrush] across [x0] to [x1] (px), the first colour at the start and the second on the answer. */ +fun Blend.chartBrushAcross(x0: Float, x1: Float): Brush = + Brush.horizontalGradient(listOf(chart, chartSecond), startX = x0, endX = if (x1 > x0) x1 else x0 + 1f) + +/** [Blend.chartBrush] from [y0] (the base, first colour) to [y1] (the top, second colour), px. */ +fun Blend.chartBrushUp(y0: Float, y1: Float): Brush = + Brush.verticalGradient(listOf(chart, chartSecond), startY = y0, endY = if (y1 != y0) y1 else y0 - 1f) + +/** [first] flat, or [second]: a small mark's colour by whether it is the answer. */ +internal fun Blend.mark(answer: Boolean): Color = if (answer) chartSecond else chart diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LevelPictures.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LevelPictures.kt index 1dee8873..d286e75a 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LevelPictures.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LevelPictures.kt @@ -7,8 +7,16 @@ import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.RoundRect import androidx.compose.ui.geometry.Size +import androidx.compose.runtime.remember +import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.graphics.drawscope.rotate +import org.openstrap.app.ui.glow.draw.ChartInk +import org.openstrap.app.ui.glow.draw.chartBlend +import org.openstrap.app.ui.theme.Blend import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.graphics.drawscope.Stroke @@ -22,7 +30,8 @@ import kotlin.math.min /* * The level and count pictures (spec 2.7): a week of dots through your band, a level fill over your usual band, a * countdown ring, blocks, day bars, a range fill, a split bar, week rings and the age scale. Each draws in its metric's - * ink and fills its modifier, about 136 by 60 dp on a Small and 324 by 70 on a Wide. Solid only: no dashes, and no dots + * blend (Charts board: the first colour at the start or base, the second on the answer, in the blend's chart tones; + * the v2 `ink` overloads find it with [chartBlend]) and fills its modifier, about 136 by 60 dp on a Small and 324 by 70 on a Wide. Solid only: no dashes, and no dots * but the week's own. * * The geometry is in plain functions below each picture, so it can be tested without drawing. Fractions run 0 to 1 @@ -32,10 +41,10 @@ import kotlin.math.min // ---- Shared ---------------------------------------------------------------------------------------------------- -/** Your normal: a band of the ink at 12% (spec 2.7). */ -internal const val BAND_ALPHA = 0.12f +/** Your normal behind a week of dots: the first colour at 8% (Charts board). */ +internal const val BAND_ALPHA = ChartInk.DOTS_BAND_ALPHA -/** A part inside your normal, or not the latest: the ink dimmed. */ +/** A part that isn't the latest: the blend dimmed. */ internal const val DIM_ALPHA = 0.55f /** A track under a fill: white at 8%. */ @@ -76,15 +85,27 @@ internal fun share(v: Float, from: Float, to: Float): Float = private fun ClosedFloatingPointRange.holds(v: Float) = v in this /** A bar [h] high centred at [cy] from [x0] to [x1], each end rounded fully or to [inner] when [roundStart]/[roundEnd] say not. */ -private fun DrawScope.bar(color: Color, x0: Float, x1: Float, cy: Float, h: Float, roundStart: Boolean = true, roundEnd: Boolean = true, inner: Float = 0f) { +private fun DrawScope.bar(color: Color, x0: Float, x1: Float, cy: Float, h: Float, roundStart: Boolean = true, roundEnd: Boolean = true, inner: Float = 0f) = + bar(SolidColor(color), x0, x1, cy, h, roundStart, roundEnd, inner) + +private fun DrawScope.bar(brush: Brush, x0: Float, x1: Float, cy: Float, h: Float, roundStart: Boolean = true, roundEnd: Boolean = true, inner: Float = 0f, alpha: Float = 1f) { if (x1 - x0 <= 0f) return val r = min(h / 2, (x1 - x0) / 2) val s = CornerRadius(if (roundStart) r else min(inner, r)) val e = CornerRadius(if (roundEnd) r else min(inner, r)) val path = Path().apply { addRoundRect(RoundRect(x0, cy - h / 2, x1, cy + h / 2, s, e, e, s)) } - drawPath(path, color) + drawPath(path, brush, alpha) } +/** The blend's chart tones across [x0] to [x1]: first at the start, second on the answer. */ +private fun Blend.across(x0: Float, x1: Float): Brush = + Brush.horizontalGradient(listOf(chart, chartSecond), startX = x0, endX = if (x1 > x0) x1 else x0 + 1f) + +/** A sweep from the first colour at the top of a ring (drawn after a -90 degree turn) to the second at [share] of the way round. */ +private fun Blend.sweep(share: Float, center: Offset): Brush = Brush.sweepGradient( + 0f to chart, share.coerceIn(0.001f, 1f) to chartSecond, 1f to chartSecond, center = center, +) + // ---- 1. Week of dots through your band --------------------------------------------------------------------------- /** The week of dots laid out: each dot's x and y (null for a night with no reading), and the band's top and foot. */ @@ -147,7 +168,17 @@ private fun aspectOf(size: PictureSize) = if (size == PictureSize.Small) 136f / // The lists arrive whole with each update and never change in place. @Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable -fun WeekOfDots(values: List, usual: ClosedFloatingPointRange?, ink: Color, size: PictureSize, modifier: Modifier = Modifier) { +fun WeekOfDots(values: List, usual: ClosedFloatingPointRange?, ink: Color, size: PictureSize, modifier: Modifier = Modifier) = + WeekOfDots(values, usual, remember(ink) { chartBlend(ink) }, size, modifier) + +/** + * [WeekOfDots] in [blend]: dots inside your usual dim in the first colour, outside it full in the second, and today's, + * the answer, larger and in the second. + */ +// The lists arrive whole with each update and never change in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +@Composable +fun WeekOfDots(values: List, usual: ClosedFloatingPointRange?, blend: Blend, size: PictureSize, modifier: Modifier = Modifier) { Canvas(modifier) { val g = weekDotsGeometry(values, usual, this.size.width / this.size.height.coerceAtLeast(1f)) val h = this.size.height @@ -155,15 +186,17 @@ fun WeekOfDots(values: List, usual: ClosedFloatingPointRange?, in if (g.bandTop != null && g.bandBottom != null) { val top = g.bandTop * h val bottom = max(g.bandBottom * h, top + 2.dp.toPx()) - drawRoundRect(ink.copy(alpha = BAND_ALPHA), Offset(0f, top), Size(w, bottom - top), CornerRadius(4.dp.toPx())) + drawRoundRect(blend.chart.copy(alpha = BAND_ALPHA), Offset(0f, top), Size(w, bottom - top), CornerRadius(4.dp.toPx())) } val last = values.lastIndex values.forEachIndexed { i, v -> val y = g.ys[i] ?: return@forEachIndexed val inBand = usual == null || usual.holds(v!!) - val alpha = if (i == last || !inBand) 1f else DIM_ALPHA + val answer = i == last || !inBand val r = (if (i == last) TODAY_R else DOT_R) * h - drawCircle(ink.copy(alpha = alpha), r, Offset(g.xs[i] * w, y * h)) + drawCircle( + if (answer) blend.chartSecond else blend.chart.copy(alpha = ChartInk.INSIDE_ALPHA), r, Offset(g.xs[i] * w, y * h), + ) } } } @@ -195,7 +228,12 @@ fun levelFillRim(value: Float, usual: ClosedFloatingPointRange?, size: Pi * it the fill is full ink. */ @Composable -fun LevelFill(value: Float, usual: ClosedFloatingPointRange?, ink: Color, size: PictureSize, modifier: Modifier = Modifier) { +fun LevelFill(value: Float, usual: ClosedFloatingPointRange?, ink: Color, size: PictureSize, modifier: Modifier = Modifier) = + LevelFill(value, usual, remember(ink) { chartBlend(ink) }, size, modifier) + +/** [LevelFill] in [blend]: your usual band flat in the first colour at 22%, the fill's leading edge and its dot in the second. */ +@Composable +fun LevelFill(value: Float, usual: ClosedFloatingPointRange?, blend: Blend, size: PictureSize, modifier: Modifier = Modifier) { Canvas(modifier) { val g = levelFillGeometry(value, usual) val dotR = 5.dp.toPx() @@ -206,11 +244,12 @@ fun LevelFill(value: Float, usual: ClosedFloatingPointRange?, ink: Color, bar(Track, x(0f), x(1f), cy, barH) if (g.bandStart != null && g.bandEnd != null) { val bandH = 16.dp.toPx() - drawRoundRect(ink.copy(alpha = BAND_ALPHA), Offset(x(g.bandStart), cy - bandH / 2), Size(x(g.bandEnd) - x(g.bandStart), bandH), CornerRadius(5.dp.toPx())) + drawRoundRect(blend.chart.copy(alpha = ChartInk.LEVEL_BAND_ALPHA), Offset(x(g.bandStart), cy - bandH / 2), Size(x(g.bandEnd) - x(g.bandStart), bandH), CornerRadius(5.dp.toPx())) } - val off = isOff(value, usual) - bar(ink.copy(alpha = if (off) 1f else 0.5f), x(0f), max(x(g.value), x(0f) + barH), cy, barH) - drawCircle(ink, dotR, Offset(x(g.value), cy)) + val end = max(x(g.value), x(0f) + barH) + bar(blend.across(x(0f), end), x(0f), end, cy, barH) + drawCircle(blend.chartSecond.copy(alpha = ChartInk.END_HALO_ALPHA), dotR + 3.dp.toPx(), Offset(x(g.value), cy)) + drawCircle(blend.chartSecond, dotR, Offset(x(g.value), cy)) } } @@ -225,18 +264,25 @@ internal fun countdownSweep(share: Float): Float = 360f * share.coerceIn(0f, 1f) * page). Never off, so no rim. */ @Composable -fun CountdownRing(share: Float, ink: Color, modifier: Modifier = Modifier, centred: Boolean = false) { +fun CountdownRing(share: Float, ink: Color, modifier: Modifier = Modifier, centred: Boolean = false) = + CountdownRing(share, remember(ink) { chartBlend(ink) }, modifier, centred) + +/** [CountdownRing] in [blend]: along the stroke from the first colour at the top to the second at the end of the value. */ +@Composable +fun CountdownRing(share: Float, blend: Blend, modifier: Modifier = Modifier, centred: Boolean = false) { Canvas(modifier) { - val stroke = 5.dp.toPx() + val stroke = 8.dp.toPx() val r = (min(this.size.height, this.size.width) - stroke) / 2 * 0.85f val cx = if (centred) size.width / 2 else r + stroke / 2 val c = Offset(cx, this.size.height / 2) drawCircle(RingTrack, r, c, style = Stroke(stroke)) val sweep = countdownSweep(share) - if (sweep > 0f) drawArc( - ink.copy(alpha = if (sweep >= 360f) 1f else 0.75f), -90f, sweep, false, - Offset(c.x - r, c.y - r), Size(2 * r, 2 * r), style = Stroke(stroke, cap = StrokeCap.Round), - ) + if (sweep > 0f) rotate(-90f, c) { + drawArc( + blend.sweep(sweep / 360f, c), 0f, sweep, false, + Offset(c.x - r, c.y - r), Size(2 * r, 2 * r), style = Stroke(stroke, cap = StrokeCap.Round), + ) + } } } @@ -261,7 +307,12 @@ internal fun blockRows(count: Int, size: PictureSize): Int { * Never off, so no rim. */ @Composable -fun Blocks(minutes: Int, ink: Color, size: PictureSize, modifier: Modifier = Modifier, target: Int = 150, perBlock: Int = 5) { +fun Blocks(minutes: Int, ink: Color, size: PictureSize, modifier: Modifier = Modifier, target: Int = 150, perBlock: Int = 5) = + Blocks(minutes, remember(ink) { chartBlend(ink) }, size, modifier, target, perBlock) + +/** [Blocks] in [blend]: the filled blocks run from the first colour to the second, which lands on the latest block. */ +@Composable +fun Blocks(minutes: Int, blend: Blend, size: PictureSize, modifier: Modifier = Modifier, target: Int = 150, perBlock: Int = 5) { Canvas(modifier) { val count = blockCount(target, perBlock) if (count == 0) return@Canvas @@ -276,7 +327,7 @@ fun Blocks(minutes: Int, ink: Color, size: PictureSize, modifier: Modifier = Mod val col = i % cols val row = i / cols drawRoundRect( - if (i < filled) ink else Track, + if (i < filled) lerp(blend.chart, blend.chartSecond, if (filled <= 1) 1f else i / (filled - 1f)) else Track, Offset(col * (bw + gap), top + row * (bh + gap)), Size(bw, bh), CornerRadius(2.dp.toPx()), ) } @@ -301,7 +352,14 @@ internal fun dayBarsGeometry(values: List, target: Float?): DayBarsGeome // The lists arrive whole with each update and never change in place. @Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable -fun DayBars(values: List, ink: Color, size: PictureSize, modifier: Modifier = Modifier, target: Float? = null) { +fun DayBars(values: List, ink: Color, size: PictureSize, modifier: Modifier = Modifier, target: Float? = null) = + DayBars(values, remember(ink) { chartBlend(ink) }, size, modifier, target) + +/** [DayBars] in [blend]: the first colour at each bar's base, the second at its top, today's in full and the others dimmer. */ +// The lists arrive whole with each update and never change in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +@Composable +fun DayBars(values: List, blend: Blend, size: PictureSize, modifier: Modifier = Modifier, target: Float? = null) { Canvas(modifier) { if (values.isEmpty()) return@Canvas val g = dayBarsGeometry(values, target) @@ -314,8 +372,9 @@ fun DayBars(values: List, ink: Color, size: PictureSize, modifier: Modif if (values[i] == null) return@forEachIndexed val bh = max(f * h, minH) drawRoundRect( - ink.copy(alpha = if (i == n - 1) 1f else DIM_ALPHA), - Offset(i * (bw + gap), h - bh), Size(bw, bh), CornerRadius(min(bw / 2, 4.dp.toPx())), + brush = Brush.verticalGradient(listOf(blend.chart, blend.chartSecond), startY = h, endY = h - bh), + topLeft = Offset(i * (bw + gap), h - bh), size = Size(bw, bh), cornerRadius = CornerRadius(min(bw / 2, 4.dp.toPx())), + alpha = if (i == n - 1) 1f else DIM_ALPHA, ) } g.target?.let { t -> @@ -340,7 +399,12 @@ internal fun rangeFillGeometry(start: Float, end: Float): RangeFillGeometry = Ra * Energy history is stored, so it has no usual. The numbers ("34 to 72") are the card's status line, not drawn here. */ @Composable -fun RangeFill(start: Float, end: Float, ink: Color, size: PictureSize, modifier: Modifier = Modifier) { +fun RangeFill(start: Float, end: Float, ink: Color, size: PictureSize, modifier: Modifier = Modifier) = + RangeFill(start, end, remember(ink) { chartBlend(ink) }, size, modifier) + +/** [RangeFill] in [blend]: the gain runs from the first colour to the second at where the night ended. */ +@Composable +fun RangeFill(start: Float, end: Float, blend: Blend, size: PictureSize, modifier: Modifier = Modifier) { Canvas(modifier) { val g = rangeFillGeometry(start, end) val w = this.size.width @@ -348,7 +412,7 @@ fun RangeFill(start: Float, end: Float, ink: Color, size: PictureSize, modifier: val h = 10.dp.toPx() bar(Track, 0f, w, cy, h) bar(Color.White.copy(alpha = 0.2f), 0f, min(g.start, g.end) * w, cy, h) - if (g.gain) bar(ink, max(0f, g.start * w - h / 2), g.end * w, cy, h) + if (g.gain) bar(blend.across(max(0f, g.start * w - h / 2), g.end * w), max(0f, g.start * w - h / 2), g.end * w, cy, h) } } @@ -389,13 +453,20 @@ internal fun splitBarParts(parts: List, width: Float, gap: Float): List, ink: Color, size: PictureSize, modifier: Modifier = Modifier) { +fun SplitBar(parts: List, ink: Color, size: PictureSize, modifier: Modifier = Modifier) = + SplitBar(parts, remember(ink) { chartBlend(ink) }, size, modifier) + +/** [SplitBar] in [blend]: the blend runs along the whole bar, each part at its rank's strength. */ +// The lists arrive whole with each update and never change in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +@Composable +fun SplitBar(parts: List, blend: Blend, size: PictureSize, modifier: Modifier = Modifier) { Canvas(modifier) { val h = 12.dp.toPx() val cy = this.size.height / 2 val laid = splitBarParts(parts, this.size.width, 2.dp.toPx()) laid.forEachIndexed { k, p -> - bar(ink.copy(alpha = splitAlpha(p.rank)), p.start, p.end, cy, h, roundStart = k == 0, roundEnd = k == laid.lastIndex, inner = 3.dp.toPx()) + bar(blend.across(0f, this.size.width), p.start, p.end, cy, h, alpha = splitAlpha(p.rank), roundStart = k == 0, roundEnd = k == laid.lastIndex, inner = 3.dp.toPx()) } } } @@ -420,7 +491,14 @@ internal fun weekRingsGeometry(width: Float, height: Float, stroke: Float, count // The lists arrive whole with each update and never change in place. @Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable -fun WeekRings(shares: List, ink: Color, size: PictureSize, modifier: Modifier = Modifier) { +fun WeekRings(shares: List, ink: Color, size: PictureSize, modifier: Modifier = Modifier) = + WeekRings(shares, remember(ink) { chartBlend(ink) }, size, modifier) + +/** [WeekRings] in [blend]: each ring runs from the first colour at the top to the second at the end of its share. */ +// The lists arrive whole with each update and never change in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +@Composable +fun WeekRings(shares: List, blend: Blend, size: PictureSize, modifier: Modifier = Modifier) { Canvas(modifier) { val stroke = (if (size == PictureSize.Small) 3.dp else 4.dp).toPx() val g = weekRingsGeometry(this.size.width, this.size.height, stroke, shares.size) @@ -430,10 +508,12 @@ fun WeekRings(shares: List, ink: Color, size: PictureSize, modifier: Mod val c = Offset(g.centres[i], cy) drawCircle(RingTrack, r, c, style = Stroke(stroke)) val sweep = countdownSweep(s ?: 0f) - if (s != null && sweep > 0f) drawArc( - ink.copy(alpha = if (sweep >= 360f) 1f else DIM_ALPHA), -90f, max(sweep, 4f), false, - Offset(c.x - r, c.y - r), Size(2 * r, 2 * r), style = Stroke(stroke, cap = StrokeCap.Round), - ) + if (s != null && sweep > 0f) rotate(-90f, c) { + drawArc( + blend.sweep(max(sweep, 4f) / 360f, c), 0f, max(sweep, 4f), false, + Offset(c.x - r, c.y - r), Size(2 * r, 2 * r), style = Stroke(stroke, cap = StrokeCap.Round), + ) + } } } } @@ -468,14 +548,19 @@ fun ageScaleRim(low: Float, high: Float, age: Float, size: PictureSize = Picture * white dot at the [estimate], a hairline at your own [age]. No labels: the card draws them, placed by [ageScaleX]. */ @Composable -fun AgeScalePicture(low: Float, high: Float, estimate: Float, age: Float, ink: Color, size: PictureSize, modifier: Modifier = Modifier) { +fun AgeScalePicture(low: Float, high: Float, estimate: Float, age: Float, ink: Color, size: PictureSize, modifier: Modifier = Modifier) = + AgeScalePicture(low, high, estimate, age, remember(ink) { chartBlend(ink) }, size, modifier) + +/** [AgeScalePicture] in [blend]: the range's band runs from the first colour at its young end to the second at its old end. */ +@Composable +fun AgeScalePicture(low: Float, high: Float, estimate: Float, age: Float, blend: Blend, size: PictureSize, modifier: Modifier = Modifier) { Canvas(modifier) { val dotR = 6.dp.toPx() val w = this.size.width - 2 * dotR fun x(a: Float) = dotR + ageScaleX(a, low, high, age) * w val cy = this.size.height / 2 bar(Track, dotR, dotR + w, cy, 3.dp.toPx()) - bar(ink.copy(alpha = 0.8f), x(low) - 4.dp.toPx(), x(high) + 4.dp.toPx(), cy, 8.dp.toPx()) + bar(blend.across(x(low) - 4.dp.toPx(), x(high) + 4.dp.toPx()), x(low) - 4.dp.toPx(), x(high) + 4.dp.toPx(), cy, 8.dp.toPx()) val lineH = min(this.size.height, 28.dp.toPx()) drawLine(AgeLine, Offset(x(age), cy - lineH / 2), Offset(x(age), cy + lineH / 2), 1.5.dp.toPx()) drawCircle(Color.White, dotR, Offset(x(estimate), cy)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LinePictures.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LinePictures.kt index a9243975..33ff240a 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LinePictures.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LinePictures.kt @@ -10,7 +10,17 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Rect import androidx.compose.ui.geometry.RoundRect import androidx.compose.ui.geometry.Size +import androidx.compose.runtime.remember +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.ClipOp import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.graphics.drawscope.clipRect +import org.openstrap.app.ui.glow.draw.chartBlend +import org.openstrap.app.ui.glow.draw.chartBrushAcross +import org.openstrap.app.ui.glow.draw.composePath +import org.openstrap.app.ui.glow.draw.smoothOps +import org.openstrap.app.ui.theme.Blend import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.drawscope.Stroke @@ -24,7 +34,6 @@ import org.openstrap.app.ui.glow.GlowType import org.openstrap.app.ui.glow.Rim import org.openstrap.app.ui.glow.draw.ChartInk import org.openstrap.app.ui.glow.draw.stageColor -import org.openstrap.app.ui.glow.drawZoneLine import java.time.LocalTime import kotlin.math.abs import kotlin.math.cos @@ -34,7 +43,9 @@ import kotlin.math.sin /* * The line-like pictures (spec 2.7): Heart rate's day line through your resting band, Stress's day strip, Skin * temperature's dial, Sleep regularity's bed and wake bars and the day with the naps on it. Each draws in its metric's - * ink to fill its modifier, solid, never dotted or dashed and with no digits (but the dial's reading), and each but the + * blend (Charts board: the first colour at the start or base, the second on the answer, in the blend's chart tones) to + * fill its modifier. The v2 `ink` overloads find the blend with [chartBlend]; the [Blend] overloads take it directly. Each + * draws solid, never dotted or dashed and with no digits (but the dial's reading), and each but the * naps has a rim function saying where on the card the off part sits (spec 2.5). The geometry is in plain functions so it * is tested without a screen. */ @@ -66,11 +77,11 @@ internal fun lineCardY(f: Float): Float = PICTURE_TOP_Y + f.coerceIn(0f, 1f) * ( private fun Modifier.pictureArea(size: PictureSize): Modifier = if (size == PictureSize.Small) defaultMinSize(136.dp, 60.dp) else defaultMinSize(324.dp, 70.dp) -/** Your normal behind a picture: the ink at 12% (spec 2.7). */ -private fun Color.normalBand(): Color = copy(alpha = ChartInk.NORMAL_BAND_ALPHA) +/** Your normal behind a picture: the blend's first colour at 12% (spec 2.7). */ +private fun Blend.normalBand(): Color = chart.copy(alpha = ChartInk.NORMAL_BAND_ALPHA) -/** A level inside your normal is drawn a little dimmer than one outside it. */ -internal const val INSIDE_ALPHA = 0.7f +/** A level inside your normal is drawn dimmer than one outside it (Charts board: 45%). */ +internal const val INSIDE_ALPHA = ChartInk.INSIDE_ALPHA /* ------------------------------------------------------------------------------------------------ */ /* Heart rate: the day's line through your resting band */ @@ -119,6 +130,19 @@ fun DayLine( size: PictureSize, modifier: Modifier = Modifier, slots: Int = values.size, +) = DayLine(values, band, remember(ink) { chartBlend(ink) }, size, modifier, slots) + +/** [DayLine] in [blend]: the blend along time, the second colour at the latest reading; inside the band the line dims. */ +@Composable +// The readings arrive whole with each update and never change in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +fun DayLine( + values: List, + band: ClosedFloatingPointRange?, + blend: Blend, + size: PictureSize, + modifier: Modifier = Modifier, + slots: Int = values.size, ) { val scale = lineScale(values, band) Canvas(modifier.pictureArea(size)) { @@ -127,18 +151,32 @@ fun DayLine( val h = this.size.height - 2 * pad val w = this.size.width - 2 * pad fun y(v: Float) = pad + scale.down(v) * h - if (band != null) { - val top = y(band.endInclusive) - drawRoundRect(ink.normalBand(), Offset(0f, top), Size(this.size.width, (y(band.start) - top).coerceAtLeast(1f)), CornerRadius(4.dp.toPx())) + val bandTop = band?.let { y(it.endInclusive) } + val bandBottom = band?.let { y(it.start) } + if (band != null && bandTop != null && bandBottom != null) { + drawRoundRect(blend.normalBand(), Offset(0f, bandTop), Size(this.size.width, (bandBottom - bandTop).coerceAtLeast(1f)), CornerRadius(4.dp.toPx())) } - fun inside(v: Float) = band != null && v in band - val at = { i: Int -> values.getOrNull(i)?.let { Offset(pad + slotX(i, slots) * w, y(it)) } } - drawZoneLine(values.size, 2.dp.toPx(), at) { i -> - val a = values[i]!! - val b = values[i + 1]!! - if (inside(a) && inside(b)) ink.copy(alpha = INSIDE_ALPHA) else ink + // Runs of readings, a gap starting a new run: a smooth line each, a lone reading a dot. + val runs = mutableListOf>(mutableListOf()) + values.forEachIndexed { i, v -> + if (v == null) { if (runs.last().isNotEmpty()) runs += mutableListOf() } + else runs.last() += Offset(pad + slotX(i, slots) * w, y(v)) + } + val last = lastReading(values)?.let { i -> Offset(pad + slotX(i, slots) * w, y(values[i]!!)) } + val brush = blend.chartBrushAcross(pad, last?.x ?: (pad + w)) + val stroke = Stroke(2.dp.toPx(), cap = StrokeCap.Round, join = androidx.compose.ui.graphics.StrokeJoin.Round) + runs.filter { it.isNotEmpty() }.forEach { pts -> + if (pts.size == 1) { drawCircle(blend.chart, 2.dp.toPx(), pts.first()); return@forEach } + val path = composePath(smoothOps(pts)) + if (bandTop != null && bandBottom != null) { + drawPath(path, brush, alpha = INSIDE_ALPHA, style = stroke) + clipRect(0f, bandTop, this.size.width, bandBottom, ClipOp.Difference) { drawPath(path, brush, style = stroke) } + } else drawPath(path, brush, style = stroke) + } + last?.let { + drawCircle(blend.chartSecond.copy(alpha = ChartInk.END_HALO_ALPHA), 7.5.dp.toPx(), it) + drawCircle(blend.chartSecond, 3.5.dp.toPx(), it) } - lastReading(values)?.let { i -> at(i)?.let { drawCircle(ink, 3.5.dp.toPx(), it) } } } } @@ -176,16 +214,24 @@ internal fun stripStretches(levels: List, slots: Int = levels.size): Lis @Composable // The levels arrive whole with each update and never change in place. @Suppress("UnstableCollections", "ComposeUnstableCollections") -fun DayStrip(levels: List, ink: Color, size: PictureSize, modifier: Modifier = Modifier, slots: Int = levels.size) { +fun DayStrip(levels: List, ink: Color, size: PictureSize, modifier: Modifier = Modifier, slots: Int = levels.size) = + DayStrip(levels, remember(ink) { chartBlend(ink) }, size, modifier, slots) + +/** [DayStrip] in [blend]: calm stretches dim in the first colour, high stretches full in the second. */ +@Composable +// The levels arrive whole with each update and never change in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +fun DayStrip(levels: List, blend: Blend, size: PictureSize, modifier: Modifier = Modifier, slots: Int = levels.size) { val stretches = stripStretches(levels, slots) Canvas(modifier.pictureArea(size)) { val h = min((if (size == PictureSize.Small) 18.dp else 20.dp).toPx(), this.size.height) val top = (this.size.height - h) / 2 - val clip = Path().apply { addRoundRect(RoundRect(Rect(0f, top, this@Canvas.size.width, top + h), CornerRadius(h / 2))) } + val clip = Path().apply { addRoundRect(RoundRect(Rect(0f, top, this@Canvas.size.width, top + h), CornerRadius(4.dp.toPx()))) } clipPath(clip) { // Each stretch reaches a hair over the next so no seam shows between them. stretches.forEach { s -> - drawRect(ink.copy(alpha = s.alpha), Offset(s.x0 * this.size.width, top), Size((s.x1 - s.x0) * this.size.width + 0.5f, h)) + val level = ((s.alpha - 0.15f) / 0.85f).coerceIn(0f, 1f) + drawRect(lerp(blend.chart, blend.chartSecond, level).copy(alpha = s.alpha), Offset(s.x0 * this.size.width, top), Size((s.x1 - s.x0) * this.size.width + 0.5f, h)) } } } @@ -241,6 +287,17 @@ fun TempDial( size: PictureSize, modifier: Modifier = Modifier, reading: String? = null, +) = TempDial(deviation, normal, remember(ink) { chartBlend(ink) }, size, modifier, reading) + +/** [TempDial] in [blend] (cool into warm): your normal flat in the first colour, the needle and its dot in the second. */ +@Composable +fun TempDial( + deviation: Float?, + normal: ClosedFloatingPointRange?, + blend: Blend, + size: PictureSize, + modifier: Modifier = Modifier, + reading: String? = null, ) { val measurer = rememberTextMeasurer() Canvas(modifier.pictureArea(size)) { @@ -255,13 +312,14 @@ fun TempDial( // Compose sweeps clockwise from 3 o'clock with y down, so a maths angle a is at -a. val from = -dialAngle(normal.start) val to = -dialAngle(normal.endInclusive) - drawArc(ink.normalBand(), from, to - from, false, corner, box, style = Stroke(bandW, cap = StrokeCap.Round)) + drawArc(blend.chart.copy(alpha = ChartInk.LEVEL_BAND_ALPHA), from, to - from, false, corner, box, style = Stroke(bandW, cap = StrokeCap.Round)) } if (deviation != null) { val angle = dialAngle(deviation) val tip = dialPoint(fit, angle) - drawLine(ink, dialPoint(fit, angle, fit.radius * 0.55f), dialPoint(fit, angle, dot), 2.dp.toPx(), StrokeCap.Round) - drawCircle(ink, dot, tip) + drawLine(blend.chartSecond, dialPoint(fit, angle, fit.radius * 0.55f), dialPoint(fit, angle, dot), 2.dp.toPx(), StrokeCap.Round) + drawCircle(blend.chartSecond.copy(alpha = ChartInk.END_HALO_ALPHA), dot + 3.dp.toPx(), tip) + drawCircle(blend.chartSecond, dot, tip) } if (reading != null) { val large = measurer.measure(reading, GlowType.secondary.copy(color = Color.White)) @@ -350,6 +408,19 @@ fun BedWakeBars( size: PictureSize, modifier: Modifier = Modifier, band: Int = USUAL_BAND_MINUTES, +) = BedWakeBars(nights, usual, remember(ink) { chartBlend(ink) }, size, modifier, band) + +/** [BedWakeBars] in [blend]: each bar runs from the first colour at bedtime to the second at wake, full when off, dimmer when usual. */ +@Composable +// The week arrives whole with each update and never changes in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +fun BedWakeBars( + nights: List, + usual: BedWake?, + blend: Blend, + size: PictureSize, + modifier: Modifier = Modifier, + band: Int = USUAL_BAND_MINUTES, ) { val off = offNights(nights, usual, band) val span = bedWakeSpan(nights, usual, band) @@ -358,7 +429,7 @@ fun BedWakeBars( fun y(m: Int) = (m - span.first) / total * this.size.height usual?.let(::sinceNoon)?.toList()?.forEach { m -> val top = y(m - band) - drawRect(ink.normalBand(), Offset(0f, top), Size(this.size.width, y(m + band) - top)) + drawRect(blend.normalBand(), Offset(0f, top), Size(this.size.width, y(m + band) - top)) } val slot = this.size.width / nights.size.coerceAtLeast(1) val w = min(slot * 0.45f, (if (size == PictureSize.Small) 8.dp else 10.dp).toPx()) @@ -367,9 +438,11 @@ fun BedWakeBars( val (b, k) = sinceNoon(n) val cx = nightX(i, nights.size) * this.size.width val top = y(b) + val bottom = top + (y(k) - top).coerceAtLeast(w) drawRoundRect( - if (off[i]) ink else ink.copy(alpha = 0.45f), - Offset(cx - w / 2, top), Size(w, (y(k) - top).coerceAtLeast(w)), CornerRadius(w / 2), + brush = Brush.verticalGradient(listOf(blend.chart, blend.chartSecond), startY = top, endY = bottom), + topLeft = Offset(cx - w / 2, top), size = Size(w, bottom - top), cornerRadius = CornerRadius(w / 2), + alpha = if (off[i]) 1f else INSIDE_ALPHA, ) } } @@ -435,7 +508,14 @@ private val NapStrip: Dp = 10.dp @Composable // The naps arrive whole with each update and never change in place. @Suppress("UnstableCollections", "ComposeUnstableCollections") -fun NapDay(naps: List, dayStart: Long, dayEnd: Long, ink: Color, size: PictureSize, modifier: Modifier = Modifier) { +fun NapDay(naps: List, dayStart: Long, dayEnd: Long, ink: Color, size: PictureSize, modifier: Modifier = Modifier) = + NapDay(naps, dayStart, dayEnd, remember(ink) { chartBlend(ink) }, size, modifier) + +/** [NapDay] in [blend]: stages keep their flat colours, a nap with none takes the blend's second colour. */ +@Composable +// The naps arrive whole with each update and never change in place. +@Suppress("UnstableCollections", "ComposeUnstableCollections") +fun NapDay(naps: List, dayStart: Long, dayEnd: Long, blend: Blend, size: PictureSize, modifier: Modifier = Modifier) { Canvas(modifier.pictureArea(size)) { val h = min(NapStrip.toPx(), this.size.height) val mid = this.size.height / 2 @@ -447,7 +527,7 @@ fun NapDay(naps: List, dayStart: Long, dayEnd: Long, ink: Color, size: Pict clipPath(clip) { p.parts.forEach { part -> drawRect( - part.stage?.let(::stageColor) ?: ink, + part.stage?.let(::stageColor) ?: blend.chartSecond, Offset(part.x0 * this.size.width, mid - h / 2), Size((part.x1 - part.x0) * this.size.width + 0.5f, h), ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/Pictures.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/Pictures.kt index 47b9ca1f..970c1f2c 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/Pictures.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/Pictures.kt @@ -2,7 +2,7 @@ package org.openstrap.app.ui.glow.pictures /* * The pictures a picture card draws (spec 2.7), one composable per kind in [org.openstrap.app.ui.dashboard.PictureKind]. - * Each draws in its metric's ink at a Small or a Wide, never dotted or dashed, and says where its off part sits so the + * Each draws in its metric's blend (Charts board, chart tones: first colour at the start or base, second on the answer; a v2 ink finds its blend through chartBlend, and every picture also takes a Blend) at a Small or a Wide, never dotted or dashed, and says where its off part sits so the * card's rim lights there ([org.openstrap.app.ui.glow.Rim]). Line-like pictures live in LinePictures.kt, levels and * counts in LevelPictures.kt. The debug gallery shows every one: `--es section pictures`. */ From 41bea6df42f27615cb492f0b46a1b88afd12bc7e Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:37:21 +0400 Subject: [PATCH 08/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20heavy=20glass=20?= =?UTF-8?q?sheets,=20sheet=20screens,=20page=20light?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../org/openstrap/app/ui/components/Glass.kt | 141 ++++++++++--- .../openstrap/app/ui/glow/AllMetricsScreen.kt | 85 +++++++- .../openstrap/app/ui/glow/EditTodaySheet.kt | 190 ++++++++++++++++-- .../org/openstrap/app/ui/glow/InfoSheet.kt | 27 ++- .../org/openstrap/app/ui/root/DetailHost.kt | 6 +- .../org/openstrap/app/ui/root/PagesOverTab.kt | 10 +- 6 files changed, 388 insertions(+), 71 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/components/Glass.kt b/app/src/main/kotlin/org/openstrap/app/ui/components/Glass.kt index aa728e14..627821ec 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/components/Glass.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/components/Glass.kt @@ -16,9 +16,7 @@ import dev.chrisbanes.haze.blur.hazeBlur import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.staticCompositionLocalOf @@ -27,6 +25,25 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp +import androidx.compose.material3.LocalContentColor +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.SideEffect +import androidx.compose.runtime.Stable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.ColorMatrix +import dev.chrisbanes.haze.HazeState +import dev.chrisbanes.haze.blur.HazeBlurStyle +import dev.chrisbanes.haze.blur.HazeColorEffect +import org.openstrap.app.ui.theme.Ground +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.theme.LocalScreenLight +import org.openstrap.app.ui.theme.litEdge +import org.openstrap.app.ui.theme.screenLight import androidx.compose.animation.core.animate import androidx.compose.animation.core.tween import androidx.compose.foundation.gestures.Orientation @@ -50,19 +67,23 @@ val GlassEdge = BorderStroke( 1.dp, Brush.verticalGradient(0f to Color.White.copy(alpha = 0.2f), 0.5f to Color.White.copy(alpha = 0.05f), 1f to Color.Black.copy(alpha = 0.4f)), ) -/** The screen's cards go OLED black with a faint hairline instead of grey fills, matching the glow tabs. */ +/** + * Material parts on the screen light (Glow × Glass): the ground is #030304 and the containers that Material paints + * behind its parts are see-through, so no black slab sits over a page's light. Menus and sheets keep an opaque dark + * container, since they must be readable over anything. + */ @Composable fun OledSurfaces(content: @Composable () -> Unit) { val c = MaterialTheme.colorScheme MaterialTheme( colorScheme = c.copy( - background = Color.Black, - surface = Color.Black, - surfaceContainerLowest = Color.Black, - surfaceContainerLow = Color.Black, - surfaceContainer = Color.Black, - surfaceContainerHigh = Color(0xFF101012), - surfaceContainerHighest = Color(0xFF1A1A1D), + background = Ground, + surface = Color.Transparent, + surfaceContainerLowest = Color.Transparent, + surfaceContainerLow = Color.Transparent, + surfaceContainer = Color(0xFF121215), + surfaceContainerHigh = Color(0xFF16161A), + surfaceContainerHighest = Color(0xFF1E1E22), outline = Color.White.copy(alpha = 0.16f), outlineVariant = Color.White.copy(alpha = 0.12f), ), @@ -72,6 +93,41 @@ fun OledSurfaces(content: @Composable () -> Unit) { ) } +/* ------------------------------------------- The page's screen light -------------------------------------- */ + +/** Holds the screen light a page over a tab asks for. Read by [PageLightHost], set by [PageLight]. */ +@Stable +class PageLightState { + var light: ScreenLight? by mutableStateOf(null) +} + +/** The page's light holder, null outside a [PageLightHost]. */ +val LocalPageLight = staticCompositionLocalOf { null } + +/** + * Draws the screen light of the page inside it, over [Ground] (the plain ground until a page sets one), fixed to the + * screen. A detail or a page over a tab sets its light from inside with [PageLight]. Wrap each page once: the host + * belongs to one stack entry, so a page sliding in or out keeps its own light. + */ +@Composable +fun PageLightHost(modifier: Modifier = Modifier, content: @Composable () -> Unit) { + val state = remember { PageLightState() } + CompositionLocalProvider(LocalPageLight provides state, LocalScreenLight provides state.light) { + Box(modifier.fillMaxSize().screenLight(state.light)) { content() } + } +} + +/** + * Sets the screen light for the page this is called in (the hero's blend, mood and angle). Cleared when the page + * leaves. Does nothing outside a [PageLightHost]. Pass null for the plain ground. + */ +@Composable +fun PageLight(light: ScreenLight?) { + val state = LocalPageLight.current ?: return + SideEffect { state.light = light } + DisposableEffect(state) { onDispose { state.light = null } } +} + /* ------------------------------------------- In-app overlay ----------------------------------------- */ /** @@ -104,12 +160,30 @@ private fun GlassPortal(host: GlassHost, sheet: Boolean, onDismiss: () -> Unit, } } -/** The page behind a popup: blurred and darkened, the nav bar's glass spread across the screen. */ -private val BackdropBlur = dev.chrisbanes.haze.blur.HazeBlurStyle { - blurRadius(28.dp) - backgroundColor(Color.Black) - colorEffects(listOf(dev.chrisbanes.haze.blur.HazeColorEffect.tint(Color.Black.copy(alpha = 0.45f)))) - fallbackColorEffect(dev.chrisbanes.haze.blur.HazeColorEffect.tint(Color.Black.copy(alpha = 0.8f))) +/** The sheet material's fill (the boards' rgba(22,22,26)). */ +private val SheetFill = Color(0xFF16161A) + +/** The boards' dim behind a sheet or popup: black at 58%. */ +private const val BACKDROP_DIM = 0.58f + +/** The haze the overlay's sheets and popups blur (the pages' source), for [GlassPanel]. */ +val LocalGlassHaze = staticCompositionLocalOf { null } + +/** + * Heavy glass (Sheet boards): the page behind blurred 40 dp, saturated 150%, under a 78% dark fill. The boards' + * System panel draws 28 dp and 170% for a card-sized panel, the sheet boards 40 and 150, and the sheets win here. + * Before Android 12, which has no blur, the fill is near solid. + */ +private val HeavyGlass = HazeBlurStyle { + blurRadius(40.dp) + backgroundColor(Ground) + colorEffects( + listOf( + HazeColorEffect.colorFilter(ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(1.5f) })), + HazeColorEffect.tint(SheetFill.copy(alpha = 0.78f)), + ), + ) + fallbackColorEffect(HazeColorEffect.tint(SheetFill.copy(alpha = 0.96f))) } /** Draws the registered popups; place it last at the root, over everything, with the pages' [haze]. */ @@ -124,7 +198,7 @@ fun GlassOverlay(host: GlassHost, haze: dev.chrisbanes.haze.HazeState) { Box( Modifier.fillMaxSize() .graphicsLayer { alpha = shown.value } - .hazeBlur(HazeInput.Sources(haze), BackdropBlur) + .background(Color.Black.copy(alpha = BACKDROP_DIM)) .clickable(tap, indication = null) { layer.onDismiss.value() }, ) Box( @@ -137,7 +211,7 @@ fun GlassOverlay(host: GlassHost, haze: dev.chrisbanes.haze.HazeState) { ) { // The panel takes its own taps, so tapping it doesn't dismiss. Box(Modifier.clickable(androidx.compose.runtime.remember { androidx.compose.foundation.interaction.MutableInteractionSource() }, indication = null) {}) { - layer.content.value() + CompositionLocalProvider(LocalGlassHaze provides haze) { layer.content.value() } } } } @@ -145,19 +219,25 @@ fun GlassOverlay(host: GlassHost, haze: dev.chrisbanes.haze.HazeState) { } /** - * The glass panel a popup sits on: see-through dark over the blurred page, with a lit top edge. Android 11 can't blur - * the page (Haze needs 12), so there it is near solid, or the page's text reads through the popup's. + * The heavy glass a sheet or popup sits on: the page behind it blurred under a dark fill, with a lit top edge. Popups + * take [GlowShapes.Card], sheets [GlowShapes.Sheet]. Outside the overlay (no page to blur) and before Android 12 it is + * a near solid fill. */ @Composable -fun GlassPanel(modifier: Modifier = Modifier, shape: androidx.compose.ui.graphics.Shape = org.openstrap.app.ui.glow.GlowLayout.CardShape, content: @Composable () -> Unit) { - Surface( - shape = shape, color = GlassTint.copy(alpha = GlassPanelAlpha), border = GlassEdge, contentColor = Color.White, - modifier = modifier, content = content, - ) +fun GlassPanel(modifier: Modifier = Modifier, shape: androidx.compose.ui.graphics.Shape = GlowShapes.Card, content: @Composable () -> Unit) { + val haze = LocalGlassHaze.current + Box( + modifier.clip(shape) + .let { + if (haze != null) it.hazeBlur(HazeInput.Sources(haze), HeavyGlass) + else it.background(SheetFill.copy(alpha = 0.96f)) + } + .litEdge(shape, top = 0.2f, ring = 0f, reach = 3f), + ) { + CompositionLocalProvider(LocalContentColor provides Color.White, content = content) + } } -private val GlassPanelAlpha = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) 0.72f else 0.96f - /** * A bottom sheet as glass in the overlay, at most [org.openstrap.app.ui.glow.GlowLayout.PageMaxWidth] wide and centred. * Pulled down by its handle, or past the top of its list, it follows the @@ -209,11 +289,12 @@ fun GlassSheet(onDismiss: () -> Unit, content: @Composable () -> Unit) { rememberDraggableState { d -> pull.floatValue = (pull.floatValue + d).coerceAtLeast(0f) }, Orientation.Vertical, onDragStopped = { v -> release(v) }, ), - org.openstrap.app.ui.glow.GlowLayout.SheetShape, + GlowShapes.Sheet, ) { Column { - Box(Modifier.fillMaxWidth().padding(top = 12.dp, bottom = 8.dp), contentAlignment = Alignment.Center) { - Box(Modifier.size(width = 36.dp, height = 4.dp).background(Color.White.copy(alpha = 0.3f), RoundedCornerShape(2.dp))) + // The grab handle as the boards draw it: a 36 by 4 pill, 10 dp from the top. + Box(Modifier.fillMaxWidth().padding(top = 10.dp, bottom = 14.dp), contentAlignment = Alignment.Center) { + Box(Modifier.size(width = 36.dp, height = 4.dp).background(Color.White.copy(alpha = 0.3f), GlowShapes.Small)) } content() } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt index 9dca56a5..245daffd 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt @@ -1,7 +1,35 @@ package org.openstrap.app.ui.glow import androidx.annotation.StringRes +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Icon +import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp +import org.openstrap.app.ui.components.GlassSheet +import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -244,8 +272,10 @@ private fun signalGroups(state: DayUiState, now: Long, strings: Strings): List Unit, onOpen: (IndexTarget) -> Unit, ) { - PageSheet(onDismiss, stringResource(R.string.glow_metrics_all_metrics), dayName(date), side = 16.dp) { - groups.forEach { group -> - ListPanel(title = group.title) { - group.rows.forEachIndexed { i, r -> - ListRow(r.name, r.color, r.value, r.status, onClick = { onOpen(r.target) }, divider = i > 0, icon = r.target.rowIcon()) + val maxHeight = (LocalConfiguration.current.screenHeightDp * 0.88f).dp + GlassSheet(onDismiss) { + Column( + Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()) + .padding(horizontal = 16.dp).navigationBarsPadding().padding(top = 4.dp, bottom = 20.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Column(Modifier.padding(horizontal = 4.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(stringResource(R.string.glow_metrics_all_metrics), color = Color.White, style = GlowType.cardTitle) + Text(dayName(date), color = Color.White.copy(alpha = 0.62f), style = GlowType.secondary) + } + Column(Modifier.fillMaxWidth().clearGlass(GlowShapes.Card).padding(horizontal = 18.dp, vertical = 4.dp)) { + groups.forEachIndexed { gi, group -> + Text( + group.title, color = Color.White.copy(alpha = 0.6f), + style = GlowType.secondary.copy(fontWeight = FontWeight.Medium), + modifier = Modifier.fillMaxWidth().then(if (gi > 0) Modifier.hairline(0.10f) else Modifier) + .padding(top = if (gi == 0) 6.dp else 18.dp, bottom = 2.dp), + ) + group.rows.forEachIndexed { i, r -> MetricRow(r, divider = i > 0) { onOpen(r.target) } } } } } } } + +/** A hairline along the top edge: white at [alpha], the boards' `inset 0 1px 0`. */ +private fun Modifier.hairline(alpha: Float): Modifier = + drawBehind { drawLine(Color.White.copy(alpha = alpha), Offset(0f, 0f), Offset(size.width, 0f), 1.dp.toPx()) } + +/** One row of the sheet, 60 dp tall: icon in a 36 dp disc, name over status, the value, a caret. */ +@Composable +private fun MetricRow(r: IndexRow, divider: Boolean, onClick: () -> Unit) { + // Every row's icon is its blend's first stop (a row not on a blend keeps its own colour). + val tint = (Blends.forInk(r.color)?.first ?: r.color).let { if (r.value == null) it.copy(alpha = 0.4f) else it } + Row( + Modifier.fillMaxWidth().heightIn(min = 60.dp).then(if (divider) Modifier.hairline(0.07f) else Modifier) + .clickable(onClick = onClick), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp), + ) { + Box(Modifier.size(36.dp).background(tint.copy(alpha = tint.alpha * 0.16f), CircleShape), contentAlignment = Alignment.Center) { + r.target.rowIcon()?.let { Icon(it, null, Modifier.size(20.dp), tint = tint) } + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(r.name, color = Color.White, style = GlowType.body) + Text(r.status, color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary.copy(fontSize = 12.sp, lineHeight = 16.sp)) + } + if (r.value != null) Text(r.value, color = Color.White, style = GlowType.rowValue, maxLines = 1) else WaitingDash() + Icon(AppIcons.CaretRight, null, Modifier.size(16.dp), tint = Color.White.copy(alpha = 0.48f)) + } +} diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt index 437da8f2..8542277f 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt @@ -1,10 +1,24 @@ package org.openstrap.app.ui.glow -import org.openstrap.app.R -import androidx.compose.ui.res.stringResource +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Icon +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -14,42 +28,178 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.stateDescription +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp +import org.openstrap.app.R +import org.openstrap.app.ui.components.GlassSheet import org.openstrap.app.ui.dashboard.TodayCard import org.openstrap.app.ui.dashboard.TodayEdits +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass /** - * Edit Today (audit 3, Sheets): which cards Today shows, and up to two pinned under the hero, as a sheet of rows. - * Each row has the card's name, a Pin chip when it can be pinned, and a switch for whether it shows. Saved as a whole - * on Done. Pulling the sheet down or Cancel leaves Today as it was. The pins and hides not yet saved outlive a rotation, - * a fold and process death ([TodayEditsSaver]). + * Edit Today (audit 3, Sheets): which cards Today shows, and up to two pinned under the hero, as a sheet of rows on + * clear glass. Each row has the card's name, a Pin chip when it can be pinned, and a switch for whether it shows. Cancel + * and Done stay at the foot while the rows scroll. Saved as a whole on Done. Pulling the sheet down or Cancel leaves + * Today as it was. The pins and hides not yet saved outlive a rotation, a fold and process death ([TodayEditsSaver]). */ @Composable internal fun EditTodaySheet(edits: TodayEdits, onSave: (TodayEdits) -> Unit, onDismiss: () -> Unit) { var e by rememberSaveable(stateSaver = TodayEditsSaver) { mutableStateOf(edits) } - PageSheet(onDismiss, stringResource(R.string.glow_today_edit), note = stringResource(R.string.glow_today_edit_note)) { - PageRows { - TodayCard.entries.filter { it.editable }.forEachIndexed { i, card -> - val shown = card !in e.hidden - PageRow(card.label, divider = i > 0) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { - if (card.pinnable) { - val pinned = card in e.pinned - val pin = stringResource(if (pinned) R.string.glow_today_edit_pinned else R.string.glow_today_edit_pin) - PageChip(pin, pinned, { e = e.togglePin(card) }, enabled = e.canPin(card)) + val maxHeight = (LocalConfiguration.current.screenHeightDp * 0.88f).dp + GlassSheet(onDismiss) { + Column(Modifier.fillMaxWidth().heightIn(max = maxHeight)) { + Box(Modifier.weight(1f, fill = false)) { + Column( + Modifier.verticalScroll(rememberScrollState()).padding(horizontal = 20.dp).padding(bottom = 40.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(stringResource(R.string.glow_today_edit), color = Color.White, style = GlowType.cardTitle) + Text( + stringResource(R.string.glow_today_edit_note), color = Color.White.copy(alpha = 0.62f), + style = GlowType.secondary, + ) + } + Column(Modifier.fillMaxWidth().clearGlass(GlowShapes.Card).padding(start = 18.dp, end = 8.dp, top = 2.dp, bottom = 2.dp)) { + TodayCard.entries.filter { it.editable }.forEachIndexed { i, card -> + val shown = card !in e.hidden + Row( + Modifier.fillMaxWidth().heightIn(min = 52.dp).topLine(i > 0), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + ) { + Text( + card.label, Modifier.weight(1f), style = GlowType.body, + color = if (shown) Color.White else Color.White.copy(alpha = 0.55f), + ) + if (card.pinnable) { + val pinned = card in e.pinned + PinChip(pinned, enabled = e.canPin(card), label = card.label) { e = e.togglePin(card) } + } + EditSwitch(shown, card.label) { e = e.toggleHidden(card) } + } } - GlowSwitch(shown, { e = e.toggleHidden(card) }) } } + // The rows fade out into the foot, as the board's last row does. + Box( + Modifier.align(Alignment.BottomCenter).fillMaxWidth().height(70.dp) + .background(Brush.verticalGradient(listOf(Color.Transparent, SheetFade))), + ) + } + Row( + Modifier.fillMaxWidth().topLine(true, 0.08f).padding(start = 20.dp, end = 20.dp, top = 12.dp) + .navigationBarsPadding().padding(bottom = 12.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + FootButton(stringResource(R.string.glow_cancel), onDismiss, Modifier.weight(1f)) + FootButton(stringResource(R.string.glow_done), { onSave(e) }, Modifier.weight(1f), primary = true) } } - Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { - PageButton(stringResource(R.string.glow_cancel), onDismiss, Modifier.weight(1f)) - PageButton(stringResource(R.string.glow_done), { onSave(e) }, Modifier.weight(1f), primary = true) + } +} + +/** The sheet's fill, for the fade at the foot of the rows (the boards' rgba(22,22,26,.95)). */ +private val SheetFade = Color(0xFF16161A).copy(alpha = 0.95f) + +private val PinIcon: ImageVector by lazy { + ImageVector.Builder("Pin", 14.dp, 14.dp, 24f, 24f).addPath( + addPathNodes("M9 4h6l-1 6 4 3v1H6v-1l4-3zM12 14v6"), stroke = SolidColor(Color.White), strokeLineWidth = 1.8f, + strokeLineCap = StrokeCap.Round, strokeLineJoin = StrokeJoin.Round, + ).build() +} + +private val CheckIcon: ImageVector by lazy { + ImageVector.Builder("Check", 18.dp, 18.dp, 24f, 24f).addPath( + addPathNodes("M5 12.5l4.5 4.5L19 7.5"), stroke = SolidColor(Color.White), strokeLineWidth = 2f, + strokeLineCap = StrokeCap.Round, strokeLineJoin = StrokeJoin.Round, + ).build() +} + +/** A hairline along the top of a row: white at [alpha], the boards' `inset 0 1px 0`. */ +private fun Modifier.topLine(show: Boolean, alpha: Float = 0.07f): Modifier = + if (show) drawBehind { drawLine(Color.White.copy(alpha = alpha), Offset(0f, 0f), Offset(size.width, 0f), 1.dp.toPx()) } else this + +/** + * The Pin chip: white with dark text and a dark pin when pinned, else a 10% white pill with a 14% ring. 30 dp tall + * inside a 44 dp tap target. When it can't take another pin it sits at 55% and does nothing. + */ +@Composable +private fun PinChip(pinned: Boolean, enabled: Boolean, label: String, onClick: () -> Unit) { + val text = stringResource(if (pinned) R.string.glow_today_edit_pinned else R.string.glow_today_edit_pin) + val ink = if (pinned) Color(0xFF0B0B0D) else Color.White + Box( + Modifier.height(44.dp).alpha(if (enabled) 1f else 0.55f) + .clickable(enabled = enabled, role = Role.Checkbox, onClick = onClick) + .semantics { stateDescription = text; contentDescription = "$label, $text" }, + contentAlignment = Alignment.Center, + ) { + Row( + Modifier.height(30.dp) + .let { + if (pinned) it.background(Color.White, GlowShapes.Pill) + else it.clearGlass(GlowShapes.Pill, fill = 0.10f) + } + .padding(horizontal = 12.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp), + ) { + Icon(PinIcon, null, Modifier.size(14.dp), tint = ink) + Text(text, color = ink, style = GlowType.secondary.copy(fontWeight = if (pinned) FontWeight.SemiBold else FontWeight.Normal), maxLines = 1) + } + } +} + +/** The switch as the board draws it: 48 by 29, white with a dark knob when on, a 16% white track with a white knob when off. */ +@Composable +private fun EditSwitch(on: Boolean, label: String, onToggle: () -> Unit) { + val knobX by animateDpAsState(if (on) 22.dp else 3.dp, label = "edit switch knob") + val track by animateColorAsState(if (on) Color.White else Color.White.copy(alpha = 0.16f), label = "edit switch track") + val knob by animateColorAsState(if (on) Color(0xFF0B0B0D) else Color.White, label = "edit switch knob colour") + Box( + Modifier.height(44.dp) + .clickable(role = Role.Switch, onClick = onToggle) + .semantics { contentDescription = label; stateDescription = if (on) "On" else "Off" }, + contentAlignment = Alignment.CenterStart, + ) { + Box(Modifier.size(48.dp, 29.dp).clip(GlowShapes.Pill).background(track)) { + Box(Modifier.offset(x = knobX, y = 3.dp).size(23.dp).background(knob, GlowShapes.Pill)) } } } +/** Cancel (clear glass) or Done (white with a check), 52 dp tall pills. */ +@Composable +private fun FootButton(text: String, onClick: () -> Unit, modifier: Modifier, primary: Boolean = false) { + val ink = if (primary) Color(0xFF0B0B0D) else Color.White + Row( + modifier.height(52.dp) + .let { if (primary) it.background(Color.White, GlowShapes.Pill) else it.clearGlass(GlowShapes.Pill, fill = 0.10f) } + .clip(GlowShapes.Pill) + .clickable(role = Role.Button, onClick = onClick), + horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally), verticalAlignment = Alignment.CenterVertically, + ) { + if (primary) Icon(CheckIcon, null, Modifier.size(18.dp), tint = ink) + Text(text, color = ink, style = GlowType.body.copy(fontWeight = if (primary) FontWeight.SemiBold else FontWeight.Medium), maxLines = 1) + } +} + /** Keeps [TodayEdits] in a saved state bundle as the hidden and the pinned cards' names, pins in their order. */ internal val TodayEditsSaver: Saver = listSaver( save = { e -> listOf(ArrayList(e.hidden.map { it.name }), ArrayList(e.pinned.map { it.name })) }, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/InfoSheet.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/InfoSheet.kt index 62ef3255..3f02dad2 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/InfoSheet.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/InfoSheet.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -37,9 +36,14 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.rememberTextMeasurer import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import org.openstrap.app.R import org.openstrap.app.ui.dashboard.Info +import androidx.compose.foundation.layout.heightIn +import androidx.compose.ui.graphics.Brush import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes /* * The info sheet (spec 6.2): what a number means, the scale it's read on with where you are, and how it's worked out, @@ -61,7 +65,7 @@ fun InfoSheet( PageSheet(onDismiss) { // One block, so the sheet's gap between blocks leaves this one's own spacing alone. Column { - Text(info.name, color = Color.White.copy(alpha = 0.5f), style = GlowType.secondary) + Text(info.name, color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary) Text( info.meaning, color = Color.White, modifier = Modifier.padding(top = 6.dp), style = GlowType.sentence, @@ -73,7 +77,7 @@ fun InfoSheet( modifier = Modifier.padding(top = if (info.scale.isEmpty()) 16.dp else 10.dp), ) Column( - Modifier.padding(top = 24.dp).fillMaxWidth().background(Color(0xFF141416), GlowLayout.CardShape).padding(horizontal = 18.dp), + Modifier.padding(top = 24.dp).fillMaxWidth().background(Color(0xFF141416), GlowShapes.Card).padding(horizontal = 18.dp), ) { val folds = rows ?: listOf( stringResource(R.string.glow_info_how) to info.how, @@ -95,6 +99,10 @@ fun InfoSheet( private fun Scale(labels: List, color: Color, here: Int?, modifier: Modifier = Modifier) { val gap = 6.dp val measurer = rememberTextMeasurer() + // The lit bar runs the metric's blend, first stop to its 4.5:1 tone; the others are the first stop dimmed. + val blend = Blends.forInk(color) + val first = blend?.first ?: color + val lit = Brush.horizontalGradient(listOf(first, blend?.chartSecond ?: color)) BoxWithConstraints(modifier.fillMaxWidth()) { val cell = ((constraints.maxWidth - with(LocalDensity.current) { gap.roundToPx() } * (labels.size - 1)) / labels.size) val style = remember(labels, cell) { fitWords(labels, listOf(GlowType.secondary, GlowType.caption), cell, measurer) } @@ -104,8 +112,11 @@ private fun Scale(labels: List, color: Color, here: Int?, modifier: Modi Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(8.dp)) { Box( Modifier.fillMaxWidth().height(10.dp) - .let { if (on) it.shadow(10.dp, CircleShape, ambientColor = color, spotColor = color) else it } - .background(if (on) color else color.copy(alpha = 0.18f + 0.12f * i / (labels.size - 1).coerceAtLeast(1)), CircleShape), + .let { if (on) it.shadow(10.dp, GlowShapes.Pill, ambientColor = first, spotColor = first) else it } + .let { + if (on) it.background(lit, GlowShapes.Pill) + else it.background(first.copy(alpha = 0.24f + 0.06f * (i - 1).coerceAtLeast(0)), GlowShapes.Pill) + }, ) Text( label, color = if (on) Color.White else Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), @@ -136,10 +147,10 @@ private fun Fold(title: String, text: String, divider: Boolean = true) { val clickLabel = stringResource(if (open) R.string.glow_info_fold else R.string.glow_info_open) Column( Modifier.fillMaxWidth() - .topHairline(divider, RowHairline), + .topHairline(divider, Color.White.copy(alpha = 0.07f)), ) { Row( - Modifier.fillMaxWidth().clickable(onClickLabel = clickLabel) { open = !open }.padding(vertical = 16.dp), + Modifier.fillMaxWidth().heightIn(min = 52.dp).clickable(onClickLabel = clickLabel) { open = !open }, verticalAlignment = Alignment.CenterVertically, ) { Text(title, color = Color.White, style = GlowType.body, modifier = Modifier.weight(1f)) @@ -147,7 +158,7 @@ private fun Fold(title: String, text: String, divider: Boolean = true) { Icon(AppIcons.CaretDown, null, tint = Color.White.copy(alpha = 0.6f), modifier = Modifier.size(16.dp).rotate(turn)) } AnimatedVisibility(open) { - Text(text, color = Color.White.copy(alpha = 0.8f), style = GlowType.secondary, modifier = Modifier.padding(bottom = 16.dp)) + Text(text, color = Color.White.copy(alpha = 0.8f), style = GlowType.secondary.copy(lineHeight = 18.85.sp), modifier = Modifier.padding(bottom = 16.dp)) } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/root/DetailHost.kt b/app/src/main/kotlin/org/openstrap/app/ui/root/DetailHost.kt index 7e2254f6..ab46fcfd 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/root/DetailHost.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/root/DetailHost.kt @@ -13,6 +13,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.produceState import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color +import org.openstrap.app.ui.components.PageLightHost import androidx.lifecycle.compose.collectAsStateWithLifecycle import java.time.Instant import java.time.LocalDate @@ -73,7 +74,8 @@ internal fun DetailHost( val onSwitch: (Detail) -> Unit = { nav.replaceTop(tab, it) } val workouts by workoutsVm.workouts.collectAsStateWithLifecycle() val activity = shown.activity - when (detail) { + // The detail draws its own screen light (PageLight), the plain ground until it sets one. + PageLightHost { when (detail) { // A night signal's detail is always the night's, as its rows read it (SleepCopy.NIGHT_SIGNALS). Blood oxygen's // is the night's only when the Sleep or Recovery tab opened it, so it comes with its own scope. is Detail.OfMetric -> GlowMetricDetailScreen( @@ -131,7 +133,7 @@ internal fun DetailHost( contentPadding = padding, onOpen = push, recovery = shown.recovery, onRestore = dayVm::restoreSleep, ) } - } + } } } /** diff --git a/app/src/main/kotlin/org/openstrap/app/ui/root/PagesOverTab.kt b/app/src/main/kotlin/org/openstrap/app/ui/root/PagesOverTab.kt index 7edb1a07..0da34025 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/root/PagesOverTab.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/root/PagesOverTab.kt @@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect @@ -55,6 +54,8 @@ import org.openstrap.app.ui.components.GrowProgress import org.openstrap.app.ui.components.ListDetail import org.openstrap.app.ui.components.NavRailWidth import org.openstrap.app.ui.components.OledSurfaces +import org.openstrap.app.ui.components.PageLightHost +import org.openstrap.app.ui.theme.Ground import org.openstrap.app.ui.components.PushContent import org.openstrap.app.ui.components.SidePaneWidth import org.openstrap.app.ui.dashboard.StrapView @@ -106,7 +107,7 @@ internal fun PagesOverTab( Modifier.fillMaxSize().padding(start = if (rail) NavRailWidth else 0.dp), progress = pageGrow, ) { closing -> - Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background).hazeSource(navGlass, zIndex = 1f)) { + Box(Modifier.fillMaxSize().background(Ground).hazeSource(navGlass, zIndex = 1f)) { CompositionLocalProvider(LocalNavigationEventDispatcherOwner provides (if (closing || tabBack == null) idleBack else tabBack)) { OledSurfaces { OverPages( @@ -160,14 +161,15 @@ private fun OverPages( val rowOpens: (Page) -> Unit = if (list != null) openBeside else open val selected = list?.getOrNull(1) val back = if (list != null) closeAll else close - when (shown) { + // Each page draws its own screen light (PageLight), the plain ground until it sets one. + PageLightHost { when (shown) { null -> Unit Page.You -> YouPageHost(hooks, profile, padding, rowOpens, selected, onGoals, back) Page.Strap, Page.Alarms, Page.HealthAlerts, Page.PhoneAlerts, Page.Firmware, Page.ZeppAccount -> { StrapPage(shown, hooks, alarmsVm, requestBluetooth, padding, lastSeen, preview, rowOpens, selected, back, open, close) } else -> DataPage(shown, hooks, profile, padding, open, close) - } + } } } BoxWithConstraints(Modifier.fillMaxSize()) { val root = pages.firstOrNull() From 90587c745f60d2f215658a5940235a99be95370b Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:42:12 +0400 Subject: [PATCH 09/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20widget=20blends?= =?UTF-8?q?=20and=20status=20dot,=20white=20bpm=20with=20zone=20dot=20in?= =?UTF-8?q?=20the=20workout=20notification?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../openstrap/app/device/WorkoutNotification.kt | 17 +++++++++++++---- .../org/openstrap/app/widget/RecoveryWidget.kt | 4 ++-- .../org/openstrap/app/widget/SleepWidget.kt | 4 ++-- .../org/openstrap/app/widget/StartWidget.kt | 4 ++-- .../org/openstrap/app/widget/StepsWidget.kt | 4 ++-- .../org/openstrap/app/widget/WidgetParts.kt | 7 +++++-- 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/device/WorkoutNotification.kt b/app/src/main/kotlin/org/openstrap/app/device/WorkoutNotification.kt index c463a7a9..531c00bf 100644 --- a/app/src/main/kotlin/org/openstrap/app/device/WorkoutNotification.kt +++ b/app/src/main/kotlin/org/openstrap/app/device/WorkoutNotification.kt @@ -77,6 +77,14 @@ object WorkoutNotification { } } + private fun zoneText(line: String?, dot: Boolean, accent: Int): CharSequence { + if (line.isNullOrEmpty() || !dot) return line.orEmpty() + return android.text.SpannableStringBuilder("\u25CF ").apply { + setSpan(android.text.style.ForegroundColorSpan(accent), 0, 1, android.text.Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + append(line) + } + } + /** The card for [card] with [actions], opening [open] on a tap. Colorized only counts for a foreground service's. */ fun build(context: Context, card: WorkoutCard, actions: List, open: PendingIntent): NotificationCompat.Builder { val accent = NotificationCopy.accent(card.zone) @@ -90,17 +98,18 @@ object WorkoutNotification { // Empty rather than gone, so it still pushes the bpm to the end. setTextViewText(R.id.kcal, if (card.kcalCollapsed) card.kcal else "") setTextViewText(R.id.bpm, card.bpm) - setTextColor(R.id.bpm, accent) + setTextColor(R.id.bpm, 0xFFFFFFFF.toInt()) } val expanded = RemoteViews(context.packageName, R.layout.notification_workout_expanded).apply { setInt(R.id.card, "setBackgroundResource", background) setChronometer(R.id.time, base, null, card.running) setTextViewText(R.id.kcal, if (card.kcalExpanded) card.kcal else "") setTextViewText(R.id.bpm, card.bpm) - setTextColor(R.id.bpm, accent) + setTextColor(R.id.bpm, 0xFFFFFFFF.toInt()) setTextViewTextSize(R.id.bpm, TypedValue.COMPLEX_UNIT_SP, if (reading) READING_SP else WORD_SP) - setTextViewText(R.id.zone, card.zoneLine.orEmpty()) - setTextColor(R.id.zone, if (card.zoneLine == NotificationCopy.END_QUESTION) 0xFFFFFFFF.toInt() else accent) + // The zone is a small category dot in its flat colour, the words stay white (Notification board). + setTextViewText(R.id.zone, zoneText(card.zoneLine, card.zone != null && card.zoneLine != NotificationCopy.END_QUESTION, accent)) + setTextColor(R.id.zone, 0xFFFFFFFF.toInt()) setTextViewText(R.id.detail, card.detail.orEmpty()) setViewVisibility(R.id.lines, if (card.zoneLine == null && card.detail == null) View.GONE else View.VISIBLE) setImageViewBitmap(R.id.strip, strip(card.zoneSeconds)) diff --git a/app/src/main/kotlin/org/openstrap/app/widget/RecoveryWidget.kt b/app/src/main/kotlin/org/openstrap/app/widget/RecoveryWidget.kt index a8b88aed..680b1ad9 100644 --- a/app/src/main/kotlin/org/openstrap/app/widget/RecoveryWidget.kt +++ b/app/src/main/kotlin/org/openstrap/app/widget/RecoveryWidget.kt @@ -28,7 +28,7 @@ import org.openstrap.app.ui.glow.draw.GlowMood import org.openstrap.app.ui.glow.draw.WeekBarsLook import org.openstrap.app.ui.glow.draw.drawWeekDots import org.openstrap.app.ui.glow.draw.renderToBitmap -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends import java.time.LocalDate /** @@ -71,7 +71,7 @@ class RecoveryWidgetReceiver : PlacedWidgetReceiver() { /* ------------------------------------------------------------------------------------------------ */ /** Recovery's ink. */ -private val Ink = MetricColors.readiness +private val Ink = Blends.Recovery.chart /** * The widget at the size Glance lays out: the edge light behind, drawn at the cell's real size, then the size's diff --git a/app/src/main/kotlin/org/openstrap/app/widget/SleepWidget.kt b/app/src/main/kotlin/org/openstrap/app/widget/SleepWidget.kt index e6162a91..98690bcc 100644 --- a/app/src/main/kotlin/org/openstrap/app/widget/SleepWidget.kt +++ b/app/src/main/kotlin/org/openstrap/app/widget/SleepWidget.kt @@ -38,7 +38,7 @@ import org.openstrap.app.ui.glow.draw.GlowMood import org.openstrap.app.ui.glow.draw.drawStageBar import org.openstrap.app.ui.glow.draw.renderToBitmap import org.openstrap.app.ui.glow.draw.stageColor -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends /** * The Sleep widget (widgets spec 3.2): last night's score, time asleep and stages, as the Sleep tab's hero tells them. @@ -77,7 +77,7 @@ class SleepWidgetReceiver : PlacedWidgetReceiver() { /* ------------------------------------------------------------------------------------------------ */ /** Sleep's ink, as the Sleep tab and Today's Last night card. */ -private val Ink = MetricColors.sleepDeep +private val Ink = Blends.Sleep.chart /** The legend's labels: Caption size and weight, at Secondary's 72% (the mockup's). */ private val LegendStyle = WidgetType.caption.copy(color = ColorProvider(Color.White.copy(alpha = 0.72f))) diff --git a/app/src/main/kotlin/org/openstrap/app/widget/StartWidget.kt b/app/src/main/kotlin/org/openstrap/app/widget/StartWidget.kt index 2640ae8d..5837ac8f 100644 --- a/app/src/main/kotlin/org/openstrap/app/widget/StartWidget.kt +++ b/app/src/main/kotlin/org/openstrap/app/widget/StartWidget.kt @@ -53,7 +53,7 @@ import org.openstrap.app.ui.glow.draw.GlowMood import org.openstrap.app.ui.glow.draw.drawIcon import org.openstrap.app.ui.glow.draw.renderToBitmap import org.openstrap.app.ui.theme.AppIcons -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends import org.openstrap.app.ui.theme.SportIcons import java.time.Instant import java.time.ZoneId @@ -119,7 +119,7 @@ internal fun openLiveWorkout(context: Context): Intent = /* ------------------------------------------------------------------------------------------------ */ /** Heart ink, as Ready's hero: the light toward Start. */ -private val Ink = MetricColors.heart +private val Ink = Blends.Heart.chart /** The still light on the top right corner, where the app's Start card's travelling light is when it starts. */ private val StartCorner = Rim(1f, 0f, reachX = 0.45f, reachY = 0.9f) diff --git a/app/src/main/kotlin/org/openstrap/app/widget/StepsWidget.kt b/app/src/main/kotlin/org/openstrap/app/widget/StepsWidget.kt index 1cbe00b6..0d126f48 100644 --- a/app/src/main/kotlin/org/openstrap/app/widget/StepsWidget.kt +++ b/app/src/main/kotlin/org/openstrap/app/widget/StepsWidget.kt @@ -34,7 +34,7 @@ import org.openstrap.app.ui.glow.draw.drawWeekRings import org.openstrap.app.ui.glow.draw.ChartInk import org.openstrap.app.ui.glow.draw.hourPills import org.openstrap.app.ui.glow.draw.renderToBitmap -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends /** * The Steps widget (widgets spec 3.3): today's steps against the goal, glanceable all day. The Wide adds what's to go @@ -83,7 +83,7 @@ class StepsWidgetReceiver : PlacedWidgetReceiver() { /* ------------------------------------------------------------------------------------------------ */ /** Steps' lime, as Today's Steps card. */ -private val Ink = MetricColors.steps +private val Ink = Blends.Steps.chart /** The goal bar's track (the mockup's): white at 10%. */ private const val TRACK_ALPHA = 0.10f diff --git a/app/src/main/kotlin/org/openstrap/app/widget/WidgetParts.kt b/app/src/main/kotlin/org/openstrap/app/widget/WidgetParts.kt index 0012676d..1a2ea82f 100644 --- a/app/src/main/kotlin/org/openstrap/app/widget/WidgetParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/widget/WidgetParts.kt @@ -444,6 +444,9 @@ internal fun TopRowView(title: String, note: String?, top: TopRow, f: WidgetFram if (line != null) { top.words?.let { Spacer(GlanceModifier.width(StatusButton.TITLE_GAP_DP.dp)) + // Decision 6: an amber dot, the words in white, never amber text. + Image(ImageProvider(dotBitmap(MetricColors.warn, f.density)), contentDescription = null, modifier = GlanceModifier.size(StartLayout.DOT_DP.dp)) + Spacer(GlanceModifier.width(4.dp)) Text(it, style = StatusWords, maxLines = 1) Spacer(GlanceModifier.width(StatusButton.WORDS_GAP_DP.dp)) } @@ -454,8 +457,8 @@ internal fun TopRowView(title: String, note: String?, top: TopRow, f: WidgetFram } } -/** The status words: Secondary in amber, the strap and sync colour (v2 spec: amber is for those only). */ -private val StatusWords = TextStyle(color = ColorProvider(MetricColors.warn), fontSize = StatusButton.WORDS_SP.sp) +/** The status words: Secondary in white, after the amber status dot (decision 6). */ +private val StatusWords = TextStyle(color = ColorProvider(Color.White), fontSize = StatusButton.WORDS_SP.sp) /** * The status button (spec 5): a [StatusButton.SIZE_DP] circle in the Control surface Start's tiles wear, the state's From b800caf3c8a41d4abb9db1a754bf6f5502d969cc Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:43:23 +0400 Subject: [PATCH 10/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20Today=20screen?= =?UTF-8?q?=20light=20per=20moment,=20clear=20glass=20strips=20and=20pills?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../app/ui/dashboard/MomentHeader.kt | 4 +- .../org/openstrap/app/ui/glow/GlowQuiet.kt | 15 +-- .../openstrap/app/ui/glow/GlowTodayScreen.kt | 96 ++++++++++++++----- .../org/openstrap/app/ui/glow/TodayCards.kt | 3 +- 4 files changed, 84 insertions(+), 34 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/dashboard/MomentHeader.kt b/app/src/main/kotlin/org/openstrap/app/ui/dashboard/MomentHeader.kt index bf90f940..ce064087 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/dashboard/MomentHeader.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/dashboard/MomentHeader.kt @@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.size import org.openstrap.app.ui.theme.ControlSurface import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn -import androidx.compose.foundation.shape.CircleShape +import org.openstrap.app.ui.theme.GlowShapes import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -176,7 +176,7 @@ private fun DaySwitcher( ) { Peek(peekDay(date.minusDays(1))) Column( - Modifier.padding(horizontal = 16.dp).widthIn(max = 200.dp).clip(CircleShape) + Modifier.padding(horizontal = 16.dp).widthIn(max = 200.dp).clip(GlowShapes.Pill) .clickable(onClickLabel = stringResource(R.string.day_header_pick_day), onClick = onPick) .padding(horizontal = 10.dp, vertical = 4.dp) .semantics { contentDescription = description }, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowQuiet.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowQuiet.kt index a90cf26d..cf5626da 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowQuiet.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowQuiet.kt @@ -3,6 +3,8 @@ package org.openstrap.app.ui.glow import androidx.compose.ui.graphics.Shape import androidx.compose.foundation.border import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -23,7 +25,7 @@ import org.openstrap.app.ui.components.pressClickable * special. */ -/** A quiet panel: the [ListPanel] surface and its 6% hairline, [GlowLayout.CardPadding] inside, blocks 14 dp apart. */ +/** A quiet panel: clear glass (white 7%, lit top edge), [GlowLayout.CardPadding] inside, blocks 14 dp apart. */ @Composable fun QuietPanel( modifier: Modifier = Modifier, @@ -34,8 +36,7 @@ fun QuietPanel( modifier .fillMaxWidth() .let { if (onClick != null) it.pressClickable(onClick, GlowLayout.CardShape) else it } - .background(ListSurface, GlowLayout.CardShape) - .border(1.dp, CardHairline, GlowLayout.CardShape) + .clearGlass(GlowShapes.Card) .padding(GlowLayout.CardPadding), verticalArrangement = Arrangement.spacedBy(14.dp), content = content, @@ -55,8 +56,8 @@ internal fun OutlineCard( content: @Composable ColumnScope.() -> Unit, ) { Column( - modifier.fillMaxWidth().clip(GlowLayout.CardShape) - .border(1.5.dp, Color.White.copy(alpha = 0.2f), GlowLayout.CardShape).padding(20.dp), + modifier.fillMaxWidth().clip(GlowShapes.Card) + .border(1.5.dp, Color.White.copy(alpha = 0.2f), GlowShapes.Card).padding(20.dp), verticalArrangement = verticalArrangement, horizontalAlignment = horizontalAlignment, content = content, @@ -69,8 +70,8 @@ internal fun OutlineCard( * presses like the rest of the glow controls. */ fun Modifier.glass(shape: Shape, onClick: (() -> Unit)? = null, scale: Float = 0.98f): Modifier = - background(Color.White.copy(alpha = 0.08f), shape) - .border(1.dp, Color.White.copy(alpha = 0.12f), shape) + background(Color.White.copy(alpha = 0.12f), shape) + .border(1.dp, Color.White.copy(alpha = 0.08f), shape) .let { if (onClick != null) it.pressClickable(onClick, shape, scale) else it } /** A change for the better, or a GPS fix good enough: the app's good green. */ diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowTodayScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowTodayScreen.kt index 2ae656af..951c40fb 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowTodayScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowTodayScreen.kt @@ -90,6 +90,12 @@ import org.openstrap.app.presentation.wakingLead import org.openstrap.app.ui.dashboard.todayCards import org.openstrap.app.ui.theme.AppIcons import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.LocalScreenLight +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass import androidx.compose.runtime.rememberUpdatedState import androidx.compose.runtime.DisposableEffect import androidx.compose.ui.layout.onGloballyPositioned @@ -262,7 +268,9 @@ fun GlowTodayScreen( val across = GlowLayout.smallsAcross(maxWidth) val slots = varyLooks(applyEdits(todayCards(moment, facts, morning), edits, moment, unavailable), looksFor, live, wide, across) val panes = todayPanes(slots, across) - GlowScreenList(contentPadding, list) { + val light = todayLight(heroKindOf(ctx, pairing, running), ctx, running) + CompositionLocalProvider(LocalScreenLight provides light) { + GlowScreenList(contentPadding, list, light = light) { add(Pane.Full, GlowBlocks.HEADER) { header() } if (waiting) return@GlowScreenList // One block per grid row: a Small pair stays side by side, and on a wide screen in one column. Each is @@ -301,6 +309,7 @@ fun GlowTodayScreen( add(panes[row.items().first()], GlowBlocks.cardsKey(row.items().map { slots[it].card }), block) } } + } } } } @@ -412,24 +421,7 @@ private fun Hero( // every hero's content, so none shows an empty band. val m = Modifier.fillMaxWidth().gridSize(CardSize.Wide) // The hero's content crossfades when the moment moves on (spec 3.5); the rows below change only with it. - val kind = when { - pairing != null -> HeroKind.Pair - ctx.stuck -> HeroKind.Stuck - else -> when (ctx.moment) { - Moment.During -> if (running != null) HeroKind.During else HeroKind.Midday - Moment.After -> if (ctx.lastWorkout != null) HeroKind.After else HeroKind.Midday - Moment.WorkoutWindow -> HeroKind.Window - Moment.Midday -> HeroKind.Midday - Moment.Evening, Moment.Night -> HeroKind.Evening - Moment.Waking -> HeroKind.Waking - null -> if (LocalTime.now().hour < 12 || !ctx.isToday) HeroKind.Waking else HeroKind.Midday - } - }.let { - // No sleep last night: nothing for Recovery to score, so Charge leads from waking on (spec 4.3). Only once - // the day has loaded, or every cold start would flash the no-sleep hero first. - if (it == HeroKind.Waking && ctx.state.loaded && ctx.recoveryFailure == null && wakingLead(ctx.firstNights, ctx.state.asleepSeconds, ctx.isToday) == WakingLead.Charge) HeroKind.NoSleep - else it - } + val kind = heroKindOf(ctx, pairing, running) // The During hero keeps drawing while it fades out after the workout ends, when [running] is already gone. Kept // once each composition is applied, not written during it (audit K6). Only the fading hero reads it. val lastRunning = remember { androidx.compose.runtime.mutableStateOf(running) } @@ -451,6 +443,61 @@ private fun Hero( private enum class HeroKind { Pair, Stuck, Waking, NoSleep, Midday, Window, After, Evening, During } +/** Which hero Today shows: the pairing stage, a stuck sync, or the moment's. */ +private fun heroKindOf(ctx: TodayContext, pairing: PairStep?, running: org.openstrap.app.device.WorkoutState.Recording?): HeroKind = when { + pairing != null -> HeroKind.Pair + ctx.stuck -> HeroKind.Stuck + else -> when (ctx.moment) { + Moment.During -> if (running != null) HeroKind.During else HeroKind.Midday + Moment.After -> if (ctx.lastWorkout != null) HeroKind.After else HeroKind.Midday + Moment.WorkoutWindow -> HeroKind.Window + Moment.Midday -> HeroKind.Midday + Moment.Evening, Moment.Night -> HeroKind.Evening + Moment.Waking -> HeroKind.Waking + null -> if (LocalTime.now().hour < 12 || !ctx.isToday) HeroKind.Waking else HeroKind.Midday + } +}.let { + // No sleep last night: nothing for Recovery to score, so Charge leads from waking on (spec 4.3). Only once + // the day has loaded, or every cold start would flash the no-sleep hero first. + if (it == HeroKind.Waking && ctx.state.loaded && ctx.recoveryFailure == null && wakingLead(ctx.firstNights, ctx.state.asleepSeconds, ctx.isToday) == WakingLead.Charge) HeroKind.NoSleep + else it +} + +/** + * The screen's light for the hero shown (Matrix board, Today by moment): the hero's blend from where its light comes + * from, at the mood's strength. None while the pairing stage or a stuck sync leads, or before the day has loaded. + * A past day is always the waking light, as its layout is. + */ +private fun todayLight(kind: HeroKind, ctx: TodayContext, running: org.openstrap.app.device.WorkoutState.Recording?): ScreenLight? { + if (!ctx.state.loaded) return null + // The hero's centre is about this far down the screen: status bar, the 60 dp header, then half a hero. + val y = 190f + return when (kind) { + HeroKind.Pair, HeroKind.Stuck -> null + HeroKind.Waking -> ScreenLight(Blends.Recovery, LightAngle.LowerLeft, ScreenLight.DAY, y) + HeroKind.Midday, HeroKind.NoSleep -> ScreenLight(Blends.Energy, LightAngle.Below, ScreenLight.DAY, y) + HeroKind.Window -> ScreenLight(Blends.Heart, LightAngle.UpperRight, ScreenLight.DAY, y) + HeroKind.During -> ScreenLight(running?.let { familyBlend(it.workout.sportType) } ?: Blends.Heart, LightAngle.Below, ScreenLight.DAY, y) + // Recovery's first stop settling into HRV's ocean. + HeroKind.After -> ScreenLight(AfterBlend, LightAngle.Below, ScreenLight.DAY, y) + HeroKind.Evening -> + if (ctx.moment == Moment.Night) ScreenLight(Blends.Sleep, LightAngle.Below, ScreenLight.NIGHT, y) + else ScreenLight(Blends.Evening, LightAngle.LowerRight, ScreenLight.EVENING, y) + } +} + +private val AfterBlend = Blend(Blends.Recovery.first, Blends.Hrv.second) + +/** The workout family's blend, which lights the screen during a workout (Palette board; zones never light a screen). */ +private fun familyBlend(sportType: Int): Blend = when (Workouts.family(sportType)) { + Workouts.Family.Distance -> Blends.Steps + Workouts.Family.IndoorCardio -> Blends.IndoorCardio + Workouts.Family.Strength -> Blends.Strength + Workouts.Family.Intervals -> Blends.Intervals + Workouts.Family.MindBody -> Blends.Evening + Workouts.Family.Games -> Blends.Games +} + /** * Waking up: how you slept and what Recovery says, the score in dots with its word, and Charge at waking as text * beside it (one dotted number a card, spec 2.3). Recovery's one teal, lit from the lower left (spec 4.2). Without @@ -637,7 +684,7 @@ private fun EveningHero(ctx: TodayContext, lightAngle: Float?, bedtime: LocalTim val goals = LocalGoals.current val sports = ctx.dayWorkouts.map { it.workout.sportType } val night = ctx.moment == Moment.Night - val style = heroStyle(if (night) MetricColors.sleepDeep else MetricColors.evening, lightAngle) + val style = heroStyle(if (night) Blends.Sleep.first else Blends.Evening.first, lightAngle) // The evening's violet is lit lighter so it reads as violet, not as a second night (spec 4.2). GlowCard(if (night) style else style.copy(bodyLightness = EVENING_BODY), modifier, onClick = onOpen) { Column { @@ -692,10 +739,11 @@ private fun DuringHero(r: org.openstrap.app.device.WorkoutState.Recording, onOpe LiveHero(glance, r.workout.sportType, glance.clock, onOpen, hooks.onAction, modifier) glance.split?.let { (title, line) -> Row( - Modifier.fillMaxWidth().clip(GlowLayout.CardShape).background(ListSurface).padding(horizontal = 18.dp, vertical = 14.dp), + Modifier.fillMaxWidth().clearGlass(GlowShapes.Card).padding(horizontal = 18.dp, vertical = 14.dp), verticalAlignment = Alignment.CenterVertically, ) { - Canvas(Modifier.size(8.dp)) { drawCircle(TrendGood) } + // A plain white dot: green stays for the strap's status, and zones are drawn small in the hero only. + Canvas(Modifier.size(8.dp)) { drawCircle(Color.White) } Spacer(Modifier.width(12.dp)) Column { Text(title, color = Color.White, style = GlowType.body) @@ -715,7 +763,7 @@ private fun DuringHero(r: org.openstrap.app.device.WorkoutState.Recording, onOpe private fun PairHero(step: PairStep, onPair: () -> Unit, modifier: Modifier) { val haptics = rememberHaptics() LaunchedEffect(step) { if (step == PairStep.Connected) haptics.perform(HapticEvent.PairingDone) } - GlowCard(heroStyle(Color(0xFF4E8F86), LightAngle.Below), modifier, onClick = onPair) { + GlowCard(heroStyle(Blends.Strap.first, LightAngle.Below), modifier, onClick = onPair) { Column { GlowHeader(stringResource(R.string.glow_today_pair_title)) HeroSentence(pairSentence(step)) @@ -737,7 +785,7 @@ private fun PairHero(step: PairStep, onPair: () -> Unit, modifier: Modifier) { private fun StuckHero(ctx: TodayContext, strap: TodayStrap, onSyncNow: () -> Unit, modifier: Modifier) { val haptics = rememberHaptics() val copy = stuckCopy(ctx.state.asleepSeconds != null, ctx.newest?.let { TimeOfDay.format(it, ctx.zone) }) - GlowCard(heroStyle(MetricColors.warn, LightAngle.Below), modifier) { + GlowCard(heroStyle(Blends.Strap.first, LightAngle.Below), modifier) { Column { GlowHeader(copy.title, trailing = lastTried(strap.record, ctx.zone)) HeroSentence(copy.sentence) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/TodayCards.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/TodayCards.kt index be46a394..f6e5367e 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/TodayCards.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/TodayCards.kt @@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape +import org.openstrap.app.ui.theme.GlowShapes import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -934,7 +935,7 @@ internal fun BodyList( internal fun EditTodayButton(onClick: () -> Unit, modifier: Modifier = Modifier) { Box(modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { Row( - Modifier.glass(CircleShape, onClick, scale = 0.97f).padding(horizontal = 16.dp, vertical = 10.dp), + Modifier.glass(GlowShapes.Pill, onClick, scale = 0.97f).padding(horizontal = 16.dp, vertical = 10.dp), verticalAlignment = Alignment.CenterVertically, ) { Icon(AppIcons.SlidersHorizontal, null, tint = Color.White, modifier = Modifier.size(14.dp)) From f31b5e7af5ebdf4b2029a6ab4a36002248224512 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:47:48 +0400 Subject: [PATCH 11/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20tab=20and=20deta?= =?UTF-8?q?il=20lights,=20detail=20hero,=20contributor=20blends,=20sleep?= =?UTF-8?q?=20marks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../openstrap/app/ui/glow/ActivityDetail.kt | 3 + .../app/ui/glow/GlowActivityScreen.kt | 18 +++-- .../app/ui/glow/GlowHealthspanScreen.kt | 7 ++ .../openstrap/app/ui/glow/GlowMetricDetail.kt | 67 +++++++++++++---- .../app/ui/glow/GlowRecoveryScreen.kt | 71 +++++++++++++------ .../openstrap/app/ui/glow/GlowSleepScreen.kt | 20 ++++-- .../org/openstrap/app/ui/glow/ScoreDetail.kt | 16 +++-- .../org/openstrap/app/ui/glow/SleepDetail.kt | 3 +- 8 files changed, 152 insertions(+), 53 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ActivityDetail.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ActivityDetail.kt index 409cd4d7..2cadb2bc 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ActivityDetail.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ActivityDetail.kt @@ -20,6 +20,8 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf @@ -1023,6 +1025,7 @@ internal fun WeekDetail(ctx: ActivityDetailContext) { contentPadding = ctx.contentPadding, headline = headline, strip = emptyList(), onDay = {}, ranges = listOf(Range.Week), range = Range.Week, onRange = {}, scrubbed = { scrub }, + blend = remember { Blend(Blends.Strap.first, Blends.Steps.first) }, ) { val values = days.map { (it.steps ?: 0).toFloat() } if (values.any { it > 0f }) item { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt index 04e9fed0..ff762f74 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt @@ -23,7 +23,10 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.shape.CircleShape +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.glow.draw.LightAngle import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -182,7 +185,10 @@ fun GlowActivityScreen( if (partialInfo && wear != null) PartialDaySheet(wear, isToday, onDismiss = { partialInfo = false }) androidx.compose.foundation.layout.Box(modifier) { CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }) { - GlowScreenList(contentPadding, list) { + // Steps' blend from the upper right (Matrix board, Activity tab), day strength. + GlowScreenList( + contentPadding, list, light = ScreenLight(Blends.Steps, LightAngle.UpperRight, ScreenLight.DAY, 240f), + ) { add(Pane.Full, GlowBlocks.HEADER) { header() } tabCards(slots) { card, m -> when (card) { @@ -628,10 +634,10 @@ internal fun WorkoutDayHeader(text: String) { ) } -/** The effort light's tile, as the mock draws it: 38 dp, 12 dp corners, a shade above the panel. */ -private val EffortTile = 38.dp -private val EffortShape = RoundedCornerShape(12.dp) -private val EffortSurface = Color(0xFF151517) +/** The effort light's tile, as the boards draw a row icon: a 36 dp circle on a faint white fill. */ +private val EffortTile = 36.dp +private val EffortShape = CircleShape +private val EffortSurface = Color.White.copy(alpha = 0.07f) private val EffortGap = 12.dp /** diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowHealthspanScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowHealthspanScreen.kt index 8b1248f7..4929190e 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowHealthspanScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowHealthspanScreen.kt @@ -53,6 +53,13 @@ private fun updatedText(asOf: Long): String { fun GlowHealthspanScreen(state: Healthspan.Outcome?, contentPadding: PaddingValues, onBack: () -> Unit) { BackHandler(onBack = onBack) val r = state?.result + // Habit Age's blend from the top, as the metric details are (DetailHabitAge board). + org.openstrap.app.ui.components.PageLight( + org.openstrap.app.ui.theme.ScreenLight( + org.openstrap.app.ui.theme.Blends.HabitAge, org.openstrap.app.ui.glow.draw.LightAngle.Above, + org.openstrap.app.ui.theme.ScreenLight.DAY, 150f, + ), + ) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader( stringResource(R.string.glow_healthspan_title), onBack, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowMetricDetail.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowMetricDetail.kt index 081d9372..ce9af565 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowMetricDetail.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowMetricDetail.kt @@ -40,10 +40,16 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.Ground +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.components.PageLight +import org.openstrap.app.ui.glow.draw.LightAngle import androidx.compose.runtime.CompositionLocalProvider import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.compose.runtime.getValue @@ -64,6 +70,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Shadow import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.graphics.drawOutline +import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.layout.layout import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -166,17 +174,22 @@ internal fun DetailTemplate( heroPicture: (@Composable () -> Unit)? = null, scrubbed: () -> DetailHeadline? = { null }, headlineDay: LocalDate? = strip.firstOrNull { it.selected }?.date, + /** The page's blend when [color] isn't one of a metric's (the week's neutral into Steps' lime). */ + blend: Blend? = null, body: LazyListScope.() -> Unit, ) { BackHandler(onBack = onBack) val list = rememberLazyListState() + // The page's light (Matrix board): the metric's own blend from the top, dimmer for the sleep details. + val blend = blend ?: remember(color) { Blends.forInk(color) ?: Blends.Strap } + PageLight(ScreenLight(blend, LightAngle.Above, if (blend == Blends.Sleep) SLEEP_DETAIL_STRENGTH else ScreenLight.DAY, 190f)) var switching by rememberSaveable { mutableStateOf(false) } val gutter = GlowLayout.WideGutter // Rows inside a detail open the next one with a crossfade, not by growing (spec 3.5). CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }, LocalCardsGrow provides false) { ScreenList(contentPadding, list, gutter = gutter) { item { - DetailHero(color, gutter) { + DetailHero(blend, ring = heroValue == null, gutter) { // A scrub is read here, so only the hero follows the finger, not the whole detail (audit K4). val scrub = scrubbed() val shown = scrub ?: headline @@ -352,10 +365,22 @@ private class PlainNumber(val number: Float, decimals: Int, grouped: Boolean) { } } -/** The hero's tint: the metric's colour at the top fading to black, rounded at the foot, as wide as the screen. */ +/** Sleep's details sit in a little less light than the others (DetailSleep board, 0.55 against 0.6). */ +private const val SLEEP_DETAIL_STRENGTH = 0.9f + +/** The corners of the hero's foot: 32 dp, only at the bottom, as a squircle. */ +private val HeroShape = sv.lib.squircleshape.SquircleShape( + topStart = 0.dp, topEnd = 0.dp, bottomStart = 32.dp, bottomEnd = 32.dp, smoothing = GlowShapes.SMOOTHING, +) + +/** + * The hero's surface (DetailRecovery and DetailMetric boards): the blend's first stop as a soft glow from the top + * centre over a deep tint of it fading toward the ground, a squircle foot, a hairline along it and, when [ring], the + * blend as a 2 dp edge that fades out down the sides. As wide as the screen. + */ @Composable -private fun DetailHero(color: Color, gutter: Dp, content: @Composable () -> Unit) { - val shape = RoundedCornerShape(bottomStart = GlowLayout.CardCorner, bottomEnd = GlowLayout.CardCorner) +private fun DetailHero(blend: Blend, ring: Boolean, gutter: Dp, content: @Composable () -> Unit) { + val shape = HeroShape Column( Modifier // Out to the screen's edges, past the list's gutter. @@ -369,13 +394,29 @@ private fun DetailHero(color: Color, gutter: Dp, content: @Composable () -> Unit .detailSurface(hero = true, shape) .clip(shape) .drawBehind { - drawRect(Brush.verticalGradient(listOf(lerp(Color.Black, color, 0.2f), Color.Black))) - drawRect(Brush.radialGradient(listOf(color.copy(alpha = 0.4f), Color.Transparent), Offset(size.width / 2, -size.height * 0.1f), size.width * 0.7f)) - // The hairline along the foot; its top is above the clip, so only the foot and its corners show. - val r = GlowLayout.CardCorner.toPx() - drawRoundRect( - Color.White.copy(alpha = 0.07f), Offset(0.5f, -r), Size(size.width - 1f, size.height + r - 0.5f), CornerRadius(r), - style = Stroke(1.dp.toPx()), + val tint = lerp(Color.Black, blend.first, 0.21f) + drawRect(Brush.verticalGradient(listOf(tint.copy(alpha = 0.9f), Ground.copy(alpha = 0.35f)))) + drawRect( + Brush.radialGradient( + listOf(blend.first.copy(alpha = 0.45f), blend.second.copy(alpha = 0.12f), Color.Transparent), + Offset(size.width / 2, -size.height * 0.12f), size.width * 0.75f, + ), + ) + // The hairline along the foot. + val up = 40.dp.toPx() + translate(top = -up) { + drawOutline( + shape.createOutline(Size(size.width, size.height + up), layoutDirection, this), + Color.White.copy(alpha = 0.07f), style = Stroke(2.dp.toPx()), + ) + } + if (ring) drawOutline( + shape.createOutline(size, layoutDirection, this), + Brush.linearGradient( + 0f to blend.first, 0.3f to blend.second, 0.62f to blend.second.copy(alpha = 0f), + start = Offset(size.width, 0f), end = Offset(0f, size.height), + ), + style = Stroke(4.dp.toPx()), ) } .padding(start = gutter, end = gutter, top = 4.dp, bottom = 22.dp), @@ -416,7 +457,7 @@ private fun WeekStrip(days: List, color: Color, onDay: (Loc val ink by animateColorAsState(if (d.selected) Color.White else Color.White.copy(alpha = 0.5f), quick, label = "day ink") val dot by animateColorAsState(if (d.hasData) color else Color.Transparent, quick, label = "day dot") Column( - Modifier.width(40.dp).clip(RoundedCornerShape(14.dp)) + Modifier.width(40.dp).clip(GlowShapes.Icon) .background(pill) .clickable(onClickLabel = show, role = Role.Button) { onDay(d.date) } .padding(vertical = 8.dp), diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt index 0ca206ed..8f3532a4 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt @@ -7,7 +7,11 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.RoundedCornerShape +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.glow.draw.LightAngle import androidx.compose.ui.Alignment import androidx.compose.ui.text.style.TextOverflow import kotlin.math.roundToInt @@ -130,7 +134,11 @@ fun GlowRecoveryScreen( val partial = partialTag.takeIf { wear?.partial == true } val isToday = state.date == java.time.LocalDate.now() CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }) { - GlowScreenList(contentPadding, list, focus = showCharge, onFocused = onChargeShown) { + // Light all round the number (Matrix board): the Recovery blend, day strength, centred on the hero. + GlowScreenList( + contentPadding, list, focus = showCharge, onFocused = onChargeShown, + light = ScreenLight(Blends.Recovery, LightAngle.Above, ScreenLight.DAY, 190f), + ) { add(Pane.Full, GlowBlocks.HEADER) { header() } tabCards(slots, focus = RecoveryCard.Charge) { card, m -> when (card) { @@ -289,7 +297,7 @@ private fun DriversList(ready: Recovery.Readiness?, onAll: () -> Unit) { top.forEachIndexed { i, c -> DriverRow( TabCopy.factorName(c.factor), TabCopy.contributorWord(c.score), c.score / 100f, - offTag(OffWords.Usual, contributorOffStatus(c.score)), divider = i > 0, onClick = onAll, + offTag(OffWords.Usual, contributorOffStatus(c.score)), divider = i > 0, blend = factorBlend(c.factor), onClick = onAll, ) } } @@ -302,35 +310,52 @@ internal fun contributorOffStatus(score: Int): OffStatus = when { else -> OffStatus.Below } +/** The blend a Recovery contributor is drawn in: its metric's own (DetailRecovery board). */ +internal fun factorBlend(f: Recovery.Factor): Blend = when (f) { + Recovery.Factor.HrvBalance -> Blends.Hrv + Recovery.Factor.RestingHr -> Blends.Heart + Recovery.Factor.Sleep, Recovery.Factor.SleepBalance -> Blends.Sleep + Recovery.Factor.Temperature -> Blends.Temperature + Recovery.Factor.Breathing -> Blends.Breathing + Recovery.Factor.PreviousDayLoad -> Blends.Load + Recovery.Factor.BloodOxygen -> Blends.Spo2 + Recovery.Factor.RecoveryIndex -> Blends.Recovery +} + /** - * A contributor bar (chart kit): the [name] on its own line, then a white bar filled to [fraction] (0..1) with the - * [word] after it, or the off [tag] in the word's place. [onClick] opens the Recovery detail, with the row's caret. + * A contributor row (DetailRecovery board): the [name] with its [word] or off [tag] and caret at the right, then an 8 dp + * bar filled to [fraction] (0..1) in the metric's [blend] along its length, then the [detail] line when there is one. + * [onClick] opens the Recovery detail, with the row's caret. */ @Composable -private fun DriverRow(name: String, word: String, fraction: Float, tag: NewsTag?, divider: Boolean, onClick: () -> Unit) { - val opening = org.openstrap.app.ui.components.cardOpening(onClick) - androidx.compose.foundation.layout.Row( +internal fun DriverRow( + name: String, word: String, fraction: Float, tag: NewsTag?, divider: Boolean, blend: Blend, detail: String? = null, + onClick: (() -> Unit)? = null, +) { + val opening = onClick?.let { org.openstrap.app.ui.components.cardOpening(it) } + Column( Modifier.fillMaxWidth() .then(opening?.modifier ?: Modifier) - .clickable(onClick = opening?.onClick ?: onClick) + .let { if (onClick != null) it.clickable(onClick = opening?.onClick ?: onClick) else it } .topHairline(divider, RowHairline) .padding(vertical = GlowLayout.RowPadding), - verticalAlignment = Alignment.CenterVertically, + verticalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(8.dp), ) { - Column(Modifier.weight(1f)) { - Text(name, color = Color.White, style = GlowType.body, maxLines = 1, overflow = TextOverflow.Ellipsis) - androidx.compose.foundation.layout.Row(Modifier.fillMaxWidth().padding(top = 8.dp), verticalAlignment = Alignment.CenterVertically) { - val shape = RoundedCornerShape(3.dp) - Box(Modifier.weight(1f).height(6.dp).background(Color.White.copy(alpha = 0.07f), shape)) { - Box(Modifier.fillMaxWidth(fraction.coerceIn(0f, 1f)).height(6.dp).background(Color.White.copy(alpha = 0.7f), shape)) - } - Spacer(Modifier.width(12.dp)) - if (tag != null) NewsPill(tag) - else Text(word, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, maxLines = 1) + androidx.compose.foundation.layout.Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(name, Modifier.weight(1f), color = Color.White, style = GlowType.body, maxLines = 1, overflow = TextOverflow.Ellipsis) + Spacer(Modifier.width(12.dp)) + if (tag != null) NewsPill(tag) + else Text(word, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, maxLines = 1) + if (onClick != null) { + Spacer(Modifier.width(6.dp)) + TapCaret(ROW_CARET_ALPHA) } } - Spacer(Modifier.width(RowCaretGap)) - TapCaret(ROW_CARET_ALPHA) + val shape = GlowShapes.Small + Box(Modifier.fillMaxWidth().height(8.dp).background(Color.White.copy(alpha = 0.08f), shape)) { + Box(Modifier.fillMaxWidth(fraction.coerceIn(0f, 1f)).height(8.dp).background(blend.chartBrush(), shape)) + } + if (detail != null) Text(detail, color = Color.White.copy(alpha = 0.7f), style = GlowType.secondary, maxLines = 2) } } @@ -347,7 +372,7 @@ private fun ChargeTall( // Before the first night the number would only be the simulation's starting guess: a dash until then. val now = c?.takeIf { it.anchored }?.latest?.let(::chargeShown) val atWake = c?.atWake?.toInt() - GlowCard(GlowStyle.Ember.copy(lightLevel = (now ?: 0) / 100f, second = true), modifier, onClick = onOpen) { + GlowCard(GlowStyle.Ember.copy(lightLevel = (now ?: 0) / 100f), modifier, onClick = onOpen) { Column(Modifier.fillMaxHeight()) { GlowHeader(stringResource(R.string.glow_recovery_energy), tag = tag) Spacer(Modifier.weight(1f)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowSleepScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowSleepScreen.kt index dddde6ab..fc7f4628 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowSleepScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowSleepScreen.kt @@ -7,7 +7,10 @@ import org.openstrap.app.presentation.dotFormat import org.openstrap.app.presentation.Ranges import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.clickable -import androidx.compose.foundation.shape.RoundedCornerShape +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.glow.draw.LightAngle import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row @@ -110,7 +113,10 @@ fun GlowSleepScreen( var breathingInfo by rememberSaveable { mutableStateOf(false) } // The Sleep tab is always at night (spec 2.6): calm glow, light from below only. CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }, LocalGlowMood provides GlowMood.Night) { - GlowScreenList(contentPadding, list) { + // Always night, light from below (Matrix board): Sleep's blend at 65%, the top stays dark. + GlowScreenList( + contentPadding, list, light = ScreenLight(Blends.Sleep, LightAngle.Below, ScreenLight.NIGHT, 190f), + ) { full { header() } // With naps and a breathing summary the two are a Small pair; alone, either is a Wide. val pair = (breathing != null || firstNights) && state.naps.isNotEmpty() @@ -204,8 +210,8 @@ private fun NightHero(state: DayUiState, firstNights: Boolean, onRestore: (org.o ) Spacer(Modifier.height(10.dp)) Legend( - totals.map { (stage, seconds) -> TabCopy.stageTotal(stage, seconds) to stageColor(stage) }, - swatch = RoundedCornerShape(2.dp), layout = LegendLayout.Flow, + totals.map { (stage, seconds) -> TabCopy.stageTotal(stage, seconds) to stageMark(stage) }, + swatch = GlowShapes.Small, layout = LegendLayout.Flow, ) } } @@ -252,9 +258,13 @@ internal fun sleepHypnogramStages(spans: List): List { return spans.map { GlowStage((it.start - start).toFloat() / (end - start), (it.end - start).toFloat() / (end - start), rows[it.stage] ?: 0) } } +/** A stage's colour as a small mark (legend dot, hypnogram band): Deep lightened to 3:1 (decision 11). The bars use [stageColor]. */ +internal fun stageMark(stage: Int): Color = + if (stage == org.openstrap.app.data.db.SleepStage.DEEP) Blends.SleepDeepMark else stageColor(stage) + /** Each hypnogram row's stage colour, Awake at the top, Deep at the foot. */ internal val SleepRowColors: List = DayViewModel.SLEEP_STAGE_ROWS.let { rows -> - (0 until rows.size).map { row -> stageColor(rows.entries.first { it.value == row }.key) } + (0 until rows.size).map { row -> stageMark(rows.entries.first { it.value == row }.key) } } /** The vitals while asleep against your previous nights, each opening its metric scoped to the night. */ diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ScoreDetail.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ScoreDetail.kt index b375ad29..f1377ea6 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ScoreDetail.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ScoreDetail.kt @@ -8,6 +8,8 @@ import org.openstrap.app.presentation.RecoveryCopy import org.openstrap.app.presentation.Units import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box +import org.openstrap.app.ui.dashboard.OffWords +import org.openstrap.app.ui.dashboard.offTag import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding @@ -190,7 +192,12 @@ private fun RecoveryDetail( // The arc gauge (chart kit, spec 2.7) holds the day's score, centred, the number inside the half circle. heroValue = (score ?: estimate)?.takeIf { range == Range.Day }?.let { shown -> // One key for every day, so the arc sweeps from the score shown to the next day's instead of cutting. - { ArcGauge(shown / 100f, color, key = Score.Recovery) { DetailScoreNumber(shown, state.date) } } + { + // The number sits clear of the arc's ends (decision 17), a little above the line they stand on. + ArcGauge(shown / 100f, color, key = Score.Recovery) { + Box(Modifier.padding(bottom = 10.dp)) { DetailScoreNumber(shown, state.date) } + } + } }, // The Recovery card's picture under the gauge: the week to this morning as dots through the band of your usual. heroPicture = week.map { it.second?.toFloat() }.takeIf { range == Range.Day && it.any { v -> v != null } }?.let { dots -> @@ -216,9 +223,10 @@ private fun RecoveryDetail( if (all.isNotEmpty()) item { ListPanel(Modifier.padding(top = 8.dp), title = stringResource(R.string.glow_recovery_what_drove)) { all.forEachIndexed { i, c -> - ContributorRow( - TabCopy.factorName(c.factor), MetricColors.readiness, TabCopy.contributorWord(c.score), c.score / 100f, - offNormal = TabCopy.contributorOff(c.score), divider = i > 0, detail = RecoveryCopy.detail(c.detail), + DriverRow( + TabCopy.factorName(c.factor), TabCopy.contributorWord(c.score), c.score / 100f, + offTag(OffWords.Usual, contributorOffStatus(c.score)), divider = i > 0, blend = factorBlend(c.factor), + detail = RecoveryCopy.detail(c.detail), ) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/SleepDetail.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/SleepDetail.kt index 6903c5d2..87420193 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/SleepDetail.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/SleepDetail.kt @@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -402,7 +401,7 @@ private val SnackbarSurface = Color(0xFFF2F2F4) @Composable private fun EditedNote(text: String) { Row( - Modifier.fillMaxWidth().background(ListSurface, RoundedCornerShape(16.dp)).padding(horizontal = 14.dp, vertical = 12.dp), + Modifier.fillMaxWidth().background(ListSurface, org.openstrap.app.ui.theme.GlowShapes.Tile).padding(horizontal = 14.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically, ) { androidx.compose.material3.Icon(AppIcons.PencilEdit, null, Modifier.size(16.dp), tint = Color.White.copy(alpha = 0.7f)) From 4765fe539ed93b3490ff9439d2ea2771dbf621cd Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:49:30 +0400 Subject: [PATCH 12/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20workout=20summar?= =?UTF-8?q?ies,=20share=20cards,=20celebration,=20rewards,=20workout=20det?= =?UTF-8?q?ail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../org/openstrap/app/ui/glow/Celebrations.kt | 45 ++++-- .../app/ui/glow/GlowWorkoutScreen.kt | 29 +++- .../app/ui/glow/GlowWorkoutSummary.kt | 140 ++++++++++++++++-- .../openstrap/app/ui/glow/GoalsAndBests.kt | 81 ++++++++-- .../org/openstrap/app/ui/glow/MedalDrawing.kt | 11 ++ .../org/openstrap/app/ui/glow/ShareCards.kt | 119 ++++++++------- .../org/openstrap/app/ui/glow/ShareScreen.kt | 7 +- .../openstrap/app/ui/glow/SummarySections.kt | 26 ++-- .../org/openstrap/app/ui/glow/Wordmark.kt | 8 +- 9 files changed, 352 insertions(+), 114 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt index a11e52cf..b23f0954 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt @@ -22,7 +22,15 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import org.openstrap.app.data.Rewards import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.Blends import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.theme.screenLight +import androidx.compose.foundation.layout.size +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.drawscope.Stroke import org.openstrap.app.presentation.RewardsCopy import org.openstrap.app.presentation.dotFormat import org.openstrap.app.ui.glow.draw.DotSize @@ -37,8 +45,9 @@ import org.openstrap.app.ui.glow.draw.DotSize internal fun badgeColor(group: Rewards.Group): Color = when (group) { Rewards.Group.Firsts -> MetricColors.steps Rewards.Group.Milestones -> MetricColors.calories - Rewards.Group.Weekly -> MetricColors.good - Rewards.Group.Kinds -> MetricColors.load + Rewards.Group.Weekly -> Blends.Goals.first + // Something new: white glass, no colour of its own (decision 8). + Rewards.Group.Kinds -> Color.White } /** A personal best's colour: the calories' gold. */ @@ -61,8 +70,8 @@ private fun CloseRow(title: String?, onClose: () -> Unit) { fun BestCardScreen(best: Rewards.NewBest, sportName: String, contentPadding: PaddingValues, onContinue: () -> Unit) { BackHandler(onBack = onContinue) val now = System.currentTimeMillis() / 1000 - WorkoutPage( - BestColor, contentPadding, + LightPage( + Modifier.screenLight(ScreenLight(Blends.Calories, 270f, ScreenLight.DAY, 260f)), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) }, ) { CloseRow(stringResource(R.string.glow_celebrate_personal_best), onContinue) @@ -89,21 +98,31 @@ fun BestCardScreen(best: Rewards.NewBest, sportName: String, contentPadding: Pad @Composable fun GoalMomentScreen(count: Int, goal: Int, inARow: Int, weekStarts: List, contentPadding: PaddingValues, onSettings: () -> Unit, onContinue: () -> Unit) { BackHandler(onBack = onContinue) - WorkoutPage( - MetricColors.good, contentPadding, + LightPage( + Modifier.screenLight(ScreenLight(Blends.Goals, 270f, ScreenLight.DAY, 190f)), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) PageTextButton(stringResource(R.string.glow_celebrate_settings), onSettings, Modifier.align(Alignment.CenterHorizontally)) }, ) { CloseRow(null, onContinue) - Spacer(Modifier.height(32.dp)) - DotMatrixText( - dotFormat("%d/%d", count, goal), Modifier.align(Alignment.CenterHorizontally), dot = DotSize.Hero, color = MetricColors.good, - ) + Spacer(Modifier.height(12.dp)) + // The number sits in a glass disc ringed in the Goals blend (board WorkoutCelebration). + Box( + Modifier.align(Alignment.CenterHorizontally).size(220.dp).drawBehind { + val ring = 1.5.dp.toPx() + val brush = Brush.linearGradient(listOf(Blends.Goals.first, Blends.Goals.second), Offset(size.width * 0.2f, 0f), Offset(size.width * 0.8f, size.height)) + drawCircle(Brush.verticalGradient(listOf(org.openstrap.app.ui.theme.DarkGlowFill.copy(alpha = 0.92f), org.openstrap.app.ui.theme.DarkGlowFill.copy(alpha = 0.6f), org.openstrap.app.ui.theme.DarkGlowFill.copy(alpha = 0.2f))), size.minDimension / 2) + drawCircle(brush.let { Brush.linearGradient(listOf(Blends.Goals.first.copy(alpha = 0.18f), Blends.Goals.second.copy(alpha = 0.3f))) }, size.minDimension / 2) + drawCircle(brush, size.minDimension / 2 - ring / 2, style = Stroke(ring)) + }, + contentAlignment = Alignment.Center, + ) { + DotMatrixText(dotFormat("%d/%d", count, goal), dot = DotSize.Hero) + } Text( stringResource(R.string.glow_celebrate_goal_met), color = Color.White, style = GlowType.pageTitle, textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth().padding(top = 12.dp), + modifier = Modifier.fillMaxWidth().padding(top = 20.dp), ) Text(RewardsCopy.momentLine(inARow), color = Color.White, style = GlowType.sentence, textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth()) Spacer(Modifier.height(8.dp)) @@ -150,8 +169,8 @@ fun CelebrationsSheet(goalMoment: Boolean, weeklyRecap: Boolean, onGoalMoment: ( @Composable fun HistoryBadgesScreen(badges: List, contentPadding: PaddingValues, onContinue: () -> Unit, face: (Rewards.Badge) -> String = { it.short }) { BackHandler(onBack = onContinue) - WorkoutPage( - MetricColors.good, contentPadding, + LightPage( + Modifier.screenLight(ScreenLight(Blends.Goals, 270f, ScreenLight.DAY, 190f)), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) }, ) { CloseRow(null, onContinue) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutScreen.kt index f0c17801..20b49476 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutScreen.kt @@ -48,6 +48,12 @@ import org.openstrap.app.ui.dashboard.Score import org.openstrap.app.ui.dashboard.ScreenList import org.openstrap.app.ui.theme.AppIcons import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.components.PageLight +import androidx.compose.ui.graphics.drawOutline +import androidx.compose.ui.graphics.drawscope.translate import org.openstrap.app.ui.workout.EffectFigures import org.openstrap.app.ui.workout.PhoneSummary import org.openstrap.app.ui.workout.ZoneSeconds @@ -108,6 +114,10 @@ fun GlowWorkoutDetailScreen( var info by rememberSaveable { mutableStateOf(false) } val usual = remember(workouts) { Workouts.usualLoad(workouts.map { it.workout.trainingLoad }) } val zones = shown?.zoneSeconds.orEmpty() + // Lit by the kind's blend at a strength by effort (Matrix board), as its summary was; the zones stay small. + PageLight( + shown?.let { ScreenLight(familyBlend(Workouts.family(it.workout.sportType)), 225f, 0.6f + 0.25f * Workouts.effort(it.workout.trainingLoad, usual), 170f) }, + ) CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }) { ScreenList(contentPadding, list, gutter = GlowLayout.Gutter) { item { @@ -129,7 +139,7 @@ fun GlowWorkoutDetailScreen( // The summary's hero with the length in dots: a strap workout has no kind of its own to show. val sentence = WorkoutDetailCopy.sentence(w.sportType, shown.activeSeconds, w.trainingLoad, usual, zones) val hero = SummaryHero(dotClock(shown.activeSeconds), "", sentence = sentence) - SummaryHeroCard(hero, mainZoneColor(zones, MetricColors.heart), Workouts.effort(w.trainingLoad, usual)) + SummaryHeroCard(hero, familyInk(Workouts.family(w.sportType)), Workouts.effort(w.trainingLoad, usual)) } if (shown.heartRate.isNotEmpty() || w.averageHeartRate != null) item { HeartRateCard(shown) } val activeKcal = Workouts.activeKcal(shown, bmrPerMinute) @@ -186,6 +196,8 @@ private fun PastSummary( val family = org.openstrap.app.ui.workout.FamilySummary.familyOf(w.sportType, summary.structure) val weekStarts = remember(workouts) { goalWeekStarts(workouts) } val trim = rememberWorkoutTrim(summary, onTrim, onUndoTrim) + val effort = Workouts.effort(w.trainingLoad, usual) + PageLight(ScreenLight(familyBlend(family), 225f, 0.6f + 0.25f * effort, 170f)) CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }) { ScreenList(contentPadding, list, gutter = GlowLayout.Gutter) { item { @@ -209,7 +221,7 @@ private fun PastSummary( if (h.sentence != null) h else SummaryHero(h.value, h.unit, h.figures, WorkoutDetailCopy.sentence(w.sportType, a.activeSeconds, w.trainingLoad, usual, zones.toList()), h.line) } - SummaryHeroCard(hero, mainZoneColor(zones, familyColor(family)), Workouts.effort(w.trainingLoad, usual)) + SummaryHeroCard(hero, familyInk(family), effort) FamilySection(family, summary, emptyList(), others, weekStarts, heartLine = false) // Always there, even before any heart rate, since it holds Trim. HeartRateCard(a, trim) @@ -418,6 +430,8 @@ fun GlowWorkoutsScreen(workouts: List, contentPadding: PaddingV val usual = remember(workouts) { Workouts.usualLoad(workouts.map { it.workout.trainingLoad }) } val days = remember(workouts) { workouts.groupBy { Instant.ofEpochSecond(it.workout.start).atZone(zone).toLocalDate() }.toList() } val today = LocalDate.now() + // Heart's blend from the upper right, quiet: nothing here is a single workout to light (board DetailAllWorkouts). + PageLight(ScreenLight(Blends.Heart, 45f, 0.7f, 120f)) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader( @@ -468,11 +482,12 @@ private fun ListSegment(first: Boolean, last: Boolean, content: @Composable Colu val top = if (first) 0f else -r val end = if (last) bottom else bottom + r clipRect(top = 0f, bottom = bottom) { - drawRoundRect(ListSurface, Offset(0f, top), Size(size.width, end - top), CornerRadius(r)) - drawRoundRect( - RowHairline, Offset(stroke / 2, top + stroke / 2), Size(size.width - stroke, end - top - stroke), - CornerRadius(r - stroke / 2), style = Stroke(stroke), - ) + // The card's squircle, drawn past the ends that join another stretch. + val outline = GlowShapes.Card.createOutline(Size(size.width, end - top), layoutDirection, this) + translate(top = top) { + drawOutline(outline, ListSurface) + drawOutline(outline, RowHairline, style = Stroke(stroke)) + } } } .padding(horizontal = GlowLayout.CardInset) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt index 2a366c3f..ec0ba639 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt @@ -1,5 +1,27 @@ package org.openstrap.app.ui.glow +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.statusBars +import androidx.compose.foundation.layout.statusBarsPadding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.drawscope.scale +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.platform.LocalDensity +import org.openstrap.app.ui.components.PinnedFade +import org.openstrap.app.ui.components.pinnedFade +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.glow.draw.LightAngle +import org.openstrap.app.ui.glow.draw.heroStyle +import org.openstrap.app.ui.theme.Ground import org.openstrap.app.R import org.openstrap.app.presentation.Units import androidx.compose.ui.res.pluralStringResource @@ -155,10 +177,20 @@ fun GlowWorkoutSummaryScreen( return } val trim = summary?.let { rememberWorkoutTrim(it, onTrim, onUndoTrim) } + // The summary is lit by its family's blend at a size by effort (Matrix board), so both are known before the page. + val family = remember(summary) { summary?.let { FamilySummary.familyOf(it.analysis.workout.sportType, it.structure) } ?: Workouts.Family.Distance } + val effort = remember(summary, workouts) { + if (summary == null) 0f else Workouts.effort( + summary.analysis.workout.trainingLoad, + Workouts.usualLoad(workouts.filter { it.workout.start != summary.analysis.workout.start }.map { it.workout.trainingLoad }), + ) + } + // A personal best swells the light once. + val swell = remember { Animatable(0f) } // Share and Done stay on the bottom edge; Delete waits at the end of the page. Nothing to share until the workout // has loaded. - WorkoutPage( - Color.Transparent, contentPadding, + LightPage( + Modifier.effortLight(familyBlend(family)) { effort + SwellLevel * swell.value }, contentPadding, pinned = { if (a != null && hero != null) SummaryButtons(onShare = { sharing = true }, onDone = done) else WorkoutButton(stringResource(R.string.glow_done), Color.White, Color.Black, onDone) @@ -182,16 +214,15 @@ fun GlowWorkoutSummaryScreen( } if (summary == null || a == null || trim == null) { PageNote(stringResource(R.string.glow_workout_loading)) - return@WorkoutPage + return@LightPage } val w = a.workout val others = remember(workouts, w.start) { workouts.filter { it.workout.start != w.start }.sortedByDescending { it.workout.start } } val usualLoad = remember(others) { Workouts.usualLoad(others.map { it.workout.trainingLoad }) } val earned = rewards?.earned.orEmpty() - // A personal best ticks once and swells the hero's glow once; with animations off, only the tick. + // A personal best ticks once and swells the light once; with animations off, only the tick. val haptics = rememberHaptics() val animationsOn = rememberAnimationsOn() - val swell = remember { Animatable(0f) } var swelled by rememberSaveable(w.start) { mutableStateOf(false) } val anyBest = earned.any { it.kind == EarnedLine.Kind.Best } LaunchedEffect(anyBest) { @@ -203,13 +234,11 @@ fun GlowWorkoutSummaryScreen( swell.animateTo(0f, tween(900)) } } - val family = FamilySummary.familyOf(w.sportType, summary.structure) - val effort = Workouts.effort(w.trainingLoad, usualLoad) val heartZones = LocalHeartZones.current val zones = remember(a, heartZones) { WorkoutRecorder.liveZoneSeconds(a.heartRate.filter { it.timestamp <= a.end }.map { it.timestamp to it.bpm }, a.maxHeartRate, heartZones).toList() } - SummaryHeroCard(hero ?: summaryHero(family, summary, usualLoad), mainZoneColor(zones, familyColor(family)), effort) { swell.value } + SummaryHeroCard(hero ?: summaryHero(family, summary, usualLoad), familyInk(family), effort) { swell.value } // What was done to the times, under the hero that says them. TrimNote(summary, trim.undo, Modifier.padding(horizontal = 4.dp), onCard = false) val weekStarts = remember(workouts) { goalWeekStarts(workouts) } @@ -236,10 +265,10 @@ fun GlowWorkoutSummaryScreen( */ @Composable internal fun SummaryHeroCard(hero: SummaryHero, color: Color, effort: Float, swell: () -> Float = { 0f }) { - // The swell is drawn over the card's own light ([GlowSwell]), so the light at rest stays the cache key and a best's - // swell neither composes the hero again nor renders a new glow each frame. - val lift = remember(effort, swell) { GlowSwell((effort + SwellLevel).coerceAtMost(1f), swell) } - GlowCard(effortGlow(color, effort), Modifier.fillMaxWidth(), swell = lift) { + // Tinted glass of the family's blend, its tint as strong as the effort (Matrix board: an easy hero is 20% where a hard one is + // 42%); the light behind the screen does the size ([effortLight]). The swell is drawn there, not here. + val style = remember(color, effort) { heroStyle(color, LightAngle.Below, rim = 0.5f + 0.5f * effort.coerceIn(0f, 1f)) } + GlowCard(style, Modifier.fillMaxWidth()) { Column { HeroValue(hero.value, hero.unit) hero.sentence?.let { HeroSentence(it) } @@ -466,7 +495,7 @@ internal fun SplitsList(summary: PhoneSummary, liveRoute: List, mar private fun SplitTimeBars(rows: List, fastest: Int?) { val seconds = rows.map { it.seconds } val best = rows.indices.filter { rows[it].kind == SplitRow.Kind.Whole && seconds[it] > 0 }.minOfOrNull { seconds[it] } - val bar = familyColor(Workouts.Family.Distance).copy(alpha = 0.5f) + val bar = Blends.Distance.chart.copy(alpha = 0.5f) rows.forEachIndexed { i, r -> val lit = i == fastest val text = if (lit) Color.White else Color.White.copy(alpha = GlowType.SECONDARY_ALPHA) @@ -494,3 +523,88 @@ internal fun SummaryButtons(onShare: () -> Unit, onDone: () -> Unit) { /** The small pill beside the summary's title, Trim. */ private val TopPillText = GlowType.secondary.copy(fontWeight = FontWeight.SemiBold) + + +/* ------------------------------------------- Family blend and the light ------------------------------------------ */ + +/** + * The blend that lights a workout of [family] (Palette and Workouts boards, decision 14). Local to the summary files until + * the coordinator unifies it with WorkoutStyle: Distance is Steps', Mind and body the Evening's. + */ +internal fun familyBlend(family: Workouts.Family): Blend = when (family) { + Workouts.Family.Distance -> Blends.Distance + Workouts.Family.IndoorCardio -> Blends.IndoorCardio + Workouts.Family.Strength -> Blends.Strength + Workouts.Family.Intervals -> Blends.Intervals + Workouts.Family.MindBody -> Blends.MindAndBody + Workouts.Family.Games -> Blends.Games +} + +/** [familyBlend]'s first stop, for the parts that still take one ink (they find the blend again from it). */ +internal fun familyInk(family: Workouts.Family): Color = familyBlend(family).first + +/** The share of a full light that a workout of no effort keeps (Matrix board, "Workout summary, easy"). */ +private const val LIGHT_EASY_SIZE = 0.45f +private const val LIGHT_HARD_SIZE = 1.25f + +/** + * The summary's light by effort (Matrix board, Workout summary): the family's blend, both stops muted, over the ground. + * An easy walk keeps a small dim light and leaves most of the screen dark, a hard HIIT floods it. [effort] is read + * while drawing, so a personal best's swell never composes again. + */ +internal fun Modifier.effortLight(blend: Blend, effort: () -> Float): Modifier = drawBehind { + drawRect(Ground) + val e = effort().coerceIn(0f, 1f) + val size = LIGHT_EASY_SIZE + (LIGHT_HARD_SIZE - LIGHT_EASY_SIZE) * e + val w = this.size.width + val heroY = 170.dp.toPx() + fun blob(c: Offset, rx: Float, ry: Float, color: Color, alpha: Float) { + val brush = Brush.radialGradient( + 0f to color.copy(alpha = alpha), 0.35f to color.copy(alpha = alpha * 0.9f), 0.6f to color.copy(alpha = alpha * 0.55f), + 0.8f to color.copy(alpha = alpha * 0.2f), 1f to Color.Transparent, center = c, radius = rx, + ) + scale(1f, ry / rx, pivot = c) { drawCircle(brush, rx, c) } + } + val first = 0.6f + 0.25f * e + blob(Offset(w * 0.4f, heroY + 50.dp.toPx()), (w * 0.82f + 120.dp.toPx()) * size, (260.dp.toPx() + 120.dp.toPx()) * size, blend.light, first) + // The second stop only joins once the workout was hard enough to flood. + val second = ((e - 0.25f) / 0.5f).coerceIn(0f, 1f) + if (second > 0f) blob( + Offset(w * 0.78f, heroY + 420.dp.toPx()), (w * 0.51f + 120.dp.toPx()) * size, (190.dp.toPx() + 120.dp.toPx()) * size, + blend.lightSecond, first * 0.9f * second, + ) +} + +/** + * A workout's page: the same layout as [WorkoutPage] (content scrolling under the pinned buttons, on one centred column + * on a wide screen) on a [background] light, which paints the ground too. [WorkoutPage] stays for the live screens. + */ +@Composable +internal fun LightPage( + background: Modifier, contentPadding: PaddingValues, scroll: Boolean = true, + pinned: (@Composable ColumnScope.() -> Unit)? = null, + content: @Composable ColumnScope.() -> Unit, +) { + BoxWithConstraints(Modifier.fillMaxSize().then(background)) { + val density = LocalDensity.current + var pinnedHeight by remember { mutableStateOf(0.dp) } + val side = GlowLayout.pageSide(maxWidth, LocalPageColumn.current, GlowLayout.Gutter) + val padTop = WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + contentPadding.calculateTopPadding() + 8.dp + val padBottom = contentPadding.calculateBottomPadding() + val end = if (pinned != null) (PinnedFade.listClearance(pinnedHeight) - padBottom).coerceAtLeast(16.dp) else 16.dp + Column( + Modifier.fillMaxSize().then(if (scroll) Modifier.imePadding().verticalScroll(rememberScrollState()) else Modifier).statusBarsPadding() + .padding(contentPadding).padding(start = side, end = side, top = 8.dp, bottom = end) + .then(if (scroll) Modifier.heightIn(min = (maxHeight - padTop - padBottom - end).coerceAtLeast(0.dp)) else Modifier), + verticalArrangement = Arrangement.spacedBy(12.dp), + content = content, + ) + if (pinned != null) Column( + Modifier.align(Alignment.BottomCenter).fillMaxWidth().pinnedFade() + .padding(contentPadding).padding(start = side, end = side, bottom = 16.dp) + .onSizeChanged { pinnedHeight = with(density) { it.height.toDp() } }, + verticalArrangement = Arrangement.spacedBy(4.dp), + content = pinned, + ) + } +} diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GoalsAndBests.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GoalsAndBests.kt index eb868fb9..2670a5d8 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GoalsAndBests.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GoalsAndBests.kt @@ -37,7 +37,18 @@ import org.openstrap.app.data.Rewards import org.openstrap.app.i18n.Strings import org.openstrap.app.ui.dashboard.ScreenList import org.openstrap.app.ui.theme.AppIcons -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.DarkGlowFill +import org.openstrap.app.ui.theme.litEdge +import org.openstrap.app.ui.theme.GlowShapes +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.drawscope.scale +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize import org.openstrap.app.presentation.RewardsCopy import org.openstrap.app.presentation.RewardsView import org.openstrap.app.ui.glow.draw.GlowStyle @@ -50,7 +61,7 @@ import org.openstrap.app.ui.glow.draw.level */ /** The goal colour: met weeks, the goal moment. */ -private val GoalColor = MetricColors.good +private val GoalColor = Blends.Goals.first /** The days of [first]'s week, each a letter and whether a workout in [view] counted on it. */ private fun weekDots(view: RewardsView, first: LocalDate, zone: ZoneId = ZoneId.systemDefault()): List> { @@ -61,8 +72,53 @@ private fun weekDots(view: RewardsView, first: LocalDate, zone: ZoneId = ZoneId. } /** - * A week against its goal on a glow lit as far as the count is toward it: the count in dots, "of 4 workouts", its days, - * and [line] under them. [trailing] goes on the title row. + * The Goals blend's page light (boards RewardsGoals, RewardsBadges, RewardsWeeklyRecap, WorkoutCelebration): the second + * stop big at the upper left, the first small at the lower right, both muted, over the ground. [top] and [bottom] are + * the two blobs' strengths. + */ +internal fun Modifier.goalsLight(top: Float = 0.5f, bottom: Float = 0.22f, topY: Float = 200f, bottomY: Float = 680f): Modifier = drawBehind { + drawRect(org.openstrap.app.ui.theme.Ground) + fun blob(c: Offset, rx: Float, ry: Float, color: Color, alpha: Float) { + val brush = Brush.radialGradient( + 0f to color.copy(alpha = alpha), 0.35f to color.copy(alpha = alpha * 0.9f), 0.6f to color.copy(alpha = alpha * 0.55f), + 0.8f to color.copy(alpha = alpha * 0.2f), 1f to Color.Transparent, center = c, radius = rx, + ) + scale(1f, ry / rx, pivot = c) { drawCircle(brush, rx, c) } + } + val w = size.width + blob(Offset(w * 0.3f, topY.dp.toPx()), w * 0.82f + 100.dp.toPx(), 240.dp.toPx() + 100.dp.toPx(), Blends.Goals.lightSecond, top) + blob(Offset(w * 0.8f, bottomY.dp.toPx()), w * 0.5f + 100.dp.toPx(), 170.dp.toPx() + 100.dp.toPx(), Blends.Goals.light, bottom) +} + +/** + * The Goals hero's fill (board RewardsGoals, decision 7): the Goals blend left to right as far as [level] of the goal, + * then a soft fade into the dark just past it (not a hard stop), with three dark pools behind the text. + */ +private fun Modifier.goalsFill(level: Float): Modifier = drawWithCache { + val dark = DarkGlowFill + val l = level.coerceIn(0f, 1f) + val fade = (l * 1.2f).coerceAtMost(1f) + val fill = Brush.horizontalGradient( + 0f to Blends.Goals.first.copy(alpha = 0.78f), (l * 0.96f) to Blends.Goals.second.copy(alpha = 0.62f), + fade to DarkGlowFill.copy(alpha = 0.88f), 1f to DarkGlowFill.copy(alpha = 0.88f), + ) + onDrawBehind { + drawRect(fill) + fun pool(cx: Float, cy: Float, rx: Float, ry: Float, a: Float) { + val c = Offset(size.width * cx, size.height * cy) + val r = size.width * rx + val b = Brush.radialGradient(0f to dark.copy(alpha = a), 0.5f to dark.copy(alpha = a * 0.66f), 1f to Color.Transparent, center = c, radius = r) + scale(1f, size.height * ry / r, pivot = c) { drawCircle(b, r, c) } + } + pool(0.18f, 0.10f, 0.6f, 0.30f, 0.6f) + pool(0.38f, 0.94f, 0.9f, 0.32f, 0.82f) + pool(0.14f, 0.46f, 0.4f, 0.46f, 0.9f) + } +} + +/** + * A week against its goal on a glow filled as far as the count is toward it, fading out softly just past it: the count + * in dots, "of 4 workouts", its days, and [line] under them. [trailing] goes on the title row. */ @Composable private fun GoalWeekCard( @@ -70,8 +126,9 @@ private fun GoalWeekCard( /** The week as a bar of the goal's workouts (board AchievementsV1) rather than its days (WeeklyRecap). */ bar: Boolean = false, trailing: @Composable (() -> Unit)? = null, ) { - val style = GlowStyle.level(GoalColor, (count.toFloat() / goal).coerceIn(0f, 1f)) - GlowCard(style, Modifier.fillMaxWidth()) { + val shape = GlowShapes.Card + val level = (count.toFloat() / goal).coerceIn(0f, 1f) + Box(Modifier.fillMaxWidth().clip(shape).goalsFill(level).litEdge(shape, top = 0.3f, ring = 0.1f).padding(GlowLayout.CardPadding)) { Column { Row(verticalAlignment = Alignment.CenterVertically) { Text(title, color = Color.White, style = GlowType.cardTitle, maxLines = 1, modifier = Modifier.weight(1f)) @@ -175,7 +232,7 @@ fun GoalsAndBestsPage( BackHandler(onBack = onBack) var openBadge by rememberSaveable { mutableStateOf(null) } var openBest by rememberSaveable { mutableStateOf(null) } - ScreenList(contentPadding, gutter = GlowLayout.Gutter) { + Box(Modifier.fillMaxSize().goalsLight()) { ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.glow_goals_title), onBack) } if (view == null) { item { PageNote(stringResource(R.string.glow_goals_loading)) } @@ -192,7 +249,7 @@ fun GoalsAndBestsPage( view.next?.let { next -> item { NextBadgeCard(next, view, onOpen = { openBadge = it.id }) } } item { BadgesPanel(view, onOpen = { openBadge = it.id }, onAllBadges = onAllBadges) } item { WaysOn(onAllBadges, onRecap, onCelebrations) } - } + } } if (view != null) { openBadge?.let(Rewards::badge)?.let { b -> BadgeSheet(b, view, onDismiss = { openBadge = null }) } openBest?.let { kind -> BestSheet(kind, view, onDismiss = { openBest = null }) } @@ -217,7 +274,7 @@ private fun WaysOn(onAllBadges: () -> Unit, onRecap: () -> Unit, onCelebrations: fun AllBadgesPage(view: RewardsView?, contentPadding: PaddingValues, onBack: () -> Unit) { BackHandler(onBack = onBack) var open by rememberSaveable { mutableStateOf(null) } - ScreenList(contentPadding, gutter = GlowLayout.Gutter) { + Box(Modifier.fillMaxSize().goalsLight(top = 0.38f, bottom = 0.2f, topY = 100f, bottomY = 560f)) { ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { val subtitle = view?.let { stringResource(R.string.glow_goals_earned_count, it.earned.size, Rewards.BADGES.size) } PageHeader(stringResource(R.string.glow_goals_all_badges), onBack, subtitle = subtitle) @@ -238,7 +295,7 @@ fun AllBadgesPage(view: RewardsView?, contentPadding: PaddingValues, onBack: () } } } - } + } } if (view != null) open?.let(Rewards::badge)?.let { b -> BadgeSheet(b, view, onDismiss = { open = null }) } } @@ -256,7 +313,7 @@ fun WeeklyRecapPage(view: RewardsView?, first: LocalDate, contentPadding: Paddin return } BackHandler(onBack = onBack) - ScreenList(contentPadding, gutter = GlowLayout.Gutter) { + Box(Modifier.fillMaxSize().goalsLight(top = 0.55f, bottom = 0.3f, topY = 220f, bottomY = 670f)) { ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.glow_goals_your_week), onBack, subtitle = RewardsCopy.weekRange(first)) } if (view == null) return@ScreenList val week = view.week(first) @@ -322,5 +379,5 @@ fun WeeklyRecapPage(view: RewardsView?, first: LocalDate, contentPadding: Paddin ) } } - } + } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/MedalDrawing.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/MedalDrawing.kt index a37d1ddc..57670e12 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/MedalDrawing.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/MedalDrawing.kt @@ -44,6 +44,10 @@ internal enum class MedalShape(val top: Float, val bottom: Float, val content: F Rosette(ROSETTE_TOP, ROSETTE_BOTTOM, ROSETTE_CONTENT), } +/** The white glass medal's fill and ring. */ +private const val GLASS_FILL = 0.13f +private const val GLASS_RING = 0.2f + /** A medal's tones from its ink, by the glow cards' formula: the light at the foot, the body, the core, the picture. */ internal class MedalTones(ink: Color) { private val palette = GlowPalette(GlowStyle(color = ink)) @@ -51,6 +55,9 @@ internal class MedalTones(ink: Color) { val body: Color = palette.mid val core: Color = palette.core val mark: Color = lerp(Color.White, palette.light, MARK_TINT) + + /** White ink is "something new" (decision 8): a white glass medal at 13%, no tint, so nothing competes with the group colours. */ + val glass: Boolean = ink == Color.White } /** The medal on the frame: the laurel or rosette's edge behind, then the face, lit or quiet, and its inner ring. */ @@ -64,6 +71,10 @@ internal fun DrawScope.drawFrame(shape: MedalShape, tones: MedalTones, locked: B if (locked) { drawPath(face, LockedFill) drawPath(face, LockedRim, style = Stroke(RIM_LINE)) + } else if (tones.glass) { + drawPath(face, Color.White.copy(alpha = GLASS_FILL)) + drawPath(face, Color.White.copy(alpha = GLASS_RING), style = Stroke(RIM_LINE)) + return } else { drawLitFace(shape, face, tones, lit.coerceIn(0f, 1f)) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareCards.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareCards.kt index 255b6ba6..8f345701 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareCards.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareCards.kt @@ -3,7 +3,6 @@ package org.openstrap.app.ui.glow import org.openstrap.app.R import org.openstrap.app.i18n.Strings import org.openstrap.app.presentation.DayWords -import org.openstrap.app.ui.glow.draw.EdgeSurface import androidx.compose.ui.graphics.asAndroidPath import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.graphics.nativeCanvas @@ -23,6 +22,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.Ground +import org.openstrap.app.ui.theme.litEdge import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -58,13 +62,10 @@ import org.openstrap.app.data.Strength import org.openstrap.app.data.Structure import org.openstrap.app.data.WorkoutRecorder import org.openstrap.app.data.Workouts -import org.openstrap.app.ui.theme.AppIcons -import org.openstrap.app.ui.theme.MetricColors import org.openstrap.app.presentation.EarnedLine import org.openstrap.app.ui.workout.FamilySummary import org.openstrap.app.ui.workout.PhoneSummary import org.openstrap.app.ui.workout.ZONE_COLORS -import org.openstrap.app.ui.workout.familyColor import org.openstrap.app.ui.glow.draw.DotSize import org.openstrap.app.ui.dashboard.LocalHeartZones @@ -320,28 +321,53 @@ internal object StoryRouteShape { */ @Composable internal fun StoryCardView(card: StoryCard, photo: ImageBitmap?, route: List, modifier: Modifier = Modifier) { - Box(modifier.size(StoryWidth, StoryHeight).background(EdgeSurface)) { + Box(modifier.size(StoryWidth, StoryHeight).background(Ground)) { if (photo != null) { Image(photo, null, Modifier.fillMaxSize(), contentScale = ContentScale.Crop) PhotoFade() - } else StoryGlow(storyColor(card)) + } else StoryGlow(storyBlend(card)) // In the picture zone, between the header and the stack at the foot. if (route.size >= 2) { val box = Modifier.fillMaxWidth().padding(horizontal = StoryRouteInset).padding(top = StoryRouteTop).height(StoryRouteHeight) RouteLine(route, box) } - Box(Modifier.fillMaxSize().padding(StoryGap.Part)) { - BrandRow(card.date) - StoryStack(card, modifier = Modifier.align(Alignment.BottomStart)) + Box(Modifier.fillMaxSize()) { + BrandRow(card.date, Modifier.padding(start = StoryGap.Part, end = StoryGap.Part, top = 22.dp)) + // Everything the card says sits in one dark glass block on the foot (Share board, decision 15): the light stays + // bright round it and the text passes 4.5:1 on it. + StoryBlock(card, Modifier.align(Alignment.BottomStart).padding(StoryGap.Block)) } } } /** The three gaps on a card (mockups/share-cards-system.html): inside a part, stats to chips, and between parts. */ private object StoryGap { - val Inner = 8.dp - val Near = 16.dp + val Inner = 10.dp + val Near = 14.dp val Part = 24.dp + /** The block's distance from the card's edge. */ + val Block = 14.dp +} + +/** The block's corner: 24 dp, a squircle. */ +private val BlockShape = GlowShapes.Card + +/** + * The glass block under the text on a lit card (decision 15): a dark gradient from 46% to 74%, a lit top edge and a + * ring. The saved picture is drawn off screen, where nothing blurs, so the darker end carries the contrast. + */ +@Composable +private fun StoryBlock(card: StoryCard, modifier: Modifier = Modifier) { + Box( + modifier.fillMaxWidth().clip(BlockShape) + .background( + Brush.verticalGradient( + 0f to Color.Black.copy(alpha = 0.46f), 0.55f to Color.Black.copy(alpha = 0.62f), 1f to Color.Black.copy(alpha = 0.74f), + ), + ) + .litEdge(BlockShape, top = 0.20f, ring = 0.07f) + .padding(start = 18.dp, end = 18.dp, top = 18.dp, bottom = 16.dp), + ) { StoryStack(card) } } /** Where a run's route sits in the picture zone: its top, height and side insets. */ @@ -358,7 +384,7 @@ private val StoryHeroRoom = 230.dp */ @Composable private fun StoryStack(card: StoryCard, modifier: Modifier = Modifier) { - Column(modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(StoryGap.Part)) { + Column(modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(StoryGap.Near)) { Column(verticalArrangement = Arrangement.spacedBy(StoryGap.Inner)) { Text(card.title, color = Color.White, style = GlowType.cardTitle, maxLines = 1, overflow = TextOverflow.Ellipsis) HeroValue(card.value, card.unit, dot = DotSize.Detail, gap = 10.dp, maxWidth = StoryHeroRoom) @@ -417,7 +443,7 @@ private fun StoryDetail(card: StoryCard) { private fun StatRow(stats: List) { Row(Modifier.fillMaxWidth().height(IntrinsicSize.Min)) { stats.forEachIndexed { i, s -> - if (i > 0) Box(Modifier.padding(end = StoryGap.Near).width(1.dp).fillMaxHeight().background(Color.White.copy(alpha = 0.18f))) + if (i > 0) Box(Modifier.padding(end = 12.dp).width(1.dp).fillMaxHeight().background(Color.White.copy(alpha = 0.14f))) Column(Modifier.weight(1f)) { // The value and its unit as one line on one baseline; a long one ("10:05 /km") shrinks the value to fit. val text = buildAnnotatedString { @@ -444,39 +470,31 @@ private fun StatRow(stats: List) { /** The smallest a stat's value shrinks to before its column is full. */ private val StatMinSize = 20.sp -/** A card's light: its kind's colour, as on Choose and Ready, and the week's goal green. */ -private fun storyColor(card: StoryCard): Color = when (card) { - is StoryCard.Week -> MetricColors.good - else -> familyColor(card.family) +/** A card's light: its family's blend (Share board), and the Goals blend for the week. */ +private fun storyBlend(card: StoryCard): Blend = when (card) { + is StoryCard.Week -> Blends.Goals + else -> familyBlend(card.family) } -/** How strong a card's light is at its foot, the same for every kind. */ -private const val STORY_LIGHT = 0.95f - -/** Where the board's light sits, in card heights from the top, and its size in card widths and heights. */ -private const val STORY_LIGHT_BELOW = 1.12f -private const val STORY_LIGHT_WIDTH = 1.3f -private const val STORY_LIGHT_HEIGHT = 0.65f - -/** The light's middle stop, as a share of its strength, and its fixed rim before it fades out. */ -private const val STORY_LIGHT_MID_AT = 0.38f -private const val STORY_LIGHT_MID = 0.47f -private const val STORY_LIGHT_RIM_AT = 0.7f -private const val STORY_LIGHT_RIM = 0.08f - /** - * The board's light from below: an ellipse wider than the card centred under its foot, from [strength] of [color] to - * black at its edge. + * The board's light from below: the blend's first stop in a wide blob at the lower left and its second in a smaller one at + * the lower right, both blurred (the board's 520 by 440 at 55% and 360 by 320 at 45%, on a 360 by 640 card). */ @Composable -private fun StoryGlow(color: Color, strength: Float = STORY_LIGHT) { +private fun StoryGlow(blend: Blend) { Box( Modifier.fillMaxSize().drawBehind { - drawCardLight( - color, Offset(size.width / 2, size.height * STORY_LIGHT_BELOW), - size.width * STORY_LIGHT_WIDTH, size.height * STORY_LIGHT_HEIGHT, - listOf(0f to strength, STORY_LIGHT_MID_AT to strength * STORY_LIGHT_MID, STORY_LIGHT_RIM_AT to STORY_LIGHT_RIM), - ) + fun blob(cx: Float, cy: Float, rx: Float, ry: Float, color: Color, alpha: Float) { + val c = Offset(cx.dp.toPx(), cy.dp.toPx()) + val r = rx.dp.toPx() + val brush = Brush.radialGradient( + 0f to color.copy(alpha = alpha), 0.35f to color.copy(alpha = alpha * 0.9f), 0.6f to color.copy(alpha = alpha * 0.55f), + 0.8f to color.copy(alpha = alpha * 0.2f), 1f to Color.Transparent, center = c, radius = r, + ) + scale(1f, ry / rx, pivot = c) { drawCircle(brush, r, c) } + } + blob(120f, 550f, 260f + 90f, 220f + 90f, blend.first, 0.55f) + blob(330f, 590f, 180f + 90f, 160f + 90f, blend.second, 0.45f) }, ) } @@ -490,12 +508,12 @@ private fun PhotoFade() { Box(Modifier.fillMaxSize()) { Box( // Deep enough that the wordmark's red reads over a bright photo. - Modifier.fillMaxWidth().fillMaxHeight(0.3f) - .background(Brush.verticalGradient(listOf(Color.Black.copy(alpha = 0.85f), Color.Transparent))), + Modifier.fillMaxWidth().fillMaxHeight(0.22f) + .background(Brush.verticalGradient(listOf(Color.Black.copy(alpha = 0.7f), Color.Transparent))), ) Box( Modifier.align(Alignment.BottomCenter).fillMaxWidth().fillMaxHeight(0.62f).background( - Brush.verticalGradient(0f to Color.Transparent, 0.35f to Color.Black.copy(alpha = 0.55f), 1f to Color.Black.copy(alpha = 0.85f)), + Brush.verticalGradient(0f to Color.Transparent, 0.4f to Color.Black.copy(alpha = 0.75f), 1f to Color.Black.copy(alpha = 0.9f)), ), ) } @@ -529,23 +547,24 @@ private fun RouteLine(route: List, modifier: Modifier) { * and a photo is darkened at the top, so the red reads on every card. */ @Composable -private fun BrandRow(date: String) { - Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { +private fun BrandRow(date: String, modifier: Modifier = Modifier) { + Row(modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Box(Modifier.weight(1f)) { Wordmark() } - Text(date, color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary, maxLines = 1) + Text(date, color = Color.White.copy(alpha = 0.8f), style = GlowType.secondary, maxLines = 1) } } -/** A best, the weekly goal or the weeks in a row on a dark pill, its icon in its colour. */ +/** A best, the weekly goal or the weeks in a row on a white 14% pill, with a small dot in the kind's colour. */ @Composable private fun StoryChipView(chip: StoryChip) { - val (icon, tint) = if (chip.best) AppIcons.FlagCheckered to MetricColors.calories else AppIcons.Target to if (chip.met) MetricColors.good else Color.White + // A dot, not a tick: green and amber are status colours only, so a goal met is a white dot and a best the calories gold. + val dot = if (chip.best) org.openstrap.app.ui.theme.Blends.Calories.first else Color.White Row( - Modifier.height(30.dp).clip(CircleShape).background(Color.Black.copy(alpha = 0.45f)).padding(start = 10.dp, end = 12.dp), + Modifier.height(28.dp).clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.14f)).padding(horizontal = 12.dp), verticalAlignment = Alignment.CenterVertically, ) { - Icon(icon, null, tint = tint, modifier = Modifier.size(15.dp)) - Text(chip.text, color = Color.White, style = ChipText, maxLines = 1, modifier = Modifier.padding(start = 7.dp)) + Box(Modifier.size(6.dp).background(dot, CircleShape)) + Text(chip.text, color = Color.White, style = ChipText, maxLines = 1, modifier = Modifier.padding(start = 6.dp)) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareScreen.kt index a2ae7b14..3ac51d89 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareScreen.kt @@ -65,6 +65,7 @@ import kotlinx.coroutines.withContext import org.openstrap.app.data.catching import org.openstrap.app.data.Route import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.screenLight import org.openstrap.app.presentation.EarnedLine import org.openstrap.app.ui.workout.FamilySummary import org.openstrap.app.ui.workout.PhoneSummary @@ -203,8 +204,8 @@ private fun ShareScreen(card: StoryCard, route: List, fileName: Str saved = null } - WorkoutPage( - Color.Transparent, contentPadding, scroll = false, + LightPage( + Modifier.screenLight(null), contentPadding, scroll = false, pinned = { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { val saveLabel = stringResource( @@ -252,7 +253,7 @@ private fun ShareScreen(card: StoryCard, route: List, fileName: Str val width = height * 9f / 16f val density = LocalDensity.current Column(horizontalAlignment = Alignment.CenterHorizontally) { - Box(Modifier.size(width, height).clip(GlowLayout.TileShape)) { + Box(Modifier.size(width, height).clip(GlowLayout.CardShape)) { CompositionLocalProvider(LocalDensity provides Density(density.density * (width / StoryWidth), 1f)) { StoryCardView(card, photo, shown) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/SummarySections.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/SummarySections.kt index 3884226f..b1a7a396 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/SummarySections.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/SummarySections.kt @@ -24,7 +24,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -60,7 +61,6 @@ import org.openstrap.app.ui.workout.PhoneSummary import org.openstrap.app.ui.workout.RoundLine import org.openstrap.app.ui.workout.ZONE_COLORS import org.openstrap.app.ui.workout.ZONE_NAMES -import org.openstrap.app.ui.workout.familyColor import org.openstrap.app.ui.dashboard.LocalHeartZones /* @@ -283,7 +283,7 @@ private fun SentenceCard(title: String, sentence: String) { private fun SetsCard(groups: List, maxHr: Int) { val heartZones = LocalHeartZones.current val shares = remember(groups) { FamilySummary.peakShares(groups.flatMap { g -> g.sets.map { it.peak } }) } - PictureCard(familyColor(Workouts.Family.Strength), Modifier.fillMaxWidth()) { + PictureCard(familyInk(Workouts.Family.Strength), Modifier.fillMaxWidth()) { EdgeTitle(stringResource(R.string.glow_summary_sets_title), stringResource(R.string.glow_summary_peak_heart_rate)) var i = 0 groups.forEachIndexed { gi, g -> @@ -333,8 +333,8 @@ private fun RoundsCard(lines: List, title: String, maxHr: Int) { val hardest = remember(lines) { FamilySummary.hardestRound(lines) } val labelled = lines.size <= LabelledRounds val gap = if (labelled) 6.dp else 3.dp - val shape = RoundedCornerShape(5.dp) - PictureCard(familyColor(Workouts.Family.Intervals), Modifier.fillMaxWidth()) { + val shape = GlowShapes.Small + PictureCard(familyInk(Workouts.Family.Intervals), Modifier.fillMaxWidth()) { EdgeTitle(title, stringResource(R.string.glow_summary_peak_then_rest)) Row(Modifier.fillMaxWidth().height(84.dp).padding(top = 14.dp), horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.Bottom) { lines.forEachIndexed { i, r -> @@ -382,8 +382,8 @@ private fun RepTimesCard(times: List) { val best = times.indexOf(fastest) val labelled = times.size <= LabelledRounds val gap = if (labelled) 6.dp else 3.dp - val shape = RoundedCornerShape(5.dp) - val color = familyColor(Workouts.Family.Intervals) + val shape = GlowShapes.Small + val color = familyInk(Workouts.Family.Intervals) PictureCard(color, Modifier.fillMaxWidth()) { EdgeTitle(stringResource(R.string.glow_summary_each_rep), stringResource(R.string.glow_summary_rep_times_time)) Row(Modifier.fillMaxWidth().height(RoundColumnHeight + 14.dp).padding(top = 14.dp), horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.Bottom) { @@ -417,7 +417,7 @@ private val RoundColumnHeight = 52.dp */ @Composable private fun PeriodsCard(periods: List, of: Int, read: String?) { - val color = familyColor(Workouts.Family.Games) + val color = familyInk(Workouts.Family.Games) val shares = remember(periods) { FamilySummary.peakShares(periods.map { it.averageBpm }) } PictureCard(color, Modifier.fillMaxWidth()) { EdgeTitle( @@ -491,7 +491,7 @@ internal fun ZoneStripPanel(zones: ZoneSeconds) { private fun ZonesCard(zones: ZoneSeconds) { val minutes = remember(zones) { FamilySummary.zoneMinutes(zones) } val most = zones.indices.maxByOrNull { zones[it] } ?: 0 - PictureCard(ZONE_COLORS[most], Modifier.fillMaxWidth()) { + PictureCard(familyInk(Workouts.Family.IndoorCardio), Modifier.fillMaxWidth()) { EdgeTitle(stringResource(R.string.glow_summary_time_in_zones), FamilySummary.mostlyZone(zones)) ZoneBar( zones, ZONE_COLORS, Modifier.padding(top = 10.dp, bottom = 6.dp), height = 12.dp, gap = 3.dp, corner = 4.dp, ends = 4.dp, @@ -532,9 +532,9 @@ private fun IndoorHeartCard(readings: List>, target: Pair Row(verticalAlignment = Alignment.CenterVertically) { Box( - Modifier.size(20.dp).background((if (reached) MetricColors.good else Color.White).copy(alpha = 0.16f), CircleShape), + Modifier.size(20.dp).background((if (reached) Blends.Goals.first else Color.White).copy(alpha = 0.16f), CircleShape), contentAlignment = Alignment.Center, - ) { Icon(if (reached) AppIcons.Tick02 else AppIcons.Target, null, tint = if (reached) MetricColors.good else Color.White, modifier = Modifier.size(12.dp)) } + ) { Icon(if (reached) AppIcons.Tick02 else AppIcons.Target, null, tint = if (reached) Blends.Goals.first else Color.White, modifier = Modifier.size(12.dp)) } Text(text, color = Color.White, style = GlowType.secondary, modifier = Modifier.padding(start = 8.dp)) } } @@ -664,8 +664,8 @@ internal fun EarnedChips(lines: List) { lines.forEach { l -> val (icon, color) = when (l.kind) { EarnedLine.Kind.Best -> AppIcons.FlagCheckered to MetricColors.calories - EarnedLine.Kind.Badge -> AppIcons.CheckCircle to MetricColors.good - EarnedLine.Kind.Goal -> AppIcons.Target to if (l.met) MetricColors.good else Color.White + EarnedLine.Kind.Badge -> AppIcons.CheckCircle to Blends.Goals.first + EarnedLine.Kind.Goal -> AppIcons.Target to if (l.met) Blends.Goals.first else Color.White } val text = l.value?.let { stringResource(R.string.glow_summary_join, l.text, it) } ?: l.text IconPill(text, null, icon = icon, tint = color, height = 36.dp, style = GlowType.secondary) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/Wordmark.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/Wordmark.kt index df7b2112..e20ce1bd 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/Wordmark.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/Wordmark.kt @@ -8,17 +8,19 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle -import org.openstrap.app.ui.theme.MetricColors +import androidx.compose.ui.graphics.Shadow +import org.openstrap.app.ui.theme.Blends /** * The app's name as its logo (docs/design/rebrand-unstrap.md): "un" in the heart red, "strap" in white, lowercase. - * The logo's glow is left out at this size, as the logo sheet says for anything under about 24 px. Placed on dark + * A faint glow round the red, as the Share board draws it. Placed on dark * ground only, where the red reads. A brand, not a word to translate. */ @Composable fun Wordmark(modifier: Modifier = Modifier, style: TextStyle = GlowType.storyBrand, strap: Color = Color.White) { val text = buildAnnotatedString { - withStyle(SpanStyle(color = MetricColors.heart)) { append("un") } + // The board's soft glow round the red, 0.25 em wide (Share board). + withStyle(SpanStyle(color = Blends.Heart.first, shadow = Shadow(Blends.Heart.first.copy(alpha = 0.35f), blurRadius = style.fontSize.value * 0.25f))) { append("un") } withStyle(SpanStyle(color = strap)) { append("strap") } } Text(text, style = style, maxLines = 1, modifier = modifier) From a0e6e5a509826a64191b76e84dc2ddf9e256d84b Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:50:15 +0400 Subject: [PATCH 13/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20You=20and=20Stra?= =?UTF-8?q?p=20pages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../openstrap/app/ui/alarms/AlarmsScreen.kt | 2 + .../app/ui/alarms/PhoneAlertsScreen.kt | 1 + .../openstrap/app/ui/dashboard/ScreenParts.kt | 6 +- .../org/openstrap/app/ui/device/BackupPage.kt | 56 ++-- .../app/ui/device/DeletedSleepPage.kt | 7 +- .../openstrap/app/ui/device/DeviceScreen.kt | 87 +++--- .../app/ui/device/HealthConnectPage.kt | 37 ++- .../org/openstrap/app/ui/device/PlaceParts.kt | 275 ++++++++++++++++++ .../openstrap/app/ui/device/ProfileScreen.kt | 5 +- .../openstrap/app/ui/device/UpdatesPage.kt | 60 ++-- .../org/openstrap/app/ui/device/YouPage.kt | 79 +++-- .../app/ui/firmware/FirmwareScreen.kt | 75 +++-- .../openstrap/app/ui/glow/HeartZonesScreen.kt | 25 +- .../org/openstrap/app/ui/glow/StrapDrawing.kt | 4 +- 14 files changed, 543 insertions(+), 176 deletions(-) create mode 100644 app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt diff --git a/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt index 912a4454..cbf15de4 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt @@ -172,6 +172,7 @@ fun AlarmsScreen( ) } } + org.openstrap.app.ui.components.PageLight(org.openstrap.app.ui.device.StrapPageLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_alarms_title), onBack) } (state.error ?: state.alarmsError)?.let { msg -> item { ErrorPanel(msg, state.busy, vm::refresh) } } @@ -193,6 +194,7 @@ fun AlarmsScreen( @Composable fun HealthAlertsScreen(vm: AlarmsViewModel, state: AlarmsUiState, contentPadding: PaddingValues, onBack: () -> Unit) { BackHandler(onBack = onBack) + org.openstrap.app.ui.components.PageLight(org.openstrap.app.ui.device.StrapPageLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_health_title), onBack) } (state.error ?: state.healthError)?.let { msg -> item { ErrorPanel(msg, state.busy, vm::refresh) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/alarms/PhoneAlertsScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/alarms/PhoneAlertsScreen.kt index ce9e99d2..14df91e6 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/alarms/PhoneAlertsScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/alarms/PhoneAlertsScreen.kt @@ -124,6 +124,7 @@ fun PhoneAlertsScreen(vm: PhoneAlertsViewModel, contentPadding: PaddingValues, o Unit } + org.openstrap.app.ui.components.PageLight(org.openstrap.app.ui.device.StrapPageLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_phone_title), onBack) } item { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/dashboard/ScreenParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/dashboard/ScreenParts.kt index 6cae4a5a..ef828049 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/dashboard/ScreenParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/dashboard/ScreenParts.kt @@ -1,6 +1,5 @@ package org.openstrap.app.ui.dashboard -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.PaddingValues @@ -10,7 +9,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -43,9 +41,9 @@ fun ScreenList( val column = org.openstrap.app.ui.glow.LocalPageColumn.current BoxWithConstraints(Modifier.fillMaxSize()) { val side = org.openstrap.app.ui.glow.GlowLayout.pageSide(maxWidth, column, gutter) - // The status bar gets an opaque strip so cards don't scroll underneath the clock. + // Transparent: the page host (or the screen's light) paints the ground and the light behind the list. LazyColumn( - Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background).statusBarsPadding(), + Modifier.fillMaxSize().statusBarsPadding(), state = state, contentPadding = PaddingValues( start = side, end = side, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/BackupPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/BackupPage.kt index fe65c41d..67204f4b 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/BackupPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/BackupPage.kt @@ -2,7 +2,13 @@ package org.openstrap.app.ui.device import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row import androidx.compose.runtime.Composable +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import org.openstrap.app.ui.components.PageLight import androidx.compose.runtime.remember import androidx.compose.ui.res.stringResource import org.openstrap.app.R @@ -37,34 +43,36 @@ fun BackupPage( // Read again whenever the state changes, so "today" follows the last backup. val now = remember(state, backingUp) { System.currentTimeMillis() / 1000 } val toggle = { on: Boolean -> if (on) onTurnOn() else onTurnOff() } + PageLight(YouLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_backup_title), onBack) } item { - PageRows { - PageSwitchRow( - stringResource(R.string.you_backup_automatic), BackupCopy.status(state, now), state.on, toggle, divider = false, - icon = AppIcons.ShieldCheck, - ) - if (state.on) { - PageRow( - stringResource(R.string.you_backup_folder), BackupCopy.folder(state), onClick = onFolder, below = true, - icon = AppIcons.FolderOpen, - ) - PageRow( - stringResource(R.string.you_backup_now), - stringResource(if (backingUp) R.string.you_backup_now_running else R.string.you_backup_now_note), - onClick = onBackUpNow, below = true, enabled = !backingUp, icon = AppIcons.CloudArrowDown, - ) - } - PageRow( - stringResource(R.string.you_action_restore), stringResource(R.string.you_backup_restore_note), onClick = onRestore, - below = true, - icon = AppIcons.ArrowCounterClockwise, + SwitchHero( + AppIcons.ShieldCheck, stringResource(R.string.you_backup_automatic), BackupCopy.status(state, now), state.on, toggle, + below = if (!state.on) null else { + { + PageRow( + stringResource(R.string.you_backup_folder), BackupCopy.folder(state), onClick = onFolder, below = true, + icon = AppIcons.FolderOpen, + ) + PageRow( + stringResource(R.string.you_backup_now), + stringResource(if (backingUp) R.string.you_backup_now_running else R.string.you_backup_now_note), + onClick = onBackUpNow, below = true, enabled = !backingUp, icon = AppIcons.CloudArrowDown, + ) + } + }, + ) + } + item { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + PlaceTile( + AppIcons.ArrowCounterClockwise, stringResource(R.string.you_action_restore), stringResource(R.string.you_backup_restore_note), + onRestore, Modifier.weight(1f), height = 170.dp, caret = false, ) - PageRow( - stringResource(R.string.you_backup_save_copy), stringResource(R.string.you_backup_save_copy_note), onClick = onSaveCopy, - below = true, - icon = AppIcons.DownloadSimple, + PlaceTile( + AppIcons.DownloadSimple, stringResource(R.string.you_backup_save_copy), stringResource(R.string.you_backup_save_copy_note), + onSaveCopy, Modifier.weight(1f), height = 170.dp, caret = false, ) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/DeletedSleepPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/DeletedSleepPage.kt index 807ee4ad..6e4bfd32 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/DeletedSleepPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/DeletedSleepPage.kt @@ -4,6 +4,10 @@ import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text +import androidx.compose.foundation.layout.height +import org.openstrap.app.ui.components.PageLight +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.ScreenLight import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -41,6 +45,7 @@ fun DeletedSleepPage( val zone = ZoneId.systemDefault() val now = System.currentTimeMillis() / 1000 fun clock(t: Long) = TimeOfDay.format(t, zone) + PageLight(ScreenLight(Blends.Sleep, angle = 150f, strength = 1f, heroCenterY = 150f)) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_deleted_sleep_title), onBack) } item { Text(SleepCopy.DELETED_INTRO, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.body, modifier = Modifier.padding(horizontal = 4.dp)) } @@ -55,7 +60,7 @@ fun DeletedSleepPage( below = true, divider = i > 0, icon = AppIcons.Moon, ) { PageButton( - stringResource(R.string.you_action_restore), { onRestore(r.strap) }, icon = AppIcons.ArrowCounterClockwise, + stringResource(R.string.you_action_restore), { onRestore(r.strap) }, Modifier.height(44.dp), icon = AppIcons.ArrowCounterClockwise, ) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt index 68af502e..46702c21 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt @@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Text @@ -36,6 +35,10 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment +import androidx.compose.foundation.layout.Spacer +import org.openstrap.app.ui.components.PageLight +import org.openstrap.app.ui.theme.GlowShapes +import androidx.compose.ui.unit.sp import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext @@ -63,15 +66,11 @@ import org.openstrap.app.ui.alarms.healthAlertsSummary import org.openstrap.app.ui.alarms.phoneAlertsSummary import org.openstrap.app.ui.dashboard.agoText import org.openstrap.app.ui.firmware.FirmwareViewModel -import org.openstrap.app.ui.glow.draw.CoreShape import org.openstrap.app.ui.glow.DestructiveInk import org.openstrap.app.ui.glow.HeroValue -import org.openstrap.app.ui.glow.GlowCard import org.openstrap.app.ui.glow.GlowLayout -import org.openstrap.app.ui.glow.draw.GlowStyle import org.openstrap.app.ui.glow.PageSwitchRow import org.openstrap.app.ui.glow.GlowType -import org.openstrap.app.ui.glow.draw.LightAngle import org.openstrap.app.ui.glow.PageButton import org.openstrap.app.ui.glow.PageConfirm import org.openstrap.app.ui.glow.PageField @@ -204,6 +203,7 @@ fun DeviceScreen( ) } + PageLight(StrapPageLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_strap_title), onBack) } @@ -264,49 +264,54 @@ fun DeviceScreen( stringResource(R.string.you_strap_row_health_alerts), healthAlertsSummary(alarms) ?: waiting, onClick = onHealthAlerts, icon = AppIcons.Heartbeat, selected = selected == PageRowKeys.HEALTH_ALERTS, ) + } + } + item { + PageRows { PageSwitchRow( - stringResource(R.string.you_strap_row_off_body), null, wearReminder, vm::setWearReminder, icon = AppIcons.HandPalm, + stringResource(R.string.you_strap_row_off_body), null, wearReminder, vm::setWearReminder, divider = false, + icon = AppIcons.HandPalm, ) KeepConnectedRow(vm, keepConnected, device.address) - val firmware = info?.firmware ?: (connection as? ConnectionState.Connected)?.firmware + } + } + item { + val firmware = info?.firmware ?: (connection as? ConnectionState.Connected)?.firmware + OutlinePanel { + var first = true if (FirmwareViewModel.UPDATES_ENABLED) { PageRow( stringResource(R.string.you_strap_row_firmware), firmware ?: stringResource(R.string.you_strap_check_for_updates), - onClick = onFirmware, icon = AppIcons.Cpu, selected = selected == PageRowKeys.FIRMWARE, + onClick = onFirmware, divider = false, icon = AppIcons.Cpu, selected = selected == PageRowKeys.FIRMWARE, ) + first = false } else if (firmware != null) { - PageRow(stringResource(R.string.you_strap_row_firmware), firmware, icon = AppIcons.Cpu) + PageRow(stringResource(R.string.you_strap_row_firmware), firmware, divider = false, icon = AppIcons.Cpu) + first = false } PageRow( stringResource(R.string.you_strap_row_zepp), stringResource(if (zeppSignedIn) R.string.you_strap_signed_in else R.string.you_strap_not_signed_in), - onClick = onZeppAccount, icon = AppIcons.Key, selected = selected == PageRowKeys.ZEPP_ACCOUNT, + onClick = onZeppAccount, divider = !first, icon = AppIcons.Key, selected = selected == PageRowKeys.ZEPP_ACCOUNT, ) } } item { - PageRows { - var first = true - if (connection is ConnectionState.Connected) { - PageRow( - stringResource(R.string.you_strap_disconnect), onClick = { confirmDisconnect = true }, divider = false, + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + val connected = connection is ConnectionState.Connected + val canRestart = connected && info?.canRestart == true + if (connected || canRestart) Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { + if (connected) PageButton( + stringResource(R.string.you_strap_disconnect), { confirmDisconnect = true }, Modifier.weight(1f).height(52.dp), icon = AppIcons.LinkBreak, ) - first = false - } - if (connection is ConnectionState.Connected && info?.canRestart == true) { - PageRow( - stringResource(R.string.you_strap_row_restart), onClick = { confirmRestart = true }, divider = !first, + if (canRestart) PageButton( + stringResource(R.string.you_strap_row_restart), { confirmRestart = true }, Modifier.weight(1f).height(52.dp), icon = AppIcons.ShutDown, ) - first = false } - PageRow( - stringResource(R.string.you_strap_row_forget), onClick = { confirmForget = true }, divider = !first, - titleColor = DestructiveInk, - icon = AppIcons.Trash, - ) + OutlinePill(stringResource(R.string.you_strap_row_forget), AppIcons.Trash, { confirmForget = true }) } } } @@ -404,15 +409,19 @@ internal fun StrapHero(name: String, connection: ConnectionState, sync: SyncStat val now by androidx.compose.runtime.produceState(System.currentTimeMillis() / 1000) { while (true) { kotlinx.coroutines.delay(30_000); value = System.currentTimeMillis() / 1000 } } - GlowCard(StrapGlow, Modifier.fillMaxWidth()) { + PlaceHero(Modifier.strapHero(), Modifier.heightIn(min = 196.dp)) { Box(Modifier.fillMaxWidth()) { Column(Modifier.fillMaxWidth().padding(end = 112.dp)) { Text(name, color = Color.White, style = GlowType.cardTitle, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text( - strapStateLine(connection, sync, lastSeen, now, lastSync = lastSync), - color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, - modifier = Modifier.padding(top = 4.dp), - ) + // The small status dot beside the state: green while connected, amber when it isn't (decision 9). + Row(Modifier.padding(top = 4.dp), verticalAlignment = Alignment.CenterVertically) { + Box(Modifier.size(7.dp).background(if (connected != null && sync !is SyncState.Failed) MetricColors.good else MetricColors.warn, CircleShape)) + Spacer(Modifier.width(7.dp)) + Text( + strapStateLine(connection, sync, lastSeen, now, lastSync = lastSync), + color = Color.White.copy(alpha = 0.82f), style = GlowType.secondary.copy(fontSize = 14.sp, lineHeight = 20.sp), + ) + } } // 5 dp under it, so the space below the battery matches the space the title's line height leaves above it. // Clear of the strap on the right too, which sits centred and so lower as this grows. @@ -453,20 +462,12 @@ internal fun StrapHero(name: String, connection: ConnectionState, sync: SyncStat } -/** - * The strap's card: a quiet grey-green lit from above, so it doesn't read as any metric. The page's hero, so its light - * is L4 at full strength (spec 2.1). - */ -internal val StrapGlow = GlowStyle( - color = Color(0xFF6AAF98), coreShape = CoreShape.Radial, coreWidth = 1.2f, coreHeight = 1.1f, coreBlur = 30.dp, - coreLightness = 0.03f, toneWidth = 0.dp, lightAngle = LightAngle.Above, -) - /** The protocol log, for bug reports, opened from the You page; the whole log can be copied. */ @Composable fun DiagnosticsScreen(lines: List, contentPadding: PaddingValues, onBack: () -> Unit) { BackHandler(onBack = onBack) val context = LocalContext.current + PageLight(org.openstrap.app.ui.theme.ScreenLight(org.openstrap.app.ui.theme.Blends.You, angle = 100f, strength = 0.65f, heroCenterY = 160f)) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { val label = stringResource(R.string.you_diagnostics_clip_label) @@ -474,7 +475,7 @@ fun DiagnosticsScreen(lines: List, contentPadding: PaddingValues, onBack PageButton(stringResource(R.string.you_diagnostics_copy), { context.getSystemService(ClipboardManager::class.java) .setPrimaryClip(ClipData.newPlainText(label, lines.joinToString("\n"))) - }, Modifier.height(40.dp), icon = AppIcons.Copy) + }, Modifier.height(44.dp), icon = AppIcons.Copy) } } item { @@ -483,7 +484,7 @@ fun DiagnosticsScreen(lines: List, contentPadding: PaddingValues, onBack note = pluralStringResource(R.plurals.you_diagnostics_lines, lines.size, lines.size), ) { Box( - Modifier.fillMaxWidth().heightIn(max = 520.dp).clip(RoundedCornerShape(12.dp)).background(Color.Black) + Modifier.fillMaxWidth().heightIn(max = 520.dp).clip(GlowShapes.Tile).background(Color.Black) .verticalScroll(rememberScrollState()).horizontalScroll(rememberScrollState()).padding(12.dp), ) { Text( diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt index b4cdb7ec..9ab6d796 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt @@ -8,7 +8,10 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.heightIn import androidx.compose.runtime.Composable +import org.openstrap.app.ui.components.PageLight import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -59,35 +62,31 @@ fun HealthConnectPage( onOfferCalories: () -> Unit = {}, ) { BackHandler(onBack = onBack) + PageLight(YouLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_hc_title), onBack) } if (availability == HcAvailability.INSTALLABLE) item { InstallPanel(onInstall) } item { - PageRows { - val now = System.currentTimeMillis() / 1000 - val line = healthConnectLine(auto, now, java.time.ZoneId.systemDefault(), availability = availability) - PageSwitchRow(stringResource(R.string.you_hc_auto), line, auto.on, onAuto, divider = false, icon = AppIcons.Refresh04) - } + val now = System.currentTimeMillis() / 1000 + val line = healthConnectLine(auto, now, java.time.ZoneId.systemDefault(), availability = availability) + SwitchHero(AppIcons.Refresh04, stringResource(R.string.you_hc_auto), line, auto.on, onAuto, Modifier.heightIn(min = 136.dp)) } - item { SectionLabel(stringResource(R.string.you_hc_any_time), Modifier.padding(top = 4.dp), PanelLabelInset) } + item { SectionLabel(stringResource(R.string.you_hc_any_time), Modifier.padding(top = 4.dp)) } item { - PageRows { - PageRow( - stringResource(R.string.you_hc_copy_now), stringResource(R.string.you_hc_copy_now_note), onClick = onCopyNow, - below = true, - divider = false, icon = AppIcons.Heartbeat, - ) - PageRow( - stringResource(R.string.you_action_restore), stringResource(R.string.you_hc_restore_note), onClick = onRestore, - below = true, - icon = AppIcons.ArrowCounterClockwise, + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + PlaceTile( + AppIcons.Heartbeat, stringResource(R.string.you_hc_copy_now), stringResource(R.string.you_hc_copy_now_note), + onCopyNow, Modifier.weight(1f), caret = false, ) - PageRow( - stringResource(R.string.you_hc_open), stringResource(R.string.you_hc_open_note), onClick = onOpen, below = true, - icon = AppIcons.SlidersHorizontal, + PlaceTile( + AppIcons.ArrowCounterClockwise, stringResource(R.string.you_action_restore), stringResource(R.string.you_hc_restore_note), + onRestore, Modifier.weight(1f), caret = false, ) } } + item { + OutlineRow(AppIcons.SlidersHorizontal, stringResource(R.string.you_hc_open), onOpen, note = stringResource(R.string.you_hc_open_note)) + } if (caloriesMissing) item { CaloriesOffer(onOfferCalories) } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt new file mode 100644 index 00000000..b5ac9db2 --- /dev/null +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt @@ -0,0 +1,275 @@ +package org.openstrap.app.ui.device + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.selection.toggleable +import androidx.compose.ui.semantics.clearAndSetSemantics +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.drawOutline +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import kotlin.math.PI +import kotlin.math.abs +import kotlin.math.cos +import kotlin.math.sin +import org.openstrap.app.ui.components.pressClickable +import org.openstrap.app.ui.glow.GlowType +import org.openstrap.app.ui.glow.NoticeDot +import org.openstrap.app.ui.glow.TapCaret +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.theme.clearGlass +import org.openstrap.app.ui.theme.litEdge + +/* + * The parts the You and Strap pages share on the Glow × Glass boards (PageYou, PageStrap and what they open): the place + * hero in tinted glass of its own blend, the 150 dp tiles, the outlined row, and the screen lights each board draws. + * You is copper, Strap is graphite. Both are places, so they light their pages and never a chart. + */ + +/** The You pages' light (PageYou and what it opens): copper from the upper left, a little lower for a longer page. */ +internal val YouLight = ScreenLight(Blends.You, angle = 165f, strength = ScreenLight.EVENING, heroCenterY = 156f) + +/** The Strap pages' light (PageStrap and what it opens): graphite from above. */ +internal val StrapPageLight = ScreenLight(Blends.Strap, angle = 90f, strength = 0.75f, heroCenterY = 174f) + +/** The caret's alpha at the end of a tile or an outlined row (clear glass: 50%). */ +private const val CARET = 0.5f + +/** + * The CSS `linear-gradient(deg, ...)` for a box of [w] by [h]: the gradient line runs through the centre at + * [angle] clockwise from up, as long as the box's projection on it. + */ +private fun cssGradient(angle: Float, w: Float, h: Float, stops: Array>): Brush { + val a = angle / 180f * PI.toFloat() + val dx = sin(a); val dy = -cos(a) + val half = (abs(w * dx) + abs(h * dy)) / 2f + val c = Offset(w / 2f, h / 2f) + return Brush.linearGradient( + colorStops = stops, start = Offset(c.x - dx * half, c.y - dy * half), end = Offset(c.x + dx * half, c.y + dy * half), + ) +} + +/** A hero in tinted glass: [stops] along [angle] (CSS degrees), lit top edge 35%, ring 10%. */ +internal fun Modifier.placeHero(angle: Float, vararg stops: Pair): Modifier = + drawWithCache { + val outline = GlowShapes.Card.createOutline(size, layoutDirection, this) + val brush = cssGradient(angle, size.width, size.height, arrayOf(*stops)) + onDrawBehind { drawOutline(outline, brush) } + }.litEdge(GlowShapes.Card, top = 0.35f, ring = 0.10f) + +/** The You pages' hero: white into the copper first stop and back to white, lit from the upper left (140 degrees). */ +internal fun Modifier.youHero(blend: Blend = Blends.You): Modifier = placeHero( + 140f, 0f to Color.White.copy(alpha = 0.24f), 0.55f to blend.first.copy(alpha = 0.14f), 1f to Color.White.copy(alpha = 0.04f), +) + +/** The Strap pages' hero: the strap blend from the top (46%) fading to white 4%. */ +internal fun Modifier.strapHero(blend: Blend = Blends.Strap): Modifier = placeHero( + 180f, 0f to blend.first.copy(alpha = 0.46f), 0.55f to blend.first.copy(alpha = 0.16f), 1f to Color.White.copy(alpha = 0.04f), +) + +/** A hero card of a place's page: tinted glass of [look], padded 20 dp, [onClick] makes the whole card a button. */ +@Composable +internal fun PlaceHero( + look: Modifier, + modifier: Modifier = Modifier, + onClick: (() -> Unit)? = null, + content: @Composable BoxScope.() -> Unit, +) { + val shape = GlowShapes.Card + Box( + modifier.fillMaxWidth().clip(shape).then(look) + .let { if (onClick != null) it.pressClickable(onClick, shape).semantics { role = Role.Button } else it } + .padding(horizontal = 20.dp, vertical = 18.dp), + content = content, + ) +} + +/** A round icon on a page's tile, hero or row: [size] across, white at [fill] behind the [icon]. */ +@Composable +internal fun PlaceIcon(icon: ImageVector, size: androidx.compose.ui.unit.Dp, fill: Float, tint: Color = Color.White) { + Box(Modifier.size(size).background(Color.White.copy(alpha = fill), CircleShape), contentAlignment = Alignment.Center) { + Icon(icon, null, Modifier.size(size / 2), tint = tint) + } +} + +/** + * A 150 dp tile of the two-up grid on the You pages (Health Connect, Backup, Copy now, Restore): clear glass, a 40 dp + * round icon at the top left with the caret opposite when it opens something, its [title] and [note] at the bottom. + */ +@Composable +internal fun PlaceTile( + icon: ImageVector, + title: String, + note: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, + height: androidx.compose.ui.unit.Dp = 150.dp, + caret: Boolean = true, + enabled: Boolean = true, +) { + val shape = GlowShapes.Card + Column( + modifier.height(height).clip(shape).clearGlass(shape) + .let { if (enabled) it.pressClickable(onClick, shape) else it.alpha(0.4f) } + .semantics { role = Role.Button } + .padding(16.dp), + verticalArrangement = Arrangement.SpaceBetween, + ) { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Top) { + PlaceIcon(icon, 40.dp, 0.10f) + if (caret) TapCaret(CARET, Modifier.padding(top = 4.dp)) + } + Column(verticalArrangement = Arrangement.spacedBy(3.dp)) { + Text(title, color = Color.White, style = GlowType.body.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.Medium), maxLines = 2) + Text(note, color = Color.White.copy(alpha = 0.65f), style = GlowType.secondary, maxLines = 3, overflow = TextOverflow.Ellipsis) + } + } +} + +/** + * An outlined row on the You and Strap pages (Open Health Connect, Deleted sleep): no fill, a 1 dp white 16% ring, a + * 36 dp round icon, the [title] with an optional [note] under it, then [trailing] (a chip) and the caret. + */ +@Composable +internal fun OutlineRow( + icon: ImageVector, + title: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, + note: String? = null, + iconFill: Color = Color.White.copy(alpha = 0.10f), + dot: Boolean = false, + trailing: (@Composable () -> Unit)? = null, +) { + val shape = GlowShapes.Tile + Row( + modifier.fillMaxWidth().height(68.dp).clip(shape).border(1.dp, Color.White.copy(alpha = 0.16f), shape) + .clickable(role = Role.Button, onClick = onClick) + .padding(start = 14.dp, end = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Box(Modifier.size(36.dp).background(iconFill, CircleShape), contentAlignment = Alignment.Center) { + Icon(icon, null, Modifier.size(18.dp), tint = Color.White) + } + Spacer(Modifier.width(14.dp)) + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(title, color = Color.White, style = GlowType.body, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (dot) { Spacer(Modifier.width(8.dp)); NoticeDot() } + } + if (note != null) Text(note, color = Color.White.copy(alpha = 0.65f), style = GlowType.secondary, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + if (trailing != null) { Spacer(Modifier.width(10.dp)); trailing() } + Spacer(Modifier.width(12.dp)) + TapCaret(CARET) + } +} + +/** A small white 14% chip with [text] ("2 to restore"), the board's count tag. */ +@Composable +internal fun CountChip(text: String) { + Text( + text, color = Color.White, style = GlowType.secondary.copy(fontSize = 12.sp), + modifier = Modifier.clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.14f)).padding(horizontal = 10.dp, vertical = 4.dp), + ) +} + +/** A panel of rows with no fill and a 1 dp white 14% ring (Firmware and Zepp account on the Strap page). */ +@Composable +internal fun OutlinePanel(modifier: Modifier = Modifier, content: @Composable androidx.compose.foundation.layout.ColumnScope.() -> Unit) { + Column( + modifier.fillMaxWidth().clip(GlowShapes.Card).border(1.dp, Color.White.copy(alpha = 0.14f), GlowShapes.Card) + .padding(horizontal = 18.dp, vertical = 6.dp), + content = content, + ) +} + +/** A pill with no fill and a white 16% ring, its words at 72% (Forget this strap). */ +@Composable +internal fun OutlinePill(text: String, icon: ImageVector?, onClick: () -> Unit, modifier: Modifier = Modifier) { + Row( + modifier.fillMaxWidth().height(52.dp).clip(GlowShapes.Pill).border(1.dp, Color.White.copy(alpha = 0.16f), GlowShapes.Pill) + .clickable(role = Role.Button, onClick = onClick).padding(horizontal = 20.dp), + horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically, + ) { + val ink = Color.White.copy(alpha = 0.72f) + if (icon != null) { Icon(icon, null, Modifier.size(18.dp), tint = ink); Spacer(Modifier.width(8.dp)) } + Text(text, color = ink, style = GlowType.body.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.Medium), maxLines = 1) + } +} + +/** + * The You pages' switch hero (Health Connect, Backup): a 40 dp icon and the switch on one line, the [title] and [line] + * under them. The whole top is the switch's row, so a tap anywhere on it flips it. [below] holds what follows inside the + * card (Backup's folder rows). + */ +@Composable +internal fun SwitchHero( + icon: ImageVector, + title: String, + line: String, + checked: Boolean, + onChange: (Boolean) -> Unit, + modifier: Modifier = Modifier, + below: (@Composable androidx.compose.foundation.layout.ColumnScope.() -> Unit)? = null, +) { + PlaceHero(Modifier.youHero(), modifier) { + Column { + Column( + Modifier.fillMaxWidth().toggleable(checked, role = Role.Switch, onValueChange = onChange), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { + PlaceIcon(icon, 40.dp, 0.16f) + org.openstrap.app.ui.glow.GlowSwitch(checked, onChange, Modifier.clearAndSetSemantics {}) + } + Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(title, color = Color.White, style = GlowType.cardTitle) + Text(line, color = Color.White.copy(alpha = 0.85f), style = GlowType.secondary.copy(fontSize = 14.sp, lineHeight = 20.sp)) + } + } + if (below != null) { Spacer(Modifier.height(10.dp)); below() } + } + } +} + +/** The paper the release notes are printed on (PageUpdates, What's new): near white, with ink for text. */ +internal object Paper { + val Fill = Color(0xFFF7F5F9) + val Ink = Color(0xFF0B0B0D) + val Body = Color(0xFF3A3A42) + val Lead = Color(0xFF2A2A30) + val Muted = Color(0xFF5B5B63) + val Bullet = Color(0xFF6E6E76) +} diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt index 0245f08c..14480355 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt @@ -155,12 +155,15 @@ fun ProfileScreen(profile: UserProfile, contentPadding: PaddingValues, onSave: ( val bottom = if (keyboard) 0.dp else contentPadding.calculateBottomPadding() val side = GlowLayout.pageSide(maxWidth, LocalPageColumn.current, GlowLayout.Gutter) // The list ends clear of Save and the fade behind it (ScreenList adds its own 24 dp). + org.openstrap.app.ui.components.PageLight( + org.openstrap.app.ui.theme.ScreenLight(org.openstrap.app.ui.theme.Blends.You, angle = 30f, strength = 0.75f, heroCenterY = 165f), + ) ScreenList(PaddingValues(bottom = PinnedFade.listClearance(bottom + 12.dp + SaveHeight, listEnd = 24.dp)), gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_profile_title), back) } + item { PageNote(stringResource(R.string.you_profile_note), Color.White.copy(alpha = 0.65f)) } item { PagePanel { Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { - PageNote(stringResource(R.string.you_profile_note)) PageNumberField( age, { age = it }, stringResource(R.string.you_profile_age), stringResource(R.string.you_profile_age_unit), age.isNotBlank() && ageValue == null, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt index 715804cc..db59ddbd 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt @@ -12,6 +12,11 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.material3.Text +import androidx.compose.ui.draw.clip +import androidx.compose.ui.unit.sp +import org.openstrap.app.ui.components.PageLight +import org.openstrap.app.ui.glow.PageButton +import org.openstrap.app.ui.theme.GlowShapes import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -70,19 +75,31 @@ fun UpdatesPage( val newer = Releases.newer(state.releases, installed) val newest = newer.firstOrNull() val busy = state.install is Install.Downloading || state.install is Install.Installing + PageLight(YouLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_updates_title), onBack) } + if (newest != null) item { + // The new version as the page's hero, with the one button that installs it. + PlaceHero(Modifier.youHero(), Modifier.height(136.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.Bottom) { + Text( + stringResource(R.string.you_updates_release, newest.versionName), Modifier.weight(1f), color = Color.White, + style = GlowType.pageTitle.copy(fontWeight = FontWeight.Medium, fontSize = 24.sp, lineHeight = 30.sp), maxLines = 1, + ) + newest.publishedAt?.let { Text(UpdateCopy.date(it), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary) } + } + PageButton( + UpdateCopy.install(newest, state.install, recording), { onInstall(newest) }, + Modifier.align(Alignment.BottomStart).fillMaxWidth().height(52.dp), + enabled = !busy && !(recording && newest.apk != null), primary = true, icon = AppIcons.DownloadSimple, + ) + } + } item { PageRows { - if (newest != null) PageRow( - stringResource(R.string.you_updates_release, newest.versionName), UpdateCopy.install(newest, state.install, recording), - onClick = { onInstall(newest) }, below = true, divider = false, enabled = !busy && !(recording && newest.apk != null), - icon = AppIcons.DownloadSimple, - ) PageRow( stringResource(R.string.you_updates_check_now), UpdateCopy.checkStatus(state, now), onClick = onCheck, below = true, - divider = newest != null, - enabled = state.check != Check.Checking, icon = AppIcons.Refresh04, + divider = false, enabled = state.check != Check.Checking, icon = AppIcons.Refresh04, ) PageSwitchRow( stringResource(R.string.you_updates_daily), stringResource(R.string.you_updates_daily_note), auto, onAuto, @@ -106,9 +123,14 @@ fun UpdatesPage( else -> R.string.you_updates_latest }, ) - PagePanel(title = title) { + // Printed on paper, as the board draws it: near white with dark ink. + Column( + Modifier.fillMaxWidth().clip(GlowShapes.Card).background(Paper.Fill).padding(20.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + Text(title, color = Paper.Ink, style = GlowType.cardTitle.copy(fontWeight = FontWeight.SemiBold, fontSize = 19.sp, lineHeight = 24.sp)) shown.forEachIndexed { i, release -> - if (i > 0) Box(Modifier.fillMaxWidth().height(1.dp).background(Color.White.copy(alpha = 0.08f))) + if (i > 0) Box(Modifier.fillMaxWidth().height(1.dp).background(Paper.Ink.copy(alpha = 0.1f))) ReleaseNotesView(release) } } @@ -117,7 +139,7 @@ fun UpdatesPage( Text( stringResource(R.string.you_updates_installed, installed), Modifier.fillMaxWidth().padding(top = 4.dp), - color = Color.White.copy(alpha = 0.45f), style = GlowType.secondary, textAlign = TextAlign.Center, + color = Color.White.copy(alpha = 0.58f), style = GlowType.secondary, textAlign = TextAlign.Center, ) } } @@ -129,28 +151,28 @@ private fun ReleaseNotesView(release: Release) { val blocks = remember(release.notes) { ReleaseNotes.parse(release.notes) } Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { - Text(release.versionName, color = Color.White, style = GlowType.body.copy(fontWeight = FontWeight.Medium), modifier = Modifier.weight(1f)) + Text(release.versionName, color = Paper.Ink, style = GlowType.body.copy(fontWeight = FontWeight.Medium), modifier = Modifier.weight(1f)) release.publishedAt?.let { - Text(UpdateCopy.date(it), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary) + Text(UpdateCopy.date(it), color = Paper.Muted, style = GlowType.secondary) } } if (blocks.isEmpty()) { Text( - stringResource(R.string.you_updates_no_notes), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), + stringResource(R.string.you_updates_no_notes), color = Paper.Muted, style = GlowType.secondary, ) } blocks.forEachIndexed { i, block -> when (block) { is NoteBlock.Heading -> Text( - spans(block.spans), color = Color.White, style = GlowType.body.copy(fontWeight = FontWeight.Medium), modifier = Modifier.padding(top = 6.dp), + spans(block.spans), color = Paper.Ink, style = GlowType.body.copy(fontWeight = FontWeight.Medium), modifier = Modifier.padding(top = 6.dp), ) // The opening paragraph leads, larger; any later one reads like the bullets. is NoteBlock.Paragraph -> - if (i == 0) Text(spans(block.spans), color = Color.White.copy(alpha = 0.85f), style = GlowType.body) - else Text(spans(block.spans), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary) + if (i == 0) Text(spans(block.spans), color = Paper.Lead, style = GlowType.body) + else Text(spans(block.spans), color = Paper.Body, style = GlowType.secondary) is NoteBlock.Bullet -> Row { - Text("•", color = Color.White.copy(alpha = 0.5f), style = GlowType.body, modifier = Modifier.width(16.dp)) - Text(spans(block.spans), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary, modifier = Modifier.padding(top = 1.dp)) + Text("•", color = Paper.Bullet, style = GlowType.body, modifier = Modifier.width(16.dp)) + Text(spans(block.spans), color = Paper.Body, style = GlowType.secondary, modifier = Modifier.padding(top = 1.dp)) } } } } @@ -159,6 +181,6 @@ private fun ReleaseNotesView(release: Release) { /** Bold runs in white at medium weight, the rest in the text's own colour. */ private fun spans(spans: List): AnnotatedString = buildAnnotatedString { for (s in spans) { - if (s.bold) withStyle(SpanStyle(fontWeight = FontWeight.Medium, color = Color.White)) { append(s.text) } else append(s.text) + if (s.bold) withStyle(SpanStyle(fontWeight = FontWeight.SemiBold, color = Paper.Ink)) { append(s.text) } else append(s.text) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt index c2da5ac4..dd7c0be6 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt @@ -1,7 +1,18 @@ package org.openstrap.app.ui.device import androidx.activity.compose.BackHandler +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.width +import androidx.compose.ui.Alignment +import androidx.compose.ui.unit.sp +import org.openstrap.app.ui.components.PageLight +import org.openstrap.app.ui.glow.CARD_CARET_ALPHA +import org.openstrap.app.ui.glow.TapCaret +import org.openstrap.app.ui.theme.Blends import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text @@ -30,7 +41,6 @@ import org.openstrap.app.ui.glow.GlowType import org.openstrap.app.ui.glow.PageHeader import org.openstrap.app.update.UpdateCopy import org.openstrap.app.ui.glow.PageRow -import org.openstrap.app.ui.glow.PanelLabelInset import org.openstrap.app.ui.glow.SectionLabel import org.openstrap.app.ui.glow.PageRows import org.openstrap.app.ui.theme.AppIcons @@ -142,18 +152,32 @@ fun YouPage( selected: String? = null, ) { BackHandler(onBack = onBack) + PageLight(YouLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_title), onBack) } item { - PageRows { - PageRow( - stringResource(R.string.you_row_profile), profile.summary(), onClick = onProfile, below = true, divider = false, - icon = AppIcons.User, - selected = selected == PageRowKeys.PROFILE, + // The profile, as the page's hero: tinted copper glass, the summary in Sentence type at the bottom. + PlaceHero(Modifier.youHero(), Modifier.height(160.dp), onClick = onProfile) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + PlaceIcon(AppIcons.User, 52.dp, 0.16f) + Spacer(Modifier.width(14.dp)) + Text( + stringResource(R.string.you_row_profile), Modifier.weight(1f), color = Color.White, + style = GlowType.cardTitle, maxLines = 1, + ) + TapCaret(CARD_CARET_ALPHA) + } + Text( + profile.summary(), Modifier.align(Alignment.BottomStart), color = Color.White, + style = GlowType.sentence.copy(fontSize = 22.sp, lineHeight = 28.sp), maxLines = 2, ) + } + } + item { + PageRows { PageRow( org.openstrap.app.ui.workout.HeartZonesCopy.TITLE, org.openstrap.app.ui.workout.HeartZonesCopy.youLine(maxHeartRate), onClick = onHeartZones, - below = true, icon = AppIcons.Heartbeat, selected = selected == PageRowKeys.HEART_ZONES, + below = true, divider = false, icon = AppIcons.Heartbeat, selected = selected == PageRowKeys.HEART_ZONES, ) PageRow(stringResource(R.string.you_row_goals), goalsLine(goals), onClick = onGoals, below = true, icon = AppIcons.Target) PageRow( @@ -168,30 +192,31 @@ fun YouPage( ) } } - item { SectionLabel(stringResource(R.string.you_section_your_data), Modifier.padding(top = 4.dp), PanelLabelInset) } + item { SectionLabel(stringResource(R.string.you_section_your_data), Modifier.padding(top = 4.dp)) } item { - PageRows { - // Read again whenever either changes, so "today" and "yesterday" follow the last one. - val now = remember(healthConnectAuto, backup) { System.currentTimeMillis() / 1000 } - val zone = java.time.ZoneId.systemDefault() - PageRow( - stringResource(R.string.you_row_health_connect), - healthConnectSummary(healthConnectAuto, now, zone, availability = healthConnectAvailability), onClick = onHealthConnect, - below = true, divider = false, - icon = AppIcons.Heartbeat, selected = selected == PageRowKeys.HEALTH_CONNECT, - ) - PageRow( - stringResource(R.string.you_row_backup), BackupCopy.summary(backup, now, zone), onClick = onBackup, below = true, - icon = AppIcons.ShieldCheck, selected = selected == PageRowKeys.BACKUP, + // Read again whenever either changes, so "today" and "yesterday" follow the last one. + val now = remember(healthConnectAuto, backup) { System.currentTimeMillis() / 1000 } + val zone = java.time.ZoneId.systemDefault() + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + PlaceTile( + AppIcons.Heartbeat, stringResource(R.string.you_row_health_connect), + healthConnectSummary(healthConnectAuto, now, zone, availability = healthConnectAvailability), + onHealthConnect, Modifier.weight(1f), ) - if (deletedSleep > 0) PageRow( - stringResource(R.string.you_row_deleted_sleep), org.openstrap.app.ui.dashboard.SleepCopy.deletedCount(deletedSleep), - onClick = onDeletedSleep, below = true, - icon = AppIcons.Trash, selected = selected == PageRowKeys.DELETED_SLEEP, + PlaceTile( + AppIcons.ShieldCheck, stringResource(R.string.you_row_backup), BackupCopy.summary(backup, now, zone), + onBackup, Modifier.weight(1f), ) } } - item { SectionLabel(stringResource(R.string.you_section_help), Modifier.padding(top = 4.dp), PanelLabelInset) } + if (deletedSleep > 0) item { + OutlineRow( + AppIcons.Trash, stringResource(R.string.you_row_deleted_sleep), onDeletedSleep, + iconFill = Blends.Sleep.first.copy(alpha = 0.26f), + trailing = { CountChip(org.openstrap.app.ui.dashboard.SleepCopy.deletedCount(deletedSleep)) }, + ) + } + item { SectionLabel(stringResource(R.string.you_section_help), Modifier.padding(top = 4.dp)) } item { PageRows { val now = remember(updates) { System.currentTimeMillis() / 1000 } @@ -215,7 +240,7 @@ fun YouPage( Text( stringResource(R.string.you_footer, BuildConfig.VERSION_NAME), Modifier.fillMaxWidth().padding(top = 4.dp), - color = Color.White.copy(alpha = 0.45f), style = GlowType.secondary, textAlign = TextAlign.Center, + color = Color.White.copy(alpha = 0.58f), style = GlowType.secondary, textAlign = TextAlign.Center, ) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt index 1981b886..ac9b85b1 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt @@ -18,6 +18,12 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.unit.sp +import org.openstrap.app.ui.components.PageLight +import org.openstrap.app.ui.device.OutlinePanel +import org.openstrap.app.ui.device.PlaceHero +import org.openstrap.app.ui.device.StrapPageLight +import org.openstrap.app.ui.device.strapHero import androidx.compose.runtime.DisposableEffect import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.compose.runtime.getValue @@ -81,39 +87,50 @@ fun FirmwareScreen(vm: FirmwareViewModel, contentPadding: PaddingValues, onBack: var confirm by remember { mutableStateOf(null) } confirm?.let { image -> ConfirmInstall(image, vm.blockers(), onDismiss = { confirm = null }, onInstall = { confirm = null; vm.install(image) }) } + PageLight(StrapPageLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_firmware_title), { vm.reset(); onBack() }, backEnabled = !installing) } item { - PagePanel(title = stringResource(R.string.you_firmware_this_strap)) { + PlaceHero(Modifier.strapHero()) { val c = connection as? ConnectionState.Connected - InfoLine( - stringResource(R.string.you_firmware_title), - info?.firmware ?: c?.firmware ?: stringResource(R.string.you_firmware_unknown), - ) - info?.hardware?.let { InfoLine(stringResource(R.string.you_firmware_hardware), it) } - InfoLine( - stringResource(R.string.you_firmware_battery), - c?.batteryPercent?.let { stringResource(R.string.you_firmware_percent, it) } - ?: stringResource(R.string.you_firmware_not_connected), - ) - InfoLine( - stringResource(R.string.you_firmware_service), - stringResource( - when (info?.dfuAvailable) { - true -> R.string.you_firmware_service_available - false -> R.string.you_firmware_service_not_found - null -> R.string.you_firmware_service_unknown - }, - ), - ) + Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + Text(stringResource(R.string.you_firmware_this_strap), color = Color.White, style = GlowType.cardTitle) + Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(stringResource(R.string.you_firmware_title), color = Color.White.copy(alpha = 0.78f), style = GlowType.secondary) + Text( + info?.firmware ?: c?.firmware ?: stringResource(R.string.you_firmware_unknown), color = Color.White, + style = GlowType.sentence.copy(fontSize = 34.sp, lineHeight = 40.sp), + ) + } + Row(Modifier.fillMaxWidth().padding(top = 4.dp), horizontalArrangement = Arrangement.spacedBy(10.dp)) { + info?.hardware?.let { Fact(stringResource(R.string.you_firmware_hardware), it, Modifier.weight(1f)) } + Fact( + stringResource(R.string.you_firmware_battery), + c?.batteryPercent?.let { stringResource(R.string.you_firmware_percent, it) } + ?: stringResource(R.string.you_firmware_not_connected), + Modifier.weight(1f), + ) + Fact( + stringResource(R.string.you_firmware_service), + stringResource( + when (info?.dfuAvailable) { + true -> R.string.you_firmware_service_available + false -> R.string.you_firmware_service_not_found + null -> R.string.you_firmware_service_unknown + }, + ), + Modifier.weight(1f), + ) + } + } } } item { StepPanel(step, vm, onInstall = { confirm = it }) } item { - PageRows { + OutlinePanel { // Update checks need a signed-in Zepp account; its page is a row away, as on the Strap page. PageRow( stringResource(R.string.you_strap_row_zepp), @@ -188,7 +205,7 @@ private fun StepPanel(step: FirmwareStep, vm: FirmwareViewModel, onInstall: (Rea } FirmwareStep.Installed -> { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { - Icon(AppIcons.CheckCircle, null, tint = MetricColors.good) + Icon(AppIcons.CheckCircle, null, tint = Color.White) CardTitle(stringResource(R.string.you_firmware_installed)) } Body(stringResource(R.string.you_firmware_installed_text)) @@ -210,7 +227,7 @@ private fun StepPanel(step: FirmwareStep, vm: FirmwareViewModel, onInstall: (Rea private fun CheckResult(result: UpdateCheck, vm: FirmwareViewModel) { if (result.upToDate) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { - Icon(AppIcons.CheckCircle, null, tint = MetricColors.good) + Icon(AppIcons.CheckCircle, null, tint = Color.White) CardTitle(stringResource(R.string.you_firmware_up_to_date)) } Body(stringResource(R.string.you_firmware_up_to_date_text)) @@ -242,6 +259,7 @@ fun ZeppAccountScreen(vm: FirmwareViewModel, contentPadding: PaddingValues, onBa BackHandler(onBack = onBack) val account by vm.account.collectAsStateWithLifecycle() val installing = vm.step.collectAsStateWithLifecycle().value is FirmwareStep.Installing + PageLight(StrapPageLight) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_zepp_title), onBack) } item { AccountPanel(account, enabled = !installing, onSave = vm::saveAccount, onClear = vm::clearAccount, onSignIn = vm::saveSignIn) } @@ -373,6 +391,15 @@ private fun Point(icon: ImageVector, title: String, body: String) { } } +/** One of the three small facts under the firmware number: a label over its value. */ +@Composable +private fun Fact(label: String, value: String, modifier: Modifier = Modifier) { + Column(modifier, verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(label, color = Color.White.copy(alpha = 0.72f), style = GlowType.secondary.copy(fontSize = 12.sp, lineHeight = 16.sp), maxLines = 1) + Text(value, color = Color.White, style = GlowType.body, maxLines = 1, overflow = TextOverflow.Ellipsis) + } +} + @Composable private fun InfoLine(label: String, value: String) { Row(Modifier.fillMaxWidth()) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt index 02078f16..f6339e71 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -37,6 +36,7 @@ import org.openstrap.app.data.Workouts import org.openstrap.app.ui.dashboard.ScreenList import org.openstrap.app.ui.theme.AppIcons import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.device.placeHero import org.openstrap.app.ui.workout.HeartZonesCopy import org.openstrap.app.ui.workout.ZONE_COLORS import org.openstrap.app.ui.workout.ZONE_NAMES @@ -59,6 +59,9 @@ fun HeartZonesScreen( BackHandler(onBack = onBack) var editing by rememberSaveable { mutableStateOf(null) } var settingMax by rememberSaveable { mutableStateOf(false) } + org.openstrap.app.ui.components.PageLight( + org.openstrap.app.ui.theme.ScreenLight(org.openstrap.app.ui.theme.Blends.Heart, angle = 185f, strength = 1f, heroCenterY = 260f), + ) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(HeartZonesCopy.TITLE, onBack) } item { MaxHero(max) { settingMax = true } } @@ -82,9 +85,13 @@ fun HeartZonesScreen( /** The max as the page's hero: its Doto number on heart red lit from the left, where it comes from, and Set it myself. */ @Composable private fun MaxHero(max: MaxHeartRate?, onSet: () -> Unit) { - LitPanel( - MetricColors.heart, HeroLight, - lightCenter = { Offset(0f, it.height / 2) }, reach = { Size(it.width * HERO_LIGHT_REACH, it.width * HERO_LIGHT_REACH) }, + val heart = org.openstrap.app.ui.theme.Blends.Heart + Column( + Modifier.fillMaxWidth().clip(org.openstrap.app.ui.theme.GlowShapes.Card) + .placeHero( + 90f, 0f to heart.first.copy(alpha = 0.55f), 0.5f to heart.second.copy(alpha = 0.20f), 1f to Color.White.copy(alpha = 0.05f), + ) + .padding(horizontal = 20.dp, vertical = 18.dp), verticalArrangement = Arrangement.spacedBy(12.dp), ) { Text(HeartZonesCopy.MAX_TITLE, color = Color.White.copy(alpha = 0.8f), style = GlowType.body) @@ -93,16 +100,10 @@ private fun MaxHero(max: MaxHeartRate?, onSet: () -> Unit) { color = if (max != null) Color.White else Color.White.copy(alpha = 0.2f), ) if (max != null) Text(HeartZonesCopy.source(max), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary) - PageButton(HeartZonesCopy.SET_IT, onSet, enabled = max != null, icon = AppIcons.PencilEdit) + PageButton(HeartZonesCopy.SET_IT, onSet, Modifier.height(44.dp), enabled = max != null, icon = AppIcons.PencilEdit, onCard = true) } } -/** How far the max hero's light reaches from the left edge, in card widths. */ -private const val HERO_LIGHT_REACH = 1.1f - -/** The max hero's light: heart red at 55% on the edge, 12% halfway out. */ -private val HeroLight = listOf(0f to 0.55f, 0.5f to 0.12f) - /** A zone on the list: its colour as a short bar, its number and name, and its heart rates. */ @Composable private fun ZoneRow(zone: Int, bpm: String, divider: Boolean, onClick: () -> Unit) { @@ -112,7 +113,7 @@ private fun ZoneRow(zone: Int, bpm: String, divider: Boolean, onClick: () -> Uni .padding(vertical = GlowLayout.RowPadding), verticalAlignment = Alignment.CenterVertically, ) { - Box(Modifier.width(6.dp).height(34.dp).clip(RoundedCornerShape(3.dp)).background(ZONE_COLORS[zone])) + Box(Modifier.width(6.dp).height(34.dp).clip(org.openstrap.app.ui.theme.GlowShapes.Small).background(ZONE_COLORS[zone])) Spacer(Modifier.width(14.dp)) Column(Modifier.weight(1f)) { RowName(HeartZonesCopy.zoneName(zone)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/StrapDrawing.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/StrapDrawing.kt index 27cf1a42..f7a8a894 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/StrapDrawing.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/StrapDrawing.kt @@ -108,5 +108,5 @@ private val Lugs = listOf(43f to 36f, 77f to 36f, 43f to 110f, 77f to 110f) /** The resting turn when the strap isn't syncing. */ private val NoTurn: State = mutableFloatStateOf(0f) -/** The strap's own light, a soft green, as it glows when connected. */ -internal val StrapLight = Color(0xFF7DE0C0) +/** The strap's own light, the Strap blend's first stop brightened toward white (PageStrap's pod light), not a status colour. */ +internal val StrapLight = androidx.compose.ui.graphics.lerp(org.openstrap.app.ui.theme.Blends.Strap.first, Color.White, 0.45f) From 32ea9a407986c50c5b0dca7df388aa325eeaa5b5 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:53:16 +0400 Subject: [PATCH 14/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20workout=20Choose?= =?UTF-8?q?,=20Ready=20and=20live=20screens=20in=20the=20family=20blends?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Family blend map in WorkoutStyle, WorkoutPage lit by a ScreenLight, live screens on tinted and clear glass with a shared zone strip (zones only as dots, tracks and chips), Strength rest in bronze, Intervals pink for work and teal for rest, squircle shapes throughout. Co-Authored-By: Claude Opus 5.5 --- .../org/openstrap/app/ui/glow/ChooseScreen.kt | 98 +++--- .../openstrap/app/ui/glow/GlowWorkoutMode.kt | 52 ++-- .../org/openstrap/app/ui/glow/ReadyCardio.kt | 66 ++-- .../org/openstrap/app/ui/glow/ReadyPlans.kt | 8 +- .../org/openstrap/app/ui/glow/ReadyScreen.kt | 14 +- .../openstrap/app/ui/glow/WorkoutCapsule.kt | 46 +-- .../org/openstrap/app/ui/glow/WorkoutMap.kt | 6 +- .../app/ui/glow/live/LiveDistance.kt | 51 ++-- .../openstrap/app/ui/glow/live/LiveFrame.kt | 85 ++++-- .../openstrap/app/ui/glow/live/LiveGame.kt | 58 ++-- .../openstrap/app/ui/glow/live/LiveGlass.kt | 159 ++++++++++ .../openstrap/app/ui/glow/live/LiveHeart.kt | 80 ++--- .../openstrap/app/ui/glow/live/LiveIndoor.kt | 104 +++++-- .../app/ui/glow/live/LiveIntervals.kt | 114 +++---- .../org/openstrap/app/ui/glow/live/LiveMap.kt | 14 +- .../openstrap/app/ui/glow/live/LiveMind.kt | 50 ++-- .../openstrap/app/ui/glow/live/LivePaused.kt | 5 +- .../openstrap/app/ui/glow/live/LiveSets.kt | 281 +++++++++--------- .../org/openstrap/app/ui/root/WorkoutLayer.kt | 5 +- .../openstrap/app/ui/workout/WorkoutStyle.kt | 30 +- .../main/res/values/strings_workout_live.xml | 8 + 21 files changed, 811 insertions(+), 523 deletions(-) create mode 100644 app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGlass.kt diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt index ff351b9f..37634076 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt @@ -31,7 +31,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions @@ -78,7 +77,14 @@ import org.openstrap.app.ui.components.pressClickable import org.openstrap.app.ui.dashboard.ScreenList import org.openstrap.app.ui.theme.AppIcons import org.openstrap.app.ui.theme.SportIcons -import org.openstrap.app.ui.workout.familyColor +import org.openstrap.app.ui.workout.sportBlend +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.theme.tintedGlass +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.unit.sp /* ---------------------------------------------- Choose ----------------------------------------------- */ @@ -169,6 +175,8 @@ private fun ChooseBody( onMore: () -> Unit, modifier: Modifier = Modifier, ) { + // The usual sport's family lights the screen from the top left (board WorkoutChoose); with none, the distance lime. + val light = remember(usual?.type) { ScreenLight(usual?.let { sportBlend(it.type) } ?: Blends.Distance, 135f, 0.85f, 170f) } val header: @Composable () -> Unit = { Row(verticalAlignment = Alignment.CenterVertically) { RoundIcon(AppIcons.X, stringResource(R.string.glow_close), onBack) @@ -198,7 +206,7 @@ private fun ChooseBody( // Unfolded (spec 2.4): the rest of the sports, A to Z, in a column of their own beside the tiles, each side // scrolling by itself, so none is a tap away behind More sports. if (maxWidth >= GlowLayout.TwoColumnWidth) CompositionLocalProvider(LocalPageColumn provides GlowLayout.MaxContentWidth) { - WorkoutPage(Color.Transparent, contentPadding, scroll = false) { + WorkoutPage(light, contentPadding, scroll = false) { header() Row(Modifier.weight(1f).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(GlowLayout.ColumnGap * 2)) { Column(Modifier.weight(1f).verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(14.dp), content = choose) @@ -208,7 +216,7 @@ private fun ChooseBody( } } } - } else WorkoutPage(Color.Transparent, contentPadding) { + } else WorkoutPage(light, contentPadding) { header() choose() MoreSportsRow(onMore) @@ -222,41 +230,54 @@ private fun ChooseBody( */ @Composable private fun UsualRow(s: ChooseSport, onStart: () -> Unit, onOpen: () -> Unit) { - val color = familyColor(Workouts.family(s.type)) + val blend = sportBlend(s.type) val haptics = org.openstrap.app.ui.components.rememberHaptics() - PictureCard(color, Modifier.fillMaxWidth(), onClick = onOpen, contentPadding = PaddingValues(start = 18.dp, top = 14.dp, end = 14.dp, bottom = 14.dp)) { - Row(verticalAlignment = Alignment.CenterVertically) { - Column(Modifier.weight(1f)) { - Text( - stringResource(R.string.glow_choose_your_usual), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), - style = GlowType.secondary, - ) - Text( - Workouts.sportName(s.type), color = Color.White, style = GlowType.headerDate, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.padding(top = 2.dp), - ) - if (s.line.isNotEmpty()) Text( - s.line, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, - maxLines = 1, overflow = TextOverflow.Ellipsis, - ) - } - Spacer(Modifier.width(12.dp)) - PageButton( - stringResource(R.string.glow_choose_start), - { haptics.perform(org.openstrap.app.ui.components.HapticEvent.WorkoutStart); onStart() }, - primary = true, icon = AppIcons.PlayFill, + // Tinted glass in the usual sport's family blend: the one lit card on Choose. + Row( + Modifier.fillMaxWidth().clip(GlowShapes.Card).tintedGlass(blend, GlowShapes.Card).pressClickable(onOpen, GlowShapes.Card) + .padding(start = 18.dp, top = 14.dp, end = 14.dp, bottom = 14.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f)) { + Text( + stringResource(R.string.glow_choose_your_usual), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), + style = GlowType.secondary, + ) + Text( + Workouts.sportName(s.type), color = Color.White, style = GlowType.headerDate, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(top = 2.dp), + ) + if (s.line.isNotEmpty()) Text( + s.line, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, + maxLines = 1, overflow = TextOverflow.Ellipsis, ) } + Spacer(Modifier.width(12.dp)) + PageButton( + stringResource(R.string.glow_choose_start), + { haptics.perform(org.openstrap.app.ui.components.HapticEvent.WorkoutStart); onStart() }, + primary = true, icon = AppIcons.PlayFill, + ) } } -/** Choose's quiet chips, a step off black. */ -private val QuietCard = ListSurface - -/** A Recent chip: the sport's icon in its colour and a name, a sport's or a saved workout's, on a quiet pill. */ +/** + * A Recent chip (board WorkoutChoose): a 44 dp pill, white 6% with a 12% ring, the sport's family blend as a small + * dot and its name, a sport's or a saved workout's. + */ @Composable -private fun RecentPill(sport: Int, name: String, onClick: () -> Unit) = - IconPill(name, onClick, icon = SportIcons.of(sport), tint = familyColor(Workouts.family(sport)), surface = QuietCard, hairline = true) +private fun RecentPill(sport: Int, name: String, onClick: () -> Unit) { + val blend = sportBlend(sport) + Row( + Modifier.height(44.dp).clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.06f)) + .border(1.dp, Color.White.copy(alpha = 0.12f), GlowShapes.Pill).pressClickable(onClick, GlowShapes.Pill) + .semantics { role = Role.Button }.padding(start = 12.dp, end = 16.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + Box(Modifier.size(10.dp).clip(CircleShape).background(Brush.linearGradient(listOf(blend.first, blend.second)))) + Text(name, color = Color.White, style = GlowType.secondary.copy(fontSize = 14.sp), maxLines = 1) + } +} /* --------------------------------------------- Sport picker -------------------------------------------- */ @@ -272,20 +293,25 @@ internal fun SportTile( modifier: Modifier, outdoor: Boolean, selected: Boolean = false, + /** The sport's family blend: the tile shows it as a dot (board WorkoutChoose) in place of the [icon]. */ + blend: Blend? = null, onClick: () -> Unit, ) { // Tight corners and room underneath, so the press area never clips a label that fills the width. Column( - modifier.pressClickable(onClick, RoundedCornerShape(8.dp)).semantics(mergeDescendants = true) { role = Role.Button } + modifier.pressClickable(onClick, GlowShapes.Small).semantics(mergeDescendants = true) { role = Role.Button } .padding(vertical = 4.dp), horizontalAlignment = Alignment.CenterHorizontally, ) { Box( - Modifier.size(SportTileSize).clip(GlowLayout.TileShape).background(if (selected) Color.White else Raised), + Modifier.size(SportTileSize).clip(GlowLayout.TileShape).background(if (selected) Color.White else Color.White.copy(alpha = 0.1f)), contentAlignment = Alignment.Center, ) { val ink = if (selected) Color.Black else Color.White - Icon(icon, null, tint = ink, modifier = Modifier.size(24.dp)) + if (blend != null) Box( + Modifier.size(12.dp).clip(CircleShape) + .background(if (selected) SolidColor(Color.Black) else Brush.linearGradient(listOf(blend.first, blend.second))), + ) else Icon(icon, null, tint = ink, modifier = Modifier.size(24.dp)) if (outdoor) Icon( SportIcons.Location, stringResource(R.string.glow_choose_outdoors), tint = ink.copy(alpha = 0.7f), modifier = Modifier.align(Alignment.TopEnd).padding(6.dp).size(12.dp), @@ -464,7 +490,7 @@ private fun SportTiles(title: String?, types: List, name: (Int) -> String, Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.Top) { row.forEach { type -> val outdoor = type in Workouts.OUTDOOR_ONLY - SportTile(SportIcons.of(type), name(type), Modifier.weight(1f), outdoor, isSelected(type)) { onPick(type) } + SportTile(SportIcons.of(type), name(type), Modifier.weight(1f), outdoor, isSelected(type), sportBlend(type)) { onPick(type) } } repeat(4 - row.size) { Spacer(Modifier.weight(1f)) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt index 2f11b0bb..5d467db3 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt @@ -35,7 +35,6 @@ import org.openstrap.app.ui.components.PinnedFade import org.openstrap.app.ui.components.pinnedFade import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Icon import androidx.compose.material3.Text @@ -73,6 +72,13 @@ import org.openstrap.app.ui.workout.PhoneSummary import org.openstrap.app.ui.components.pressClickable import org.openstrap.app.ui.theme.MetricColors import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.LocalScreenLight +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.theme.screenLight +import androidx.compose.runtime.CompositionLocalProvider import org.openstrap.app.ui.workout.ZONE_COLORS import androidx.compose.ui.semantics.onClick import org.openstrap.app.ui.workout.SummaryCopy @@ -146,8 +152,8 @@ internal fun WorkoutButton( modifier: Modifier = Modifier, icon: androidx.compose.ui.graphics.vector.ImageVector? = null, height: Dp = 56.dp, ) { Row( - modifier.fillMaxWidth().height(height).shadow(28.dp, RoundedCornerShape(50), ambientColor = background, spotColor = background) - .clip(RoundedCornerShape(50)).background(background).pressClickable(onClick, RoundedCornerShape(50)), + modifier.fillMaxWidth().height(height).shadow(28.dp, GlowShapes.Pill, ambientColor = background, spotColor = background) + .clip(GlowShapes.Pill).background(background).pressClickable(onClick, GlowShapes.Pill), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically, ) { if (icon != null) { @@ -159,30 +165,23 @@ internal fun WorkoutButton( } /** - * A workout screen: black, with the workout's colour glowing softly from the top, scrolling if it must but filling + * A workout screen lit by [light] (the family's blend, Workouts board) over the ground, scrolling if it must but filling * the height so the controls sit at the bottom. [pinned] (Start, Done) stays on the bottom edge while the rest - * scrolls under it, behind the pinned buttons' fade ([pinnedFade], spec 6.3), and the content ends clear of it. + * scrolls under it, behind the pinned buttons' fade ([pinnedFade], spec 6.3), and the content ends clear of it. Null + * [light] is the plain ground. */ @Composable internal fun WorkoutPage( - glow: Color, contentPadding: PaddingValues, scroll: Boolean = true, + light: ScreenLight?, contentPadding: PaddingValues, scroll: Boolean = true, pinned: (@Composable ColumnScope.() -> Unit)? = null, - /** Painted over the whole screen in place of the top glow (HIIT's phase light). */ + /** Painted over the whole screen in place of the light (HIIT's phase light). */ backdrop: Brush? = null, content: @Composable ColumnScope.() -> Unit, ) { - BoxWithConstraints(Modifier.fillMaxSize().background(Color.Black)) { - val width = constraints.maxWidth.toFloat() + CompositionLocalProvider(LocalScreenLight provides light) { BoxWithConstraints(Modifier.fillMaxSize().then(if (backdrop != null) Modifier.screenLight(null) else Modifier.screenLight(light))) { val density = LocalDensity.current var pinnedHeight by remember { mutableStateOf(0.dp) } - // No wider than the box is tall: on a wide screen (unfolded) a wider glow would be cut off in a straight line. - val glowHeight = 420.dp - val radius = minOf(width * 0.9f, with(density) { glowHeight.toPx() }) - if (backdrop != null) Box(Modifier.fillMaxSize().background(backdrop)) else Box( - Modifier.fillMaxWidth().height(glowHeight).background( - Brush.radialGradient(listOf(glow.copy(alpha = 0.22f), Color.Transparent), center = Offset(width / 2f, 0f), radius = radius), - ), - ) + if (backdrop != null) Box(Modifier.fillMaxSize().background(backdrop)) // On a wide screen the page keeps to one centred column (spec 2.4 Unfolded); the glow stays the screen's. val side = GlowLayout.pageSide(maxWidth, LocalPageColumn.current, GlowLayout.Gutter) // The content ends [PinnedFade.Ramp] above the pinned buttons (their box already counts the bottom padding), @@ -200,7 +199,7 @@ internal fun WorkoutPage( verticalArrangement = Arrangement.spacedBy(14.dp), content = content, ) - // Black from the bottom of the screen up to the buttons, fading out above them. + // Ground from the bottom of the screen up to the buttons, fading out above them. if (pinned != null) Column( Modifier.align(Alignment.BottomCenter).fillMaxWidth().pinnedFade() .padding(contentPadding).padding(start = side, end = side, bottom = 16.dp) @@ -208,9 +207,24 @@ internal fun WorkoutPage( verticalArrangement = Arrangement.spacedBy(4.dp), content = pinned, ) - } + } } } +/** + * [WorkoutPage] for a caller that still has one colour for the glow: transparent is the plain ground, any other is a + * single-stop light from the top. New screens pass a [ScreenLight] of their family's blend. + */ +@Composable +internal fun WorkoutPage( + glow: Color, contentPadding: PaddingValues, scroll: Boolean = true, + pinned: (@Composable ColumnScope.() -> Unit)? = null, + backdrop: Brush? = null, + content: @Composable ColumnScope.() -> Unit, +) = WorkoutPage( + if (glow == Color.Transparent) null else ScreenLight(Blends.forInk(glow) ?: Blend(glow, glow), 90f, 0.5f, 0f), + contentPadding, scroll, pinned, backdrop, content, +) + /* ----------------------------------------- Activity tab entry ---------------------------------------- */ /** Where a suggestion sits: a quiet panel, or on Today an unlit strip ([strip]). */ diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyCardio.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyCardio.kt index 7a89be4d..6ff6e2da 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyCardio.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyCardio.kt @@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions @@ -78,10 +77,12 @@ import org.openstrap.app.data.db.SavedWorkout import org.openstrap.app.device.ConnectionState import org.openstrap.app.ui.components.pressClickable import org.openstrap.app.ui.theme.AppIcons -import org.openstrap.app.ui.theme.MetricColors import org.openstrap.app.ui.workout.StartCopy import org.openstrap.app.presentation.WorkoutCopy import org.openstrap.app.ui.workout.ZONE_COLORS +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.tintedGlass import java.time.LocalTime import org.openstrap.app.ui.workout.readyHero @@ -91,29 +92,19 @@ import org.openstrap.app.ui.workout.readyHero */ /** Where Ready's heart light sits, in card heights from the top, and its size in card widths and heights. */ -private const val HEART_LIGHT_BELOW = 1.25f -private const val HEART_LIGHT_WIDTH = 1.2f -private const val HEART_LIGHT_HEIGHT = 1.1f - -/** Ready's heart light at full strength: 70% in the middle, 18% halfway out. */ -private val HeartLight = listOf(0f to 0.7f, 0.5f to 0.18f) - /** - * Ready's heart: the live bpm in dots on a card lit from below in [color] (heart red, or the family's colour), as - * Today's hero, "bpm, live from your strap" beside it. While the strap is away, what's wrong and that you can start - * anyway, on a dimmer light. + * Ready's heart (boards WorkoutReadyRun, WorkoutReadyStrength): the live bpm in dots on heart-red tinted glass, + * "bpm, live from your strap" beside it, the same on every family. While the strap is away, what's wrong and that you can + * start anyway, on a dimmer tint. */ @Composable -internal fun ReadyHeartCard(connection: ConnectionState, liveHeartRate: Int?, color: Color = MetricColors.heart) { +internal fun ReadyHeartCard(connection: ConnectionState, liveHeartRate: Int?) { org.openstrap.app.ui.components.HoldLiveHeartRate() val hero = WorkoutCopy.readyHero(connection, liveHeartRate) val bpm = liveHeartRate.takeIf { hero.live } - val light = if (bpm != null) 1f else 0.4f - // An ellipse 1.2 widths across and 1.1 heights tall, centred a quarter of the height below the card. - LitPanel( - color, HeartLight.map { (at, alpha) -> at to alpha * light }, - lightCenter = { Offset(it.width / 2, it.height * HEART_LIGHT_BELOW) }, - reach = { Size(it.width * HEART_LIGHT_WIDTH, it.height * HEART_LIGHT_HEIGHT) }, + Column( + Modifier.fillMaxWidth().clip(GlowShapes.Card).tintedGlass(Blends.Heart, GlowShapes.Card, strength = if (bpm != null) 1f else 0.4f) + .padding(horizontal = 20.dp, vertical = 18.dp), ) { if (bpm != null) HeroValue(bpm.toString(), stringResource(R.string.glow_ready_bpm_live), gap = 14.dp) else Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { @@ -123,6 +114,9 @@ internal fun ReadyHeartCard(connection: ConnectionState, liveHeartRate: Int?, co } } +/** The family's blend while Ready shows: its dots, switches' tint, the typed number's caret. Set by [GlowReadyScreen]. */ +internal val LocalReadyBlend = androidx.compose.runtime.compositionLocalOf { Blends.Distance } + /** * Where you are and the switch rows, on one quiet panel. For a sport with an indoor side ([sides]), its title is the * side you're on: outside with a green pin and the GPS line, or indoors with its amber icon and what you get without @@ -148,7 +142,7 @@ internal fun ReadyWhere( var rows = 0 if (sides != null) { PlaceRow( - placeIcon(sides, indoor), if (indoor) IndoorTint else TrendGood, StartCopy.place(sides, indoor), + placeIcon(sides, indoor), LocalReadyBlend.current.chart, StartCopy.place(sides, indoor), when { indoor -> StartCopy.indoorNote(type) !locationOn -> WorkoutCopy.LOCATION_OFF @@ -173,9 +167,6 @@ internal fun ReadyWhere( private val SportIconsLocation: ImageVector get() = org.openstrap.app.ui.theme.SportIcons.Location -/** Amber, for an indoor side: zone 3's yellow, as the board has it. */ -private val IndoorTint = ZONE_COLORS[2] - /** Each side's icon: the pin outdoors, then the treadmill, the pool or a house. */ private fun placeIcon(sides: Workouts.Sides, indoor: Boolean): ImageVector = when { !indoor -> SportIconsLocation @@ -188,7 +179,7 @@ private fun placeIcon(sides: Workouts.Sides, indoor: Boolean): ImageVector = whe @Composable private fun PlaceRow(icon: ImageVector, tint: Color, title: String, note: String, trailing: (@Composable () -> Unit)?) { Row(Modifier.fillMaxWidth().padding(vertical = GlowLayout.RowPadding), verticalAlignment = Alignment.CenterVertically) { - Box(Modifier.size(44.dp).clip(RoundedCornerShape(14.dp)).background(tint.copy(alpha = 0.15f)), contentAlignment = Alignment.Center) { + Box(Modifier.size(44.dp).clip(GlowShapes.Icon).background(tint.copy(alpha = 0.15f)), contentAlignment = Alignment.Center) { Icon(icon, null, tint = tint, modifier = Modifier.size(24.dp)) } Spacer(Modifier.width(14.dp)) @@ -307,7 +298,7 @@ private fun ReadyPlanCard( var choosing by rememberSaveable { mutableStateOf(false) } Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) { IconPill( - shown.name, { onTyping(false); choosing = true }, icon = shown.icon, tint = TypingLime, caret = true, height = 40.dp, + shown.name, { onTyping(false); choosing = true }, icon = shown.icon, tint = LocalReadyBlend.current.chart, caret = true, height = 40.dp, description = stringResource(R.string.glow_ready_plan_description, shown.name, StartCopy.planHint(family)), ) } @@ -353,6 +344,7 @@ private fun kindNote(k: GoalKind, hasDistance: Boolean): String = when (k) { /** A plan's choice in the sheet (board ReadyKindSheet): its icon on a tile, its name, what the strap does, a tick when chosen. */ @Composable private fun KindRow(icon: ImageVector, label: String, note: String, on: Boolean, divider: Boolean, onClick: () -> Unit) { + val ink = LocalReadyBlend.current.chart Row( Modifier.fillMaxWidth() .topHairline(divider, RowHairline) @@ -361,14 +353,14 @@ private fun KindRow(icon: ImageVector, label: String, note: String, on: Boolean, horizontalArrangement = Arrangement.spacedBy(14.dp), ) { Box( - Modifier.size(40.dp).clip(RoundedCornerShape(12.dp)).background(if (on) TypingLime.copy(alpha = 0.14f) else Raised), + Modifier.size(40.dp).clip(GlowShapes.Icon).background(if (on) ink.copy(alpha = 0.14f) else Raised), contentAlignment = Alignment.Center, - ) { Icon(icon, null, tint = if (on) TypingLime else Color.White, modifier = Modifier.size(20.dp)) } + ) { Icon(icon, null, tint = if (on) ink else Color.White, modifier = Modifier.size(20.dp)) } Column(Modifier.weight(1f)) { Text(label, color = Color.White, style = GlowType.body) Text(note, color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary, modifier = Modifier.padding(top = 2.dp)) } - if (on) Icon(AppIcons.CheckCircle, null, tint = TypingLime, modifier = Modifier.size(20.dp)) + if (on) Icon(AppIcons.CheckCircle, null, tint = ink, modifier = Modifier.size(20.dp)) } } @@ -401,7 +393,7 @@ private fun ValueStepper(less: String, more: String, onLess: () -> Unit, onMore: @Composable private fun TapValue(parts: List>, hint: String?, onClick: () -> Unit) { Column( - Modifier.clip(RoundedCornerShape(12.dp)).clickable(onClickLabel = StartCopy.TAP_TO_TYPE, onClick = onClick).padding(horizontal = 8.dp), + Modifier.clip(GlowShapes.Icon).clickable(onClickLabel = StartCopy.TAP_TO_TYPE, onClick = onClick).padding(horizontal = 8.dp), horizontalAlignment = Alignment.CenterHorizontally, ) { Row { @@ -433,15 +425,16 @@ private fun TypedNumber( style: TextStyle = GlowType.goalValue, modifier: Modifier = Modifier, ) { + val ink = LocalReadyBlend.current.chart Row( modifier.drawBehind { val y = size.height - 1.dp.toPx() - drawLine(if (focused) TypingLime else Color.White.copy(alpha = 0.2f), Offset(0f, y), Offset(size.width, y), 2.dp.toPx()) + drawLine(if (focused) ink else Color.White.copy(alpha = 0.2f), Offset(0f, y), Offset(size.width, y), 2.dp.toPx()) }.padding(start = 6.dp, end = 6.dp, bottom = 6.dp), ) { BasicTextField( value, onValue, field.width(IntrinsicSize.Min).widthIn(min = 18.dp).alignByBaseline(), - textStyle = style.copy(color = Color.White), cursorBrush = SolidColor(TypingLime), singleLine = true, + textStyle = style.copy(color = Color.White), cursorBrush = SolidColor(ink), singleLine = true, keyboardOptions = KeyboardOptions(keyboardType = keyboard, imeAction = ime), keyboardActions = KeyboardActions(onDone = { onIme() }, onNext = { onIme() }), ) @@ -458,9 +451,6 @@ private val TextFieldValuesSaver = androidx.compose.runtime.saveable.listSaver v.chunked(3) { (t, a, b) -> TextFieldValue(t as String, TextRange(a as Int, b as Int)) } }, ) -/** The caret and underline of a number being typed. */ -private val TypingLime = MetricColors.steps - /** [text] with all of it selected, so the first key typed replaces it. */ private fun selected(text: String) = TextFieldValue(text, TextRange(0, text.length)) @@ -590,9 +580,9 @@ private fun ZoneGoal(goal: WorkoutTarget.Zones, onGoal: (WorkoutTarget.Zones) -> val on = z in goal.low..goal.high val color = ZONE_COLORS[z] Column( - Modifier.weight(1f).height(56.dp).clip(RoundedCornerShape(14.dp)).background(if (on) color else ZoneOff) + Modifier.weight(1f).height(56.dp).clip(GlowShapes.Icon).background(if (on) color else ZoneOff) .drawBehind { if (!on) drawRect(color, Offset(0f, size.height - 3.dp.toPx()), androidx.compose.ui.geometry.Size(size.width, 3.dp.toPx())) } - .pressClickable({ onGoal(WorkoutSetup.pickZone(goal, z)) }, RoundedCornerShape(14.dp)) + .pressClickable({ onGoal(WorkoutSetup.pickZone(goal, z)) }, GlowShapes.Icon) .semantics { selected = on; role = Role.Button }, horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center, @@ -610,7 +600,7 @@ private fun ZoneGoal(goal: WorkoutTarget.Zones, onGoal: (WorkoutTarget.Zones) -> } /** A zone button not chosen: dark, with its colour along the bottom. */ -private val ZoneOff = Color(0xFF1A1A1D) +private val ZoneOff = Color.White.copy(alpha = 0.08f) /** * Intervals: "6 × 400 m" over "with 90 s rest between". Any number taps to type, then on to the next: how many, each @@ -783,7 +773,7 @@ private const val SAVED = 1 /** One number of the intervals to tap and type, with its [unit] after it, on the shared baseline. */ @Composable internal fun RowScope.TapNumber(n: String, unit: String?, style: TextStyle, onClick: () -> Unit) { - Row(Modifier.alignByBaseline().clip(RoundedCornerShape(10.dp)).clickable(onClickLabel = StartCopy.TAP_TO_TYPE, onClick = onClick).padding(horizontal = 4.dp)) { + Row(Modifier.alignByBaseline().clip(GlowShapes.Small).clickable(onClickLabel = StartCopy.TAP_TO_TYPE, onClick = onClick).padding(horizontal = 4.dp)) { Text(n, color = Color.White, style = style, modifier = Modifier.alignByBaseline()) if (unit != null) { Spacer(Modifier.width(4.dp)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyPlans.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyPlans.kt index 9acc7387..3b26ae0b 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyPlans.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyPlans.kt @@ -22,7 +22,7 @@ import org.openstrap.app.R import org.openstrap.app.data.Structure import org.openstrap.app.data.Workouts import org.openstrap.app.ui.theme.AppIcons -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends import org.openstrap.app.ui.theme.SportIcons import org.openstrap.app.ui.workout.StartCopy @@ -210,7 +210,7 @@ internal fun ReadyRows(content: @Composable ColumnScope.() -> Unit) { Column(Modifier.fillMaxWidth().clip(GlowLayout.CardShape).background(ListSurface).padding(horizontal = 18.dp), content = content) } -/** Work and rest along the rounds, each as wide as its time: work in heart red, rest in sleep blue. */ +/** Work and rest along the rounds, each as wide as its time: work in flare pink, rest in deep teal. */ @Composable private fun RoundsStrip(s: Structure.Timed) { val described = pluralStringResource(R.plurals.glow_ready_rounds_description, s.rounds, s.rounds, s.work, s.rest) @@ -219,8 +219,8 @@ private fun RoundsStrip(s: Structure.Timed) { horizontalArrangement = Arrangement.spacedBy(2.dp), ) { repeat(s.rounds) { i -> - Box(Modifier.weight(s.work.toFloat()).height(10.dp).clip(CircleShape).background(MetricColors.heart)) - if (i < s.rounds - 1 && s.rest > 0) Box(Modifier.weight(s.rest.toFloat()).height(10.dp).clip(CircleShape).background(MetricColors.sleepDeep)) + Box(Modifier.weight(s.work.toFloat()).height(10.dp).clip(CircleShape).background(Blends.Intervals.chart)) + if (i < s.rounds - 1 && s.rest > 0) Box(Modifier.weight(s.rest.toFloat()).height(10.dp).clip(CircleShape).background(Blends.Intervals.chartSecond)) } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyScreen.kt index d5493b77..98177762 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyScreen.kt @@ -55,7 +55,9 @@ import org.openstrap.app.ui.components.pressClickable import org.openstrap.app.ui.components.rememberHaptics import org.openstrap.app.ui.theme.AppIcons import org.openstrap.app.ui.workout.StartCopy -import org.openstrap.app.ui.workout.familyColor +import org.openstrap.app.ui.workout.familyBlend +import org.openstrap.app.ui.theme.ScreenLight +import androidx.compose.runtime.CompositionLocalProvider import org.openstrap.app.data.Structure import androidx.compose.ui.unit.Dp import androidx.compose.foundation.layout.RowScope @@ -225,8 +227,10 @@ fun GlowWorkoutReadyScreen( ), ) } - WorkoutPage( - Color.Transparent, contentPadding, + val blend = familyBlend(family) + CompositionLocalProvider(LocalReadyBlend provides blend) { WorkoutPage( + // The family's blend from below for a run, from above for the rest (boards WorkoutReadyRun, WorkoutReadyStrength). + if (cardio) ScreenLight(blend, 225f, 0.9f, 520f) else ScreenLight(blend, 135f, 0.9f, 220f), contentPadding, // While a goal is typed the keyboard has the bottom of the screen. pinned = if (typing) null else ({ WorkoutButton(StartCopy.startLabel(type), Color.White, Color.Black, start, icon = AppIcons.PlayFill, height = 64.dp) }), ) { @@ -259,7 +263,7 @@ fun GlowWorkoutReadyScreen( ) return@WorkoutPage } - ReadyHeartCard(connection, liveHeartRate, familyColor(family)) + ReadyHeartCard(connection, liveHeartRate) when (family) { Workouts.Family.Strength -> StrengthPlanCard( type, sets, { sets = it; if (it != null) planSets = it }, planSets, restSeconds, { restSeconds = it }, typing, { typing = it }, @@ -288,7 +292,7 @@ fun GlowWorkoutReadyScreen( } PageSwitchRow(StartCopy.ASK_TO_END, StartCopy.ASK_TO_END_NOTE, askToEnd, { askToEnd = it }, divider = divider) } - } + } } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/WorkoutCapsule.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/WorkoutCapsule.kt index ae269999..fb8381bd 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/WorkoutCapsule.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/WorkoutCapsule.kt @@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -49,25 +48,30 @@ import org.openstrap.app.presentation.WorkoutCopy import org.openstrap.app.ui.workout.LiveGlance import org.openstrap.app.ui.workout.GlanceTint import org.openstrap.app.ui.workout.GlanceAction -import org.openstrap.app.ui.workout.ZONE_COLORS import org.openstrap.app.ui.theme.MetricColors import androidx.compose.ui.text.style.TextOverflow import org.openstrap.app.ui.glow.draw.LightAngle import org.openstrap.app.ui.glow.draw.GlowMotion import org.openstrap.app.ui.glow.draw.heroStyle import org.openstrap.app.ui.glow.draw.DotSize +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.workout.familyBlend +import org.openstrap.app.data.SportTypes import org.openstrap.app.ui.theme.ControlSurface /* ------------------------------------- Rest of the app meanwhile ------------------------------------- */ -/** The colour a [LiveGlance] is lit in ([GlanceTint]). */ -internal fun glanceColor(g: LiveGlance): Color = when (g.tint) { - GlanceTint.Zone -> g.zone?.let { ZONE_COLORS[it] } ?: PausedColor - GlanceTint.Work -> MetricColors.heart - GlanceTint.Rest -> Color(WorkoutColors.REST_GREEN) - GlanceTint.Mind -> MetricColors.evening +/** + * The colour a [LiveGlance] is lit in ([GlanceTint]): its family's blend's first stop (Intervals: pink for work, teal for + * rest), grey while paused. A heart zone is never the colour of a bar or a card, only of a small dot inside it. + */ +internal fun glanceColor(g: LiveGlance, sportType: Int = SportTypes.OUTDOOR_RUN): Color = when (g.tint) { + GlanceTint.Work -> Blends.Intervals.first + GlanceTint.Rest -> Blends.Intervals.second + GlanceTint.Mind -> Blends.MindAndBody.first GlanceTint.Paused -> PausedColor - GlanceTint.Asking -> MetricColors.warn + GlanceTint.Zone, GlanceTint.Asking -> familyBlend(Workouts.family(sportType)).first } /** An action's icon on the bar and the hero. */ @@ -89,9 +93,13 @@ private fun actionIcon(a: GlanceAction) = when (a) { * brings the live screen back. */ @Composable -fun WorkoutCapsule(glance: LiveGlance, onClick: () -> Unit, onAction: (GlanceAction) -> Unit, modifier: Modifier = Modifier) { - val color = glanceColor(glance) - val shape = RoundedCornerShape(50) +fun WorkoutCapsule( + glance: LiveGlance, onClick: () -> Unit, onAction: (GlanceAction) -> Unit, modifier: Modifier = Modifier, + /** The workout's sport, for its family's blend. */ + sportType: Int = SportTypes.OUTDOOR_RUN, +) { + val color = glanceColor(glance, sportType) + val shape = GlowShapes.Pill val quiet = glance.tint == GlanceTint.Mind Box( // Mind and body is quieter: 56 dp and no glow. @@ -142,7 +150,7 @@ fun WorkoutCapsule(glance: LiveGlance, onClick: () -> Unit, onAction: (GlanceAct /** A pill on the bar: white with its [icon] for the next action ([primary]), else dark, End with its red dot. */ @Composable private fun BarPill(label: String, primary: Boolean, icon: androidx.compose.ui.graphics.vector.ImageVector? = null, endDot: Boolean = false, onClick: () -> Unit) { - val shape = RoundedCornerShape(50) + val shape = GlowShapes.Pill Row( Modifier.height(44.dp).clip(shape).background(if (primary) Color.White else ControlSurface).pressClickable(onClick, shape) .padding(horizontal = 14.dp), @@ -169,7 +177,7 @@ private fun BarPill(label: String, primary: Boolean, icon: androidx.compose.ui.g */ @Composable internal fun LiveHero(glance: LiveGlance, sportType: Int, clock: String, onOpen: () -> Unit, onAction: (GlanceAction) -> Unit, modifier: Modifier) { - val color = glanceColor(glance) + val color = glanceColor(glance, sportType) val style = heroStyle(color, LightAngle.Below).let { s -> glance.bpm?.let { s.copy(motion = GlowMotion.Heartbeat(it)) } ?: s } GlowCard(style, modifier, onClick = onOpen) { Column { @@ -195,8 +203,8 @@ internal fun LiveHero(glance: LiveGlance, sportType: Int, clock: String, onOpen: } glance.progress?.let { p -> Spacer(Modifier.height(16.dp)) - Box(Modifier.fillMaxWidth().height(6.dp).clip(RoundedCornerShape(50)).background(Color.Black.copy(alpha = 0.4f))) { - Box(Modifier.fillMaxWidth(p.fraction).height(6.dp).clip(RoundedCornerShape(50)).background(Color.White)) + Box(Modifier.fillMaxWidth().height(6.dp).clip(GlowShapes.Pill).background(Color.Black.copy(alpha = 0.4f))) { + Box(Modifier.fillMaxWidth(p.fraction).height(6.dp).clip(GlowShapes.Pill).background(Color.White)) } } if (glance.goal != null || glance.toGo != null) { @@ -220,7 +228,7 @@ internal fun LiveHero(glance: LiveGlance, sportType: Int, clock: String, onOpen: } glance.next?.let { next -> Spacer(Modifier.height(16.dp)) - Column(Modifier.fillMaxWidth().clip(RoundedCornerShape(16.dp)).background(Color.Black.copy(alpha = 0.4f)).padding(14.dp)) { + Column(Modifier.fillMaxWidth().clip(GlowShapes.Tile).background(Color.Black.copy(alpha = 0.4f)).padding(14.dp)) { Text( stringResource(R.string.glow_workout_capsule_next), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, @@ -235,8 +243,8 @@ internal fun LiveHero(glance: LiveGlance, sportType: Int, clock: String, onOpen: dark?.let { a -> val label = glance.secondLabel.takeIf { a == glance.second } Box( - Modifier.height(52.dp).then(if (label == null) Modifier.size(52.dp) else Modifier).clip(RoundedCornerShape(50)) - .background(Color.Black.copy(alpha = 0.45f)).pressClickable({ onAction(a) }, RoundedCornerShape(50)) + Modifier.height(52.dp).then(if (label == null) Modifier.size(52.dp) else Modifier).clip(GlowShapes.Pill) + .background(Color.Black.copy(alpha = 0.45f)).pressClickable({ onAction(a) }, GlowShapes.Pill) .padding(horizontal = if (label == null) 0.dp else 18.dp), contentAlignment = Alignment.Center, ) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/WorkoutMap.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/WorkoutMap.kt index 5dcaca2b..7c171ab5 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/WorkoutMap.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/WorkoutMap.kt @@ -44,11 +44,11 @@ import java.util.Locale /** OpenFreeMap's dark style: no API key, no cookies; attribution is shown by the map's own button. */ private const val TILES_STYLE = "https://tiles.openfreemap.org/styles/dark" -/** The black of [BLANK_STYLE], for a map that can't be drawn. */ -private val RouteOnlyBlack = Color(0xFF0B0B0D) +/** The ground of [BLANK_STYLE], for a map that can't be drawn. */ +private val RouteOnlyBlack = org.openstrap.app.ui.theme.Ground /** "Route only": no tile requests at all, just the line on black. */ -private const val BLANK_STYLE = """{"version":8,"sources":{},"layers":[{"id":"bg","type":"background","paint":{"background-color":"#0B0B0D"}}]}""" +private const val BLANK_STYLE = """{"version":8,"sources":{},"layers":[{"id":"bg","type":"background","paint":{"background-color":"#030304"}}]}""" /** * A workout's route on a map, each stretch in its heart-rate zone's colour ([Route.byZone]), with a white dot where diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveDistance.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveDistance.kt index b15f71d3..3c1e3703 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveDistance.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveDistance.kt @@ -22,7 +22,6 @@ import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -58,14 +57,16 @@ import org.openstrap.app.ui.components.HapticEvent import org.openstrap.app.ui.components.rememberHaptics import org.openstrap.app.ui.glow.DotMatrixText import org.openstrap.app.ui.glow.draw.DotSize -import org.openstrap.app.ui.glow.PictureCard import org.openstrap.app.ui.glow.GlowType import org.openstrap.app.ui.glow.MediumBody import org.openstrap.app.ui.glow.TrendBad import org.openstrap.app.ui.glow.TrendGood import org.openstrap.app.ui.glow.activeSecondsState import org.openstrap.app.ui.glow.workoutColor -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.data.WorkoutTarget import org.openstrap.app.ui.glow.dotFitScale import org.openstrap.app.presentation.LiveView import org.openstrap.app.presentation.WorkoutCopy @@ -79,7 +80,7 @@ import org.openstrap.app.R /** * A distance workout with GPS (workouts spec 2.3, boards Run and Map): two views, swiped, under the moving time. Pace: - * the pace now large on a card lit in the distance lime, the average beside its title and a bar per kilometre, the one + * the pace now large on tinted glass in the distance blend, the average beside its title and a bar per kilometre, the one * under way growing; the heart rate on a strip in its zone's colour; then distance, climb and active kcal. Map: the * route in zone colours with the heart rate on it, then distance, pace and the last split. Opens on the view used last * ([liveView], saved through [onLiveView]). A ride shows its speed instead of a pace. With [split] the heart rate is on @@ -120,7 +121,9 @@ internal fun LiveDistanceScreen( LaunchedEffect(pager) { snapshotFlow { pager.settledPage }.drop(1).collect { saveView(it) } } val scope = rememberCoroutineScope() val connected = connection is ConnectionState.Connected + val blend = Blends.Distance val color = workoutColor(r, liveHeartRate, connected, heartZones) + val target = remember(r.workout.target) { WorkoutTarget.parse(r.workout.target) } val bpm = liveHeartRate.takeIf { connected && !r.paused } ZoneTick(bpm, r) val distance = r.workout.distanceMeters ?: 0f @@ -146,7 +149,7 @@ internal fun LiveDistanceScreen( val battery = (connection as? ConnectionState.Connected)?.batteryPercent if (r.paused) { LiveFrame( - r, color, connected, contentPadding, controls, lap, time = { active.value }, battery = battery, status = status, + r, blend, connected, contentPadding, controls, lap, time = { active.value }, battery = battery, status = status, paused = { LivePaused(r, liveHeartRate.takeIf { connected }, recent, listOf( Units.km(distance, Units.Precision.Workout) to stringResource(R.string.workout_live_figure_km), @@ -180,14 +183,14 @@ internal fun LiveDistanceScreen( when (LiveView.entries[page]) { // Reps (board RunIntervals): the total small on top, the rep the screen's number. LiveView.Heart -> if (reps) LiveFrame( - r, color, connected, pagePadding, controls, lap, time = { active.value }, smallTime = true, battery = battery, + r, blend, connected, pagePadding, controls, lap, time = { active.value }, smallTime = true, battery = battery, status = status, fill = true, title = stringResource(R.string.workout_live_reps_title, Workouts.sportName(r.workout.sportType)), bottomRoom = bar, ) { - RepPage(r, route, readings, bpm, color, compact, if (shortLandscape(compact)) Modifier else Modifier.weight(1f)) + RepPage(r, route, readings, bpm, color, target, connected, compact, if (shortLandscape(compact)) Modifier else Modifier.weight(1f)) } else LiveFrame( - r, color, connected, pagePadding, controls, lap, time = { active.value }, smallTime = compact, battery = battery, + r, blend, connected, pagePadding, controls, lap, time = { active.value }, smallTime = compact, battery = battery, status = status, fill = true, bottomRoom = bar, ) { if (compact) Box(Modifier.fillMaxWidth().weight(1f), contentAlignment = Alignment.Center) { @@ -198,8 +201,8 @@ internal fun LiveDistanceScreen( kcal?.active?.toInt()?.toString() to stringResource(R.string.workout_live_figure_active_kcal), )) } else Column(Modifier.fillMaxWidth().weight(1f), verticalArrangement = Arrangement.spacedBy(14.dp)) { - PaceCard(pace, averagePace, splits, speed, Modifier.weight(1f)) - if (!split) LitHeartPill(bpm, r.maxHeartRate, color, r.paused, 56.dp, Modifier.fillMaxWidth()) + PaceCard(pace, averagePace, splits, speed, blend, Modifier.weight(1f)) + if (!split) LiveStrip(Modifier.fillMaxWidth()) { LiveZoneStrip(bpm, r.maxHeartRate, r.paused, connected, target) } LiveFigures(listOf( Units.km(distance, Units.Precision.Workout) to stringResource(R.string.workout_live_figure_km), climb?.toInt()?.toString() to stringResource(R.string.workout_live_figure_climb), @@ -239,7 +242,8 @@ internal fun LiveDistanceScreen( */ @Composable private fun RepPage( - r: WorkoutState.Recording, route: List, readings: List>, bpm: Int?, color: Color, compact: Boolean, + r: WorkoutState.Recording, route: List, readings: List>, bpm: Int?, color: Color, + target: WorkoutTarget?, connected: Boolean, compact: Boolean, modifier: Modifier, ) { val now = nowTicking() @@ -317,7 +321,7 @@ private fun RepPage( } if (line != null) Text(line, color = Color.White, style = GlowType.sentence, textAlign = androidx.compose.ui.text.style.TextAlign.Center) } - LitHeartPill(bpm, r.maxHeartRate, color, r.paused, 56.dp, Modifier.fillMaxWidth()) + LiveStrip(Modifier.fillMaxWidth()) { LiveZoneStrip(bpm, r.maxHeartRate, r.paused, connected, target) } val done = r.rounds.filter { it.workEnd != null } if (done.isNotEmpty()) Row( Modifier.fillMaxWidth().horizontalScroll(rememberScrollState(Int.MAX_VALUE)), @@ -325,7 +329,7 @@ private fun RepPage( ) { done.forEach { round -> Row( - Modifier.clip(RoundedCornerShape(50)).background(org.openstrap.app.ui.glow.Raised).padding(horizontal = 14.dp, vertical = 9.dp), + Modifier.clip(GlowShapes.Pill).background(org.openstrap.app.ui.glow.Raised).padding(horizontal = 14.dp, vertical = 9.dp), verticalAlignment = Alignment.CenterVertically, ) { Text( @@ -359,12 +363,11 @@ internal fun speedText(secondsPerKm: Double?, locale: java.util.Locale = java.ut /** * The Pace card: "Pace" with the average beside it, the pace now in the card's one dotted number, and a bar per - * kilometre under it ([KmSplitBars]). Lit in the distance lime from its edge, so it never looks like the heart strip - * under it. + * kilometre under it ([KmSplitBars]). The hero's tinted glass in the distance blend (Steps), under it the clear glass zone strip. */ @Composable -private fun PaceCard(pace: Double?, averagePace: () -> Double?, splits: List, speed: Boolean, modifier: Modifier = Modifier) { - PictureCard(MetricColors.steps, modifier.fillMaxWidth()) { +private fun PaceCard(pace: Double?, averagePace: () -> Double?, splits: List, speed: Boolean, blend: Blend, modifier: Modifier = Modifier) { + LiveHero(blend, modifier, verticalArrangement = Arrangement.spacedBy(0.dp)) { Row(Modifier.fillMaxWidth()) { Text( stringResource(if (speed) R.string.workout_live_speed_title else R.string.workout_live_pace_title), color = Color.White, @@ -391,7 +394,7 @@ private fun PaceCard(pace: Double?, averagePace: () -> Double?, splits: List Double?, speed: Boolean) { * by its kilometre. */ @Composable -private fun KmSplitBars(splits: List) { +private fun KmSplitBars(splits: List, blend: Blend) { val shown = splits.takeLast(SPLIT_SLOTS) val done = splits.filter { it.meters >= 1000 } val fastest = done.minByOrNull { it.pace } @@ -433,19 +436,21 @@ private fun KmSplitBars(splits: List) { } val best = s == fastest Column(Modifier.weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(4.dp)) { - val lime = MetricColors.steps Canvas(Modifier.fillMaxWidth().height(30.dp)) { val h = size.height * height val corner = CornerRadius(5.dp.toPx()) if (underWay) { val filled = size.height * (s.meters / 1000).toFloat().coerceIn(0f, 1f) - drawRoundRect(lime.copy(alpha = 0.35f), Offset(0f, size.height - filled), Size(size.width, filled), corner) + drawRoundRect(blend.second.copy(alpha = 0.45f), Offset(0f, size.height - filled), Size(size.width, filled), corner) val w = 1.5.dp.toPx() drawRoundRect( - lime.copy(alpha = 0.6f), Offset(w / 2, w / 2), Size(size.width - w, size.height - w), corner, + blend.second.copy(alpha = 0.7f), Offset(w / 2, w / 2), Size(size.width - w, size.height - w), corner, style = androidx.compose.ui.graphics.drawscope.Stroke(w), ) - } else drawRoundRect(if (best) lime else lime.copy(alpha = 0.35f), Offset(0f, size.height - h), Size(size.width, h), corner) + } else if (best) drawRoundRect( + androidx.compose.ui.graphics.Brush.verticalGradient(listOf(blend.second, blend.first), startY = size.height - h, endY = size.height), + Offset(0f, size.height - h), Size(size.width, h), corner, + ) else drawRoundRect(blend.first.copy(alpha = 0.35f), Offset(0f, size.height - h), Size(size.width, h), corner) } Text( if (underWay) stringResource(R.string.workout_live_split_km, s.index + 1) else workoutClock(s.seconds), diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveFrame.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveFrame.kt index 0eda9109..50271c65 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveFrame.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveFrame.kt @@ -7,6 +7,7 @@ import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.tween import androidx.compose.foundation.Canvas import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -73,13 +74,15 @@ import androidx.compose.ui.unit.sp import java.time.Instant import java.time.ZoneId import java.time.format.DateTimeFormatter -import androidx.compose.foundation.shape.RoundedCornerShape import org.openstrap.app.presentation.WorkoutCopy import org.openstrap.app.data.WorkoutRecorder import org.openstrap.app.ui.glow.draw.DotSize import org.openstrap.app.ui.dashboard.LocalHeartZones import androidx.compose.ui.res.stringResource import org.openstrap.app.R +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.ScreenLight /** * The live stats row's figures, unchanged from before spec 6.3 ("Stats row unchanged"): the moving time large in the @@ -87,7 +90,7 @@ import org.openstrap.app.R * live clock read at arm's length isn't one of spec 2.3's. */ internal val LiveClock = GlowType.sentence.copy(fontSize = 46.sp, lineHeight = 50.sp, letterSpacing = (-0.02).em, fontFeatureSettings = "tnum") -internal val LiveFigure = GlowType.sentence.copy(fontSize = 26.sp, lineHeight = 30.sp, letterSpacing = (-0.02).em, fontFeatureSettings = "tnum") +internal val LiveFigure = GlowType.sentence.copy(fontSize = 24.sp, lineHeight = 28.sp, letterSpacing = (-0.02).em, fontFeatureSettings = "tnum") /** What every live screen can do to the workout, passed down as one. */ @androidx.compose.runtime.Immutable @@ -113,7 +116,8 @@ internal class LiveControls( @Composable internal fun LiveFrame( r: WorkoutState.Recording, - color: Color, + /** The family's blend (Workouts board): the screen's light and the dot in the sport's pill. Zones never light a screen. */ + blend: Blend, connected: Boolean, contentPadding: PaddingValues, controls: LiveControls, @@ -130,6 +134,10 @@ internal fun LiveFrame( /** The pill's words when more than the sport's name ("HIIT, Tabata"). */ title: String? = null, backdrop: androidx.compose.ui.graphics.Brush? = null, + /** Where the light comes from (degrees, 270 below) and how strong; the live screens rise from below. */ + lightAngle: Float = 270f, + lightStrength: Float = 0.85f, + lightY: Float = 400f, /** Mind and body (board LiveMind): the sport's name plain and centred, no strap status, and two dark buttons. */ quiet: Boolean = false, /** Under a quiet screen's buttons, the line saying a tap lights it; left out where there's no room for it. */ @@ -139,6 +147,8 @@ internal fun LiveFrame( * under the pager, so the page only leaves this much room for them. */ bottomRoom: Dp? = null, + /** Strength: the screen's own action (Set done, Start set N) in Pause's place, Pause on the left ([lap]). */ + center: (@Composable () -> Unit)? = null, content: @Composable ColumnScope.() -> Unit, ) { BackHandler(onBack = controls.onMinimize) @@ -147,7 +157,7 @@ internal fun LiveFrame( val landscape = LocalLiveLandscape.current // On its side the screen keeps a wider column than a page's, so the content and the controls fit side by side. CompositionLocalProvider(LocalPageColumn provides if (landscape) GlowLayout.MaxContentWidth else LocalPageColumn.current) { - WorkoutPage(color, contentPadding, scroll = false, backdrop = backdrop) { + WorkoutPage(ScreenLight(blend, lightAngle, lightStrength, heroCenterY = lightY), contentPadding, scroll = false, backdrop = backdrop) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { RoundIcon(AppIcons.CaretDown, stringResource(R.string.workout_live_minimize), controls.onMinimize) if (quiet) { @@ -161,7 +171,7 @@ internal fun LiveFrame( } Spacer(Modifier.width(10.dp)) // The pill takes what the status leaves, so on a narrow screen the sport's name gives way, not the status. - Box(Modifier.weight(1f)) { IconPill(title ?: Workouts.sportName(r.workout.sportType), null, dot = color) } + Box(Modifier.weight(1f)) { IconPill(title ?: Workouts.sportName(r.workout.sportType), null, dot = blend.first) } Spacer(Modifier.width(10.dp)) Column(horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.spacedBy(2.dp)) { val strap = when { @@ -185,7 +195,7 @@ internal fun LiveFrame( if (landscape) { LandscapePanes( r, connected, controls, bigTime, bottomRoom != null, paused, - frameControls = { FrameControls(r, controls, lap, labelled, paused != null, quiet, tapHint) }, + frameControls = { FrameControls(r, controls, lap, labelled, paused != null, quiet, tapHint, center) }, content = content, ) return@WorkoutPage @@ -202,7 +212,7 @@ internal fun LiveFrame( if (r.endFailed) NotSavedNotice(controls.onEnd) r.endPrompt?.let { at -> StoppedPrompt(r, at, controls.onEndAtPrompt, controls.onKeepGoing) } if (!fill || r.paused) Spacer(Modifier.weight(1f)) - FrameControls(r, controls, lap, labelled, paused != null, quiet, tapHint) + FrameControls(r, controls, lap, labelled, paused != null, quiet, tapHint, center) } } } @@ -304,7 +314,7 @@ private val LandscapeGap = 24.dp @Composable private fun ColumnScope.FrameControls( r: WorkoutState.Recording, controls: LiveControls, lap: (@Composable () -> Unit)?, labelled: Boolean, hasPaused: Boolean, - quiet: Boolean, tapHint: Boolean, + quiet: Boolean, tapHint: Boolean, center: (@Composable () -> Unit)? = null, ) { when { r.paused && hasPaused -> { @@ -323,7 +333,7 @@ private fun ColumnScope.FrameControls( // With no [paused] view, a paused quiet screen keeps this row, so it turns into Resume. val label = stringResource(if (r.paused) R.string.workout_live_resume else R.string.workout_live_pause) Labelled(label, true) { - FlatButton(Raised, 64.dp, onClick = if (r.paused) controls.onResume else controls.onPause) { + FlatButton(Raised, 88.dp, onClick = if (r.paused) controls.onResume else controls.onPause) { Icon(if (r.paused) AppIcons.PlayFill else AppIcons.PauseFill, label, tint = Color.White, modifier = Modifier.size(20.dp)) } } @@ -333,7 +343,7 @@ private fun ColumnScope.FrameControls( Spacer(Modifier.height(8.dp)) } else -> { - ControlsRow(r, controls, lap, labelled, Modifier.align(Alignment.CenterHorizontally)) + ControlsRow(r, controls, lap, labelled, Modifier.align(Alignment.CenterHorizontally), center) if (!labelled) ControlsHint(stringResource(R.string.workout_live_hold_square_hint)) // A little room under the controls, so they sit up off the screen's edge. Spacer(Modifier.height(20.dp)) @@ -353,14 +363,17 @@ private fun ControlsHint(text: String, alpha: Float = 0.6f) = Text( * middle and largest, and the square to hold to end, [labelled] under each on the screens built for each sport. */ @Composable -internal fun ControlsRow(r: WorkoutState.Recording, controls: LiveControls, lap: (@Composable () -> Unit)?, labelled: Boolean, modifier: Modifier = Modifier) { +internal fun ControlsRow( + r: WorkoutState.Recording, controls: LiveControls, lap: (@Composable () -> Unit)?, labelled: Boolean, modifier: Modifier = Modifier, + center: (@Composable () -> Unit)? = null, +) { // At most a thumb's reach wide, so on a wide screen (an unfolded or half-folded phone) Lap and End stay by Pause. Row(modifier.widthIn(max = 360.dp).fillMaxWidth().padding(horizontal = 12.dp), verticalAlignment = Alignment.Top) { val pauseLabel = stringResource(if (r.paused) R.string.workout_live_resume else R.string.workout_live_pause) // Pause stays centred with or without the left button. The left button labels itself ([LapButton]). if (lap != null) lap() else Spacer(Modifier.size(64.dp)) Spacer(Modifier.weight(1f)) - Labelled(pauseLabel, labelled) { + if (center != null && !r.paused) center() else Labelled(pauseLabel, labelled) { FlatButton(Color.White, 88.dp, onClick = if (r.paused) controls.onResume else controls.onPause) { Icon(if (r.paused) AppIcons.PlayFill else AppIcons.PauseFill, pauseLabel, tint = Color.Black, modifier = Modifier.size(30.dp)) } @@ -370,6 +383,17 @@ internal fun ControlsRow(r: WorkoutState.Recording, controls: LiveControls, lap: } } +/** The centre of the controls row for a screen's own action (Strength's Set done): 88 dp white, its label bold under it. */ +@Composable +internal fun CenterAction(label: String, icon: androidx.compose.ui.graphics.vector.ImageVector, onClick: () -> Unit) { + Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(6.dp)) { + Box(Modifier.height(88.dp), contentAlignment = Alignment.Center) { + FlatButton(Color.White, 88.dp, onClick = onClick) { Icon(icon, label, tint = Color.Black, modifier = Modifier.size(30.dp)) } + } + Text(label, color = Color.White, style = GlowType.secondary.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), maxLines = 1) + } +} + /** A control on the controls row, with its [label] under it on the screens that label them ([show]). */ @Composable private fun Labelled(label: String, show: Boolean, button: @Composable () -> Unit) { @@ -380,6 +404,15 @@ private fun Labelled(label: String, show: Boolean, button: @Composable () -> Uni } } +/** Pause on the controls row's left, where the centre is the screen's own action ([CenterAction]). */ +@Composable +internal fun PauseSideButton(onPause: () -> Unit) { + val text = stringResource(R.string.workout_live_pause) + Labelled(text, true) { + FlatButton(Raised, 64.dp, onClick = onPause) { Icon(AppIcons.PauseFill, text, tint = Color.White, modifier = Modifier.size(22.dp)) } + } +} + /** The controls row's left button: Lap, which marks a lap, or Skip ([skip]), with its label on the labelled screens. */ @Composable internal fun LapButton(onLap: () -> Unit, label: Boolean = false, skip: Boolean = false) { @@ -400,7 +433,7 @@ private fun HoldPill(label: String, onEnd: () -> Unit, modifier: Modifier) { val progress = remember { Animatable(0f) } val haptics = rememberHaptics() val described = stringResource(R.string.workout_live_hold_to_end_description) - val shape = androidx.compose.foundation.shape.RoundedCornerShape(50) + val shape = GlowShapes.Pill Row( modifier.height(64.dp).clip(shape).background(Raised) .drawBehind { drawRect(EndRed.copy(alpha = 0.35f), size = size.copy(width = size.width * progress.value)) } @@ -508,7 +541,7 @@ private val DotsRowHeight = 28.dp internal fun LiveStat(label: String, modifier: Modifier = Modifier, value: @Composable () -> Unit) { Column(modifier, horizontalAlignment = Alignment.CenterHorizontally) { value() - Text(label, color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary) + Text(label, color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary) } } @@ -531,6 +564,7 @@ internal fun FlatButton(container: Color, size: Dp, modifier: Modifier = Modifie // Flat, like the app's Start and Done: the live screen's card already carries the glow. Box( modifier.size(size).clip(CircleShape).background(container) + .then(if (container == EndSurface) Modifier.border(1.dp, EndRed.copy(alpha = 0.35f), CircleShape) else Modifier) .then(if (onClick != null) Modifier.pressClickable(onClick, CircleShape) else Modifier), contentAlignment = Alignment.Center, ) { content() } @@ -571,7 +605,7 @@ internal fun HoldToEnd(onEnd: () -> Unit) { val haptics = rememberHaptics() Box(contentAlignment = Alignment.Center) { FlatButton( - Raised, 64.dp, + EndSurface, 64.dp, Modifier.pointerInput(Unit) { detectTapGestures(onPress = { coroutineScope { @@ -601,6 +635,9 @@ internal fun HoldToEnd(onEnd: () -> Unit) { } internal val EndRed = MetricColors.heart + +/** The end button's glass: the heart red at 16%, its ring at 35% (boards, every live screen). */ +internal val EndSurface = EndRed.copy(alpha = 0.16f) private const val HOLD_MS = 2000 /** A live clock in white, its own scope: the second it reads composes it again, not the screen around it. */ @@ -623,30 +660,30 @@ internal fun nowTickingState(): androidx.compose.runtime.State = produceSt } /** - * The live heart rate on a pill lit in the zone's [color] (pattern D5): a dot beating at it, the bpm in small dots and - * the zone named when [maxHr] is given, all in black on the colour. The pace page's strip and the map's chip, [height] - * apart. Paused or without a reading, it says so. + * The live heart rate on a dark glass pill (the map's chip): a dot in the zone's [color] beating at it, the bpm in small + * dots and the zone named when [maxHr] is given, all in white. Zones stay small, so the pill itself is never lit by one. + * [height] apart. Paused or without a reading, it says so. */ @Composable internal fun LitHeartPill(bpm: Int?, maxHr: Int?, color: Color, paused: Boolean, height: Dp, modifier: Modifier = Modifier) { val heartZones = LocalHeartZones.current Row( - modifier.height(height).clip(RoundedCornerShape(50)).background(color).padding(horizontal = 18.dp), + modifier.height(height).clip(GlowShapes.Pill).background(Color.Black.copy(alpha = 0.55f)).padding(horizontal = 18.dp), verticalAlignment = Alignment.CenterVertically, ) { if (bpm == null) { - Text(WorkoutCopy.noHeartRate(paused), color = Color.Black, style = MediumBody) + Text(WorkoutCopy.noHeartRate(paused), color = Color.White, style = MediumBody) return@Row } - org.openstrap.app.ui.glow.PulseDot(Color.Black, bpm, 8.dp) + org.openstrap.app.ui.glow.PulseDot(color, bpm, 8.dp) Spacer(Modifier.width(10.dp)) - DotMatrixText("$bpm", dot = DotSize.Edge, color = Color.Black) + DotMatrixText("$bpm", dot = DotSize.Edge, color = Color.White) Spacer(Modifier.width(6.dp)) - Text(stringResource(R.string.workout_live_unit_bpm), color = Color.Black, style = MediumBody) + Text(stringResource(R.string.workout_live_unit_bpm), color = Color.White.copy(alpha = 0.75f), style = MediumBody) if (maxHr == null) return@Row Spacer(Modifier.weight(1f)) WorkoutRecorder.liveZone(bpm, maxHr, heartZones)?.let { z -> - Text(WorkoutCopy.zoneLine(z), color = Color.Black, style = MediumBody, maxLines = 1) + Text(WorkoutCopy.zoneLine(z), color = Color.White, style = MediumBody, maxLines = 1) } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGame.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGame.kt index 3b1fec8b..00fad894 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGame.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGame.kt @@ -25,17 +25,14 @@ import org.openstrap.app.device.ConnectionState import org.openstrap.app.device.WorkoutState import org.openstrap.app.ui.glow.HeroValue import org.openstrap.app.ui.glow.draw.DotSize -import org.openstrap.app.ui.glow.GlowCard -import org.openstrap.app.ui.glow.draw.GlowMotion +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.data.WorkoutTarget import org.openstrap.app.ui.glow.GlowType import org.openstrap.app.ui.glow.Segment import org.openstrap.app.ui.glow.SegmentBar -import org.openstrap.app.ui.glow.draw.LightAngle import org.openstrap.app.ui.glow.WorkoutButton import org.openstrap.app.ui.glow.activeSecondsState -import org.openstrap.app.ui.glow.draw.heroStyle import org.openstrap.app.ui.glow.workoutClock -import org.openstrap.app.ui.glow.workoutColor import org.openstrap.app.ui.theme.AppIcons import org.openstrap.app.ui.workout.StartCopy import org.openstrap.app.presentation.WorkoutCopy @@ -73,7 +70,8 @@ internal fun LiveGameScreen( val connected = connection is ConnectionState.Connected val bpm = liveHeartRate.takeIf { connected && !r.paused } ZoneTick(bpm, r) - val color = workoutColor(r, liveHeartRate, connected, heartZones) + val blend = Blends.Games + val target = remember(r.workout.target) { WorkoutTarget.parse(r.workout.target) } val periods = r.structure as? Structure.Periods // The phase alone picks the buttons; its clock is read in [PeriodRow], so the screen holds still between seconds. val phase = remember(r) { androidx.compose.runtime.derivedStateOf { r.phase(now.value) } }.value @@ -86,23 +84,28 @@ internal fun LiveGameScreen( hard.toString() to stringResource(R.string.workout_live_figure_hard_efforts), ) LiveFrame( - r, color, connected, contentPadding, controls, time = { active.value }, smallTime = compact || periods != null, + r, blend, connected, contentPadding, controls, time = { active.value }, smallTime = compact || periods != null, paused = { LivePaused(r, liveHeartRate.takeIf { connected }, readings, figures) }, ) { if (periods != null && phase != null) PeriodRow(r, periods, phase, { now.value }, { active.value }) - val style = heroStyle(color, LightAngle.Below).let { s -> bpm?.let { s.copy(motion = GlowMotion.Heartbeat(it)) } ?: s } - if (split) EffortBar(effort) else GlowCard(style, Modifier.fillMaxWidth()) { - Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { - Row(verticalAlignment = androidx.compose.ui.Alignment.Bottom) { - if (bpm != null) HeroValue("$bpm", stringResource(R.string.workout_live_unit_bpm), dot = DotSize.Detail) - else Text(WorkoutCopy.noHeartRate(r.paused, connected), color = Color.White, style = GlowType.sentence) - Spacer(Modifier.weight(1f)) - WorkoutRecorder.liveZone(bpm, r.maxHeartRate, heartZones)?.let { z -> - Text(WorkoutCopy.zoneLine(z), color = Color.White, style = GlowType.secondary) - } + if (split) EffortCard(effort) else { + // The heart on tinted glass: the zone named with its dot, the reading in the live dots, the zone's track. + LiveHero(blend) { + val zone = WorkoutRecorder.liveZone(bpm, r.maxHeartRate, heartZones) + Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically) { + if (zone != null) { + org.openstrap.app.ui.glow.PulseDot(ZONE_COLORS[zone], bpm, 8.dp) + Spacer(Modifier.width(8.dp)) + Text(WorkoutCopy.zoneLine(zone), color = Color.White, style = GlowType.cardTitle, maxLines = 1) + } else Text(WorkoutCopy.noZone(r.paused), color = Color.White, style = GlowType.cardTitle, maxLines = 1) } - EffortBar(effort) + Spacer(Modifier.height(10.dp)) + if (bpm != null) HeroValue("$bpm", stringResource(R.string.workout_live_unit_bpm), dot = DotSize.Live, maxWidth = 280.dp) + else Text(WorkoutCopy.noHeartRate(r.paused, connected), color = Color.White, style = GlowType.sentence) + Spacer(Modifier.height(14.dp)) + ZoneTrack(bpm, r.maxHeartRate, target as? WorkoutTarget.Zones) } + EffortCard(effort) } LiveFigures(figures) Spacer(Modifier.weight(1f)) @@ -133,18 +136,23 @@ private fun PeriodRow(r: WorkoutState.Recording, periods: Structure.Periods, pha } } -/** Effort 1 to 5 as five steps, lit up to it in the zones' colours, "Effort 3 of 5" beside them. */ +/** The effort card: clear glass under the heart card, [EffortBar] on it. */ +@Composable +private fun EffortCard(effort: Int?) = LiveStrip(Modifier.fillMaxWidth()) { EffortBar(effort) } + +/** + * Effort 1 to 5 as five blocks, lit up to it in the zones' flat colours (the others white at 12%), "4 of 5 effort" + * above them in the dots, "From your time in zones" beside it (board LiveGame). + */ @Composable internal fun EffortBar(effort: Int?) { val of = effort?.let { stringResource(R.string.workout_live_effort_of, it) } val described = of ?: stringResource(R.string.workout_live_effort_none) - Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically) { + Column(verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.semantics { contentDescription = described }) { + Text(of ?: stringResource(R.string.workout_live_effort), color = Color.White, style = GlowType.secondary) SegmentBar( - List(5) { i -> Segment(1f, if (effort != null && i < effort) ZONE_COLORS[i] else Color.Black.copy(alpha = 0.35f)) }, - Modifier.weight(1f).semantics { contentDescription = described }, - height = 8.dp, gap = 4.dp, + List(5) { i -> Segment(1f, if (effort != null && i < effort) ZONE_COLORS[i] else Color.White.copy(alpha = 0.12f)) }, + height = 28.dp, gap = 6.dp, corner = 10.dp, ends = 10.dp, ) - Spacer(Modifier.width(12.dp)) - Text(of ?: stringResource(R.string.workout_live_effort), color = Color.White, style = GlowType.secondary) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGlass.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGlass.kt new file mode 100644 index 00000000..56d4fbc5 --- /dev/null +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGlass.kt @@ -0,0 +1,159 @@ +package org.openstrap.app.ui.glow.live + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.border +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import org.openstrap.app.R +import org.openstrap.app.data.WorkoutRecorder +import org.openstrap.app.data.WorkoutTarget +import org.openstrap.app.presentation.WorkoutCopy +import org.openstrap.app.ui.dashboard.LocalHeartZones +import org.openstrap.app.ui.glow.GlowType +import org.openstrap.app.ui.glow.DotMatrixText +import org.openstrap.app.ui.glow.draw.DotSize +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass +import org.openstrap.app.ui.theme.litEdge +import org.openstrap.app.ui.theme.tintedGlass +import org.openstrap.app.ui.workout.ZONE_COLORS + +/* + * The glass the live screens share (Glow × Glass, boards LiveDistance to LiveGame): the hero is tinted glass in the + * family's blend, every other card clear glass, and the heart rate's zone is only ever drawn small, as a dot and a + * track of five steps. The screen's own light is the family's blend ([LiveFrame]); a zone never lights a screen. + */ + +/** The live screen's hero: tinted glass in the family's [blend], 20 dp in from its edges. */ +@Composable +internal fun LiveHero( + blend: Blend, modifier: Modifier = Modifier, padding: PaddingValues = PaddingValues(start = 20.dp, top = 16.dp, end = 20.dp, bottom = 16.dp), + verticalArrangement: Arrangement.Vertical = Arrangement.Top, horizontalAlignment: Alignment.Horizontal = Alignment.Start, + content: @Composable ColumnScope.() -> Unit, +) = Column( + modifier.fillMaxWidth().clip(GlowShapes.Card).tintedGlass(blend, GlowShapes.Card).padding(padding), + verticalArrangement = verticalArrangement, horizontalAlignment = horizontalAlignment, content = content, +) + +/** A live card that isn't the hero: clear glass. */ +@Composable +internal fun LiveStrip( + modifier: Modifier = Modifier, padding: PaddingValues = PaddingValues(start = 18.dp, top = 14.dp, end = 18.dp, bottom = 16.dp), + verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(12.dp), content: @Composable ColumnScope.() -> Unit, +) = Column( + modifier.fillMaxWidth().clip(GlowShapes.Card).clearGlass(GlowShapes.Card).padding(padding), + verticalArrangement = verticalArrangement, content = content, +) + +/** A zone's flat colour as the small dot beside its name. */ +@Composable +internal fun ZoneDot(zone: Int?, size: Dp = 8.dp, modifier: Modifier = Modifier) = + Box(modifier.size(size).clip(CircleShape).background(zone?.let { ZONE_COLORS[it] } ?: Color.White)) + +/** + * The zone strip (ZoneStrip board), one part under every heart card: the reading in 3 dp dots with "bpm", the zone named + * on the right with its dot, then the track of five equal steps in zone order, dim, the current one lit and glowing, the + * marker exactly where [bpm] sits, and the target (if one is set) outlined. Zones stay small: never the screen's light. + */ +@Composable +internal fun LiveZoneStrip( + bpm: Int?, maxHr: Int, paused: Boolean, connected: Boolean, target: WorkoutTarget?, modifier: Modifier = Modifier, + /** Left out where the reading is the hero already and the strip is only the track ([Games]'s heart card). */ + reading: Boolean = true, +) { + val zones = LocalHeartZones.current + val zone = WorkoutRecorder.liveZone(bpm, maxHr, zones) + Column(modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(12.dp)) { + if (reading) Row(verticalAlignment = Alignment.Bottom) { + if (bpm != null) { + DotMatrixText(bpm.toString(), dot = DotSize.Edge) + Spacer(Modifier.width(8.dp)) + Text(stringResource(R.string.workout_live_unit_bpm), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary) + } else Text(WorkoutCopy.noHeartRate(paused, connected), color = Color.White, style = GlowType.sentence) + Spacer(Modifier.weight(1f)) + Row(verticalAlignment = Alignment.CenterVertically) { + if (zone != null) { + ZoneDot(zone) + Spacer(Modifier.width(7.dp)) + Text(WorkoutCopy.zoneLine(zone), color = Color.White, style = GlowType.secondary.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), maxLines = 1) + } else Text(WorkoutCopy.noZone(paused), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary, maxLines = 1) + } + } + ZoneTrack(bpm, maxHr, (target as? WorkoutTarget.Zones)) + } +} + +/** The five-step track alone: dim steps, the current lit with a glow, the white marker, the target outlined. */ +@Composable +internal fun ZoneTrack(bpm: Int?, maxHr: Int, target: WorkoutTarget.Zones?, modifier: Modifier = Modifier) { + val zones = LocalHeartZones.current + val zone = WorkoutRecorder.liveZone(bpm, maxHr, zones) + val described = zone?.let { WorkoutCopy.zoneLine(it) } ?: stringResource(R.string.workout_live_effort_none) + BoxWithConstraints(modifier.fillMaxWidth().height(16.dp).semantics { contentDescription = described }) { + val gap = 3.dp + val step = (maxWidth - gap * 4) / 5 + Row(Modifier.align(Alignment.Center), horizontalArrangement = Arrangement.spacedBy(gap)) { + for (z in 0 until 5) { + val on = z == zone + Box( + Modifier.width(step).height(10.dp) + .then(if (on) Modifier.shadow(7.dp, GlowShapes.Pill, ambientColor = ZONE_COLORS[z], spotColor = ZONE_COLORS[z]) else Modifier) + .clip(GlowShapes.Pill).background(ZONE_COLORS[z].copy(alpha = if (on) 1f else 0.26f)), + ) + } + } + if (target != null) { + val lo = target.low.coerceIn(0, 4) + val hi = target.high.coerceIn(lo, 4) + Box( + Modifier.offset(x = (step + gap) * lo - 3.dp).width(step * (hi - lo + 1) + gap * (hi - lo) + 6.dp).height(16.dp) + .border(1.5.dp, Color.White.copy(alpha = 0.7f), GlowShapes.Tile), + ) + } + if (bpm != null) { + val p = WorkoutRecorder.zonePosition(bpm, maxHr, zones).coerceIn(0f, 1f) + Box( + Modifier.offset(x = maxWidth * p - 11.dp).align(Alignment.CenterStart).size(22.dp).clip(CircleShape) + .background(Color.Black.copy(alpha = 0.55f)), + contentAlignment = Alignment.Center, + ) { Box(Modifier.size(16.dp).clip(CircleShape).background(Color.White)) } + } + } +} + +/** The dark card the phase light shows round (HIIT, boards LiveIntervals): near black at 40% with a lit edge. */ +@Composable +internal fun LiveDarkCard( + modifier: Modifier = Modifier, horizontalAlignment: Alignment.Horizontal = Alignment.Start, + verticalArrangement: Arrangement.Vertical = Arrangement.Top, content: @Composable ColumnScope.() -> Unit, +) = Column( + modifier.fillMaxWidth().clip(GlowShapes.Card).background(Color.Black.copy(alpha = 0.42f), GlowShapes.Card) + .litEdge(GlowShapes.Card, top = 0.12f, ring = 0.05f).padding(20.dp), + verticalArrangement = verticalArrangement, horizontalAlignment = horizontalAlignment, content = content, +) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt index 290c87ba..694e57d1 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt @@ -55,10 +55,9 @@ import org.openstrap.app.ui.glow.* import org.openstrap.app.presentation.WorkoutCopy import org.openstrap.app.ui.workout.ZONE_COLORS import org.openstrap.app.ui.workout.ZoneSeconds -import org.openstrap.app.ui.glow.draw.GlowMotion -import org.openstrap.app.ui.glow.draw.GlowStyle +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends import org.openstrap.app.ui.glow.draw.DotSize -import org.openstrap.app.ui.glow.draw.chart import org.openstrap.app.ui.dashboard.LocalHeartZones import androidx.compose.ui.res.stringResource import org.openstrap.app.R @@ -125,7 +124,7 @@ fun GlowWorkoutLiveScreen( // way, so what a screen saves outlives a turn of the phone. val landscape = !split && maxWidth > maxHeight val cutout = if (!landscape) Modifier - else Modifier.background(Color.Black).windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal)) + else Modifier.background(org.openstrap.app.ui.theme.Ground).windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal)) CompositionLocalProvider(LocalLiveLandscape provides landscape) { Box(Modifier.fillMaxSize().then(cutout)) { when { @@ -212,8 +211,8 @@ internal fun ZoneArc(bpm: Int?, maxHr: Int, modifier: Modifier) { val start = ARC_START + z * (seg + ARC_GAP) val on = z == zone // The lit segment glows: a wide soft stroke of itself under it. - if (on) drawArc(ZONE_COLORS[z].copy(alpha = 0.3f), start, seg, false, topLeft, box, style = Stroke(stroke * 2.6f, cap = StrokeCap.Round)) - drawArc(ZONE_COLORS[z].copy(alpha = if (on) 1f else 0.22f), start, seg, false, topLeft, box, style = Stroke(stroke, cap = StrokeCap.Round)) + if (on) drawArc(ZONE_COLORS[z].copy(alpha = 0.3f), start, seg, false, topLeft, box, style = Stroke(stroke * 2.2f, cap = StrokeCap.Round)) + drawArc(ZONE_COLORS[z].copy(alpha = if (on) 1f else 0.4f), start, seg, false, topLeft, box, style = Stroke(stroke, cap = StrokeCap.Round)) } if (bpm != null) { val a = Math.toRadians((ARC_START + WorkoutRecorder.zonePosition(bpm, maxHr, heartZones) * ARC_SWEEP).toDouble()) @@ -226,9 +225,10 @@ internal fun ZoneArc(bpm: Int?, maxHr: Int, modifier: Modifier) { } /** - * The live heart card: the beating number on its zone arc over the last ten minutes, then the zone, its range and the - * time in it. Its light reaches as high as the zone (spec 2.5); paused, it drops to an outline of the same layout - * (pattern D1). With [fill] it takes all the height it's given and the number grows, for the standing half of a fold. + * The live heart card (board LiveIndoor): tinted glass in the family's [blend], the zone named with its dot and the time + * in it above, the beating number inside the zone arc over the last ten minutes, the zone's range under it. Paused, the + * number goes and the words say so. With [fill] it takes all the height it's given and the number grows, for the + * standing half of a fold. */ @Composable internal fun WorkoutHeartCard( @@ -245,22 +245,31 @@ internal fun WorkoutHeartCard( kcal: Float? = null, /** The time in each zone as a bar under the zone (indoor cardio, board Main). */ zoneBar: Boolean = false, + /** The family's blend that tints the card. */ + blend: Blend = Blends.IndoorCardio, ) { val heartZones = LocalHeartZones.current val bpm = liveHeartRate.takeIf { connected && !r.paused } val zone = WorkoutRecorder.liveZone(bpm, r.maxHeartRate, heartZones) - val color = workoutColor(r, liveHeartRate, connected, heartZones) - GlowCard(liveHeartStyle(color, bpm, zone, r.paused), modifier) { + LiveHero(blend, modifier) { Column(if (fill) Modifier.fillMaxSize() else Modifier) { - GlowHeader( - stringResource(R.string.workout_live_heart_title), - trailing = bpm?.let { stringResource(R.string.workout_live_heart_of_max, it * 100 / r.maxHeartRate) }, - ) + Row(verticalAlignment = Alignment.CenterVertically) { + if (zone != null) { + org.openstrap.app.ui.glow.PulseDot(ZONE_COLORS[zone], bpm, 8.dp) + Spacer(Modifier.width(8.dp)) + Text( + WorkoutCopy.zoneLine(zone), color = Color.White, style = GlowType.cardTitle, maxLines = 1, + modifier = Modifier.weight(1f, fill = false), + ) + Spacer(Modifier.weight(1f)) + Text(WorkoutCopy.zoneTime(zoneSeconds[zone]), color = Color.White.copy(alpha = 0.72f), style = GlowType.secondary, maxLines = 1) + } else Text(WorkoutCopy.noZone(r.paused), color = Color.White, style = GlowType.cardTitle, maxLines = 1) + } BoxWithConstraints(Modifier.fillMaxWidth().then(if (fill) Modifier.weight(1f) else Modifier.height(220.dp))) { val now = recent.lastOrNull()?.first ?: (System.currentTimeMillis() / 1000) val values = remember(recent) { bucketRecent(recent, now) } if (values.any { it != null }) { - GlowLineChart(values, Modifier.align(Alignment.BottomCenter).alpha(0.45f), height = 120.dp, showAverage = false) + GlowLineChart(values, blend, Modifier.align(Alignment.BottomCenter).alpha(0.4f), height = 120.dp, showAverage = false) } ZoneArc(bpm, r.maxHeartRate, Modifier.matchParentSize()) // Sized for three digits inside the arc, whatever the reading, so the number never spills past it @@ -272,8 +281,9 @@ internal fun WorkoutHeartCard( DotMatrixText(bpm.toString(), dot = DotSize.Live, scale = scale) Spacer(Modifier.height(8.dp)) Text( - stringResource(R.string.workout_live_heart_behind), color = Color.White.copy(alpha = 0.75f), - style = GlowType.secondary, + if (zone != null) stringResource(R.string.workout_live_heart_range, zoneRange(zone, r.maxHeartRate).removeSuffix(" bpm")) + else stringResource(R.string.workout_live_unit_bpm), + color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary, ) } else Text( WorkoutCopy.noHeartRate(r.paused, connected), @@ -281,41 +291,17 @@ internal fun WorkoutHeartCard( ) } } - Row(verticalAlignment = Alignment.Bottom) { - if (zone != null) { - // "Zone 3, aerobic": two text elements, the name a step quieter. - val (name, word) = WorkoutCopy.zoneTitle(zone) - Text(name, color = Color.White, style = GlowType.sentence) - Spacer(Modifier.width(6.dp)) - Text(word, color = Color.White.copy(alpha = 0.75f), style = GlowType.sentence, modifier = Modifier.weight(1f)) - Text(zoneRange(zone, r.maxHeartRate), color = Color.White.copy(alpha = 0.85f), style = GlowType.secondary) - } else Text(WorkoutCopy.noZone(r.paused), color = Color.White, style = GlowType.sentence) - } - if (zoneBar) { - Spacer(Modifier.height(12.dp)) - ZoneTimeBar(zoneSeconds, zone) - } - Spacer(Modifier.height(8.dp)) - HeartNotes(r, zone, zoneSeconds, active, kcal) + if (zoneBar) Spacer(Modifier.height(4.dp)) + HeartNotes(r, zone, zoneSeconds, active, kcal, zoneTime = false) } } } -/** - * The live heart card's glow (pattern D1): [color] beating at [bpm], lit as high as the [zone], and only its outline - * while [paused]. The full card and the short one on a phone on its side light alike. - */ -internal fun liveHeartStyle(color: Color, bpm: Int?, zone: Int?, paused: Boolean) = GlowStyle.chart(color).copy( - motion = if (bpm != null) GlowMotion.Heartbeat(bpm) else GlowMotion.Still, - lightLevel = WorkoutCopy.zoneLightLevel(zone), - outline = paused, -) - /** The time in the [zone] you're in on the left of the heart card's foot, and the target's progress on the right. */ @Composable -internal fun HeartNotes(r: WorkoutState.Recording, zone: Int?, zoneSeconds: ZoneSeconds, active: () -> Long, kcal: Float?) { +internal fun HeartNotes(r: WorkoutState.Recording, zone: Int?, zoneSeconds: ZoneSeconds, active: () -> Long, kcal: Float?, zoneTime: Boolean = true) { Row { - zone?.let { PageNote(WorkoutCopy.zoneTime(zoneSeconds[it])) } + if (zoneTime) zone?.let { PageNote(WorkoutCopy.zoneTime(zoneSeconds[it])) } Spacer(Modifier.weight(1f)) when (val t = WorkoutTarget.parse(r.workout.target)) { is WorkoutTarget.Zones -> PageNote( @@ -346,7 +332,7 @@ fun GlowWorkoutGlance( ) { val connected = connection is ConnectionState.Connected val active = activeSecondsState(r) - Box(modifier.background(Color.Black).statusBarsPadding().padding(horizontal = GlowLayout.Gutter, vertical = 12.dp)) { + Box(modifier.background(org.openstrap.app.ui.theme.Ground).statusBarsPadding().padding(horizontal = GlowLayout.Gutter, vertical = 12.dp)) { WorkoutHeartCard( r, liveHeartRate, recent, zoneSeconds, connected, { active.value }, Modifier.fillMaxSize(), fill = true, kcal = kcal?.active, ) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIndoor.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIndoor.kt index 9fe871f8..a31a0ebc 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIndoor.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIndoor.kt @@ -1,6 +1,19 @@ package org.openstrap.app.ui.glow.live import org.openstrap.app.presentation.Units +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.width +import androidx.compose.runtime.remember +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import org.openstrap.app.data.WorkoutTarget +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes import androidx.compose.foundation.layout.Arrangement import org.openstrap.app.ui.glow.draw.DotSize import org.openstrap.app.ui.glow.HeroValue @@ -60,7 +73,7 @@ internal fun LiveIndoorScreen( ) { val heartZones = LocalHeartZones.current val connected = connection is ConnectionState.Connected - val color = workoutColor(r, liveHeartRate, connected, heartZones) + val blend = Blends.IndoorCardio ZoneTick(liveHeartRate.takeIf { connected && !r.paused }, r) val active = activeSecondsState(r) val figures = listOfNotNull( @@ -78,7 +91,7 @@ internal fun LiveIndoorScreen( kcal?.active?.toInt()?.toString() to stringResource(R.string.workout_live_figure_active_kcal), ) LiveFrame( - r, color, connected, contentPadding, controls, + r, blend, connected, contentPadding, controls, lap = if (!r.paused) ({ LapButton(onLap, label = true) }) else null, time = { active.value }, smallTime = compact, battery = (connection as? ConnectionState.Connected)?.batteryPercent, paused = { LivePaused(r, liveHeartRate.takeIf { connected }, recent, figures) }, @@ -86,23 +99,28 @@ internal fun LiveIndoorScreen( // Time reps on the treadmill side: the rep above the heart. if (r.structure is org.openstrap.app.data.Structure.Reps) RepCard(r, emptyList(), recent, liveHeartRate.takeIf { connected && !r.paused }) val reading = liveHeartRate.takeIf { connected && !r.paused } - if (split) ZoneTimeBar(zoneSeconds, WorkoutRecorder.liveZone(reading, r.maxHeartRate, heartZones)) + val target = remember(r.workout.target) { WorkoutTarget.parse(r.workout.target) as? WorkoutTarget.Zones } + if (split) TimeInZonesCard(zoneSeconds, WorkoutRecorder.liveZone(reading, r.maxHeartRate, heartZones), target) // A whole screen this short is a phone on its side: the arc can't fit beside the controls, the number can. - else if (compact) CompactHeartCard(r, liveHeartRate, zoneSeconds, connected, { active.value }, kcal?.active) - else WorkoutHeartCard( - r, liveHeartRate, recent, zoneSeconds, connected, { active.value }, Modifier.fillMaxWidth(), - kcal = kcal?.active, zoneBar = true, - ) + else if (compact) CompactHeartCard(r, liveHeartRate, zoneSeconds, connected, { active.value }, kcal?.active, blend, target) + else { + WorkoutHeartCard( + r, liveHeartRate, recent, zoneSeconds, connected, { active.value }, Modifier.fillMaxWidth(), + kcal = kcal?.active, zoneBar = true, blend = blend, + ) + TimeInZonesCard(zoneSeconds, WorkoutRecorder.liveZone(reading, r.maxHeartRate, heartZones), target) + } LiveFigures(figures, Modifier.padding(top = 4.dp)) } } /** - * The time in each zone as one bar split into the five zones' colours, each as wide as its share; the zone you're in - * is white so it stands out against its neighbours, and an empty zone keeps a sliver so the bar always shows all five. + * The time in each zone as one bar, each step as wide as its share and the zone you're in lit and glowing; an empty + * zone keeps a sliver so the bar always shows all five. The target's zones are outlined, and each zone's whole minutes + * sit under it (board ZoneStrip, Indoor cardio). Flat zone colours, drawn small. */ @Composable -internal fun ZoneTimeBar(zoneSeconds: ZoneSeconds, current: Int?) { +internal fun ZoneTimeBar(zoneSeconds: ZoneSeconds, current: Int?, target: WorkoutTarget.Zones? = null, labels: Boolean = false) { val total = zoneSeconds.sum().coerceAtLeast(1) val res = LocalResources.current val each = zoneSeconds.withIndex().joinToString(", ") { (z, s) -> @@ -110,42 +128,84 @@ internal fun ZoneTimeBar(zoneSeconds: ZoneSeconds, current: Int?) { else res.getString(R.string.workout_live_zone_time_minutes, z + 1, s / 60) } val described = stringResource(R.string.workout_live_zone_times_description, each) - val segments = zoneSeconds.mapIndexed { z, s -> - val color = when { - z == current -> Color.White - s == 0 -> Color.White.copy(alpha = 0.18f) - else -> ZONE_COLORS[z] + val weights = zoneSeconds.map { maxOf(it.toFloat() / total, 0.04f) } + Column(Modifier.semantics { contentDescription = described }) { + BoxWithConstraints(Modifier.fillMaxWidth().height(16.dp)) { + val gap = 3.dp + val sum = weights.sum() + val room = maxWidth - gap * 4 + Row(Modifier.align(Alignment.Center), horizontalArrangement = Arrangement.spacedBy(gap)) { + zoneSeconds.forEachIndexed { z, s -> + val on = z == current + Box( + Modifier.width(room * (weights[z] / sum)).height(10.dp) + .then(if (on) Modifier.shadow(7.dp, GlowShapes.Pill, ambientColor = ZONE_COLORS[z], spotColor = ZONE_COLORS[z]) else Modifier) + .clip(GlowShapes.Pill) + .background(if (s == 0) Color.White.copy(alpha = 0.18f) else ZONE_COLORS[z].copy(alpha = if (on) 1f else 0.7f)), + ) + } + } + if (target != null) { + val lo = target.low.coerceIn(0, 4) + val hi = target.high.coerceIn(lo, 4) + val start = (0 until lo).sumOf { (room * (weights[it] / sum)).value.toDouble() + gap.value }.dp + val width = (lo..hi).sumOf { (room * (weights[it] / sum)).value.toDouble() }.dp + gap * (hi - lo) + Box(Modifier.offset(x = start - 3.dp).width(width + 6.dp).height(16.dp).border(1.5.dp, Color.White.copy(alpha = 0.7f), GlowShapes.Tile)) + } + } + if (labels) Row(Modifier.fillMaxWidth().padding(top = 6.dp)) { + zoneSeconds.forEachIndexed { z, s -> + Text( + if (s >= 60) "${s / 60}" else "", color = Color.White.copy(alpha = 0.72f), style = GlowType.caption, + textAlign = androidx.compose.ui.text.style.TextAlign.Center, maxLines = 1, modifier = Modifier.weight(weights[z]), + ) + } + } + } +} + +/** "Time in zones" and the target on clear glass over [ZoneTimeBar] (board LiveIndoor): the strip that follows the arc. */ +@Composable +internal fun TimeInZonesCard(zoneSeconds: ZoneSeconds, current: Int?, target: WorkoutTarget.Zones?) { + LiveStrip(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.workout_live_time_in_zones), color = Color.White, style = GlowType.cardTitle, maxLines = 1, modifier = Modifier.weight(1f)) + if (target != null) Text( + if (target.low == target.high) stringResource(R.string.workout_live_target_short_zone, target.low + 1) + else stringResource(R.string.workout_live_target_short_zones, target.low + 1, target.high + 1), + color = Color.White.copy(alpha = 0.72f), style = GlowType.secondary, maxLines = 1, + ) } - Segment(maxOf(s.toFloat() / total, 0.04f), color) + ZoneTimeBar(zoneSeconds, current, target, labels = true) } - SegmentBar(segments, Modifier.semantics { contentDescription = described }, height = 8.dp, gap = 3.dp) } /** * The live heart card on a short screen (a phone on its side): the bpm in dots with the zone beside it, the time in - * each zone as a bar, and the card's notes, lit as the full card is ([WorkoutHeartCard]), without the arc and the + * each zone as a bar, and the card's notes, tinted as the full card is ([WorkoutHeartCard]), without the arc and the * last ten minutes that need its height. */ @Composable private fun CompactHeartCard( r: WorkoutState.Recording, liveHeartRate: Int?, zoneSeconds: ZoneSeconds, connected: Boolean, active: () -> Long, kcal: Float?, + blend: Blend, target: WorkoutTarget.Zones?, ) { val heartZones = LocalHeartZones.current val bpm = liveHeartRate.takeIf { connected && !r.paused } val zone = WorkoutRecorder.liveZone(bpm, r.maxHeartRate, heartZones) - val style = liveHeartStyle(workoutColor(r, liveHeartRate, connected, heartZones), bpm, zone, r.paused) - GlowCard(style, Modifier.fillMaxWidth()) { + LiveHero(blend) { Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Row(verticalAlignment = Alignment.Bottom) { if (bpm != null) HeroValue("$bpm", stringResource(R.string.workout_live_unit_bpm), dot = DotSize.Detail) else Text(WorkoutCopy.noHeartRate(r.paused, connected), color = Color.White, style = GlowType.sentence) Spacer(Modifier.weight(1f)) + if (zone != null) ZoneDot(zone, modifier = Modifier.padding(bottom = 4.dp, end = 7.dp)) Text( zone?.let { WorkoutCopy.zoneLine(it) } ?: WorkoutCopy.noZone(r.paused), color = Color.White, style = GlowType.secondary, maxLines = 1, ) } - ZoneTimeBar(zoneSeconds, zone) + ZoneTimeBar(zoneSeconds, zone, target) HeartNotes(r, zone, zoneSeconds, active, kcal) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIntervals.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIntervals.kt index ed568d8c..1e2b89f1 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIntervals.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIntervals.kt @@ -1,6 +1,5 @@ package org.openstrap.app.ui.glow.live -import org.openstrap.app.presentation.WorkoutColors import org.openstrap.app.presentation.dotFormat import androidx.compose.foundation.Canvas import androidx.compose.foundation.background @@ -24,12 +23,7 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.RadialGradientShader -import androidx.compose.ui.graphics.ShaderBrush -import androidx.compose.ui.graphics.lerp import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextAlign @@ -43,7 +37,6 @@ import org.openstrap.app.device.WorkoutState import org.openstrap.app.ui.glow.DotMatrixText import org.openstrap.app.ui.glow.HeroValue import org.openstrap.app.ui.glow.draw.DotSize -import org.openstrap.app.ui.glow.PictureCard import org.openstrap.app.ui.glow.GlowType import org.openstrap.app.ui.glow.PeakBars import org.openstrap.app.ui.glow.Segment @@ -54,7 +47,8 @@ import org.openstrap.app.ui.glow.activeSecondsState import org.openstrap.app.ui.glow.workoutClock import org.openstrap.app.ui.glow.dotClock import org.openstrap.app.ui.theme.AppIcons -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends import org.openstrap.app.ui.workout.IntervalMoment import org.openstrap.app.ui.workout.StartCopy import org.openstrap.app.presentation.WorkoutCopy @@ -66,8 +60,9 @@ import androidx.compose.ui.res.stringResource import org.openstrap.app.R /** Work red and rest green, the intervals' two colours. */ -private val WorkRed = MetricColors.heart -private val RestGreen = Color(WorkoutColors.REST_GREEN) +/** Work is flare pink, rest deep teal: the two stops of the family's blend, each lighting the screen alone. */ +private val WorkLight = Blend(Blends.Intervals.first, Blends.Intervals.first) +private val RestLight = Blend(Blends.Intervals.second, Blends.Intervals.second) /** * HIIT (workouts spec 2.5, boards HiitWork and HiitRest), with the total small on top and the screen in the phase's @@ -99,12 +94,13 @@ internal fun LiveIntervalsScreen( // in the content), so the screen holds still between seconds. val phase = androidx.compose.runtime.remember(r) { androidx.compose.runtime.derivedStateOf { r.phase(now.value) } }.value if (r.structure == null || phase == null) return - val color = when { - r.paused -> org.openstrap.app.ui.glow.PausedColor - phase is Phase.Work -> WorkRed - phase is Phase.Rest -> RestGreen - else -> org.openstrap.app.ui.glow.workoutColor(r, liveHeartRate, connected, heartZones) + // The phase is the light: work rises pink from the bottom, rest falls teal from the top, paused is a grey wash. + val blend = when { + r.paused -> PausedLight + phase is Phase.Rest -> RestLight + else -> WorkLight } + val fromTop = !r.paused && phase is Phase.Rest // Every minute's work ends on Done, which shows a tick. The rest skip. val skipDone = phase is Phase.Work && r.structure is org.openstrap.app.data.Structure.EveryMinute val skipLabel = when (phase) { @@ -117,7 +113,8 @@ internal fun LiveIntervalsScreen( val plan = structure?.let { StartCopy.structureName(it) } val active = activeSecondsState(r) LiveFrame( - r, color, connected, contentPadding, controls, time = { active.value }, smallTime = true, + r, blend, connected, contentPadding, controls, time = { active.value }, smallTime = true, + lightAngle = if (fromTop) 90f else 270f, lightStrength = if (fromTop) 0.9f else 1f, lightY = if (fromTop) 120f else 520f, lap = skipLabel?.takeIf { !r.paused }?.let { label -> { SkipButton(label, skipDone, onSkip) } }, paused = { LivePaused(r, liveHeartRate.takeIf { connected }, readings, listOf( "${org.openstrap.app.data.Phases.roundsDone(r.rounds)}" to stringResource(R.string.workout_live_figure_rounds_done), @@ -125,19 +122,15 @@ internal fun LiveIntervalsScreen( )) }, fill = true, title = listOfNotNull(org.openstrap.app.data.Workouts.sportName(r.workout.sportType), plan).joinToString(", "), - backdrop = when { - r.paused -> null - phase is Phase.Work -> WorkGlow - phase is Phase.Rest -> RestGlow - else -> null - }, ) { val m = intervalMoment(r, now.value, bpm, readings, emptyList()) ?: return@LiveFrame - RoundBar(m, when (structure) { - is org.openstrap.app.data.Structure.Timed -> structure.work - is org.openstrap.app.data.Structure.EveryMinute -> structure.period - else -> null - }) + val bar: @Composable () -> Unit = { + RoundBar(m, when (structure) { + is org.openstrap.app.data.Structure.Timed -> structure.work + is org.openstrap.app.data.Structure.EveryMinute -> structure.period + else -> null + }) + } when (m.phase) { is Phase.Work -> PhaseFigure( stringResource(R.string.workout_live_round_of, m.round, m.rounds), @@ -145,7 +138,7 @@ internal fun LiveIntervalsScreen( ?: stringResource(R.string.workout_live_last_round), stringResource(R.string.workout_live_phase_work), m.left?.let { dotFormat("%02d", it) }, stringResource(if (m.everyMinute) R.string.workout_live_seconds_left_minute else R.string.workout_live_seconds_left), - compact, + compact, bar = bar, ) is Phase.Rest -> PhaseFigure( stringResource(R.string.workout_live_done_of, m.round - 1, m.rounds), @@ -155,7 +148,7 @@ internal fun LiveIntervalsScreen( m.drop?.takeIf { it > 0 }?.let { stringResource(R.string.workout_live_heart_rate_down, b, it) } ?: stringResource(R.string.workout_live_heart_rate, b) } ?: stringResource(R.string.workout_live_seconds_left), - compact, + compact, bar = bar, // Folded, +10 s sits beside the seconds: the half has no room for a row of its own. action = { val more = stringResource(R.string.workout_live_add_10_s) @@ -166,16 +159,16 @@ internal fun LiveIntervalsScreen( stringResource(R.string.workout_live_warm_up), pluralStringResource(R.plurals.workout_live_rounds_after, m.rounds, m.rounds), stringResource(R.string.workout_live_phase_warming_up), null, - stringResource(R.string.workout_live_rounds_start_hint), compact, + stringResource(R.string.workout_live_rounds_start_hint), compact, bar = bar, ) Phase.Done -> PhaseFigure( pluralStringResource(R.plurals.workout_live_all_rounds_done, m.rounds, m.rounds), stringResource(R.string.workout_live_end_or_keep), - stringResource(R.string.workout_live_phase_done), null, "", compact, + stringResource(R.string.workout_live_phase_done), null, "", compact, bar = bar, ) } if (!split && (m.phase is Phase.Rest || m.phase == Phase.Done)) RoundPeaks(r.rounds, m.rounds) - if (!split && m.phase !is Phase.Rest) HeartStripDark(bpm, r.maxHeartRate, r.paused, Modifier.align(Alignment.CenterHorizontally)) + if (!split && m.phase !is Phase.Rest) LiveStrip(Modifier.fillMaxWidth()) { LiveZoneStrip(bpm, r.maxHeartRate, r.paused, connected, null) } val tall = if (compact) 48.dp else 64.dp when (m.phase) { Phase.WarmUp -> WorkoutButton( @@ -198,23 +191,8 @@ internal fun LiveIntervalsScreen( /** A see-through button colour that reads both on the phase's light and on black. */ private val OverGlow = Color.White.copy(alpha = 0.16f) -/** - * The phase's light over the whole screen (boards HiitWork and HiitRest): work rises from the bottom, rest falls from - * the top, strongest at the edge and gone by the middle, so the seconds stay on black. - */ -// Made once: a new brush each second would draw the backdrop again. -private val WorkGlow by lazy { phaseGlow(WorkRed, fromTop = false) } -private val RestGlow by lazy { phaseGlow(RestGreen, fromTop = true) } - -private fun phaseGlow(color: Color, fromTop: Boolean) = object : ShaderBrush() { - override fun createShader(size: Size) = RadialGradientShader( - Offset(size.width / 2f, if (fromTop) -size.height * 0.08f else size.height * 1.08f), - size.height * if (fromTop) 0.7f else 0.88f, - // A white-hot core in the phase's colour, as on the boards. - listOf(lerp(color, Color.White, 0.6f), color.copy(alpha = 0.85f), color.copy(alpha = 0.3f), Color.Transparent), - listOf(0f, 0.3f, 0.62f, 1f), - ) -} +/** Paused: a grey wash, the notification's grey. */ +private val PausedLight = Blend(org.openstrap.app.ui.glow.PausedColor, org.openstrap.app.ui.glow.PausedColor) /** Skip, Done ([done], with a tick) or Skip rest on the controls row's left, labelled under it. */ @Composable @@ -265,45 +243,29 @@ private const val MAX_ROUNDS_SHOWN = 20 @Composable private fun ColumnScope.PhaseFigure( where: String, next: String, word: String, seconds: String?, line: String, compact: Boolean = false, action: (@Composable () -> Unit)? = null, + bar: @Composable () -> Unit = {}, ) { Row(Modifier.fillMaxWidth().padding(horizontal = 4.dp)) { - Text(where, color = Color.White, style = GlowType.body, modifier = Modifier.weight(1f)) + Text(where, color = Color.White, style = GlowType.body.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), modifier = Modifier.weight(1f)) Text(next, color = Color.White.copy(alpha = 0.8f), style = GlowType.secondary) } + bar() if (compact) { Row(Modifier.fillMaxWidth().then(if (shortLandscape(compact)) Modifier else Modifier.weight(1f)), horizontalArrangement = Arrangement.spacedBy(20.dp, Alignment.CenterHorizontally), verticalAlignment = Alignment.CenterVertically) { - Text(word.uppercase(), color = Color.White, style = GlowType.phaseWord, maxLines = 1) + Text(word, color = Color.White, style = GlowType.phaseWord, maxLines = 1) if (seconds != null) DotMatrixText(seconds, dot = DotSize.Detail) action?.invoke() } return } - Column(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically)) { - Text(word.uppercase(), color = Color.White, style = GlowType.phaseWord) - if (seconds != null) DotMatrixText(seconds, dot = DotSize.Live, scale = 1.4f) + // A dark card so the phase's light shows round it and the seconds sit on glass, not on the colour. + LiveDarkCard(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically)) { + Text(word, color = Color.White, style = GlowType.phaseWord) + if (seconds != null) DotMatrixText(seconds, dot = DotSize.Live) if (line.isNotEmpty()) Text(line, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.body, textAlign = TextAlign.Center) } } -/** The heart rate on a black pill as wide as its words, with the zone's dot and name: the phase's colour is all around it. */ -@Composable -private fun HeartStripDark(bpm: Int?, maxHr: Int, paused: Boolean, modifier: Modifier = Modifier) { - val heartZones = LocalHeartZones.current - Row( - modifier.height(52.dp).clip(CircleShape).background(Color.Black).padding(horizontal = 18.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - val zone = WorkoutRecorder.liveZone(bpm, maxHr, heartZones) - Canvas(Modifier.size(8.dp)) { drawCircle(zone?.let { ZONE_COLORS[it] } ?: Color.White) } - Spacer(Modifier.width(10.dp)) - Text( - bpm?.let { stringResource(R.string.workout_live_bpm, it) } ?: WorkoutCopy.noHeartRate(paused), color = Color.White, - style = GlowType.body, - ) - zone?.let { Spacer(Modifier.width(16.dp)); Text(WorkoutCopy.zoneLine(it), color = Color.White, style = GlowType.secondary, maxLines = 1) } - } -} - /** * Each round's peak heart rate so far as bars in the peak's zone colour, rounds to come as faint stubs, with how far * the heart rate came down in each rest. @@ -314,11 +276,11 @@ private fun RoundPeaks(rounds: List, total: Int) { if (peaks.all { it == null }) return val shown = peaks.filterNotNull().joinToString(", ") val described = stringResource(R.string.workout_live_peaks_description, shown) - PictureCard(WorkRed, Modifier.fillMaxWidth()) { + LiveStrip(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(0.dp)) { Text(stringResource(R.string.workout_live_peaks_title), color = Color.White, style = GlowType.cardTitle, maxLines = 1) Spacer(Modifier.height(12.dp)) PeakBars( - peaks, { MetricColors.heart }, + peaks, { Blends.Intervals.first }, Modifier.semantics { contentDescription = described }, height = 56.dp, rounds = total, corner = 3.dp, ) @@ -339,7 +301,7 @@ internal fun RepCard(r: WorkoutState.Recording, route: List, readin val now = nowTicking() val m = intervalMoment(r, now, bpm, readings, route) ?: return val resting = m.phase is Phase.Rest - PictureCard(if (resting) RestGreen else MetricColors.steps, Modifier.fillMaxWidth()) { + LiveHero(Blends.Distance) { Row(Modifier.fillMaxWidth()) { Text( when (m.phase) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveMap.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveMap.kt index 4eb6f770..fe3a08b0 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveMap.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveMap.kt @@ -15,10 +15,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import org.openstrap.app.ui.theme.MetricColors import androidx.compose.foundation.layout.Column import org.openstrap.app.presentation.WorkoutCopy import org.openstrap.app.ui.theme.AppIcons @@ -46,6 +44,8 @@ import org.openstrap.app.ui.glow.* import org.openstrap.app.ui.dashboard.LocalHeartZones import androidx.compose.ui.res.stringResource import org.openstrap.app.R +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes /** * A distance workout's map page (board Map view): the map from the top of the screen, with minimize, the heart rate @@ -99,7 +99,7 @@ internal fun LiveMapScreen( Spacer(Modifier.weight(1f)) val acc = route.lastOrNull()?.accuracy Row( - Modifier.height(32.dp).clip(RoundedCornerShape(50)).background(OverMap).padding(horizontal = 12.dp), + Modifier.height(32.dp).clip(GlowShapes.Pill).background(OverMap).padding(horizontal = 12.dp), verticalAlignment = Alignment.CenterVertically, ) { Box(Modifier.size(6.dp).clip(CircleShape).background(if (acc != null && acc <= Route.MAX_ACCURACY_M) TrendGood else TrendBad)) @@ -124,7 +124,7 @@ internal fun LiveMapScreen( Column( Modifier.align(Alignment.BottomCenter).fillMaxWidth() .onSizeChanged { panel = with(density) { it.height.toDp() } } - .clip(org.openstrap.app.ui.glow.GlowLayout.SheetShape).background(Color.Black) + .clip(org.openstrap.app.ui.glow.GlowLayout.SheetShape).background(org.openstrap.app.ui.theme.Ground) .padding(start = 16.dp, end = 16.dp, top = 18.dp, bottom = contentPadding.calculateBottomPadding()), verticalArrangement = Arrangement.spacedBy(14.dp), ) { @@ -147,7 +147,7 @@ internal fun LiveMapScreen( private val PANEL_OVERLAP = 28.dp /** Buttons and pills drawn over the map: near black, a little see-through. */ -private val OverMap = Color(0xD9141416) +private val OverMap = Color.Black.copy(alpha = 0.85f) /** A round button over the map, white while what it does is on ([lit]). */ @Composable @@ -161,10 +161,10 @@ private fun LastSplit(route: List, readings: List>, val now = nowTicking() val (line, ago) = WorkoutCopy.lastSplit(splits, readings, route.firstOrNull()?.t, now) ?: return Row( - Modifier.fillMaxWidth().height(44.dp).clip(RoundedCornerShape(14.dp)).background(Raised).padding(horizontal = 14.dp), + Modifier.fillMaxWidth().height(44.dp).clip(GlowShapes.Icon).background(Raised).padding(horizontal = 14.dp), verticalAlignment = Alignment.CenterVertically, ) { - Box(Modifier.size(8.dp).clip(CircleShape).background(MetricColors.steps)) + Box(Modifier.size(8.dp).clip(CircleShape).background(Blends.Distance.first)) Spacer(Modifier.width(10.dp)) Text(line, color = Color.White, style = GlowType.body.copy(fontFeatureSettings = "tnum"), maxLines = 1, modifier = Modifier.weight(1f)) Text(ago, color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary, maxLines = 1) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveMind.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveMind.kt index 0ddc835e..73d17c1b 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveMind.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveMind.kt @@ -46,7 +46,11 @@ import org.openstrap.app.ui.glow.PlainLine import org.openstrap.app.ui.glow.ProgressRing import org.openstrap.app.ui.glow.activeSecondsState import org.openstrap.app.ui.glow.workoutClock -import org.openstrap.app.ui.theme.MetricColors +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.glow.DotMatrixText +import org.openstrap.app.ui.glow.dotClock +import org.openstrap.app.ui.glow.dotFitScale +import org.openstrap.app.ui.glow.draw.DotSize import androidx.compose.foundation.gestures.detectTapGestures import org.openstrap.app.presentation.WorkoutCopy import androidx.compose.ui.res.stringResource @@ -108,7 +112,10 @@ internal fun LiveMindScreen( } }, ) { - LiveFrame(r, MindColor.copy(alpha = 0.5f), connected, contentPadding, controls, time = null, quiet = true, fill = true, tapHint = !compact) { + LiveFrame( + r, Blends.MindAndBody, connected, contentPadding, controls, time = null, quiet = true, fill = true, tapHint = !compact, + lightAngle = 90f, lightStrength = 0.5f, lightY = 40f, + ) { Spacer(Modifier.weight(0.6f)) MindRing({ active.value }, length, ring = !compact, onClock = { clock.value = it }) Spacer(Modifier.weight(0.5f)) @@ -120,18 +127,20 @@ internal fun LiveMindScreen( val values = remember(recent) { bucketRecent(recent, now) } // Lower on a short screen (a phone on its side), so the heart rate line under it still fits beside the buttons. // The heart rate as one thin violet line edge to edge, with a dot at now: no axis, no numbers. - PlainLine( - values, MindColor.copy(alpha = 0.7f), if (compact) 40.dp else 64.dp, smooth = false, dots = LineDots.Last, stroke = 2.dp, - ) - val first = values.firstOrNull { it != null }?.toInt() - Text( - bpm?.let { b -> - first?.minus(b)?.takeIf { it > 0 }?.let { stringResource(R.string.workout_live_mind_heart_down, b, it) } - ?: stringResource(R.string.workout_live_mind_heart, b) - } ?: WorkoutCopy.noHeartRate(r.paused, connected), - color = Color.White.copy(alpha = 0.8f), style = GlowType.body, - modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center, - ) + LiveStrip(Modifier.fillMaxWidth()) { + PlainLine( + values, MindColor, if (compact) 40.dp else 64.dp, smooth = false, dots = LineDots.Last, stroke = 2.dp, + ) + val first = values.firstOrNull { it != null }?.toInt() + Text( + bpm?.let { b -> + first?.minus(b)?.takeIf { it > 0 }?.let { stringResource(R.string.workout_live_mind_heart_down, b, it) } + ?: stringResource(R.string.workout_live_mind_heart, b) + } ?: WorkoutCopy.noHeartRate(r.paused, connected), + color = Color.White.copy(alpha = 0.8f), style = GlowType.body, + modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center, + ) + } Spacer(Modifier.weight(0.6f)) } // Dimmed, the first touch only lights the screen: the veil takes it. @@ -162,8 +171,10 @@ internal fun MindRing(time: () -> Long, length: Long?, ring: Boolean = true, onC private fun MindClock(time: () -> Long, length: Long?, onClock: (Rect) -> Unit) { val active = time() Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text( - workoutClock(active), color = Color.White.copy(alpha = 0.9f), style = GlowType.mindClock, maxLines = 1, + // The live dots, shrunk only as far as the ring's inside needs. + val text = dotClock(active) + DotMatrixText( + text, dot = DotSize.Live, color = Color.White.copy(alpha = 0.9f), scale = dotFitScale(text, DotSize.Live, MindDotsWidth), modifier = Modifier.onGloballyPositioned { onClock(it.boundsInRoot()) }, ) Text( @@ -198,5 +209,8 @@ private fun DrawScope.drawVeil(alpha: Float, clock: Rect) { } } -/** Mind and body's colour: the evening violet, never a zone's. */ -private val MindColor = MetricColors.evening +/** The clock's room inside the ring. */ +private val MindDotsWidth = 220.dp + +/** Mind and body's colour: the evening violet (as a mark on dark), never a zone's. */ +private val MindColor = Blends.MindAndBody.chart diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LivePaused.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LivePaused.kt index a818e669..0d846200 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LivePaused.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LivePaused.kt @@ -42,7 +42,9 @@ internal fun ColumnScope.LivePaused(r: WorkoutState.Recording, liveHeartRate: In stringResource(R.string.workout_live_paused_for), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, ) - DotMatrixText(dotClock((now - at).coerceAtLeast(0)), dot = DotSize.Detail) + val paused = dotClock((now - at).coerceAtLeast(0)) + // The live dots, shrunk only as far as an hour's worth of digits needs. + DotMatrixText(paused, dot = DotSize.Live, scale = org.openstrap.app.ui.glow.dotFitScale(paused, DotSize.Live, 320.dp)) val before = Workouts.heartRateAt(recent, at) ?: recent.lastOrNull { it.first <= at }?.second val drop = if (before != null && liveHeartRate != null) before - liveHeartRate else null if (liveHeartRate != null) Text( @@ -63,7 +65,6 @@ internal fun ColumnScope.LivePaused(r: WorkoutState.Recording, liveHeartRate: In internal fun LiveFigures(figures: List>, modifier: Modifier = Modifier) { Row(modifier.fillMaxWidth().height(IntrinsicSize.Min), verticalAlignment = Alignment.Bottom) { figures.forEachIndexed { i, (value, label) -> - if (i > 0) StatRule() LiveStat(label, Modifier.weight(1f)) { LiveValue(value) } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveSets.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveSets.kt index 8576d75f..be7a7bcb 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveSets.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveSets.kt @@ -1,6 +1,5 @@ package org.openstrap.app.ui.glow.live -import org.openstrap.app.presentation.WorkoutColors import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -16,7 +15,6 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions @@ -56,13 +54,8 @@ import org.openstrap.app.ui.components.pressClickable import org.openstrap.app.ui.components.rememberHaptics import org.openstrap.app.ui.glow.DotMatrixText import org.openstrap.app.ui.glow.draw.DotSize -import org.openstrap.app.ui.glow.PictureCard -import org.openstrap.app.ui.glow.GlowCard import org.openstrap.app.ui.glow.GlowLayout -import org.openstrap.app.ui.glow.OutlineCard -import org.openstrap.app.ui.glow.draw.GlowMotion import org.openstrap.app.ui.glow.GlowType -import org.openstrap.app.ui.glow.draw.LightAngle import org.openstrap.app.ui.glow.MediumBody import org.openstrap.app.ui.glow.PageButton import org.openstrap.app.ui.glow.PageRow @@ -74,11 +67,17 @@ import org.openstrap.app.ui.glow.MinusPlus import org.openstrap.app.ui.glow.RoundIcon import org.openstrap.app.ui.glow.WorkoutButton import org.openstrap.app.ui.glow.activeSecondsState -import org.openstrap.app.ui.glow.draw.heroStyle import org.openstrap.app.ui.glow.workoutClock import org.openstrap.app.ui.glow.dotClock -import org.openstrap.app.ui.glow.workoutColor import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.data.WorkoutTarget +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.widthIn +import androidx.compose.ui.graphics.graphicsLayer import org.openstrap.app.presentation.WorkoutCopy import org.openstrap.app.ui.workout.ZONE_COLORS import org.openstrap.app.ui.workout.strengthMoment @@ -88,7 +87,6 @@ import androidx.compose.ui.res.stringResource import org.openstrap.app.R /** Strength's rest colour, the green the floating bar and the hero rest in too. */ -private val RestGreen = Color(WorkoutColors.REST_GREEN) /** * Strength (workouts spec 2.4, boards StrengthSet, StrengthLog and StrengthRest), with the total small on top. @@ -125,20 +123,30 @@ internal fun LiveStrengthScreen( val connected = connection is ConnectionState.Connected val bpm = liveHeartRate.takeIf { connected && !r.paused } ZoneTick(bpm, r) - val color = if (r.resting && !r.paused) RestGreen else workoutColor(r, liveHeartRate, connected, heartZones) + // Bronze into iron lights the whole workout: from below in a set, from the top in rest (boards LiveStrength, LiveStrengthRest). + val blend = Blends.Strength + val rest = r.resting && !r.paused + val target = remember(r.workout.target) { WorkoutTarget.parse(r.workout.target) } // Read where it shows (the cards' clocks, the paused figures, the log card), so the screen holds still between // seconds. The rest of the screen doesn't move with the clock: [steady] is the moment without its seconds, which // only the clocks read, so it needs no time at all. val momentNow = { strengthMoment(r, now.value, bpm, history) } val steady = remember(r, bpm, history) { strengthMoment(r, 0, bpm, history).copy(setSeconds = 0, restLeft = null) } - val haptics = rememberHaptics() var naming by rememberSaveable { mutableStateOf(false) } // Sets whose log card was skipped, so it doesn't come back. val skipped = rememberSaveable(r.workout.start) { mutableStateListOf() } val unlogged = r.sets.lastOrNull { it.end != null }?.takeIf { r.logSets && it.reps == null && it.index !in skipped && !r.inSet } val active = activeSecondsState(r) + val haptics = rememberHaptics() + val tapSetDone = { haptics.perform(HapticEvent.SetDone); onSetDone() } LiveFrame( - r, color, connected, contentPadding, controls, time = { active.value }, smallTime = true, fill = true, + r, blend, connected, contentPadding, controls, time = { active.value }, smallTime = true, fill = true, + lightAngle = if (rest) 90f else 270f, lightStrength = if (rest) 0.6f else 1f, lightY = if (rest) 120f else 460f, + lap = if (!r.paused) ({ PauseSideButton(controls.onPause) }) else null, + center = when { + r.inSet -> ({ CenterAction(stringResource(R.string.workout_live_sets_set_done), AppIcons.Tick02, tapSetDone) }) + else -> ({ CenterAction(stringResource(R.string.workout_live_sets_start_set, steady.setNumber), AppIcons.PlayFill, onStartSet) }) + }, paused = { LivePaused(r, liveHeartRate.takeIf { connected }, history, listOf( momentNow().done.let { done -> done.toString() to pluralStringResource(R.plurals.workout_live_figure_sets_done, done) }, Strength.kgLifted(r.sets)?.let { Strength.kgText(it) } to stringResource(R.string.workout_live_figure_kg_lifted), @@ -146,36 +154,22 @@ internal fun LiveStrengthScreen( )) }, ) { val moment = steady - val tall = if (compact) 56.dp else 72.dp - if (compact) CompactCard(r, moment, momentNow, color, onName = { naming = true }) else when { - r.inSet -> SetCard(r, moment.setNumber, { momentNow().setSeconds }, bpm, color) { naming = true } - r.resting -> RestCard(r, { momentNow().restLeft ?: 0 }, moment.done, bpm, moment.drop, history) - else -> ReadyCard(r, moment.setNumber, color) { naming = true } + if (compact) CompactCard(r, moment, momentNow, blend, onName = { naming = true }, onAdd30 = onExtendRest) else when { + r.inSet -> SetCard(r, moment.setNumber, { momentNow().setSeconds }, blend) { naming = true } + r.resting -> RestCard(r, { momentNow().restLeft ?: 0 }, moment.done, moment.setNumber, r.exercise, moment.nextLoad, blend, onExtendRest) + else -> ReadyCard(r, moment.setNumber, blend) { naming = true } } - if (!compact && r.resting && !r.inSet) NextLine(moment.setNumber, r.exercise, moment.nextLoad) - if (!compact) DoneSets(r.sets, history) - Spacer(Modifier.weight(1f)) - when { - r.inSet -> WorkoutButton( - stringResource(R.string.workout_live_sets_set_done), Color.White, Color.Black, - { haptics.perform(HapticEvent.SetDone); onSetDone() }, icon = AppIcons.Tick02, height = tall, - ) - else -> Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { - if (r.resting) Box(Modifier.width(108.dp)) { - WorkoutButton(stringResource(R.string.workout_live_sets_add_30_s), Raised, Color.White, onExtendRest, height = tall) - } - Box(Modifier.weight(1f)) { - WorkoutButton( - stringResource(R.string.workout_live_sets_start_set, moment.setNumber), Color.White, Color.Black, onStartSet, - icon = AppIcons.PlayFill, height = tall, - ) - } - } + if (!compact) { + // The heart under the card: in a set the zone strip, in rest the drop toward the level that ends it. + if (r.resting && !r.inSet) RestHeart(r, bpm, moment.drop, history) + else LiveStrip(Modifier.fillMaxWidth()) { LiveZoneStrip(bpm, r.maxHeartRate, r.paused, connected, target) } + DoneSets(r.sets, history) } - val target = r.workout.setsTarget - if (!compact && target != null && moment.done >= target && !r.inSet) { + Spacer(Modifier.weight(1f)) + val setsTarget = r.workout.setsTarget + if (!compact && setsTarget != null && moment.done >= setsTarget && !r.inSet) { Text( - pluralStringResource(R.plurals.workout_live_sets_all_done, target, target), color = Color.White.copy(alpha = 0.6f), + pluralStringResource(R.plurals.workout_live_sets_all_done, setsTarget, setsTarget), color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary, modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center, ) } @@ -189,36 +183,30 @@ internal fun LiveStrengthScreen( if (naming) ExerciseSheet(r.exercise, exercises.map { it.name }, onPick = { onExercise(it); naming = false }, onDismiss = { naming = false }) } -/** The set under way: set N of M and its exercise, the set's clock in dots, the sets as dots, the heart rate and zone. */ +/** The set under way (board LiveStrength): set N of M and its exercise, the set's clock in the live dots, the sets as dots. */ @Composable -private fun SetCard(r: WorkoutState.Recording, number: Int, seconds: () -> Long, bpm: Int?, color: Color, onName: () -> Unit) { - val style = heroStyle(color, LightAngle.Below).let { s -> bpm?.let { s.copy(motion = GlowMotion.Heartbeat(it)) } ?: s } - GlowCard(style, Modifier.fillMaxWidth()) { - Column { - Row(verticalAlignment = Alignment.CenterVertically) { - Text(WorkoutCopy.setOf(number, r.workout.setsTarget), color = Color.White, style = GlowType.cardTitle, maxLines = 1, modifier = Modifier.weight(1f)) - ExercisePill(r.exercise, onName) - } - Column(Modifier.fillMaxWidth().padding(top = 34.dp, bottom = 26.dp), horizontalAlignment = Alignment.CenterHorizontally) { - DotClock({ dotClock(seconds()) }, DotSize.Live) - Spacer(Modifier.height(14.dp)) - Text(stringResource(R.string.workout_live_sets_in_this_set), color = Color.White.copy(alpha = 0.8f), style = GlowType.body) - } - SetDots(r.sets.count { it.end != null }, r.workout.setsTarget, inSet = true, Modifier.align(Alignment.CenterHorizontally)) - Spacer(Modifier.height(22.dp)) - HeartLine(bpm, r.maxHeartRate, r.paused) +private fun SetCard(r: WorkoutState.Recording, number: Int, seconds: () -> Long, blend: Blend, onName: () -> Unit) { + LiveHero(blend) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(WorkoutCopy.setOf(number, r.workout.setsTarget), color = Color.White, style = GlowType.cardTitle, maxLines = 1, modifier = Modifier.weight(1f)) + ExercisePill(r.exercise, onName) } + Column(Modifier.fillMaxWidth().padding(top = 34.dp, bottom = 26.dp), horizontalAlignment = Alignment.CenterHorizontally) { + DotClock({ dotClock(seconds()) }, DotSize.Live) + } + SetDots(r.sets.count { it.end != null }, r.workout.setsTarget, inSet = true, Modifier.align(Alignment.CenterHorizontally)) + Spacer(Modifier.height(4.dp)) } } /** * The set, the rest or the next set on one row (half a folded phone): what it is and its exercise, and the set's clock - * or the rest left in dots, on an unlit picture card. + * or the rest left in dots, on tinted glass; a rest also has +30 s beside it, as the full card does. */ @Composable private fun CompactCard( r: WorkoutState.Recording, moment: org.openstrap.app.ui.workout.StrengthMoment, now: () -> org.openstrap.app.ui.workout.StrengthMoment, - color: Color, onName: () -> Unit, + blend: Blend, onName: () -> Unit, onAdd30: () -> Unit, ) { val (title, clock) = when { r.inSet -> WorkoutCopy.setOf(moment.setNumber, r.workout.setsTarget) to { dotClock(now().setSeconds) } @@ -231,21 +219,25 @@ private fun CompactCard( stringResource(title) to null } } - PictureCard(color, Modifier.fillMaxWidth()) { + LiveHero(blend) { Row(verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(8.dp)) { Text(title, color = Color.White, style = GlowType.cardTitle, maxLines = 1) ExercisePill(r.exercise, onName) } if (clock != null) DotClock(clock, DotSize.Detail) + if (r.resting && !r.inSet) { + Spacer(Modifier.width(12.dp)) + Add30Pill(onAdd30) + } } } } /** Before the first set, or once rest is over: which set is next and its exercise. */ @Composable -private fun ReadyCard(r: WorkoutState.Recording, number: Int, color: Color, onName: () -> Unit) { - PictureCard(color, Modifier.fillMaxWidth()) { +private fun ReadyCard(r: WorkoutState.Recording, number: Int, blend: Blend, onName: () -> Unit) { + LiveHero(blend) { Row(verticalAlignment = Alignment.CenterVertically) { Text( stringResource(if (number == 1) R.string.workout_live_sets_ready_first else R.string.workout_live_sets_rest_over), @@ -264,14 +256,14 @@ private fun ReadyCard(r: WorkoutState.Recording, number: Int, color: Color, onNa } /** - * Rest: what it follows, the time left in dots, the heart rate and how far it dropped, and the heart line since the - * set ended falling toward the level that ends rest sooner, drawn as a solid rule. + * Rest (board LiveStrengthRest): bronze tinted glass with what it follows, the time left in the live dots, what's next + * with +30 s at the foot, and a bar along it that empties as the rest runs down. The heart's drop is the card under it. */ @Composable -private fun RestCard(r: WorkoutState.Recording, left: () -> Long, done: Int, bpm: Int?, drop: Int?, history: List>) { - val rule = Strength.Rest.parse(r.workout.rest) ?: Strength.Rest.DEFAULT - // Outlined, not lit: the set's card glows, the rest's counts down in its ring. - OutlineCard(horizontalAlignment = Alignment.CenterHorizontally) { +private fun RestCard( + r: WorkoutState.Recording, left: () -> Long, done: Int, number: Int, exercise: String?, load: String?, blend: Blend, onAdd30: () -> Unit, +) { + LiveHero(blend) { Row { Text( stringResource(R.string.workout_live_sets_rest_title), color = Color.White, style = GlowType.cardTitle, maxLines = 1, @@ -282,33 +274,67 @@ private fun RestCard(r: WorkoutState.Recording, left: () -> Long, done: Int, bpm color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, ) } - Spacer(Modifier.height(10.dp)) - val total = (r.restUntil ?: 0) - (r.sets.lastOrNull()?.end ?: r.restUntil ?: 0) - RestRing({ left().coerceAtLeast(0) }, total.coerceAtLeast(1)) - Spacer(Modifier.height(4.dp)) - Column(Modifier.fillMaxWidth()) { - val since = r.sets.lastOrNull()?.end - if (since != null) { - Spacer(Modifier.height(10.dp)) - FallingHeart(remember(history, since) { history.filter { it.first >= since - 10 } }, rule.belowBpm) - } - Spacer(Modifier.height(6.dp)) - if (bpm != null) Text( - drop?.takeIf { it > 0 }?.let { stringResource(R.string.workout_live_bpm_down, bpm, it) } - ?: stringResource(R.string.workout_live_bpm, bpm), - color = Color.White, style = GlowType.sentence, + Column(Modifier.fillMaxWidth().padding(top = 26.dp, bottom = 22.dp), horizontalAlignment = Alignment.CenterHorizontally) { + DotClock({ dotClock(left().coerceAtLeast(0)) }, DotSize.Live) + } + val total = ((r.restUntil ?: 0) - (r.sets.lastOrNull()?.end ?: r.restUntil ?: 0)).coerceAtLeast(1) + val track = Color.White.copy(alpha = 0.12f) + Box(Modifier.fillMaxWidth().height(4.dp).clip(GlowShapes.Pill).background(track)) { + Box(Modifier.fillMaxHeight().fillMaxWidth().graphicsLayer { scaleX = (left().toFloat() / total).coerceIn(0f, 1f); transformOrigin = androidx.compose.ui.graphics.TransformOrigin(0f, 0.5f) }.background(blend.chart)) + } + Spacer(Modifier.height(14.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + exercise?.lowercase()?.let { e -> listOfNotNull(e, load).joinToString(" ") } + ?.let { stringResource(R.string.workout_live_sets_next_set_exercise, number, it) } + ?: stringResource(R.string.workout_live_sets_next_set, number), + color = Color.White.copy(alpha = 0.85f), style = GlowType.secondary, maxLines = 1, modifier = Modifier.weight(1f), ) - Spacer(Modifier.height(4.dp)) - Text(WorkoutCopy.restRule(rule.belowBpm), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary) + Spacer(Modifier.width(10.dp)) + Add30Pill(onAdd30) } } } -/** The rest left in dots inside a ring in rest green that empties as it runs down. [left] is read in draw and its text. */ +/** +30 s: a small white 14% pill in the rest card. */ +@Composable +private fun Add30Pill(onClick: () -> Unit) { + Text( + stringResource(R.string.workout_live_sets_add_30_s), color = Color.White, style = MediumBody, maxLines = 1, + modifier = Modifier.clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.14f)).pressClickable(onClick, GlowShapes.Pill) + .padding(horizontal = 16.dp, vertical = 10.dp), + ) +} + +/** Rest's heart (clear glass): the bpm in dots with how far it dropped, the line falling toward the level that ends rest. */ +@Composable +private fun RestHeart(r: WorkoutState.Recording, bpm: Int?, drop: Int?, history: List>) { + val rule = Strength.Rest.parse(r.workout.rest) ?: Strength.Rest.DEFAULT + LiveStrip(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) { + Row(verticalAlignment = Alignment.Bottom) { + if (bpm != null) { + DotMatrixText(bpm.toString(), dot = DotSize.Edge) + Spacer(Modifier.width(8.dp)) + Text( + drop?.takeIf { it > 0 }?.let { stringResource(R.string.workout_live_bpm_down, bpm, it) } ?: stringResource(R.string.workout_live_bpm, bpm), + color = Color.White, style = GlowType.secondary, + ) + } else Text(WorkoutCopy.noHeartRate(r.paused), color = Color.White, style = GlowType.sentence) + } + val since = r.sets.lastOrNull()?.end + if (since != null) FallingHeart(remember(history, since) { history.filter { it.first >= since - 10 } }, rule.belowBpm) + Text(WorkoutCopy.restRule(rule.belowBpm), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary) + } +} + +/** + * The rest left in dots inside a ring in the family's bronze that empties as it runs down. [left] is read in draw and + * its text. The rest card itself now counts down on a bar ([RestCard]); the ring is kept for the Live parts gallery. + */ @Composable internal fun RestRing(left: () -> Long, total: Long) { Box(Modifier.size(220.dp), contentAlignment = Alignment.Center) { - ProgressRing({ left().toFloat() / total }, RestGreen, Modifier.fillMaxSize().padding(4.dp)) + ProgressRing({ left().toFloat() / total }, Blends.Strength.chart, Modifier.fillMaxSize().padding(4.dp)) Column(horizontalAlignment = Alignment.CenterHorizontally) { DotClock({ dotClock(left()) }, DotSize.Detail) Spacer(Modifier.height(10.dp)) @@ -321,23 +347,6 @@ internal fun RestRing(left: () -> Long, total: Long) { @Composable private fun DotClock(text: () -> String, dot: DotSize) = DotMatrixText(text(), dot = dot) -/** What follows the rest: "Set 4, bench press 10 × 60 kg". */ -@Composable -private fun NextLine(number: Int, exercise: String?, load: String?) { - Row(Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 14.dp)) { - Text( - stringResource(R.string.workout_live_sets_next), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), - style = GlowType.body, modifier = Modifier.weight(1f), - ) - Text( - exercise?.lowercase()?.let { e -> listOfNotNull(e, load).joinToString(" ") } - ?.let { stringResource(R.string.workout_live_sets_next_set_exercise, number, it) } - ?: stringResource(R.string.workout_live_sets_next_set, number), - color = Color.White, style = GlowType.body, - ) - } -} - /** The heart rate since the set ended, falling, with the level that ends rest sooner as a thin solid rule. */ @Composable private fun FallingHeart(readings: List>, level: Int?) { @@ -354,7 +363,7 @@ private fun FallingHeart(readings: List>, level: Int?) { val path = Path().apply { readings.forEachIndexed { i, (t, v) -> if (i == 0) moveTo(x(t), y(v)) else lineTo(x(t), y(v)) } } - drawPath(path, EndRed, style = Stroke(2.5.dp.toPx(), cap = StrokeCap.Round)) + drawPath(path, Blends.Strength.chart, style = Stroke(2.5.dp.toPx(), cap = StrokeCap.Round)) } } @@ -369,49 +378,34 @@ private fun SetDots(done: Int, target: Int?, inSet: Boolean, modifier: Modifier ?: pluralStringResource(R.plurals.workout_live_sets_dots_description, done, done) Row( modifier.semantics { contentDescription = described }, - horizontalArrangement = Arrangement.spacedBy(10.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, ) { + // Done sets are white dots, the one under way a white pill, those to go a ring. repeat(total) { i -> val now = inSet && i == done - // The set under way has a soft ring round it. - Box(Modifier.size(22.dp), contentAlignment = Alignment.Center) { - if (now) Box(Modifier.size(22.dp).clip(CircleShape).background(Color.White.copy(alpha = 0.3f))) - Box(Modifier.size(14.dp).clip(CircleShape).background(if (i < done || now) Color.White else Color.Black.copy(alpha = 0.35f))) + when { + now -> Box(Modifier.width(24.dp).height(12.dp).clip(GlowShapes.Pill).background(Color.White)) + i < done -> Box(Modifier.size(12.dp).clip(CircleShape).background(Color.White)) + else -> Box(Modifier.size(12.dp).clip(CircleShape).border(1.5.dp, Color.White.copy(alpha = 0.5f), CircleShape)) } } } } -/** The heart rate in plain figures with its zone named: the set's clock is the card's dotted number. */ -@Composable -private fun HeartLine(bpm: Int?, maxHr: Int, paused: Boolean) { - val heartZones = LocalHeartZones.current - Row(verticalAlignment = Alignment.Bottom) { - Text(bpm?.toString() ?: WorkoutCopy.noHeartRate(paused), color = Color.White, style = GlowType.sentence) - if (bpm != null) { - Spacer(Modifier.width(6.dp)) - Text( - stringResource(R.string.workout_live_unit_bpm), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), - style = GlowType.secondary, - ) - Spacer(Modifier.weight(1f)) - WorkoutRecorder.liveZone(bpm, maxHr, heartZones)?.let { z -> - Text(WorkoutCopy.zoneLine(z), color = Color.White, style = GlowType.secondary, maxLines = 1) - } - } - } -} - -/** The exercise as a dark pill to tap, or "Name it" while the sets are only numbered. */ +/** The exercise as a pill to tap (its name and a chevron), or "Name it" while the sets are only numbered. */ @Composable private fun ExercisePill(name: String?, onClick: () -> Unit) { - val shape = RoundedCornerShape(50) - Text( - name ?: stringResource(R.string.workout_live_sets_name_it), color = Color.White, style = MediumBody, maxLines = 1, - overflow = TextOverflow.Ellipsis, - modifier = Modifier.clip(shape).background(Color.Black.copy(alpha = 0.35f)).pressClickable(onClick, shape) - .padding(horizontal = 14.dp, vertical = 8.dp), - ) + val shape = GlowShapes.Pill + Row( + Modifier.clip(shape).background(Color.White.copy(alpha = 0.12f)).pressClickable(onClick, shape).padding(start = 14.dp, end = 10.dp, top = 8.dp, bottom = 8.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + name ?: stringResource(R.string.workout_live_sets_name_it), color = Color.White, style = MediumBody, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 150.dp), + ) + Icon(AppIcons.CaretRight, null, tint = Color.White.copy(alpha = 0.7f), modifier = Modifier.padding(start = 2.dp).size(14.dp)) + } } /** The sets done, newest first: "Set 2" and "10 × 60 kg, 0:51, peak 148". */ @@ -421,10 +415,10 @@ private fun DoneSets(sets: List, history: List>) if (done.isEmpty()) return // The peaks scan the readings, so they're worked out when a set or the readings change, not on every pass. val lines = remember(done, history) { done.take(4).map { s -> WorkoutCopy.setLine(s, Strength.peak(history, s.start, s.end!!)) } } - Column(Modifier.fillMaxWidth()) { + LiveStrip(Modifier.fillMaxWidth(), padding = PaddingValues(horizontal = 18.dp, vertical = 4.dp), verticalArrangement = Arrangement.Top) { done.take(4).forEachIndexed { i, s -> - SetRule() - Row(Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 14.dp)) { + if (i > 0) SetRule() + Row(Modifier.fillMaxWidth().padding(vertical = 14.dp)) { Text( stringResource(R.string.workout_live_sets_row, s.index + 1), color = Color.White, style = GlowType.body, modifier = Modifier.weight(1f), @@ -435,13 +429,12 @@ private fun DoneSets(sets: List, history: List>) ) } } - SetRule() } } -/** The line between the rows under the card, plain enough to read as a break between sets. */ +/** The line between the rows in the sets card. */ @Composable -private fun SetRule() = Box(Modifier.fillMaxWidth().height(1.dp).background(Color.White.copy(alpha = 0.18f))) +private fun SetRule() = Box(Modifier.fillMaxWidth().height(1.dp).background(Color.White.copy(alpha = 0.12f))) /** * The log card after a set (board StrengthLog): the set done with its time and peak, its exercise, reps and kg diff --git a/app/src/main/kotlin/org/openstrap/app/ui/root/WorkoutLayer.kt b/app/src/main/kotlin/org/openstrap/app/ui/root/WorkoutLayer.kt index 92289010..0de67b1d 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/root/WorkoutLayer.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/root/WorkoutLayer.kt @@ -220,7 +220,10 @@ internal fun BoxScope.WorkoutLayer( container.workout, state, minimized, liveView, rootVm::setWorkoutLiveView, hooks, padding, capsule = { place -> glance()?.let { g -> - WorkoutCapsule(g, onClick = { container.workout.minimized.value = false }, onAction = onGlanceAction, modifier = place) + WorkoutCapsule( + g, onClick = { container.workout.minimized.value = false }, onAction = onGlanceAction, modifier = place, + sportType = state.workout.sportType, + ) } }, capsuleHidden = capsuleHidden, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/workout/WorkoutStyle.kt b/app/src/main/kotlin/org/openstrap/app/ui/workout/WorkoutStyle.kt index 5a6b1bba..1fc0b9b2 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/workout/WorkoutStyle.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/workout/WorkoutStyle.kt @@ -1,10 +1,13 @@ package org.openstrap.app.ui.workout import androidx.compose.ui.graphics.Color +import org.openstrap.app.data.Workouts import org.openstrap.app.presentation.WorkoutColors +import org.openstrap.app.ui.theme.Blend +import org.openstrap.app.ui.theme.Blends import org.openstrap.app.presentation.WorkoutWords -/** Zone 1 (easy) to 5 (max), cool to hot ([WorkoutColors.ZONES]); during a workout the app takes on the current one. */ +/** Zone 1 (easy) to 5 (max), cool to hot ([WorkoutColors.ZONES]); drawn small (a dot, a bar, a chip), never as a screen's light. */ internal val ZONE_COLORS: List = WorkoutColors.ZONES.map(::Color) /** * A workout's top card colour: the zone it spent most time in, so the card agrees with its sentence ("mostly in zone @@ -17,14 +20,21 @@ internal fun mainZoneColor(zones: List, fallback: Color): Color = internal val ZONE_NAMES: List get() = WorkoutWords.ZONE_NAMES /** - * Each kind of workout's colour on Choose and Ready (workouts spec 2.1): lime for distance, strength's orange, heart red - * for intervals, a calm blue for indoor cardio, the evening's violet for mind and body, and a clear blue for games. + * Each kind of workout's blend (Workouts board, Palette): the light on Choose, Ready, the live screens and the summary. + * Distance takes Steps' lime, Indoor cardio violet into indigo, Strength bronze into iron, Intervals flare pink into + * deep teal, Games turf into pitch, and Mind and body the evening's violet. Zones never light a screen. */ -internal fun familyColor(family: org.openstrap.app.data.Workouts.Family): Color = when (family) { - org.openstrap.app.data.Workouts.Family.Distance -> org.openstrap.app.ui.theme.MetricColors.steps - org.openstrap.app.data.Workouts.Family.IndoorCardio -> ZONE_COLORS[0] - org.openstrap.app.data.Workouts.Family.Strength -> ZONE_COLORS[3] - org.openstrap.app.data.Workouts.Family.Intervals -> org.openstrap.app.ui.theme.MetricColors.heart - org.openstrap.app.data.Workouts.Family.MindBody -> org.openstrap.app.ui.theme.MetricColors.evening - org.openstrap.app.data.Workouts.Family.Games -> org.openstrap.app.ui.theme.MetricColors.spo2 +internal fun familyBlend(family: Workouts.Family): Blend = when (family) { + Workouts.Family.Distance -> Blends.Distance + Workouts.Family.IndoorCardio -> Blends.IndoorCardio + Workouts.Family.Strength -> Blends.Strength + Workouts.Family.Intervals -> Blends.Intervals + Workouts.Family.MindBody -> Blends.MindAndBody + Workouts.Family.Games -> Blends.Games } + +/** The blend of a sport's family, where a sport is all there is to go on (a tile, a pill). */ +internal fun sportBlend(sportType: Int): Blend = familyBlend(Workouts.family(sportType)) + +/** A family's first stop, for the small marks that take one colour (a dot, an icon). */ +internal fun familyColor(family: Workouts.Family): Color = familyBlend(family).first diff --git a/app/src/main/res/values/strings_workout_live.xml b/app/src/main/res/values/strings_workout_live.xml index f4891f56..83873de6 100644 --- a/app/src/main/res/values/strings_workout_live.xml +++ b/app/src/main/res/values/strings_workout_live.xml @@ -198,6 +198,14 @@ %1$d%% of max bpm, line shows last 10 min + + bpm, %1$s + + Time in zones + + Target zone %1$d + + Target zone %1$d to %2$d Target zone %1$d. The strap buzzes if you drift From 4fd46b0344c585b1a49b59130172f62ad2470c03 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 02:54:07 +0400 Subject: [PATCH 15/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20tab=20bar=20take?= =?UTF-8?q?s=20the=20tab's=20light,=20screen=20light=20clipped=20to=20its?= =?UTF-8?q?=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../kotlin/org/openstrap/app/MainActivity.kt | 12 ++++++++++-- .../org/openstrap/app/ui/glow/GlowLayout.kt | 2 ++ .../org/openstrap/app/ui/root/TabsPager.kt | 4 ++++ .../org/openstrap/app/ui/theme/Materials.kt | 16 +++++++++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/MainActivity.kt b/app/src/main/kotlin/org/openstrap/app/MainActivity.kt index 01c7441e..7b770f7e 100644 --- a/app/src/main/kotlin/org/openstrap/app/MainActivity.kt +++ b/app/src/main/kotlin/org/openstrap/app/MainActivity.kt @@ -441,12 +441,14 @@ private fun AppRoot( // over a blur of the pages, like the nav bar. val navGlass = rememberHazeState() val glassHost = remember { GlassHost() } + val tabLights = remember { org.openstrap.app.ui.theme.TabLights() } // Half open on a table the top half is heart rate, or the workout's heart card with the controls below. Stood up // like a book, only the live workout splits. val folds = rememberFolds() val hinge = folds.table CompositionLocalProvider( LocalGoals provides goals, LocalHeartZones provides heartZones, LocalGlassHost provides glassHost, + org.openstrap.app.ui.theme.LocalTabLights provides tabLights, LocalGrowOrigin provides growOrigin, ) { Column(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) { @@ -474,7 +476,11 @@ private fun AppRoot( showBar, enter = slideInVertically { it } + fadeIn(), exit = slideOutVertically { it } + fadeOut(), - ) { FloatingNavBar(navItems, tab, selectTab, glass = navGlass) } + ) { + CompositionLocalProvider(org.openstrap.app.ui.theme.LocalScreenLight provides tabLights.lights[tab]) { + FloatingNavBar(navItems, tab, selectTab, glass = navGlass) + } + } }, containerColor = MaterialTheme.colorScheme.background, ) { padding -> @@ -508,7 +514,9 @@ private fun AppRoot( ) } } - if (rail) FloatingNavRail(navItems, tab, selectTab, Modifier.align(Alignment.CenterStart), glass = navGlass) + if (rail) CompositionLocalProvider(org.openstrap.app.ui.theme.LocalScreenLight provides tabLights.lights[tab]) { + FloatingNavRail(navItems, tab, selectTab, Modifier.align(Alignment.CenterStart), glass = navGlass) + } AllMetricsHost(nav, shown, workoutsVm, scroll, closePages, onShowCharge = { showCharge = true }) AddWorkoutHost(nav, container, workoutsVm, rootVm) SaveStretchHost(nav, container, workoutsVm, rootVm) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt index d48a4e17..c7fc186b 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt @@ -220,6 +220,8 @@ fun GlowScreenList( light: org.openstrap.app.ui.theme.ScreenLight? = null, content: GlowBlocks.() -> Unit, ) { + val report = org.openstrap.app.ui.theme.LocalScreenLightReport.current + androidx.compose.runtime.SideEffect { report(light) } BoxWithConstraints(Modifier.fillMaxSize().then(if (light != null) Modifier.screenLight(light) else Modifier)) { val wide = maxWidth >= GlowLayout.TwoColumnWidth val gutter = GlowLayout.dashboardGutter(maxWidth) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt b/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt index 94a2b7ff..3555587c 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt @@ -203,7 +203,11 @@ internal fun TabsPager( ) { page -> val back = if (page == tab) emptyArray() else arrayOf(LocalNavigationEventDispatcherOwner provides idleBack) @Suppress("SpreadOperator") // at most one local, once per page + val tabLights = org.openstrap.app.ui.theme.LocalTabLights.current CompositionLocalProvider( + org.openstrap.app.ui.theme.LocalScreenLightReport provides remember(tabLights, page) { + { l: org.openstrap.app.ui.theme.ScreenLight? -> if (tabLights != null && tabLights.lights[page] != l) tabLights.lights[page] = l } + }, // Remembered: a new lambda each time would be a new static local, recomposing the whole tab under it. LocalGlowPagePaused provides remember(pager, page, covered) { tabPaused(pager, page, covered) }, LocalScrollToTop provides scroll.of(page), diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt index c80bd520..6383e5b9 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt @@ -3,6 +3,7 @@ package org.openstrap.app.ui.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.compositionLocalOf import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.draw.drawWithCache import androidx.compose.ui.geometry.Offset @@ -135,6 +136,19 @@ data class ScreenLight(val blend: Blend, val angle: Float = 225f, val strength: /** The light a screen is lit by, for parts (sheets, the nav bar) that want to know. Null when the screen has none. */ val LocalScreenLight = compositionLocalOf { null } +/** + * Each tab's light as its screen last drew it, so the nav bar outside the pages can tint the selected tab with it + * (TabTodayMorning). Provided at the root; a tab page reports through [LocalScreenLightReport]. + */ +class TabLights { + val lights = androidx.compose.runtime.mutableStateMapOf() +} + +val LocalTabLights = androidx.compose.runtime.staticCompositionLocalOf { null } + +/** Where a screen reports the light it draws ([GlowScreenList] calls it). Nothing listens outside a tab. */ +val LocalScreenLightReport = androidx.compose.runtime.staticCompositionLocalOf<(ScreenLight?) -> Unit> { {} } + /** The boards' blob opacity at full strength. */ private const val LIGHT_OPACITY = 0.6f @@ -142,7 +156,7 @@ private const val LIGHT_OPACITY = 0.6f * Draws [light] behind this (fixed to the screen, not scrolled), over [Ground]. With no light, just the ground: "no * light until there's a hero to light" (Matrix board, No data yet). */ -fun Modifier.screenLight(light: ScreenLight?): Modifier = drawBehind { +fun Modifier.screenLight(light: ScreenLight?): Modifier = clipToBounds().drawBehind { drawRect(Ground) if (light == null) return@drawBehind val w = size.width From f4f60327fea107fba80a2296a8fef5e0a4fb647f Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:00:38 +0400 Subject: [PATCH 16/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20live=20zone=20li?= =?UTF-8?q?ne=20no=20longer=20cut=20short?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt index 694e57d1..3e85d06b 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt @@ -259,9 +259,10 @@ internal fun WorkoutHeartCard( Spacer(Modifier.width(8.dp)) Text( WorkoutCopy.zoneLine(zone), color = Color.White, style = GlowType.cardTitle, maxLines = 1, - modifier = Modifier.weight(1f, fill = false), + // The zone line takes what the time leaves: two weights split the row and cut "Zone 2, easy" short. + modifier = Modifier.weight(1f), ) - Spacer(Modifier.weight(1f)) + Spacer(Modifier.width(8.dp)) Text(WorkoutCopy.zoneTime(zoneSeconds[zone]), color = Color.White.copy(alpha = 0.72f), style = GlowType.secondary, maxLines = 1) } else Text(WorkoutCopy.noZone(r.paused), color = Color.White, style = GlowType.cardTitle, maxLines = 1) } From ceb16974790f7cb6edb6847a50ee67cc3e55ea9e Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:05:40 +0400 Subject: [PATCH 17/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20Activity,=20Reco?= =?UTF-8?q?very=20and=20Choose=20polish=20against=20the=20boards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../org/openstrap/app/ui/glow/ChooseScreen.kt | 8 +- .../app/ui/glow/GlowActivityScreen.kt | 142 ++++++++++-------- .../app/ui/glow/GlowRecoveryScreen.kt | 4 +- 3 files changed, 86 insertions(+), 68 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt index 37634076..b75f7143 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt @@ -81,6 +81,7 @@ import org.openstrap.app.ui.workout.sportBlend import org.openstrap.app.ui.theme.Blend import org.openstrap.app.ui.theme.Blends import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass import org.openstrap.app.ui.theme.ScreenLight import org.openstrap.app.ui.theme.tintedGlass import androidx.compose.ui.graphics.Brush @@ -412,11 +413,14 @@ private fun SearchResults(query: String, selected: Int, onPick: (Int) -> Unit) { else SportTiles(null, found, { if (it in Workouts.EVERYDAY) Workouts.shortName(it) else Workouts.sportName(it) }, { it == selected }, pick) } +/** The search field's glass: white 12% with the lit edge (board WorkoutChoose). */ +private const val SearchFill = 0.12f + /** Choose's search field before it's typed in: it looks like the field and opens [SearchPage]. */ @Composable private fun SearchEntry(hint: String, onClick: () -> Unit, modifier: Modifier = Modifier) { Row( - modifier.fillMaxWidth().height(48.dp).clip(GlowLayout.TileShape).background(Raised) + modifier.fillMaxWidth().height(48.dp).clip(GlowLayout.TileShape).clearGlass(GlowLayout.TileShape, SearchFill) .pressClickable(onClick, GlowLayout.TileShape).semantics { role = Role.Button }.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { @@ -510,7 +514,7 @@ private fun SearchField(query: String, hint: String, modifier: Modifier = Modifi keyboardActions = KeyboardActions(onSearch = { keyboard?.hide() }), decorationBox = { field -> Row( - Modifier.fillMaxWidth().height(48.dp).clip(GlowLayout.TileShape).background(Raised).padding(horizontal = 16.dp), + Modifier.fillMaxWidth().height(48.dp).clip(GlowLayout.TileShape).clearGlass(GlowLayout.TileShape, SearchFill).padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { Icon(SportIcons.Search, null, tint = Color.White.copy(alpha = GlowType.CAPTION_ALPHA), modifier = Modifier.size(18.dp)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt index ff762f74..6837e0e8 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -206,19 +207,13 @@ fun GlowActivityScreen( }, ) } - ActivityCard.HeartPoints -> { - val week = remember(stored, state.date, state.pai) { heartPointsWeek(state.date, stored, state.pai?.daily) } - // The last 7 days as bars, today's in full ink. The aim is the week's total, so no line per day. - PictureSmall( - MetricColors.heart, stringResource(R.string.glow_activity_heart_points), - heartPoints?.roundToInt()?.toString(), null, - heartPoints?.let { TabCopy.heartPoints(it.roundToInt(), HEART_POINTS_TARGET) } ?: AFTER_NEXT_SYNC, - onClick = { open(Score.HeartPoints) }, modifier = m, - picture = week.takeIf { days -> days.any { it != null } }?.let { days -> - { pm -> DayBars(days, MetricColors.heart, PictureSize.Small, pm) } - }, - ) - } + ActivityCard.HeartPoints -> BarSmall( + MetricColors.heart, Blends.Heart, stringResource(R.string.glow_activity_heart_points), + heartPoints?.roundToInt()?.toString(), null, + heartPoints?.let { TabCopy.heartPoints(it.roundToInt(), HEART_POINTS_TARGET) } ?: AFTER_NEXT_SYNC, + share = heartPoints?.let { it / HEART_POINTS_TARGET }, + onClick = { open(Score.HeartPoints) }, modifier = m, + ) ActivityCard.Load -> DayLoadCard(r) { open(Score.Load) } ActivityCard.HeartRate -> HeartRateCard( state, live, restingRange, @@ -259,19 +254,24 @@ private fun StartCard(sports: List, onStart: (Int) -> Unit, onAllSports: () horizontalArrangement = Arrangement.spacedBy(StartTileGap), ) { sports.take(columns - 1).forEach { type -> - SportTile(SportIcons.of(type), Workouts.sportName(type), Modifier.weight(1f), outdoor = type in Workouts.OUTDOOR) { - onStart(type) - } + SportTile( + SportIcons.of(type), Workouts.sportName(type), Modifier.weight(1f), outdoor = type in Workouts.OUTDOOR, + blend = org.openstrap.app.ui.workout.sportBlend(type), + ) { onStart(type) } } SportTile( AppIcons.MoreHorizontalCircle01, stringResource(R.string.glow_activity_all_sports), Modifier.weight(1f), - outdoor = false, onClick = onAllSports, + outdoor = false, blend = AllSportsBlend, + onClick = onAllSports, ) } } } } +/** All sports' dot: white into a dimmer white, the board's neutral. */ +private val AllSportsBlend = org.openstrap.app.ui.theme.Blend(Color.White, Color.White.copy(alpha = 0.6f)) + /** A tile's column on a phone: four tiles and their gaps in 344 dp. */ private val StartTileColumn = 80.dp private val StartTileGap = 8.dp @@ -299,29 +299,31 @@ private fun StepsGlow(state: DayUiState, usual: List?, history: ActivityH val now = java.time.LocalTime.now() val pace = ActivityCopy.paceOf(state.steps, usual, isToday, now.hour, now.minute) var hour by remember(state.date, state.hourlySteps) { mutableStateOf(null) } - GlowCard(limeHero(MetricColors.steps), Modifier.fillMaxWidth().gridSize(CardSize.Wide), onClick = onClick) { + // The tab's hero (board TabActivity): tinted glass in Steps' blend, the title and goal, the sentence, the dotted + // number, then the hour bars running to the card's edges along its foot. + GlowCard( + limeHero(MetricColors.steps), Modifier.fillMaxWidth().gridSize(CardSize.Wide), onClick = onClick, + contentPadding = PaddingValues(0.dp), + ) { Column { - GlowHeader( - stringResource(R.string.glow_activity_steps), trailing = stringResource(R.string.glow_activity_goal, Units.count(goal)), - tag = tag, - ) - Spacer(Modifier.height(GlowLayout.TitleGap)) - HourPills(state.hourlySteps, hour) { hour = it } - Spacer(Modifier.height(16.dp)) - // A picked hour takes the number's place; one dotted number either way (spec 2.3). Its number stays the - // second glow's size, so the hour pills above it keep their room. - val h = hour - val picked = h?.let { state.hourlySteps.getOrNull(it) } - // The tag is the day's, so a picked hour leaves it out. - val (count, label) = if (h != null && picked != null) Math.round(picked) to ActivityCopy.hourLabel(h) - else state.steps to ActivityCopy.activityLine(state.steps, goal, pace, isToday) - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - TaggedNumber(Units.count(count, Units.DOT_LOCALE), null, goalTag.takeIf { h == null || picked == null }, dot = DotSize.Second) - Text( - label, - color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, maxLines = 2, + Column(Modifier.padding(start = GlowLayout.CardInset, end = GlowLayout.CardInset, top = GlowLayout.CardInset)) { + GlowHeader( + stringResource(R.string.glow_activity_steps), trailing = stringResource(R.string.glow_activity_goal, Units.count(goal)), + tag = tag, ) + Spacer(Modifier.height(GlowLayout.TitleGap)) + // A picked hour takes the number's place; one dotted number either way (spec 2.3). + val h = hour + val picked = h?.let { state.hourlySteps.getOrNull(it) } + // The tag is the day's, so a picked hour leaves it out. + val (count, label) = if (h != null && picked != null) Math.round(picked) to ActivityCopy.hourLabel(h) + else state.steps to ActivityCopy.activityLine(state.steps, goal, pace, isToday) + Text(label, color = Color.White, style = GlowType.sentence, maxLines = 3) + Spacer(Modifier.height(14.dp)) + TaggedNumber(Units.count(count, Units.DOT_LOCALE), null, goalTag.takeIf { h == null || picked == null }, dot = DotSize.Hero) } + Spacer(Modifier.height(14.dp)) + HourPills(state.hourlySteps, hour, labels = false) { hour = it } } } } @@ -333,10 +335,10 @@ private fun StepsGlow(state: DayUiState, usual: List?, history: ActivityH * latest; tapping it again lets it go. The hours under it in Caption. */ @Composable -private fun HourPills(hourly: List, picked: Int?, onPick: (Int?) -> Unit) { - Column { +private fun HourPills(hourly: List, picked: Int?, labels: Boolean = true, onPick: (Int?) -> Unit) { + Column(Modifier.padding(horizontal = if (labels) 0.dp else GlowLayout.CardInset)) { Canvas( - Modifier.fillMaxWidth().height(HourPillsHeight).pointerInput(hourly, picked) { + Modifier.fillMaxWidth().height(if (labels) HourPillsHeight else 70.dp).pointerInput(hourly, picked) { detectTapGestures { o -> if (hourly.isEmpty()) return@detectTapGestures val h = (o.x / (size.width.toFloat() / hourly.size)).toInt().coerceIn(0, hourly.lastIndex) @@ -348,7 +350,7 @@ private fun HourPills(hourly: List, picked: Int?, onPick: (Int?) -> Unit) // The shared pill bars ([hourPills]), as a widget's chart draws them. hourPills(hourly, picked, size.width, size.height, density)?.let { drawHourPills(it) } } - Row(Modifier.fillMaxWidth().padding(top = 4.dp), horizontalArrangement = Arrangement.SpaceBetween) { + if (labels) Row(Modifier.fillMaxWidth().padding(top = 4.dp), horizontalArrangement = Arrangement.SpaceBetween) { listOf("00", "06", "12", "18", "24").forEach { Text(it, color = Color.White.copy(alpha = GlowType.CAPTION_ALPHA), style = GlowType.caption) } @@ -471,6 +473,33 @@ private fun PictureSmall( } } +/** + * A Small in dark glass with a bar along its foot (board TabActivity, Calories and Heart points): the title, the number + * in dots with its [unit], the [status], and under them a 10 dp bar running edge to edge in [blend], filled to [share] + * of the way (the rest at 30%). Without a [share] the bar is left out. + */ +@Composable +private fun BarSmall( + ink: Color, blend: org.openstrap.app.ui.theme.Blend, title: String, value: String?, unit: String?, status: String, + share: Float?, onClick: () -> Unit, modifier: Modifier = Modifier, +) { + PictureCard(ink, modifier, onClick = onClick, contentPadding = PaddingValues(0.dp)) { + Column(Modifier.weight(1f).padding(start = 16.dp, end = 16.dp, top = 14.dp)) { + CardTitle(title) + Spacer(Modifier.height(12.dp)) + TaggedNumber(value, unit, null) + StatusLine(status) + } + if (share != null) { + val f = share.coerceIn(0f, 1f) + Row(Modifier.fillMaxWidth().height(10.dp)) { + if (f > 0f) Box(Modifier.weight(f).fillMaxHeight().background(Brush.horizontalGradient(listOf(blend.first, blend.second)))) + if (f < 1f) Box(Modifier.weight(1f - f).fillMaxHeight().background(blend.first.copy(alpha = 0.3f))) + } + } + } +} + /** * Heart points earned on each of the 7 days ending on [date], oldest first: the stored days, with [today]'s from the * strap's latest record when there is one. Null for a day with none stored. @@ -637,16 +666,15 @@ internal fun WorkoutDayHeader(text: String) { /** The effort light's tile, as the boards draw a row icon: a 36 dp circle on a faint white fill. */ private val EffortTile = 36.dp private val EffortShape = CircleShape -private val EffortSurface = Color.White.copy(alpha = 0.07f) private val EffortGap = 12.dp /** - * A workout as a list row: its sport's toned white icon on the effort light (a heart-red glow as strong as the - * workout's Load against your [usual], [Workouts.effort]), the sport with "Auto-detected" when the strap logged + * A workout as a list row: its family's dot on a faint circle of its blend ([SportDot]; [usual] no longer lights it), the sport with "Auto-detected" when the strap logged * it by itself, the sport's one fact and the start time ([TabCopy.workoutFact]), and the duration in dots. A thin zone * bar under it, lined up with the name. [divider] draws the hairline above. */ @Composable +@Suppress("UNUSED_PARAMETER") internal fun WorkoutRow(a: WorkoutAnalysis, usual: Float?, divider: Boolean, onClick: () -> Unit) { val fact = TabCopy.workoutFact( TabCopy.sportFact(a.workout.sportType), a.distanceMeters, a.distanceFromSteps, @@ -660,7 +688,7 @@ internal fun WorkoutRow(a: WorkoutAnalysis, usual: Float?, divider: Boolean, onC .topHairline(divider, RowHairline), ) { Row(Modifier.fillMaxWidth().padding(vertical = 12.dp), verticalAlignment = Alignment.CenterVertically) { - EffortLight(SportIcons.of(a.workout.sportType), Workouts.effort(a.workout.trainingLoad, usual)) + SportDot(org.openstrap.app.ui.workout.sportBlend(a.workout.sportType)) Spacer(Modifier.width(EffortGap)) Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { Row(verticalAlignment = Alignment.CenterVertically) { @@ -689,30 +717,14 @@ internal fun WorkoutRow(a: WorkoutAnalysis, usual: Float?, divider: Boolean, onC } } -/** - * The effort light: the sport's icon on a small dark tile, a soft heart-red glow behind it, centred a little low as - * light from below would be. [effort] (0..1) sets the glow's strength. - */ +/** A sport's mark in a list row (board TabActivity): a 36 dp circle in its family's first stop at 16%, the dot in the blend. */ @Composable -private fun EffortLight(icon: androidx.compose.ui.graphics.vector.ImageVector, effort: Float) { +private fun SportDot(blend: org.openstrap.app.ui.theme.Blend) { Box( - Modifier - .size(EffortTile) - .clip(EffortShape) - .background(EffortSurface) - .drawBehind { - val centre = Offset(size.width / 2, size.height * 0.6f) - drawRect( - Brush.radialGradient( - 0f to MetricColors.heart.copy(alpha = 0.7f * effort.coerceIn(0f, 1f)), 1f to Color.Transparent, - center = centre, radius = size.minDimension * 0.56f, - ), - ) - } - .border(1.dp, Color.White.copy(alpha = 0.06f), EffortShape), + Modifier.size(EffortTile).clip(EffortShape).background(blend.first.copy(alpha = 0.16f)), contentAlignment = Alignment.Center, ) { - Icon(icon, null, tint = Color.White.copy(alpha = 0.85f), modifier = Modifier.size(RowIcon)) + Box(Modifier.size(10.dp).clip(CircleShape).background(Brush.linearGradient(listOf(blend.first, blend.second)))) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt index 8f3532a4..574757a9 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt @@ -375,7 +375,9 @@ private fun ChargeTall( GlowCard(GlowStyle.Ember.copy(lightLevel = (now ?: 0) / 100f), modifier, onClick = onOpen) { Column(Modifier.fillMaxHeight()) { GlowHeader(stringResource(R.string.glow_recovery_energy), tag = tag) - Spacer(Modifier.weight(1f)) + // The number sits under the title, inside the dark pool at the top (board TabRecovery), not at the foot, + // where a tall card runs under the tab bar. + Spacer(Modifier.height(12.dp)) HeroFigure( now?.toString(), when { From 35c37c0e058cb3659ef0a42aaf4539dfe4e78d3a Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:06:27 +0400 Subject: [PATCH 18/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20tests=20follow?= =?UTF-8?q?=20the=20new=20tokens,=20type=20roles=20for=2012=20and=2014=20s?= =?UTF-8?q?p=20labels,=20Edit=20Today=20switch=20is=20toggleable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../openstrap/app/ui/components/Insights.kt | 2 +- .../openstrap/app/ui/dashboard/StrapPill.kt | 2 +- .../openstrap/app/ui/glow/AllMetricsScreen.kt | 4 ++-- .../openstrap/app/ui/glow/EditTodaySheet.kt | 12 ++++++---- .../org/openstrap/app/ui/glow/GlowList.kt | 2 +- .../org/openstrap/app/ui/glow/GlowType.kt | 6 +++++ .../org/openstrap/app/ui/glow/NewsPill.kt | 2 +- .../org/openstrap/app/ui/theme/Blends.kt | 12 +++++----- .../org/openstrap/app/ui/DesignTokenTest.kt | 7 +++--- .../org/openstrap/app/ui/DetailRulesTest.kt | 3 ++- .../org/openstrap/app/ui/PageRulesTest.kt | 5 ---- .../app/ui/glow/EditTodayRestoreTest.kt | 3 ++- .../openstrap/app/ui/glow/draw/DotSpecTest.kt | 23 ++++++++++++------- .../app/ui/glow/live/LiveTopBarTest.kt | 2 +- 14 files changed, 49 insertions(+), 36 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt b/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt index 84a23e74..fd4e1d61 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt @@ -240,7 +240,7 @@ private fun NavCell(item: NavItem, on: Boolean, modifier: Modifier, verticalArra if (on) item.selectedIcon else item.icon, item.label, tint = tint, modifier = Modifier.size(22.dp).graphicsLayer { scaleX = iconScale; scaleY = iconScale }, ) - Text(item.label, style = GlowType.caption.copy(fontSize = 12.sp, lineHeight = 14.sp, fontWeight = androidx.compose.ui.text.font.FontWeight.Normal), color = tint, maxLines = 1) + Text(item.label, style = GlowType.label, color = tint, maxLines = 1) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/dashboard/StrapPill.kt b/app/src/main/kotlin/org/openstrap/app/ui/dashboard/StrapPill.kt index 856cacc4..d7233520 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/dashboard/StrapPill.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/dashboard/StrapPill.kt @@ -108,7 +108,7 @@ private fun StrapAndWords(text: String) { private fun PillText(text: String) { Text( text, maxLines = 1, softWrap = false, color = Color.White, - style = GlowType.secondary.copy(fontSize = 14.sp, fontWeight = FontWeight.Normal, fontFeatureSettings = "tnum"), + style = GlowType.chip, ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt index 245daffd..1c8044cb 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt @@ -292,7 +292,7 @@ fun AllMetricsSheet( verticalArrangement = Arrangement.spacedBy(16.dp), ) { Column(Modifier.padding(horizontal = 4.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text(stringResource(R.string.glow_metrics_all_metrics), color = Color.White, style = GlowType.cardTitle) + Text(stringResource(R.string.glow_metrics_all_metrics), color = Color.White, style = GlowType.cardTitle, maxLines = 1) Text(dayName(date), color = Color.White.copy(alpha = 0.62f), style = GlowType.secondary) } Column(Modifier.fillMaxWidth().clearGlass(GlowShapes.Card).padding(horizontal = 18.dp, vertical = 4.dp)) { @@ -329,7 +329,7 @@ private fun MetricRow(r: IndexRow, divider: Boolean, onClick: () -> Unit) { } Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) { Text(r.name, color = Color.White, style = GlowType.body) - Text(r.status, color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary.copy(fontSize = 12.sp, lineHeight = 16.sp)) + Text(r.status, color = Color.White.copy(alpha = 0.6f), style = GlowType.label) } if (r.value != null) Text(r.value, color = Color.White, style = GlowType.rowValue, maxLines = 1) else WaitingDash() Icon(AppIcons.CaretRight, null, Modifier.size(16.dp), tint = Color.White.copy(alpha = 0.48f)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt index 8542277f..7f742053 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt @@ -4,6 +4,7 @@ import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -72,7 +73,7 @@ internal fun EditTodaySheet(edits: TodayEdits, onSave: (TodayEdits) -> Unit, onD verticalArrangement = Arrangement.spacedBy(16.dp), ) { Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text(stringResource(R.string.glow_today_edit), color = Color.White, style = GlowType.cardTitle) + Text(stringResource(R.string.glow_today_edit), color = Color.White, style = GlowType.cardTitle, maxLines = 1) Text( stringResource(R.string.glow_today_edit_note), color = Color.White.copy(alpha = 0.62f), style = GlowType.secondary, @@ -120,14 +121,14 @@ internal fun EditTodaySheet(edits: TodayEdits, onSave: (TodayEdits) -> Unit, onD private val SheetFade = Color(0xFF16161A).copy(alpha = 0.95f) private val PinIcon: ImageVector by lazy { - ImageVector.Builder("Pin", 14.dp, 14.dp, 24f, 24f).addPath( + ImageVector.Builder("pin", 14.dp, 14.dp, 24f, 24f).addPath( addPathNodes("M9 4h6l-1 6 4 3v1H6v-1l4-3zM12 14v6"), stroke = SolidColor(Color.White), strokeLineWidth = 1.8f, strokeLineCap = StrokeCap.Round, strokeLineJoin = StrokeJoin.Round, ).build() } private val CheckIcon: ImageVector by lazy { - ImageVector.Builder("Check", 18.dp, 18.dp, 24f, 24f).addPath( + ImageVector.Builder("check", 18.dp, 18.dp, 24f, 24f).addPath( addPathNodes("M5 12.5l4.5 4.5L19 7.5"), stroke = SolidColor(Color.White), strokeLineWidth = 2f, strokeLineCap = StrokeCap.Round, strokeLineJoin = StrokeJoin.Round, ).build() @@ -174,8 +175,9 @@ private fun EditSwitch(on: Boolean, label: String, onToggle: () -> Unit) { val knob by animateColorAsState(if (on) Color(0xFF0B0B0D) else Color.White, label = "edit switch knob colour") Box( Modifier.height(44.dp) - .clickable(role = Role.Switch, onClick = onToggle) - .semantics { contentDescription = label; stateDescription = if (on) "On" else "Off" }, + // Toggleable, so TalkBack and tests read its on or off state. + .toggleable(value = on, role = Role.Switch, onValueChange = { onToggle() }) + .semantics { contentDescription = label }, contentAlignment = Alignment.CenterStart, ) { Box(Modifier.size(48.dp, 29.dp).clip(GlowShapes.Pill).background(track)) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt index d92d4028..45aca90f 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt @@ -225,7 +225,7 @@ private fun RowLine(status: String?, tag: org.openstrap.app.ui.dashboard.NewsTag status, Modifier.weight(1f, fill = false), color = if (waiting) Color.White.copy(alpha = 0.5f) else Color.White.copy(alpha = 0.65f), - style = GlowType.secondary.copy(fontSize = 12.sp), + style = GlowType.label, // Beside a tag the line stays on one row, the tag keeping its place. maxLines = if (tag != null) 1 else Int.MAX_VALUE, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowType.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowType.kt index d9867c0b..4acc9cf7 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowType.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowType.kt @@ -67,6 +67,12 @@ object GlowType { /** Axes, times, tags: Sans 500, 11 on 14, tabular so times line up, drawn at [CAPTION_ALPHA] white. */ val caption = TextStyle(fontFamily = FunnelSans, fontWeight = FontWeight.Medium, fontSize = 11.sp, lineHeight = 14.sp, fontFeatureSettings = "tnum") + /** Small labels on glass: tags, status lines under a row, the tab bar's names (Glow × Glass boards): Sans 400, 12 on 16. */ + val label = TextStyle(fontFamily = FunnelSans, fontWeight = FontWeight.Normal, fontSize = 12.sp, lineHeight = 16.sp) + + /** A chip's words, the header battery chip's percent: Sans 400, 14 on 18, tabular. */ + val chip = TextStyle(fontFamily = FunnelSans, fontWeight = FontWeight.Normal, fontSize = 14.sp, lineHeight = 18.sp, fontFeatureSettings = "tnum") + /** White for [caption] text. */ const val CAPTION_ALPHA = 0.5f diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/NewsPill.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/NewsPill.kt index 9469deb0..130e8235 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/NewsPill.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/NewsPill.kt @@ -29,7 +29,7 @@ fun NewsPill(text: String, modifier: Modifier = Modifier) { text, modifier.background(NewsPillFill, GlowShapes.Pill).padding(horizontal = 8.dp, vertical = 2.dp), color = Color.White, - style = GlowType.caption.copy(fontSize = 12.sp, lineHeight = 16.sp), + style = GlowType.label, maxLines = 1, ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt index 546498d4..2b5a93e3 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt @@ -95,13 +95,13 @@ object Blends { else -> all.firstOrNull { it.second.first == ink }?.second } - /** Every blend, for tests and the debug gallery. */ + /** Every blend by an id (not user-facing), for tests and the debug gallery. */ val all: List> = listOf( - "Recovery" to Recovery, "HRV" to Hrv, "Blood oxygen" to Spo2, "Breathing rate" to Breathing, "Sleep" to Sleep, - "Load" to Load, "Evening" to Evening, "Habit Age" to HabitAge, "Stress" to Stress, "Heart rate" to Heart, - "Energy" to Energy, "Skin temperature" to Temperature, "Calories" to Calories, "Steps" to Steps, - "Strap" to Strap, "You" to You, "Goals" to Goals, - "Indoor cardio" to IndoorCardio, "Strength" to Strength, "Intervals" to Intervals, "Games" to Games, + "recovery" to Recovery, "hrv" to Hrv, "blood-oxygen" to Spo2, "breathing-rate" to Breathing, "sleep" to Sleep, + "load" to Load, "evening" to Evening, "habit-age" to HabitAge, "stress" to Stress, "heart-rate" to Heart, + "energy" to Energy, "skin-temperature" to Temperature, "calories" to Calories, "steps" to Steps, + "strap" to Strap, "you" to You, "goals" to Goals, + "indoor-cardio" to IndoorCardio, "strength" to Strength, "intervals" to Intervals, "games" to Games, ) } diff --git a/app/src/test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt b/app/src/test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt index 42f670e6..2456d876 100644 --- a/app/src/test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt +++ b/app/src/test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt @@ -37,7 +37,8 @@ class DesignTokenTest { } @Test fun `the tokens hold the spec's values`() { - assertEquals(listOf(2.4f, 3f, 3.6f, 4.5f, 6f, 9f), DotSize.entries.map { it.dot.value }) + // Glow × Glass (Numbers board): every grid card is 3 dp, so Second matches Edge. + assertEquals(listOf(2.4f, 3f, 3f, 4.5f, 6f, 9f), DotSize.entries.map { it.dot.value }) DotSize.entries.forEach { assertEquals(it.name, it.dot.value * 0.38f, it.gap.value, 1e-4f) } assertEquals(28.dp, GlowLayout.CardCorner) assertEquals(16.dp, GlowLayout.TileCorner) @@ -203,7 +204,7 @@ class DesignTokenTest { @Test fun `cards take their corners from GlowLayout`() { val found = mutableListOf() sources.forEach { (path, lines) -> - if (path == "glow/GlowLayout.kt") return@forEach + if (path == "glow/GlowLayout.kt" || path == "theme/Shapes.kt") return@forEach val code = lines.joinToString("\n") Regex("""\b(RoundedCornerShape|CornerRadius)\(""").findAll(code).forEach { m -> val args = balanced(code, m.range.last) @@ -213,7 +214,7 @@ class DesignTokenTest { } } // A style's own corner (GlowStyle(radius = 36.dp)); a circle's radius in a draw call is drawn in px. - found += find(Regex("""\bradius\s*=\s*\d+(\.\d+)?\.dp\b(?!\.toPx)""")) + found += find(Regex("""\bradius\s*=\s*\d+(\.\d+)?\.dp\b(?!\.toPx)""")).filterNot { it.startsWith("theme/Shapes.kt:") } if (found.isNotEmpty()) fail("Card corners are GlowLayout.CardCorner (spec 2.4):\n" + found.joinToString("\n")) val stale = cornerAllowed.filter { (path, line) -> sources[path]?.getOrNull(line - 1)?.let { Regex("""(RoundedCornerShape|CornerRadius)\(""").containsMatchIn(it) } != true diff --git a/app/src/test/kotlin/org/openstrap/app/ui/DetailRulesTest.kt b/app/src/test/kotlin/org/openstrap/app/ui/DetailRulesTest.kt index 482182eb..97ac5ede 100644 --- a/app/src/test/kotlin/org/openstrap/app/ui/DetailRulesTest.kt +++ b/app/src/test/kotlin/org/openstrap/app/ui/DetailRulesTest.kt @@ -56,7 +56,8 @@ class DetailRulesTest { val charts = sources.getValue("glow/GlowCharts.kt") listOf("fun ArcGauge(", "fun HorizonArc(").forEach { head -> val body = charts.substringAfter(head).substringBefore("\n}\n") - assertTrue("$head has round caps and no halo", "StrokeCap.Round" in body && "drawCircle" !in body && "Brush" !in body) + // Glow × Glass: the arc draws its blend along its length (Charts board), still round capped with no halo. + assertTrue("$head has round caps and no halo", "StrokeCap.Round" in body && "drawCircle" !in body) assertTrue("$head fills from the value shown", "rememberGaugeProgress(" in body) } val progress = charts.substringAfter("fun rememberGaugeProgress(").substringBefore("\n}\n") diff --git a/app/src/test/kotlin/org/openstrap/app/ui/PageRulesTest.kt b/app/src/test/kotlin/org/openstrap/app/ui/PageRulesTest.kt index 5ff54525..108c41fc 100644 --- a/app/src/test/kotlin/org/openstrap/app/ui/PageRulesTest.kt +++ b/app/src/test/kotlin/org/openstrap/app/ui/PageRulesTest.kt @@ -7,7 +7,6 @@ import org.junit.Test import org.openstrap.app.ui.alarms.AlarmsUiState import org.openstrap.app.ui.alarms.ROW_VALUE_MAX import org.openstrap.app.ui.alarms.healthAlertsSummary -import org.openstrap.app.ui.device.StrapGlow import org.openstrap.protocol.services.SettingsCodec import org.openstrap.protocol.services.SettingsGroup import java.io.File @@ -71,10 +70,6 @@ class PageRulesTest { assertTrue("Female and Male as segments", segments.containsMatchIn(profile)) } - @Test fun `the strap hero is lit at full`() { - // The Strap page's hero is L4 (spec 2.1): its rim at full strength. - assertEquals(1f, StrapGlow.glowStrength, 1e-6f) - } /** [src] with comments and string contents blanked, line breaks kept. */ private fun codeOnly(src: String): String { diff --git a/app/src/test/kotlin/org/openstrap/app/ui/glow/EditTodayRestoreTest.kt b/app/src/test/kotlin/org/openstrap/app/ui/glow/EditTodayRestoreTest.kt index b36cb95e..fb6ab846 100644 --- a/app/src/test/kotlin/org/openstrap/app/ui/glow/EditTodayRestoreTest.kt +++ b/app/src/test/kotlin/org/openstrap/app/ui/glow/EditTodayRestoreTest.kt @@ -57,7 +57,8 @@ class EditTodayRestoreTest { compose.onAllNodesWithText("Pinned").assertCountEquals(2) // Done sits under the rows, scrolled to as a finger would. - compose.onNodeWithText("Done").performScrollTo().performClick() + // Done is pinned in the sheet's footer (SheetEditToday board), outside the list. + compose.onNodeWithText("Done").performClick() assertEquals(expected, saved) } diff --git a/app/src/test/kotlin/org/openstrap/app/ui/glow/draw/DotSpecTest.kt b/app/src/test/kotlin/org/openstrap/app/ui/glow/draw/DotSpecTest.kt index 1dce0ad8..96fd404a 100644 --- a/app/src/test/kotlin/org/openstrap/app/ui/glow/draw/DotSpecTest.kt +++ b/app/src/test/kotlin/org/openstrap/app/ui/glow/draw/DotSpecTest.kt @@ -8,14 +8,21 @@ import org.junit.Test class DotSpecTest { @Test fun `8,432 in the second glow's dots`() { val l = dotLayout("8,432", DotSize.Second, density = 1f) - // Four 5-wide digits, the 1-wide comma and four empty columns between them. - assertEquals(25, DotFont.columns("8,432")) - // 8 has 17 dots, 4 has 14, 3 has 15, 2 has 14, the comma 2. - assertEquals(62, l.centers.size) - val pitch = 3.6f + 3.6f * DotSize.DOT_GAP - assertEquals(pitch * 25 - 3.6f * DotSize.DOT_GAP, l.width, 1e-4f) - assertEquals(pitch * 7 - 3.6f * DotSize.DOT_GAP, l.height, 1e-4f) - assertEquals(1.8f, l.radius, 1e-6f) + // Four digits read without a gap (Numbers board): four 5-wide digits and three empty columns between them. + assertEquals(23, DotFont.columns("8,432")) + // 8 has 17 dots, 4 has 14, 3 has 15, 2 has 14. + assertEquals(60, l.centers.size) + val pitch = 3f + 3f * DotSize.DOT_GAP + assertEquals(pitch * 23 - 3f * DotSize.DOT_GAP, l.width, 1e-4f) + assertEquals(pitch * 7 - 3f * DotSize.DOT_GAP, l.height, 1e-4f) + assertEquals(1.5f, l.radius, 1e-6f) + } + + @Test fun `five digits keep a gap of half a digit before the last three`() { + assertEquals("12,480", DotFont.grouped("12,480")) + assertEquals("8412", DotFont.grouped("8,412")) + // Five 5-wide digits, four gaps between glyphs, and the 2-wide group gap with its own column. + assertEquals(5 * 5 + 2 + 5, DotFont.columns("12,480")) } @Test fun `every dot sits inside the box at any density`() { diff --git a/app/src/test/kotlin/org/openstrap/app/ui/glow/live/LiveTopBarTest.kt b/app/src/test/kotlin/org/openstrap/app/ui/glow/live/LiveTopBarTest.kt index c55d6809..f68ddc91 100644 --- a/app/src/test/kotlin/org/openstrap/app/ui/glow/live/LiveTopBarTest.kt +++ b/app/src/test/kotlin/org/openstrap/app/ui/glow/live/LiveTopBarTest.kt @@ -31,7 +31,7 @@ class LiveTopBarTest { val r = WorkoutState.Recording(appWorkout(start = now - 600, end = null), maxHeartRate = 190) rules.compose.setContent { LiveFrame( - r, Color.Green, connected = false, PaddingValues(), LiveControls({}, {}, {}, {}, {}, {}), + r, org.openstrap.app.ui.theme.Blends.Distance, connected = false, PaddingValues(), LiveControls({}, {}, {}, {}, {}, {}), title = "Outdoor cycling, intervals", status = listOf("GPS good" to Color.Green), ) {} } From ef128d522f8dbad1826d352a03b2e3882e76414d Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:08:32 +0400 Subject: [PATCH 19/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20places=20polish?= =?UTF-8?q?=20(strap=20tiles,=20tinted=20rows,=20alarms,=20profile,=20zepp?= =?UTF-8?q?=20account,=20setup)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../openstrap/app/ui/alarms/AlarmsScreen.kt | 95 ++++++--- .../app/ui/alarms/PhoneAlertsScreen.kt | 8 +- .../openstrap/app/ui/device/DeviceScreen.kt | 30 +-- .../org/openstrap/app/ui/device/GoalsSheet.kt | 2 +- .../org/openstrap/app/ui/device/PlaceParts.kt | 55 +++++- .../openstrap/app/ui/device/ProfileScreen.kt | 185 +++++++++++++----- .../openstrap/app/ui/device/UpdatesPage.kt | 8 +- .../org/openstrap/app/ui/device/YouPage.kt | 11 +- .../app/ui/firmware/FirmwareScreen.kt | 32 +-- .../openstrap/app/ui/glow/DataStateParts.kt | 5 +- .../openstrap/app/ui/glow/HeartZonesScreen.kt | 2 +- .../org/openstrap/app/ui/glow/PageParts.kt | 34 +++- .../org/openstrap/app/ui/glow/StrapDrawing.kt | 4 +- .../openstrap/app/ui/root/PermissionGates.kt | 6 + .../org/openstrap/app/ui/zepp/ZeppSignIn.kt | 42 +++- 15 files changed, 375 insertions(+), 144 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt index cbf15de4..24bcace6 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt @@ -1,7 +1,19 @@ package org.openstrap.app.ui.alarms import androidx.activity.compose.BackHandler +import androidx.compose.foundation.border import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.height +import androidx.compose.ui.draw.clip +import androidx.compose.ui.unit.sp +import org.openstrap.app.ui.device.PlaceIcon +import org.openstrap.app.ui.device.placeHero +import org.openstrap.app.ui.glow.topHairline +import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ExperimentalLayoutApi @@ -209,7 +221,7 @@ fun HealthAlertsScreen(vm: AlarmsViewModel, state: AlarmsUiState, contentPadding @Composable private fun ErrorPanel(message: String, busy: Boolean, onRetry: () -> Unit) { PagePanel { - PageNote(message, color = MetricColors.warn) + PageNote(message, color = Color.White) PageButton(stringResource(R.string.you_alarms_try_again), onRetry, Modifier.fillMaxWidth(), enabled = !busy) } } @@ -222,36 +234,71 @@ private fun AlarmsPanel( onAdd: () -> Unit, onDeleteAll: () -> Unit, ) { - PagePanel( - title = stringResource(R.string.you_alarms_on_strap), - note = state.caps?.let { stringResource(R.string.you_alarms_count, state.alarms.size, it.maxCount) }, - ) { - if (state.alarms.isEmpty()) PageNote(stringResource(R.string.you_alarms_none)) - state.alarms.forEach { a -> - Row(Modifier.fillMaxWidth().clickable(enabled = !state.busy) { onEdit(a) }.padding(vertical = 2.dp), verticalAlignment = Alignment.CenterVertically) { - Column(Modifier.weight(1f)) { - val ink = if (a.enabled) Color.White else Color.White.copy(alpha = 0.45f) - val (digits, marker) = dotClock(a.hour, a.minute) - Row(verticalAlignment = Alignment.Bottom) { - org.openstrap.app.ui.glow.DotMatrixText(digits, dot = org.openstrap.app.ui.glow.draw.DotSize.Edge, color = ink) - marker?.let { Text(it, style = GlowType.secondary, color = ink, modifier = Modifier.padding(start = 6.dp)) } + Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + // The board's hero panel: strap glass from the top, the title and count on one line, 84 dp rows of 40 sp time. + Column( + Modifier.fillMaxWidth().clip(GlowShapes.Card) + .placeHero(180f, 0f to Blends.Strap.first.copy(alpha = 0.22f), 0.6f to Color.White.copy(alpha = 0.06f), 1f to Color.White.copy(alpha = 0.06f)) + .padding(start = 18.dp, end = 18.dp, top = 16.dp, bottom = 6.dp), + ) { + Row(Modifier.fillMaxWidth().height(24.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Bottom) { + Text(stringResource(R.string.you_alarms_on_strap), color = Color.White, style = GlowType.cardTitle, maxLines = 1) + state.caps?.let { + Text( + stringResource(R.string.you_alarms_count, state.alarms.size, it.maxCount), + color = Color.White.copy(alpha = 0.65f), style = GlowType.secondary, + ) + } + } + Spacer(Modifier.height(6.dp)) + if (state.alarms.isEmpty()) PageNote(stringResource(R.string.you_alarms_none)) + state.alarms.forEachIndexed { i, a -> + Row( + Modifier.fillMaxWidth().topHairline(i > 0).height(84.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), verticalAlignment = Alignment.CenterVertically, + ) { + Column( + Modifier.weight(1f).fillMaxHeight().clickable(enabled = !state.busy) { onEdit(a) }, + verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically), + ) { + val ink = if (a.enabled) Color.White else Color.White.copy(alpha = 0.45f) + val (digits, marker) = dotClock(a.hour, a.minute) + Row(verticalAlignment = Alignment.Bottom) { + Text(digits, color = ink, style = GlowType.goalValue) + marker?.let { Text(it, style = GlowType.secondary, color = ink, modifier = Modifier.padding(start = 6.dp, bottom = 4.dp)) } + } + Text(daysLabel(a.days), style = GlowType.secondary, color = Color.White.copy(alpha = 0.6f)) } - Text(daysLabel(a.days), style = GlowType.secondary, color = Color.White.copy(alpha = 0.6f), modifier = Modifier.padding(top = 6.dp)) + org.openstrap.app.ui.glow.GlowSwitch(a.enabled, { onToggle(a, it) }, enabled = !state.busy) } - org.openstrap.app.ui.glow.GlowSwitch(a.enabled, { onToggle(a, it) }, enabled = !state.busy) } } - if (state.canAdd) { - PageButton(stringResource(R.string.you_alarms_add), onAdd, Modifier.fillMaxWidth(), enabled = !state.busy, primary = true) + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + if (state.canAdd) { + PageButton( + stringResource(R.string.you_alarms_add), onAdd, Modifier.fillMaxWidth().height(52.dp), enabled = !state.busy, primary = true, + icon = AppIcons.Plus, + ) + } + if (state.alarms.size > 1) { + PageTextButton( + stringResource(R.string.you_alarms_delete_all), onDeleteAll, Modifier.align(Alignment.CenterHorizontally).height(44.dp), + enabled = !state.busy, color = DestructiveInk, + ) + } } - if (state.alarms.size > 1) { - PageTextButton( - stringResource(R.string.you_alarms_delete_all), onDeleteAll, Modifier.align(Alignment.CenterHorizontally), - enabled = !state.busy, color = DestructiveInk, + // Zepp's tip for this strap (alarm_stuttgart_close_tips), in an outlined panel with the hand. + Row( + Modifier.fillMaxWidth().clip(GlowShapes.Card).border(1.dp, Color.White.copy(alpha = 0.14f), GlowShapes.Card) + .padding(horizontal = 18.dp, vertical = 16.dp), + horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically, + ) { + PlaceIcon(AppIcons.HandPalm, 32.dp, 0.08f, tint = Color.White.copy(alpha = 0.78f)) + Text( + stringResource(R.string.you_alarms_tip), Modifier.weight(1f), color = Color.White.copy(alpha = 0.72f), + style = GlowType.body, ) } - // Zepp's tip for this strap (alarm_stuttgart_close_tips). - PageNote(stringResource(R.string.you_alarms_tip)) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/alarms/PhoneAlertsScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/alarms/PhoneAlertsScreen.kt index 14df91e6..a3fc39fd 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/alarms/PhoneAlertsScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/alarms/PhoneAlertsScreen.kt @@ -143,7 +143,7 @@ fun PhoneAlertsScreen(vm: PhoneAlertsViewModel, contentPadding: PaddingValues, o divider = false, ) if (phoneBlocked && !callPermission) { - PageNote(stringResource(R.string.you_phone_calls_blocked), color = MetricColors.warn) + PageNote(stringResource(R.string.you_phone_calls_blocked), color = Color.White) PageButton(stringResource(R.string.you_phone_open_settings), openAppSettings, Modifier.fillMaxWidth()) } if (calls && callPermission) { @@ -151,7 +151,7 @@ fun PhoneAlertsScreen(vm: PhoneAlertsViewModel, contentPadding: PaddingValues, o Text(stringResource(R.string.you_phone_call_buzz), style = GlowType.body, color = Color.White) // Picking one plays it for a few seconds, so the two can be compared on the wrist. GlowSegments(CallBuzz.entries.map { it.label }, callStyle.ordinal, { i -> vm.pickCallBuzz(CallBuzz.entries[i]) }) - callPreviewError?.let { PageNote(it, color = MetricColors.warn) } + callPreviewError?.let { PageNote(it, color = Color.White) } } Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Text(stringResource(R.string.you_phone_call_length), style = GlowType.body, color = Color.White) @@ -170,7 +170,7 @@ fun PhoneAlertsScreen(vm: PhoneAlertsViewModel, contentPadding: PaddingValues, o }, ) if (notifications && !notificationAccess) { - PageNote(stringResource(R.string.you_phone_notifications_access), color = MetricColors.warn) + PageNote(stringResource(R.string.you_phone_notifications_access), color = Color.White) PageButton(stringResource(R.string.you_phone_open_settings), openNotificationAccess, Modifier.fillMaxWidth()) } if (notifications && notificationAccess) { @@ -178,7 +178,7 @@ fun PhoneAlertsScreen(vm: PhoneAlertsViewModel, contentPadding: PaddingValues, o Text(stringResource(R.string.you_phone_pattern), style = GlowType.body, color = Color.White) // Picking a pattern plays it once, so it can be felt before the next notification. GlowSegments(BuzzPattern.entries.map { it.label }, pattern.ordinal, { i -> vm.pickPattern(BuzzPattern.entries[i]) }) - previewError?.let { PageNote(it, color = MetricColors.warn) } + previewError?.let { PageNote(it, color = Color.White) } } PageSwitchRow( stringResource(R.string.you_phone_quiet), quietHoursSummary(quiet, calls && callPermission), quiet.on, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt index 46702c21..b589bf0d 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt @@ -267,12 +267,12 @@ fun DeviceScreen( } } item { - PageRows { - PageSwitchRow( - stringResource(R.string.you_strap_row_off_body), null, wearReminder, vm::setWearReminder, divider = false, - icon = AppIcons.HandPalm, + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + StatusTile( + AppIcons.HandPalm, stringResource(R.string.you_strap_row_off_body), Modifier.weight(1f), + checked = wearReminder, onChange = vm::setWearReminder, ) - KeepConnectedRow(vm, keepConnected, device.address) + KeepConnectedTile(vm, keepConnected, device.address, Modifier.weight(1f)) } } item { @@ -368,7 +368,7 @@ private tailrec fun android.content.Context.findActivity(): android.app.Activity * battery-optimization prompt. */ @Composable -private fun KeepConnectedRow(vm: DeviceViewModel, keepConnected: KeepConnected, address: String) { +private fun KeepConnectedTile(vm: DeviceViewModel, keepConnected: KeepConnected, address: String, modifier: Modifier) { val context = LocalContext.current val associated by vm.companionAssociated.collectAsStateWithLifecycle() val ignoringBattery by vm.ignoringBatteryOptimizations.collectAsStateWithLifecycle() @@ -380,9 +380,9 @@ private fun KeepConnectedRow(vm: DeviceViewModel, keepConnected: KeepConnected, val failed = stringResource(R.string.you_strap_battery_settings_failed) val icon = AppIcons.Bluetooth when { - associated -> PageRow(title, on, icon = icon) - vm.companionSupported && !declined && !hidden -> PageRow(title, off, onClick = { keepConnected.associate(address) }, icon = icon) - !ignoringBattery -> PageRow(title, off, icon = icon, onClick = { + associated -> StatusTile(icon, title, modifier, chip = on) + vm.companionSupported && !declined && !hidden -> StatusTile(icon, title, modifier, chip = off, onClick = { keepConnected.associate(address) }) + !ignoringBattery -> StatusTile(icon, title, modifier, chip = off, onClick = { runCatching { context.startActivity( android.content.Intent(android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) @@ -390,7 +390,7 @@ private fun KeepConnectedRow(vm: DeviceViewModel, keepConnected: KeepConnected, ) }.onFailure { vm.showMessage(failed) } }) - else -> PageRow(title, on, icon = icon) + else -> StatusTile(icon, title, modifier, chip = on) } } @@ -419,7 +419,7 @@ internal fun StrapHero(name: String, connection: ConnectionState, sync: SyncStat Spacer(Modifier.width(7.dp)) Text( strapStateLine(connection, sync, lastSeen, now, lastSync = lastSync), - color = Color.White.copy(alpha = 0.82f), style = GlowType.secondary.copy(fontSize = 14.sp, lineHeight = 20.sp), + color = Color.White.copy(alpha = 0.82f), style = GlowType.body, ) } } @@ -434,7 +434,7 @@ internal fun StrapHero(name: String, connection: ConnectionState, sync: SyncStat } when { connection is ConnectionState.Failed && !connection.keyRejected -> { - Text(connection.reason, color = MetricColors.warn, style = GlowType.secondary) + Text(connection.reason, color = Color.White, style = GlowType.secondary) Text( stringResource(R.string.you_strap_retrying), style = GlowType.secondary, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), @@ -442,7 +442,7 @@ internal fun StrapHero(name: String, connection: ConnectionState, sync: SyncStat } sync is SyncState.Failed -> { Text( - stringResource(R.string.you_strap_sync_stopped, sync.reason), color = MetricColors.warn, + stringResource(R.string.you_strap_sync_stopped, sync.reason), color = Color.White, style = GlowType.secondary, ) Text( @@ -597,14 +597,14 @@ private fun ManualPairSheet( ) } if (locationOff) { - PageNote(stringResource(R.string.you_pair_scan_location_off), color = MetricColors.warn) + PageNote(stringResource(R.string.you_pair_scan_location_off), color = Color.White) PageButton( stringResource(R.string.you_pair_scan_location_on), { context.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)) }, Modifier.fillMaxWidth(), icon = AppIcons.Location01, ) } - scan.error?.let { PageNote(stringResource(R.string.you_pair_scan_failed, it), color = MetricColors.warn) } + scan.error?.let { PageNote(stringResource(R.string.you_pair_scan_failed, it), color = Color.White) } if (scan.scanning && scan.found.isEmpty()) PageNote(stringResource(R.string.you_pair_scan_looking)) if (scan.found.isNotEmpty()) PageRows { scan.found.forEachIndexed { i, d -> diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/GoalsSheet.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/GoalsSheet.kt index 8735fa9f..052ef62d 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/GoalsSheet.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/GoalsSheet.kt @@ -211,7 +211,7 @@ private fun CalorieGoalField(value: Int, onChange: (Int) -> Unit, suggested: Int size = 44.dp, ) } - if (refused) PageNote(GoalCopy.outOfRange(Goals.CALORIES), MetricColors.warn) + if (refused) PageNote(GoalCopy.outOfRange(Goals.CALORIES), Color.White) if (suggested != null) { val count = Units.count(suggested.toLong()) if (suggested == value) PageNote(stringResource(R.string.you_goals_suggested_matched, count)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt index b5ac9db2..b1cda2c3 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt @@ -50,6 +50,7 @@ import org.openstrap.app.ui.theme.GlowShapes import org.openstrap.app.ui.theme.ScreenLight import org.openstrap.app.ui.theme.clearGlass import org.openstrap.app.ui.theme.litEdge +import org.openstrap.app.ui.theme.tintedGlass /* * The parts the You and Strap pages share on the Glow × Glass boards (PageYou, PageStrap and what they open): the place @@ -151,7 +152,7 @@ internal fun PlaceTile( if (caret) TapCaret(CARET, Modifier.padding(top = 4.dp)) } Column(verticalArrangement = Arrangement.spacedBy(3.dp)) { - Text(title, color = Color.White, style = GlowType.body.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.Medium), maxLines = 2) + Text(title, color = Color.White, style = GlowType.body, maxLines = 2) Text(note, color = Color.White.copy(alpha = 0.65f), style = GlowType.secondary, maxLines = 3, overflow = TextOverflow.Ellipsis) } } @@ -170,6 +171,7 @@ internal fun OutlineRow( note: String? = null, iconFill: Color = Color.White.copy(alpha = 0.10f), dot: Boolean = false, + iconTint: Color = Color.White, trailing: (@Composable () -> Unit)? = null, ) { val shape = GlowShapes.Tile @@ -180,7 +182,7 @@ internal fun OutlineRow( verticalAlignment = Alignment.CenterVertically, ) { Box(Modifier.size(36.dp).background(iconFill, CircleShape), contentAlignment = Alignment.Center) { - Icon(icon, null, Modifier.size(18.dp), tint = Color.White) + Icon(icon, null, Modifier.size(18.dp), tint = iconTint) } Spacer(Modifier.width(14.dp)) Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { @@ -196,11 +198,52 @@ internal fun OutlineRow( } } +/** + * A 128 dp tile of the Strap page's two-up row (PageStrap): a 36 dp round icon at the top left, the [title] at the bottom + * left, and at the top right either a switch ([onChange] set) or a chip with [chip] ("On"). Clear glass for a switch, + * tinted strap glass for the chip; a tap flips the switch, or runs [onClick] when the chip is something to turn on. + */ +@Composable +internal fun StatusTile( + icon: ImageVector, + title: String, + modifier: Modifier = Modifier, + checked: Boolean = false, + onChange: ((Boolean) -> Unit)? = null, + chip: String? = null, + onClick: (() -> Unit)? = null, +) { + val shape = GlowShapes.Card + Column( + modifier.height(128.dp).clip(shape) + .let { if (onChange != null) it.clearGlass(shape) else it.tintedGlass(Blends.Strap, shape) } + .let { + when { + onChange != null -> it.toggleable(checked, role = Role.Switch, onValueChange = onChange) + onClick != null -> it.pressClickable(onClick, shape).semantics { role = Role.Button } + else -> it + } + } + .padding(horizontal = 16.dp, vertical = 14.dp), + verticalArrangement = Arrangement.SpaceBetween, + ) { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { + PlaceIcon(icon, 36.dp, 0.08f, tint = Color.White.copy(alpha = 0.78f)) + if (onChange != null) org.openstrap.app.ui.glow.GlowSwitch(checked, onChange, Modifier.clearAndSetSemantics {}) + else if (chip != null) Text( + chip, color = Color.White, style = GlowType.secondary, + modifier = Modifier.clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.12f)).padding(horizontal = 10.dp, vertical = 4.dp), + ) + } + Text(title, color = Color.White, style = GlowType.body, maxLines = 2) + } +} + /** A small white 14% chip with [text] ("2 to restore"), the board's count tag. */ @Composable internal fun CountChip(text: String) { Text( - text, color = Color.White, style = GlowType.secondary.copy(fontSize = 12.sp), + text, color = Color.White, style = GlowType.caption, modifier = Modifier.clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.14f)).padding(horizontal = 10.dp, vertical = 4.dp), ) } @@ -225,7 +268,7 @@ internal fun OutlinePill(text: String, icon: ImageVector?, onClick: () -> Unit, ) { val ink = Color.White.copy(alpha = 0.72f) if (icon != null) { Icon(icon, null, Modifier.size(18.dp), tint = ink); Spacer(Modifier.width(8.dp)) } - Text(text, color = ink, style = GlowType.body.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.Medium), maxLines = 1) + Text(text, color = ink, style = GlowType.body, maxLines = 1) } } @@ -255,8 +298,8 @@ internal fun SwitchHero( org.openstrap.app.ui.glow.GlowSwitch(checked, onChange, Modifier.clearAndSetSemantics {}) } Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { - Text(title, color = Color.White, style = GlowType.cardTitle) - Text(line, color = Color.White.copy(alpha = 0.85f), style = GlowType.secondary.copy(fontSize = 14.sp, lineHeight = 20.sp)) + Text(title, color = Color.White, style = GlowType.cardTitle, maxLines = 1) + Text(line, color = Color.White.copy(alpha = 0.85f), style = GlowType.body) } } if (below != null) { Spacer(Modifier.height(10.dp)); below() } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt index 14480355..ca8cab83 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt @@ -46,6 +46,23 @@ import org.openstrap.app.ui.glow.PagePanel import org.openstrap.app.ui.glow.PageRow import org.openstrap.app.ui.glow.PageSwitchRow import java.time.LocalDate +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.sp +import org.openstrap.app.ui.glow.PageRows +import org.openstrap.app.ui.theme.AppIcons +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass +import org.openstrap.app.ui.theme.darkGlow /** One line for the settings row: "34 years, male, 72 kg, 178 cm", or a prompt when empty. */ fun UserProfile.summary(strings: Strings = Strings.app): String = @@ -163,7 +180,7 @@ fun ProfileScreen(profile: UserProfile, contentPadding: PaddingValues, onSave: ( item { PageNote(stringResource(R.string.you_profile_note), Color.White.copy(alpha = 0.65f)) } item { PagePanel { - Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + Column(verticalArrangement = Arrangement.spacedBy(14.dp)) { PageNumberField( age, { age = it }, stringResource(R.string.you_profile_age), stringResource(R.string.you_profile_age_unit), age.isNotBlank() && ageValue == null, @@ -171,14 +188,14 @@ fun ProfileScreen(profile: UserProfile, contentPadding: PaddingValues, onSave: ( // Sex as labelled segments like Units, not two bare symbols beside Age. Tapping the chosen one // again clears it. Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - PageNote(stringResource(R.string.you_profile_sex_note)) + PageNote(stringResource(R.string.you_profile_sex_note), Color.White.copy(alpha = 0.65f)) org.openstrap.app.ui.glow.GlowSegments( listOf(stringResource(R.string.you_profile_sex_female), stringResource(R.string.you_profile_sex_male)), if (sex in 0..1) sex else -1, { i -> sex = if (sex == i) 2 else i }, ) } Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - PageNote(stringResource(R.string.you_profile_units)) + PageNote(stringResource(R.string.you_profile_units), Color.White.copy(alpha = 0.65f)) org.openstrap.app.ui.glow.GlowSegments( listOf( stringResource(R.string.you_profile_units_metric), stringResource(R.string.you_profile_units_imperial), @@ -186,58 +203,77 @@ fun ProfileScreen(profile: UserProfile, contentPadding: PaddingValues, onSave: ( if (imperial) 1 else 0, { switchUnits(it == 1) }, ) } - PageNumberField( - weight, { weight = it }, stringResource(R.string.you_profile_weight), - stringResource(if (imperial) R.string.you_profile_unit_lb else R.string.you_profile_unit_kg), - weight.isNotBlank() && weightValue == null, decimal = true, - ) - if (imperial) { - Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { - val wrong = !heightBlank && heightValue == null - PageNumberField( - feet, { feet = it.take(1) }, stringResource(R.string.you_profile_feet), - stringResource(R.string.you_profile_unit_ft), wrong, - Modifier.weight(1f), - ) - PageNumberField( - inches, { inches = it.take(2) }, stringResource(R.string.you_profile_inches), - stringResource(R.string.you_profile_unit_in), wrong, - Modifier.weight(1f), - ) - } - } else { - PageNumberField( - heightCm, { heightCm = it }, stringResource(R.string.you_profile_height), - stringResource(R.string.you_profile_unit_cm), - !heightBlank && heightValue == null, - ) - } - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - PageNote(stringResource(R.string.you_profile_activity_note)) - // Tapping the chosen level again clears it. - org.openstrap.app.ui.glow.GlowSegments((1..5).map { "$it" }, activity, { i -> activity = if (activity == i) -1 else i }) - PageNote( - if (activity in 0..4) org.openstrap.app.data.Vo2max.ACTIVITY_LEVELS[activity] - else stringResource(R.string.you_profile_activity_pick), - ) - } - PageSwitchRow( - stringResource(R.string.you_profile_beta_blockers), null, betaBlocker, { betaBlocker = it }, divider = false, + } + } + } + // Weight and height as two big tiles (the board's 112 dp); imperial height is feet and inches, three across. + item { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + BodyTile( + weight, { weight = it.filter { c -> c.isDigit() || c == '.' || c == ',' }.take(5) }, stringResource(R.string.you_profile_weight), + stringResource(if (imperial) R.string.you_profile_unit_lb else R.string.you_profile_unit_kg), + weight.isNotBlank() && weightValue == null, Modifier.weight(if (imperial) 1.3f else 1f), decimal = true, big = !imperial, + ) + if (imperial) { + val wrong = !heightBlank && heightValue == null + BodyTile( + feet, { feet = it.filter(Char::isDigit).take(1) }, stringResource(R.string.you_profile_feet), + stringResource(R.string.you_profile_unit_ft), wrong, Modifier.weight(1f), big = false, ) - PageSwitchRow(stringResource(R.string.you_profile_pregnant), null, pregnant, { pregnant = it }, divider = false) - // Your max is set on the Heart rate zones page, with the zones that follow it. - PageRow( - org.openstrap.app.ui.workout.HeartZonesCopy.MAX_ROW, org.openstrap.app.ui.workout.HeartZonesCopy.profileLine(profile.maxHeartRate), - onClick = onHeartZones, below = true, divider = false, + BodyTile( + inches, { inches = it.filter(Char::isDigit).take(2) }, stringResource(R.string.you_profile_inches), + stringResource(R.string.you_profile_unit_in), wrong, Modifier.weight(1f), big = false, ) - PageNumberField( - sleepNeed, { sleepNeed = it }, stringResource(R.string.you_profile_sleep_need), - stringResource(R.string.you_unit_h), - sleepNeed.isNotBlank() && sleepNeedValue == null, decimal = true, + } else { + BodyTile( + heightCm, { heightCm = it.filter(Char::isDigit).take(5) }, stringResource(R.string.you_profile_height), + stringResource(R.string.you_profile_unit_cm), !heightBlank && heightValue == null, Modifier.weight(1f), ) } } } + item { + // The usual activity in a card lit from below in the copper blend, the five levels as segments. + Column( + Modifier.fillMaxWidth().darkGlow(Blends.You, GlowShapes.Card).padding(horizontal = 18.dp, vertical = 16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + Text( + stringResource(R.string.you_profile_activity_note), color = Color.White.copy(alpha = 0.8f), + style = GlowType.body, + ) + // Tapping the chosen level again clears it. + org.openstrap.app.ui.glow.GlowSegments((1..5).map { "$it" }, activity, { i -> activity = if (activity == i) -1 else i }) + Text( + if (activity in 0..4) org.openstrap.app.data.Vo2max.ACTIVITY_LEVELS[activity] + else stringResource(R.string.you_profile_activity_pick), + color = Color.White, style = GlowType.body, + ) + } + } + item { + PageRows { + PageSwitchRow( + stringResource(R.string.you_profile_beta_blockers), null, betaBlocker, { betaBlocker = it }, divider = false, + ) + PageSwitchRow(stringResource(R.string.you_profile_pregnant), null, pregnant, { pregnant = it }) + } + } + item { + // Your max is set on the Heart rate zones page, with the zones that follow it. + OutlineRow( + AppIcons.Heartbeat, org.openstrap.app.ui.workout.HeartZonesCopy.MAX_ROW, onHeartZones, + note = org.openstrap.app.ui.workout.HeartZonesCopy.profileLine(profile.maxHeartRate), + iconFill = Blends.Heart.first.copy(alpha = 0.20f), iconTint = Blends.Heart.chart, + ) + } + item { + SleepNeedRow( + sleepNeed, { sleepNeed = it.filter { c -> c.isDigit() || c == '.' || c == ',' }.take(5) }, + stringResource(R.string.you_profile_sleep_need), stringResource(R.string.you_unit_h), + sleepNeed.isNotBlank() && sleepNeedValue == null, + ) + } } // Black from the bottom of the screen up to Save, fading out above it, so the page scrolls away under it. Box(Modifier.align(Alignment.BottomCenter).fillMaxWidth().pinnedFade().padding(start = side, end = side, bottom = bottom + 12.dp)) { @@ -248,6 +284,57 @@ fun ProfileScreen(profile: UserProfile, contentPadding: PaddingValues, onSave: ( } } +/** A big number field on a tile (Weight, Height): its [label] over the value in light type with the [unit] on its baseline. */ +@Composable +private fun BodyTile( + value: String, + onChange: (String) -> Unit, + label: String, + unit: String, + error: Boolean, + modifier: Modifier = Modifier, + decimal: Boolean = false, + big: Boolean = true, +) { + val shape = GlowShapes.Card + Column( + modifier.height(112.dp).clearGlass(shape).let { if (error) it.border(1.5.dp, Color.White.copy(alpha = 0.9f), shape) else it } + .padding(horizontal = 16.dp, vertical = 14.dp), + verticalArrangement = Arrangement.SpaceBetween, + ) { + Text(label, color = Color.White.copy(alpha = 0.72f), style = GlowType.body) + Row(verticalAlignment = Alignment.Bottom, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + BasicTextField( + value, onChange, Modifier.width(IntrinsicSize.Min).widthIn(min = 18.dp, max = 110.dp), + textStyle = (if (big) GlowType.goalValue else GlowType.smallValue).copy(color = Color.White), + singleLine = true, cursorBrush = SolidColor(Color.White), + keyboardOptions = KeyboardOptions(keyboardType = if (decimal) KeyboardType.Decimal else KeyboardType.Number), + ) + Text(unit, color = Color.White.copy(alpha = 0.7f), style = GlowType.body, modifier = Modifier.padding(bottom = 6.dp)) + } + } +} + +/** The sleep need as a 64 dp row on the board: the question, the hours on the right in 20 sp, then "h". */ +@Composable +private fun SleepNeedRow(value: String, onChange: (String) -> Unit, label: String, unit: String, error: Boolean) { + val shape = GlowShapes.Card + Row( + Modifier.fillMaxWidth().height(64.dp).clearGlass(shape).let { if (error) it.border(1.5.dp, Color.White.copy(alpha = 0.9f), shape) else it } + .padding(horizontal = 16.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, + ) { + Text(label, Modifier.weight(1f), color = Color.White.copy(alpha = 0.85f), style = GlowType.body) + BasicTextField( + value, onChange, Modifier.width(40.dp), + textStyle = GlowType.rowValue.copy(color = Color.White, textAlign = TextAlign.End), + singleLine = true, cursorBrush = SolidColor(Color.White), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal), + ) + Text(unit, color = Color.White.copy(alpha = 0.6f), style = GlowType.body) + } +} + /** The pinned Save button's height, as Start on Ready. */ private val SaveHeight = 56.dp diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt index db59ddbd..a59e42fd 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt @@ -84,7 +84,7 @@ fun UpdatesPage( Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.Bottom) { Text( stringResource(R.string.you_updates_release, newest.versionName), Modifier.weight(1f), color = Color.White, - style = GlowType.pageTitle.copy(fontWeight = FontWeight.Medium, fontSize = 24.sp, lineHeight = 30.sp), maxLines = 1, + style = GlowType.pageTitle, maxLines = 1, ) newest.publishedAt?.let { Text(UpdateCopy.date(it), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary) } } @@ -128,7 +128,7 @@ fun UpdatesPage( Modifier.fillMaxWidth().clip(GlowShapes.Card).background(Paper.Fill).padding(20.dp), verticalArrangement = Arrangement.spacedBy(8.dp), ) { - Text(title, color = Paper.Ink, style = GlowType.cardTitle.copy(fontWeight = FontWeight.SemiBold, fontSize = 19.sp, lineHeight = 24.sp)) + Text(title, color = Paper.Ink, style = GlowType.cardTitle, maxLines = 1) shown.forEachIndexed { i, release -> if (i > 0) Box(Modifier.fillMaxWidth().height(1.dp).background(Paper.Ink.copy(alpha = 0.1f))) ReleaseNotesView(release) @@ -151,7 +151,7 @@ private fun ReleaseNotesView(release: Release) { val blocks = remember(release.notes) { ReleaseNotes.parse(release.notes) } Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { - Text(release.versionName, color = Paper.Ink, style = GlowType.body.copy(fontWeight = FontWeight.Medium), modifier = Modifier.weight(1f)) + Text(release.versionName, color = Paper.Ink, style = GlowType.body, modifier = Modifier.weight(1f)) release.publishedAt?.let { Text(UpdateCopy.date(it), color = Paper.Muted, style = GlowType.secondary) } @@ -164,7 +164,7 @@ private fun ReleaseNotesView(release: Release) { } blocks.forEachIndexed { i, block -> when (block) { is NoteBlock.Heading -> Text( - spans(block.spans), color = Paper.Ink, style = GlowType.body.copy(fontWeight = FontWeight.Medium), modifier = Modifier.padding(top = 6.dp), + spans(block.spans), color = Paper.Ink, style = GlowType.body, modifier = Modifier.padding(top = 6.dp), ) // The opening paragraph leads, larger; any later one reads like the bullets. is NoteBlock.Paragraph -> diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt index dd7c0be6..f7d92cc4 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt @@ -169,7 +169,7 @@ fun YouPage( } Text( profile.summary(), Modifier.align(Alignment.BottomStart), color = Color.White, - style = GlowType.sentence.copy(fontSize = 22.sp, lineHeight = 28.sp), maxLines = 2, + style = GlowType.sentence, maxLines = 2, ) } } @@ -178,17 +178,18 @@ fun YouPage( PageRow( org.openstrap.app.ui.workout.HeartZonesCopy.TITLE, org.openstrap.app.ui.workout.HeartZonesCopy.youLine(maxHeartRate), onClick = onHeartZones, below = true, divider = false, icon = AppIcons.Heartbeat, selected = selected == PageRowKeys.HEART_ZONES, + tint = Blends.Heart, iconSize = 36.dp, ) - PageRow(stringResource(R.string.you_row_goals), goalsLine(goals), onClick = onGoals, below = true, icon = AppIcons.Target) + PageRow(stringResource(R.string.you_row_goals), goalsLine(goals), onClick = onGoals, below = true, icon = AppIcons.Target, iconSize = 36.dp) PageRow( stringResource(R.string.you_row_sleep_goal), sleepGoalLine(goals, sleepNeedMinutes), onClick = onGoals, below = true, - icon = AppIcons.Moon, + icon = AppIcons.Moon, tint = Blends.Sleep, iconSize = 36.dp, ) PageRow( stringResource(R.string.you_row_goals_and_bests), pluralStringResource(R.plurals.you_goals_and_bests_line, goals.workoutsPerWeek, goals.workoutsPerWeek), onClick = onGoalsAndBests, - below = true, icon = AppIcons.FlagCheckered, selected = selected == PageRowKeys.GOALS_AND_BESTS, + below = true, icon = AppIcons.FlagCheckered, iconSize = 36.dp, selected = selected == PageRowKeys.GOALS_AND_BESTS, ) } } @@ -212,7 +213,7 @@ fun YouPage( if (deletedSleep > 0) item { OutlineRow( AppIcons.Trash, stringResource(R.string.you_row_deleted_sleep), onDeletedSleep, - iconFill = Blends.Sleep.first.copy(alpha = 0.26f), + iconFill = Blends.Sleep.first.copy(alpha = 0.26f), iconTint = Blends.Sleep.chart, trailing = { CountChip(org.openstrap.app.ui.dashboard.SleepCopy.deletedCount(deletedSleep)) }, ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt index ac9b85b1..89b94964 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width @@ -22,6 +23,10 @@ import androidx.compose.ui.unit.sp import org.openstrap.app.ui.components.PageLight import org.openstrap.app.ui.device.OutlinePanel import org.openstrap.app.ui.device.PlaceHero +import org.openstrap.app.ui.device.PlaceIcon +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.clearGlass +import androidx.compose.foundation.layout.offset import org.openstrap.app.ui.device.StrapPageLight import org.openstrap.app.ui.device.strapHero import androidx.compose.runtime.DisposableEffect @@ -95,12 +100,12 @@ fun FirmwareScreen(vm: FirmwareViewModel, contentPadding: PaddingValues, onBack: PlaceHero(Modifier.strapHero()) { val c = connection as? ConnectionState.Connected Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { - Text(stringResource(R.string.you_firmware_this_strap), color = Color.White, style = GlowType.cardTitle) + Text(stringResource(R.string.you_firmware_this_strap), color = Color.White, style = GlowType.cardTitle, maxLines = 1) Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { Text(stringResource(R.string.you_firmware_title), color = Color.White.copy(alpha = 0.78f), style = GlowType.secondary) Text( info?.firmware ?: c?.firmware ?: stringResource(R.string.you_firmware_unknown), color = Color.White, - style = GlowType.sentence.copy(fontSize = 34.sp, lineHeight = 40.sp), + style = GlowType.smallValue, ) } Row(Modifier.fillMaxWidth().padding(top = 4.dp), horizontalArrangement = Arrangement.spacedBy(10.dp)) { @@ -213,7 +218,7 @@ private fun StepPanel(step: FirmwareStep, vm: FirmwareViewModel, onInstall: (Rea } is FirmwareStep.Failed -> { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { - Icon(AppIcons.WarningCircle, null, tint = MetricColors.warn) + Icon(AppIcons.WarningCircle, null, tint = Color.White) CardTitle(stringResource(R.string.you_firmware_failed)) } Body(step.message) @@ -286,8 +291,12 @@ private fun AccountPanel( onConfirm = { listing, strap -> mode = AccountMode.Idle; onSignIn(listing, strap) }, ) } - PagePanel { + Column( + Modifier.fillMaxWidth().clearGlass(GlowShapes.Card).padding(20.dp), + verticalArrangement = Arrangement.spacedBy(14.dp), + ) { if (mode != AccountMode.EditingToken) { + PlaceIcon(AppIcons.Key, 44.dp, 0.12f) Body( when { account == null -> stringResource(R.string.you_zepp_account_none) @@ -298,21 +307,22 @@ private fun AccountPanel( PageButton( stringResource(if (account == null) R.string.you_pair_sign_in else R.string.you_zepp_sign_in_again), { mode = AccountMode.SigningIn }, - Modifier.fillMaxWidth(), enabled = enabled, primary = true, + Modifier.fillMaxWidth().height(52.dp), enabled = enabled, primary = true, icon = AppIcons.Key, ) - Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { + Row(Modifier.offset(y = (-4).dp), horizontalArrangement = Arrangement.spacedBy(10.dp)) { PageButton( stringResource(if (account == null) R.string.you_zepp_paste_token else R.string.you_zepp_edit), { mode = AccountMode.EditingToken }, - Modifier.weight(1f), enabled = enabled, + Modifier.weight(1f).height(52.dp), enabled = enabled, icon = AppIcons.PencilEdit, ) if (account != null) { PageButton( - stringResource(R.string.you_zepp_remove), onClear, Modifier.weight(1f), enabled = enabled, color = DestructiveInk, + stringResource(R.string.you_zepp_remove), onClear, Modifier.weight(1f).height(52.dp), enabled = enabled, + color = DestructiveInk, icon = AppIcons.Trash, ) } } - return@PagePanel + return@Column } // Keyed on the account, so a fresh sign-in or renewed token starts the fields again from it and a stale copy // can't be written back over it. The pasted token is the secret: plain remember, so it never reaches the saved state. @@ -395,7 +405,7 @@ private fun Point(icon: ImageVector, title: String, body: String) { @Composable private fun Fact(label: String, value: String, modifier: Modifier = Modifier) { Column(modifier, verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text(label, color = Color.White.copy(alpha = 0.72f), style = GlowType.secondary.copy(fontSize = 12.sp, lineHeight = 16.sp), maxLines = 1) + Text(label, color = Color.White.copy(alpha = 0.72f), style = GlowType.caption, maxLines = 1) Text(value, color = Color.White, style = GlowType.body, maxLines = 1, overflow = TextOverflow.Ellipsis) } } @@ -411,7 +421,7 @@ private fun InfoLine(label: String, value: String) { @Composable private fun Warning(text: String) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Icon(AppIcons.Warning, null, tint = MetricColors.warn, modifier = Modifier.size(20.dp)) + Icon(AppIcons.Warning, null, tint = Color.White, modifier = Modifier.size(20.dp)) Text(text, style = GlowType.secondary, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA)) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/DataStateParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/DataStateParts.kt index 22db1f76..8e30c8c2 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/DataStateParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/DataStateParts.kt @@ -42,7 +42,6 @@ import org.openstrap.app.ui.dashboard.PARTIAL_DAY_ROWS import org.openstrap.app.ui.dashboard.PairStep import org.openstrap.app.ui.dashboard.Wear import org.openstrap.app.ui.dashboard.partialLine -import org.openstrap.app.ui.theme.MetricColors /* * The pieces of the data states (spec 4.3): the pairing stage on Today's hero, and the partial day sheet a card's @@ -54,7 +53,7 @@ import org.openstrap.app.ui.theme.MetricColors * is always a solid 1 dp hairline (spec 2.7), and each [step] moves in its own way: still while it waits; ripples out of * the phone while it searches; the strap answering with a pulse once it's in reach; sparks running along the line while * they connect; the line lighting up from the phone to the strap with a flash at the pod when connected; and the line - * broken in the middle, amber, when it couldn't. + * broken in the middle when it couldn't. */ @Composable internal fun PairingStage(step: PairStep, modifier: Modifier = Modifier) { @@ -142,7 +141,7 @@ internal fun PairingStage(step: PairStep, modifier: Modifier = Modifier) { // Broken in the middle. val mid = (start + end) / 2 val broken = 7.dp.toPx() - val amber = MetricColors.warn.copy(alpha = 0.75f) + val amber = Color.White.copy(alpha = 0.5f) drawLine(amber, Offset(start, y), Offset(mid - broken, y), hair, StrokeCap.Round) drawLine(amber, Offset(mid + broken, y), Offset(end, y), hair, StrokeCap.Round) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt index f6339e71..a3e05ac8 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt @@ -74,7 +74,7 @@ fun HeartZonesScreen( } item { Text(HeartZonesCopy.NOTE, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, modifier = Modifier.padding(horizontal = 4.dp)) } if (!zones.standard) item { - PageButton(HeartZonesCopy.RESET, { onZones(HeartZones.STANDARD) }, Modifier.fillMaxWidth(), icon = AppIcons.ArrowCounterClockwise) + org.openstrap.app.ui.device.OutlinePill(HeartZonesCopy.RESET, AppIcons.ArrowCounterClockwise, { onZones(HeartZones.STANDARD) }) } } val zone = editing diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt index c9c1a6b7..2135ec7e 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt @@ -235,6 +235,9 @@ fun PageRow( icon: ImageVector? = null, selected: Boolean = false, dot: Boolean = false, + /** Tints the icon as the boards draw a metric's rows: its circle the blend's first stop at 18%, the glyph in the blend. */ + tint: org.openstrap.app.ui.theme.Blend? = null, + iconSize: Dp = 32.dp, trailing: (@Composable () -> Unit)? = null, ) { Row( @@ -252,7 +255,7 @@ fun PageRow( .padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { - if (icon != null) RowIcon(icon) + if (icon != null) RowIcon(icon, tint, iconSize) if (below) Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { if (dot) Row(verticalAlignment = Alignment.CenterVertically) { RowName(title, titleColor) @@ -273,9 +276,10 @@ fun PageRow( /** A settings row's [icon], quiet on the left and centred on the row, with the gap to its title after it. */ @Composable -private fun RowIcon(icon: ImageVector) { - Box(Modifier.padding(end = 12.dp).size(32.dp).background(RowIconFill, CircleShape), contentAlignment = Alignment.Center) { - Icon(icon, null, Modifier.size(18.dp), tint = Color.White.copy(alpha = 0.78f)) +private fun RowIcon(icon: ImageVector, tint: org.openstrap.app.ui.theme.Blend? = null, size: Dp = 32.dp) { + val fill = if (tint != null) tint.first.copy(alpha = 0.18f) else RowIconFill + Box(Modifier.padding(end = 12.dp).size(size).background(fill, CircleShape), contentAlignment = Alignment.Center) { + Icon(icon, null, Modifier.size(18.dp), tint = tint?.chart ?: Color.White.copy(alpha = 0.78f)) } } @@ -501,7 +505,7 @@ fun PageButton( Icon(icon, null, Modifier.size(size.icon), tint = color) Spacer(Modifier.width(8.dp)) } - val style = if (size == ButtonSize.Row) GlowType.secondary else GlowType.body.copy(fontWeight = FontWeight.Medium) + val style = if (size == ButtonSize.Row) GlowType.secondary else GlowType.body Text(text, color = color, style = style, maxLines = 1, overflow = TextOverflow.Ellipsis) } } @@ -529,7 +533,7 @@ fun PageTextButton( /** * A text field in the input style: white 8% glass with 14 dp corners, the [label] over it in - * Secondary, the text in Body, an optional [unit] after it. [error] draws an amber hairline round it. + * Secondary, the text in Body, an optional [unit] after it. [error] draws a white ring round it. */ @Composable fun PageField( @@ -549,7 +553,7 @@ fun PageField( if (label != null) Text(label, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary) Row( Modifier.fillMaxWidth().heightIn(min = 52.dp).clip(GlowShapes.Icon).background(Color.White.copy(alpha = 0.08f)) - .let { if (error) it.border(1.dp, MetricColors.warn, GlowShapes.Icon) else it } + .let { if (error) it.border(1.5.dp, Color.White.copy(alpha = 0.9f), GlowShapes.Icon) else it } .padding(start = 16.dp, end = if (trailing != null) 4.dp else 16.dp), verticalAlignment = Alignment.CenterVertically, ) { @@ -641,14 +645,24 @@ fun PageConfirm( onDismiss: () -> Unit, dismiss: String = stringResource(R.string.glow_cancel), confirmEnabled: Boolean = true, + /** A 40 dp round icon before the title (the permission sheets), and glyphs in the two buttons. */ + icon: ImageVector? = null, + confirmIcon: ImageVector? = null, + dismissIcon: ImageVector? = null, content: (@Composable ColumnScope.() -> Unit)? = null, ) { - PageSheet(onDismiss, title) { + PageSheet(onDismiss, if (icon == null) title else null) { + if (icon != null) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { + Box(Modifier.size(40.dp).background(org.openstrap.app.ui.theme.Blends.Strap.first.copy(alpha = 0.18f), CircleShape), contentAlignment = Alignment.Center) { + Icon(icon, null, Modifier.size(20.dp), tint = Color.White) + } + Text(title, color = Color.White, style = GlowType.cardTitle, maxLines = 2) + } if (text != null) Text(text, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.body) content?.invoke(this) Row(Modifier.fillMaxWidth().padding(top = 4.dp), horizontalArrangement = Arrangement.spacedBy(12.dp)) { - PageButton(dismiss, onDismiss, Modifier.weight(1f)) - PageButton(confirm, onConfirm, Modifier.weight(1f), enabled = confirmEnabled, primary = true) + PageButton(dismiss, onDismiss, Modifier.weight(1f).height(52.dp), icon = dismissIcon) + PageButton(confirm, onConfirm, Modifier.weight(1f).height(52.dp), enabled = confirmEnabled, primary = true, icon = confirmIcon) } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/StrapDrawing.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/StrapDrawing.kt index f7a8a894..cbb91f45 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/StrapDrawing.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/StrapDrawing.kt @@ -108,5 +108,5 @@ private val Lugs = listOf(43f to 36f, 77f to 36f, 43f to 110f, 77f to 110f) /** The resting turn when the strap isn't syncing. */ private val NoTurn: State = mutableFloatStateOf(0f) -/** The strap's own light, the Strap blend's first stop brightened toward white (PageStrap's pod light), not a status colour. */ -internal val StrapLight = androidx.compose.ui.graphics.lerp(org.openstrap.app.ui.theme.Blends.Strap.first, Color.White, 0.45f) +/** The strap's own light, the Strap blend's chart tone (graphite lightened to read on glass), not a status colour. */ +internal val StrapLight = org.openstrap.app.ui.theme.Blends.Strap.chart diff --git a/app/src/main/kotlin/org/openstrap/app/ui/root/PermissionGates.kt b/app/src/main/kotlin/org/openstrap/app/ui/root/PermissionGates.kt index 51cd62b1..199e2490 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/root/PermissionGates.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/root/PermissionGates.kt @@ -174,5 +174,11 @@ internal fun BluetoothBlockedDialog(gates: PermissionGates) { }, onDismiss = gates::dismissBlocked, dismiss = stringResource(R.string.day_nearby_not_now), + icon = when (blocked) { + BlockedPermission.BLUETOOTH -> org.openstrap.app.ui.theme.AppIcons.Bluetooth + BlockedPermission.LOCATION -> org.openstrap.app.ui.theme.AppIcons.Location01 + BlockedPermission.NOTIFICATIONS -> org.openstrap.app.ui.theme.AppIcons.Vibrate + }, + dismissIcon = org.openstrap.app.ui.theme.AppIcons.X, ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/zepp/ZeppSignIn.kt b/app/src/main/kotlin/org/openstrap/app/ui/zepp/ZeppSignIn.kt index 92388a52..c7c18be7 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/zepp/ZeppSignIn.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/zepp/ZeppSignIn.kt @@ -59,6 +59,15 @@ import org.openstrap.app.ui.glow.GlowType import org.openstrap.app.ui.glow.PageButton import org.openstrap.app.ui.glow.OptionButton import org.openstrap.app.ui.glow.PageNote +import org.openstrap.app.ui.glow.StrapDrawing +import org.openstrap.app.ui.glow.StrapLight +import org.openstrap.app.ui.glow.topHairline +import org.openstrap.app.ui.device.placeHero +import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.GlowShapes +import org.openstrap.app.ui.theme.ScreenLight +import org.openstrap.app.ui.theme.screenLight +import androidx.compose.foundation.layout.heightIn import org.openstrap.app.ui.glow.PagePanel import org.openstrap.app.ui.glow.PageProgress import org.openstrap.app.ui.glow.PageTextButton @@ -142,7 +151,11 @@ fun ZeppSignInDialog( Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false)) { // Black to the screen's edges, the page itself in one centred column like every other page (spec 2.4). - Box(Modifier.fillMaxSize().background(Color.Black), contentAlignment = Alignment.TopCenter) { + // Lit by the strap's graphite from the upper left like the Setup boards; the light paints the ground too. + Box( + Modifier.fillMaxSize().screenLight(ScreenLight(Blends.Strap, angle = 150f, strength = 1f, heroCenterY = 150f)), + contentAlignment = Alignment.TopCenter, + ) { Column(Modifier.widthIn(max = GlowLayout.PageMaxWidth).fillMaxSize()) { // A page's top: the round button (a close, since this sits over the page it came from) and the title. val close = stringResource(R.string.you_zepp_close) @@ -198,7 +211,7 @@ fun ZeppSignInDialog( val thirdParty = s is SignInStep.ThirdParty PagePanel { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { - Icon(AppIcons.WarningCircle, null, Modifier.size(20.dp), tint = MetricColors.warn) + Icon(AppIcons.WarningCircle, null, Modifier.size(20.dp), tint = Color.White) Text( stringResource(if (thirdParty) R.string.you_zepp_use_email else R.string.you_zepp_no_devices), color = Color.White, style = GlowType.cardTitle, maxLines = 1, @@ -242,7 +255,18 @@ private fun FoundStrap( val canConfirm = strap != null && (strap.authKey != null || !requireKey) var showKey by remember { mutableStateOf(false) } Column(Modifier.verticalScroll(rememberScrollState()).padding(GlowLayout.Gutter), verticalArrangement = Arrangement.spacedBy(12.dp)) { - PagePanel(title = stringResource(if (strap != null) R.string.you_zepp_found else R.string.you_zepp_not_found)) { + Column( + Modifier.fillMaxWidth().clip(GlowShapes.Card) + .placeHero(200f, 0f to Blends.Strap.first.copy(alpha = 0.42f), 0.55f to Blends.Strap.second.copy(alpha = 0.16f), 1f to Color.White.copy(alpha = 0.05f)) + .padding(start = 20.dp, end = 20.dp, top = 18.dp, bottom = 10.dp), + ) { + Row(Modifier.fillMaxWidth().padding(bottom = 12.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp)) { + Text( + stringResource(if (strap != null) R.string.you_zepp_found else R.string.you_zepp_not_found), Modifier.weight(1f), + color = Color.White, style = GlowType.cardTitle, maxLines = 1, + ) + if (strap != null) StrapDrawing(StrapLight, lit = true, syncing = false, Modifier.size(width = 52.dp, height = 64.dp)) + } if (strap == null) { Text( if (listing.devices.isEmpty()) { @@ -254,7 +278,7 @@ private fun FoundStrap( ) } else { Line(stringResource(R.string.you_pair_address), strap.macAddress) - Row(verticalAlignment = Alignment.CenterVertically) { + Row(Modifier.fillMaxWidth().topHairline(true, Color.White.copy(alpha = 0.1f)).heightIn(min = 44.dp), verticalAlignment = Alignment.CenterVertically) { Text( stringResource(R.string.you_pair_key), color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.body, modifier = Modifier.weight(1f), @@ -280,7 +304,7 @@ private fun FoundStrap( stringResource(if (strap.china) R.string.you_zepp_region_china else R.string.you_zepp_region_global), ) if (strap.authKey == null) { - PageNote(stringResource(R.string.you_zepp_no_key), color = MetricColors.warn) + PageNote(stringResource(R.string.you_zepp_no_key), color = Color.White) } } Line(stringResource(R.string.you_zepp_user), listing.session.userId) @@ -290,10 +314,10 @@ private fun FoundStrap( } PageNote(stringResource(R.string.you_zepp_token_stays)) PageButton( - if (canConfirm) confirmLabel else stringResource(R.string.you_zepp_keep_sign_in), { onConfirm(strap) }, Modifier.fillMaxWidth(), - primary = true, + if (canConfirm) confirmLabel else stringResource(R.string.you_zepp_keep_sign_in), { onConfirm(strap) }, Modifier.fillMaxWidth().height(52.dp), + primary = true, icon = if (canConfirm) AppIcons.Bluetooth else null, ) - PageButton(stringResource(R.string.you_zepp_other_account), onOtherAccount, Modifier.fillMaxWidth()) + PageButton(stringResource(R.string.you_zepp_other_account), onOtherAccount, Modifier.fillMaxWidth().height(52.dp), icon = AppIcons.User) if (!canConfirm && requireKey) ComputerGuideButton() } } @@ -301,7 +325,7 @@ private fun FoundStrap( @Composable private fun Line(label: String, value: String) { // The label is measured first and keeps to one line (spec 2.3), and the value takes what's left, ellipsized last. - Row(Modifier.fillMaxWidth()) { + Row(Modifier.fillMaxWidth().topHairline(true, Color.White.copy(alpha = 0.1f)).heightIn(min = 44.dp), verticalAlignment = Alignment.CenterVertically) { Text(label, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.body, maxLines = 1, modifier = Modifier.padding(end = 12.dp)) Text( value, color = Color.White, style = GlowType.body, maxLines = 2, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis, From 9ba0dc6672b69256ffc464e0fec606f5baa77997 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:11:37 +0400 Subject: [PATCH 20/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20summary=20polish?= =?UTF-8?q?,=20glass=20secondary=20buttons,=20quiet=20delete,=20hero=20tit?= =?UTF-8?q?le=20row,=20dark=20glass=20drop=20card,=20summary=20pages=20on?= =?UTF-8?q?=20WorkoutPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../org/openstrap/app/ui/glow/Celebrations.kt | 12 ++-- .../openstrap/app/ui/glow/GlowWorkoutMode.kt | 32 ++++++--- .../app/ui/glow/GlowWorkoutSummary.kt | 70 ++++++++----------- .../org/openstrap/app/ui/glow/ShareScreen.kt | 4 +- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt index b23f0954..3b0ca2ef 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt @@ -70,8 +70,8 @@ private fun CloseRow(title: String?, onClose: () -> Unit) { fun BestCardScreen(best: Rewards.NewBest, sportName: String, contentPadding: PaddingValues, onContinue: () -> Unit) { BackHandler(onBack = onContinue) val now = System.currentTimeMillis() / 1000 - LightPage( - Modifier.screenLight(ScreenLight(Blends.Calories, 270f, ScreenLight.DAY, 260f)), contentPadding, + WorkoutPage( + ScreenLight(Blends.Calories, 270f, ScreenLight.DAY, 260f), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) }, ) { CloseRow(stringResource(R.string.glow_celebrate_personal_best), onContinue) @@ -98,8 +98,8 @@ fun BestCardScreen(best: Rewards.NewBest, sportName: String, contentPadding: Pad @Composable fun GoalMomentScreen(count: Int, goal: Int, inARow: Int, weekStarts: List, contentPadding: PaddingValues, onSettings: () -> Unit, onContinue: () -> Unit) { BackHandler(onBack = onContinue) - LightPage( - Modifier.screenLight(ScreenLight(Blends.Goals, 270f, ScreenLight.DAY, 190f)), contentPadding, + WorkoutPage( + ScreenLight(Blends.Goals, 270f, ScreenLight.DAY, 190f), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) PageTextButton(stringResource(R.string.glow_celebrate_settings), onSettings, Modifier.align(Alignment.CenterHorizontally)) @@ -169,8 +169,8 @@ fun CelebrationsSheet(goalMoment: Boolean, weeklyRecap: Boolean, onGoalMoment: ( @Composable fun HistoryBadgesScreen(badges: List, contentPadding: PaddingValues, onContinue: () -> Unit, face: (Rewards.Badge) -> String = { it.short }) { BackHandler(onBack = onContinue) - LightPage( - Modifier.screenLight(ScreenLight(Blends.Goals, 270f, ScreenLight.DAY, 190f)), contentPadding, + WorkoutPage( + ScreenLight(Blends.Goals, 270f, ScreenLight.DAY, 190f), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) }, ) { CloseRow(null, onContinue) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt index 5d467db3..f3d808f6 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt @@ -74,6 +74,7 @@ import org.openstrap.app.ui.theme.MetricColors import org.openstrap.app.ui.theme.AppIcons import org.openstrap.app.ui.theme.Blend import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.litEdge import org.openstrap.app.ui.theme.GlowShapes import org.openstrap.app.ui.theme.LocalScreenLight import org.openstrap.app.ui.theme.ScreenLight @@ -85,7 +86,6 @@ import org.openstrap.app.ui.workout.SummaryCopy import java.time.Instant import java.time.LocalDate import java.time.ZoneId -import org.openstrap.app.ui.theme.ControlSurface import org.openstrap.app.data.HeartZones import org.openstrap.app.ui.dashboard.LocalHeartZones import androidx.compose.runtime.ReadOnlyComposable @@ -96,7 +96,8 @@ import androidx.compose.runtime.ReadOnlyComposable internal val PausedColor = Color(WorkoutColors.PAUSED_GREY) /** The Control surface (spec 2.2): round buttons, chips, pills, tiles and fields on the workout pages. */ -internal val Raised = ControlSurface +/** A secondary control's fill: white 12% glass (Elements board), never a solid slab. */ +internal val Raised = Color.White.copy(alpha = 0.12f) /** A button's label: Body (spec 2.3), a step heavier so it reads as the thing to press. */ private val ButtonText = GlowType.body.copy(fontWeight = FontWeight.SemiBold) @@ -152,8 +153,11 @@ internal fun WorkoutButton( modifier: Modifier = Modifier, icon: androidx.compose.ui.graphics.vector.ImageVector? = null, height: Dp = 56.dp, ) { Row( - modifier.fillMaxWidth().height(height).shadow(28.dp, GlowShapes.Pill, ambientColor = background, spotColor = background) - .clip(GlowShapes.Pill).background(background).pressClickable(onClick, GlowShapes.Pill), + modifier.fillMaxWidth().height(height) + .let { if (background.alpha >= 1f) it.shadow(28.dp, GlowShapes.Pill, ambientColor = background, spotColor = background) else it } + .clip(GlowShapes.Pill).background(background) + .let { if (background.alpha < 1f) it.litEdge(GlowShapes.Pill, top = 0.2f, ring = 0f) else it } + .pressClickable(onClick, GlowShapes.Pill), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically, ) { if (icon != null) { @@ -176,9 +180,19 @@ internal fun WorkoutPage( pinned: (@Composable ColumnScope.() -> Unit)? = null, /** Painted over the whole screen in place of the light (HIIT's phase light). */ backdrop: Brush? = null, + /** The summary's light sized by effort (read while drawing) and its blend; it paints the ground too, in place of [light]. */ + effortLight: Pair<() -> Float, Blend>? = null, content: @Composable ColumnScope.() -> Unit, ) { - CompositionLocalProvider(LocalScreenLight provides light) { BoxWithConstraints(Modifier.fillMaxSize().then(if (backdrop != null) Modifier.screenLight(null) else Modifier.screenLight(light))) { + CompositionLocalProvider(LocalScreenLight provides light) { BoxWithConstraints( + Modifier.fillMaxSize().then( + when { + effortLight != null -> Modifier.effortLight(effortLight.second, effortLight.first) + backdrop != null -> Modifier.screenLight(null) + else -> Modifier.screenLight(light) + }, + ), + ) { val density = LocalDensity.current var pinnedHeight by remember { mutableStateOf(0.dp) } if (backdrop != null) Box(Modifier.fillMaxSize().background(backdrop)) @@ -220,9 +234,9 @@ internal fun WorkoutPage( pinned: (@Composable ColumnScope.() -> Unit)? = null, backdrop: Brush? = null, content: @Composable ColumnScope.() -> Unit, -) = WorkoutPage( +): Unit = WorkoutPage( if (glow == Color.Transparent) null else ScreenLight(Blends.forInk(glow) ?: Blend(glow, glow), 90f, 0.5f, 0f), - contentPadding, scroll, pinned, backdrop, content, + contentPadding, scroll, pinned, backdrop, content = content, ) /* ----------------------------------------- Activity tab entry ---------------------------------------- */ @@ -382,13 +396,13 @@ internal fun ColumnScope.SummaryActions(justEnded: Boolean, onDone: () -> Unit, DeleteWorkout(stringResource(R.string.glow_workout_delete_phone), onDelete, Modifier.align(Alignment.CenterHorizontally)) } -/** "Delete this workout" as a warn coloured button with a trash icon, asking first; [what] says what deleting it does. */ +/** "Delete this workout" as a quiet white button with a trash icon, asking first; [what] says what deleting it does. */ @Composable internal fun DeleteWorkout(what: String, onDelete: () -> Unit, modifier: Modifier = Modifier) { var confirmDelete by rememberSaveable { mutableStateOf(false) } PageButton( stringResource(R.string.glow_workout_delete), { confirmDelete = true }, modifier.fillMaxWidth(), - color = MetricColors.warn, icon = AppIcons.Trash, + color = Color.White.copy(alpha = 0.72f), icon = AppIcons.Trash, ) if (confirmDelete) { PageConfirm( diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt index ec0ba639..df379969 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt @@ -19,6 +19,10 @@ import org.openstrap.app.ui.components.PinnedFade import org.openstrap.app.ui.components.pinnedFade import org.openstrap.app.ui.theme.Blend import org.openstrap.app.ui.theme.Blends +import org.openstrap.app.ui.theme.litEdge +import org.openstrap.app.ui.glow.draw.GlowStyle +import org.openstrap.app.ui.glow.draw.chart +import org.openstrap.app.presentation.Ranges import org.openstrap.app.ui.glow.draw.LightAngle import org.openstrap.app.ui.glow.draw.heroStyle import org.openstrap.app.ui.theme.Ground @@ -189,12 +193,13 @@ fun GlowWorkoutSummaryScreen( val swell = remember { Animatable(0f) } // Share and Done stay on the bottom edge; Delete waits at the end of the page. Nothing to share until the workout // has loaded. - LightPage( - Modifier.effortLight(familyBlend(family)) { effort + SwellLevel * swell.value }, contentPadding, + WorkoutPage( + null, contentPadding, pinned = { if (a != null && hero != null) SummaryButtons(onShare = { sharing = true }, onDone = done) else WorkoutButton(stringResource(R.string.glow_done), Color.White, Color.Black, onDone) }, + effortLight = { effort + SwellLevel * swell.value } to familyBlend(family), ) { // The sport, then when, with Trim beside them. Row(Modifier.padding(start = 4.dp, top = 12.dp), verticalAlignment = Alignment.CenterVertically) { @@ -214,7 +219,7 @@ fun GlowWorkoutSummaryScreen( } if (summary == null || a == null || trim == null) { PageNote(stringResource(R.string.glow_workout_loading)) - return@LightPage + return@WorkoutPage } val w = a.workout val others = remember(workouts, w.start) { workouts.filter { it.workout.start != w.start }.sortedByDescending { it.workout.start } } @@ -238,7 +243,10 @@ fun GlowWorkoutSummaryScreen( val zones = remember(a, heartZones) { WorkoutRecorder.liveZoneSeconds(a.heartRate.filter { it.timestamp <= a.end }.map { it.timestamp to it.bpm }, a.maxHeartRate, heartZones).toList() } - SummaryHeroCard(hero ?: summaryHero(family, summary, usualLoad), familyInk(family), effort) { swell.value } + SummaryHeroCard( + hero ?: summaryHero(family, summary, usualLoad), familyInk(family), effort, { swell.value }, + title = a.sportName, range = Ranges.times(a.shownStart, a.end), + ) // What was done to the times, under the hero that says them. TrimNote(summary, trim.undo, Modifier.padding(horizontal = 4.dp), onCard = false) val weekStarts = remember(workouts) { goalWeekStarts(workouts) } @@ -264,17 +272,23 @@ fun GlowWorkoutSummaryScreen( * one number in dots, then a sentence or three figures in text. [swell] lifts the light for a personal best. */ @Composable -internal fun SummaryHeroCard(hero: SummaryHero, color: Color, effort: Float, swell: () -> Float = { 0f }) { +internal fun SummaryHeroCard( + hero: SummaryHero, color: Color, effort: Float, swell: () -> Float = { 0f }, + /** The family's title and the time range, on the card's title row (board SummaryRun); null on pages that head themselves. */ + title: String? = null, range: String? = null, +) { // Tinted glass of the family's blend, its tint as strong as the effort (Matrix board: an easy hero is 20% where a hard one is // 42%); the light behind the screen does the size ([effortLight]). The swell is drawn there, not here. val style = remember(color, effort) { heroStyle(color, LightAngle.Below, rim = 0.5f + 0.5f * effort.coerceIn(0f, 1f)) } GlowCard(style, Modifier.fillMaxWidth()) { Column { - HeroValue(hero.value, hero.unit) - hero.sentence?.let { HeroSentence(it) } + if (title != null) GlowHeader(title, trailing = range) + hero.sentence?.let { HeroSentence(it, Modifier) } + HeroValue(hero.value, hero.unit, Modifier.padding(top = if (hero.sentence != null || title != null) 14.dp else 0.dp)) hero.line?.let { Text(it, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.secondary, modifier = Modifier.padding(top = 6.dp)) } if (hero.figures.isNotEmpty()) { - DetailFigures(hero.figures, Modifier.padding(top = 18.dp), valueStyle = GlowType.rowValue, missing = null, gap = 0.dp) + Box(Modifier.padding(top = 14.dp).fillMaxWidth().height(1.dp).background(Color.White.copy(alpha = 0.14f))) + DetailFigures(hero.figures, Modifier.padding(top = 12.dp), valueStyle = GlowType.rowValue, missing = null, gap = 0.dp) } } } @@ -302,7 +316,7 @@ private fun CalmDownHero(summary: PhoneSummary, live: CalmDown?, usualDrop: Int? val line: CalmDownLine = SummaryCopy.calmDown(readings, a.end, now, live != null && now <= live.until, a.maxHeartRate, usualDrop) val bpmNow = live?.readings?.lastOrNull()?.takeIf { now <= live.until && now - it.first <= 5 }?.second // A level glow is always at full: its light is the value (spec 2.1). - GlowCard(effortGlow(MetricColors.heart, effort + SwellLevel * swell), Modifier.fillMaxWidth()) { + GlowCard(GlowStyle.chart(MetricColors.heart).copy(dark = true), Modifier.fillMaxWidth()) { Column { GlowHeader( stringResource(R.string.glow_summary_drop_title), trailing = stringResource(R.string.glow_summary_drop_since, clock(a.end)), @@ -314,6 +328,11 @@ private fun CalmDownHero(summary: PhoneSummary, live: CalmDown?, usualDrop: Int? } val shown = readings.filter { it.first in (a.end - BeforeS)..(a.end + WorkoutSession.CALM_S) } if (shown.size >= 2) DropLine(shown, a.end, Modifier.padding(top = 16.dp)) + // The effort as a thin bar in the heart blend (the light was a heavy red band). + val level = (effort + SwellLevel * swell).coerceIn(0f, 1f) + Box(Modifier.padding(top = 14.dp).fillMaxWidth().height(4.dp).clip(CircleShape).background(Color.White.copy(alpha = 0.10f))) { + Box(Modifier.fillMaxWidth(level).fillMaxHeight().clip(CircleShape).background(Blends.Heart.brush())) + } } } } @@ -575,36 +594,3 @@ internal fun Modifier.effortLight(blend: Blend, effort: () -> Float): Modifier = ) } -/** - * A workout's page: the same layout as [WorkoutPage] (content scrolling under the pinned buttons, on one centred column - * on a wide screen) on a [background] light, which paints the ground too. [WorkoutPage] stays for the live screens. - */ -@Composable -internal fun LightPage( - background: Modifier, contentPadding: PaddingValues, scroll: Boolean = true, - pinned: (@Composable ColumnScope.() -> Unit)? = null, - content: @Composable ColumnScope.() -> Unit, -) { - BoxWithConstraints(Modifier.fillMaxSize().then(background)) { - val density = LocalDensity.current - var pinnedHeight by remember { mutableStateOf(0.dp) } - val side = GlowLayout.pageSide(maxWidth, LocalPageColumn.current, GlowLayout.Gutter) - val padTop = WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + contentPadding.calculateTopPadding() + 8.dp - val padBottom = contentPadding.calculateBottomPadding() - val end = if (pinned != null) (PinnedFade.listClearance(pinnedHeight) - padBottom).coerceAtLeast(16.dp) else 16.dp - Column( - Modifier.fillMaxSize().then(if (scroll) Modifier.imePadding().verticalScroll(rememberScrollState()) else Modifier).statusBarsPadding() - .padding(contentPadding).padding(start = side, end = side, top = 8.dp, bottom = end) - .then(if (scroll) Modifier.heightIn(min = (maxHeight - padTop - padBottom - end).coerceAtLeast(0.dp)) else Modifier), - verticalArrangement = Arrangement.spacedBy(12.dp), - content = content, - ) - if (pinned != null) Column( - Modifier.align(Alignment.BottomCenter).fillMaxWidth().pinnedFade() - .padding(contentPadding).padding(start = side, end = side, bottom = 16.dp) - .onSizeChanged { pinnedHeight = with(density) { it.height.toDp() } }, - verticalArrangement = Arrangement.spacedBy(4.dp), - content = pinned, - ) - } -} diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareScreen.kt index 3ac51d89..7aca76b4 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareScreen.kt @@ -204,8 +204,8 @@ private fun ShareScreen(card: StoryCard, route: List, fileName: Str saved = null } - LightPage( - Modifier.screenLight(null), contentPadding, scroll = false, + WorkoutPage( + null, contentPadding, scroll = false, pinned = { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { val saveLabel = stringResource( From 78de69cadc162f717e8a0007a1d6a9c10ed1b953 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:18:56 +0400 Subject: [PATCH 21/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20tests=20follow?= =?UTF-8?q?=20the=20new=20rules,=20chooser=20and=20confirm=20title=20sizes?= =?UTF-8?q?=20from=20type=20roles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 5.5 --- .../main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt | 3 +-- .../main/kotlin/org/openstrap/app/ui/glow/PageParts.kt | 2 +- .../test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt | 8 +++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt index b75f7143..893d7330 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt @@ -85,7 +85,6 @@ import org.openstrap.app.ui.theme.clearGlass import org.openstrap.app.ui.theme.ScreenLight import org.openstrap.app.ui.theme.tintedGlass import androidx.compose.ui.graphics.Brush -import androidx.compose.ui.unit.sp /* ---------------------------------------------- Choose ----------------------------------------------- */ @@ -276,7 +275,7 @@ private fun RecentPill(sport: Int, name: String, onClick: () -> Unit) { verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), ) { Box(Modifier.size(10.dp).clip(CircleShape).background(Brush.linearGradient(listOf(blend.first, blend.second)))) - Text(name, color = Color.White, style = GlowType.secondary.copy(fontSize = 14.sp), maxLines = 1) + Text(name, color = Color.White, style = GlowType.chip, maxLines = 1) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt index 2135ec7e..f5fe5fc8 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt @@ -656,7 +656,7 @@ fun PageConfirm( Box(Modifier.size(40.dp).background(org.openstrap.app.ui.theme.Blends.Strap.first.copy(alpha = 0.18f), CircleShape), contentAlignment = Alignment.Center) { Icon(icon, null, Modifier.size(20.dp), tint = Color.White) } - Text(title, color = Color.White, style = GlowType.cardTitle, maxLines = 2) + Text(title, color = Color.White, style = GlowType.cardTitle, maxLines = 1) } if (text != null) Text(text, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.body) content?.invoke(this) diff --git a/app/src/test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt b/app/src/test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt index 2456d876..dc47d18a 100644 --- a/app/src/test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt +++ b/app/src/test/kotlin/org/openstrap/app/ui/DesignTokenTest.kt @@ -148,12 +148,14 @@ class DesignTokenTest { @Test fun `Steps on Activity is a hero glow like Recovery and Sleep`() { // Spec 2.1 and 5.3: the tab's hero, lit all over with the core behind the number, not a level over a black top. - // The number at the foot in the second glow's dots, under the hour bars. + // The number in the hero dots (Glow x Glass, board TabActivity), the hour bars along the foot. val code = sources.getValue("glow/GlowActivityScreen.kt").joinToString("\n") val steps = code.substringAfter("private fun StepsGlow(").substringBefore("\n}\n") assertTrue("StepsGlow uses the hero recipe", "limeHero(MetricColors.steps" in steps) - assertTrue("StepsGlow's number is 3.6 dp", "DotSize.Second" in steps) - assertTrue("the bars come before the number", steps.indexOf("HourPills(") in 0 until steps.indexOf("TaggedNumber(")) + // Glow x Glass (plan section 4, board TabActivity): the hero's number is the hero dot size, not the second glow's 3.6 dp. + assertTrue("StepsGlow's number is the hero size", "DotSize.Hero" in steps) + // The board draws the dotted number first and the hour bars along the card's foot. + assertTrue("the number comes before the bars", steps.indexOf("TaggedNumber(") in 0 until steps.indexOf("HourPills(")) } @Test fun `every hypnogram is drawn in the stage colours`() { From f1709a0f597320c6092c5bcf94652c621b28f228 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:28:07 +0400 Subject: [PATCH 22/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20detekt=20clean-u?= =?UTF-8?q?p=20(magic=20numbers,=20line=20length,=20modifiers,=20unused=20?= =?UTF-8?q?code)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 5.5 --- .../openstrap/app/ui/alarms/AlarmsScreen.kt | 19 ++++-- .../org/openstrap/app/ui/components/Glass.kt | 11 +++- .../openstrap/app/ui/components/Insights.kt | 10 +++- .../org/openstrap/app/ui/device/BackupPage.kt | 7 ++- .../app/ui/device/DeletedSleepPage.kt | 3 +- .../openstrap/app/ui/device/DeviceScreen.kt | 13 +++- .../app/ui/device/HealthConnectPage.kt | 8 ++- .../org/openstrap/app/ui/device/PlaceParts.kt | 44 ++++++++++---- .../openstrap/app/ui/device/ProfileScreen.kt | 16 +++-- .../openstrap/app/ui/device/UpdatesPage.kt | 4 +- .../org/openstrap/app/ui/device/YouPage.kt | 7 ++- .../app/ui/firmware/FirmwareScreen.kt | 7 ++- .../openstrap/app/ui/glow/AllMetricsScreen.kt | 6 +- .../org/openstrap/app/ui/glow/Celebrations.kt | 25 ++++++-- .../org/openstrap/app/ui/glow/ChooseScreen.kt | 14 +++-- .../openstrap/app/ui/glow/EditTodaySheet.kt | 23 ++++++-- .../app/ui/glow/GlowActivityScreen.kt | 8 +-- .../org/openstrap/app/ui/glow/GlowCard.kt | 10 +++- .../org/openstrap/app/ui/glow/GlowCharts.kt | 15 ++++- .../app/ui/glow/GlowHealthspanScreen.kt | 2 +- .../org/openstrap/app/ui/glow/GlowLayout.kt | 4 +- .../org/openstrap/app/ui/glow/GlowList.kt | 10 +++- .../openstrap/app/ui/glow/GlowMetricDetail.kt | 15 +++-- .../app/ui/glow/GlowRecoveryScreen.kt | 2 +- .../openstrap/app/ui/glow/GlowSleepScreen.kt | 4 +- .../openstrap/app/ui/glow/GlowTodayScreen.kt | 9 ++- .../openstrap/app/ui/glow/GlowWorkoutMode.kt | 10 +++- .../app/ui/glow/GlowWorkoutScreen.kt | 18 +++++- .../app/ui/glow/GlowWorkoutSummary.kt | 59 ++++++++++++------- .../openstrap/app/ui/glow/GoalsAndBests.kt | 39 +++++++++--- .../openstrap/app/ui/glow/HeartZonesScreen.kt | 5 +- .../org/openstrap/app/ui/glow/InfoSheet.kt | 5 +- .../org/openstrap/app/ui/glow/PageParts.kt | 5 +- .../org/openstrap/app/ui/glow/PictureCard.kt | 11 +++- .../org/openstrap/app/ui/glow/ReadyCardio.kt | 3 +- .../org/openstrap/app/ui/glow/ReadyPlans.kt | 4 +- .../org/openstrap/app/ui/glow/ReadyScreen.kt | 7 ++- .../org/openstrap/app/ui/glow/ShareCards.kt | 36 +++++++---- .../org/openstrap/app/ui/glow/SleepDetail.kt | 3 +- .../org/openstrap/app/ui/glow/Wordmark.kt | 3 +- .../org/openstrap/app/ui/glow/draw/DotSpec.kt | 5 +- .../app/ui/glow/live/LiveDistance.kt | 19 ++++-- .../openstrap/app/ui/glow/live/LiveFrame.kt | 15 +++-- .../openstrap/app/ui/glow/live/LiveGlass.kt | 21 +++++-- .../openstrap/app/ui/glow/live/LiveHeart.kt | 40 ++++++++++--- .../openstrap/app/ui/glow/live/LiveIndoor.kt | 23 ++++++-- .../app/ui/glow/live/LiveIntervals.kt | 16 +++-- .../openstrap/app/ui/glow/live/LiveSets.kt | 42 +++++++++---- .../app/ui/glow/pictures/LevelPictures.kt | 24 ++++++-- .../app/ui/glow/pictures/LinePictures.kt | 15 ++++- .../app/ui/glow/pictures/Pictures.kt | 8 ++- .../org/openstrap/app/ui/root/TabsPager.kt | 6 +- .../org/openstrap/app/ui/theme/Blends.kt | 16 +++-- .../org/openstrap/app/ui/theme/Materials.kt | 22 +++++-- .../org/openstrap/app/ui/theme/Shapes.kt | 5 +- .../org/openstrap/app/ui/zepp/ZeppSignIn.kt | 20 +++++-- .../org/openstrap/app/widget/WidgetParts.kt | 5 +- 57 files changed, 598 insertions(+), 208 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt index 24bcace6..57910c3a 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/alarms/AlarmsScreen.kt @@ -68,6 +68,8 @@ import org.openstrap.app.presentation.TimeOfDay import java.time.LocalTime /** The days of the week, short, Monday first: "Mon", for an alarm on chosen days. */ +private const val HERO_FADE_STOP = 0.6f + private val DAY_NAMES = listOf( R.string.you_alarms_day_mon, R.string.you_alarms_day_tue, R.string.you_alarms_day_wed, R.string.you_alarms_day_thu, R.string.you_alarms_day_fri, R.string.you_alarms_day_sat, R.string.you_alarms_day_sun, @@ -238,7 +240,12 @@ private fun AlarmsPanel( // The board's hero panel: strap glass from the top, the title and count on one line, 84 dp rows of 40 sp time. Column( Modifier.fillMaxWidth().clip(GlowShapes.Card) - .placeHero(180f, 0f to Blends.Strap.first.copy(alpha = 0.22f), 0.6f to Color.White.copy(alpha = 0.06f), 1f to Color.White.copy(alpha = 0.06f)) + .placeHero( + angle = 180f, + 0f to Blends.Strap.first.copy(alpha = 0.22f), + HERO_FADE_STOP to Color.White.copy(alpha = 0.06f), + 1f to Color.White.copy(alpha = 0.06f), + ) .padding(start = 18.dp, end = 18.dp, top = 16.dp, bottom = 6.dp), ) { Row(Modifier.fillMaxWidth().height(24.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Bottom) { @@ -265,7 +272,9 @@ private fun AlarmsPanel( val (digits, marker) = dotClock(a.hour, a.minute) Row(verticalAlignment = Alignment.Bottom) { Text(digits, color = ink, style = GlowType.goalValue) - marker?.let { Text(it, style = GlowType.secondary, color = ink, modifier = Modifier.padding(start = 6.dp, bottom = 4.dp)) } + marker?.let { + Text(it, style = GlowType.secondary, color = ink, modifier = Modifier.padding(start = 6.dp, bottom = 4.dp)) + } } Text(daysLabel(a.days), style = GlowType.secondary, color = Color.White.copy(alpha = 0.6f)) } @@ -276,8 +285,8 @@ private fun AlarmsPanel( Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { if (state.canAdd) { PageButton( - stringResource(R.string.you_alarms_add), onAdd, Modifier.fillMaxWidth().height(52.dp), enabled = !state.busy, primary = true, - icon = AppIcons.Plus, + stringResource(R.string.you_alarms_add), onAdd, Modifier.fillMaxWidth().height(52.dp), + enabled = !state.busy, primary = true, icon = AppIcons.Plus, ) } if (state.alarms.size > 1) { @@ -293,7 +302,7 @@ private fun AlarmsPanel( .padding(horizontal = 18.dp, vertical = 16.dp), horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically, ) { - PlaceIcon(AppIcons.HandPalm, 32.dp, 0.08f, tint = Color.White.copy(alpha = 0.78f)) + PlaceIcon(AppIcons.HandPalm, 32.dp, fill = 0.08f, tint = Color.White.copy(alpha = 0.78f)) Text( stringResource(R.string.you_alarms_tip), Modifier.weight(1f), color = Color.White.copy(alpha = 0.72f), style = GlowType.body, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/components/Glass.kt b/app/src/main/kotlin/org/openstrap/app/ui/components/Glass.kt index 627821ec..ba74c28f 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/components/Glass.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/components/Glass.kt @@ -63,6 +63,9 @@ import kotlinx.coroutines.launch /** The nav bar's glass: near-black, see-through, with a lit top edge. Popups use it over a blurred screen. */ val GlassTint = Color(0xFF0B0B0D) +private val ContainerDim = Color(0xFF121215) +private val ContainerMid = Color(0xFF16161A) +private val ContainerHigh = Color(0xFF1E1E22) val GlassEdge = BorderStroke( 1.dp, Brush.verticalGradient(0f to Color.White.copy(alpha = 0.2f), 0.5f to Color.White.copy(alpha = 0.05f), 1f to Color.Black.copy(alpha = 0.4f)), ) @@ -81,9 +84,9 @@ fun OledSurfaces(content: @Composable () -> Unit) { surface = Color.Transparent, surfaceContainerLowest = Color.Transparent, surfaceContainerLow = Color.Transparent, - surfaceContainer = Color(0xFF121215), - surfaceContainerHigh = Color(0xFF16161A), - surfaceContainerHighest = Color(0xFF1E1E22), + surfaceContainer = ContainerDim, + surfaceContainerHigh = ContainerMid, + surfaceContainerHighest = ContainerHigh, outline = Color.White.copy(alpha = 0.16f), outlineVariant = Color.White.copy(alpha = 0.12f), ), @@ -102,6 +105,7 @@ class PageLightState { } /** The page's light holder, null outside a [PageLightHost]. */ +@Suppress("CompositionLocalAllowlist", "ComposeCompositionLocalUsage") // a page deep in a stack sets the light its host draws val LocalPageLight = staticCompositionLocalOf { null } /** @@ -167,6 +171,7 @@ private val SheetFill = Color(0xFF16161A) private const val BACKDROP_DIM = 0.58f /** The haze the overlay's sheets and popups blur (the pages' source), for [GlassPanel]. */ +@Suppress("CompositionLocalAllowlist", "ComposeCompositionLocalUsage") // a design token shared by every panel in the overlay val LocalGlassHaze = staticCompositionLocalOf { null } /** diff --git a/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt b/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt index fd4e1d61..aadb41ce 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/components/Insights.kt @@ -230,7 +230,15 @@ val NavRailWidth = 92.dp /** One destination's icon and label, tinted for whether it's [on]. */ @Composable private fun NavCell(item: NavItem, on: Boolean, modifier: Modifier, verticalArrangement: Arrangement.Vertical = Arrangement.Top) { - Column(modifier, verticalArrangement = if (verticalArrangement == Arrangement.Center) Arrangement.spacedBy(3.dp, Alignment.CenterVertically) else verticalArrangement, horizontalAlignment = Alignment.CenterHorizontally) { + Column( + modifier, + verticalArrangement = if (verticalArrangement == Arrangement.Center) { + Arrangement.spacedBy(3.dp, Alignment.CenterVertically) + } else { + verticalArrangement + }, + horizontalAlignment = Alignment.CenterHorizontally, + ) { val tint by androidx.compose.animation.animateColorAsState( if (on) Color.White else Color.White.copy(alpha = 0.6f), tween(Motion.QUICK), label = "nav tint", diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/BackupPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/BackupPage.kt index 67204f4b..7b913692 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/BackupPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/BackupPage.kt @@ -27,6 +27,7 @@ import org.openstrap.app.ui.theme.AppIcons * user chooses, which the keep-7 rule never clears. Turning backup on asks for the folder first ([onTurnOn]). */ @Composable +@Suppress("ModifierMissing", "ComposeModifierMissing") // a full page: ScreenList fills the screen and takes no modifier fun BackupPage( state: BackupState, backingUp: Boolean, @@ -67,11 +68,13 @@ fun BackupPage( item { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { PlaceTile( - AppIcons.ArrowCounterClockwise, stringResource(R.string.you_action_restore), stringResource(R.string.you_backup_restore_note), + AppIcons.ArrowCounterClockwise, stringResource(R.string.you_action_restore), + stringResource(R.string.you_backup_restore_note), onRestore, Modifier.weight(1f), height = 170.dp, caret = false, ) PlaceTile( - AppIcons.DownloadSimple, stringResource(R.string.you_backup_save_copy), stringResource(R.string.you_backup_save_copy_note), + AppIcons.DownloadSimple, stringResource(R.string.you_backup_save_copy), + stringResource(R.string.you_backup_save_copy_note), onSaveCopy, Modifier.weight(1f), height = 170.dp, caret = false, ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/DeletedSleepPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/DeletedSleepPage.kt index 6e4bfd32..ac5de6d3 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/DeletedSleepPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/DeletedSleepPage.kt @@ -60,7 +60,8 @@ fun DeletedSleepPage( below = true, divider = i > 0, icon = AppIcons.Moon, ) { PageButton( - stringResource(R.string.you_action_restore), { onRestore(r.strap) }, Modifier.height(44.dp), icon = AppIcons.ArrowCounterClockwise, + stringResource(R.string.you_action_restore), { onRestore(r.strap) }, Modifier.height(44.dp), + icon = AppIcons.ArrowCounterClockwise, ) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt index b589bf0d..13e80b3f 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt @@ -131,6 +131,8 @@ internal fun strapStateLine( * Find strap, then its settings as rows with their values, each opening its page or switching in place, then * Disconnect, Restart and Forget. With no strap paired, the pairing steps. */ +// The page and its keep-connected tile both act on the one view model, so the tile is handed it. +@Suppress("ViewModelForwarding", "ComposeViewModelForwarding", "CyclomaticComplexMethod", "ModifierMissing", "ComposeModifierMissing") @Composable fun DeviceScreen( vm: DeviceViewModel, @@ -381,7 +383,9 @@ private fun KeepConnectedTile(vm: DeviceViewModel, keepConnected: KeepConnected, val icon = AppIcons.Bluetooth when { associated -> StatusTile(icon, title, modifier, chip = on) - vm.companionSupported && !declined && !hidden -> StatusTile(icon, title, modifier, chip = off, onClick = { keepConnected.associate(address) }) + vm.companionSupported && !declined && !hidden -> StatusTile( + icon, title, modifier, chip = off, onClick = { keepConnected.associate(address) }, + ) !ignoringBattery -> StatusTile(icon, title, modifier, chip = off, onClick = { runCatching { context.startActivity( @@ -415,7 +419,8 @@ internal fun StrapHero(name: String, connection: ConnectionState, sync: SyncStat Text(name, color = Color.White, style = GlowType.cardTitle, maxLines = 1, overflow = TextOverflow.Ellipsis) // The small status dot beside the state: green while connected, amber when it isn't (decision 9). Row(Modifier.padding(top = 4.dp), verticalAlignment = Alignment.CenterVertically) { - Box(Modifier.size(7.dp).background(if (connected != null && sync !is SyncState.Failed) MetricColors.good else MetricColors.warn, CircleShape)) + val dot = if (connected != null && sync !is SyncState.Failed) MetricColors.good else MetricColors.warn + Box(Modifier.size(7.dp).background(dot, CircleShape)) Spacer(Modifier.width(7.dp)) Text( strapStateLine(connection, sync, lastSeen, now, lastSync = lastSync), @@ -467,7 +472,9 @@ internal fun StrapHero(name: String, connection: ConnectionState, sync: SyncStat fun DiagnosticsScreen(lines: List, contentPadding: PaddingValues, onBack: () -> Unit) { BackHandler(onBack = onBack) val context = LocalContext.current - PageLight(org.openstrap.app.ui.theme.ScreenLight(org.openstrap.app.ui.theme.Blends.You, angle = 100f, strength = 0.65f, heroCenterY = 160f)) + PageLight( + org.openstrap.app.ui.theme.ScreenLight(org.openstrap.app.ui.theme.Blends.You, angle = 100f, strength = 0.65f, heroCenterY = 160f), + ) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { val label = stringResource(R.string.you_diagnostics_clip_label) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt index 9ab6d796..07a3454f 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt @@ -79,13 +79,17 @@ fun HealthConnectPage( onCopyNow, Modifier.weight(1f), caret = false, ) PlaceTile( - AppIcons.ArrowCounterClockwise, stringResource(R.string.you_action_restore), stringResource(R.string.you_hc_restore_note), + AppIcons.ArrowCounterClockwise, stringResource(R.string.you_action_restore), + stringResource(R.string.you_hc_restore_note), onRestore, Modifier.weight(1f), caret = false, ) } } item { - OutlineRow(AppIcons.SlidersHorizontal, stringResource(R.string.you_hc_open), onOpen, note = stringResource(R.string.you_hc_open_note)) + OutlineRow( + AppIcons.SlidersHorizontal, stringResource(R.string.you_hc_open), onOpen, + note = stringResource(R.string.you_hc_open_note), + ) } if (caloriesMissing) item { CaloriesOffer(onOfferCalories) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt index b1cda2c3..1339bcb5 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt @@ -1,3 +1,5 @@ +@file:Suppress("TooManyFunctions") // one small composable per part of the You and Strap pages, kept together + package org.openstrap.app.ui.device import androidx.compose.foundation.background @@ -66,6 +68,7 @@ internal val StrapPageLight = ScreenLight(Blends.Strap, angle = 90f, strength = /** The caret's alpha at the end of a tile or an outlined row (clear glass: 50%). */ private const val CARET = 0.5f +private const val HERO_MID_STOP = 0.55f /** * The CSS `linear-gradient(deg, ...)` for a box of [w] by [h]: the gradient line runs through the centre at @@ -91,25 +94,32 @@ internal fun Modifier.placeHero(angle: Float, vararg stops: Pair): /** The You pages' hero: white into the copper first stop and back to white, lit from the upper left (140 degrees). */ internal fun Modifier.youHero(blend: Blend = Blends.You): Modifier = placeHero( - 140f, 0f to Color.White.copy(alpha = 0.24f), 0.55f to blend.first.copy(alpha = 0.14f), 1f to Color.White.copy(alpha = 0.04f), + angle = 140f, + 0f to Color.White.copy(alpha = 0.24f), + HERO_MID_STOP to blend.first.copy(alpha = 0.14f), + 1f to Color.White.copy(alpha = 0.04f), ) /** The Strap pages' hero: the strap blend from the top (46%) fading to white 4%. */ internal fun Modifier.strapHero(blend: Blend = Blends.Strap): Modifier = placeHero( - 180f, 0f to blend.first.copy(alpha = 0.46f), 0.55f to blend.first.copy(alpha = 0.16f), 1f to Color.White.copy(alpha = 0.04f), + angle = 180f, + 0f to blend.first.copy(alpha = 0.46f), + HERO_MID_STOP to blend.first.copy(alpha = 0.16f), + 1f to Color.White.copy(alpha = 0.04f), ) -/** A hero card of a place's page: tinted glass of [look], padded 20 dp, [onClick] makes the whole card a button. */ +/** A hero card of a place's page: tinted glass of [lookModifier], padded 20 dp, [onClick] makes the whole card a button. */ @Composable +@Suppress("ModifierWithoutDefault") // the look is the card's design, always passed by the caller internal fun PlaceHero( - look: Modifier, + lookModifier: Modifier, modifier: Modifier = Modifier, onClick: (() -> Unit)? = null, content: @Composable BoxScope.() -> Unit, ) { val shape = GlowShapes.Card Box( - modifier.fillMaxWidth().clip(shape).then(look) + modifier.fillMaxWidth().clip(shape).then(lookModifier) .let { if (onClick != null) it.pressClickable(onClick, shape).semantics { role = Role.Button } else it } .padding(horizontal = 20.dp, vertical = 18.dp), content = content, @@ -142,13 +152,13 @@ internal fun PlaceTile( val shape = GlowShapes.Card Column( modifier.height(height).clip(shape).clearGlass(shape) - .let { if (enabled) it.pressClickable(onClick, shape) else it.alpha(0.4f) } + .let { if (enabled) it.pressClickable(onClick, shape) else it.alpha(alpha = 0.4f) } .semantics { role = Role.Button } .padding(16.dp), verticalArrangement = Arrangement.SpaceBetween, ) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Top) { - PlaceIcon(icon, 40.dp, 0.10f) + PlaceIcon(icon, 40.dp, fill = 0.10f) if (caret) TapCaret(CARET, Modifier.padding(top = 4.dp)) } Column(verticalArrangement = Arrangement.spacedBy(3.dp)) { @@ -190,7 +200,12 @@ internal fun OutlineRow( Text(title, color = Color.White, style = GlowType.body, maxLines = 1, overflow = TextOverflow.Ellipsis) if (dot) { Spacer(Modifier.width(8.dp)); NoticeDot() } } - if (note != null) Text(note, color = Color.White.copy(alpha = 0.65f), style = GlowType.secondary, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (note != null) { + Text( + note, color = Color.White.copy(alpha = 0.65f), style = GlowType.secondary, + maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } } if (trailing != null) { Spacer(Modifier.width(10.dp)); trailing() } Spacer(Modifier.width(12.dp)) @@ -228,11 +243,12 @@ internal fun StatusTile( verticalArrangement = Arrangement.SpaceBetween, ) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - PlaceIcon(icon, 36.dp, 0.08f, tint = Color.White.copy(alpha = 0.78f)) + PlaceIcon(icon, 36.dp, fill = 0.08f, tint = Color.White.copy(alpha = 0.78f)) if (onChange != null) org.openstrap.app.ui.glow.GlowSwitch(checked, onChange, Modifier.clearAndSetSemantics {}) else if (chip != null) Text( chip, color = Color.White, style = GlowType.secondary, - modifier = Modifier.clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.12f)).padding(horizontal = 10.dp, vertical = 4.dp), + modifier = Modifier.clip(GlowShapes.Pill).background(Color.White.copy(alpha = 0.12f)) + .padding(horizontal = 10.dp, vertical = 4.dp), ) } Text(title, color = Color.White, style = GlowType.body, maxLines = 2) @@ -293,8 +309,12 @@ internal fun SwitchHero( Modifier.fillMaxWidth().toggleable(checked, role = Role.Switch, onValueChange = onChange), verticalArrangement = Arrangement.spacedBy(12.dp), ) { - Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - PlaceIcon(icon, 40.dp, 0.16f) + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + PlaceIcon(icon, 40.dp, fill = 0.16f) org.openstrap.app.ui.glow.GlowSwitch(checked, onChange, Modifier.clearAndSetSemantics {}) } Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt index ca8cab83..b26bc0af 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/ProfileScreen.kt @@ -64,6 +64,9 @@ import org.openstrap.app.ui.theme.GlowShapes import org.openstrap.app.ui.theme.clearGlass import org.openstrap.app.ui.theme.darkGlow +/** The weight tile's share of the row next to the three imperial height tiles. */ +private const val IMPERIAL_WEIGHT_SHARE = 1.3f + /** One line for the settings row: "34 years, male, 72 kg, 178 cm", or a prompt when empty. */ fun UserProfile.summary(strings: Strings = Strings.app): String = if (isEmpty) strings.get(R.string.you_profile_empty) @@ -173,7 +176,9 @@ fun ProfileScreen(profile: UserProfile, contentPadding: PaddingValues, onSave: ( val side = GlowLayout.pageSide(maxWidth, LocalPageColumn.current, GlowLayout.Gutter) // The list ends clear of Save and the fade behind it (ScreenList adds its own 24 dp). org.openstrap.app.ui.components.PageLight( - org.openstrap.app.ui.theme.ScreenLight(org.openstrap.app.ui.theme.Blends.You, angle = 30f, strength = 0.75f, heroCenterY = 165f), + org.openstrap.app.ui.theme.ScreenLight( + org.openstrap.app.ui.theme.Blends.You, angle = 30f, strength = 0.75f, heroCenterY = 165f, + ), ) ScreenList(PaddingValues(bottom = PinnedFade.listClearance(bottom + 12.dp + SaveHeight, listEnd = 24.dp)), gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.you_profile_title), back) } @@ -210,9 +215,11 @@ fun ProfileScreen(profile: UserProfile, contentPadding: PaddingValues, onSave: ( item { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { BodyTile( - weight, { weight = it.filter { c -> c.isDigit() || c == '.' || c == ',' }.take(5) }, stringResource(R.string.you_profile_weight), + weight, { weight = it.filter { c -> c.isDigit() || c == '.' || c == ',' }.take(5) }, + stringResource(R.string.you_profile_weight), stringResource(if (imperial) R.string.you_profile_unit_lb else R.string.you_profile_unit_kg), - weight.isNotBlank() && weightValue == null, Modifier.weight(if (imperial) 1.3f else 1f), decimal = true, big = !imperial, + weight.isNotBlank() && weightValue == null, Modifier.weight(if (imperial) IMPERIAL_WEIGHT_SHARE else 1f), + decimal = true, big = !imperial, ) if (imperial) { val wrong = !heightBlank && heightValue == null @@ -320,7 +327,8 @@ private fun BodyTile( private fun SleepNeedRow(value: String, onChange: (String) -> Unit, label: String, unit: String, error: Boolean) { val shape = GlowShapes.Card Row( - Modifier.fillMaxWidth().height(64.dp).clearGlass(shape).let { if (error) it.border(1.5.dp, Color.White.copy(alpha = 0.9f), shape) else it } + Modifier.fillMaxWidth().height(64.dp).clearGlass(shape) + .let { if (error) it.border(1.5.dp, Color.White.copy(alpha = 0.9f), shape) else it } .padding(horizontal = 16.dp), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, ) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt index a59e42fd..769620df 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/UpdatesPage.kt @@ -86,7 +86,9 @@ fun UpdatesPage( stringResource(R.string.you_updates_release, newest.versionName), Modifier.weight(1f), color = Color.White, style = GlowType.pageTitle, maxLines = 1, ) - newest.publishedAt?.let { Text(UpdateCopy.date(it), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary) } + newest.publishedAt?.let { + Text(UpdateCopy.date(it), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary) + } } PageButton( UpdateCopy.install(newest, state.install, recording), { onInstall(newest) }, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt index f7d92cc4..6f39c914 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/YouPage.kt @@ -159,7 +159,7 @@ fun YouPage( // The profile, as the page's hero: tinted copper glass, the summary in Sentence type at the bottom. PlaceHero(Modifier.youHero(), Modifier.height(160.dp), onClick = onProfile) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { - PlaceIcon(AppIcons.User, 52.dp, 0.16f) + PlaceIcon(AppIcons.User, 52.dp, fill = 0.16f) Spacer(Modifier.width(14.dp)) Text( stringResource(R.string.you_row_profile), Modifier.weight(1f), color = Color.White, @@ -180,7 +180,10 @@ fun YouPage( below = true, divider = false, icon = AppIcons.Heartbeat, selected = selected == PageRowKeys.HEART_ZONES, tint = Blends.Heart, iconSize = 36.dp, ) - PageRow(stringResource(R.string.you_row_goals), goalsLine(goals), onClick = onGoals, below = true, icon = AppIcons.Target, iconSize = 36.dp) + PageRow( + stringResource(R.string.you_row_goals), goalsLine(goals), onClick = onGoals, below = true, + icon = AppIcons.Target, iconSize = 36.dp, + ) PageRow( stringResource(R.string.you_row_sleep_goal), sleepGoalLine(goals, sleepNeedMinutes), onClick = onGoals, below = true, icon = AppIcons.Moon, tint = Blends.Sleep, iconSize = 36.dp, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt index 89b94964..9dbf86a8 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/firmware/FirmwareScreen.kt @@ -102,7 +102,10 @@ fun FirmwareScreen(vm: FirmwareViewModel, contentPadding: PaddingValues, onBack: Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Text(stringResource(R.string.you_firmware_this_strap), color = Color.White, style = GlowType.cardTitle, maxLines = 1) Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { - Text(stringResource(R.string.you_firmware_title), color = Color.White.copy(alpha = 0.78f), style = GlowType.secondary) + Text( + stringResource(R.string.you_firmware_title), color = Color.White.copy(alpha = 0.78f), + style = GlowType.secondary, + ) Text( info?.firmware ?: c?.firmware ?: stringResource(R.string.you_firmware_unknown), color = Color.White, style = GlowType.smallValue, @@ -296,7 +299,7 @@ private fun AccountPanel( verticalArrangement = Arrangement.spacedBy(14.dp), ) { if (mode != AccountMode.EditingToken) { - PlaceIcon(AppIcons.Key, 44.dp, 0.12f) + PlaceIcon(AppIcons.Key, 44.dp, fill = 0.12f) Body( when { account == null -> stringResource(R.string.you_zepp_account_none) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt index 1c8044cb..b0358d92 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/AllMetricsScreen.kt @@ -277,6 +277,8 @@ private fun signalGroups(state: DayUiState, now: Long, strings: Strings): List, @@ -300,7 +302,7 @@ fun AllMetricsSheet( Text( group.title, color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary.copy(fontWeight = FontWeight.Medium), - modifier = Modifier.fillMaxWidth().then(if (gi > 0) Modifier.hairline(0.10f) else Modifier) + modifier = Modifier.fillMaxWidth().then(if (gi > 0) Modifier.hairline(alpha = 0.10f) else Modifier) .padding(top = if (gi == 0) 6.dp else 18.dp, bottom = 2.dp), ) group.rows.forEachIndexed { i, r -> MetricRow(r, divider = i > 0) { onOpen(r.target) } } @@ -320,7 +322,7 @@ private fun MetricRow(r: IndexRow, divider: Boolean, onClick: () -> Unit) { // Every row's icon is its blend's first stop (a row not on a blend keeps its own colour). val tint = (Blends.forInk(r.color)?.first ?: r.color).let { if (r.value == null) it.copy(alpha = 0.4f) else it } Row( - Modifier.fillMaxWidth().heightIn(min = 60.dp).then(if (divider) Modifier.hairline(0.07f) else Modifier) + Modifier.fillMaxWidth().heightIn(min = 60.dp).then(if (divider) Modifier.hairline(alpha = 0.07f) else Modifier) .clickable(onClick = onClick), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp), ) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt index 3b0ca2ef..ab150eee 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/Celebrations.kt @@ -71,7 +71,7 @@ fun BestCardScreen(best: Rewards.NewBest, sportName: String, contentPadding: Pad BackHandler(onBack = onContinue) val now = System.currentTimeMillis() / 1000 WorkoutPage( - ScreenLight(Blends.Calories, 270f, ScreenLight.DAY, 260f), contentPadding, + ScreenLight(Blends.Calories, angle = 270f, strength = ScreenLight.DAY, heroCenterY = 260f), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) }, ) { CloseRow(stringResource(R.string.glow_celebrate_personal_best), onContinue) @@ -99,7 +99,7 @@ fun BestCardScreen(best: Rewards.NewBest, sportName: String, contentPadding: Pad fun GoalMomentScreen(count: Int, goal: Int, inARow: Int, weekStarts: List, contentPadding: PaddingValues, onSettings: () -> Unit, onContinue: () -> Unit) { BackHandler(onBack = onContinue) WorkoutPage( - ScreenLight(Blends.Goals, 270f, ScreenLight.DAY, 190f), contentPadding, + ScreenLight(Blends.Goals, angle = 270f, strength = ScreenLight.DAY, heroCenterY = 190f), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) PageTextButton(stringResource(R.string.glow_celebrate_settings), onSettings, Modifier.align(Alignment.CenterHorizontally)) @@ -111,9 +111,22 @@ fun GoalMomentScreen(count: Int, goal: Int, inARow: Int, weekStarts: List, Box( Modifier.align(Alignment.CenterHorizontally).size(220.dp).drawBehind { val ring = 1.5.dp.toPx() - val brush = Brush.linearGradient(listOf(Blends.Goals.first, Blends.Goals.second), Offset(size.width * 0.2f, 0f), Offset(size.width * 0.8f, size.height)) - drawCircle(Brush.verticalGradient(listOf(org.openstrap.app.ui.theme.DarkGlowFill.copy(alpha = 0.92f), org.openstrap.app.ui.theme.DarkGlowFill.copy(alpha = 0.6f), org.openstrap.app.ui.theme.DarkGlowFill.copy(alpha = 0.2f))), size.minDimension / 2) - drawCircle(brush.let { Brush.linearGradient(listOf(Blends.Goals.first.copy(alpha = 0.18f), Blends.Goals.second.copy(alpha = 0.3f))) }, size.minDimension / 2) + val brush = Brush.linearGradient( + listOf(Blends.Goals.first, Blends.Goals.second), + Offset(size.width * 0.2f, 0f), + Offset(size.width * 0.8f, size.height), + ) + val fill = org.openstrap.app.ui.theme.DarkGlowFill + drawCircle( + Brush.verticalGradient(listOf(fill.copy(alpha = 0.92f), fill.copy(alpha = 0.6f), fill.copy(alpha = 0.2f))), + size.minDimension / 2, + ) + drawCircle( + brush.let { + Brush.linearGradient(listOf(Blends.Goals.first.copy(alpha = 0.18f), Blends.Goals.second.copy(alpha = 0.3f))) + }, + size.minDimension / 2, + ) drawCircle(brush, size.minDimension / 2 - ring / 2, style = Stroke(ring)) }, contentAlignment = Alignment.Center, @@ -170,7 +183,7 @@ fun CelebrationsSheet(goalMoment: Boolean, weeklyRecap: Boolean, onGoalMoment: ( fun HistoryBadgesScreen(badges: List, contentPadding: PaddingValues, onContinue: () -> Unit, face: (Rewards.Badge) -> String = { it.short }) { BackHandler(onBack = onContinue) WorkoutPage( - ScreenLight(Blends.Goals, 270f, ScreenLight.DAY, 190f), contentPadding, + ScreenLight(Blends.Goals, angle = 270f, strength = ScreenLight.DAY, heroCenterY = 190f), contentPadding, pinned = { WorkoutButton(stringResource(R.string.glow_continue), Color.White, Color.Black, onContinue) }, ) { CloseRow(null, onContinue) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt index 893d7330..9f1f3bbf 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ChooseScreen.kt @@ -304,7 +304,8 @@ internal fun SportTile( horizontalAlignment = Alignment.CenterHorizontally, ) { Box( - Modifier.size(SportTileSize).clip(GlowLayout.TileShape).background(if (selected) Color.White else Color.White.copy(alpha = 0.1f)), + Modifier.size(SportTileSize).clip(GlowLayout.TileShape) + .background(if (selected) Color.White else Color.White.copy(alpha = 0.1f)), contentAlignment = Alignment.Center, ) { val ink = if (selected) Color.Black else Color.White @@ -413,13 +414,13 @@ private fun SearchResults(query: String, selected: Int, onPick: (Int) -> Unit) { } /** The search field's glass: white 12% with the lit edge (board WorkoutChoose). */ -private const val SearchFill = 0.12f +private const val SEARCH_FILL = 0.12f /** Choose's search field before it's typed in: it looks like the field and opens [SearchPage]. */ @Composable private fun SearchEntry(hint: String, onClick: () -> Unit, modifier: Modifier = Modifier) { Row( - modifier.fillMaxWidth().height(48.dp).clip(GlowLayout.TileShape).clearGlass(GlowLayout.TileShape, SearchFill) + modifier.fillMaxWidth().height(48.dp).clip(GlowLayout.TileShape).clearGlass(GlowLayout.TileShape, SEARCH_FILL) .pressClickable(onClick, GlowLayout.TileShape).semantics { role = Role.Button }.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { @@ -493,7 +494,9 @@ private fun SportTiles(title: String?, types: List, name: (Int) -> String, Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.Top) { row.forEach { type -> val outdoor = type in Workouts.OUTDOOR_ONLY - SportTile(SportIcons.of(type), name(type), Modifier.weight(1f), outdoor, isSelected(type), sportBlend(type)) { onPick(type) } + SportTile( + SportIcons.of(type), name(type), Modifier.weight(1f), outdoor, isSelected(type), sportBlend(type), + ) { onPick(type) } } repeat(4 - row.size) { Spacer(Modifier.weight(1f)) } } @@ -513,7 +516,8 @@ private fun SearchField(query: String, hint: String, modifier: Modifier = Modifi keyboardActions = KeyboardActions(onSearch = { keyboard?.hide() }), decorationBox = { field -> Row( - Modifier.fillMaxWidth().height(48.dp).clip(GlowLayout.TileShape).clearGlass(GlowLayout.TileShape, SearchFill).padding(horizontal = 16.dp), + Modifier.fillMaxWidth().height(48.dp).clip(GlowLayout.TileShape) + .clearGlass(GlowLayout.TileShape, SEARCH_FILL).padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { Icon(SportIcons.Search, null, tint = Color.White.copy(alpha = GlowType.CAPTION_ALPHA), modifier = Modifier.size(18.dp)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt index 7f742053..fcaa38fc 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/EditTodaySheet.kt @@ -79,7 +79,10 @@ internal fun EditTodaySheet(edits: TodayEdits, onSave: (TodayEdits) -> Unit, onD style = GlowType.secondary, ) } - Column(Modifier.fillMaxWidth().clearGlass(GlowShapes.Card).padding(start = 18.dp, end = 8.dp, top = 2.dp, bottom = 2.dp)) { + Column( + Modifier.fillMaxWidth().clearGlass(GlowShapes.Card) + .padding(start = 18.dp, end = 8.dp, top = 2.dp, bottom = 2.dp), + ) { TodayCard.entries.filter { it.editable }.forEachIndexed { i, card -> val shown = card !in e.hidden Row( @@ -106,7 +109,7 @@ internal fun EditTodaySheet(edits: TodayEdits, onSave: (TodayEdits) -> Unit, onD ) } Row( - Modifier.fillMaxWidth().topLine(true, 0.08f).padding(start = 20.dp, end = 20.dp, top = 12.dp) + Modifier.fillMaxWidth().topLine(true, alpha = 0.08f).padding(start = 20.dp, end = 20.dp, top = 12.dp) .navigationBarsPadding().padding(bottom = 12.dp), horizontalArrangement = Arrangement.spacedBy(12.dp), ) { @@ -134,6 +137,8 @@ private val CheckIcon: ImageVector by lazy { ).build() } +private const val DISABLED_ALPHA = 0.55f + /** A hairline along the top of a row: white at [alpha], the boards' `inset 0 1px 0`. */ private fun Modifier.topLine(show: Boolean, alpha: Float = 0.07f): Modifier = if (show) drawBehind { drawLine(Color.White.copy(alpha = alpha), Offset(0f, 0f), Offset(size.width, 0f), 1.dp.toPx()) } else this @@ -147,7 +152,7 @@ private fun PinChip(pinned: Boolean, enabled: Boolean, label: String, onClick: ( val text = stringResource(if (pinned) R.string.glow_today_edit_pinned else R.string.glow_today_edit_pin) val ink = if (pinned) Color(0xFF0B0B0D) else Color.White Box( - Modifier.height(44.dp).alpha(if (enabled) 1f else 0.55f) + Modifier.height(44.dp).alpha(if (enabled) 1f else DISABLED_ALPHA) .clickable(enabled = enabled, role = Role.Checkbox, onClick = onClick) .semantics { stateDescription = text; contentDescription = "$label, $text" }, contentAlignment = Alignment.Center, @@ -162,7 +167,10 @@ private fun PinChip(pinned: Boolean, enabled: Boolean, label: String, onClick: ( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp), ) { Icon(PinIcon, null, Modifier.size(14.dp), tint = ink) - Text(text, color = ink, style = GlowType.secondary.copy(fontWeight = if (pinned) FontWeight.SemiBold else FontWeight.Normal), maxLines = 1) + Text( + text, color = ink, maxLines = 1, + style = GlowType.secondary.copy(fontWeight = if (pinned) FontWeight.SemiBold else FontWeight.Normal), + ) } } } @@ -188,7 +196,7 @@ private fun EditSwitch(on: Boolean, label: String, onToggle: () -> Unit) { /** Cancel (clear glass) or Done (white with a check), 52 dp tall pills. */ @Composable -private fun FootButton(text: String, onClick: () -> Unit, modifier: Modifier, primary: Boolean = false) { +private fun FootButton(text: String, onClick: () -> Unit, modifier: Modifier = Modifier, primary: Boolean = false) { val ink = if (primary) Color(0xFF0B0B0D) else Color.White Row( modifier.height(52.dp) @@ -198,7 +206,10 @@ private fun FootButton(text: String, onClick: () -> Unit, modifier: Modifier, pr horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally), verticalAlignment = Alignment.CenterVertically, ) { if (primary) Icon(CheckIcon, null, Modifier.size(18.dp), tint = ink) - Text(text, color = ink, style = GlowType.body.copy(fontWeight = if (primary) FontWeight.SemiBold else FontWeight.Medium), maxLines = 1) + Text( + text, color = ink, maxLines = 1, + style = GlowType.body.copy(fontWeight = if (primary) FontWeight.SemiBold else FontWeight.Medium), + ) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt index 6837e0e8..d8846716 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowActivityScreen.kt @@ -188,7 +188,7 @@ fun GlowActivityScreen( CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }) { // Steps' blend from the upper right (Matrix board, Activity tab), day strength. GlowScreenList( - contentPadding, list, light = ScreenLight(Blends.Steps, LightAngle.UpperRight, ScreenLight.DAY, 240f), + contentPadding, list, light = ScreenLight(Blends.Steps, LightAngle.UpperRight, ScreenLight.DAY, heroCenterY = 240f), ) { add(Pane.Full, GlowBlocks.HEADER) { header() } tabCards(slots) { card, m -> @@ -669,9 +669,9 @@ private val EffortShape = CircleShape private val EffortGap = 12.dp /** - * A workout as a list row: its family's dot on a faint circle of its blend ([SportDot]; [usual] no longer lights it), the sport with "Auto-detected" when the strap logged - * it by itself, the sport's one fact and the start time ([TabCopy.workoutFact]), and the duration in dots. A thin zone - * bar under it, lined up with the name. [divider] draws the hairline above. + * A workout as a list row: its family's dot on a faint circle of its blend ([SportDot]; [usual] no longer lights it), the sport + * with "Auto-detected" when the strap logged it by itself, the sport's one fact and the start time ([TabCopy.workoutFact]), and the + * duration in dots. A thin zone bar under it, lined up with the name. [divider] draws the hairline above. */ @Composable @Suppress("UNUSED_PARAMETER") diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCard.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCard.kt index 82aebb18..f2248757 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCard.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCard.kt @@ -64,12 +64,14 @@ import org.openstrap.app.ui.theme.litEdge * Whether glow cards should hold still right now; a scrolling screen provides its scroll state, so * the pulse pauses while the list moves and the scroll gets every frame to itself. */ +@Suppress("CompositionLocalAllowlist", "ComposeCompositionLocalUsage") val LocalGlowPaused = staticCompositionLocalOf<() -> Boolean> { { false } } /** * Whether the page holding these cards is off screen or the tab pager is moving; provided by the pager, apart from * [LocalGlowPaused] so a screen's own scroll state doesn't override it. */ +@Suppress("CompositionLocalAllowlist", "ComposeCompositionLocalUsage") val LocalGlowPagePaused = staticCompositionLocalOf<() -> Boolean> { { false } } @Composable @@ -107,7 +109,7 @@ fun GlowCard( last = withFrameNanos { it } } withFrameNanos { now -> - beats.floatValue += (now - last) / 1e9f * bpm / 60f + beats.floatValue += (now - last) / NANOS_PER_SECOND * bpm / SECONDS_PER_MINUTE last = now } } @@ -199,7 +201,6 @@ private fun Modifier.clearGlassRing(blend: Blend, shape: androidx.compose.ui.gra */ private fun Modifier.levelLight(blend: Blend, level: Float, swell: GlowSwell?, shape: androidx.compose.ui.graphics.Shape): Modifier = drawWithCache { - val outline = shape.createOutline(size, layoutDirection, this) val across = size.width > size.height * 1.2f onDrawBehind { val lifted = swell?.let { s -> @@ -239,10 +240,13 @@ private fun DrawScope.drawLevel(blend: Blend, level: Float, across: Boolean) { /** A gentle lift of the tint with each heartbeat (live heart rate only): the blend's first stop, up to 12% over the card. */ private fun Modifier.beatPulse(blend: Blend, beats: () -> Float): Modifier = drawBehind { val c = contraction(beats()) - if (c > 0.01f) drawRect(blend.first.copy(alpha = BEAT_LIFT * c)) + if (c > BEAT_MIN) drawRect(blend.first.copy(alpha = BEAT_LIFT * c)) } private const val BEAT_LIFT = 0.12f +private const val BEAT_MIN = 0.01f +private const val NANOS_PER_SECOND = 1e9f +private const val SECONDS_PER_MINUTE = 60f /** * How hard the heart is squeezing over one beat (phase in beats), 0..1: a quick lub, a smaller dub just after, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt index 1f27a206..7ee4f79a 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt @@ -804,7 +804,10 @@ fun TrendDots(values: List, blend: Blend, modifier: Modifier = Modifier, h fun yOf(v: Float) = ring + (size.height - ring * 2) * (1f - (v - lo) / (hi - lo)) band?.let { b -> val y0 = yOf(b.endInclusive) - drawRoundRect(blend.chart.copy(alpha = ChartInk.NORMAL_BAND_ALPHA), Offset(0f, y0), Size(size.width, yOf(b.start) - y0), CornerRadius(6.dp.toPx())) + drawRoundRect( + blend.chart.copy(alpha = ChartInk.NORMAL_BAND_ALPHA), Offset(0f, y0), Size(size.width, yOf(b.start) - y0), + CornerRadius(6.dp.toPx()), + ) } val pts = values.mapIndexedNotNull { i, v -> v?.let { i to Offset(xOf(i), yOf(it.toFloat())) } } pts.zipWithNext { (_, a), (_, b) -> drawLine(blend.chart.copy(alpha = 0.3f), a, b, 1.5.dp.toPx()) } @@ -901,12 +904,18 @@ internal fun NormalTrend( onDrawBehind { band?.let { b -> val y0 = yOf(b.endInclusive) - drawRoundRect(blend.chart.copy(alpha = NormalBandAlpha), Offset(0f, y0), Size(size.width, yOf(b.start) - y0), CornerRadius(12.dp.toPx())) + drawRoundRect( + blend.chart.copy(alpha = NormalBandAlpha), Offset(0f, y0), Size(size.width, yOf(b.start) - y0), + CornerRadius(12.dp.toPx()), + ) if (bandText != null && labelH != null) { val w = bandText.size.width val sw = 14.dp.toPx() val x = size.width - w - drawRoundRect(blend.chart.copy(alpha = 0.35f), Offset(x - sw - 6.dp.toPx(), labelH / 2 - 4.dp.toPx()), Size(sw, 8.dp.toPx()), CornerRadius(3.dp.toPx())) + drawRoundRect( + blend.chart.copy(alpha = 0.35f), Offset(x - sw - 6.dp.toPx(), labelH / 2 - 4.dp.toPx()), + Size(sw, 8.dp.toPx()), CornerRadius(3.dp.toPx()), + ) text(bandText, size.width, 0f, align = 1f) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowHealthspanScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowHealthspanScreen.kt index 4929190e..0f090f3a 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowHealthspanScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowHealthspanScreen.kt @@ -57,7 +57,7 @@ fun GlowHealthspanScreen(state: Healthspan.Outcome?, contentPadding: PaddingValu org.openstrap.app.ui.components.PageLight( org.openstrap.app.ui.theme.ScreenLight( org.openstrap.app.ui.theme.Blends.HabitAge, org.openstrap.app.ui.glow.draw.LightAngle.Above, - org.openstrap.app.ui.theme.ScreenLight.DAY, 150f, + org.openstrap.app.ui.theme.ScreenLight.DAY, heroCenterY = 150f, ), ) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt index c7fc186b..988028eb 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowLayout.kt @@ -482,7 +482,9 @@ internal fun NoteText(text: String) = internal fun StateMarker(text: String, modifier: Modifier = Modifier) { // An amber dot and white words: amber is for the dot, never the text (decisions 6 and 9). Row(modifier, verticalAlignment = Alignment.CenterVertically) { - androidx.compose.foundation.layout.Box(Modifier.size(6.dp).background(MetricColors.warn, androidx.compose.foundation.shape.CircleShape)) + androidx.compose.foundation.layout.Box( + Modifier.size(6.dp).background(MetricColors.warn, androidx.compose.foundation.shape.CircleShape), + ) androidx.compose.foundation.layout.Spacer(Modifier.width(6.dp)) Text(text, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.caption, maxLines = 1) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt index 45aca90f..f5cd840c 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowList.kt @@ -195,9 +195,15 @@ fun ListRow( Spacer(Modifier.width(RowIconGap)) } else if (icon != null) { Box( - Modifier.size(RowIconCircle).background(circle.copy(alpha = circle.alpha * if (waiting) WAITING_ICON_ALPHA else 1f), CircleShape), + Modifier.size(RowIconCircle) + .background(circle.copy(alpha = circle.alpha * if (waiting) WAITING_ICON_ALPHA else 1f), CircleShape), contentAlignment = Alignment.Center, - ) { Icon(icon, null, tint = glyph.copy(alpha = glyph.alpha * if (waiting) WAITING_ICON_ALPHA else 1f), modifier = Modifier.size(RowGlyph)) } + ) { + Icon( + icon, null, tint = glyph.copy(alpha = glyph.alpha * if (waiting) WAITING_ICON_ALPHA else 1f), + modifier = Modifier.size(RowGlyph), + ) + } Spacer(Modifier.width(RowIconGap)) } Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowMetricDetail.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowMetricDetail.kt index ce9af565..fbdf8788 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowMetricDetail.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowMetricDetail.kt @@ -181,15 +181,16 @@ internal fun DetailTemplate( BackHandler(onBack = onBack) val list = rememberLazyListState() // The page's light (Matrix board): the metric's own blend from the top, dimmer for the sleep details. - val blend = blend ?: remember(color) { Blends.forInk(color) ?: Blends.Strap } - PageLight(ScreenLight(blend, LightAngle.Above, if (blend == Blends.Sleep) SLEEP_DETAIL_STRENGTH else ScreenLight.DAY, 190f)) + val pageBlend = blend ?: remember(color) { Blends.forInk(color) ?: Blends.Strap } + val lightStrength = if (pageBlend == Blends.Sleep) SLEEP_DETAIL_STRENGTH else ScreenLight.DAY + PageLight(ScreenLight(pageBlend, LightAngle.Above, strength = lightStrength, heroCenterY = 190f)) var switching by rememberSaveable { mutableStateOf(false) } val gutter = GlowLayout.WideGutter // Rows inside a detail open the next one with a crossfade, not by growing (spec 3.5). CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }, LocalCardsGrow provides false) { ScreenList(contentPadding, list, gutter = gutter) { item { - DetailHero(blend, ring = heroValue == null, gutter) { + DetailHero(pageBlend, ring = heroValue == null, gutter) { // A scrub is read here, so only the hero follows the finger, not the whole detail (audit K4). val scrub = scrubbed() val shown = scrub ?: headline @@ -367,6 +368,10 @@ private class PlainNumber(val number: Float, decimals: Int, grouped: Boolean) { /** Sleep's details sit in a little less light than the others (DetailSleep board, 0.55 against 0.6). */ private const val SLEEP_DETAIL_STRENGTH = 0.9f +private const val HERO_GLOW_RISE = 0.12f +private const val HERO_GLOW_RADIUS = 0.75f +private const val RING_MID_STOP = 0.3f +private const val RING_END_STOP = 0.62f /** The corners of the hero's foot: 32 dp, only at the bottom, as a squircle. */ private val HeroShape = sv.lib.squircleshape.SquircleShape( @@ -399,7 +404,7 @@ private fun DetailHero(blend: Blend, ring: Boolean, gutter: Dp, content: @Compos drawRect( Brush.radialGradient( listOf(blend.first.copy(alpha = 0.45f), blend.second.copy(alpha = 0.12f), Color.Transparent), - Offset(size.width / 2, -size.height * 0.12f), size.width * 0.75f, + Offset(size.width / 2, -size.height * HERO_GLOW_RISE), size.width * HERO_GLOW_RADIUS, ), ) // The hairline along the foot. @@ -413,7 +418,7 @@ private fun DetailHero(blend: Blend, ring: Boolean, gutter: Dp, content: @Compos if (ring) drawOutline( shape.createOutline(size, layoutDirection, this), Brush.linearGradient( - 0f to blend.first, 0.3f to blend.second, 0.62f to blend.second.copy(alpha = 0f), + 0f to blend.first, RING_MID_STOP to blend.second, RING_END_STOP to blend.second.copy(alpha = 0f), start = Offset(size.width, 0f), end = Offset(0f, size.height), ), style = Stroke(4.dp.toPx()), diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt index 574757a9..26ade70e 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowRecoveryScreen.kt @@ -137,7 +137,7 @@ fun GlowRecoveryScreen( // Light all round the number (Matrix board): the Recovery blend, day strength, centred on the hero. GlowScreenList( contentPadding, list, focus = showCharge, onFocused = onChargeShown, - light = ScreenLight(Blends.Recovery, LightAngle.Above, ScreenLight.DAY, 190f), + light = ScreenLight(Blends.Recovery, LightAngle.Above, ScreenLight.DAY, heroCenterY = 190f), ) { add(Pane.Full, GlowBlocks.HEADER) { header() } tabCards(slots, focus = RecoveryCard.Charge) { card, m -> diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowSleepScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowSleepScreen.kt index fc7f4628..ef8b860c 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowSleepScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowSleepScreen.kt @@ -1,3 +1,5 @@ +@file:Suppress("TooManyFunctions") // the Sleep screen's cards and rows are one cohesive set + package org.openstrap.app.ui.glow import org.openstrap.app.R @@ -115,7 +117,7 @@ fun GlowSleepScreen( CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }, LocalGlowMood provides GlowMood.Night) { // Always night, light from below (Matrix board): Sleep's blend at 65%, the top stays dark. GlowScreenList( - contentPadding, list, light = ScreenLight(Blends.Sleep, LightAngle.Below, ScreenLight.NIGHT, 190f), + contentPadding, list, light = ScreenLight(Blends.Sleep, LightAngle.Below, ScreenLight.NIGHT, heroCenterY = 190f), ) { full { header() } // With naps and a breathing summary the two are a Small pair; alone, either is a Wide. diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowTodayScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowTodayScreen.kt index 951c40fb..381f5881 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowTodayScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowTodayScreen.kt @@ -242,7 +242,7 @@ fun GlowTodayScreen( val unavailable = if (healthspan?.result == null) setOf(TodayCard.HabitAge) else emptySet() val stepsGoal = LocalGoals.current.steps val stepsFacts = activity?.stepsFacts(state.date, state.steps, stepsGoal) - val morning = LocalTime.now().hour < 12 + val morning = LocalTime.now().hour < NOON_HOUR val live = liveHeartRate != null // The moment the cards are laid out for, with no moment yet resolved as todayCards does. val looksFor = moment ?: if (morning) Moment.Waking else Moment.Midday @@ -454,7 +454,7 @@ private fun heroKindOf(ctx: TodayContext, pairing: PairStep?, running: org.opens Moment.Midday -> HeroKind.Midday Moment.Evening, Moment.Night -> HeroKind.Evening Moment.Waking -> HeroKind.Waking - null -> if (LocalTime.now().hour < 12 || !ctx.isToday) HeroKind.Waking else HeroKind.Midday + null -> if (LocalTime.now().hour < NOON_HOUR || !ctx.isToday) HeroKind.Waking else HeroKind.Midday } }.let { // No sleep last night: nothing for Recovery to score, so Charge leads from waking on (spec 4.3). Only once @@ -477,7 +477,9 @@ private fun todayLight(kind: HeroKind, ctx: TodayContext, running: org.openstrap HeroKind.Waking -> ScreenLight(Blends.Recovery, LightAngle.LowerLeft, ScreenLight.DAY, y) HeroKind.Midday, HeroKind.NoSleep -> ScreenLight(Blends.Energy, LightAngle.Below, ScreenLight.DAY, y) HeroKind.Window -> ScreenLight(Blends.Heart, LightAngle.UpperRight, ScreenLight.DAY, y) - HeroKind.During -> ScreenLight(running?.let { familyBlend(it.workout.sportType) } ?: Blends.Heart, LightAngle.Below, ScreenLight.DAY, y) + HeroKind.During -> ScreenLight( + running?.let { familyBlend(it.workout.sportType) } ?: Blends.Heart, LightAngle.Below, ScreenLight.DAY, y, + ) // Recovery's first stop settling into HRV's ocean. HeroKind.After -> ScreenLight(AfterBlend, LightAngle.Below, ScreenLight.DAY, y) HeroKind.Evening -> @@ -929,3 +931,4 @@ internal fun chargeSoFar(points: List, day: LongRange, now /** The longest Today's cards wait for the moment before showing the fallback layout. */ private const val CARDS_WAIT_MS = 4_000L +private const val NOON_HOUR = 12 diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt index f3d808f6..d0a484ce 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutMode.kt @@ -154,7 +154,9 @@ internal fun WorkoutButton( ) { Row( modifier.fillMaxWidth().height(height) - .let { if (background.alpha >= 1f) it.shadow(28.dp, GlowShapes.Pill, ambientColor = background, spotColor = background) else it } + .let { + if (background.alpha >= 1f) it.shadow(28.dp, GlowShapes.Pill, ambientColor = background, spotColor = background) else it + } .clip(GlowShapes.Pill).background(background) .let { if (background.alpha < 1f) it.litEdge(GlowShapes.Pill, top = 0.2f, ring = 0f) else it } .pressClickable(onClick, GlowShapes.Pill), @@ -235,7 +237,11 @@ internal fun WorkoutPage( backdrop: Brush? = null, content: @Composable ColumnScope.() -> Unit, ): Unit = WorkoutPage( - if (glow == Color.Transparent) null else ScreenLight(Blends.forInk(glow) ?: Blend(glow, glow), 90f, 0.5f, 0f), + if (glow == Color.Transparent) { + null + } else { + ScreenLight(Blends.forInk(glow) ?: Blend(glow, glow), angle = 90f, strength = 0.5f, heroCenterY = 0f) + }, contentPadding, scroll, pinned, backdrop, content = content, ) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutScreen.kt index 20b49476..4f28768d 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutScreen.kt @@ -76,6 +76,11 @@ import org.openstrap.app.ui.dashboard.LocalHeartZones /** The heart rate line is drawn in ten-second steps: readable on a phone, and the card still says the time. */ private const val HeartStep = 10L +private const val LIGHT_BASE_STRENGTH = 0.6f +private const val LIGHT_EFFORT_STRENGTH = 0.25f + +/** The page light's strength for a workout of [effort] (0 to 1): a base glow plus a share by how hard it was. */ +private fun workoutLightStrength(effort: Float): Float = LIGHT_BASE_STRENGTH + LIGHT_EFFORT_STRENGTH * effort /** * The workout [a]. A phone workout shows from its [summary] (route, laps, sets and the whole recording, for trimming), @@ -116,7 +121,14 @@ fun GlowWorkoutDetailScreen( val zones = shown?.zoneSeconds.orEmpty() // Lit by the kind's blend at a strength by effort (Matrix board), as its summary was; the zones stay small. PageLight( - shown?.let { ScreenLight(familyBlend(Workouts.family(it.workout.sportType)), 225f, 0.6f + 0.25f * Workouts.effort(it.workout.trainingLoad, usual), 170f) }, + shown?.let { + ScreenLight( + familyBlend(Workouts.family(it.workout.sportType)), + angle = 225f, + strength = workoutLightStrength(Workouts.effort(it.workout.trainingLoad, usual)), + heroCenterY = 170f, + ) + }, ) CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }) { ScreenList(contentPadding, list, gutter = GlowLayout.Gutter) { @@ -197,7 +209,7 @@ private fun PastSummary( val weekStarts = remember(workouts) { goalWeekStarts(workouts) } val trim = rememberWorkoutTrim(summary, onTrim, onUndoTrim) val effort = Workouts.effort(w.trainingLoad, usual) - PageLight(ScreenLight(familyBlend(family), 225f, 0.6f + 0.25f * effort, 170f)) + PageLight(ScreenLight(familyBlend(family), angle = 225f, strength = workoutLightStrength(effort), heroCenterY = 170f)) CompositionLocalProvider(LocalGlowPaused provides { list.isScrollInProgress }) { ScreenList(contentPadding, list, gutter = GlowLayout.Gutter) { item { @@ -431,7 +443,7 @@ fun GlowWorkoutsScreen(workouts: List, contentPadding: PaddingV val days = remember(workouts) { workouts.groupBy { Instant.ofEpochSecond(it.workout.start).atZone(zone).toLocalDate() }.toList() } val today = LocalDate.now() // Heart's blend from the upper right, quiet: nothing here is a single workout to light (board DetailAllWorkouts). - PageLight(ScreenLight(Blends.Heart, 45f, 0.7f, 120f)) + PageLight(ScreenLight(Blends.Heart, angle = 45f, strength = 0.7f, heroCenterY = 120f)) ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader( diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt index df379969..fe930d17 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowWorkoutSummary.kt @@ -1,3 +1,5 @@ +@file:Suppress("TooManyFunctions") // one cohesive file: each function is one section of the workout summary + package org.openstrap.app.ui.glow import androidx.compose.foundation.layout.BoxWithConstraints @@ -72,7 +74,6 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.ui.text.font.FontWeight import org.openstrap.app.ui.workout.SplitRow import org.openstrap.app.ui.workout.ZoneSeconds -import org.openstrap.app.data.WorkoutRecorder import org.openstrap.app.ui.workout.familyColor import org.openstrap.app.ui.workout.mainZoneColor import kotlinx.coroutines.delay @@ -114,11 +115,20 @@ import org.openstrap.app.ui.dashboard.LocalHeartZones /** Where Done has got to: the summary, a personal best's card, the goal moment. */ private enum class SummaryStep { Summary, Best, Moment } +private const val BLOB_STOP_A = 0.35f +private const val BLOB_STOP_B = 0.6f +private const val BLOB_STOP_C = 0.8f +private const val FIRST_BLOB_X = 0.4f +private const val FIRST_BLOB_RX = 0.82f +private const val SECOND_BLOB_X = 0.78f +private const val SECOND_BLOB_RX = 0.51f +private const val SECOND_BLOB_FADE = 0.9f + /** How much higher the hero's light reaches at the top of a personal best's swell. */ -private const val SwellLevel = 0.25f +private const val SWELL_LEVEL = 0.25f /** The drop line shows the last minute of the workout before the end. */ -private const val BeforeS = 60L +private const val BEFORE_S = 60L /** * The summary right after [summary]'s workout ended. [calmDown] is the heart rate the strap sent since, for this @@ -182,7 +192,9 @@ fun GlowWorkoutSummaryScreen( } val trim = summary?.let { rememberWorkoutTrim(it, onTrim, onUndoTrim) } // The summary is lit by its family's blend at a size by effort (Matrix board), so both are known before the page. - val family = remember(summary) { summary?.let { FamilySummary.familyOf(it.analysis.workout.sportType, it.structure) } ?: Workouts.Family.Distance } + val family = remember(summary) { + summary?.let { FamilySummary.familyOf(it.analysis.workout.sportType, it.structure) } ?: Workouts.Family.Distance + } val effort = remember(summary, workouts) { if (summary == null) 0f else Workouts.effort( summary.analysis.workout.trainingLoad, @@ -199,7 +211,7 @@ fun GlowWorkoutSummaryScreen( if (a != null && hero != null) SummaryButtons(onShare = { sharing = true }, onDone = done) else WorkoutButton(stringResource(R.string.glow_done), Color.White, Color.Black, onDone) }, - effortLight = { effort + SwellLevel * swell.value } to familyBlend(family), + effortLight = { effort + SWELL_LEVEL * swell.value } to familyBlend(family), ) { // The sport, then when, with Trim beside them. Row(Modifier.padding(start = 4.dp, top = 12.dp), verticalAlignment = Alignment.CenterVertically) { @@ -239,12 +251,8 @@ fun GlowWorkoutSummaryScreen( swell.animateTo(0f, tween(900)) } } - val heartZones = LocalHeartZones.current - val zones = remember(a, heartZones) { - WorkoutRecorder.liveZoneSeconds(a.heartRate.filter { it.timestamp <= a.end }.map { it.timestamp to it.bpm }, a.maxHeartRate, heartZones).toList() - } SummaryHeroCard( - hero ?: summaryHero(family, summary, usualLoad), familyInk(family), effort, { swell.value }, + hero ?: summaryHero(family, summary, usualLoad), familyInk(family), effort, title = a.sportName, range = Ranges.times(a.shownStart, a.end), ) // What was done to the times, under the hero that says them. @@ -269,11 +277,11 @@ fun GlowWorkoutSummaryScreen( /** * The summary's hero (workouts spec 2.8): a glow in the workout's [color] lit from below as high as its [effort], the - * one number in dots, then a sentence or three figures in text. [swell] lifts the light for a personal best. + * one number in dots, then a sentence or three figures in text. */ @Composable internal fun SummaryHeroCard( - hero: SummaryHero, color: Color, effort: Float, swell: () -> Float = { 0f }, + hero: SummaryHero, color: Color, effort: Float, /** The family's title and the time range, on the card's title row (board SummaryRun); null on pages that head themselves. */ title: String? = null, range: String? = null, ) { @@ -326,10 +334,10 @@ private fun CalmDownHero(summary: PhoneSummary, live: CalmDown?, usualDrop: Int? if (bpmNow != null) { HeroValue(bpmNow.toString(), stringResource(R.string.glow_summary_unit_bpm_now), Modifier.padding(top = 16.dp)) } - val shown = readings.filter { it.first in (a.end - BeforeS)..(a.end + WorkoutSession.CALM_S) } + val shown = readings.filter { it.first in (a.end - BEFORE_S)..(a.end + WorkoutSession.CALM_S) } if (shown.size >= 2) DropLine(shown, a.end, Modifier.padding(top = 16.dp)) // The effort as a thin bar in the heart blend (the light was a heavy red band). - val level = (effort + SwellLevel * swell).coerceIn(0f, 1f) + val level = (effort + SWELL_LEVEL * swell).coerceIn(0f, 1f) Box(Modifier.padding(top = 14.dp).fillMaxWidth().height(4.dp).clip(CircleShape).background(Color.White.copy(alpha = 0.10f))) { Box(Modifier.fillMaxWidth(level).fillMaxHeight().clip(CircleShape).background(Blends.Heart.brush())) } @@ -343,8 +351,8 @@ private fun CalmDownHero(summary: PhoneSummary, live: CalmDown?, usualDrop: Int? */ @Composable private fun DropLine(readings: List>, end: Long, modifier: Modifier = Modifier) { - val first = end - BeforeS - val span = (BeforeS + WorkoutSession.CALM_S).toFloat() + val first = end - BEFORE_S + val span = (BEFORE_S + WorkoutSession.CALM_S).toFloat() val lo = readings.minOf { it.second } - 5f val hi = readings.maxOf { it.second } + 5f Column(modifier) { @@ -579,18 +587,27 @@ internal fun Modifier.effortLight(blend: Blend, effort: () -> Float): Modifier = val heroY = 170.dp.toPx() fun blob(c: Offset, rx: Float, ry: Float, color: Color, alpha: Float) { val brush = Brush.radialGradient( - 0f to color.copy(alpha = alpha), 0.35f to color.copy(alpha = alpha * 0.9f), 0.6f to color.copy(alpha = alpha * 0.55f), - 0.8f to color.copy(alpha = alpha * 0.2f), 1f to Color.Transparent, center = c, radius = rx, + 0f to color.copy(alpha = alpha), + BLOB_STOP_A to color.copy(alpha = alpha * 0.9f), + BLOB_STOP_B to color.copy(alpha = alpha * 0.55f), + BLOB_STOP_C to color.copy(alpha = alpha * 0.2f), + 1f to Color.Transparent, + center = c, + radius = rx, ) scale(1f, ry / rx, pivot = c) { drawCircle(brush, rx, c) } } val first = 0.6f + 0.25f * e - blob(Offset(w * 0.4f, heroY + 50.dp.toPx()), (w * 0.82f + 120.dp.toPx()) * size, (260.dp.toPx() + 120.dp.toPx()) * size, blend.light, first) + blob( + Offset(w * FIRST_BLOB_X, heroY + 50.dp.toPx()), (w * FIRST_BLOB_RX + 120.dp.toPx()) * size, (260.dp.toPx() + 120.dp.toPx()) * size, + blend.light, first, + ) // The second stop only joins once the workout was hard enough to flood. val second = ((e - 0.25f) / 0.5f).coerceIn(0f, 1f) if (second > 0f) blob( - Offset(w * 0.78f, heroY + 420.dp.toPx()), (w * 0.51f + 120.dp.toPx()) * size, (190.dp.toPx() + 120.dp.toPx()) * size, - blend.lightSecond, first * 0.9f * second, + Offset(w * SECOND_BLOB_X, heroY + 420.dp.toPx()), + (w * SECOND_BLOB_RX + 120.dp.toPx()) * size, (190.dp.toPx() + 120.dp.toPx()) * size, + blend.lightSecond, first * SECOND_BLOB_FADE * second, ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GoalsAndBests.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GoalsAndBests.kt index 2670a5d8..4f30a78f 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GoalsAndBests.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GoalsAndBests.kt @@ -71,12 +71,22 @@ private fun weekDots(view: RewardsView, first: LocalDate, zone: ZoneId = ZoneId. } } +private const val LIGHT_TOP_X = 0.3f +private const val LIGHT_TOP_RX = 0.82f +private const val LIGHT_BOTTOM_X = 0.8f +private const val LIGHT_BOTTOM_RX = 0.5f + /** * The Goals blend's page light (boards RewardsGoals, RewardsBadges, RewardsWeeklyRecap, WorkoutCelebration): the second * stop big at the upper left, the first small at the lower right, both muted, over the ground. [top] and [bottom] are * the two blobs' strengths. */ -internal fun Modifier.goalsLight(top: Float = 0.5f, bottom: Float = 0.22f, topY: Float = 200f, bottomY: Float = 680f): Modifier = drawBehind { +internal fun Modifier.goalsLight( + top: Float = 0.5f, + bottom: Float = 0.22f, + topY: Float = 200f, + bottomY: Float = 680f, +): Modifier = drawBehind { drawRect(org.openstrap.app.ui.theme.Ground) fun blob(c: Offset, rx: Float, ry: Float, color: Color, alpha: Float) { val brush = Brush.radialGradient( @@ -86,8 +96,14 @@ internal fun Modifier.goalsLight(top: Float = 0.5f, bottom: Float = 0.22f, topY: scale(1f, ry / rx, pivot = c) { drawCircle(brush, rx, c) } } val w = size.width - blob(Offset(w * 0.3f, topY.dp.toPx()), w * 0.82f + 100.dp.toPx(), 240.dp.toPx() + 100.dp.toPx(), Blends.Goals.lightSecond, top) - blob(Offset(w * 0.8f, bottomY.dp.toPx()), w * 0.5f + 100.dp.toPx(), 170.dp.toPx() + 100.dp.toPx(), Blends.Goals.light, bottom) + blob( + Offset(w * LIGHT_TOP_X, topY.dp.toPx()), w * LIGHT_TOP_RX + 100.dp.toPx(), 240.dp.toPx() + 100.dp.toPx(), + Blends.Goals.lightSecond, top, + ) + blob( + Offset(w * LIGHT_BOTTOM_X, bottomY.dp.toPx()), w * LIGHT_BOTTOM_RX + 100.dp.toPx(), 170.dp.toPx() + 100.dp.toPx(), + Blends.Goals.light, bottom, + ) } /** @@ -107,12 +123,15 @@ private fun Modifier.goalsFill(level: Float): Modifier = drawWithCache { fun pool(cx: Float, cy: Float, rx: Float, ry: Float, a: Float) { val c = Offset(size.width * cx, size.height * cy) val r = size.width * rx - val b = Brush.radialGradient(0f to dark.copy(alpha = a), 0.5f to dark.copy(alpha = a * 0.66f), 1f to Color.Transparent, center = c, radius = r) + val b = Brush.radialGradient( + 0f to dark.copy(alpha = a), 0.5f to dark.copy(alpha = a * 0.66f), 1f to Color.Transparent, + center = c, radius = r, + ) scale(1f, size.height * ry / r, pivot = c) { drawCircle(b, r, c) } } - pool(0.18f, 0.10f, 0.6f, 0.30f, 0.6f) - pool(0.38f, 0.94f, 0.9f, 0.32f, 0.82f) - pool(0.14f, 0.46f, 0.4f, 0.46f, 0.9f) + pool(cx = 0.18f, cy = 0.10f, rx = 0.6f, ry = 0.30f, a = 0.6f) + pool(cx = 0.38f, cy = 0.94f, rx = 0.9f, ry = 0.32f, a = 0.82f) + pool(cx = 0.14f, cy = 0.46f, rx = 0.4f, ry = 0.46f, a = 0.9f) } } @@ -274,7 +293,8 @@ private fun WaysOn(onAllBadges: () -> Unit, onRecap: () -> Unit, onCelebrations: fun AllBadgesPage(view: RewardsView?, contentPadding: PaddingValues, onBack: () -> Unit) { BackHandler(onBack = onBack) var open by rememberSaveable { mutableStateOf(null) } - Box(Modifier.fillMaxSize().goalsLight(top = 0.38f, bottom = 0.2f, topY = 100f, bottomY = 560f)) { ScreenList(contentPadding, gutter = GlowLayout.Gutter) { + val light = Modifier.fillMaxSize().goalsLight(top = 0.38f, bottom = 0.2f, topY = 100f, bottomY = 560f) + Box(light) { ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { val subtitle = view?.let { stringResource(R.string.glow_goals_earned_count, it.earned.size, Rewards.BADGES.size) } PageHeader(stringResource(R.string.glow_goals_all_badges), onBack, subtitle = subtitle) @@ -313,7 +333,8 @@ fun WeeklyRecapPage(view: RewardsView?, first: LocalDate, contentPadding: Paddin return } BackHandler(onBack = onBack) - Box(Modifier.fillMaxSize().goalsLight(top = 0.55f, bottom = 0.3f, topY = 220f, bottomY = 670f)) { ScreenList(contentPadding, gutter = GlowLayout.Gutter) { + val light = Modifier.fillMaxSize().goalsLight(top = 0.55f, bottom = 0.3f, topY = 220f, bottomY = 670f) + Box(light) { ScreenList(contentPadding, gutter = GlowLayout.Gutter) { item { PageHeader(stringResource(R.string.glow_goals_your_week), onBack, subtitle = RewardsCopy.weekRange(first)) } if (view == null) return@ScreenList val week = view.week(first) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt index a3e05ac8..93fc2464 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/HeartZonesScreen.kt @@ -41,6 +41,8 @@ import org.openstrap.app.ui.workout.HeartZonesCopy import org.openstrap.app.ui.workout.ZONE_COLORS import org.openstrap.app.ui.workout.ZONE_NAMES +private const val HERO_MID_STOP = 0.5f + /** * Heart rate zones (board SettingsHeartZones), from Ready's Your zones and the You page: your max heart rate as the * hero, lit in heart red from the left, with where it comes from and Set it myself; then the five zones as a plain @@ -89,7 +91,8 @@ private fun MaxHero(max: MaxHeartRate?, onSet: () -> Unit) { Column( Modifier.fillMaxWidth().clip(org.openstrap.app.ui.theme.GlowShapes.Card) .placeHero( - 90f, 0f to heart.first.copy(alpha = 0.55f), 0.5f to heart.second.copy(alpha = 0.20f), 1f to Color.White.copy(alpha = 0.05f), + angle = 90f, 0f to heart.first.copy(alpha = 0.55f), HERO_MID_STOP to heart.second.copy(alpha = 0.20f), + 1f to Color.White.copy(alpha = 0.05f), ) .padding(horizontal = 20.dp, vertical = 18.dp), verticalArrangement = Arrangement.spacedBy(12.dp), diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/InfoSheet.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/InfoSheet.kt index 3f02dad2..bd196ceb 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/InfoSheet.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/InfoSheet.kt @@ -158,7 +158,10 @@ private fun Fold(title: String, text: String, divider: Boolean = true) { Icon(AppIcons.CaretDown, null, tint = Color.White.copy(alpha = 0.6f), modifier = Modifier.size(16.dp).rotate(turn)) } AnimatedVisibility(open) { - Text(text, color = Color.White.copy(alpha = 0.8f), style = GlowType.secondary.copy(lineHeight = 18.85.sp), modifier = Modifier.padding(bottom = 16.dp)) + Text( + text, color = Color.White.copy(alpha = 0.8f), style = GlowType.secondary.copy(lineHeight = 18.85.sp), + modifier = Modifier.padding(bottom = 16.dp), + ) } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt index f5fe5fc8..e1b2ad57 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/PageParts.kt @@ -653,7 +653,10 @@ fun PageConfirm( ) { PageSheet(onDismiss, if (icon == null) title else null) { if (icon != null) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { - Box(Modifier.size(40.dp).background(org.openstrap.app.ui.theme.Blends.Strap.first.copy(alpha = 0.18f), CircleShape), contentAlignment = Alignment.Center) { + Box( + Modifier.size(40.dp).background(org.openstrap.app.ui.theme.Blends.Strap.first.copy(alpha = 0.18f), CircleShape), + contentAlignment = Alignment.Center, + ) { Icon(icon, null, Modifier.size(20.dp), tint = Color.White) } Text(title, color = Color.White, style = GlowType.cardTitle, maxLines = 1) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/PictureCard.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/PictureCard.kt index 50ef28ae..7b397185 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/PictureCard.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/PictureCard.kt @@ -118,10 +118,17 @@ private fun Modifier.rimLight(rim: Rim, blend: Blend, strength: Float): Modifier val c = Offset(rim.x * size.width, rim.y * size.height) val rx = (rim.reachX * size.width).coerceAtLeast(1f) val ry = (rim.reachY * size.height).coerceAtLeast(1f) - val wash = ellipse(c, rx * WASH_REACH_X, ry * WASH_REACH_Y, listOf(blend.first.copy(alpha = WASH_ALPHA * strength), Color.Transparent), listOf(0f, 1f)) + val wash = ellipse( + c, rx * WASH_REACH_X, ry * WASH_REACH_Y, + listOf(blend.first.copy(alpha = WASH_ALPHA * strength), Color.Transparent), listOf(0f, 1f), + ) val edge = ellipse( c, rx, ry, - listOf(blend.first.copy(alpha = strength), lerp(blend.first, blend.second, 0.5f).copy(alpha = RIM_HALF_ALPHA * strength), Color.Transparent), + listOf( + blend.first.copy(alpha = strength), + lerp(blend.first, blend.second, 0.5f).copy(alpha = RIM_HALF_ALPHA * strength), + Color.Transparent, + ), listOf(0f, RIM_HALF_AT, 1f), ) // The card is clipped to its shape, so half of this stroke shows: the 2 dp rim. diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyCardio.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyCardio.kt index 6ff6e2da..1762e9da 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyCardio.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyCardio.kt @@ -298,7 +298,8 @@ private fun ReadyPlanCard( var choosing by rememberSaveable { mutableStateOf(false) } Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) { IconPill( - shown.name, { onTyping(false); choosing = true }, icon = shown.icon, tint = LocalReadyBlend.current.chart, caret = true, height = 40.dp, + shown.name, { onTyping(false); choosing = true }, icon = shown.icon, tint = LocalReadyBlend.current.chart, + caret = true, height = 40.dp, description = stringResource(R.string.glow_ready_plan_description, shown.name, StartCopy.planHint(family)), ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyPlans.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyPlans.kt index 3b26ae0b..a3c4ae8c 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyPlans.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyPlans.kt @@ -220,7 +220,9 @@ private fun RoundsStrip(s: Structure.Timed) { ) { repeat(s.rounds) { i -> Box(Modifier.weight(s.work.toFloat()).height(10.dp).clip(CircleShape).background(Blends.Intervals.chart)) - if (i < s.rounds - 1 && s.rest > 0) Box(Modifier.weight(s.rest.toFloat()).height(10.dp).clip(CircleShape).background(Blends.Intervals.chartSecond)) + if (i < s.rounds - 1 && s.rest > 0) { + Box(Modifier.weight(s.rest.toFloat()).height(10.dp).clip(CircleShape).background(Blends.Intervals.chartSecond)) + } } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyScreen.kt index 98177762..793f286e 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ReadyScreen.kt @@ -230,7 +230,12 @@ fun GlowWorkoutReadyScreen( val blend = familyBlend(family) CompositionLocalProvider(LocalReadyBlend provides blend) { WorkoutPage( // The family's blend from below for a run, from above for the rest (boards WorkoutReadyRun, WorkoutReadyStrength). - if (cardio) ScreenLight(blend, 225f, 0.9f, 520f) else ScreenLight(blend, 135f, 0.9f, 220f), contentPadding, + if (cardio) { + ScreenLight(blend, angle = 225f, strength = 0.9f, heroCenterY = 520f) + } else { + ScreenLight(blend, angle = 135f, strength = 0.9f, heroCenterY = 220f) + }, + contentPadding, // While a goal is typed the keyboard has the bottom of the screen. pinned = if (typing) null else ({ WorkoutButton(StartCopy.startLabel(type), Color.White, Color.Black, start, icon = AppIcons.PlayFill, height = 64.dp) }), ) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareCards.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareCards.kt index 8f345701..5f7c98e9 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareCards.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/ShareCards.kt @@ -351,6 +351,11 @@ private object StoryGap { /** The block's corner: 24 dp, a squircle. */ private val BlockShape = GlowShapes.Card +private const val BLOCK_MID_STOP = 0.55f +private const val BLOB_STOP_A = 0.35f +private const val BLOB_STOP_B = 0.6f +private const val BLOB_STOP_C = 0.8f +private const val PHOTO_FADE_STOP = 0.4f /** * The glass block under the text on a lit card (decision 15): a dark gradient from 46% to 74%, a lit top edge and a @@ -362,7 +367,9 @@ private fun StoryBlock(card: StoryCard, modifier: Modifier = Modifier) { modifier.fillMaxWidth().clip(BlockShape) .background( Brush.verticalGradient( - 0f to Color.Black.copy(alpha = 0.46f), 0.55f to Color.Black.copy(alpha = 0.62f), 1f to Color.Black.copy(alpha = 0.74f), + 0f to Color.Black.copy(alpha = 0.46f), + BLOCK_MID_STOP to Color.Black.copy(alpha = 0.62f), + 1f to Color.Black.copy(alpha = 0.74f), ), ) .litEdge(BlockShape, top = 0.20f, ring = 0.07f) @@ -459,7 +466,7 @@ private fun StatRow(stats: List) { ) } Text( - s.label, color = Color.White.copy(alpha = StoryDim), style = GlowType.secondary, maxLines = 1, + s.label, color = Color.White.copy(alpha = STORY_DIM), style = GlowType.secondary, maxLines = 1, overflow = TextOverflow.Ellipsis, ) } @@ -488,13 +495,18 @@ private fun StoryGlow(blend: Blend) { val c = Offset(cx.dp.toPx(), cy.dp.toPx()) val r = rx.dp.toPx() val brush = Brush.radialGradient( - 0f to color.copy(alpha = alpha), 0.35f to color.copy(alpha = alpha * 0.9f), 0.6f to color.copy(alpha = alpha * 0.55f), - 0.8f to color.copy(alpha = alpha * 0.2f), 1f to Color.Transparent, center = c, radius = r, + 0f to color.copy(alpha = alpha), + BLOB_STOP_A to color.copy(alpha = alpha * 0.9f), + BLOB_STOP_B to color.copy(alpha = alpha * 0.55f), + BLOB_STOP_C to color.copy(alpha = alpha * 0.2f), + 1f to Color.Transparent, + center = c, + radius = r, ) scale(1f, ry / rx, pivot = c) { drawCircle(brush, r, c) } } - blob(120f, 550f, 260f + 90f, 220f + 90f, blend.first, 0.55f) - blob(330f, 590f, 180f + 90f, 160f + 90f, blend.second, 0.45f) + blob(cx = 120f, cy = 550f, rx = 260f + 90f, ry = 220f + 90f, color = blend.first, alpha = 0.55f) + blob(cx = 330f, cy = 590f, rx = 180f + 90f, ry = 160f + 90f, color = blend.second, alpha = 0.45f) }, ) } @@ -508,12 +520,16 @@ private fun PhotoFade() { Box(Modifier.fillMaxSize()) { Box( // Deep enough that the wordmark's red reads over a bright photo. - Modifier.fillMaxWidth().fillMaxHeight(0.22f) + Modifier.fillMaxWidth().fillMaxHeight(fraction = 0.22f) .background(Brush.verticalGradient(listOf(Color.Black.copy(alpha = 0.7f), Color.Transparent))), ) Box( - Modifier.align(Alignment.BottomCenter).fillMaxWidth().fillMaxHeight(0.62f).background( - Brush.verticalGradient(0f to Color.Transparent, 0.4f to Color.Black.copy(alpha = 0.75f), 1f to Color.Black.copy(alpha = 0.9f)), + Modifier.align(Alignment.BottomCenter).fillMaxWidth().fillMaxHeight(fraction = 0.62f).background( + Brush.verticalGradient( + 0f to Color.Transparent, + PHOTO_FADE_STOP to Color.Black.copy(alpha = 0.75f), + 1f to Color.Black.copy(alpha = 0.9f), + ), ), ) } @@ -571,4 +587,4 @@ private fun StoryChipView(chip: StoryChip) { private val ChipText = GlowType.secondary.copy(fontWeight = FontWeight.Medium) /** White for a card's dimmer lines, as on the boards. */ -private const val StoryDim = 0.7f +private const val STORY_DIM = 0.7f diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/SleepDetail.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/SleepDetail.kt index 87420193..97c88209 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/SleepDetail.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/SleepDetail.kt @@ -401,7 +401,8 @@ private val SnackbarSurface = Color(0xFFF2F2F4) @Composable private fun EditedNote(text: String) { Row( - Modifier.fillMaxWidth().background(ListSurface, org.openstrap.app.ui.theme.GlowShapes.Tile).padding(horizontal = 14.dp, vertical = 12.dp), + Modifier.fillMaxWidth().background(ListSurface, org.openstrap.app.ui.theme.GlowShapes.Tile) + .padding(horizontal = 14.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically, ) { androidx.compose.material3.Icon(AppIcons.PencilEdit, null, Modifier.size(16.dp), tint = Color.White.copy(alpha = 0.7f)) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/Wordmark.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/Wordmark.kt index e20ce1bd..767eb284 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/Wordmark.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/Wordmark.kt @@ -20,7 +20,8 @@ import org.openstrap.app.ui.theme.Blends fun Wordmark(modifier: Modifier = Modifier, style: TextStyle = GlowType.storyBrand, strap: Color = Color.White) { val text = buildAnnotatedString { // The board's soft glow round the red, 0.25 em wide (Share board). - withStyle(SpanStyle(color = Blends.Heart.first, shadow = Shadow(Blends.Heart.first.copy(alpha = 0.35f), blurRadius = style.fontSize.value * 0.25f))) { append("un") } + val glow = Shadow(Blends.Heart.first.copy(alpha = 0.35f), blurRadius = style.fontSize.value * 0.25f) + withStyle(SpanStyle(color = Blends.Heart.first, shadow = glow)) { append("un") } withStyle(SpanStyle(color = strap)) { append("strap") } } Text(text, style = style, maxLines = 1, modifier = modifier) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/DotSpec.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/DotSpec.kt index 12d37593..db4fa404 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/DotSpec.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/draw/DotSpec.kt @@ -49,8 +49,11 @@ object DotFont { * [text] as the dots show it (Numbers board): four digits read without a gap ("8412"), five or more keep a gap of * half a digit before each group of three ("12 480"). Grouping comes in as commas ([Units.DOT_LOCALE] is ROOT). */ - fun grouped(text: String): String = GROUPED.replace(text) { m -> if (m.value.count { it.isDigit() } <= 4) m.value.replace(",", "") else m.value } + fun grouped(text: String): String = GROUPED.replace(text) { m -> + if (m.value.count { it.isDigit() } <= UNGROUPED_DIGITS) m.value.replace(",", "") else m.value + } + private const val UNGROUPED_DIGITS = 4 private val GROUPED = Regex("\\d{1,3}(,\\d{3})+") /** Whether [c] has a glyph of its own. */ diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveDistance.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveDistance.kt index 3c1e3703..74dde3bb 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveDistance.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveDistance.kt @@ -188,7 +188,10 @@ internal fun LiveDistanceScreen( fill = true, title = stringResource(R.string.workout_live_reps_title, Workouts.sportName(r.workout.sportType)), bottomRoom = bar, ) { - RepPage(r, route, readings, bpm, color, target, connected, compact, if (shortLandscape(compact)) Modifier else Modifier.weight(1f)) + RepPage( + r, route, readings, bpm, target, connected, compact, + if (shortLandscape(compact)) Modifier else Modifier.weight(1f), + ) } else LiveFrame( r, blend, connected, pagePadding, controls, lap, time = { active.value }, smallTime = compact, battery = battery, status = status, fill = true, bottomRoom = bar, @@ -242,7 +245,7 @@ internal fun LiveDistanceScreen( */ @Composable private fun RepPage( - r: WorkoutState.Recording, route: List, readings: List>, bpm: Int?, color: Color, + r: WorkoutState.Recording, route: List, readings: List>, bpm: Int?, target: WorkoutTarget?, connected: Boolean, compact: Boolean, modifier: Modifier, ) { @@ -329,7 +332,8 @@ private fun RepPage( ) { done.forEach { round -> Row( - Modifier.clip(GlowShapes.Pill).background(org.openstrap.app.ui.glow.Raised).padding(horizontal = 14.dp, vertical = 9.dp), + Modifier.clip(GlowShapes.Pill).background(org.openstrap.app.ui.glow.Raised) + .padding(horizontal = 14.dp, vertical = 9.dp), verticalAlignment = Alignment.CenterVertically, ) { Text( @@ -366,7 +370,10 @@ internal fun speedText(secondsPerKm: Double?, locale: java.util.Locale = java.ut * kilometre under it ([KmSplitBars]). The hero's tinted glass in the distance blend (Steps), under it the clear glass zone strip. */ @Composable -private fun PaceCard(pace: Double?, averagePace: () -> Double?, splits: List, speed: Boolean, blend: Blend, modifier: Modifier = Modifier) { +private fun PaceCard( + pace: Double?, averagePace: () -> Double?, splits: List, speed: Boolean, blend: Blend, + modifier: Modifier = Modifier, +) { LiveHero(blend, modifier, verticalArrangement = Arrangement.spacedBy(0.dp)) { Row(Modifier.fillMaxWidth()) { Text( @@ -448,7 +455,9 @@ private fun KmSplitBars(splits: List, blend: Blend) { style = androidx.compose.ui.graphics.drawscope.Stroke(w), ) } else if (best) drawRoundRect( - androidx.compose.ui.graphics.Brush.verticalGradient(listOf(blend.second, blend.first), startY = size.height - h, endY = size.height), + androidx.compose.ui.graphics.Brush.verticalGradient( + listOf(blend.second, blend.first), startY = size.height - h, endY = size.height, + ), Offset(0f, size.height - h), Size(size.width, h), corner, ) else drawRoundRect(blend.first.copy(alpha = 0.35f), Offset(0f, size.height - h), Size(size.width, h), corner) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveFrame.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveFrame.kt index 50271c65..9a26cd02 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveFrame.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveFrame.kt @@ -89,8 +89,10 @@ import org.openstrap.app.ui.theme.ScreenLight * middle and the two figures either side, in Display Light. The only two sizes on the workout pages no role has; a * live clock read at arm's length isn't one of spec 2.3's. */ -internal val LiveClock = GlowType.sentence.copy(fontSize = 46.sp, lineHeight = 50.sp, letterSpacing = (-0.02).em, fontFeatureSettings = "tnum") -internal val LiveFigure = GlowType.sentence.copy(fontSize = 24.sp, lineHeight = 28.sp, letterSpacing = (-0.02).em, fontFeatureSettings = "tnum") +internal val LiveClock = + GlowType.sentence.copy(fontSize = 46.sp, lineHeight = 50.sp, letterSpacing = (-0.02).em, fontFeatureSettings = "tnum") +internal val LiveFigure = + GlowType.sentence.copy(fontSize = 24.sp, lineHeight = 28.sp, letterSpacing = (-0.02).em, fontFeatureSettings = "tnum") /** What every live screen can do to the workout, passed down as one. */ @androidx.compose.runtime.Immutable @@ -157,7 +159,9 @@ internal fun LiveFrame( val landscape = LocalLiveLandscape.current // On its side the screen keeps a wider column than a page's, so the content and the controls fit side by side. CompositionLocalProvider(LocalPageColumn provides if (landscape) GlowLayout.MaxContentWidth else LocalPageColumn.current) { - WorkoutPage(ScreenLight(blend, lightAngle, lightStrength, heroCenterY = lightY), contentPadding, scroll = false, backdrop = backdrop) { + WorkoutPage( + ScreenLight(blend, lightAngle, lightStrength, heroCenterY = lightY), contentPadding, scroll = false, backdrop = backdrop, + ) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { RoundIcon(AppIcons.CaretDown, stringResource(R.string.workout_live_minimize), controls.onMinimize) if (quiet) { @@ -390,7 +394,10 @@ internal fun CenterAction(label: String, icon: androidx.compose.ui.graphics.vect Box(Modifier.height(88.dp), contentAlignment = Alignment.Center) { FlatButton(Color.White, 88.dp, onClick = onClick) { Icon(icon, label, tint = Color.Black, modifier = Modifier.size(30.dp)) } } - Text(label, color = Color.White, style = GlowType.secondary.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), maxLines = 1) + Text( + label, color = Color.White, + style = GlowType.secondary.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), maxLines = 1, + ) } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGlass.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGlass.kt index 56d4fbc5..b02a98f1 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGlass.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveGlass.kt @@ -44,6 +44,9 @@ import org.openstrap.app.ui.theme.litEdge import org.openstrap.app.ui.theme.tintedGlass import org.openstrap.app.ui.workout.ZONE_COLORS +/** The effort strip's bars, one per heart-rate zone. */ +private const val ZONE_BARS = 5 + /* * The glass the live screens share (Glow × Glass, boards LiveDistance to LiveGame): the hero is tinted glass in the * family's blend, every other card clear glass, and the heart rate's zone is only ever drawn small, as a dot and a @@ -53,7 +56,9 @@ import org.openstrap.app.ui.workout.ZONE_COLORS /** The live screen's hero: tinted glass in the family's [blend], 20 dp in from its edges. */ @Composable internal fun LiveHero( - blend: Blend, modifier: Modifier = Modifier, padding: PaddingValues = PaddingValues(start = 20.dp, top = 16.dp, end = 20.dp, bottom = 16.dp), + blend: Blend, + modifier: Modifier = Modifier, + padding: PaddingValues = PaddingValues(start = 20.dp, top = 16.dp, end = 20.dp, bottom = 16.dp), verticalArrangement: Arrangement.Vertical = Arrangement.Top, horizontalAlignment: Alignment.Horizontal = Alignment.Start, content: @Composable ColumnScope.() -> Unit, ) = Column( @@ -73,7 +78,7 @@ internal fun LiveStrip( /** A zone's flat colour as the small dot beside its name. */ @Composable -internal fun ZoneDot(zone: Int?, size: Dp = 8.dp, modifier: Modifier = Modifier) = +internal fun ZoneDot(zone: Int?, modifier: Modifier = Modifier, size: Dp = 8.dp) = Box(modifier.size(size).clip(CircleShape).background(zone?.let { ZONE_COLORS[it] } ?: Color.White)) /** @@ -101,7 +106,10 @@ internal fun LiveZoneStrip( if (zone != null) { ZoneDot(zone) Spacer(Modifier.width(7.dp)) - Text(WorkoutCopy.zoneLine(zone), color = Color.White, style = GlowType.secondary.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), maxLines = 1) + Text( + WorkoutCopy.zoneLine(zone), color = Color.White, + style = GlowType.secondary.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), maxLines = 1, + ) } else Text(WorkoutCopy.noZone(paused), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary, maxLines = 1) } } @@ -119,11 +127,14 @@ internal fun ZoneTrack(bpm: Int?, maxHr: Int, target: WorkoutTarget.Zones?, modi val gap = 3.dp val step = (maxWidth - gap * 4) / 5 Row(Modifier.align(Alignment.Center), horizontalArrangement = Arrangement.spacedBy(gap)) { - for (z in 0 until 5) { + for (z in 0 until ZONE_BARS) { val on = z == zone Box( Modifier.width(step).height(10.dp) - .then(if (on) Modifier.shadow(7.dp, GlowShapes.Pill, ambientColor = ZONE_COLORS[z], spotColor = ZONE_COLORS[z]) else Modifier) + .then( + if (on) Modifier.shadow(7.dp, GlowShapes.Pill, ambientColor = ZONE_COLORS[z], spotColor = ZONE_COLORS[z]) + else Modifier, + ) .clip(GlowShapes.Pill).background(ZONE_COLORS[z].copy(alpha = if (on) 1f else 0.26f)), ) } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt index 3e85d06b..9cd4ec62 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveHeart.kt @@ -124,7 +124,8 @@ fun GlowWorkoutLiveScreen( // way, so what a screen saves outlives a turn of the phone. val landscape = !split && maxWidth > maxHeight val cutout = if (!landscape) Modifier - else Modifier.background(org.openstrap.app.ui.theme.Ground).windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal)) + else Modifier.background(org.openstrap.app.ui.theme.Ground) + .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal)) CompositionLocalProvider(LocalLiveLandscape provides landscape) { Box(Modifier.fillMaxSize().then(cutout)) { when { @@ -191,6 +192,7 @@ internal fun KmSplitLine( private const val ARC_START = 150f private const val ARC_SWEEP = 240f private const val ARC_GAP = 8f +private const val ARC_GLOW_WIDTH = 2.2f /** * The five zones as segments of an arc open at the bottom, only the current one lit, with a marker where [bpm] sits @@ -211,8 +213,16 @@ internal fun ZoneArc(bpm: Int?, maxHr: Int, modifier: Modifier) { val start = ARC_START + z * (seg + ARC_GAP) val on = z == zone // The lit segment glows: a wide soft stroke of itself under it. - if (on) drawArc(ZONE_COLORS[z].copy(alpha = 0.3f), start, seg, false, topLeft, box, style = Stroke(stroke * 2.2f, cap = StrokeCap.Round)) - drawArc(ZONE_COLORS[z].copy(alpha = if (on) 1f else 0.4f), start, seg, false, topLeft, box, style = Stroke(stroke, cap = StrokeCap.Round)) + if (on) { + drawArc( + ZONE_COLORS[z].copy(alpha = 0.3f), start, seg, false, topLeft, box, + style = Stroke(stroke * ARC_GLOW_WIDTH, cap = StrokeCap.Round), + ) + } + drawArc( + ZONE_COLORS[z].copy(alpha = if (on) 1f else 0.4f), start, seg, false, topLeft, box, + style = Stroke(stroke, cap = StrokeCap.Round), + ) } if (bpm != null) { val a = Math.toRadians((ARC_START + WorkoutRecorder.zonePosition(bpm, maxHr, heartZones) * ARC_SWEEP).toDouble()) @@ -263,14 +273,20 @@ internal fun WorkoutHeartCard( modifier = Modifier.weight(1f), ) Spacer(Modifier.width(8.dp)) - Text(WorkoutCopy.zoneTime(zoneSeconds[zone]), color = Color.White.copy(alpha = 0.72f), style = GlowType.secondary, maxLines = 1) + Text( + WorkoutCopy.zoneTime(zoneSeconds[zone]), color = Color.White.copy(alpha = 0.72f), + style = GlowType.secondary, maxLines = 1, + ) } else Text(WorkoutCopy.noZone(r.paused), color = Color.White, style = GlowType.cardTitle, maxLines = 1) } BoxWithConstraints(Modifier.fillMaxWidth().then(if (fill) Modifier.weight(1f) else Modifier.height(220.dp))) { val now = recent.lastOrNull()?.first ?: (System.currentTimeMillis() / 1000) val values = remember(recent) { bucketRecent(recent, now) } if (values.any { it != null }) { - GlowLineChart(values, blend, Modifier.align(Alignment.BottomCenter).alpha(0.4f), height = 120.dp, showAverage = false) + GlowLineChart( + values, blend, Modifier.align(Alignment.BottomCenter).alpha(alpha = 0.4f), + height = 120.dp, showAverage = false, + ) } ZoneArc(bpm, r.maxHeartRate, Modifier.matchParentSize()) // Sized for three digits inside the arc, whatever the reading, so the number never spills past it @@ -282,8 +298,9 @@ internal fun WorkoutHeartCard( DotMatrixText(bpm.toString(), dot = DotSize.Live, scale = scale) Spacer(Modifier.height(8.dp)) Text( - if (zone != null) stringResource(R.string.workout_live_heart_range, zoneRange(zone, r.maxHeartRate).removeSuffix(" bpm")) - else stringResource(R.string.workout_live_unit_bpm), + if (zone != null) { + stringResource(R.string.workout_live_heart_range, zoneRange(zone, r.maxHeartRate).removeSuffix(" bpm")) + } else stringResource(R.string.workout_live_unit_bpm), color = Color.White.copy(alpha = 0.75f), style = GlowType.secondary, ) } else Text( @@ -300,7 +317,9 @@ internal fun WorkoutHeartCard( /** The time in the [zone] you're in on the left of the heart card's foot, and the target's progress on the right. */ @Composable -internal fun HeartNotes(r: WorkoutState.Recording, zone: Int?, zoneSeconds: ZoneSeconds, active: () -> Long, kcal: Float?, zoneTime: Boolean = true) { +internal fun HeartNotes( + r: WorkoutState.Recording, zone: Int?, zoneSeconds: ZoneSeconds, active: () -> Long, kcal: Float?, zoneTime: Boolean = true, +) { Row { if (zoneTime) zone?.let { PageNote(WorkoutCopy.zoneTime(zoneSeconds[it])) } Spacer(Modifier.weight(1f)) @@ -333,7 +352,10 @@ fun GlowWorkoutGlance( ) { val connected = connection is ConnectionState.Connected val active = activeSecondsState(r) - Box(modifier.background(org.openstrap.app.ui.theme.Ground).statusBarsPadding().padding(horizontal = GlowLayout.Gutter, vertical = 12.dp)) { + Box( + modifier.background(org.openstrap.app.ui.theme.Ground).statusBarsPadding() + .padding(horizontal = GlowLayout.Gutter, vertical = 12.dp), + ) { WorkoutHeartCard( r, liveHeartRate, recent, zoneSeconds, connected, { active.value }, Modifier.fillMaxSize(), fill = true, kcal = kcal?.active, ) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIndoor.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIndoor.kt index a31a0ebc..01ed0806 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIndoor.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIndoor.kt @@ -139,7 +139,13 @@ internal fun ZoneTimeBar(zoneSeconds: ZoneSeconds, current: Int?, target: Workou val on = z == current Box( Modifier.width(room * (weights[z] / sum)).height(10.dp) - .then(if (on) Modifier.shadow(7.dp, GlowShapes.Pill, ambientColor = ZONE_COLORS[z], spotColor = ZONE_COLORS[z]) else Modifier) + .then( + if (on) { + Modifier.shadow(7.dp, GlowShapes.Pill, ambientColor = ZONE_COLORS[z], spotColor = ZONE_COLORS[z]) + } else { + Modifier + }, + ) .clip(GlowShapes.Pill) .background(if (s == 0) Color.White.copy(alpha = 0.18f) else ZONE_COLORS[z].copy(alpha = if (on) 1f else 0.7f)), ) @@ -150,13 +156,17 @@ internal fun ZoneTimeBar(zoneSeconds: ZoneSeconds, current: Int?, target: Workou val hi = target.high.coerceIn(lo, 4) val start = (0 until lo).sumOf { (room * (weights[it] / sum)).value.toDouble() + gap.value }.dp val width = (lo..hi).sumOf { (room * (weights[it] / sum)).value.toDouble() }.dp + gap * (hi - lo) - Box(Modifier.offset(x = start - 3.dp).width(width + 6.dp).height(16.dp).border(1.5.dp, Color.White.copy(alpha = 0.7f), GlowShapes.Tile)) + Box( + Modifier.offset(x = start - 3.dp).width(width + 6.dp).height(16.dp) + .border(1.5.dp, Color.White.copy(alpha = 0.7f), GlowShapes.Tile), + ) } } if (labels) Row(Modifier.fillMaxWidth().padding(top = 6.dp)) { zoneSeconds.forEachIndexed { z, s -> Text( - if (s >= 60) "${s / 60}" else "", color = Color.White.copy(alpha = 0.72f), style = GlowType.caption, + if (s >= SECONDS_PER_MINUTE) "${s / SECONDS_PER_MINUTE}" else "", + color = Color.White.copy(alpha = 0.72f), style = GlowType.caption, textAlign = androidx.compose.ui.text.style.TextAlign.Center, maxLines = 1, modifier = Modifier.weight(weights[z]), ) } @@ -164,12 +174,17 @@ internal fun ZoneTimeBar(zoneSeconds: ZoneSeconds, current: Int?, target: Workou } } +private const val SECONDS_PER_MINUTE = 60 + /** "Time in zones" and the target on clear glass over [ZoneTimeBar] (board LiveIndoor): the strip that follows the arc. */ @Composable internal fun TimeInZonesCard(zoneSeconds: ZoneSeconds, current: Int?, target: WorkoutTarget.Zones?) { LiveStrip(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp)) { Row(verticalAlignment = Alignment.CenterVertically) { - Text(stringResource(R.string.workout_live_time_in_zones), color = Color.White, style = GlowType.cardTitle, maxLines = 1, modifier = Modifier.weight(1f)) + Text( + stringResource(R.string.workout_live_time_in_zones), color = Color.White, style = GlowType.cardTitle, + maxLines = 1, modifier = Modifier.weight(1f), + ) if (target != null) Text( if (target.low == target.high) stringResource(R.string.workout_live_target_short_zone, target.low + 1) else stringResource(R.string.workout_live_target_short_zones, target.low + 1, target.high + 1), diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIntervals.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIntervals.kt index 1e2b89f1..49ec5823 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIntervals.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveIntervals.kt @@ -54,7 +54,6 @@ import org.openstrap.app.ui.workout.StartCopy import org.openstrap.app.presentation.WorkoutCopy import org.openstrap.app.ui.workout.ZONE_COLORS import org.openstrap.app.ui.workout.intervalMoment -import org.openstrap.app.ui.dashboard.LocalHeartZones import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import org.openstrap.app.R @@ -85,7 +84,6 @@ internal fun LiveIntervalsScreen( split: Boolean = false, compact: Boolean = false, ) { - val heartZones = LocalHeartZones.current val now = nowTickingState() val connected = connection is ConnectionState.Connected val bpm = liveHeartRate.takeIf { connected && !r.paused } @@ -168,7 +166,9 @@ internal fun LiveIntervalsScreen( ) } if (!split && (m.phase is Phase.Rest || m.phase == Phase.Done)) RoundPeaks(r.rounds, m.rounds) - if (!split && m.phase !is Phase.Rest) LiveStrip(Modifier.fillMaxWidth()) { LiveZoneStrip(bpm, r.maxHeartRate, r.paused, connected, null) } + if (!split && m.phase !is Phase.Rest) { + LiveStrip(Modifier.fillMaxWidth()) { LiveZoneStrip(bpm, r.maxHeartRate, r.paused, connected, null) } + } val tall = if (compact) 48.dp else 64.dp when (m.phase) { Phase.WarmUp -> WorkoutButton( @@ -246,7 +246,10 @@ private fun ColumnScope.PhaseFigure( bar: @Composable () -> Unit = {}, ) { Row(Modifier.fillMaxWidth().padding(horizontal = 4.dp)) { - Text(where, color = Color.White, style = GlowType.body.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), modifier = Modifier.weight(1f)) + Text( + where, color = Color.White, + style = GlowType.body.copy(fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold), modifier = Modifier.weight(1f), + ) Text(next, color = Color.White.copy(alpha = 0.8f), style = GlowType.secondary) } bar() @@ -259,7 +262,10 @@ private fun ColumnScope.PhaseFigure( return } // A dark card so the phase's light shows round it and the seconds sit on glass, not on the colour. - LiveDarkCard(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically)) { + LiveDarkCard( + Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically), + ) { Text(word, color = Color.White, style = GlowType.phaseWord) if (seconds != null) DotMatrixText(seconds, dot = DotSize.Live) if (line.isNotEmpty()) Text(line, color = Color.White.copy(alpha = GlowType.SECONDARY_ALPHA), style = GlowType.body, textAlign = TextAlign.Center) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveSets.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveSets.kt index be7a7bcb..bbdeba20 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveSets.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/live/LiveSets.kt @@ -81,7 +81,6 @@ import androidx.compose.ui.graphics.graphicsLayer import org.openstrap.app.presentation.WorkoutCopy import org.openstrap.app.ui.workout.ZONE_COLORS import org.openstrap.app.ui.workout.strengthMoment -import org.openstrap.app.ui.dashboard.LocalHeartZones import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import org.openstrap.app.R @@ -118,7 +117,6 @@ internal fun LiveStrengthScreen( onLog: (index: Int, exercise: String?, reps: Int, kg: Float) -> Unit, compact: Boolean = false, ) { - val heartZones = LocalHeartZones.current val now = nowTickingState() val connected = connection is ConnectionState.Connected val bpm = liveHeartRate.takeIf { connected && !r.paused } @@ -145,7 +143,9 @@ internal fun LiveStrengthScreen( lap = if (!r.paused) ({ PauseSideButton(controls.onPause) }) else null, center = when { r.inSet -> ({ CenterAction(stringResource(R.string.workout_live_sets_set_done), AppIcons.Tick02, tapSetDone) }) - else -> ({ CenterAction(stringResource(R.string.workout_live_sets_start_set, steady.setNumber), AppIcons.PlayFill, onStartSet) }) + else -> ({ + CenterAction(stringResource(R.string.workout_live_sets_start_set, steady.setNumber), AppIcons.PlayFill, onStartSet) + }) }, paused = { LivePaused(r, liveHeartRate.takeIf { connected }, history, listOf( momentNow().done.let { done -> done.toString() to pluralStringResource(R.plurals.workout_live_figure_sets_done, done) }, @@ -156,7 +156,9 @@ internal fun LiveStrengthScreen( val moment = steady if (compact) CompactCard(r, moment, momentNow, blend, onName = { naming = true }, onAdd30 = onExtendRest) else when { r.inSet -> SetCard(r, moment.setNumber, { momentNow().setSeconds }, blend) { naming = true } - r.resting -> RestCard(r, { momentNow().restLeft ?: 0 }, moment.done, moment.setNumber, r.exercise, moment.nextLoad, blend, onExtendRest) + r.resting -> RestCard( + r, { momentNow().restLeft ?: 0 }, moment.done, moment.setNumber, r.exercise, moment.nextLoad, blend, onExtendRest, + ) else -> ReadyCard(r, moment.setNumber, blend) { naming = true } } if (!compact) { @@ -167,7 +169,8 @@ internal fun LiveStrengthScreen( } Spacer(Modifier.weight(1f)) val setsTarget = r.workout.setsTarget - if (!compact && setsTarget != null && moment.done >= setsTarget && !r.inSet) { + val showAllDone = !compact && !r.inSet + if (showAllDone && setsTarget != null && moment.done >= setsTarget) { Text( pluralStringResource(R.plurals.workout_live_sets_all_done, setsTarget, setsTarget), color = Color.White.copy(alpha = 0.6f), style = GlowType.secondary, modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center, @@ -261,7 +264,14 @@ private fun ReadyCard(r: WorkoutState.Recording, number: Int, blend: Blend, onNa */ @Composable private fun RestCard( - r: WorkoutState.Recording, left: () -> Long, done: Int, number: Int, exercise: String?, load: String?, blend: Blend, onAdd30: () -> Unit, + r: WorkoutState.Recording, + left: () -> Long, + done: Int, + number: Int, + exercise: String?, + load: String?, + blend: Blend, + onAdd30: () -> Unit, ) { LiveHero(blend) { Row { @@ -280,7 +290,11 @@ private fun RestCard( val total = ((r.restUntil ?: 0) - (r.sets.lastOrNull()?.end ?: r.restUntil ?: 0)).coerceAtLeast(1) val track = Color.White.copy(alpha = 0.12f) Box(Modifier.fillMaxWidth().height(4.dp).clip(GlowShapes.Pill).background(track)) { - Box(Modifier.fillMaxHeight().fillMaxWidth().graphicsLayer { scaleX = (left().toFloat() / total).coerceIn(0f, 1f); transformOrigin = androidx.compose.ui.graphics.TransformOrigin(0f, 0.5f) }.background(blend.chart)) + val drain = Modifier.fillMaxHeight().fillMaxWidth().graphicsLayer { + scaleX = (left().toFloat() / total).coerceIn(0f, 1f) + transformOrigin = androidx.compose.ui.graphics.TransformOrigin(pivotFractionX = 0f, pivotFractionY = 0.5f) + } + Box(drain.background(blend.chart)) } Spacer(Modifier.height(14.dp)) Row(verticalAlignment = Alignment.CenterVertically) { @@ -316,7 +330,8 @@ private fun RestHeart(r: WorkoutState.Recording, bpm: Int?, drop: Int?, history: DotMatrixText(bpm.toString(), dot = DotSize.Edge) Spacer(Modifier.width(8.dp)) Text( - drop?.takeIf { it > 0 }?.let { stringResource(R.string.workout_live_bpm_down, bpm, it) } ?: stringResource(R.string.workout_live_bpm, bpm), + drop?.takeIf { it > 0 }?.let { stringResource(R.string.workout_live_bpm_down, bpm, it) } + ?: stringResource(R.string.workout_live_bpm, bpm), color = Color.White, style = GlowType.secondary, ) } else Text(WorkoutCopy.noHeartRate(r.paused), color = Color.White, style = GlowType.sentence) @@ -397,7 +412,8 @@ private fun SetDots(done: Int, target: Int?, inSet: Boolean, modifier: Modifier private fun ExercisePill(name: String?, onClick: () -> Unit) { val shape = GlowShapes.Pill Row( - Modifier.clip(shape).background(Color.White.copy(alpha = 0.12f)).pressClickable(onClick, shape).padding(start = 14.dp, end = 10.dp, top = 8.dp, bottom = 8.dp), + Modifier.clip(shape).background(Color.White.copy(alpha = 0.12f)).pressClickable(onClick, shape) + .padding(start = 14.dp, end = 10.dp, top = 8.dp, bottom = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { Text( @@ -414,8 +430,12 @@ private fun DoneSets(sets: List, history: List>) val done = sets.filter { it.end != null }.asReversed() if (done.isEmpty()) return // The peaks scan the readings, so they're worked out when a set or the readings change, not on every pass. - val lines = remember(done, history) { done.take(4).map { s -> WorkoutCopy.setLine(s, Strength.peak(history, s.start, s.end!!)) } } - LiveStrip(Modifier.fillMaxWidth(), padding = PaddingValues(horizontal = 18.dp, vertical = 4.dp), verticalArrangement = Arrangement.Top) { + val lines = remember(done, history) { + done.take(4).map { s -> WorkoutCopy.setLine(s, Strength.peak(history, s.start, s.end!!)) } + } + LiveStrip( + Modifier.fillMaxWidth(), padding = PaddingValues(horizontal = 18.dp, vertical = 4.dp), verticalArrangement = Arrangement.Top, + ) { done.take(4).forEachIndexed { i, s -> if (i > 0) SetRule() Row(Modifier.fillMaxWidth().padding(vertical = 14.dp)) { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LevelPictures.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LevelPictures.kt index d286e75a..6fe6c706 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LevelPictures.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LevelPictures.kt @@ -31,8 +31,8 @@ import kotlin.math.min * The level and count pictures (spec 2.7): a week of dots through your band, a level fill over your usual band, a * countdown ring, blocks, day bars, a range fill, a split bar, week rings and the age scale. Each draws in its metric's * blend (Charts board: the first colour at the start or base, the second on the answer, in the blend's chart tones; - * the v2 `ink` overloads find it with [chartBlend]) and fills its modifier, about 136 by 60 dp on a Small and 324 by 70 on a Wide. Solid only: no dashes, and no dots - * but the week's own. + * the v2 `ink` overloads find it with [chartBlend]) and fills its modifier, about 136 by 60 dp on a Small and 324 by 70 + * on a Wide. Solid only: no dashes, and no dots but the week's own. * * The geometry is in plain functions below each picture, so it can be tested without drawing. Fractions run 0 to 1 * across the picture, y from the top. The rim functions turn those into fractions of the card ([Rim]), assuming the @@ -84,11 +84,17 @@ internal fun share(v: Float, from: Float, to: Float): Float = private fun ClosedFloatingPointRange.holds(v: Float) = v in this +private const val MIN_SWEEP_SHARE = 0.001f + /** A bar [h] high centred at [cy] from [x0] to [x1], each end rounded fully or to [inner] when [roundStart]/[roundEnd] say not. */ private fun DrawScope.bar(color: Color, x0: Float, x1: Float, cy: Float, h: Float, roundStart: Boolean = true, roundEnd: Boolean = true, inner: Float = 0f) = bar(SolidColor(color), x0, x1, cy, h, roundStart, roundEnd, inner) -private fun DrawScope.bar(brush: Brush, x0: Float, x1: Float, cy: Float, h: Float, roundStart: Boolean = true, roundEnd: Boolean = true, inner: Float = 0f, alpha: Float = 1f) { +@Suppress("LongParameterList") // a private draw helper: the bar's span, height, round ends and inner radius +private fun DrawScope.bar( + brush: Brush, x0: Float, x1: Float, cy: Float, h: Float, + roundStart: Boolean = true, roundEnd: Boolean = true, inner: Float = 0f, alpha: Float = 1f, +) { if (x1 - x0 <= 0f) return val r = min(h / 2, (x1 - x0) / 2) val s = CornerRadius(if (roundStart) r else min(inner, r)) @@ -103,7 +109,7 @@ private fun Blend.across(x0: Float, x1: Float): Brush = /** A sweep from the first colour at the top of a ring (drawn after a -90 degree turn) to the second at [share] of the way round. */ private fun Blend.sweep(share: Float, center: Offset): Brush = Brush.sweepGradient( - 0f to chart, share.coerceIn(0.001f, 1f) to chartSecond, 1f to chartSecond, center = center, + 0f to chart, share.coerceIn(MIN_SWEEP_SHARE, 1f) to chartSecond, 1f to chartSecond, center = center, ) // ---- 1. Week of dots through your band --------------------------------------------------------------------------- @@ -244,7 +250,10 @@ fun LevelFill(value: Float, usual: ClosedFloatingPointRange?, blend: Blen bar(Track, x(0f), x(1f), cy, barH) if (g.bandStart != null && g.bandEnd != null) { val bandH = 16.dp.toPx() - drawRoundRect(blend.chart.copy(alpha = ChartInk.LEVEL_BAND_ALPHA), Offset(x(g.bandStart), cy - bandH / 2), Size(x(g.bandEnd) - x(g.bandStart), bandH), CornerRadius(5.dp.toPx())) + drawRoundRect( + blend.chart.copy(alpha = ChartInk.LEVEL_BAND_ALPHA), Offset(x(g.bandStart), cy - bandH / 2), + Size(x(g.bandEnd) - x(g.bandStart), bandH), CornerRadius(5.dp.toPx()), + ) } val end = max(x(g.value), x(0f) + barH) bar(blend.across(x(0f), end), x(0f), end, cy, barH) @@ -466,7 +475,10 @@ fun SplitBar(parts: List, blend: Blend, size: PictureSize, modifier: Modi val cy = this.size.height / 2 val laid = splitBarParts(parts, this.size.width, 2.dp.toPx()) laid.forEachIndexed { k, p -> - bar(blend.across(0f, this.size.width), p.start, p.end, cy, h, alpha = splitAlpha(p.rank), roundStart = k == 0, roundEnd = k == laid.lastIndex, inner = 3.dp.toPx()) + bar( + blend.across(0f, this.size.width), p.start, p.end, cy, h, alpha = splitAlpha(p.rank), + roundStart = k == 0, roundEnd = k == laid.lastIndex, inner = 3.dp.toPx(), + ) } } } diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LinePictures.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LinePictures.kt index 33ff240a..7edbc94c 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LinePictures.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/LinePictures.kt @@ -154,7 +154,10 @@ fun DayLine( val bandTop = band?.let { y(it.endInclusive) } val bandBottom = band?.let { y(it.start) } if (band != null && bandTop != null && bandBottom != null) { - drawRoundRect(blend.normalBand(), Offset(0f, bandTop), Size(this.size.width, (bandBottom - bandTop).coerceAtLeast(1f)), CornerRadius(4.dp.toPx())) + drawRoundRect( + blend.normalBand(), Offset(0f, bandTop), Size(this.size.width, (bandBottom - bandTop).coerceAtLeast(1f)), + CornerRadius(4.dp.toPx()), + ) } // Runs of readings, a gap starting a new run: a smooth line each, a lone reading a dot. val runs = mutableListOf>(mutableListOf()) @@ -231,7 +234,10 @@ fun DayStrip(levels: List, blend: Blend, size: PictureSize, modifier: Mo // Each stretch reaches a hair over the next so no seam shows between them. stretches.forEach { s -> val level = ((s.alpha - 0.15f) / 0.85f).coerceIn(0f, 1f) - drawRect(lerp(blend.chart, blend.chartSecond, level).copy(alpha = s.alpha), Offset(s.x0 * this.size.width, top), Size((s.x1 - s.x0) * this.size.width + 0.5f, h)) + drawRect( + lerp(blend.chart, blend.chartSecond, level).copy(alpha = s.alpha), Offset(s.x0 * this.size.width, top), + Size((s.x1 - s.x0) * this.size.width + 0.5f, h), + ) } } } @@ -312,7 +318,10 @@ fun TempDial( // Compose sweeps clockwise from 3 o'clock with y down, so a maths angle a is at -a. val from = -dialAngle(normal.start) val to = -dialAngle(normal.endInclusive) - drawArc(blend.chart.copy(alpha = ChartInk.LEVEL_BAND_ALPHA), from, to - from, false, corner, box, style = Stroke(bandW, cap = StrokeCap.Round)) + drawArc( + blend.chart.copy(alpha = ChartInk.LEVEL_BAND_ALPHA), from, to - from, false, corner, box, + style = Stroke(bandW, cap = StrokeCap.Round), + ) } if (deviation != null) { val angle = dialAngle(deviation) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/Pictures.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/Pictures.kt index 970c1f2c..fe40a25d 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/Pictures.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/pictures/Pictures.kt @@ -2,9 +2,11 @@ package org.openstrap.app.ui.glow.pictures /* * The pictures a picture card draws (spec 2.7), one composable per kind in [org.openstrap.app.ui.dashboard.PictureKind]. - * Each draws in its metric's blend (Charts board, chart tones: first colour at the start or base, second on the answer; a v2 ink finds its blend through chartBlend, and every picture also takes a Blend) at a Small or a Wide, never dotted or dashed, and says where its off part sits so the - * card's rim lights there ([org.openstrap.app.ui.glow.Rim]). Line-like pictures live in LinePictures.kt, levels and - * counts in LevelPictures.kt. The debug gallery shows every one: `--es section pictures`. + * Each draws in its metric's blend (Charts board, chart tones: first colour at the start or base, second on the answer; + * a v2 ink finds its blend through chartBlend, and every picture also takes a Blend) at a Small or a Wide, never dotted + * or dashed, and says where its off part sits so the card's rim lights there ([org.openstrap.app.ui.glow.Rim]). + * Line-like pictures live in LinePictures.kt, levels and counts in LevelPictures.kt. + * The debug gallery shows every one: `--es section pictures`. */ /** How big a picture is drawn: on a Small (176 by 160 dp) or across a Wide. */ diff --git a/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt b/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt index 3555587c..12e0b28e 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/root/TabsPager.kt @@ -202,11 +202,13 @@ internal fun TabsPager( userScrollEnabled = !subScreenOpen, key = { it }, beyondViewportPageCount = Tab.entries.size - 1, ) { page -> val back = if (page == tab) emptyArray() else arrayOf(LocalNavigationEventDispatcherOwner provides idleBack) - @Suppress("SpreadOperator") // at most one local, once per page val tabLights = org.openstrap.app.ui.theme.LocalTabLights.current + @Suppress("SpreadOperator") // at most one local, once per page CompositionLocalProvider( org.openstrap.app.ui.theme.LocalScreenLightReport provides remember(tabLights, page) { - { l: org.openstrap.app.ui.theme.ScreenLight? -> if (tabLights != null && tabLights.lights[page] != l) tabLights.lights[page] = l } + { l: org.openstrap.app.ui.theme.ScreenLight? -> + if (tabLights != null && tabLights.lights[page] != l) tabLights.lights[page] = l + } }, // Remembered: a new lambda each time would be a new static local, recomposing the whole tab under it. LocalGlowPagePaused provides remember(pager, page, covered) { tabPaused(pager, page, covered) }, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt index 2b5a93e3..7561f237 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Blends.kt @@ -120,18 +120,26 @@ internal fun chartTone(c: Color, on: Color = ChartGlass, target: Float = 4.5f): if (contrast(c, on) >= target) return c val (h, s, l) = hsl(c) var light = l + var tone = Color.White while (light < 1f) { - light = min(1f, light + 0.01f) + light = min(1f, light + TONE_STEP) val next = Color.hsl(h, s, light) - if (contrast(next, on) >= target) return next + if (contrast(next, on) >= target) { + tone = next + break + } } - return Color.White + return tone } +private const val TONE_STEP = 0.01f +private const val MUTED_SATURATION = 0.6f +private const val MUTED_LIGHTNESS = 0.4f + /** [c] for the screen's light: same hue, 60% of its saturation, 40% lightness (Matrix board). */ internal fun muted(c: Color): Color { val (h, s, _) = hsl(c) - return Color.hsl(h, s * 0.6f, 0.4f) + return Color.hsl(h, s * MUTED_SATURATION, MUTED_LIGHTNESS) } internal fun hsl(c: Color): Triple { diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt index 6383e5b9..3e638e4b 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Materials.kt @@ -87,13 +87,15 @@ fun Modifier.solidLight(blend: Blend, level: Float = 1f, shape: Shape = GlowShap edge to blend.second, 1f to blend.first, ) // A dark pool behind the number, upper left, as the boards' radial-gradient. + val poolCenter = Offset(size.width * 0.3f, size.height * 0.22f) + val poolSquash = 0.52f / 1.1f val pool = Brush.radialGradient( 0f to DarkGlowFill.copy(alpha = 0.97f), 0.5f to DarkGlowFill.copy(alpha = 0.88f), 1f to Color.Transparent, - center = Offset(size.width * 0.3f, size.height * 0.22f), radius = size.width * 1.1f, + center = poolCenter, radius = size.width * 1.1f, ) onDrawBehind { drawOutline(outline, fill) - scale(1f, 0.52f / 1.1f, pivot = Offset(size.width * 0.3f, size.height * 0.22f)) { drawOutline(outline, pool) } + scale(1f, poolSquash, pivot = poolCenter) { drawOutline(outline, pool) } } }.litEdge(shape, top = 0.25f, ring = 0.05f) @@ -134,6 +136,7 @@ data class ScreenLight(val blend: Blend, val angle: Float = 225f, val strength: } /** The light a screen is lit by, for parts (sheets, the nav bar) that want to know. Null when the screen has none. */ +@Suppress("CompositionLocalAllowlist", "ComposeCompositionLocalUsage") // a design token the sheets and nav bar read val LocalScreenLight = compositionLocalOf { null } /** @@ -152,6 +155,11 @@ val LocalScreenLightReport = androidx.compose.runtime.staticCompositionLocalOf<( /** The boards' blob opacity at full strength. */ private const val LIGHT_OPACITY = 0.6f +/** The two blobs' widths (as a share of the screen width) and the second one's strength next to the first. */ +private const val FIRST_BLOB_RX = 0.82f +private const val SECOND_BLOB_RX = 0.51f +private const val SECOND_BLOB_STRENGTH = 0.9f + /** * Draws [light] behind this (fixed to the screen, not scrolled), over [Ground]. With no light, just the ground: "no * light until there's a hero to light" (Matrix board, No data yet). @@ -165,8 +173,14 @@ fun Modifier.screenLight(light: ScreenLight?): Modifier = clipToBounds().drawBeh val heroY = light.heroCenterY.dp.toPx() val reachX = w * 0.32f; val reachY = 90.dp.toPx() val a = light.strength * LIGHT_OPACITY - blob(Offset(w / 2 + vx * reachX, heroY + vy * reachY), w * 0.82f + 120.dp.toPx(), 260.dp.toPx() + 120.dp.toPx(), light.blend.light, a) - blob(Offset(w / 2 - vx * reachX, heroY - vy * reachY + 360.dp.toPx()), w * 0.51f + 120.dp.toPx(), 190.dp.toPx() + 120.dp.toPx(), light.blend.lightSecond, a * 0.9f) + blob( + Offset(w / 2 + vx * reachX, heroY + vy * reachY), w * FIRST_BLOB_RX + 120.dp.toPx(), 260.dp.toPx() + 120.dp.toPx(), + light.blend.light, a, + ) + blob( + Offset(w / 2 - vx * reachX, heroY - vy * reachY + 360.dp.toPx()), w * SECOND_BLOB_RX + 120.dp.toPx(), + 190.dp.toPx() + 120.dp.toPx(), light.blend.lightSecond, a * SECOND_BLOB_STRENGTH, + ) } /** A blurred ellipse [rx] by [ry] around [c]: what the boards draw as a circle under `filter: blur(120px)`. */ diff --git a/app/src/main/kotlin/org/openstrap/app/ui/theme/Shapes.kt b/app/src/main/kotlin/org/openstrap/app/ui/theme/Shapes.kt index f518581c..19627bc7 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/theme/Shapes.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/theme/Shapes.kt @@ -1,3 +1,5 @@ +@file:Suppress("MatchingDeclarationName") // the file is the theme's Shapes; the object is the one shape set + package org.openstrap.app.ui.theme import androidx.compose.foundation.shape.RoundedCornerShape @@ -18,7 +20,8 @@ object GlowShapes { val Card: CornerBasedShape = SquircleShape(radius = 28.dp, smoothing = SMOOTHING) /** Sheets: the top corners only. */ - val Sheet: CornerBasedShape = SquircleShape(topStart = 28.dp, topEnd = 28.dp, bottomStart = 0.dp, bottomEnd = 0.dp, smoothing = SMOOTHING) + val Sheet: CornerBasedShape = + SquircleShape(topStart = 28.dp, topEnd = 28.dp, bottomStart = 0.dp, bottomEnd = 0.dp, smoothing = SMOOTHING) /** Tiles inside a card. */ val Tile: CornerBasedShape = SquircleShape(radius = 16.dp, smoothing = SMOOTHING) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/zepp/ZeppSignIn.kt b/app/src/main/kotlin/org/openstrap/app/ui/zepp/ZeppSignIn.kt index c7c18be7..31669806 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/zepp/ZeppSignIn.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/zepp/ZeppSignIn.kt @@ -243,7 +243,11 @@ fun ZeppSignInDialog( } } +private const val HERO_ANGLE = 200f +private const val HERO_MID_STOP = 0.55f + @Composable +@Suppress("CyclomaticComplexMethod") // one card of rows, each shown or not by what the account lists private fun FoundStrap( listing: DeviceListing, confirmLabel: String, @@ -257,7 +261,12 @@ private fun FoundStrap( Column(Modifier.verticalScroll(rememberScrollState()).padding(GlowLayout.Gutter), verticalArrangement = Arrangement.spacedBy(12.dp)) { Column( Modifier.fillMaxWidth().clip(GlowShapes.Card) - .placeHero(200f, 0f to Blends.Strap.first.copy(alpha = 0.42f), 0.55f to Blends.Strap.second.copy(alpha = 0.16f), 1f to Color.White.copy(alpha = 0.05f)) + .placeHero( + HERO_ANGLE, + 0f to Blends.Strap.first.copy(alpha = 0.42f), + HERO_MID_STOP to Blends.Strap.second.copy(alpha = 0.16f), + 1f to Color.White.copy(alpha = 0.05f), + ) .padding(start = 20.dp, end = 20.dp, top = 18.dp, bottom = 10.dp), ) { Row(Modifier.fillMaxWidth().padding(bottom = 12.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp)) { @@ -314,10 +323,13 @@ private fun FoundStrap( } PageNote(stringResource(R.string.you_zepp_token_stays)) PageButton( - if (canConfirm) confirmLabel else stringResource(R.string.you_zepp_keep_sign_in), { onConfirm(strap) }, Modifier.fillMaxWidth().height(52.dp), - primary = true, icon = if (canConfirm) AppIcons.Bluetooth else null, + if (canConfirm) confirmLabel else stringResource(R.string.you_zepp_keep_sign_in), { onConfirm(strap) }, + Modifier.fillMaxWidth().height(52.dp), primary = true, icon = if (canConfirm) AppIcons.Bluetooth else null, + ) + PageButton( + stringResource(R.string.you_zepp_other_account), onOtherAccount, Modifier.fillMaxWidth().height(52.dp), + icon = AppIcons.User, ) - PageButton(stringResource(R.string.you_zepp_other_account), onOtherAccount, Modifier.fillMaxWidth().height(52.dp), icon = AppIcons.User) if (!canConfirm && requireKey) ComputerGuideButton() } } diff --git a/app/src/main/kotlin/org/openstrap/app/widget/WidgetParts.kt b/app/src/main/kotlin/org/openstrap/app/widget/WidgetParts.kt index 1a2ea82f..0955614f 100644 --- a/app/src/main/kotlin/org/openstrap/app/widget/WidgetParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/widget/WidgetParts.kt @@ -445,7 +445,10 @@ internal fun TopRowView(title: String, note: String?, top: TopRow, f: WidgetFram top.words?.let { Spacer(GlanceModifier.width(StatusButton.TITLE_GAP_DP.dp)) // Decision 6: an amber dot, the words in white, never amber text. - Image(ImageProvider(dotBitmap(MetricColors.warn, f.density)), contentDescription = null, modifier = GlanceModifier.size(StartLayout.DOT_DP.dp)) + Image( + ImageProvider(dotBitmap(MetricColors.warn, f.density)), contentDescription = null, + modifier = GlanceModifier.size(StartLayout.DOT_DP.dp), + ) Spacer(GlanceModifier.width(4.dp)) Text(it, style = StatusWords, maxLines = 1) Spacer(GlanceModifier.width(StatusButton.WORDS_GAP_DP.dp)) From 584f09fc296fc2338ecbeaabfa11279e305b75fe Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:31:27 +0400 Subject: [PATCH 23/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20lint=20clean-up?= =?UTF-8?q?=20(zh=20strings,=20unused=20strings,=20chart=20list=20params,?= =?UTF-8?q?=20modifier=20defaults)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 5.5 --- .../kotlin/org/openstrap/app/ui/device/DeviceScreen.kt | 2 +- .../org/openstrap/app/ui/device/HealthConnectPage.kt | 2 +- .../kotlin/org/openstrap/app/ui/device/PlaceParts.kt | 2 +- .../kotlin/org/openstrap/app/ui/glow/GlowCharts.kt | 7 +++++++ .../main/res/values-zh-rCN/strings_workout_live.xml | 9 ++++----- app/src/main/res/values/strings_workout_live.xml | 10 ---------- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt index 13e80b3f..19b6c0ee 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/DeviceScreen.kt @@ -370,7 +370,7 @@ private tailrec fun android.content.Context.findActivity(): android.app.Activity * battery-optimization prompt. */ @Composable -private fun KeepConnectedTile(vm: DeviceViewModel, keepConnected: KeepConnected, address: String, modifier: Modifier) { +private fun KeepConnectedTile(vm: DeviceViewModel, keepConnected: KeepConnected, address: String, modifier: Modifier = Modifier) { val context = LocalContext.current val associated by vm.companionAssociated.collectAsStateWithLifecycle() val ignoringBattery by vm.ignoringBatteryOptimizations.collectAsStateWithLifecycle() diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt index 07a3454f..909aad06 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/HealthConnectPage.kt @@ -46,7 +46,7 @@ import org.openstrap.app.ui.theme.AppIcons * rows' toasts can't hold one. */ // A whole page, placed by the page host like the Strap page's others, so there's nothing for a caller to modify. -@Suppress("ModifierMissing") +@Suppress("ModifierMissing", "ComposeModifierMissing") @Composable fun HealthConnectPage( auto: HealthConnectAuto, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt b/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt index 1339bcb5..361117ec 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/device/PlaceParts.kt @@ -110,7 +110,7 @@ internal fun Modifier.strapHero(blend: Blend = Blends.Strap): Modifier = placeHe /** A hero card of a place's page: tinted glass of [lookModifier], padded 20 dp, [onClick] makes the whole card a button. */ @Composable -@Suppress("ModifierWithoutDefault") // the look is the card's design, always passed by the caller +@Suppress("ModifierWithoutDefault", "ComposeModifierWithoutDefault") // the look is the card's design, always passed by the caller internal fun PlaceHero( lookModifier: Modifier, modifier: Modifier = Modifier, diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt index 7ee4f79a..a1fa8d34 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt @@ -362,6 +362,7 @@ fun GlowBars( ) /** [GlowBars] in [blend]. [othersAlpha] dims the columns that aren't the [highlight] (1 draws every bar in full, as the board does). */ +@Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable fun GlowBars( values: List, @@ -433,6 +434,7 @@ fun GlowTrend( ) = GlowTrend(days, remember(color) { chartBlend(color) }, modifier, height, average) /** [GlowTrend] in [blend]. */ +@Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable fun GlowTrend( days: List, @@ -673,6 +675,7 @@ data class GlowStage(val from: Float, val to: Float, val row: Int) * Sleep stages as white pills on hairline rows (row 0 at the top, e.g. Awake), joined by thin connectors, deeper rows * drawn brighter so deep sleep stands out on the dark core; or, with [rowColors], as solid bands in the stage colours. */ +@Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable fun GlowHypnogram( stages: List, @@ -762,6 +765,7 @@ fun GhostLine(today: List, color: Color, max: Float, modifier: Modifier GhostLine(today, remember(color) { chartBlend(color) }, max, modifier, usual, height) /** [GhostLine] in [blend]: today's line runs from the first colour to the second, which lands on the end dot. */ +@Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable fun GhostLine(today: List, blend: Blend, max: Float, modifier: Modifier = Modifier, usual: List? = null, height: Dp = 56.dp) { Spacer( @@ -792,6 +796,7 @@ fun TrendDots(values: List, modifier: Modifier = Modifier, height: Dp = 52 TrendDots(values, remember(color) { chartBlend(color) }, modifier, height, band) /** [TrendDots] in [blend]: days inside your normal dim in the first colour, those outside and today in the second. */ +@Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable fun TrendDots(values: List, blend: Blend, modifier: Modifier = Modifier, height: Dp = 52.dp, band: ClosedFloatingPointRange? = null) { Canvas(modifier.fillMaxWidth().height(height)) { @@ -829,6 +834,7 @@ fun TrendDots(values: List, blend: Blend, modifier: Modifier = Modifier, h * otherwise spread across. Holding scrubs: [onScrub] gets the point under the finger, or null on release, so the * headline can follow it (spec 2.7). */ +@Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable internal fun NormalTrend( values: List, @@ -844,6 +850,7 @@ internal fun NormalTrend( ) = NormalTrend(values, levels, remember(color) { chartBlend(color) }, modifier, height, labels, band, bandLabel, onScrub) /** [NormalTrend] in [blend]: the line runs from the first colour to the second at the latest day, outside days lit in the second. */ +@Suppress("UnstableCollections", "ComposeUnstableCollections") @Composable internal fun NormalTrend( values: List, diff --git a/app/src/main/res/values-zh-rCN/strings_workout_live.xml b/app/src/main/res/values-zh-rCN/strings_workout_live.xml index 4e1ae61b..08af7736 100644 --- a/app/src/main/res/values-zh-rCN/strings_workout_live.xml +++ b/app/src/main/res/values-zh-rCN/strings_workout_live.xml @@ -86,9 +86,10 @@ 显示地图 仅显示轨迹,不显示地图 跟随我的位置 - 心率 - 最大心率的 %1$d%% - bpm,折线显示最近 10 分钟 + bpm,%1$s + 各区用时 + 目标 %1$d 区 + 目标 %1$d 至 %2$d 区 目标 %1$d 区。偏离时手环会振动 目标 %1$d 至 %2$d 区。偏离时手环会振动 %1$s / 共 %2$d 分钟 @@ -138,14 +139,12 @@ 已完成全部 %1$d 组。长按方块结束,或继续训练。 - 本组用时 %1$s 后休息 准备第 1 组 休息结束 接下来进行 %1$s。拿起器械时点击“开始”。 休息 %1$s 后 - 接下来 第 %1$d 组 第 %1$d 组,%2$s 本组结束后的心率变化 diff --git a/app/src/main/res/values/strings_workout_live.xml b/app/src/main/res/values/strings_workout_live.xml index 83873de6..255247fa 100644 --- a/app/src/main/res/values/strings_workout_live.xml +++ b/app/src/main/res/values/strings_workout_live.xml @@ -192,12 +192,6 @@ - - Heart rate - - %1$d%% of max - - bpm, line shows last 10 min bpm, %1$s @@ -312,8 +306,6 @@ %1$d set done. Hold the square to end, or keep going. All %1$d sets done. Hold the square to end, or keep going. - - in this set Rest after %1$s @@ -326,8 +318,6 @@ Rest after %1$s - - Next Set %1$d From 25b79e4d6f4353970587e6d31e8326111b2c9f05 Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:36:21 +0400 Subject: [PATCH 24/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20keep=20chart=20o?= =?UTF-8?q?verload=20complexity=20suppress?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 5.5 --- app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt index a1fa8d34..d455d8ab 100644 --- a/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt +++ b/app/src/main/kotlin/org/openstrap/app/ui/glow/GlowCharts.kt @@ -675,7 +675,7 @@ data class GlowStage(val from: Float, val to: Float, val row: Int) * Sleep stages as white pills on hairline rows (row 0 at the top, e.g. Awake), joined by thin connectors, deeper rows * drawn brighter so deep sleep stands out on the dark core; or, with [rowColors], as solid bands in the stage colours. */ -@Suppress("UnstableCollections", "ComposeUnstableCollections") +@Suppress("UnstableCollections", "ComposeUnstableCollections", "CyclomaticComplexMethod") @Composable fun GlowHypnogram( stages: List, @@ -850,7 +850,7 @@ internal fun NormalTrend( ) = NormalTrend(values, levels, remember(color) { chartBlend(color) }, modifier, height, labels, band, bandLabel, onScrub) /** [NormalTrend] in [blend]: the line runs from the first colour to the second at the latest day, outside days lit in the second. */ -@Suppress("UnstableCollections", "ComposeUnstableCollections") +@Suppress("UnstableCollections", "ComposeUnstableCollections", "CyclomaticComplexMethod") @Composable internal fun NormalTrend( values: List, From 75bc34dd1fc4a680c6a4e81c8c48a95a77b96fff Mon Sep 17 00:00:00 2001 From: Sayed Ameer Date: Fri, 13 Nov 2026 03:39:10 +0400 Subject: [PATCH 25/27] =?UTF-8?q?Glow=20=C3=97=20Glass:=20status=20after?= =?UTF-8?q?=20the=20overnight=20waves,=20emulator=20contact=20sheet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../glow-glass/emulator/contact-sheet.png | Bin 0 -> 2561360 bytes docs/design/glow-glass/status.md | 54 ++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 docs/design/glow-glass/emulator/contact-sheet.png create mode 100644 docs/design/glow-glass/status.md diff --git a/docs/design/glow-glass/emulator/contact-sheet.png b/docs/design/glow-glass/emulator/contact-sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..9c281f213f0907bee0644b80476a69af78edc5d7 GIT binary patch literal 2561360 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

7IayM@$_3qKSOQ+`NFWuvLjt0~uE`I&H?3_ZI zmA`pAF*zlxL;IM&_MOkmFUiO%_jax|$ zyY;@2N$uB6CC8bBVmP=NA zhk#u6?mz$DsyW}R--V#1JhvCLOnIII>A<42@%Mx0F5Gpx1e=xLf9TTIKTp`K{GHh3 z0e#xHZq<-sn5HpxM@@VqJw2DAsFc*~y*oeb(XG{)bGP4K{`9hy>rS4&&hcDmh<}yS zmGIzETtce1myH6T1af#-(5T@(maY8m@X^aQ8-MfGgH|mYjvv$Sjg{Y~re;@ERNc6F zAEfKBut75+PVs&vM_wcDin)W|f0IrBvDDXGMu1Z%$eR(JY%vI|i33m;)y7*>3bMXF z_9sg-J~sQH79AH293PjNCPKJHE64fR96naZyuPCt3TXU=6{VTQ1vcJV=B#pyqK)HJ z)skCQ4Ae?5AD7^!EELOtM&p|Q3iMNx%AC$$&mOv+p2#xnX9u_bKJU#o(T(=sy2vu1 zikqe^<<2Ta0bMU>i=|2cfhK@b1i+HuSj{5UXjisBfy%vlLAo4_Ne6)qPGe2etQd;eH8c>HHiEu?AsR%+7P!#hFK zZkl3g;H0CVKdzvnq^P3YVFPvP16y`%SGP%pyGoLk7E$%?Wu(GHFFLEZfMZ!6um&Y5 zC!<~6#vH?uXt+GfT}g`Ddj80~L1Q?Et#mnmKXWKC`w_&%p+#9*vvK4l|0lt1Y1$iobOpC=*T2TfPacOV>*_YAS!X_Kas6NDE!c<~Us?6GY6Y}Ig zkr9!fuFaQTCZ%7^Qob{kDIq9~RZmmyq+(KE+JHHfaNtg=`vk#%dU6jfAE zeEjd@Bc_Zzvir!Ov4i4n#-*pEb5_tc8l|q3msQA;!dU^iRaI6oEDPXT`giTpuWMy_ zg(52rn>9Rh=xk|G>6a_Np0;30|55!_RXKg&?5+*F5c^;lIxsXS{#F9S<^!0NMR~<& z*s!Wm%zT(>_X6-t-oB2fUz)CyJ0bo^@5Z+-`xl^NOsvU2ef8c>8*J z`#M^7YF00%E)02EGLo_c0RRPNKgzS(d7xI&09wT_$am4FvvVF5{PN*06*Rg5)q=opBFVpe@YlqJgJ1r9I?XV#mlAjXa55;| zKlV}z4^=vgh009McX(T^4z9Aqtx_sYTUZX%I|H@`DR9Qi!@Yd0RaI3qWAXF%0U&@p zUr}C}m7eXeI}qT2u{lu$PY|;*bKO-gil*+}ym$WOrAH6bTX$?_QB|Jj1A_yCf&&(> zcmetBN{Y)e(lYE0yUXdSs;IKtfee!*(OKo>Z9K=a6h*NdYqeTS%gX=WzIWn`al5ze z89HXr{d*6R5|XWUfd8l`KVy5$pec`<46^c!Fdnt6;s4Ys$CL!+`KvY(6O=IZ_~R*x z<@vvV`E}@wX-BtiE6LAq*0G~3N!gDc*&Pm+E7oI=qw!*NAv z=`ujpvj#>-m1Sm0PABJZsESgapD(&x-XXzyoi%1wuyX^DSd6ozl(F&*&r_1*Dk-HI z+ABDyvarxuQo`BnK+$x%TqUJOOjHH+FcylcEGz;iT6tLz+~wso$9ac_7C(92h?}E`GHm! zuy~29tej>Uw2fISm`P_zDa(VQsumRtiKe|mLKu#3F=-<1&y{}hGDR~C&y}R5S!jy2 z*}Q9om!@X`9C7iBHI0T2PC0r^tgK=ofFSWArGy7L z=&+2BIpP2MGBPOe4%7AkHs7>{8-}w69gJm~aiqlpqDT2T&#rmfEdnT2@a!!6=UZQ} z3=`rX=w-7%)o&Pv<+^zPt{_WYnzkI=zFURMsVGXrh&q=N?ot$GlmN&NBfo~Qed^tL;kZr9I8_ZF6y+O5`M9l8&0*A=Pi zS0BWQvdjZYp+LwKgosq2Eh#k50h}yya#fI`OEDCkTV4i$k6AFtQfE0$(ZRm{Zc)rH zD{)wD76@ltTv3j7p(k23vwHGGo9M9zk^VK$Qo4T}h#A1o7!OexPVNztWuRXHGilwC zf^-80fCjM|P?vTeqx~G}(1X2{C{CnBivA0U zVV{KI7bl?n^%P&z{E~Sa#KJ0y5*Xw^cvwHX!@gyN|DTdTkDg z&n%b%fS4sIC^$d?=woz5WZ0vJnKVuFJg+KhVL^#3$yO_WWdE6QQ-`$f&@?qUqh;He zm9Kt|oI#4J1O)lH1tBlD$nLO#^m!3D$Y>fsfc5Cpp-Zo}mE~2kEH`Re_t^dm1$o7% zk6s=#b>Ojs7lw}MdHqssPF8`{1|9@Wh$P7ob;5cM=-{eyx9Ql_VzGGpI(&S*>eQ{3 znU;&foED1Wt$aywSy4f$12!wb3yR&(6acrS8I~z6Ddzz~JWtV5SxE)dyR;o5isFC~ zU0b$q;;eAWveKkQy}LIO8Ne^-(vk`uMy6$1E-R^Ec{U)(FDI)|l4KqN|CJV(0~~79 zE6hT1ERz)f$W`TP6cg2`SyXCL)}F1WdJXJQw^3y4j*V|!y>E8_B+rqPdSlACdOi+g z&JxvffWI;g?r!RMpn$mm1tbw9iJhn# z17OX|lAM~96B6dna$ph=oVs2suRDs!oo=GvCnb^p2uYy_4KSR9meWFNbGU7n`6l{% zbf~PTK|%f_hxPPw*#6r72>=JP@wFqvnm4O|^G>1_0B%q$%dYu)>ypLOzWQvjm1AS$ zAAa`bRtBcUFwomzx7&Puy_&_;edE>XK)P8hIk`p2DVg=_MJ${*4#Ap-1o_JVYnZMb z8Iqiu4ZKcPPEpl@f)YsraFc%@I6r;Lz>e*jCZ%MwYt#6p*S-b<2xg%M1^T+(LUwMU z9pFyVf+!ah0v*ZimiqVY(5pwQigKqU%gtlz?mc)RH^2Ds(JN0)9=Pw|#c`v0UATNN zGrPcM1=NHlN0Q~JI-vvmb*OT>J9PlmNgVu9fyE2Z7B20L4H$zgL5mFDfo8 z$S?JF*kzC;VQS`s+9=W>hk+>p)C6GlXj&>Mt*~;i034nm2;zugT|2gGQc>xWB)Mht z`qyvXXMv-OE-5MF0T>@AN^)^YImfZVL4KK81+t`AtpNAGsJL8!u!+d6z_DChd}>vd zt65BRi>CGNC#L_g_2{rcof|i(-KA5riec9hUYer>v|pGb`WA+hI{HoG$(0976x8ss;x7TCH4aYL1t~#&Q5GKH+{^ zty;k>2gr${Xr2cyAl=tM8Zjn=Mh_5?d4Gm%C9Mq{^824U{yfT~%p%*2!a*YOY9U7~ z%M<{SPOlg-{ph`GNAF!{IJ&5^e8<((lREZ|3=BryB1B25bi2+c#%{WB*o(J;{TdWj zQdQADy0M+Jatu=mA!Gf$yjhyAa63_IC2IZ20g?fAABE**<*v#=Z*Q3S1d4xQhY&Kz zre!BxvfVw7!5 z(IDXy^cUt>il$-HVJ*=g-4wu5T2ybFowm@gZvNKC<^at@M$dSr@9?h=?f`y9(0M^- zD6LOC%*7RZH*M3WS=;A+{G_C^T#%%%XT1#YMBx$sUf!s`hbYStfgzP{7Z^5Dg!Hg+ zt$^VD*Dh>3e=NwyuX~f$uZ*0!AnQ>9G`-j83 zQO%$Pu}Jk&3uK(@dEN++nGEt!bh)#vq@wJr-J8oQD`*R4Zl{sSfHf051y!n35+f_71w z%u_AEr)!!H?I3MNp}$l2#DQNC7=`|j<( zeg9iDM!kWhrY7UgWrEw?vSZ8sqX#UVy{sUoKyV9hf4d5Rk_7qZX63&6)Y71kfXI5a zmwmQ0D=q8zo)e%=2S6|^4THVdWeId0@%HnAO^5Zaqo6v^!Z6g+ug$u3{`StFcPo+- z)3(W*-@XBgCQV)_6JtUtdsSssdwxA|X5R(7-EOg{5%nTOmpJ;FVSyq3q9B5*?e6e_wkDntT)PK%fWBZQlSdd*DT01}#B+e#_ZYemz&+QZiCty=r{;mE}BxTIg z{fY}p-dVWGDOUK0*w=1*AJk`~tq7k7HWmhr$SIJI2$r2;n7rKlAJ+T~v{e>tWFByZI1PLJ0cP-p~~b?FhU|GoGQa7{>18_o|J3+O~8z4bdS3pXkTiYE17kH zvU{O%PCF|qN(&0hN=g`xD=#Tw7$z_zB;!FMLT(PJ9hv>`p)AV`Ow>kAbs3Jc+HI16 z`hFlBVt|JLI#h_Dy#uiHIZlz~z=(+b-~X_8?f1UHK|LpqpYi_ck0wk7>NszeL=iZS zc;4>gBgBB#KrqFVrPaV;8#FMA67U2=;;G7GehWiy74ax7p8C6&A^& zIAz^h3i@$0rUhrOJTJdNukHY}4t6Z@2@hqhR%daEBFPL79vqYt38K~88#KW{ZQ)?{ zJ(j^13i#LTetw*nS5-+V4Q7?Kdi%)GF=~o0LQg%O0gI|u=I2MYZB5aXEK0H@1_T69 zEG<-4rJcXnV%(VKW5-k$6c#;vn0)$l?=wRU2w?NmW7q@wZmH%YYw{w>x}mN4iQ%AVj@(smk2E;FuT?1QrCz?Xm?1 zfJcU88~5j~&Wm2i>D$*kEHvfVaR$(xM?S3CC0@fD!-+yv`2HV4QFtb6E@LEQu|5K{ z$<1yGbA=+7NEn6R=y(IH<;wD`qJpIxzN~b)C=2Cnw+H(LLgn@rJn)VYk7z6tY>B3T;EG=Hs_PNJaW=l&$XbEH&wux^OK>v``^RhV;%*O`1fkWE z%8DB)_g~xawVks{3cwuX8D#$ejj?uc=*hd+|GaQA*w?>P<7P`I%=lpYF9l_#AMg4t zIXeTm4r!)dSVVeZUSwb}pe)$(9zCxDhNlBW5c7!8b+r5}&BX+w(1qotR*nnx3y8}s zp(#4R;qB*uk`DAL0aY>@f`f6LYVWaUiS#59?k2+k#+nO>+fFDLXo5|iT!Tv*;CCAA zpyq+od~-N~8V^ffJ;Yo!qW1jp6GcK8kP%* zR)~FQnpcptO3(?o$*A#_-fY{G6rRklL6pklwI;~b(DQJP0VXVy{6a5L5C@JMT2@x^ z@`9Df5#w?R^Iw`ZVd}`+H{;MHtX8Y9ulMQ|U)b%oz~F#|i=UqV(#++re26+3%8KH0 z3zZdB#}1wQ^@r^aZy@xeqib6z%a`ll{%*~tGbb*)-Qws8gJ#SbC(CkSL2+n!Fw$*A zLGtzWhIp@*-0Xrg$FGcPW-dqwZ%d(G;12y8% z=}s?B2Q37(*%w?wkN)jDc5k`lxzCCVOGQEY@|QP&OwbR|cB#HpMTMnpJI63I19}38 zlHJ?RfZQn1OA!2F>EfdDxH~C*hjogq6S9Bj*{t;ZM=4oD$98YhyzaN3Y?B13q^RuE zmA@9`moN-%vsojfLW>K^bgV|Rv7;*CwF2YsJUn&ydQga8qoz?WE}!xs{t;~Vp}ErEnePszd-N8{8IQVo*kt@|2;+KfD-`7IN(JR<-ic%^fZv) zq$p~5WKdRmo&nEi>_<|O)7~0!Aad)Hh|bmHR60dJ(Tl9>)h~uMdXKA-swie|M%pjv zvms0z*T1x^;@Jfs&;Zqsa=C?9UYh#U)FIbz-bY-^X0`hHdM{c2o!xE=3HDpEc-rC@ zC%yRUSIEaLE2_&SR#a5&KYZ!?ANP290Z&DPx{(%(W#jtSKUuTo*okXyw>Wu1zvrGA zDa&$RK}oGzL9$Lwe!gCyiHF6Km0ft`__fIs`o<-sB|pr%myinFjw;xzC6Jl|{Cu;r z3Rw;~?gRXNDl45G+cgNDr};&tf*@|*@Fq=Z>Y@f# z1z#W?URCq+OFDOKMl&E$P7ow-FFVUJAk7diAj8mwg=M$yB#j)_ExJzl)*UC((sPqj zGAEAf+p>ARcR%_~5TwGQvZZgX%gZZfSlVjk>qUhZn!PSR^Ysg$BBkrBZ+Zavs{ z@Iq*ae~aez-(5N9ZtO$BEo)B${{m@HG?kZE92nr|aM>D(H!rW40_kV~ zcShUl@D#MNXt&W6RaRCdN^)peKvGJE4T4`qMTI|nn1#bg#LyDlUA!@0dO@ZNmHlqXI)` zbQ>foQc`Xv&#*k~b$cZC+Qg2%dp2(6Yj^Z$-0I^=^P+;oT#{JJKWJ)~{vqD}b%H`) z=r<-QH#4IspQb6EV{7>bMFxbh6il(PP!(?H(YWjL`;KlC-7whOZ)T4n-d6ja^kkOS ze4R7}k_0v10sIIu+VrVYEvk*>8-_((Il?YX^qJL_|;S(%;5%^+IX^X{W`v zH5VyE(^iiAV#W(IdJIu5YJOR9g$pEAAxaMS4~hy3vmuW%z???qGa$n3V|Q42esqVP zt?D+63=H)^`PNCJ-DzjVbk!qnc|LrX7K4giTA}@nDO=d{6e$otshN5t9dxh^iIQxnY@86Hh4k&|8z1K>0jt=sG^$a>zfcoN)E?r{qn`&J6{0G{ z6pRiZy5qOR#wAyT$ zX<26upIQF-^5Vkc+gI-bzXodQ3)9?Su_5aD3le-dj+14XW+)$DAC~6^jv3IZW2>N$ zz=q8me!2CFuKhbZUGDrGpcfi?g=#tR_o=P}yAB*b(974WW6$<|M)vXY@d~XK40?Kk zxFzaytV*Kf?dQ#MTx9)-(KAPR`8Xo$M}o}>qm-0|LJluf5e*Vcd9Jd&>h!+zQ(u_a zqEl0Ef3Ln{d#zl*gktDxCvQ%Eaa@zu4SoE)2Ttr=zgcv6RHzNK;?nfzVbl9he{I6P zUynJfgqU^>>NktB``ClR1D1R4J5v_gvy;^l|IQ;4ESB}QJDgi2ow#bx<5LIAnIK|t?VYP9= zq5e~z9TOTJT)$CWngS1kGW*(gYW>FhulNP}DxhO9oIr}UTCEO;&Ec@w9d^6j4t$Yt zn}WEOB=6d?_o-*63>ezSKhVGT;9fuM__jggdXgjo?;+~T3$Ma)9HKRz=OXJw)Q*m{ z*=?DRvX1XR`N7)N<>eLEE`p4Ab8lU|l~F@AJzYaH+Hg5+HL@@f$P-c%Du&nLTZ{`B zRkudYnf?_{5Ybw{p|{Af1F6_pkg05lnwEBWTFKGUbxYtuR?GNR9{8UEqn5se$Ess(h0 z^YXI$`u3SUBOo#&v_U<c^g5X%W6$Heb!x7HRaO}V~-pw&o86^FV&upqCpO$ z_MTxg@5cIug?5@Y*(W5paqk|@hYa)$4e<>N1u~HZ1goXLfNVZ|5l~UZFs#kThp}2) zj~yM^s-=HK1n=blhrz4?hU4xZKgro0eHOpy6CM`Qu)(0^%W~rr@{^LYWABAEZrp0@ zDDTjaMtyrV?$^f=80Z}mg7R2#`&tlTw^{QN?pNgH_kQ_Bzld5skrC}@P4@~33ToKE zNWfP?H*?sYSX+Of5nHYIj~w$33++08o>yo{NaMzRmc5pJ^LA-^MsZrYtE8mciwlxZ zoKh4eKR!Vg#m>(?n{@OICRzYc`uBdEXn|I%Gb-AXW7B+yL4~XI@s4gz}pu@{-H|_r_y@c98n>)!U6(G z!x6aRwC-(`sK_>sw_9!A4zKBbhDHPi*9(mRXjU{8;O$d4tX6=x?_ZZscWK;ma*qN2 z-af7BHvD$plI~4g3lhNDbi*DUKfbWMUU)>QvogQ5gr=yJ+{}cG)Foq|YEY|okgwnK zL&v>6^;r(|ln3f!WKd{Ca0p0crKmt3-?|~S{2ai#V;Ru29i|+Cv9Sy!UVUy^8qCIn ztn|2y)YVg;?H<#*eZ3|xjhGbRsyCxDTOT-{+bSCS&O)uajuq?5MLLV*I zIZ(+2$D$_D1pFZ3+cV)9V$Ul6MjJeG&EvWpI?=U`>^sw?XS>mp2K)JWckJ4F=;*$_e%=wa!x)D7d*{)19b3$p zJMOP-M*wyT94E&zX%90~lQR~+HY2)T?cmVBr=A@h5)x3qF=+0`@tn7>7teD;NA+sg zv3X=vxSyX-YI4TK(>LE)^Ky1({;g~AeTQ^;{?%zbbbKg^8W`+1Y;3Qcza6@NFEueC zH7OzOe%!;IzaJVfyjy5^5KgD1X^@Pj`)ZXNSK@jP>e#JM+n~^ZQIq>MXcAqgUM<*N z6r^TolMClW&ou_8DzeO5IWKR!&1M}rsc)0!^&+FgZ8j@P`orod%Yv4;=Z@W|Q@7TX zXNLOu`^2=YKW=J2tCf$c9|2-p`a+*QdSle2-XWm@*DuAf9CPB})v0ra@-{Bzenw(K zdVWsHyjLeg)(Hs-3tX^t;@nrpDWHl4nK?k~L#{f|aZ!|FTGspY$CsP7tXEm?D$E0w z!W0+@Q16kfhL#b{Te*9;9+ni9&s{twGAblIBKVmXMyZN=>&gQVbL2IigI=7K4XYJc zD>4{qm<&Vb=M-PR5dZAUqheY_2L}0!pV_Z*vpS~^-Gmt86f7DwH|fx2i?NkGMU$u0 zA_)hFBuS$CH)0}O35MNdx+=cE0gI%^6m=^PcwxM}>@%hg*}DDM&D)9b@u_j~sqqPE z8-Cr_t6S^F4Wpo^80@D{KUnz6OH&wz&dV<;E2{+VFjZw)IxHlxVZBI(rg#5+cJAyE z1NwFF_xBkxu=9p>%j!ml3xXKn52&eqyT+5o_x19!)r|_@yZ=J(?ro+{9N_Qg-K}ej zv7>wW`+L=n2&EZ%+n*;ocWgF)&ZsRrjzhS0FlL5jQc|;%k~80UZCZo+kzpZ$&pk6T zG&HbDBS1|&&-(g0cq==0RL{;Gn?^^4`}_GMrDUEudvopQFJ)%sU%8erba3ZouTBMt z=b&~(4GHoaKc?3&zaNf`PmN1>6nFnoY+UNEzaJhstZR695NL&q>|L1JiA1>~tCz1P z3>wg}Z?86?q5e}Q^owa6Rkv=q!(n3?(24|W7?@17=&~&HJn!w}u-W)26Z$o8R<|ys zCXf=3aFdXSoTY76>yZ=J>({L{clL;Y0H2mE>d%}u$Y!-Rs9&3CQfxVN^y;)p1HwWB z&Rqg#=HCY{&U<#G)oP8u|L9&qYIaW18%w4~MTLcj2CjU4=IgILrKlLB+I;(B##v#E0^XH6h z-J;>&`_BPt0{n_Yl1Oj3j7$Zq3Q7T-{3yHBayA3LKmVb6|TRueb<5_OUm6JYJ`0UHNmAWbub288~F%(@=Rrw$%9S1CAMG5l@e0{`I9K)15oda5Q z=-0gc*N1mrOp1N~@81^mA2X_bchENL{+&NA9QF6|?$xAqUTN{gqm zzG(2ob#q=Vb2@ilJyTRs*1UGT%%Xg7Q^-C*e5Rr_B{!?6qI}K4ZFBpL8s4@mMN#R6 zxtq@)kyZ8F{ktRE_vqcM&8K^}6jzo%$W8~agDiJ7IsWL~s~=B$zDjT>W~aZq>zCne zyZSl2RaL#395=L0mxY7I+pYZWtEcx~Kc|5Y!X1^Aon9%pcV0SCJ2>=%rxu8kNK^FB z$Nw$_GX|z5x1{LXLp!JS96X|951OJM<>&0bcFxN27vk@X?9_ARXN((&ZE->8stp&lx&y)yxF|wXmdU!+~9SCB=>F)O+Kp z=bVE3K}PDjJ=?msXzQ@sbBhW@352jv&>=HFx1^#%2Ya?;737vyR#24XQEoP@5mq1N zW(lGI6Y{`fJ<7>a6y;HN=C|86jqW=zrhcQm!u*@@v8|glGliVY+tqUu>oIAgXAaI+ z@NgL#r)Unp|I*=?aFObMXAb~REGw&@sS7)dN~L|HsA_8bgNm{;EqR5a9wjE1@cPrg$WnTBSSA}j0O`}(=%FRcFIBT*1y zuigFjov%9f?()^j&l|Uj`E=9gE~o3px$EDo{<>wy);7DXQmHz$^U#E+Cmh{#RB#Kh zx)50tR7r7ZVq6k*mcfrjr4JKR?_P^NwDa&ApDz>KVp>w#=PSM#J7aWSR{o~1e}DRw z*`N@TWp7=)ed)wy;7EeX;^k9UeqFQasfAOYS~#`5tYX``?cE1;uhXDTVr*h!Y?8Cm z2_8^Ue_iw2+}G!Pw&g>Y({*^qv9jXQCaoLA-$+P~e+Vk4T<)ZMDY68d;1sR8obKef zhZIHqwQ;}Q%l_hf^FRV%mHW3Zwq~d0>|Fo1mycudXU~gnF+DkJ{o9+m4e8_);9XW! zu3BiT&DyF^1D<=cT%!CaAy;%u z49o1-3t0vbk-@JD_UI5T?O5H}${Ra2my7AAVf?^uP z(wNecviQ3RvJ6~5+MWS!d&=c>-MgCrFsgPP3JM8a{MJi6%ZZ}+%eTK@Id?5IJS6UJ zg3Af2gON+|-mN&nEtHj%pFeqV?#s{QW#xVR*5?(a<$Jd8ow?wtLw_A{R=R9nw#So} zr%%ru1~x)R1T0leP=Nn>X?&f>dl294)= z@|rI|`AlWSk1JQD#NMMUmY?2QJ!|Fi<-cxlmRFqnYtOzPe{R^e_2q+yAbV%rPUmm$ zyf#zOtv#X-w?5^Dvn@gixH2?dX@19z@{N-PMR76n}gdHD$DoOJGZ@!=M*7614 zuXR;cCY-yt_3d|Jx_8^Q>fPGSnl0S0UUa+fpS!T@{g0Y-?abS(If=<-dHIT>X2jle z!6JHRMaA_!dq=NWc5DAZRF0}~eTsHfRA%0b2Y8tlis9IdyY~)%{#EzcGrB!Jqbw)) z)VJ$9O`R0dpk7%{Ue5hQ?DwoFD9lYrMAO6Y{KJb^VhPF`!C6{IAqAU^%MHQtyEYHmo-NJ$8tNOkE+T@?tNp2ze-Fh%cgLU3!a@}$(Kw5XoyEo7Us;3`d`mO3 zj=%j*QSw7)K_R#!+%84QDbAuI$>}=r);nDnzcg~~mlg|E`Y8S4mtU)@QkI_XECKic zG{@#8Bph9~qW!#QBRaG%&&owQ|0}&nCCm%kF+_>7Jc_u&^=~_hQ zghw7z4FyyG0d$tQlOFFPFF{yZ`Xn14dX>%gMXfcV9jY5{@hup5y+y zd?qqD^y67CNV3Gx^v_54rWfXYx_k4hW2Sxe>|&s}R+N3b>$eJ*lcAZ*iT7R{F)_Ea zXyxV~&c)w;X28f#W-Z)&`cPVaj;bmQ&E%96$cjYMR9b#cK?O+bL-uxBeokH)z^_=j z`G;3VPkm+d6qg{JioKaukVDf{L|}0LR_*`3d^WqdfU!W+{RtW4lOAcL{AuSQ21;P$ z)pVh1fRaQkOx7vZG)!VS1TBeJYzFB)@da+s1tXHg`%Zo_&7d4(sBo%8Z?pjZpXvT=9s zU%h<0MXM&MDUVo=bGclfeenJBFV9}z7cky}f}%Aa{zy^OsUsH#4DHpfV~cfP{kC(< zK3_lYSKgS*FrWbKk6(75Iev-b*k>0`9Xn}gd1=L#O?&zc>=x6!(UJXU)_(fyj5%Xx z&K+M~R{6)qzXp%!)u?H`^wjLMH@#6}& zTex}o-ly;U)S*kut-tI)@Ym^;A1wsXaw(agtomWn%wYjRzD}oW|DPwP&K`c`?{ktU zHEJ5&rB~Z68~3?jnPj7w==-q`uV0RHcsXG2Izao^F2p9rr#5L;_u`pbG!Fs^<>k)% z_a1^QauCqv_ij58Q9JaF59YaDLSkI%r>lONFk^^+kWX52W^Q&7asf~@{U{|nH@gt{ z{!|NZW3Qf%J$L;2J72!&b_oyS(>{6Y=dsfU`1*UNCS~Pi7o%D(VC+jlX*%G4@8% zy<5qZi^s8Nr}m9A>r%{6Q@87jI5Nz+MqF1 zP|DpfDmSm_@UhEYUUpbo3zqEG-J}bbW81WDl$?^uajetnUj4zw*Iu5wb<=8#s^;aF zy!Y|16h$3Aa%K3?Zk;+d`{L_uzimC@>+Aj2>$4b!7Def&U-ln8agF2HMbD3)Hfca< zS;dA;2L=!5)UtVlzYm=M;M2{|Jw0OnoKa=vl|OFWKWcclrZLeE({hqivMyhZZ_%vY z<*RYP>y3s>fd-^+y|;1Y>oYg5Tjq8Pm#)OGd}l-VF3o@X^}x=*&V2U4^DdV=DJ5&g z>YtyUF(fF^r?SemZP%$evxfh*@4O&NO=F__^lbCv#siR=l$a*bckeyCbS2K);Q(nf zFrVh!<=D7{v=&Y4ojQA);Vm@9l$Te<#-&1_LyMK?w(dMpr*_Ck?>^^pi*fO(Z@#l( z)>DH50)3KFva+%Zkrbn8D&=8zW=|~q`tz4uE_Yl)+KN>_PoD}r zo=HiWSveXF(iEMPl9gXrn({FFjkkY%;kmIB#`bZ#+*`IE&&n=r-Lk>8>-T{RQU$X3 z=Iz9rw-e8tyHi|LZnyGRZzNp5asT?Q#Io`#%0ew!zHY_R>A(E&24%6NXXL&6(I!C< z6CR|OlvL0R9e+Qqq_h$lK|IeLJ8`{XgW4awJy()tmScD9I&~*DIqgwyUcM%jX^Kir z%E&J$b-BcsmwvNi>5O03FIOowE30tPlC>qJ72#olckev}U2$MQs-(2y{H54=&yF5f zP_pX14e1%V5Q>EU==0x~ygcojHLrlmk4o3_x7XdelW4P93kpl)6M*@NCfQS@5k7Nc z>+AhSA5R({RPb-K6dVjf{r~)O^leGR=R64xy-^h3JNFh#+> z{tnJsTv=Y`tm5>*7X@mTB`>Qj$j4WboebXAS-H?&ogm`^sW z2dM`h3MH;$!BvJjK9`Z!rw2eR7E2WgJ%L$;tg2O{(SbU6bMT?($rLv+*tNw#?3k%?ra+3LD3Xrak(o6*;VDL zP-wv?*jiRzl9QdGva+mJxkWbz9z;@9m1SrzZ?Ce_a=jV}uospEK#d+d5aI^Hvt-Z_ zAu!0_Kft%NxU8tKgyTVQjAH?YCN`c}u&+QNG0o6+J8QZv!a3rxNjC&6s#2m1=Vz6Nff*S{2hLNmHCD4%1WD;LjjE1LeXIGXf8mMpQgcC z+S-8I`G$tlJXe;TV^LJjVUq<=m<+Z$Y=jDAlL(*ye8R#MNi5IF2dQm-;|XaGP8a1by6SSSUq$uizyVSxGP=79(b%ti#UTu5IH2KHxI?*89< z8JpEzR^EBxg6N(-_s(0ONRm)l*=F|4+MPNbS^7Gt^EHUzA245tN=qmNb3`#NFAt0P ze|R0%a3uff#kK<31O_E(<%pQ5Gy&-q;4iaUMYtBYGEfw-?*ft-6a%6xk=4QgcNn0j z0QHPzn6Q8#6m&$L$3#UA@%6Xyw%n3JNtOYqpDe**Yzl#;AO#Yp4FddPK@_lYhamPK zs4>tbC<_%95U40hPDv5R06;4dvPv7zBbZ=80yRuNc1MtpUzOXHUkZx)^}gtk=v6h? z$KTs-FR3gqt|;eN0NbakYM6f@$FjMl#eyV2>|?NVY#gXYbPGUBwDX{slPHNYQ2A)+ zIs~gENiqv}FU;W6#w-C~mf%5cI{k6xXq6klHq{NS^~bBLpI`r3?4y)GZ{PB&N+K?z zgKQb@tN(+W52wx46oIM17D1c?F!MJK+EH?{#Oj0q0^|hq6$NtX353kiLdkBH>}Rt4Vhr{p(y)ZeOCi zyphB~NGFJ`=I0B`qqK5F?AXvakUl_=eh$I)k=d**Kg>R68Cn!T-U=*_m8@24NLY}? zLgnQY0Pt(TS5-SeZKegcD1m0YQb3@;pPx@jad}Be8OL+7DEa#N`1|`778F-jx*QH0 zz!*|wP?H$o>mT4-TvS?KQi(wHoRuzFRz6?<=A9eyzx}w|Znu(%Z?de=G#wTmtg32m zb|KBs9M6dWJx~b>4d8h$FQ*XHK-jHrmr!0_)uV5Rg|AIp^z{2xRZg4D%3Jx0GGL_x z1rMTRA|t|B5CED1l88mn+ZSwqDBx%j=wRRltRqDU4h>*Awjj4iQBg`i=(sPoCBAu3i?xtlI-Pe4+{3HD03DU zmjM(o)gl3H!6*!7Sq3SS$Up!eVbKVLPL^q!4havSDJnm=M3wm3l_lV4C;QR#FztUy_iK^<$LzfVA*Pf<}>Nol2*!zL?ARi#T(l#T0_Uc2#N-Oqp9 zA;zVSpaA3r&Cs>NgH%<`0)A?m=UBG@s3|NofVZ;Q*uy4E9U!6An z*$*lzop!6$X5-5+HSwH9QDF(KF1Jr4eag$1w-ot*>vM%t`^niv+^^%@O=(1ikxI*AG4xz?#vK=I~R3 zZKpZHpmP__g97WF(M=$*y2`*bH{gT-I|i0Cz~8mm!RQsRb(b#tp#BMS6@fMh8TQ)Q zFW=8e|6<=(8wa)^7@H|?4V;ClCQ$nuRCx`2Y8nKbrbD8O1A_`p8vGX3%xZQMl4MYG zMQAt%ARn4rcsjDO;L-pzcW^OX-9uV0{07240>%X97$S>l3yQA*r82rZC95iO;eoTX z4l+>11MEX-+oai?v6C*{z4<6RvsQ3;*H&%+IJoC(>}}wH*Y!Y;?Q2pub^Jb)#tAtY zta{cH0!;d<-lB12hOBHlT(CKyV>`4U)!&YZMZ( zf^gXZw}qh=NWUQE6U`r@2?p$FT7^sqLFJ)iR9U-`W~_p98FUY*V?^-k*WzeF>w6( z=#D?5@1)rZgRduX{Drz)B<+y?JJM6{>*ue{20?e|V2tcxt~3Me7?mb!ziMF&$Q9vo z8@vfJe^9~zJr24msgD78mx03(B-KJb2B`oLpzav~gVK)#Mh>dT25xKpNFYRjYZVkV z1CKM>X>chmic+tA+xi{acb+(I$BI>n7cTP}qO<;7+BSfhz*uF6P3M7=16&O#PvB@k zS*ThMQV66?!VuNR44r*Qs%o+WJu?cRD1d1}_Z)+e0?|!X85kI_O%xy~NLE0HH-KVb z-j9tZv##=?H0zGLh{!2e+cu5q4*$cv%uvrtZ0Ng0=KvE5mAkzz-Pqs0`&l` z9keDAj41+RgU%L|Vy2Y}0(quQ3&K>@f0YF>x>t`rD_5i(KT-JLK|uZbjfM<9|Jmn> z2M*P0(n0;dTv_{F>gh9#&HC@IyJ}7pHU|)5(@K9+6emWS11xyBB2Px?w zvIwt$)E=m=7z_a_Fq*FxlRSz9>RKEWWKaWx1q~V%pgsvum)0~0#MR&!U?PN}$bjJj z1`KbF87a6dG|EvsIBiG5oug4V;OgiWn(T(93=kGwkMpAlsMhmGQG6XL{lS&vq2`AG(rJy7$ERsZKVPqc~1)5z?-ny#aH)T*VRR&&&Oo=gtR)4Zv6 zs;TuyjXxVw&GenF{Ses9=qS{<-EjOFtp>5WqvJqmu0V=nB(<`*R5t>2L(zQ4|BK_# z5G-cLAG{cH{Ar3T)!p(X%uJE1x?a6@FWqWm~WWZ+z6%78r#A_rC} z00961NklAm8+HTTxSe;hi)+M_&m=x7W1& zs~L>Mo;A}fP17!^3^@LD8`)3_t5JD@^dyeIT4p1Ou$^>*Q&rW=J5Z7tr2m`KY)uCv zy9TLV2DQOig5diY;Tn8{d`4(O5Z6HTrEgSFbB4@Vkg$R_Bp^X>eVCylL;0r7Ejkiq zuFy2yuXo$_Z5sFM({9?+?-dql$aEyzB&bQ#=0MW|%>@858=w%oTAK+*-Y5g?L=PE8>H2BRtHTh{~-th)ul_SW4O zv`O|s0@tWX_b`G~2V~;u4H)o-!DMG z&QHh(_a$JPcuJv11kErJ zs?w*;*r3E`*u7S&tSrJEB235Y0u-HOeFDedla=~vbFZt>)qm9^J{}gPkyho|dl z6jzhX+C`9K0wHKa-Cgg^$uMkcLH5pTXOLH(m?BMO$GWd3K=qqJ|Cct!y5t8x)4-!> zU1oMUh+R#kWo0A}Y3o2MJ_y*CT!Rc@bX_K>Nl=(Ie+-`kA#QGdYY&1&ihwgxrXF%>`>5}8ImFexn}=U zA1jmUXMDshG>vK3o#y&5j1n(|6l3ZG4il~Qp+OUbTwDmJW!ND!%fb{*eUg!j9?v$* zqMZx(E&}!+04<>&@J6LxaPeSgSo}bE zlLHE(5N@OHZzZP-icmB|SllAeAIz12!%yGj05A&y)#{v5Gw<~|)O_0TR$w;*_CdDx z0ooPJ6Gcyw%-7J5uu;VE_pIg;ZFmdXrlLJ~&t!LjlpC#x*hr znJZ|r7>ZRH#X`$6%m#!i1#)Xb)g1JZ(0Qp&L|`e1&XPJ4(S#7(yWsKlb_AH348J!V zA*$Sh;|B_~)n=_%zut{2x3_HAhWZH_BBDASR4ei#OMQv9ibN*MzY!5JspO^1_w>*T zYaE(cw;**xL(SE7V&Ivrb~%_;rh%JapC5?{50^!6B84D)^s9M{6J@BuBXn6v9H{|C zq0Iw=MX1JyRutLc?-x|3_NkvXrd+$h!Wwxz$>=;}LXZJ+=;YO-4A_{|oV}WmqZz$x ziq2DD4_qUWP`@}{Pi;b=5{UyNI*$Z8kxtZ5;r8@M6S}6BtfxH)AUX4@Y1>twOnvu4 z9z%hgS;Gyi3r}NzYtb+G9(X5-j8jB1rn(0FP^4JEI-JHW!DQm?h<{~xF74d;L$5Ar zJZxy~E}ez)ieqoSm38epfIIc^_Nx;W_vc@kSFh59qt?7tA1kZKY9^0Y^>3e?nn)`M z?LJdd1?m4I`;_8MU(LwU{jvB!w3wQw6#|4)G>bU1Zbc$pTr)e z8Q>a|Y!RQXch0~7c51cbw4I}sA7BMa&%N<@BBQ@;wcV=c0%%cNBrWj6!VV)E^s%a!K+MVoaLAL!pft%_qY5XSUg) z?Etkr4TTYE4VssY3_fW>1bPiHlLA_Y9`Haf7=Y5g(VXe>X{j(WZimmNp)cA#1lr*N?b#_V&JAr>r&(kJGRj4aHwqj3F(+ z?n#89MNAF;2LROSTM|tNcHSX9RnG*$onheJIR>*lKzdlr5i^O`5vZGRawurnYvUxG zAG(&M<)|TZQuAHH<515YV+oK%1WFce)~BUgKyw&rmD*fGMH269bT1s))0~5N5n%{T zzmp!Tp;Pc^Is$ zCgslXLK>D)jn~)WPP)*-7A)E+yAXrPa;*N30|kzY{CX{%;>D3o7@l}atx29yq{?W4J-XuHi?zh1 z?EsMk8((QV1f@k)QxOO~S9>~-2483Z$k&90k_# z7Sj|?QpV68Dw#G*#+u_M0nnY{VbZH$$pE|4T^5=%QoAGc%wSWSLW)1GiX*jOG=AW( z)Qm)OlY{N3PXb9E#-k8&vs#gqo(^H?FFL!!-Yj^yE}QfS`;*A1C(HQj*YclqQaC0B zm-=eevYsy^e&(@3%&tx19TCBUvL2>lN<0IaPGY6Qd)8X2zH&5oU{U zL_Y^?Nb83^ULVxkqU$~&({aXWNEDD$j5v>{y>3>L$Tc^Cn&^4w_(sO0VjazNFWj6` zkN%8r9-Q)IB4_po}Ngi$suRt+^npU}90VXVlbC%*-lJ z+_C)ItG!<8i}SfLl%X*OO7&raI9bd1LmN|vMAZ}h^pR^BDmsL_aWFmr8U5yO(3bSL z4&GXDHt}_^{%fKmP+BL5u>SzB1s-eGi?POFR5NQXH0)6|Ccs0#(1Z|HFElm8P-(C? z#89%4;|x!#=~qKn(y~*CR%h6Sq1^@PVEWLpgAbpsWr<-ORd+U+el@O!zl6R+(qm}x zNc1B z>631l6XbRDM>i{Bcr`urG;%o%Jr+_STs1`!LCz-NkTAst^kbo9Nm5~bG|Tf^fTEh_ zr<1Uujp+J-ZoShK%=q&x^)-ATnn44u^Q5J|m{Xc)iFl)`UPi_ro*J^FgZ?$~o)mN> zH#cA3=-{G}A2~Quv0yS@d9Pb z5Ox`fbe;tOW|sel7glWX?Tz>f_Gs1o++;k(r2HBWT=U&Lf6^5}LhKkOPmLY{@}{0Q z&^z*y`Xn|5YAF8o_{p#uuv$%+0l>hM)ykq0(l4oLcjhZuEUI+--!uMb!H>`l2qGa_ zqiXT<_eI%!25nSRgtRxF*;NGFGlz_g6U=Ws&&9-vuj6q?(~UI7C<>wsY71D{eivIx z=0p!XTy3o|*k+5;FDzQ3PwOys;R@vzkPrdF?$; zG_4FSMAafg#8lT*>T6^{l9us*E%g;F5vK8a>{6W{IJ{uSA7Sn4fn`sBmaZ_@NNZSn z6JL=3l8>wj1!K#2&X>+^2_n+o0JB|?WLW__uEwIt7Uz0g1!krTqD(<* z^6<(%QOq1)OtTx*C;rBaI`PG&Qv%=m?oIrkYlPzI_vD;L)@t5jfq#P zIs>XE;mq8J@Wz;Lr^_1BZ=k>Nco6+b@iQ8t3uOGUauq1`^;p7cL!(q){a~ zniT7d2(v?MhhSkzJd`c~FbgyJ>!x9jpv^O2K^iM|Uk+Mlt4T1eP~UEl{a zPshK#Je8Pgv#q70z|j%x2=f)Pu0=b5@U@^{2n|fn0@f!MuNpkjuvYb5q1(-b%7pC( zB5M)^wQNQ-SX%~Nq?=ce5SrSgne9IE4G}bj9|^YswutoyB8Ew*G5U0AO9Or}=G@bm zCauA*kw@XjGs1(!hBS%G zCw`GJW5bE5Ng0x8h*{L`q}il|cSJu5`DO6~cnqD8$CzFyST}=*grx|YZ;;Zd$5y}* zTENdxpB*Z9ErhDN_=pj$M3A6`+4}pZd zp1*BOk>&2_rxS8JAijC*CsTI$)i}q(_*g z%s;tdv~@Bs-+y}H`x&cg_!)@RA{+?BuZE#SR{qv-x{=zAcZ*r^AU$oSi<@N&Vw!9zvjnWk|497JFtnYvKJM2i`rA0yu;fTj zv8SZbWIBEXd>t~fU_7BoeSF;3^PEm3QFZBvuWh=8SzR%fSid!H0fL@MYk#eG=fES@ zaq={FS1q{^55+tiI`Nywg|#aW#`qtFl<`moXD3)B`UmS)#-y24m}&zcqm`c1g&vh+OHGN&_)`ktIl;aU1sVO*sV(*?0tjSW$)G(U{FPdg-R?TLq z_Iiv+~S3*)6MYNJ9*fi>NF6IK6O~S4kVQM-T z!7Mc|9Qh5otu*GUJ4H+$hnn8N(P{PtdIU|hkpUt+?VgRNOe<(oCX8fXUBD5yFfL+N z0P$3j(p=BGsUG;l^P}I($Th?62_q;*mL(FR%D7j}?k=60Fq8O~*T1J!{PPQ^P&}43 zR~ww?&N30C_KcqAdde|_@0&l+Vw75~o%uG9Og!$ao#1g@h)AX& zWI*F6LV8ql5&4CeUR|Hel`bXt=8d1}RmU10DZ)NV!VacSacW~Bpw>8k|jxU3$g^5i8eB<8WS3undOlJ#Kc1l)t(%WuJd5TQsP2}PKyH#{{X|fC{UZjA;PDYPQ8uQ1s#%O=X5nV~+qAgmfnwRCDO30W z^Op2{y2rje#_p*z{p0Q=6+Nsw>Q8CjUc|GI_5J235P5u!PoM`Sbu~!a(}qYk*(^`= zBDm;3&Aa|Pp|^W75Rc1N`^AHR^`}>#c*04Wf#i3dUTec>*T+ok4H8?}9{Ze+ zf?L-$dTVk7hq3*uIXiB^(LNez67Es)8UW3gU9wY%P-@m9^d?fRQ-36T(f#(ewKfx z6VsJy_|B||kTDn!mzv?8t7Zw9&#UQfCIeK*2CnuPKQ(!-0Ux$NZ*m7r;AW0lR zc*3E29S~b*#^`|*RSoj-s~s33$Wn4nrUYTVVCovG(bpWpsGqNvx2(rc4R1Z3bJOpp z2rIFs)mD@UWZ}|LBjXthN8?~q{-b`6>KHTn7uBQF?Sxcd^(dyE9jWaRZN{`WdgKkk?GX>JD?4b|T3g>IqBMhSmz9DLOwVpTI_e0PV=u zM=9vlm^YCWqN~=#Y+*L%p)%n)!+uBeG=t9&0vV-SX~ms{0#D%j>5NNvyPDn`71_vd zNiZ?^D{;ILh{unkU&JgC4aX%OzkXwK67(DDP->XX>JCnQqiPS0lKu2(F)1R*_K!M` zL_4XvDr2xq9rw}0Zo-js?Lx$Z;0qh!b>j?uE|6t_VAe@;@(`#0{_@ahHDc6g9;Y}M zSK$e+mL0a7o>;nE<4&_e;=pCrMv6-ktAHXG_7;lW+WoNF^j1pOjH zqM}5XtGo~(_=-ffl_M)xrU!MHBxq=k|aR21iG`D=Vvtiy?*y=Cs;& zQ!SRjI<8>1rHy}ZqT0>0^X5zvwCK$&V9`aq=vbGt8tB$sh;QHAy>#PTV1)s zT+gU1Gl&O=IW;;Zv^t~I*?3fa*$pYI@o^)zVN9Pf1Y$#AlG2Veaz(ImLFh%=)yUZ} zZ9~%!`lFH=Tb^|?o*PzYETpk%Ds1r}-G6=&tjsu#;L6%0VIHd8(qP7BiH*zD^ed2@ z9kX8jXq-uD+HxLaH^tPod*ED<>LwW0S2YIkPcu>NH-lXo+5wS4O->K-Mk51F026O& zyb+m#XG%LU4y-EaWiiYgJyM>rGf02r zvuw;d=An8fqGtb_vI{&&fnXq>xlg7E(`*A{dC{cnx{S`M^qHclU&)@#%R(Aa0D~AHaL~RE=?<98iT>o z@Vr%rcQr9@gH!1vAs!c91^>Y>T>-*d#iSSfJvE@nW>nXfR1zxqN zb?b(gmpe;JD|E0x^pgpx!+a}q%+EAqx<>3VPLI);qaNs9rb7&q8()U_hLCl}18b|T z$$-bq8-CTqG_;rgXk>+?dAsNfY5>s~1usTcz4iu<32!3o5HTe~6H*ZFBJG3jY|&i} zrq~3UMq{VqS}px4%!btetkl`BH86tVmFAW&?upoQawKE*cc~tQNi^wl%_1I_L+O;vYAd8`q zPejX0AJw+o{hW-X+ziwoOS8W8M0tZ(qq;kb$}#NRJ|ns}ZppJ;Nmcnzr}kY*j%W2| z8G5?CiI^2dvGe?U6QA{Wc*kcyT618V=#m6k8rz}Qgid|P1OvAyyuNi^aYea?P7U(| zOyULG{{*!eS_{bqO*3s~FUHat&;|NhVuHuD14gy9z7x!3Msh8JH)?bPHjW8S!7$Xx z?cl-v$R*UP7;t5@HWb*5S*I8C#zoE=tz3j4_-ZfIR9a8zFs~bl6{zjLC(;K!+|K%H znXOEH`)XP$UPcoy0RM|UEGRSs2ZBzxG`-;M#dR9geHfp#@w0WVTo-QeTGIlUIjE`*n>;KfAtmWv zq9jUFo||HG*gksoBP;C44pLcVIWRczg|}YV_QSS>+XU;X8TyMX~mx zeS?oQL4Cnl6$PI7IvoMu zV4P~~TjPm6Dql?|C2Ju|!Wph4d+ zSyqsh1^X;%^b7L~5hSQd$w6(F6-k=(#?ps(@9zETJ48EJ)i8DumT9`CsYr6O-n|%( zy?6W+#PcR{l*}_Ni{hBoZzh~PbLQubybX0>HYQ1yq>y@bXRiOYqOdUW^x3Q1b~Yb0 zAnx!{XIU8yn_U=z5h4_Xk|PO9B!n;FyfdnA$?$;&H%YKH9aI(9G?O*{Bo8#K2U45R zdAX+vMeIzy{7+-5h^|1xylUGL-9Qr{x}N}_LP$*Q`g$;g#EQ{~$8gbMAPsH1<7v=G zf|iwd3QWj`l4JT?V+W?J1vAa*)Ar;PrHg%2M-9@3FtXuD<4NNjhQWa!gSdnT*VY!p zbPbIkSBn9d2*J!~bodKGIP2FZP=s*@1%fRb{~8NMTv=NVazE+MMa)>3BxhMJK!Z8_9-raq2O6Y+9IBuV!z!jy~@B8!i$wn6>3eURY_bK7U34 zTPsQ@OHB=#f>(qv9kuBoh@PY!(og^Rx*g5xsLmA)!KWzdq_KVOCuPLOJp?@{Oe9Ml zTjQ(d-v|z6V&kS=YTogpD8KjCGe?eJ+py`7&1NN>g4OT!2{-j-p_ zn+eo&p2+e3uN;4mdFfd4#E8h}CY3BAE}|-`Ad5WBf=+qx2?R+(EtuVsh_7g60S2}x ziK>Ot(d#Hl23Zvx!@xv5MphL`mU)H&4Q?RsbV(xYbq!lxL+S_MN0cQgFDtjS2sBes zRksA|8NrZ1XBf96QWRz7ctw?+qQKIiXp4vVJ8scEwnOi2mrmSFd*J8rQWV84N~m!J z3vLRHc0;;RZb6(sc=Ui~?cd$Asi3@cbo(Bw#?GGe)2BHlg`hVUG@T?+(ksK61D$1f zhLd2M>WF~g72AKfnsVRAW~XVIv#>YQ5(~;pkQ8)@!r+#jIyY?U6x^sCk!}|mbU<1n zm?L4&ESW)|A3?yMkcyH1m!UiA$n?5|@Nffp+#Pr6tZ~!m_chc@{cJtPg^31x<~;O# zQal^%&2$UA=V}@Na@cEePLp2^4a)F3nxc7z&)4H={*x|fa@`xLUig`H$qrxG3N-=N z=!=5X8HQzfD~~v%APAs`Iy{lH@_-H~Dy&Y#)^C13vFjkiaW8(b{KBD=w=Z1v3GheC zkRnMIS`DugvFVE+PVGJBI)+%6GyDui)hmgPC5`M8|UQBRH9 zw`Je0i#M${8_)9`$B8aCnr1+mEGvoP{W}R2WfcrVOQIx8G6j0ut5)8MyI~>K3E)P{ zpiR4~T6i#i8NJb_Ur|LtwAy$@mL)+(SU)Vway&1(0TojeB?00BPsUrVG{ck?m8INE zmL*wqiyRLGumY+wL9a%hhmGVcl;8#o0d_8<8J3kLndc$ew8oy%=nSYnB5F&3W9mwR z(ZPd^)e{Hc^*8h?qC2oDMvm+>V{?!)lPqh}H_qd!&g6q2h{l6%stHsg#AZH}@Q7B^ z>1!N~F&D-)Jj6Wi?@IzRJ>knx?W$$9;L1x6ZPD|2V7r98?5xDtSlGZs7DN&B`U2dZ z<$2BOpc&@o=`-mMl0f5f$|5@5qn?}N8xY{Etc++-Z^rA(BI?x(imb)k?SRD-fn)5Y z5#27H<7ELfTTm@flt9oV&SnE|Kq0XzxB&&BHgG)8E2>3uyI7u=MG?%EqOy<%ofQ?$ z`u4VYd0pB4x82)YRTSQ8#k*2)xmk{-VM9kCH?20*><^UVy9BNCG);3htLS!HeY`D{ zWz)0Im*(U|G;PxL>FM`Ro)RjZHg7MF>;*FzqUR!OwwOmozOEQ)T)x_d!cvD&)y<3^ ze^-Mgt+QeC`6vuUCcf0LXYgCYL?Lu>(m{gA+AwiVh904RlN5$O6ZxK=KN~2b)rRL8 z>8Uo;y0G|fBIuu9M)r(RJAenHGZGI8Ya(quuLKX%tOnzUH&3+b4e4gWJvVFciW!5} zXW6sf%XAk4jEOYsOd*$lo^H68aID|Zn5w(-Yg}sddK_T89=Ha_E0juWp(*V@5F=74 z)DnsKhOoNzH#Gh)o;wmGp8SS53WGRd?~uNM_4EuPf5fo#$sI-F(36>h|N1i0R*;56 z?g%WzO)6|nLQ;F9D2gBmHY*Qm7vN*VN(+{uX}23BeWQb6yDdrpm@TT+YDHG2C`uNK z%5j|A<>pvU1}}vJFW6ZgBDA<&ZZsz}1Ggu^cN25;{hNdLRw3alyb)M@~@!Xh&$# zSe609Qz_2Iffl_rkfvcQnD>X-yJuq8W^QJ>pa;F;4Qg5r4{@jSL=)pT9|K!{Vn?%% zMo0RcNspZ8GnzI$$$P8sLj&2}ATXjA5l&Vj^huA{4KZ-i|4|(xQ@0GwlSx3MS97O4 zp0oa!mr1eIR4anq^^R#8zwnSl#v5(Jy8$&(T7y-}EeI?Ny0yFAqCR}e#zSfnB@1k1 zhvp0PwF52!&gB+3j*(?m0wx0sw=3c)ipvc!yMT>P(;UxMIbBap9k6ZZ$qSca0|I;~ ziWWsc0U)Xh_CL$AjLRjkEF*)OK1eSX%4+3+kAx6ff*?wu>>bQB$FYJa*{z&~26mGu z$qY>?3ZN#A12FfZD2otw3Fv+-%K;*yY&LMS>f7r{rrxYmli?H-RX*7gdkTGHmm23A z3vE~hXaR{<5_()l+mJOU@I28-)Ea&wY>LO6s42W2;?HAp$YfIENHTuyp{zXaQOM&= zK2uWK{r_C*tN*R>RUK8sLk%SV0iDYt146nqXu9wAMFC(5QL>^AZqYHTv?wk!b$F{T z9qYwdESBr3_m9Wla0>38ja#w|dphAZL(`Hhb#K&yqUkFs@iV#(JePRS&*2!*tliaz z31=U~GQf#PP3zkKW@@6Z!)s9U4jj#%esKHD{o9HnSGt{UNmNwOetl4j_Pv_4R#f%K z-K)iwWr%*znd}YX^qj%}CyJ{T$1%lY0$|3JMw7wrl;+TH7z5WEo~s zr#=w@AqC|nf898joR?4o=NOz{;Z zIm|C$Y=>SA!y<~SDh}MdcqKW$dF^`RJM{_i@t@smXp1@x{=9NZRTP@0Gm7%k@^e&R z<*8PdTQqpWhLiitomEyI!s=^<;ACQ-Cn0;9Af}&~cfNBR96OvKU5L z2LZ+;YIa%~E^K{UYgaJg-h0Fcu@YgT4BeVG9>7y-8rh8m+thLZjch|AHtHGAHdIoR zy+DMgjpSb4HhIFFb$y&z^&_-EoMWL8k*Rb{OO+%wX^r@h;w8ya+n!yz3>jeaawJ^8 zb8P3HfLg(Wri~A;6FFe~i0H-*EEFBps2hI$PmJ;S-a*# zCJgcR_ep(_y8n;;Wksbl%v7R4(W2C}b<=_41_Xozq~1^6`}^Le?V8aPb?NwJhGSJ( z@eB0tGqU%wUB_*9+pwua>ollSlvi|k$I+Cyl!4<1lopj1AG-Y))!qXwHmqR#ZAGDrHFy2o4_p)U>FE4a$m( zj_ur)bmuO|0cW>`rqdIX(h?p}77Iv}iwF;kirVn@JA%vIXZ-k#D{|&x6ZE0stddRdT`|`%36WV>t)u;_nbVjN#~A|DBV1C z`1a8gfwjWBjvsSr*I&(h^@{1%rK+s#;*LMlZpZeUGrLK*E)-2qdgraYl!qM8U)i+> zfNa94?mA^+R(wK6Y#a*>Jj5mxS?27vu1`&=*S@{zcHP;3DE|1V7J~f>02jRK+)>I^ns};Ri@E!;@gv1I>+@ zbk)(5Yihq3xiba}()B6AHpVk!a?z3AnQB>R=yY9pYd0}Dglc+l%`Zim)VPw)fK$=) z#C2d3BKgr!UknpPZyaF^->3^G27g;r!`#MptE>AA7D?XbVL9nMP6ZPu#si1Gb`LINHoXYSs5xUisf=G?JY&fg9R4;nbU2TjxG zPhLNHuwrntTZ10e;z>G(^ z`*xmul$u3ZsQL}-jF`|jEIcSTr*O}xC6S$K{~ASlxxd^Izhz=L{{m)S5vr(!$*MN#K3-u-Le`Kl`S-~k zGQ%>WC=KY-fnn$~=Wo9-d-Ty0Hv$5DMi1|H=KP(bC$4iW$Uw64+*6YWbZQ^t7R7xB zFI~HSf8o5*b)&<_jOboFGW3t_#~-EVwQ1F0(%9Z1q5jFqS(~>V&o3-pFn8413wLXU z1&tcsm8Pj!k9+;h7^v8}9$tl?o5gr#Tc!*5%a@6ofXSF)l z)R?bUqk;Qmm=i5M-aN*=Mr=0&l#FD}h94U*y?Muz03*2EN|!r^i@I9IAVvI(-<$n# zL}I^w83S3YMqx+j5JW*Ww$F$&$QoT@uC!->VivfDHOe(nB-+r}ok%J}mj6+64gzwN`w&4A7xW!Hz3afl+>8e~ z=~FxRf2sdCSyj3>YS}NQt)$2xPgRk+Hf-LzacfbM+C(>cVZfM~-3C{<+$B|&2s%tw z)#efPmJOdaqIK5?Iq5lNMN6Rr!!3%V+x6(uu$fbEPwO)9)ghBJit^(!Q^&UNxqRe| zmbL3kvh45hp3A^Wnr!eP0zLfRCZuD6pQ0Z$Y+J0G;S=;L6U-PZ&BUb$ zE}-pg?Trychg*vfV@47cs)aO0htDDN>_}Ebct8mE4f){uycm1{|7DQDlShH^jOq6v zWvXYOO!JHwN9%=02n+@!%juLQiDKU|!=GKXEH6Ft&iTt-2K9Yz)iOzx@*ZW1f>2Ue zoRglFpOGcF+@(duIcXV^C_iXW!dH(o4@?g!tR4R zKe&@rR$TV-#|yg->{L}=)pcN}C11YetaRPG65qaO>&2fv->zqC5OTxoL~4{I_C8u6 z;#bXC;2~MaAJL97+CS+IK0Rat`4|=w`rbn}8QBm>EA-X22r|%+n@J--q$=a`R*gMF zneEXwLcfUqe7ej;&t`OH)3-jpE2+yF$?WLPM85;V<4AT!Fq47)uU3HhWSXEpV$Y*> zQx6M8eRecKrcZ`O$cUMs2@^%Jd8dw}pPr?v>cV$dM>lG8{_s(^)4go%SM{4W6Jewm zNKKaItUPB0nXqH#&C5wmyL;iH-P?QbPa8J9|B_@j0Uye*AAWYp@KPB#|KwC9Y2jp`fxS?9NSN{QpKI-;G3Ze+Tm*(xG7 zU`_iL>ppn9khdZH>BM<>vW>luuS8HE;v?Fr#8%WUhl$Wq(;HnO)$XVB7Q`uxsW88J z!k0&aB$iG_0j=?sA=dFnICPC~p)nbXJn;r8w(ywhHi!{w(-^S!%t%_ovv4u5;S+}G zc!Wt~vL{Sxh{*;amF^nedJGQ_jGP4gP#cMrx9toljgxzZhX|ns?I^2Y5~F#q*thd8~Gm6QQ4N zcw?yYvdU>Q#&zl5-t87;Ne-(OGH>Aw!7aSJY~C{qrry7o6c_to`kV=`EngssO0WK1 z1`X>iNg!Y&N>Y!$o%#;!CWu1&&MjYFHfPTKDV61wCBeY*P+H`38&KEED8`4!2q&A(J zeY$=b%d?ly-wvx4^u>?M>eQ_j85Q>F56c|h_Or*Y1%>#pUh`5=h`%f$xCK0&ICEUz z4#sB>YaafnTb+afV^mU@J4>2i^U)U7@ra4tYeag9A}YgrFepH~t+6}tW-{q4gtRig z(w@eX?O^expMlw;Aq}zNW0>m3Igj0^#MD(k$fV*LCJ>ff7~%_8tq^*nE*&+g+ z7L1FHOT81DGH=ePw^z)TWMyFg4kL$l6=h)T3!>D&Z@VFbI=Ka@OQ+^WZStBrL1B5?quk0Wcjrz`zyIoG zMYS9|aid|w+TVQflAo`4+g1%fdwsc)|~ z>%Lm7D9X7Dv7Oq-to{7O;X^tLg4nrZ(+%Ih#&hi1^LHa^1^xQtl6rN+qw0ihT=$x{ zm;LC88=;~8Yd>2UqEQnuO?Y~A*??UcHNMeyFBYNtB%^Q8P9%P;>5V@B`Ws_^>VJEP z@9J+%ELeA&A%#GHV;o{!QFk{GHWw)q@uU!E5u?Q(W{g~kWfLN2{0390A$JS~3C|@~ z6^M)BvNGMFf^`Xxi6Vw)lHgA&m;UdizKf4MhJQ~4Do2ku@T)wbKY#5-KoH0 zDKAr1)!t27zwze}_cGHc%5o_=?(3&sY;Z)vHwlu}w;iaP`d7I$}<%w*i!lS77H(Nro-5&y?uWs!^2%$DJN@^s{<|mNR}zK$C0Btw zVgoH0Hd@3kEDhL2B20zyV3@8blLB5`W=Ioek(lE%Ra|`Q z_5c3!ee<4t&UWk#%T|5oZ+E}^;1e(Y>#>tAK4fZXFJ<-j_PzAza~E85;gYu(J^ha-GP!Inm)*5x=kLG& z+d^MHOr?JQuV0;d(dqZ!b)T14apxn(j3_NFdF8Q}c5K@D&P(r{ap@V^T-NValA`0- zSAY8Iw_kYs-k;y=IL^X17XAF;pIcU{yR-Y~Q;vH5sn<(NbEjQ&%G3XN=JZQX@9yaS z-M4?|75ulJdF!jc`pS9Np7;E}Ubx`8bD#eEv&-LG5r(PVTWfFo<}DBZ{!y=>(poy( zI+xC0cInL*-SeY=v^KW+p8Ddcmz?zeD+@2V^@3;q{=x&le$;lHdH;Ur7f<|f;p=3#=OAeCS#AjpbMdVr=%!sHkw&FNp3 z3gYYU>q}=dlMg!ZfnVSK+7nN_^2j6Wmo4M2SN(FKkRLyN`rLEQzU#lfq-FK)&JH(| z*7Y&bmI`5i>i@RmHtwoj`@zELvyb@mm%gH6VAX&A**D*`{PlTZ7_r$+9E?6{X+5z`}<6Eg9eEWfizWCrj=3IQ?Kfd(!S!bM{ zEiIY%_xsc7%*t0@JMNmRHoW(~pZ8~9a>3Sxi|aRTO6PJoOzaSI-Pw0%$gn3)G1a_(7+A9=iG=dN6N83tMKAVvuS zF!3>~Z7jS&+~FC3y2^hXK6%9mEO*G6qlxNDf`#BA00M*tMkO>nPa}~C^8tnkc*U4V zY~Z54P`oE5u_{@xjyi&k0gIxD3o%fXFrq8Mjv8G_VCWz-Zi-JGvb>lsOs#V6Nc0X0 zXC&~L%}kufnSWVYOiZvb!=noW5C;YwF}b6N=wW1VmH--C!1zZ7`e;HDz`(lHhdMsw z<9NvV-p5lySjB%h?Jk}u#FKerZ5pjhRAuJ%8ATFgQS&nif&%V%d0OP8CNm{5Ue5e@ z=n}|fY@#UMFnWT5`oz{2$qW(>or6cLn39%U0l0078z$d|!*-m8`o^c9c=7V9E}Zwu zyZLPYwv&Q_K#nE(Py@8-kHl~qe9Q>L(>nMvU}iVc};`t8>iUU~ib z3*KG+@IRiZsHnK{lOKJ5{?gz4e#fW3{^_6W+)*F; z!LIFfpZog9o_+j{)~0ryFMQ3-7ryk&{9kdF1uKKlRha@2_fVXuIR?FTV2J zJHPn;y|!&X`M@hb`Tdu#zUhJo|Mu)3e)hoYFTU>=g125>^tUJOJmm1{dv?7mrv*2y z6Z98Fc9BCX0YoyU1T#sB`6hM|QJZZS2_HA-@x@D8&nRKD*z%Ghpy43wV` zLFss7;7A1#fkbiaqT>Uh@qUj4l74tPx&JQ~D|*AH$#Pt$esA+5PrPy6)n~o*>cam1 z!ujXUUAulq7^coU=h&M*@zbTtH(6F{-doEad*FLV%zCw_yDz6o8yR`M;Cbo5ZSUxL z`L)I0z5V*LF8=za&AUq!HmQVk%Ss(QbKTmbIR8?8_xldd=@9pJ3{OP}3$9eUQrH}pVyQiOe}}vBk&G(fxEI!D8gWwfbUr_6fvA_)e_9 zVgm!bNMRe2KS8<@ih&qDm}GnK8k<*E(fB`}>P!5Xab~j)=wE|A7TNMe72SJz&Ehj> z&OUg|q;>T>Po8nu-{!wKaoDK#zV2;J^<~*yDwW#R+F0MwI=N<)E)PK#XXsAaaaBxT zdrMh1$BC(HyDeQE9lhOUnOwhDsBLX>EK4QiMw^e+R8(agcXjQy(rnJQtd{Q1y`8OT z*R^fCtG}nVwW%bVv#eBOS6dhaxwJ~#w=GqMuQZ!$@9BPQ;hUd5XJg2U$`T6A^ z>}cBS=u}@Cu!^LuYis%L6ZfW4sUs#%`}7%?>}aarP`}HyowVZ|IA-FKZ5#82LRmJK z_X>-*t-s-fvuY};yg=18%cL{ebeh%oR#R5+3s=rPt);tj-nymPwB9hmOfE+acmV_n zNCRS7p(sY7Y()SAw;_`PY#g{T8;^aWZ;|E%d)~4bRg+Tzxxg{a9DA)(;*9uX{=q4Q zm?P{Y_Zl!6K!B>TvGWq_OtGRdV8}AOZ2Hf0FIf12NfnWUr;T_9TR6}-Fd)B~s0@2acYvAe9IGz?RFw(V-HYnU`+>W&TD+M3%otz1`H zUg9{eo(jjZN^)7-wlmput|X@oR8i=kS5{Hh+uc*UV|Phu&W;?*nM`{9@^y>eTKK&` z{h+I(d*_xN&;Ik-?v5@u?FN2OUQsrB{OGEol~WFy;@D0Q1dik6`|@wUIREUAo;B~8 zHx8L|NUo%0$=gd#I{&266Gq+s+uL2&34*Yyy0WdgEt|`BwRJbuHIgsD_hU9;`j zs!E`VKC#m2bmN|;-tOMgvXcJ3{N9~=r_7vOHLR+vqHN8=b(w57lTGLQ^E)@~j*9Ps z;f(;^*xq2pjc3U?j%epcu-$?86WXEn4A(O24Qv=4Q1Bu2NAcg_g@)glZw479Vy8 z7iFXEGHl!NqojMJm}snFJ+W-Z*}isNp^z^vuPF5Pu6gghna3TQQx*C`-w#Gknp|2@ ze&u(*88MeIlPl@%?8=svrBbOqn>UAHkSi}Q^!2sW)|FINq;pxvb#2GZl$JQQ^WGzm z-}=Yjj-EEHqp|UzlTUo&`*)`F=GxGMFbs!JnOr_>*rnh9j!K^of=o$ie|Jx=veL<< zqk4b2=)bIG+iouBW{sbTO)+C9#uO$3Xi(ii-oh<&IREr8z$vjKT20QnOb;TejUT6{ zFr$;rwO(OJ78KT>Vuk;pc!Q1!WlbfF5Y#Q!VL~{u!Mov{Y-(T!T0$G$lvLT`76;(? zh*eSDPy@Yu&ft0aVywLMzz5J6My+soAke9>a|pkRo`ujVTt9NT(*SAW2`(tNQ4%AX za`3qDU2ftmIVKaw2FikRNP6bj7++P^RnZR8s05qWS>i)$^bAtTF ztJKF%Vt~pf+w=i1=;~9@A>fNr_W+?rS3XAXBEl^zy(qrGKp8gyXN8jaIFrK%X@;nX z7>G$p(Wq?4-e*foj%aEy8V%(48uO)*O2I}AAuKpm5lVsRXwuk#eQ@La{tt>gVx5+0 zqYTRV)QE>n6Pa}SnSZ}}-bH85I%4LUl^ae!=cGUW`o76iC$_bAY~8%0tU@t}ojYpl zY8xgWFi{nHW^#uqk!4xgOlHHH&2_u?mX(!avYc((58e0d=f8I2{ZHQ2+S2~cn~R@+ zQu$f!s19-_n=P*_9X)Qu$k8=-{pCBhqq2;Z44KXJXES^EG&ME0m6er*LAZLw#!Mz% zGkj=sV{6K{DuF(RSeurgQl~rY<#}0q!Z_lOEZZ?l%G6FhoA;3LsES*k2_V2eoa?we1 zj+n7*<(Bi$J@yyBestQ@ajmVL8#nK+s3^5ksck#zYipaPPaE%>B9%s72WP&O$+)Z6 zZr{DTvAnDV=ESyb``&-N_|30f`@$15^Qgr>F1T_t$*%BPZ3>wVZYO?7#o% zD>_+z^vG&Ql~dQ#U}}qyP!m6qdS?7Y&Nd3obi!cH)OX=mVoWp^(|`-c;sW6A{;&hr7H{*OyfRQXP6QeF<+D0A%hmIitgcO~FFdwx2VbB1O zbJ+41I62a+Sn0R_OvE4AM$l4edQ1z5i7edMf_`;;-?8l4*2cvJur0f}81!w%yPf_{wb+1diqCRI(^@R&56x>z)bz=0)P+0lj&M zW!Yt!Y<=KGHP4-llU9X~%nnJ)6r$oXFc%C29+kJB&OEm8&6id!m^^&U%(0Vhzv#N3 zJoB%&H>^-r59K#g^X@v%QB$UFsNY%N-eRS!r!Y=TY;WHXB<8H_O9E^Bz&Wlkdq@n73 zUO~cuXPOMENCnn3()YZ+?w-ef`wQ0TYm{UVC535Htde%s zB^?Ui*V~(oYw8Zz6aM{_`Sz2Ct z>Blaae&~!-E;@DLyoId|t*Ibf^w#2k-u2JY^3uRpJLL5C^p6}n(y~=uYW1xkR0svR zJp}x=`d_q(M-=#kTxb4W?8GVHkuN*bGO1B%R4bJ}p)MAy--!hM}+O=&4Eb3i-X;cl`Zp z-_)COq?85R?d|Ne9mnkZ3R1B0WkCVeFbM6eyL;`rovT;Rx%8sFTefz$wryR!#7U>k zDgXuay~5s2TORuA?P(PfqMCFZr?0EaGJ%SerJD)^{aPWPw=K&_NBePOjH{MukbLVO zU>pgc4md%L={IhzOtj3H8h~(PsWpoG!9AFuK~{_m1A$o0ez3iv5XUQhn_v#9DA7)# z08HFaV(u`If(KBfHOWo}g7Nzln}_yuz!dVp8Ky^!kWA@>Lx5hoc|8S?qaNS!4$-g( z>hJH61|DHpig8;grEZiVKqw{(V=5j#N28J-MV+0CE0p`mUm@YntUNc_>zNT-01G*s z#D;;kd;tx}n03jO!kl|zS}EC_fm7^6Q^e$IU|<^w%A~8nqs)A65RhzL<{9bgCpYfbtA69xz1RtCE05|bPmoJgLc z%NEAxz{rg#h8jsqqhG=a43>7rpP)k@hDia1;DZwCSutdgbE^(F?e5xH`@wrlF1qxr zs;Y`G2tIgc$yw*0lF2A3Mek{5+jdDwuCK4(R??T{`9UU?@_pZR9jKJ2d`nsq!*67= znKdgneEMVGo-%F1q$%UCy#9g_BZmF{m-l0x2Hy|z{rP7ed+qg?-YY511%BYB-PY!g zQ_nuuNk>gZ&t$V1mEo&45{b51Q-xpr${`hA!3(k(-w#Ska$TK0YKss*C@IZpwJz|3 z(z24yj_wPuIPI(pPPpri`?@;1E!(=|H~+=`h=H%5~jx)Q$lX~S-oQaceHkgB_%OtQWwsRIr4!9i5eG=VIyUz9< z^>4qo^0G@$sj5;w*SFqTanbq5sa^M zPIGhTxn~`vV+O-eSv+!TgF&?quT~E75jIs1DKGebHcSV8SW=Sh= zt@yZ*9+64~rVsAS6q06aFL}|h;quCmExs)05tCyE$(aUMQgCi$SyY-~=-&nu2-!H7L-JWsW3lCFu_k%DzXVx)g+1%>dZM$0=4<0*d!mtqq z-*dsTEG0h`7btgwv8HEJ+6BA z@zV~8tOM%s1OKyUe&o92&epHbo;-d0uo1PbP0@C!YHjANTXy=vvk#dtCGUHcrRCQi zf7Y@cn_GH1ZQFK?(SpXJcDV}tYmYx`cT2-N8&+oBbdU-&Zu;y)j~ZKDqxD80X%uRi zL}Y$}YyL)VU}~b`BotXffno4mv|U=drLKP0#x2L4 zcV<_6d;N}`Vt5gD_hAeGha@1ifm{uT)Q>ij-Q_6*vUb|>TWp&kQm!7R9 z;xj&SPH9Ei`lYKgIhDg`-Z98!wyJf~YHPU&Q506H4?qvqd4yTEV;A!IbFMh|8^8Wm zV_n0W&%W{aUms29GF3w=l{3J$yF0sAe6ak~i%#|ZV9)m2((;lo|Ln^Xr%kNgUb|%e zl3TuU^8trUo%i%S$F&!{vGB;_j~F^^=$`F+db@gV{`yTvpL&#EC`5)5GbC+%R3^3v zwIZWmL@^M>EZcRRj+V}~i`Rejlb4J?U~DFvKKhI~haP*dSMbx>^aWfY{s zLyy6!30J6w3r4kx+7W;gG=KOq;x85ZLt~(62TYB;E)A2y5(+bc6JTF4P~F$hIAz5H zYH7eN;!p&*U;~KXPLK$ANjAm4u)jkZC5x~H0c+QJv^kQ zX2I)kJpB7V?B2R<^u&pg9Zx+Mgvzpf`KLdzAEk>{Ux`fax?cu6(((EIecI;}atDk$#6{mgbHnp{Plu!nbD)dm%f{`{d?Zo3I z%sEm?mSTRvMlCFR0xpZ#2T+@)>#-<5{sGj~2b5@p&^^GRO^0|+SLGG{1u6~*cfjT# z`XRKBBCM8b`f*#=z9E}c37~5f_+I4kqD`1S@1wL+@fQuVVF((ZUm5xmJ2%!XDIGv1 zTd^lqk~YR}kzl|+D+or6s-W6WL@y>pqsyjv%nE@tE2{%B)|^H$>MWzR`Gmx1Sd0?W z46|TF8aL{RFb({=`N4g}Y%&wHlYFzR7bp^7h@0VFd=$vu#0n*Tun!sXFM(A6k?|Es z^BH4{OhLuaQ5INBEgH7WXbCJF@@Xzv5m2F28o^|2SlAuWH^HzzyrOjFvbDQ*>^b!C zgC~HS*-qCXpTm0V22mk)`dv7n9IAyG* zOpT7^C^4z0t9RLgHD{iGVi<S2;4QsYdm^^0m*x}`srOM&tsPgvJ!>Ud{|G4ss(g0%W z*~F07lFL0YnBn+_pcZc`A@s)@5(rl$_?Mlsz03v#4Av|{EboiygLq8zRy@umRZfs& z!)G*8_D<|D#X~(3V}rV8iTNT)c>rwTi}2wNB*w*i#pnxupDnboLg~xtwEN&Aub*)2 zAz%N}HBUePUSEHH$+C^vbo!brPSY;6D?V~cMS1Cxr5m^J*n8w*)22)slh1q8r;b1I zxI-%|O0yZYBd{Ck6i8KrAk39y?!V{j$Im_Zo%h%N^&c<3F@MF>Nn=#Xk*jKhxvtaM z)%(Gsbr+sLHw?pVJL+?}%#Xi!%k%@r_4eftm@?+{Q;*CSJjZcvxc1Dty{)_JnzRnp z+1300g0-Kx^@2lZPD;DZ>8BoX@(G8ALD13J{m%PqZodBPQ6q=-=e+}_j=A!(lV5#f z>8KIayK9@?d4J97wL7Lv8a;OG@X87m%1kR>&rUjo|vXG8t2 zqb48t)`k@&>FnN)mfyee)U79-f7(Gurcz;5N%?PI|95j|#~bUG9W(i$UtRg>y&bJV z7{0t_;VCl?A74GZx6t3!ugaDaKaG6s1>f)P??dgr;Cmf?-KsKfUr)jF`n|%BpMT)? z3$FXkHJ|G(^zUrmTi4d?IChW<+IqUQUKdgGptG+x2tz*%HrDUH`q4<_hw5=yV^Vbf-(Vw zL9lb)l%ig9@n@&q#_|97)!({0I+eN27~SpOp5Dk> znCfinuqLAlrQ6nR$z;;6KK{xN@BQK1FT7K`ZFgyD$^7Tuo_ye>Z~p%F=DjVILo1s0G%cF9 zsAg16XKM#~C<8C(Z0n5nUG=-#x@=2rc;DTjb^+4MmG94YclNkx_x@iz^qC*t_Kn|t zvA4UoslH{$#$Bl}95%B0(?7c9{+~Va@&j*VOMyt@%%dJ?u!>5uLX8FuOUmE~=5NP0eA+LcF>2RahT!=!(!fWiGRlNkJ!hGyIc8uzQ3=3_tvfJ zmMy>i?%&ky*j`pyX{D^Uo_pTa(R0y8Iy2|Yo^;@hAAS6jI(}67e*5!BpLxb5pSVrs zY-BQ@{LvjP4Gs5v>$|62@zGIJCf{+*4NjCnuEWh*>gzuG<^OWind;G_y4%{H{LOD| z$LZp%a%eT$xY_JhZt+`4#a^X}avCQn*D?=4qhHw@WI^>=j#K~T4G^UJ^a-FaX6;)yq2 z?`G0YI`h=`?oi>0zTe&2rr4-$cel3nb#`6;vmZ5X+49<5zdh~qpXqLGeejc?R|HjI zGtNBCDefw5!mt<%VuedkiqH^+FYDz(T_hHh1rbZ!O$9vOlmY<|La(o^eZ)2z#vDL` z9uoFIeB-{|m|_zq6) zWEzc?I43-d0Oo{S7;(v914zDZB!!p>6ml9&s980Qm+|T(v{<;*WMU_Q5tEY96$|rZ z9JHA0lrY9)5GK{S;dqaam>5wgO%F+MRQiER4VtuHX+YS|L1qWGWK3%@cX)CQhkjX# zBedMKyJ7v7wW~JHJ@Kg5UYcK8Qc_pD_pYD*`7>X<>Fo1Q3Bzzmb=5EK{8QuJ=2u>L zd+v#Iet+MO>T4UqFnsRcZ=7+?@e?ME>FMt6?C9owvXzCd>$Ml=fAWjhUwp;cwq*?) zKIHD7+!qAlru92Ma@E-yKmP2W9=Nl)v310#nnmxeShHgDxQU~i zn%d5~;Dk%BKC`T>tg^D~=Rdfor@Jqs3P7hE*ZIq@AFdiwap!Np)Ya9~Sl6<3<4*0R zzW4V}e*K5H-F@G;TU$DY4IjFC*{0{7cx&8*QQ!ILr~dNT550od+S2jNqi-C4@)6HG z@FM+#;NFja5|bD&*H|3U7+rcRnylH5itWICN*yMFtM)mu(E@$lzg zT2NM+tKHM|!=L{1YhS$TqVtbSg{h%KE584u`x_ctpMBx|lTVoS;NQPlTiXMKsOENeu~kUM|&U=W7uHtf9as?*On z<;Y+E;mNyx_r%Zd{P<)4{BA>2>*$fg-g$rZ@>N?VO&rj+uUtYBW1Wi!C#4v3$BYre?%`A1XcVQ2Z>VJ4&f341!TpCT6RvR6bzhE3v*r+ivuK`K&8l*ZJkkk7nJp z%B}MY!^*1;96iBGrPkN&Z0u}LtB~3tZ94~znN*Q0*|c|eV`tmgA;TLx+tQ9(lF2r8 zwSz@c&7%r)&F0FpB@LZzx=SUwTzRIXv9qnZtg_$Br^3|Cv6GhV*jQaw8H7P=ch}!< z`T8H1l4E5;0|Y3^z-_`VgU9LF9}F|@I>t=}t@W^!YOR6Dl4tEI8CulJzQ6UGj$ z>FDiQwR>x4U+=7OlfQiKRbPJi_ia60b`*_SD0oB5%MThesU)4<*05(wyReO_MY?GCRP(%RkCSLnyZ48v4;E;ppKe0NJDPN8jE(??CH zZEb4r?u>L!k!J!?2`pyRh+Q$e6kJ1`LJ6D&g^OHSdfq#0<77A98k^Fvf=8LNNPq(*WK4ksspb>$Y(#5 z>V9L@ezEE3VaUA5d>FZ5m}+H(Rp}uaKdX(=CIK8|SV+-P?*w63T2YZHDQRtJ@(NzI zv}Ed`hm=-S?AW-uZre^*Nl5n45yQJXx_Y~N!c;1oD;Yj+wBx#swe_9top$u$lx0_s zsOjqH>h0;VEIZ$qA2xFM0f!zKhN(@f*EiQUxvJDlW@t@yQ@z?V2jc_6D5bHatYqX^ z)n?tUI@fg_*J*8PjqHqJRdrR$vO8MaYeo%kZ|&&m>duzrW*mCp(BVVtYxizmwULMJ z2A*#_&h%L`sz+Au*}iAn`fXA4pdF@CBgc;HZ0qXj?6w?Rl|u9UNi!ympEAC+scqxR zjb6boDJ>Z?Y)DIEtKPUHlgSJnKBReXOFEOT7*f$(-&$Hxnk&h+Hnyp52dT2k(riht ztG#RHoP##6+?vg0GPz9sj)w2t^VMbVtbY1$FB~{~M#HYguD0&TNQcgu$n0VEuhMH6 z6%(N=$nDIaWGslWh(@MS`Ws!>=N7x-*p}@Fe%|Zp_j?QKZ+D;9-LL;EboF{&LFmP_ zg#DPz7+gy(8tPDTnN)60kcW}EA72BfgJH42+`wSXGl$g^erSyx;*G3mS7FwmHEMK3 z13wyX7B=sngH`wT^0-07Ds7E`x=yKzsw(ZpB`JhU*&w@xVNg*~Sz1=sSXUSN{^SD> z96x1BZ+F**Wy^ayJJYVxXVeh{mDSZHr6mo!YjuFRnuQ>!96EH^sL`n~@CyZHbo2c^ zTecp3_E{%heBsYO{wZA|u+Z0c%bh=T9Q&c4{QQvPj_vF2-Mn;Ze^0NQP7fV1-0Sb} zYHjxm`C+3+PnvZ|;Q8BDtmtZPb<^p}Vb!Trsv7w$$$N^7&hS_v^O0`e%On^Gr#J)?_r7s2Vx4(A(47-r*Mt)nmtwKlEU)Kfh!7 zir%(1C!NmZa^=<49eW$XDEhBrcunQ-;a)!9ylwliNfQIF(6W73Wc8zbc9O#l(8to@ zWS|t(qr?d(3m2>#2U0X2L(^uf9bU%?o{{D`(HyHO$TTAK51u`zs9i||lAx{V*dN8Pv4KuqifsLTJ$)1SekaP~RR?NIS&^IWzU0wddAh)as*2c#!6fe@Pk-vEA}q)|11 zbRp<&X=9R}-ijL^HeXRY^)20&+TY<8s=*cn$ipcP0B}`RrB2vSkU@?)s_&lX_4f3A z`-fjlXEJww_t&{>R_!9%pC3MA*ujU+uqP-#xP1z`~)=j&I%$iYIRk301mWI8} z6DE$?Ti=w)WJ=3Qni^CkBGQJ#RK8FcH(~VjgQkRGux{0shPoy3y3U^6 z4Q(wQj^oUnHEramn%z6=H?G^3?=M_(KRo@CKys( zHS@3o`up;$mTpYDZdG-~-aSnnQze_-DCvHw&nDB?RAYiRCOIXn8$<>hDL9BYJW%G8V7=dz#%e(M4v7z zukrk}E{Z}GL*#4v#Pj^_p1z;{@Z*_G`WxT*Ye`PU!}j+VMvfSI*r8J`%UZd5Yh8Uy zE|>9C9U%LN!w#sbEML8LTm9bFNfSra*SBP|>C)0%Lql7Pi{$f#i4#W7oG~#B!xd|` z)zvqrUAMF}JAUkNH|^}&-PqFF={nA=L#B)wUA<#x!;bMj~Z3I zQ?<6kvaKKphE-P{K5J@UUw+B5P3g2-J+!>Gu4UASq21kmUf>@vWz5D+wf+4CrEu(* z0VQM)x{~COTw9Nw6nO^a9(fW!;)cHjcVQ0}yDXmxDTD`vCIDVKW6&~CgN%_emTve7 zHW;s+MAejH?U>tawoH-Qlh3_l1wRh2e$lr78&BX_>q>rib&9lDVw>_z4Ig2>|F zsvvOIaAXJZ!$9rk5nTwvAP56T)m-<3AgC^{y8D{Xt=Y5v@x^ahmi5s&C(jr);d2k% z-QLp`hJpH~j#Y~)E@?f@S4Ept@_e+1uPVA1m2gtIz-c%AsZ%fN>g&1pofk2(MC}V1 z1kujls+yszMj@6sv{HHB3;e*2@`%Awt6~*(wr>==W*%3=34*kvtAm-b7JN@2VIu67dFW_!Isr+FuDZs4%4rf7w78 z{!GB44n5TIK4#jC8#7QPQ$j~sCBncD3k5F>Ra&1N*(t(MRT;Bvl?<3lS-v0mp0A4c zxvpg?o0{&uU+^Q-6C|yx?MA&+7^U$#ZV;`US5VR)!syuUMA#@ZC@3`wDZ< zIr@ytPrl=}U+&znTTfAB)!hsefbkKAnrL zuBbYM>P2G~41%EF@5y`Wzka``-|JGgKfk*_-__@J`H|rdr8i<*MjRzLLYJe`cM+V_2hwhE`x zx|BrVd&=<}oktI-QcA9)iZ`iqMFHHAQznl-VCscm{=#2A{^`c;I~`XsR@@spP)MY5 z-}Sdb#iUgGw%YtEV&T3YA&7b<@cb|uyOYlNUP0B+P^D~z(T&GPAqNurL=kPvOgcC0 z45-RTqa8{3i2#gbO*eBZ9^VH>;Rr|pPpNVeX?W}vG}tlg991{O*w>@y-%^anIpT47pR*b_vqF2WI4fX&85#f)@hyU2TmAPCZmVjBbj=we3P#7c=m zivk$A{>>L4uIa#X46Gf+MhFH3(h}m!HF)icmBmXM{)!$k%Nuu>$}h>k?BDpa@EdE9 z$7cdWD^puhev(E}#7f9qS;%dKSSj=^^9!BDY~yPk(#Pw#A}1rYOu<;X5cIUPL*w9t zVun9#eDH=pKoCF)w4ehbR~9q;!5<(b5u+V9e$==LW54j#+rD@EFV?KukOl!MP`pBk z{0ja}xdx?2cm>7GqHC%MpkfxGl6<04V%&D34lmMMbTL80aTJSF^yPfPFbJi}!RnwCZWe9iEofB5Bt-JLxroI3mR8_vD` z)4yD^d}BJRij;W;KTHLdWvA1T*cKHE^gLDTRt-%FXo2gxUcry@DeXeRbJLNEWG0xa z>`2a~GeOvUV1o6GCayE#!Ndc`+%$%4VKHvJ#J2yHk_cl0B$o+x$US7#8T4=wUl1&b zbs5-(ajO|?a;z`%aZcPt1S{{NFb0ZAF?dFjUNOmWKZZYf4A$^xkjNT@;g9x3CEg<3 zN~wwCM@|?&@|$0~_AB4`)AChn?_J%b?}Y_V?KGe?AB8FEP$4^>9|mD0tl0{iT(#c- zU{m}skgT#B9i{k0mIOdjl?bm?{z%iYZ6#jz_4i+UeBY_KUXeb5gCVUTv* zf)`Jf|I8ocGTn<^VYA}xVJX#YSWl{8ti>$@aSvKXcI>CzqF(J ztTbbz0+H;aD>T`*i%!R=43hHC=$2c1I{*9W`))YytgoMUjg?C6X>0o4)AzM?E9<*1 zcZg-2H3L)1zbX-?TF~~Fw5#?r)h4VU@c;VObA5SLNtdx3W$&}okrjZiv2HjbP8r7q z)zD;3n3hSxG?@sIDaK*1Dn-EbfuvHo#e(Swm{Q==q-GdPAmbz&{fM-~z5%TE3pa@~ zxgHP_U<7P|DF2hmkAne|P_Y9^B;ukjxPuL6qiYC<#&W>GmBxjQqK6(g$~8p-Odc;Y zeVRF>B70~&Wdw!B&bO=F&%q-fOyZpWqd$zo2iE^Vjw~FFfQWjd7d<@Nu`+g+iN2BW z5($WUxVpd}<}0CKZKWew(3Gb)>T6;8B}i7!{`dhEYVIPQD~ld%(Bvvw3xE&D3VU2BFQ57z`lW>Bl8i@ye99y znhE$EHbOO(wE53;4-AN40W`ND9?%N)h9tZY2H1%WY;qA6^=Ta?s?mn?QZ7Oocmu8FvQC&`@f6K=H(E8&q!B8I;JO%*s-XX0kJ=1v1gm&?siW z;#zKGTGNgwWfZeql~p8M$C1>a>sew0`mW*?8ME`RUiGf_&cA;5d-f^6fOdl1ix(e#QunnG2SB06a|U0qvIxl?5EA6VW(sD&`mrqlxJ_M63;C zq`*NyCwPxmi=;#N0=E_s{$bGwf@oZ6Y2SgYKJ1BRCo+i;UXc)GHh~X|(tDY(gwz0& zK@jDD-@t>y(i69EY3&bd+%qsl76O%W*ls6g?1(=fLUyNOq5u;yeg$O+3<{ZdaEW#A z3=LAdO*<}<06|D#(rcV@oHcW=b?8CY8e|V5)!lfe6=x{R>DgnN)cH)jzu2;x@V{C$yi4vVM zzX!0_CEMmr71Ow6mJ8)A8;MRgkI{S@Le!2DhDPv?fgA|6+?au%4F38F!v^^F()&L6 z?$|^I$wUO!3WHXhSfVSGgyS$wopH{|b5EG_>I-kJTeB&$`WYxxvYOEn7?i6tKqcwv zOOYupk~6f(i7p11^>ieeu_=k1$3|*0G*Ss&Ao4qo-B8!Obm1D?v9net5>>c_rF_hH z-SPM9Z@c94-?&~?Tk7ck@$G+HvtpB$MtLzuD z5I#8>m~qEcOTo@C=)xH#b|pk2qJJVuRj>k1%ZMlvYZGb?UeQR&nJ9{5+-gW~C7e)F zFeBNDE`p;eY3>xj!7MsSlOm2ssDDv^8I&d^J!l0)NTo5L@EaQ%9z1-1zXyy_=h)zS z^BG`T6Uh1U<>VAAIje|N7Le=YRWa z*H~7ny`$%=-~QXO6O({vfKxCymAJud z3o&{=kU=bI9|FMOWDd7UgWL#^Y!Du;eKbnqJKsWs}p9`vE1!cyuBEGVYQn%V}~}#6y^p-qHV8BmOLi_?wWet_=Jr ziEF?QnrR8Gl&>P!jGDwiNQV3CyJpe3+(K62*t=XNkU!N?P$7F^Njhs;sUB4g&`vwf z{@*1VEy^!Cz))S+S#kkTJaW0}_!S+*r-2 zW+>-3v2^+cQq*X;kkO61&kShqHd2>KwKdyR0|;_C(nRXfCXmp}n6yW|=bhxs!dug~ zP&6}S-9#YL42oW_q;p-%$B<>ozj#3n6!=Y%WPE_=*r!s|Y+wSXC)c}-Wsvk2V z6j|<|*cEokY^@9*Vjm@?T)zuhy-{Qz81>9a^kh^4j;@G^zkaVL@9QMruD(J~pV!sz zb@mlZ#2-wQgiLvGbrtb_e}R4+9}GR9m1d$2$vot9C{k4{N(@)2zN0ETqKH36>||EI z{8r-0(Apbw>ZFbNn5KZg^xjKE_da1xmgTmCp*@qB;Okm`Fr z_4V>x$*P@Ozwr0FqoSL}PK{G17lF(wl7cZvG&&KVbg}lPgVcS~WzqH637Rb8Cq=%n z|0AxF8F>W@^Chd6fb645KU|a2)_`A<$u*J{#7uaJm(dtkZ2pS8#T6yep~&7SXN!ry z$UJ1sgs-w9R4x&8-#iH~8j_Uuf}Uno3PFWs8j-;wsJjU!YFCtUPX zyvaoTvBC!QhrbmOrch-+L_s~wf50gvyCMM}kdB$>$lJ$X2XF?VkZ{$oSQHDDHWa9U zaiq1P^HJhR!7C{(aU8p^w?FU$<<^yl(5C5%#2zVkBh7_$7!U@<tB7mO5*BDmwTE!(3a0Qqav^fdGRKfGoD)~vE zB$~$Ka}uMJROx|Wj51bX76q4xGZ!{5Q81C-dnZ}y&azTogiWPoImfYkd;5Jq%x2tu zm`x4ENJ#qw%KAkc*w^F2g))ef{XRiqY&@QA{|AaYY!7;NGZ|^F4_VoWEuW$Dv8Rhn z0J~I#g%V??D@7P3l%j}zjI2n}UX)J0yR(t17qM5dHLZT7|AP^KjP&TA%vMXiNCHn$ zgRrqoDsM3KI9AA!KE@j$Vviynn*?-W@$MSOBK1+3`9jN6*}H0oT>7Lb_r|F-!V;L? z3_YO9)?w$xh946yWBiy13J76ltgLl5wQMr@&}4yTPHpr&u_}J@NMIpz0dcw{mM&@S z2RVX$UILN6s{6wViJ`N`O#V~|q3)u^p0R$Km48nLh&Zl`Dpg!`%f+!o)vY8@)3NCbk?TkQb za_nU+fE6c_jKT0BnU~n>478cRLnW)?P8qcDaOBcP8sw&tT?M;G*~HvC2?WfI4y6|O zK{^vfJPCK3!8tVNG5bKYSp{U1GHFW$Ek)O0Gh__xHlo>IxVX|73t z;!QOX=yP01VlabIG5n@(GPbD5V8vb*H1pIo!HS6Zm_}oikOK`;0D=vCk=4=@Q<_NJ zKzE&?({Vrm41w1fbi`4qC?iA$5ffzMG(5I!5bDbL7UPb_+8Afeq8VbG)K%h>g4GY^ z0PNH>P6L9WrRXbTq54b%Wfn?()mJ4`3M}3NX%7-rqRPo}F<}7T;>KP>(R%a!M@>B_ z?-hRX)RW)6?8Xxgob~dGg}HR5IGw`RkdV_-CDv7NIuhtG8k8Gr60^wpC6|zZ;})~~ z$)}675*NeGawHVa;>BBvt0n;X5M3}3^<`2t{^mdQD#k=K{%ow?tC#^Qz?XP4(ee0R zHA&|=rsx`i0dhRmaAK4-F69C*BEpIDlN3t#eZ-$NVma3=qDmp0DHCoGUg?pU6CHLJ zBPnq)5^<4TjZHr96=E)SQxI$R3DHY6017EGtdM+0QGSV&4OD#@l~+crC)P1|reVc!qF5vmb&%a-`B1QyiK1;>g7~m99$QvYJ%#ct zHud0aRiXk8D2kXPRwG7)(jIR@uplzc^BpAELDGR3L|nDj)&&(oD5$&aw4=7z&gx=K zs+78lmn|}b(k4?3?Bo0+dBV(Y`+Yc0(?8q^&n!+%7%XbM--*K*F^Zy~IA`!_(PZHU zAP|9CjBxV&E?{J_K63*I!5+R8Lss^3l30sI%(gk2&LMfFFNw(9K{2Qgnd&R$u7tP- zSXTr@WN(oCtC+Fdan{z&vKFXYx2mY32%5-eHzR3Oyy}jId-Zeg^T$ zXka?ed5cs`B+ZY}1U5NbPsd+LhLyC2GG3Vkddy&oo6hz8F!P47cyf^lR6imE+5*nm93?kfNtl zH8~3$6f!ZBu|`h-SOeQJ>ko1-DUTy^0HjzEa*LYX{27h?x>|$03mzQU?Iq!TWRkdX zDI&NqCptHG0C__T8*H8@T-y3Uv^f(cFsY?%LQP+x%n4i7*p5gzhgw^Xc7RdEInfA+ zje%VcOFbfgH~z>Ossfej85V3|D+sUH;&BY=gT;j$oGh4>bXfTW(t zm>V-iOuB*3FutrRniAcHDIqFp5`r1MXM=?N#H8%Y%9=5)7uXCyh+dBfpUlVUb>a*p z%ns&2szCpv*(SokaL)8z2R0cJYSxg^afnhCU*U8=N#&U$#aV`7kMJFp!epN~bJq5T z`gOZ^EZ?!|+7r*5w`Li8O$a8~H~N-fsYozs6lh)M^(SbEaT^|^mxSGt7}A!#i0}yU zbcL~G76z#+7sxBn4)Q3#dCu}B3Sw6w5H?=BOc6Jpb-}*`$(hpTq`EyMdJAY$jnc4rc?M;N--nYhNeHmhiq|3Op(Vye_z* z8|D+?L5hp`9FR^4eWas>qyY;Q|KWWB|SgfUP7B|IQyl<6Tf zx13Kxq9@}mTAxHyA_793+eF`GrD4(T3)!{s3>6PX0Wc=313puU6{@)d-2ozq5)a89 zz@5ygF~7jJ&qjY?aR?MA0BN>n=`n{KO4Dl9M6QZaP5E?jCIVT$dREZ%#O*AGb)d?E zPfNUDHYc*{at)6Xn9TwirI{z+(juY_3-LwT4A|1@+0diZ`NuJq3KBDq@njZz0WA!y z0bv0s!2SOr!jgpw#5DvovBH#SuEai$x<7W`1Rt0V0Z^d39v}?LDJdBjRaJ_s25@I0 zZ)CVIqcv-;J7aOf2D5(?JPCG8G*<8(b43zPqk^!PiIf*f>}8fdU0ZMfGa~2Y&{h<6 z1s)W7lFB2~2iTV=nh&M~lYjMA9=e}AxQ}hrYYcf%$SVLjD(bs>>-K@Y@#LkV$Wbm zppgDyINGg%WD%JVB_l=1AH@#D>cRt}G9xF>6%u4XW`0jx0U8V5v{+23Y#GdusepxU zqg4WwXmap@v%w50#l;?Ey~dM6Q%#e=J3)~YB;;{vh`tNr6?UITTmgp%(x^KDouMxR z#pNKxs>uMX(X@)Fd!(nFM^U;EjSl2O%?e>YNW$P{ow@nBC_EOsx1R&p4WDgjGiu7# z)^P+p;dCbL3CcMz8jMkbOuA-4+%mlozlWY~3F=``RZ@E3n2E2fT$DJdN80*rh7;9AWGx_&j}jUn4-maFt$XCin1lqIfJDrq_LS24+H-~ zw+-?)CRs7-DhbchJWBcl4$&CkxP4rXf~$yRt^@18*vf{LLT8d6%Xbs-0{=iw7%nFo z5rpgA@CjmVY#vboj957Ld2;L)LWUNhA=KB*w-9O#AQs_nG&=*=yV=iSYz;(rVH!13 z6WfKJpmCFyp3M$Tg~okzfzf+5@eBZ1z7QqSd@HnT`R}gj~{=%ek z73WP{MEY=Oh5l7(Gek*(mL{$c#B~9hUU@1encLTrtAOGiB8m~WV{3?9Q*u42x+3RK z(jpiXBB|_pVt{gptPv#rAYo|%Bvx{HkVl-M4(1T0>1gYD@~bg=k0&g{iz}LpPcli7 zRecpCJkj@%zL6AeW2}pSU#kp=R`k4CPm)-4TO>Z#X{2yKUpj}+|}lM^JOg6JoVU+i67y!Asr&`>BLqCGgMuuj1H=^$rJpbfti+fcHD$u0kQVE+7L*Y}$slNcn#fU_YxZ53KWv@m45yq$_QAZN$&V;h zY#N2_56;opr|o?Z)@Phu@}LK4GHH4_h$n!nxD7x)hnzlcOW6mw7Q4&{)xIzQsAT*( z!@m;5b5K-E_a2D`h7%*@)7Cx|NQr=%-5rtEa=poH;23jAAsvkno}wff(GZ>H1Wvv# z=m)e$zANq-DK>#5o>ln5}Zgb$OecP64EerPrEYZcj76{F+q@hJTA5( zq{#7ui){cn7&BQ=OrTRvm>6I!_sS zChmze4*v++m}H}ZgbR8rPT)t3F2H%y+{}1Ah!?7Ek|yMj)0y4Ur#vw;?Hq0 zZJ!WNc~bOSG*hJU!Af_`HN-G9bO7H@V<40I#5vcs1`Ly<$fasRXU( zuQ6bhB#?-=?8iQEGs#M@HFVx5ac5Fjltmbxsy5?j0v!I=h~>dX8g zW=sGf{3eYn9C!ybzO*_#LlYUyDTJVU;AU}jfDktlk8$Q>wluzv8Q2HR97z(*a-kqv z4t^M)A^P4UfyEAWlnTxX8swQ()^t!$m}!UADWV!z0K72K5Q$4)q)}qN5%{DHB$_EB zf(_BlrjHbO6=lBiMPf)}fD~<9Y@T>3oCH>Ka`8uDoGfDuBO0J7L=c33cq(3UnxM_J ziMC-LGlEN?*O=){82QAAEk=1j=Lz~)mP&zNc0hRY z^<&y6EF2{&^o~jN2t)Km^OMjLc_Pf0Nt|JU53x$wdM7)nJemv?)G&;9(o895<|b!T zSKUQLSAQUi93*z5+f^69s0V-f72Lanh5pISeBp1DL9U)q7u2>%l>1ABkEV+OVO;DM z0p}QjY&?D}NHoTHMM(g8OROw&T@lrnu}{XHZ1$uw*(N58OTR}kV6lA^_Hhuy(KIuD z1)wVWe7t4m24_iO5S?KdHJchvF)`tnBo`#y(Jx-gC+T%UzcjXrw2?Dgd>t#=0U*=T z18FyoTQsgQk2h`V!8RGiXmQDr;|E~8p*V)k>NhEnlMxbX2YSX}Pf#-890((9`xT(K zdKNSy04w8V1hAU|WN^&x>|m*R&By zC?hb$tBKQcXh4347lJUHJYuwC+k4wv9LwqM>-%8S+LI4H>@TlB+n3KrU!(8{BbMRb zE4(y&eD!qoW^*OB`d%2?mX*t7dh`9RrFJjj3=Ec&G#TQil2oyDIc~qvC&b#4KXK+* z91jB$x#$9@DHTK9qW~Ic593-nG-Cz=bqd7*lhjTkJr4~c7Ni+1I@v&Kl@g_fWeH$x zmatwY2{o~RH5eOFE zMl&kO6EBO+U`~=K%5Nqb3v~1|3A7TDAtg|oK!ke8zW^E@e!-Yp zVth(2EN7nl5sXxmk)d28;A+fCtD*d;%mu8gs3o zM7Sz3A_K)YIBX$7Vt|hUoH8JbkDANG9IuM3j`_S?J8T3A7?A)F9a!*klAVjDkSFko zjdvx6_wZ3pK%>`KxidpZL^La&5N(CJ3!?lEaX9@UqXiHVX3tU_wmGi9 z`V66Lm>P^207Hg#gQ+nyEUQ5e6b~>ENf!HCfE7|MBxZvMRYXh((lMj@BaV;{7RxvB zR9$1pLZhCc3fzW=$Zhh#k#>ny;;~9dvH&vhW29QKC51U-8rNVk&Ws(*8*GNT4r)ve zAyr3#_2rL(4UPMO0WyGEBPl0EDwec~{EtlVlMWS*y}VG%9k+?kwE-KgoAthH&9Zdk!&LO>*2`J1bhZ~ide;A`>v>hw5n#?`q zrd-M6JF$_-M`Hyk9P@GXcR}Wb2Pp&4&>fU1U|J~i2?fTY3M=(XaAwGbLQa75r{NVz zEY3N|$8uu>2*?-Ff(hxkNbJeJ52>^>77kcL3ttRT8wX zJ^fxjz7N@Ey9Nk;!Z|mufiX+(XZd`TooZ}CjFy+0CtFv~7 zQuuK&+zuD3J69zqBSgd{)nm}U%l|k$si7h%xNMwC}XKl4JBYCFzaK6M6V$RFdXjBIG*~uE=tNN*W8k=8jsvM>OCdWw97W6GIlW4#}7o-Iu{KCUJ-n zAiW1wPKSK!O9VC?`ip%MD|!GIA!(Z5A*-wDK%yzL-12Gm4-*Ku(k9e%VUw_8#an5g z0IrdVx6K(PqBA~&Jxj!rF)sz38R(ay3h+X3H3IN4qW~t-p@>CtujWw5;SINExTzPG zJVkQ#;`RbL_r@tFt|H?nh|Ch-wl6_#tJv>D8kNA%v_(T{WLWZ>>G=tbTkkOeYInH3f>i3Ana-p#h%AygW$skZQz;(1eunKT)_?yHV9l` zS9oPB77k)8V=!y71^6IMJU3p)XT=CwgeVkUV99nklh)74rNBxwOcUZ#myj!X^$tPQ ziV*_h%P~=!EhmdqL@5=8bZLJX6gCZdS6?AP&=CX7eZZ!;i6mNPICCP-Dg!0oW7d`= zA2Sq6i!(ry=nHb6Y%UBX%hIBB0@?7Sgb*(?O1BK2Ce=_ciU~H+k_{?AqFjt2S73-l z@i$=%lzds>lz0-M9cCHTS3X~Y#X|E^(v*@~LLd`8E3%fXR~%Q_x^lKIp2rYg(=;fe zR&i)Y2?0Nc;fg@y~#p7{ftXk!oxJlU>YG z!-znKN7)>_)u2Cf`3$gu^@V!D_^YX2Ct+51gZjyet;E*6h^L9!@`y>tMNh;~RJ};z z5j+tY1qlKPL!p$wFrr1UTo$^G!zY^{5G}G%;^kOypULE<>*_xq_lK|O06>=93tz-s zU#&lj1ZU`EQZ1AqTU2vI##Drb?E{GUEk+nv+f?=wu_&(dnd#y_dbHvoK`qM22RQf$ z%|EeG75#_$Q$((a40c3#iwj>wRH#|zSdQvwus3NLknBZ&Sh)=no>=U-I=9+{4ony&@~ke+lu%P%C%9;B*&0g$RrKkRTY35)3o^tz`Plfzy(a4q8M^xAF;oZ zsc;K`TsN`XEp&q$L8QDH8wkW?hz3L_VuO!$ICjmLV6?)+v`3(Z#JR+oXh+PaL2;u@ zapAfs(`BR!zI^#89Sj69u*?z`7_5){?(12%cRr2 z`TmW2cD=OhgJ%}M+gIpMJ1*z;#0W$LISoy8Qc+lY@`%y9n;ZKJg2dl%U9K3GFkr>WHnB7UV`bSVq5%@TVg^M{CRi`HYQ<@- z?j2gKMU7NJ$$^!!`Hq_|2Uz6fViFIEz00tTM~U;3A_R+F)nc0@RYYx>I*%cG%!R<* z#*AA^B@}o7B8tVP1fG`KlccusTTCsFHAvI}-(VshkXB+{M*YF$NXBGY#$rhCZ()ZFttKH)%kqNVBIe!kU=wG+3N4j) ztJ6GauW2E!7!GGhgjog*WvA3XggrxJX!4mu0(c<>5()XAp}sz&?WGXKgc=n$I#CKZ zPADukEDOVJ2yDiwVlt=!Gj5JUH8VPFV(sd!vH)i-7AmP^-{w&LK`2N4N=dX$Qv#qG1#213gL`hw5Ky2dVo5=}WHlYY^ zvg@LjYGPo`(9M(Sbb9I54PU(P?lINFtII2ooIL$&mt1?n?Bl=s&)@HDZ*?7)iE}YY zn@d%3aVZQ_*|a-p_~^B}cLZUefvVv9Z>?K#=}{++98%rZ)8*I>DiGL)a1llS_ruWh zefk)v_)e58to<;45IDB;osZlwysGN!5B{~Xr0mWsZ$4n;m`(MyuHyhC0#p~tj6z0> zJ4BHh1D}->3Q285d)Odg!lBccz${a0DBOd#Nn~0mEhh2|pb+TcMYv=tAB>I31A>>3 z(+t`o@G{g$GYshlVOSS~18%D)I>~$v_y!q6Fyn*qMx=;}^a5`~UdHNT5dxC)9yj+H zOd(n_B8#Ohh)rOn5i;&ceobeTYQoGBi34Z=JZwY;p+?0S zCwNVS#6X5!J*P0PL1WT~Pxa+2D{kfE0w{Y;DskK-jDW%!woxL*OK6&r6RJ5j%{ctw z$<7!~qJL1V9Ln@@V}RF~i-QX>T-89RHA=h@WN2Z8F_6%W zwz)>dNffiguvbo=iEJ4HTVW~ z#E1{^8x1R|XirzpHMvsHs3#d*%|=?ZmRLiLn@P>8z%Xc!I~lJmqcF*+Vemp1pyN}B z91qAZ!Jn{kA`u|j6%D{7Nilt>=wHUvfze9IfWNNIcSfASMwsqr0FWgDqv9H!LtTo< zf=7P&Sgx)%+v!wac9E=mc5&-o?5Fy!(j+a*F*W|8WML-t18a%d+(8o(k}IQOMiFB9 z9>t;r1ZU(vngq@WXy*7#+_tF6Ay(p-xLI;5tNk6UlpDb+P^b9V7`T$@1(^m7o}E!G zJpC9x!5pq^qR9MWgleS9m_5&Yw)$4g0ihK@=%K(OdXm_v*_W8&B+bZTi2^Z`s*(TX z3IUZi9pGAvoIju+auH2XdqPixd|lo=5Eh76qV#1W?XVDaTwBUt#{EITsf9$IuAr>T z`cCqxkQKn|Dvi)=GU4OIkx8u3Vj>3}-6ELx=nj%Ol$cl^FMEsyZS&-6))b*FRklrr z$x_c#AL| z6P-pD!+;guj|IvOXrto1)+#3C!gxr3!AD{_rp(*JAX|Tg`K{nz!-EN;rH)7+=D+ac zM6lwlpZ&uWL-Sci=9qSX(iw?O&~XNg(gZ8$rI^Ixwhv@GoRQ(I;NqaujYf*N!C6&; z?9#w_F>XXphOiMhvwc;W?ii{Z1xzW3V~x-u2kqod#1J9Qa|@$!rt#2BZpYLpNPxhZ zomgmdTL?l7P~d06A!qK#pp9WFnv12`T9lI(sAW1;WQmYE8zvx)y7^DeUJc;G!3IYkq^3?BO^f0Pd`34YNkkUurri!Ej#W6)6KU@AH^VNj7d zO&AB^sxeL%QB*3T+p=EJ+JkRMtA;VsAl#$;X<=m}Or zQz#H){fNs*;U#$#&ywR0NDvY{1z{sel8QdeFf;K!{op)Wn#Jf*O+pi?K?59GvII*P z@N__XZOS!@6(BqShZOL*AcA15X@xn1t(45mI`Att12i@ATLN1(3B?RwPER;Fr+^!R zciId^evZ^*#9;ay&wxPY1s@SKhzSre^2CQJriqP=Xcgve>rQcS#UOa%uNXoITm|a- z=^hGkpOy(Mi4r=|X2~y+&4*&*h>9`(K^zZUmQX%dtQ~s5@MW~RGphlgL}oN$QwC~> zS#1V%1bnP=r?Hk$^E$p(-!}juGgkP+AL76@1{YXS;Wkc$I5A=TR~r?S6T@*`$8{oN zw!N|bpKrZ<+nE;pgW?TA9eUj}^Y^9s{Pjr-X(A0Ibtc;55)UE8(`p0~B3Zp+?1b#1NF zMvXb^(AmFy;qmpgyKZcHCSpMxZ~;AIm+0?UvSJtc1hmTu#jCq;-q>03yHV+4aldbu(nHFB06YZ*=w zjw{BP^w)%_mgpWu#*)wj7h;cph%j{V6%w%G9Ic3^P>f9r0MgSXufbr8b4()p#b%92 zC^M6=H(BEXn)f+m{;1S|=?g6DZ6Gx;HXp^ND|ww$ook@ zQjsQN3hRD9O9UbY;6!DOO1)2{6g0ZnAmEV!RAZD2&D_Ur?CfOV_C^JQda9tK{dxx^?fl1hcZG|=RTn!IdmlFy4@`?C13Oe>CU zAPY-}3@6mZy7oUrropHB78Si%l1=nijyf5{t3gu=i-~PInEN4C3KpWl_{7nqvE4kd zxF2&dnd?F_rVmntoK6!mnLKFeLT|mW$f8U^IlMR<3?6X2q|OlHfC-x?i!ni4O7dXb z5ROoqO9MMba*S0zhu?_|_sBRHZ6iSwZ3c%dgxw=GfPya=Cuj46+iL*YU}sqCFmsVR z*qFFc*<*y1R-FH)6&0Dwum(|PE|pAYvMiQX#|pF%w8>x&9M#k)bjNsJDtnYCF|T8IlG1O3cYW9=VPbdT(GG1DH|_;90M2m_>zJ6OaYr18oiLEExT0HAHDbM;rG z66?Wn$3CcmF^PwG9HlqFI?$;ETs`U-DkRuHPx>>ru`Vkbp^^n$X`4`%ghXW=$n-mC zB@31v>scB=<&kS-E7yQYgqK7#j5DBOmM}Y1m4j^zjI^eR&JVs+3@wTH2@TSGlqEqh zL5CZ*(dk21VOt%TJ4!Y(WE2y}C^Q7!9+dM!UNp3XB`T94rT{^PX*GlxtDBj2pt>N5 zNzuon4ykNknAON36^lwqYFUO^!4?n(Jh&@}EhB@6=!#CVHdjoy!H^1FBe?@8D+Zz) z0YY2dz^0~?kxlwGE4P6e)tqbKFevre^w=;t^tZ=t8kECK^clYZH8Kn)8MWCAj0q!b zLO(?PSwrPaPY@T$a-rKpX^K&1cu>j~W=N(#CJH39vg!1S9h+0B)ZFQZJo4TfI_M7= zP&}CuDF&NV^=}Y__W$w5+SIS0x1t*yUX{-{*rsB95@B#U=wQELE5gjPJ`Ws(U0_hPf0| zW(W+SGLiu!+UP`oBkwWx5A=ZHFML7>(dHr&RlqGY7#etF9Es7a7!?o}bR(jJh-~_a zGOJ)@MiynzCpBV`*I>$6f{zC4>vAm&Oz&*r2FsinX0YG%ONVTTeH(-rN!%iagCyqh zrjw9>JXJImM_`UsNV9l%Y2}GSuy0aWl$lr{8jyj4f;a0j3?%8+;mBhMGo2FEmpDzZ zju2$THlvxol=YLPX=xYVG5MLlAF`ehQx%?~hsP_@(_E;P=Lka;T+WMlLP3@e2Y! z7>qE5Qh-3QZ?k`x>KOsGWLJDXgkOiFxDFl>pNk=)jEN;09sSVshyz^gqoO@wE#c(C zIL+yyILssfu;|G?p+wG~KJZ)k4e}EbQxnBuxZ6u>VTA7Z4VDCf&Mtj{Cw0g^Q@AQx zqEIdsqK=r7h$#rlMAU_nEF~myRf8r$e4dGFC~YS{0N-JGC)o8t zN3!onmPr6c{gkOzGiX}{snEg%K!giSSs-`v6=ybIZFu82i42aZ5PZ{T^8wr&ov0?C zLRz)hDS#8K6SBmx`bT`bU#E@BQZ-DUZ|EC!H*0a=nSJrk9SN;x{fFR+}bE!_?? zQ0O34C_KRo4-yE$N-eJlI*mLKfC~zOBHyHiF^~cxETT0gYT^Gi$RsfWDt0rJCqDh* zvl7Y9!2_*$aSzrnPRwZkNMhxh;DGg?p+*!;WL{HV65)meYywS!L}{oWZ-voYVEn=< z(@zU?4VjeCL`8M1uwD$s_>*Tu2FWp`jcjMeP-e_+(b6#G07p#KEQFYXbPA>xNnKR* zlqpCsdmvQmu3)?nQ!}tJqC7ydnXRi>NS|0hGcXO2m>x-yP^K}ONfs!GS}dl?Qt?Z~ z5mu^KKSn#q8{ZKXN2Q!*>Ikk7AO??9WDkM)8+uJM%*0m%IfiM$T%&=T8r3w7l{Fb0 zUNLqfl{2(|5CSD6czGb@H5^n`Jkf_9Z%b##railln{mkFAG`^fN{05b=8EZ##N&b~ zqsDaf^>p@jV;owTN;$T@y`lb@CGUOW^b6*#S>D{)5!K+MBDpxZK^T7N{L9O-x$iuB zUwdyirurJ8Bus5$Mtvvys{Ar_xRBx=?<)j?m z$7F|bw#djuaKbet)D>w4f%4*p6oi$mzyeIRyaL|_P(-dA%R9$)WXzSzJ*bx?q<(RU zd7F(Si6~9U;D|u9%1rko5C%U3^$TuevX*=gp)0?F$g3L+2go%NAj_yE{H4zun=!ccwa5mJKJ-8tx?jZ31mu88s*K!fwtz<0 z7~FBOlM4`tzf?!WbWcnsd{02A`7V@>jem%Y4J>Az1RSQF0B7RMgr^#Yw4ooV0(^lq zAURpZ5=fJ~`U-6goIH$|h$A7X?)Tuh1F9UVD#hBzc{MbY7vdL01+(p0-FvJZ!AzS) zvriL*iIxkNAGK`k94Z|GulS@(859g(s5WVfwX7M#+9sf-@Sj-Weqj=fTdDqEIY@LP z5Ek^FUlXyD65aS<0WTO;$HJLK;EPiiE4qNTMj*FT9-3JRwSE;d+L?uw_9U`Ck`cjB zs)&FKZJmTnQR9%nxrqKmV~M^RSEdHJj%-K4{Txz=F(Z%fB{84?SoB(KH5tpGe*wRk zq`-#G+vJwkcxU+!SWDfMUT(miIDCm$xYZeFK+th`pA%X}MX`VJ7;d5*(pkg0gI}Rr z{3lq<=q0ZEN`oNpK2ixIKgRhl8bIhvM6=Al#3^I`M`(lLZ85Kcn297f85ShAZQlhV)Q+*uXcHu%nyw zAEb>^gd1M5_*cx!bXWfm_nI}WK~p>$4I9VeIjo1YNi98t(R5^Hi#3AhxCVw=n?B3Q zU|1)I&$T0dk-ASi=V}|C((-Iu{fz?f;HS3nsq@G%7oDiTCX?4ZV`BQEXY^0Cj|Y_V zgAIR8-yvDpSQQ;sC=e!wJVhKUfa{5$iTeYBVEi_aJdBQ#Hv#*kYn2lj&E=BV&fiG3 zio+VL9Ky6QBIxWE(gDUB!GI!oFTEqm7{uoW!@wouj{dL@fp0Y#s83e&qKE8LQPZiQ z+>%|O(phbRjZdmuUAQqRW`C3%Vf>DY|ReRJ6vO4x}?4RX>9z(tHN;UtZ)j~l-9 z5-@u#b^)0;Ci{Zg6&uoi4&p9AHfbVgPJqbr`^X*4Pf)wbd1Dq=$K^$~vtY^A4Tnvd zR#{StwlHc5xCK!KM)LGu+qS2U7}L_#*_+R!q@$Ms<|Iqay5j-31ZSD$U|>CCvU<2Y{gpJUmstxnR8n@eX@3BQ!3e%h|FnX3(Xth(0b zAPlFD9OH|y_9ECVNScsgkOOo6$z?|3U&wpSloAK#ViJqP=Hi0vj95`@2gw#j!Y~04 zp^-@-01UKBG1e4EAvSu}bJKgHW^>6T)-7kzxw6$D@@v)I+#ilFEoa z@Bctb%utIjFRr$b-T3ksTe5+fhxl;pWf~376pjHMS8k|Z2m`UZ%n{2;Obk~!jo8ls zim^1|1t`h`NXy@kcY{lW91LRJ!bL&J7~V|G104JOE{}^ADwb4ab<6RrciDN;IT$!G zVoji##5p)YTW`GUMX3E?I0u_Pcxx~i5|gn8{~ht$EKOW%?4M1QC;vNlrly_I8gKdV)M$O4&I{kslgtDHT>z?f_kS>jUqZ%r6?ul^J3U2>DNSj%-_fn z91*oBFB2UeDn0=K*wjkrrh{lLRACnkAy@n2Avr;RL-Y*gODW4L#dFL4=;+<-xZ z)`g5)JopaWvkVDwd6LwDCc@*0xu}Eim8nHA#J~p0Vfc{7(GTJfYe@4A(pEd zTOpKzSkH{JMQA!kIzUB-xC&^U3^+vf3D$Kc^z%^_vpmH7Km0B~MJEa1EfnJuW+9*o zkhcmUeHh6Cuz?d3LB7_&$X7BT%Z?o&Nf9L@gAS88RUjEyvUHqSWDN=vh2@Mx)6{{B zw5#Y`L$iuliyl*WV2n&^odRBw4)&cjsBQ95qa?fNL`7>@A=|1JLfs&kO2W%VQtZ~ZQHToP}@A}ljyqsX&!T;6aAOo6?gF`mMs1nM(|-O2xt}@g>hn1 zfS+8zAbldj*M!}d#tM`PiI>TjO{fBJg7lLZqCRJ)TVoc%_s9eU-J=dOuFQpo!5k(u z9MfYcyb3mJ;Y|_e(Zh>Snw!0h4XR4Ql#|`47g;j5YeM;ZxBo zDgY39l4ewz{6NIEuyMCINR8^cyT@bgo%~XX8>#(Tgg$25|Ei( zQ?t*&uPKPjEuqGEh9*=KX2Zj1^<*L|;2GwFJV1zGra1J9!~|9Hnh2YSkU5acMFFSk zzc5rnpJm(YYj+GOEt@oav>*6P*d;lSzC=<1K&IN#H#2tF@LkOf1@(F~)@bDe#r3SV z?#_R__41X+o^r&b0}6!#(tkaee$SgUeB?JSy879rA1v9nA?v2$ebb2ACD@$dKln$9 zl%ZvH^!Dy(+BE#U>PwwVoB(9e30IZK_eM*{NNa*8(gpH# z0o`XBFcV24&PuDSML1@cLm5$b1rjJt+wd0SI|yIoyktvG!n1%nkl>k>k_pv@=V&Fu z%!MZ11U>YiV*lWqqJD7DB^ix%mE{D(X6f}cq zPitBsJf$`a_X0^*TGSBBwK^vJGh*tvwqRs?oHBMxV@ROyA~lM2DP}DoU7qN53QD6S3PUOfY4O1|`WSmx^L=%?v5fLcY&84Zg^IzC7z0C70~2;mS~ic~{DAq00pSt%tOvCO>KfQUvi z$mL`o<#8=e0Ij4|g*7#W3dlTwnS2CcM%akNJH29xQ=%M-Bs&hBfaMH^7fF2i@`SMKtw%ZwL_xsu@52AGq!}Ual%TJ%4nYO z05W7I<;RyFO|uA+>?@q!Fyc?BWDbx4i+C7?h;5S~l~2KbOvE z>!j}oxpaorK7y41)kCj>{(_cSXs;A8qhNg`vP=q@Q3)9W394rR0W^q+IC4-cvbtC{ z6%{Y+3qXt@paRxOoY6v?#zQWaG8V>ZgkZ!*PhrwFp#xzrF1UbS#=b<~xNIfH&RSr! zAcn%s49IymTU7)PLUq<&%<4}IYd&O@CYWM2I4~+i=WvQjrha#@$`u!_5@-W|z|5CY z8$Fl>QC2){%Y(mGO6@l2WU}ed_ftXW*jBbA8wS1=hK`-eJ!@dm$J3pE~U^ZSDMo(V(#jP!6Kz00t48#Ry|_@)Dd)GdDIWUuD8+uqoz#dJK_V}lob`ngEsjW;T*&0z=Rkz9W&TDWQ>b` zlBv#^=imyQL@|HSPZc)8jer)n3Cd>We<~hO{Z-k%dM3=cvAf19Aw)fCyfUB(b|^IQ z@cUq6&>#uK8cC06x5x=R3epk;cp23=;uHzvpK$f^+A=arXwaxceJJvV944Bj%uJCT zMcSoI7L2Yq3a?;gPd(>opdn)+8$NzqM$MrCN?LZviDJ3}bw|zrqSX$-TnL6h{wc6| zutDSY6yie>`;Hpn)TT&EcC6RTmIQ+Y`yaMLX+1>Va2V>pNCr0aGExkweh5kiFuSa2 zm|283(-bU{07sexCT!rWKyx@mfCQW(uJB?i70xKZ5PMl526Kwh)X?+BCc!LsG*XU@ zrVW5Hjqm33a0@?KG|YurB0q#QNJ9Y$DVd}uf5r43;tnXa5?5CC&B&~vr@^+Y+Lp$q zj<&-lP4xpM`;kotm0Br9Fo8jNc`HiFYAUL>Hq;?hX`qS>iz(N2-&nJJZSBr)U3zV4 zF6a4*35H?H5B;8e|B%wMJFmQ@qqqD1`LEiR%J9{_({5-DpOHaUW%a5PeHX2M(cI)c zZ_D02hfbKBaUG+6Gf4^M9?MGkf!|li_ZK{0DPAB#X~B`~SE+$ctN~BB>WNYjP7=3q z#0>!W7OBLv#=>Zb`iamZp>=NHB)N%}kL!?3zhVLwfD`HG0@}21kZuttC(|HIR+vha zWlJWF7=7TF3Dd`nA2p=fG3nbdZRY=&^NLEE%-Apv4#I=tI52pe!lW7;zhGN%i-IbP zsN<{;WEKd6z_P7eNzV6tstZ83Nr%xjnS};~%|%x{&(D=)q2hwnU|3h+r>OG6$wUx@ zw(F!bY2VW&F0f0?PeU`o-WRl0{Tui}Nl8v)raCXpfo4Plp=FFs5tmZ9JpiNA`)&`Aj^r=y@I?%Y12|qvXVS} z!i&NqAb{bba51r5FYP;wV+1mGLKZGzbl^5>&Zmj-usH$J ziww+6yyO-5IgZa9CsDj0#wT}=LrgT$FENfBnY=9I0T3N2u+^*x{HDkwF(-oT(Wr^> zayH8E^2KGaM8o9jEUXHrzG#>v3&n@#N`p`Jjne?AFU_yTz8|~E*_-+k1VLp<$#*Zj z;g8pUarVR+X~(_&yleh)!Up(`pf4Skyr_Vf6VW5x@OcP-kUUl@Tf4}K# zHywYj7x)()cHF%;f9=z!T%1aUXB{%t&${QvuYCK0>q@h^KuKM4 zOhD^!0i_xwX(QJ$7$qk%#F>_Ed*C^spA_4`D*D8^EPI+%JedX*Z#N$L9@CPF+(JIX zC@Xv__90_;Ff=VD5zzQ!a}xV7Y2Ny)Nfsd3rFa__DlT@&)=4h~z0IshLL-lw5#k3; z2eD3`-9=bE_}u#Vu#y-9f}53cqyHQh>&0$IJqY|EBWiB_)z3fwmp@HBWM)Zu>BsK; z!I%F2*8`89lg_5E`|odk{hxn3?35F2%ew0JFMs2KdyYE$j4%j3@`X=-^TB&gy8PnM z_mH2FA0B*gnm2{MKlg$&zw_W9Zus_pWipw_B2RL@={2MAY^|6oGOMQz`M@q%uTW3|n`30OOGSpa6k7BweG>g8OCQVdHTFAWG*s6e zwAS&T`e8T`7E!jzFKp<6?K9&l=MV{~AD|Q#CksVoBnf$Bd`73(2X`7_XH8kYhIt~rL! zb3O}B3|3c%PcJXti_3{CD@)qQH3h4kC}=s5N+E2NMWhRep2XjrttCFrzO9%+1Y5Z^p*H4ul6|d| z)!Elu+uD5Cq-l0!ond0l{&7DDQ^P7Mhn83DY-+GlHq9!`x}|iR;Loo=J7vU}+b_P_ zvaOzczZV9>$}2BB`o#M`{f!Y-L+^a*!S4P(^>wU12$RQ@SeQm0RjB`1sm*)$jIJ6w zq^yGGSRkYNoA#!^(>2)reCdo{AG=ebxeFvAHU; zOalrXtkaz6kTP6U29wdZvf)@xZTxd`b|iNw2B;ht;-r!vK^P7zubeq<;_%9`y-V zm8%@biNXm71T4-5(WSr7DMhIvHcT!Qap32CXg|tFqJsknV%U4`pWKfmhNaSq-K7}z zL{rT309_)SkYm{QAyOf9(6` zoH09}_lRW|r=J5Zs8{eWy=d;UkA3%!@7|Ejq*Xw!Zi0($4Cx7I<$u2Kj~P{c&+k9? z@O@uB?2yR?&yUN~!W3MT8Jjo4F#N<#=REi5w?B33x%q;3-BqVN_t>|;@`XzsN3p+s zO{3^=Q8}RK>=b!MekKNQx^YUK;CIB6RAm{TqgW)yzzAKFtSn?!IS>N5NL~Ek0RoiW z$SnI@nuP@g5xPh*Fe%9n$d_T*1NJKh6aUwD^`%aLh9G(-g}OrEA3SFAnKNgnQmL~K zIjXzA@BCTErc$Z%XC1S%dGAM#JkheOOOH5V-uh)xQSzwZKll)WR9KqLU2)VYV}{gx z^r(}cS@GUS=bSvHX7q@PA@Z3$Z^w0j(cj^JIi)% z$~bAg%#aj>BZDd}R9ii|13R|@AW^|i^9ZggDG00@VDvGQ7fJ>E*uDxFGRP(jgW2hZ zspw9-l|&(5RP0BOLip5}|3_D>XL!JZZFnWg7>7j0CTknQWmDP|v_UM9$%?&W=^KO{ zx(-_@<(6RRPx?hd@Zdf+DDVuFPZ_n-f&_;=6ll z4NW}}=-l9<5_qwLLL(8VxJ02xsZB~)YZU6vLZRfSPlZB$+MGFuo^(oO^=bzix-97h`3sb4oahF`suzlyrS6pV<*728KxNGf(ldrh6q@w(kD=uB| z+{=ajg6)vYlFh7+@D0M7xL>CwCMih`0vSngtF} z>;on->sz+CrLLRo;nV;-d$8-cU9Y)f&h_$|5Jt;VRpEI)x6Yh4yMM^Kf#7FD!zwpU zpe!!fB!hOs8o_{ch#S^d7iEu`aH(tCigLWMQsn}A%v8h9H}n`wgra8S6! zs2c0P919~CM2YxbO|1Kds2k9gJ<-~}F9O($`tR_2X2)o{i0M&C1nGJHBCN3fgplgu zlB0Y*ipo{NO$6%(F$n~CB_YHjEMLewVCDl0i^Im~RB9e~_7#;84D#XB3$AKdu5oy$ zqEJ{}AroL47mO{6j(*2|W#q!fm1P9zXdi~C!`hdx??P)ZNq{u0JUYRZ;V#6pWkesR z-<-Lr(@1%a@iba=+(O;(QIl@K{9n{zgNGD8h${)gC@XON0`I;s^Th&5 z&?|37kD?DyXq=U_<3=0cnj@FVW{vb^uJjiQo9cESJ?)_3l|%Ag!M2@PcVbMN7A%$O z^YRCb8f#ltdvAAHHfyVG(8WliT;NoFTkEf0c>GJ}T|RyE_{NUb>axmV6_pt`{r;x4 z|6cNLb7x0+E=NV;L6a@U%SELZeK?M@r?tg(-D#u7uG+mlqe=k+%$Uu7QhDDybll{h zTy=BCas4Q_YD;6?Ypa$m+P<;At;MpewBs^*o2>QD{kwxXA<^5+8+biU>X@{^u-=mg!2oxGtj8i%c!;I@rA2Y5blRa+w zAx9l>P-}PROUoA2wKj)gxV3(diYnDHQhYT@PS%kh#(xQ0HKBly5*P}MgE~mUBl1n& zO+XzX(lA!VL~h9e3@uVoMcx53CSP)elKL*Y`usOudY9R60IX<#OoCnE42=>1)0y<; z*PeU8j7j4sjeYE2FK$?~E#nyE6ze1gkzMrMi7NP zjM+uvE$9g>c)>x_$6a;#$*EN8+AB|c;nl@*h)iCCKT;Pp4FzG4NxL^(ecD0O$4{9! z>i&n`SiN>%T?6!rg3 z%n%$sKqxgP9b_KnQFsW=N{GumP>$_7j1bKg7jB?|rKVs>%;gcL87fuqe{EM^6eQvj zLfnvSMyi*^wVh3ScQ4+)VeHVF`5Ra6YHfID^Qsvm$G^RCMO}N#>+6;sHh${s>z8_A z;MlgVN`}o_mfe%@e{t2qOO8D8wY5tcyV_q_v#6%LYW}8Gd)k`ktzR~&X4JA>n`_&e z-rl%!*7&KL_U_)%+~C@dN-h?Nj3XmSi46$V93d8g<&PnS8NI|_BQVG*VGqz&s-Q&j z@Ha7UM3x05)kwqhhp8F1P+Ze7g9YdU0~cRU5m3!pBH=7p>XLM~r&=Vx)BxZ=!6JUlrm9K*j^Iam1bY#R2Axwgy5F;_!iQJx%^sQKe!u}6F z5>RCkk+cGBTPfEzX@z<_KeYO(a(xl)NN3VJSFhT(Vnx}|p&LHXyAW@8A>WE`IqnKi}^-4&tx| zB{G4Ap<`LT=PiDD-iYyIH!WG&RJ&Kna7>5+=^m_6T<=8trr2uS*#2<2%)AQDC#-?y zuiobuuP7}KH(!q1PXOXT9lux;5R6I{M-rAkaZXl0&~Q!RL2l-YZlO^Rf5J|_!VV}; z%m%)e3M({ilD*GVR#Z`e<^jvH1HBW7F(aDPW<5-qTaJ1bRG;KPO{7!ubLPutma?RJ zMrb4H7~uhW>m&`*-z=)c3T$ADi#RYSbRrd$hrR$96T`sjTsV5lvBZs7P1k`=m|=UK z7x*e{Ay-mTR$g9GT3S+Cn#<+VnGBaG8K`Oai`EHk6`;_HNMQ|sBm>2O-iQ`R83@D~ z(Mq5St$9+^F$++&$=B=CRYd6&G zYVPbvyRKu~y?!86d}&!qjFWXHO8(v6yw~^r$-_r4+_E85bpio0qaFo;vPRv0;g!3Z z8}E4fq0&t5fKj98PCe+8r=NdYc<%d~);+c4y;Zxnd%mA>U6pYxHVy>wQP}Xvm${D> zL{dXy3p9h85Gp(ZVz_w6AtEksndahlN@E_6!yf}+15pMQA>EMnK*TqJ-*CGhY_`l> zHdlgBDE{h$*oF5n_mhGFQs?v8D{-+KN188Z)f_4&7@Sp;T|eD;j{lfhH9W7}4t z;Jy0X{BaXTEnBp9&+fgh>(DrHYfvHj#;ks7+ioirx@mXik`1etZ7i=SefP~}jxx`o zfWU2B)EtiGw)n^(|Pk=TF}zirUX~)M~v6g z41o}c&OOF|6H_g<41x6Q87{6vZAPOvz*9WFn?VaFXnZwsUtDRA<0*CeQwILI&W%!+ z0b?x%Nx)p6imec=^K^(}%hgY!hOgFufAn?jFdQ!kbe zl;h;rN#0RhGzinKvt?WTE3Yp-WagyjURq$v>cJ~TI01?s?6EKmY|APX{AXTRIC1=l z1xq&W+})UVBkw+ZoE%Lk_p%MU^pm=pWjdW+yma%@O-_gz4M#7JXO3)Qh*}^sv?$dB;Zue;OQCSv55y_WMxjX@@4>quDfW=O7q0Wn#9v zA~d=2_@t~X9eHx}j%;3_Qr62dxokS!+S6&JtZX`6nl5SW=}e`;_+EafKj+1>xauE!>FYA|_6f08|8QF`xs5P~H!S#311>CcKed6h~*K$_R3? zjwAiS$&_*=+98n0u^0)>86z14>SbYDh-^k~H4%FTZF$}l6nTQ}Wx9KN5%JYMsyvCa zq(0jQStfRR#6{eg_rnIuMqq!weBeJW84{xrkbJ7{CKw+pV zsL+1FbF&$*KX19Nm-mK^8QIa?>U)75aR|m*Fuv6c1tfV+vQfLBm^)Ml4M8=E0H=LS zJr}XA7zM>Ygn!vjqdrCkG)P|-_CCCl4DMs+bPFwdF>9b@M_Cmt5|E65CQ%pch7NlG z;s>#Mp)ndd=3!-bwY|XW_1gRL9X*AP-h6v+p`)kJ-ji?d$+vYE+WjEU%r6Frg&|j8 zAwCFrjVcr=0%F++Rq32dKgIbAew~(7Qj{RHMhyu@SN23@vxvB2iY`|Y-)rjIFE*9; zbQ9t*pPBH?rozg~DxIWfGQUX?;oeC8ullEu&s&x?aq84rM;~?ItXUJLP8~OSa!F~a zVp*9?Jjm$($`O~K{{Q_5Loc8A`uYofeJwk8HEh~kw`T3m#Y-DDZt^`poz2E*BMV5R zg)&qjB9!TDHd9`fDJ^j`Sx0#(6k-W^2}p@ls{mT0h#UV>LKzdH5Nltk_(ELLvCdI< z{lL%Xz5c#@S9hVWFXFH|yqUL0v9nBBiCR*HAndwAVRge^R~HOI){eA*G0t}fArfYf zo&mJ8SVXpQw}fRiLxZdv2D%0d_rB0HGQYVwt12(gxF&{3cO?kJ>ay~`fBN=sJ$%or zD;DL_YPn(D@kKz1MBnHw`oPTfVeE5Sm7jNI(-PdcW+OAGi4p#F5j4;zO4+QNYSw&HZM@%qT2ND#_ zP|(oAF2$gt7?1#q=S5&4`U2wMWLyP&!iczNB8ca??7MAPmP< z4<9w8`l{nkzi7_!`ho7gzW;voZ#x_JuB+YNUnl@y#8^T!dm7t--S2fZwd#O0`aHSr zNe1s`p1VM@f4h7DtilyUuUMgi}GU=+J zReSd|WU^WDye67V@nl{b^Ql7K%Vsl$e8F*?e7-Px?8uhpHs1@}NY$eF7&Fi4fB}mK zbkO$#?OX}N!1sdkin2^L-Q3WcEm3vEs6Qsbo#>RoT&CN4g+e-;DfAcI$Y(ROrmD5M zJ@5m|wySHZ+FQFk&yNrUjpA6$jI3aiw2Pgah`}3-!6`GMlr1)gHj{2tDiU9fzZrBl z%8HZbAT9}$I~obK#$xU@H|8jlV!@ZL$SItW$QNTtBp;ej!~+6j4ACf0l8Elh@P{HF z_xdW~)#>%x>za1hnyD3`E1*V%sYY*kYJZ34OfnG2h9Bib;R-4=Dz6;rhdJO)uy(XM zq#ED?DP#&m*KrD}_K}rIyVXO>YwKFFSqfLjcIah(3NTeDc-d?^-|soDoiBLfMh|Oh z>GV9`byb+2U?KRr@moeS0?Xj}zTPk*3`5TkD$7f<*>po=dr2Oq3=0K6 zn@#ukd#?XwNU4PquFx6KGv5bBYkm(<~b}?U0PK5n17+PBXg)=T2 zT2}Go0#zPx5p z^dz*MN;P%0M~QHD5QdFi9Z@}em3G+F*`cfGr&6hwu1?Fc{8Vt*_^F>g^^#q!jd#EH zWJh0jM3Oj2P(S(FAm3wLk1ePas(^^bg4ay!8%-gS4rEM7!7yV7(@G7eh3Ha(Q$_&* z+=-yEa5m&XGUbP^urNrbr<1u4Wsz7=Bx{JzMI2j`&l-wp!W>}IVFF<43{sFIK);)? zrIPT8u&8GTEvEDUQ3MkO$Xbc+NAV&Wl`v>6Qmjl+hT6sw*+2Tq1}d{&+SC8iG()G&*wY)`W@R*)^^Y9 zY-+M>$93&9Z@S^&6Xw48@Z*bKeARYb<_k4{ea}1g!n01l?xQQ-eE0c3-#`0|6VJZs z>J5umJol&jecy*nJqX+b-H$oepeX`U$Y+bZzf65KEpUw%6UivR5}Fiw zrF0`CinDNX9p z50+e{6Qus7d3nVmt$uLHk-twf8|`9Ro-3I;a@;E`7wP>%gn7!0mP})= z$|8?qB|zTdl0I+WBpwOrT}&WVV~Z~ML9k-ywo_)#D#>K@7A3kdwXIwjjH()X(@AIj zd+~eQoA&11Ov*~7RZ)yoSAYL=%NM@7X4%ZK6E2xO_lK9?(9+fQ_J&oP_tw?7x9(|c zX=rZ?tsrB&DBN)7%Jd_>{fOx$Zi+?yrLqE$whBSWhK5rdC+Yv}U5hhTs7Tl7`J=MiYsr@d> zE6cw0%}-32H1;iMgt6fGLf$*?(o?U! z`Qo=;TkyBvK6?5&$KCLW%a$%&{ny_-qD&8%M@uUl&%e_X=zGDavBSUkotrY5^sl~u zZ&zpcm%e*TMP=Dkw)#*(w=VWTnJ73y7aUhtckbZD<<| z=GY7<&e6lEK^-Dhk7j@~bpirRC)X1X3&oXR3w9c)DErRWubwh#)Ez&6c+I*U-}>^E zhaNKdH@|;s-aD%@Isq0tz_opY#WdIXf_K?P$KQ72S+BgY{MUbY`nTu&?oOv6 z6qlPFd1?T{Ks5AE-g3^x=N?QLu~*c7JrHn!^ugPj7KHw zFEa)tDoU7IS!~BkEJ(u5CsblB2~zx=*dInlf%yS!r9zuVYAFmMT&#nC7)50Pf6O@} z1ChBB1yMH=FHtyHl%6FG3e7;6!lX z2NS*EH6~iA0uY{e^yCB2KIEuWDz&Zgn6-O$q$95m5)Ox14Q&zw}9#ua%luYzJC1{SH+debhWOrwt~DjQ^`Tk{Fu3of61(vcIV9XWB@y!Ff8+^{_7 zX7sK?rT_{Ah#5N1(m>7NIeTCxE9T+hmTWQ{3hy(UL2emcg9DqbXDyv-oc0qBazm*@3yJVt26o@xpmPQlvo;hR2ddg{_vR(wZ`r6HC6B2Q{3;$`0=PK!MlP+XrsX zOASTvY==&?rJ#XPy``i08@aq9BCb<_H9&S%&6Ss> zvzb-%<`??&R+KaW!7OU$!b~=E&MnuDoi=6Ur16Vins?f@mmP5Ap%V|DvE=19cdg&- zWNgFOmGzPQ56oJJ^wUr)lmDZqM`39!1UyF6P!M5vfqBE)nEDa`inK$C;rfPFnya=E zr1`d!Xy(%iwz%C0H~H}xz?jvKTlCOuhektY>>J>UHW5PAKZyI&Bv3UNR0^~zaR7=*dXipo(czQ)TJn7#zej;}S+5X#daaS#my z%mX3Zo(NRLsYwmMgNt!Y+Kd663i|U?endW8r((?L-qzNhrsj~LHDou!!E(|m9*P7< z@=@YQi=6J~Fhad9k02yl=2tUv22C$2W+1e1bq+?Z>Mdfrc=TMqm*22w=Mj^qr5#lQ zN$>+XrQG)62jS>p!^*PR^?P=*qRM>WKzcwz0A)cEIw7>j#Sb$X($z_;8hy^T?KQPK zu0HOR(L<_tHaEDIi>sZ_dsiKEa@tM*d&#?LM{#lv3E6Zy2!mxiwk+GRWm3(^(`Ftv zd-AmN4?DU%m+S27TeEw|U*CFZL;Y@3HxShkXu

APh<~+45X@c~(UrhpDioyR*H! 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

  • ~!YpoVGKD9I%^cA_u+(=Q)?a{Gx>Jzd=cR5O>B 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