From be28d04af75af1f5ceb0b49473f731fb60bd88bf Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 12:26:29 +0000 Subject: [PATCH] Every button is a PulseButton, at least 52dp tall The design system sets buttons at a 52dp minimum; PulseLoop's were Material3 defaults (40dp, 48dp target). One PulseButton(style, ...) now wraps Filled / Tonal / Outlined / Text with heightIn(min = 52dp) and the 97% press scale, and all 247 direct Material button calls go through it. Fixed 48-56dp heights on buttons are gone; the height is a minimum, so long pt-BR labels grow the button. PulseButtonTest fails on a direct Material button call. Audit: audits/2026-11-04-v2.11.57-pulse-button.md Claude-Session: https://claude.ai/code/session_01P1t1aUqSUPd3whKXmgVm7w --- AGENTS.md | 5 + .../coach/schema/CoachActionCardView.kt | 6 +- .../ui/components/PairingComponents.kt | 5 +- .../pulseloop/ui/components/PulseButton.kt | 101 +++++++++++ .../pulseloop/ui/dashboard/DashboardEdit.kt | 7 +- .../com/pulseloop/ui/onboarding/Editors.kt | 11 +- .../pulseloop/ui/screens/AccuracyCheckUi.kt | 27 ++- .../pulseloop/ui/screens/AccuracyReportUi.kt | 24 +-- .../pulseloop/ui/screens/ActivityScreen.kt | 30 ++-- .../ui/screens/BarcodeScannerScreen.kt | 8 +- .../java/com/pulseloop/ui/screens/BodyUi.kt | 5 +- .../pulseloop/ui/screens/CoachModelPicker.kt | 6 +- .../java/com/pulseloop/ui/screens/CycleUi.kt | 15 +- .../com/pulseloop/ui/screens/DebugScreen.kt | 14 +- .../java/com/pulseloop/ui/screens/DrinksUi.kt | 35 ++-- .../ui/screens/HealthConnectSourceUi.kt | 17 +- .../com/pulseloop/ui/screens/LabReportsUi.kt | 25 ++- .../ui/screens/LanguageSettingsScreen.kt | 7 +- .../ui/screens/LogPastActivityScreen.kt | 6 +- .../java/com/pulseloop/ui/screens/LogSheet.kt | 4 +- .../pulseloop/ui/screens/MealAnalysisSheet.kt | 19 +- .../java/com/pulseloop/ui/screens/MedsUi.kt | 18 +- .../com/pulseloop/ui/screens/MyHealthUi.kt | 14 +- .../pulseloop/ui/screens/NutritionScreen.kt | 20 ++- .../com/pulseloop/ui/screens/PostpartumUi.kt | 25 ++- .../com/pulseloop/ui/screens/RecordScreen.kt | 12 +- .../java/com/pulseloop/ui/screens/Screens.kt | 12 +- .../ui/screens/SettingsSubScreens.kt | 162 +++++++++--------- .../com/pulseloop/ui/screens/SleepScreen.kt | 24 +-- .../com/pulseloop/ui/screens/TodayGlance.kt | 3 +- .../com/pulseloop/ui/screens/TodayScreen.kt | 3 +- .../ui/screens/WorkoutSummaryScreen.kt | 29 ++-- .../java/com/pulseloop/update/UpdateUi.kt | 14 +- .../pulseloop/widgets/WidgetConfigActivity.kt | 4 +- .../ui/components/PulseButtonTest.kt | 41 +++++ audits/2026-11-04-v2.11.57-pulse-button.md | 85 +++++++++ 36 files changed, 543 insertions(+), 300 deletions(-) create mode 100644 app/src/main/java/com/pulseloop/ui/components/PulseButton.kt create mode 100644 app/src/test/java/com/pulseloop/ui/components/PulseButtonTest.kt create mode 100644 audits/2026-11-04-v2.11.57-pulse-button.md diff --git a/AGENTS.md b/AGENTS.md index f5b59261..3f39b283 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1307,6 +1307,11 @@ serving, AI-estimate source); changing a number marks it `userEdited`, as a barc connected) is its own green, REM is cyan, connecting is amber. The readiness ring keeps the brand colour on purpose: it is the headline score. - **One card radius: 8dp.** Tiles and vital cards used to be 20/30dp. +- **Every button is a `PulseButton`** (`ui/components/PulseButton.kt`, v2.11.57): one composable + with a style (Filled, Tonal, Outlined, Text) that holds the design system's button rules — 52dp + minimum height and the 97% press scale. Never call Material's `Button`, `FilledTonalButton`, + `OutlinedButton` or `TextButton` directly, and don't give a button a fixed `.height()`: it is a + minimum so a long pt-BR label grows the button. `PulseButtonTest` fails on a direct call. - **One filled accent per screen**: the Actions button. A screen's own primary action is a tonal button (Activity's Record). - **Landscape keeps the header** (compact, one row): it is the only route to Settings and the diff --git a/app/src/main/java/com/pulseloop/coach/schema/CoachActionCardView.kt b/app/src/main/java/com/pulseloop/coach/schema/CoachActionCardView.kt index b55f47ec..16c3d6b5 100644 --- a/app/src/main/java/com/pulseloop/coach/schema/CoachActionCardView.kt +++ b/app/src/main/java/com/pulseloop/coach/schema/CoachActionCardView.kt @@ -1,6 +1,8 @@ package com.pulseloop.coach.schema import com.pulseloop.ui.theme.dither +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.theme.PulseColors import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -51,13 +53,13 @@ fun CoachActionCardView( Text(action.summary, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurface) Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = onCancel, modifier = Modifier.weight(1f), ) { Text("Cancel") } - Button( + PulseButton( onClick = onConfirm, modifier = Modifier.weight(1f), colors = ButtonDefaults.buttonColors(containerColor = tone), diff --git a/app/src/main/java/com/pulseloop/ui/components/PairingComponents.kt b/app/src/main/java/com/pulseloop/ui/components/PairingComponents.kt index e9a338cb..39217250 100644 --- a/app/src/main/java/com/pulseloop/ui/components/PairingComponents.kt +++ b/app/src/main/java/com/pulseloop/ui/components/PairingComponents.kt @@ -16,7 +16,6 @@ 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.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Icon import androidx.compose.material3.Text @@ -48,7 +47,7 @@ fun PrimaryButton( enabled: Boolean = true, onClick: () -> Unit, ) { - Button( + PulseButton( onClick = onClick, enabled = enabled, modifier = modifier.fillMaxWidth().heightIn(min = 52.dp), @@ -76,7 +75,7 @@ fun SecondaryButton( enabled: Boolean = true, onClick: () -> Unit, ) { - Button( + PulseButton( onClick = onClick, enabled = enabled, modifier = modifier diff --git a/app/src/main/java/com/pulseloop/ui/components/PulseButton.kt b/app/src/main/java/com/pulseloop/ui/components/PulseButton.kt new file mode 100644 index 00000000..4ea85071 --- /dev/null +++ b/app/src/main/java/com/pulseloop/ui/components/PulseButton.kt @@ -0,0 +1,101 @@ +package com.pulseloop.ui.components + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.heightIn +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonColors +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.FilledTonalButton +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.unit.dp +import com.pulseloop.ui.theme.pressScale + +/** The four kinds of button the app uses. Which one a screen gets is a hierarchy decision. */ +enum class PulseButtonStyle { + /** The one filled accent action per screen. */ + Filled, + /** A screen's own primary action when the accent is taken (Activity's Record). */ + Tonal, + /** A secondary action. */ + Outlined, + /** A dialog action, or a quiet action beside a stronger one. */ + Text, +} + +object PulseButtonDefaults { + /** + * Every button is at least 52dp tall (Gabriel Design System, DESIGN.md "Buttons"; the + * `button` size token, 52px). Material3's own 40dp only reached 48dp as a touch target. + * A min, not a fixed height, so a two-line pt-BR label or large font scale grows the button + * instead of clipping it. + */ + val MinHeight = 52.dp +} + +/** + * The app's only button. Every `Button` / `FilledTonalButton` / `OutlinedButton` / `TextButton` + * goes through it, so the system's button rules hold in one place: 52dp minimum height and the + * 97% press scale (`pressScale`, which follows "Remove animations"). `PulseButtonTest` fails on a + * Material button called anywhere else. + * + * [style] comes first so a call reads `PulseButton(PulseButtonStyle.Outlined, onClick = …)`, and + * positional arguments after it keep the Material order (onClick, modifier). [colors], [border] + * and [shape] default to that style's Material defaults. + */ +@Composable +fun PulseButton( + style: PulseButtonStyle = PulseButtonStyle.Filled, + onClick: () -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true, + shape: Shape? = null, + colors: ButtonColors? = null, + border: BorderStroke? = null, + contentPadding: PaddingValues? = null, + content: @Composable RowScope.() -> Unit, +) { + val interaction = remember { MutableInteractionSource() } + val m = modifier.heightIn(min = PulseButtonDefaults.MinHeight).pressScale(interaction) + when (style) { + PulseButtonStyle.Filled -> Button( + onClick = onClick, modifier = m, enabled = enabled, + shape = shape ?: ButtonDefaults.shape, + colors = colors ?: ButtonDefaults.buttonColors(), + border = border, + contentPadding = contentPadding ?: ButtonDefaults.ContentPadding, + interactionSource = interaction, content = content, + ) + PulseButtonStyle.Tonal -> FilledTonalButton( + onClick = onClick, modifier = m, enabled = enabled, + shape = shape ?: ButtonDefaults.filledTonalShape, + colors = colors ?: ButtonDefaults.filledTonalButtonColors(), + border = border, + contentPadding = contentPadding ?: ButtonDefaults.ContentPadding, + interactionSource = interaction, content = content, + ) + PulseButtonStyle.Outlined -> OutlinedButton( + onClick = onClick, modifier = m, enabled = enabled, + shape = shape ?: ButtonDefaults.outlinedShape, + colors = colors ?: ButtonDefaults.outlinedButtonColors(), + border = border ?: ButtonDefaults.outlinedButtonBorder, + contentPadding = contentPadding ?: ButtonDefaults.ContentPadding, + interactionSource = interaction, content = content, + ) + PulseButtonStyle.Text -> TextButton( + onClick = onClick, modifier = m, enabled = enabled, + shape = shape ?: ButtonDefaults.textShape, + colors = colors ?: ButtonDefaults.textButtonColors(), + border = border, + contentPadding = contentPadding ?: ButtonDefaults.TextButtonContentPadding, + interactionSource = interaction, content = content, + ) + } +} diff --git a/app/src/main/java/com/pulseloop/ui/dashboard/DashboardEdit.kt b/app/src/main/java/com/pulseloop/ui/dashboard/DashboardEdit.kt index bbbfcbc7..8c7f6038 100644 --- a/app/src/main/java/com/pulseloop/ui/dashboard/DashboardEdit.kt +++ b/app/src/main/java/com/pulseloop/ui/dashboard/DashboardEdit.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.dashboard import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -25,7 +27,6 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -224,7 +225,7 @@ fun HiddenMetricsTray(hidden: List, onRestore: (DashboardCard) -> * for iOS's long-press). Show it only when not already editing. */ @Composable fun CustomizeCardsButton(onClick: () -> Unit) { - TextButton(onClick = onClick) { + PulseButton(PulseButtonStyle.Text, onClick = onClick) { Text(tr("Customize"), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) } } @@ -244,7 +245,7 @@ fun ReorderDoneBar(onDone: () -> Unit) { color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp), ) - TextButton(onClick = onDone) { Text(tr("Done")) } + PulseButton(PulseButtonStyle.Text, onClick = onDone) { Text(tr("Done")) } } } } diff --git a/app/src/main/java/com/pulseloop/ui/onboarding/Editors.kt b/app/src/main/java/com/pulseloop/ui/onboarding/Editors.kt index 02bede30..958ed083 100644 --- a/app/src/main/java/com/pulseloop/ui/onboarding/Editors.kt +++ b/app/src/main/java/com/pulseloop/ui/onboarding/Editors.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.onboarding import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -31,7 +33,6 @@ import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.Slider import androidx.compose.material3.SliderDefaults import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.* import androidx.compose.ui.Alignment @@ -352,7 +353,7 @@ private fun NumberPickerSheet( Modifier.fillMaxWidth().padding(horizontal = 12.dp), verticalAlignment = Alignment.CenterVertically, ) { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { onSave(null) onDismiss() }) { Text(tr("Clear"), color = PulseColors.textSecondary) } @@ -364,7 +365,7 @@ private fun NumberPickerSheet( color = PulseColors.textPrimary, ) Spacer(Modifier.weight(1f)) - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { onSave(selection) onDismiss() }) { Text(tr("Done"), color = PulseColors.accent, fontWeight = FontWeight.SemiBold) } @@ -426,7 +427,7 @@ private fun DecimalValueSheet( Modifier.fillMaxWidth().padding(horizontal = 12.dp), verticalAlignment = Alignment.CenterVertically, ) { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { onSave(null) onDismiss() }) { Text(tr("Clear"), color = PulseColors.textSecondary) } @@ -438,7 +439,7 @@ private fun DecimalValueSheet( color = PulseColors.textPrimary, ) Spacer(Modifier.weight(1f)) - TextButton( + PulseButton(PulseButtonStyle.Text, enabled = parsedValue != null, onClick = { onSave(parsedValue) diff --git a/app/src/main/java/com/pulseloop/ui/screens/AccuracyCheckUi.kt b/app/src/main/java/com/pulseloop/ui/screens/AccuracyCheckUi.kt index 6cb664ed..52c0c83e 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/AccuracyCheckUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/AccuracyCheckUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -13,7 +15,6 @@ import androidx.compose.foundation.clickable import androidx.compose.material3.AlertDialog import androidx.compose.material3.FilterChip import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.TextButton import androidx.compose.runtime.collectAsState import com.pulseloop.data.PulseLoopDatabase import com.pulseloop.data.entity.AccuracyCheckEntity @@ -31,9 +32,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -166,12 +165,12 @@ fun AccuracyCheckSettingsScreen(onBack: () -> Unit) { verticalArrangement = Arrangement.spacedBy(4.dp), ) { if (readable.size < ReferenceMetric.entries.size) { - Button(onClick = { launcher.launch(AccuracyCheckPermissions.request) }, enabled = !scanning) { + PulseButton(onClick = { launcher.launch(AccuracyCheckPermissions.request) }, enabled = !scanning) { Text(if (readable.isEmpty()) tr("Allow access") else tr("Allow more")) } } if (readable.isNotEmpty()) { - OutlinedButton(onClick = { scan() }, enabled = !scanning) { Text(trf("Scan last {0} days", ReferenceSourceScanner.LOOKBACK_DAYS)) } + PulseButton(PulseButtonStyle.Outlined, onClick = { scan() }, enabled = !scanning) { Text(trf("Scan last {0} days", ReferenceSourceScanner.LOOKBACK_DAYS)) } } if (scanning) CircularProgressIndicator(Modifier.size(20.dp).align(Alignment.CenterVertically), strokeWidth = 2.dp) } @@ -204,7 +203,7 @@ fun AccuracyCheckSettingsScreen(onBack: () -> Unit) { } } } - OutlinedButton(onClick = { + PulseButton(PulseButtonStyle.Outlined, onClick = { val text = ReferenceSurveyText.render(r.sources, ReferenceSourceScanner.LOOKBACK_DAYS, { ReferenceAppLabels.label(context, it) }, r.unreadable) (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager) .setPrimaryClip(ClipData.newPlainText(tr("Accuracy check sources"), text)) @@ -298,7 +297,7 @@ private fun RunningCard(check: AccuracyCheckEntity, scope: kotlinx.coroutines.Co Text(trf("Accuracy check · day {0} of {1}", day, total), fontSize = 16.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) Text(trf("{0} vs {1}, until {2}.", check.deviceLabel, check.referenceLabel, AccuracyUiText.date(check.plannedEndAt)), fontSize = 14.sp, color = PulseColors.textSecondary) Text(trf("Wear both as usual. Health Connect export paused for: {0}.", AccuracyUiText.units(units)), fontSize = 12.sp, color = PulseColors.warning) - OutlinedButton(onClick = { confirmEnd = true }) { Text(tr("End now")) } + PulseButton(PulseButtonStyle.Outlined, onClick = { confirmEnd = true }) { Text(tr("End now")) } } if (confirmEnd) { AlertDialog( @@ -306,12 +305,12 @@ private fun RunningCard(check: AccuracyCheckEntity, scope: kotlinx.coroutines.Co title = { Text(tr("End the check now?")) }, text = { Text(tr("The report covers the days so far. You'll then choose what happens to the paused Health Connect export.")) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { confirmEnd = false scope.launch { AccuracyCheckController.end(context, AccuracyCheckEntity.END_EARLY) } }) { Text(tr("End now")) } }, - dismissButton = { TextButton(onClick = { confirmEnd = false }) { Text(tr("Keep going")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { confirmEnd = false }) { Text(tr("Keep going")) } }, ) } } @@ -327,11 +326,11 @@ private fun ResumeCard(check: AccuracyCheckEntity, scope: kotlinx.coroutines.Cor trf("During the check, {0} wrote the same types to Health Connect. Exporting the ring's copy of those days now would count them twice.", check.referenceLabel), fontSize = 12.sp, color = PulseColors.textMuted, ) - Button(onClick = { + PulseButton(onClick = { busy = true scope.launch { AccuracyCheckController.resolve(context, AccuracyCheckEntity.RESUME_SKIP); busy = false } }, enabled = !busy, modifier = Modifier.fillMaxWidth()) { Text(tr("Skip these days (recommended)")) } - OutlinedButton(onClick = { + PulseButton(PulseButtonStyle.Outlined, onClick = { busy = true scope.launch { AccuracyCheckController.resolve(context, AccuracyCheckEntity.RESUME_EXPORT); busy = false } }, enabled = !busy, modifier = Modifier.fillMaxWidth()) { Text(tr("Export them too")) } @@ -384,8 +383,8 @@ private fun StartDialog( Text(tr("Wear both devices as you normally would, including at night."), fontSize = 12.sp) } }, - confirmButton = { TextButton(onClick = { onStart(label.trim(), days) }) { Text(tr("Start")) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(tr("Cancel")) } }, + confirmButton = { PulseButton(PulseButtonStyle.Text, onClick = { onStart(label.trim(), days) }) { Text(tr("Start")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } }, ) } @@ -412,7 +411,7 @@ private fun SourceCard(context: Context, s: ReferenceSourceSurvey, onUse: (() -> ) } s.metrics.forEach { MetricRow(it) } - if (onUse != null) Button(onClick = onUse, modifier = Modifier.fillMaxWidth()) { Text(tr("Compare my ring with this")) } + if (onUse != null) PulseButton(onClick = onUse, modifier = Modifier.fillMaxWidth()) { Text(tr("Compare my ring with this")) } } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/AccuracyReportUi.kt b/app/src/main/java/com/pulseloop/ui/screens/AccuracyReportUi.kt index b4eda6f0..a00c8ce2 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/AccuracyReportUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/AccuracyReportUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -15,12 +17,10 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Slider import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState @@ -115,10 +115,10 @@ internal fun AccuracyReportSection( ) // Both actions are width-bounded so translated labels can't squeeze the weighted title. if (scoring) CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp) - else TextButton(onClick = { rescore(force = true) }, modifier = Modifier.widthIn(max = 120.dp)) { + else PulseButton(PulseButtonStyle.Text, onClick = { rescore(force = true) }, modifier = Modifier.widthIn(max = 120.dp)) { Text(tr("Recompute"), maxLines = 1, overflow = TextOverflow.Ellipsis) } - if (summaries.isNotEmpty()) TextButton(modifier = Modifier.widthIn(max = 120.dp), onClick = { + if (summaries.isNotEmpty()) PulseButton(PulseButtonStyle.Text, modifier = Modifier.widthIn(max = 120.dp), onClick = { scope.launch { val ring = db.deviceDao().currentReal()?.takeIf { RingIdentity.keyOf(it) == check.deviceKey } val text = AccuracyReportText.share( @@ -333,21 +333,21 @@ internal fun AccuracyCorrectionControl(check: AccuracyCheckEntity, summary: Accu existing != null && existing.enabled -> Row(verticalAlignment = Alignment.CenterVertically) { Text(trf("Correction on: {0}", AccuracyCorrections.formatValue(metric, existing.value)), fontSize = 12.sp, color = PulseColors.success, modifier = Modifier.weight(1f)) - TextButton(onClick = { editing = true }, modifier = Modifier.widthIn(max = 110.dp)) { + PulseButton(PulseButtonStyle.Text, onClick = { editing = true }, modifier = Modifier.widthIn(max = 110.dp)) { Text(tr("Change"), maxLines = 1, overflow = TextOverflow.Ellipsis) } - TextButton(onClick = { scope.launch { AccuracyCorrections.setEnabled(db, existing, false) } }, modifier = Modifier.widthIn(max = 110.dp)) { + PulseButton(PulseButtonStyle.Text, onClick = { scope.launch { AccuracyCorrections.setEnabled(db, existing, false) } }, modifier = Modifier.widthIn(max = 110.dp)) { Text(tr("Turn off"), maxLines = 1, overflow = TextOverflow.Ellipsis) } } existing != null -> Row(verticalAlignment = Alignment.CenterVertically) { Text(trf("Correction off ({0})", AccuracyCorrections.formatValue(metric, existing.value)), fontSize = 12.sp, color = PulseColors.textMuted, modifier = Modifier.weight(1f)) - TextButton(onClick = { scope.launch { AccuracyCorrections.setEnabled(db, existing, true) } }, modifier = Modifier.widthIn(max = 120.dp)) { + PulseButton(PulseButtonStyle.Text, onClick = { scope.launch { AccuracyCorrections.setEnabled(db, existing, true) } }, modifier = Modifier.widthIn(max = 120.dp)) { Text(tr("Turn on"), maxLines = 1, overflow = TextOverflow.Ellipsis) } } - else -> Button(onClick = { editing = true }, modifier = Modifier.fillMaxWidth()) { + else -> PulseButton(onClick = { editing = true }, modifier = Modifier.fillMaxWidth()) { Text(trf("Apply correction ({0})", AccuracyCorrections.formatValue(metric, fitted))) } } @@ -383,11 +383,11 @@ private fun CorrectionDialog( ) Text(AccuracyCorrections.formatValue(metric, value), fontSize = 20.sp, fontWeight = FontWeight.Bold) Slider(value = value.toFloat(), onValueChange = { value = it.toDouble() }, valueRange = range) - TextButton(onClick = { value = fitted }) { Text(tr("Use the fitted value")) } + PulseButton(PulseButtonStyle.Text, onClick = { value = fitted }) { Text(tr("Use the fitted value")) } } }, - confirmButton = { TextButton(onClick = { onSave(roundCorrection(metric, value)) }) { Text(tr("Apply")) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(tr("Cancel")) } }, + confirmButton = { PulseButton(PulseButtonStyle.Text, onClick = { onSave(roundCorrection(metric, value)) }) { Text(tr("Apply")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } }, ) } @@ -444,7 +444,7 @@ internal fun AccuracyCorrectionsCard() { } } Switch(checked = c.enabled, onCheckedChange = { on -> scope.launch { AccuracyCorrections.setEnabled(db, c, on) } }) - TextButton(onClick = { scope.launch { AccuracyCorrections.remove(db, c) } }, modifier = Modifier.widthIn(max = 110.dp)) { + PulseButton(PulseButtonStyle.Text, onClick = { scope.launch { AccuracyCorrections.remove(db, c) } }, modifier = Modifier.widthIn(max = 110.dp)) { Text(tr("Remove"), maxLines = 1, overflow = TextOverflow.Ellipsis) } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/ActivityScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/ActivityScreen.kt index 16664eba..417db73a 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/ActivityScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/ActivityScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -34,7 +36,6 @@ import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.History import androidx.compose.material.icons.filled.Map import androidx.compose.material3.AlertDialog -import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.FilledTonalIconButton import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -42,7 +43,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Slider import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -172,9 +172,9 @@ fun ActivityScreen( // Tonal, not filled mint: the Actions button is the screen's one filled accent, and // two filled CTAs side by side left no primary action to find. Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp), verticalAlignment = Alignment.CenterVertically) { - FilledTonalButton( + PulseButton(PulseButtonStyle.Tonal, onClick = { pickerOpen = true }, - modifier = Modifier.weight(1f).height(56.dp), + modifier = Modifier.weight(1f), ) { Text(tr("+ Record Activity"), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, maxLines = 1) } @@ -258,7 +258,7 @@ fun ActivityScreen( "You can allow it in Android Settings › Apps › PulseLoop › Permissions."), ) }, - confirmButton = { TextButton(onClick = { permissionDenied = false }) { Text(tr("OK")) } }, + confirmButton = { PulseButton(PulseButtonStyle.Text, onClick = { permissionDenied = false }) { Text(tr("OK")) } }, ) } if (pickerOpen) { @@ -670,9 +670,9 @@ private fun RecordTypePickerDialog(onDismiss: () -> Unit, onStart: (String, Bool } }, confirmButton = { - TextButton(onClick = { onStart(selected, useGps && ActivityMeta.gpsCapable(selected)) }) { Text(tr("Start")) } + PulseButton(PulseButtonStyle.Text, onClick = { onStart(selected, useGps && ActivityMeta.gpsCapable(selected)) }) { Text(tr("Start")) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } }, ) } @@ -727,7 +727,7 @@ private fun WorkoutHistoryDialog( } } }, - confirmButton = { TextButton(onClick = onDismiss) { Text(tr("Done")) } }, + confirmButton = { PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Done")) } }, ) } @@ -754,11 +754,11 @@ private fun GoalEditorDialog( } }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { onSave((steps / 500).toInt() * 500, active.toInt(), ((sleepH * 2).toInt() * 30), workouts.toInt()) }) { Text(tr("Save")) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } }, ) } @@ -883,7 +883,7 @@ private fun ActivityRecordsCard( } } if (rows.size > visibleCount) { - TextButton( + PulseButton(PulseButtonStyle.Text, onClick = { visibleCount += ACTIVITY_RECORDS_PAGE_SIZE }, modifier = Modifier.padding(start = 8.dp), ) { @@ -908,13 +908,13 @@ private fun ActivityRecordsCard( ) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val target = bucket pending = null scope.launch { buckets = viewModel?.deleteBucket(target.startEpoch) ?: buckets } }) { Text(tr("Delete"), color = MaterialTheme.colorScheme.error) } }, - dismissButton = { TextButton(onClick = { pending = null }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { pending = null }) { Text(tr("Cancel")) } }, ) } } @@ -972,10 +972,10 @@ private fun DetectedActivityCard() { } // FlowRow: the two translated actions wrap rather than overflow the card. FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - androidx.compose.material3.FilledTonalButton(onClick = { + PulseButton(PulseButtonStyle.Tonal, onClick = { scope.launch { runCatching { com.pulseloop.service.ActivityDetection.accept(context, db, p, type) }; tick++ } }) { Text(if (isNap) tr("Yes, a nap") else tr("Add workout"), fontSize = 14.sp, fontWeight = FontWeight.SemiBold) } - TextButton(onClick = { com.pulseloop.service.ActivityDetection.answer(context, p); tick++ }) { + PulseButton(PulseButtonStyle.Text, onClick = { com.pulseloop.service.ActivityDetection.answer(context, p); tick++ }) { Text(tr("Not this"), fontSize = 14.sp, color = PulseColors.textSecondary) } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/BarcodeScannerScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/BarcodeScannerScreen.kt index 51c66c08..f156ad21 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/BarcodeScannerScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/BarcodeScannerScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.tr +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import android.Manifest import android.content.Context @@ -30,9 +32,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.QrCodeScanner import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect @@ -237,7 +237,7 @@ fun BarcodeScannerScreen(onScan: (String) -> Unit, onDismiss: () -> Unit) { color = PulseColors.textPrimary, modifier = Modifier.weight(1f), ) - TextButton(onClick = onDismiss) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } } when (availability) { ScanAvailability.Granted -> @@ -304,7 +304,7 @@ fun BarcodeScannerScreen(onScan: (String) -> Unit, onDismiss: () -> Unit) { textAlign = TextAlign.Center, ) Spacer(Modifier.height(16.dp)) - OutlinedButton(onClick = { + PulseButton(PulseButtonStyle.Outlined, onClick = { runCatching { context.startActivity( Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) diff --git a/app/src/main/java/com/pulseloop/ui/screens/BodyUi.kt b/app/src/main/java/com/pulseloop/ui/screens/BodyUi.kt index 07f991b2..e8d58662 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/BodyUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/BodyUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -13,7 +15,6 @@ import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -143,7 +144,7 @@ fun HealthConnectBodyCard(onUpdated: () -> Unit) { } note?.let { Text(it, fontSize = 12.sp, color = PulseColors.textMuted) } if (enabled) { - TextButton(onClick = { importNow() }, enabled = !busy) { Text(if (busy) tr("Syncing…") else tr("Sync now")) } + PulseButton(PulseButtonStyle.Text, onClick = { importNow() }, enabled = !busy) { Text(if (busy) tr("Syncing…") else tr("Sync now")) } } } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/CoachModelPicker.kt b/app/src/main/java/com/pulseloop/ui/screens/CoachModelPicker.kt index b03d7c5f..9fd1ebd5 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/CoachModelPicker.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/CoachModelPicker.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -71,7 +73,7 @@ fun CoachModelPicker( var expanded by remember { mutableStateOf(false) } var filter by remember(provider) { mutableStateOf("") } Box { - OutlinedButton(onClick = { expanded = true }, modifier = Modifier.fillMaxWidth()) { + PulseButton(PulseButtonStyle.Outlined, onClick = { expanded = true }, modifier = Modifier.fillMaxWidth()) { Text(selected, Modifier.weight(1f)) Icon(Icons.Filled.ArrowDropDown, null) } @@ -137,7 +139,7 @@ fun CoachModelPicker( Text(status, style = MaterialTheme.typography.bodySmall, color = color, modifier = Modifier.weight(1f)) if (savedKey.isNotBlank() && !loading) { // Bounded so a long translated label can't squeeze the weighted status text. - TextButton(onClick = { load(force = true) }, modifier = Modifier.widthIn(max = 140.dp)) { + PulseButton(PulseButtonStyle.Text, onClick = { load(force = true) }, modifier = Modifier.widthIn(max = 140.dp)) { Text( if (listing is CoachModelCatalog.Result.Failure) tr("Retry") else tr("Refresh"), maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis, diff --git a/app/src/main/java/com/pulseloop/ui/screens/CycleUi.kt b/app/src/main/java/com/pulseloop/ui/screens/CycleUi.kt index 63b13cef..2a8f0c70 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/CycleUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/CycleUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -13,15 +15,12 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Delete -import androidx.compose.material3.Button import androidx.compose.material3.DatePicker import androidx.compose.material3.DatePickerDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberDatePickerState import androidx.compose.runtime.* import androidx.compose.ui.Alignment @@ -111,15 +110,15 @@ fun CycleScreen(onBack: () -> Unit) { if (!loaded) { Spacer(Modifier.height(40.dp)) } else if (open != null) { - Button(onClick = { scope.launch { db.periodDao().upsert(open.copy(endDay = today.toEpochDay())) } }, modifier = Modifier.fillMaxWidth()) { + PulseButton(onClick = { scope.launch { db.periodDao().upsert(open.copy(endDay = today.toEpochDay())) } }, modifier = Modifier.fillMaxWidth()) { Text(tr("Period ended today")) } } else { - Button(onClick = { scope.launch { db.periodDao().upsert(PeriodEntity(startDay = today.toEpochDay())) } }, modifier = Modifier.fillMaxWidth()) { + PulseButton(onClick = { scope.launch { db.periodDao().upsert(PeriodEntity(startDay = today.toEpochDay())) } }, modifier = Modifier.fillMaxWidth()) { Text(tr("Period started today")) } } - OutlinedButton(onClick = { picking = "start" }, modifier = Modifier.fillMaxWidth()) { Text(tr("Log a past period")) } + PulseButton(PulseButtonStyle.Outlined, onClick = { picking = "start" }, modifier = Modifier.fillMaxWidth()) { Text(tr("Log a past period")) } if (periods.isNotEmpty()) { Text(tr("HISTORY"), fontSize = 12.sp, letterSpacing = 1.6.sp, color = PulseColors.textMuted) @@ -157,7 +156,7 @@ fun CycleScreen(onBack: () -> Unit) { DatePickerDialog( onDismissRequest = { picking = null; pastStart = null }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val chosen = state.selectedDateMillis?.let { Instant.ofEpochMilli(it).atZone(ZoneOffset.UTC).toLocalDate() } if (chosen != null && !chosen.isAfter(today)) { if (picking == "start") { pastStart = chosen; picking = "end" } @@ -170,7 +169,7 @@ fun CycleScreen(onBack: () -> Unit) { } }) { Text(if (picking == "start") tr("Next: end date") else tr("Save")) } }, - dismissButton = { TextButton(onClick = { picking = null; pastStart = null }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { picking = null; pastStart = null }) { Text(tr("Cancel")) } }, ) { Text(if (picking == "start") tr("When did it start?") else tr("When did it end?"), modifier = Modifier.padding(start = 24.dp, top = 16.dp), fontSize = 16.sp, fontWeight = FontWeight.SemiBold) DatePicker(state = state, showModeToggle = false) diff --git a/app/src/main/java/com/pulseloop/ui/screens/DebugScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/DebugScreen.kt index 1d18ed7d..cb486e27 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/DebugScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/DebugScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -80,14 +82,14 @@ fun DebugScreen(viewModel: DiagnosticsViewModel, onBack: () -> Unit = {}) { ) // FlowRow: the two translated labels don't fit side by side on a phone. FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(bottom = 8.dp)) { - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, enabled = !busy, onClick = { viewModel.sync(connect = false) }, contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp), ) { Text(tr("Sync Now"), style = MaterialTheme.typography.labelSmall) } - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, enabled = !busy, onClick = { viewModel.sync(connect = true) }, contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp), @@ -105,7 +107,7 @@ fun DebugScreen(viewModel: DiagnosticsViewModel, onBack: () -> Unit = {}) { modifier = Modifier.padding(top = 8.dp)) } else { events.take(if (showAllEvents) 40 else 5).forEach { EventRow(it, timeFmt) } - TextButton(onClick = { showAllEvents = !showAllEvents }) { + PulseButton(PulseButtonStyle.Text, onClick = { showAllEvents = !showAllEvents }) { Text(if (showAllEvents) tr("Show fewer events") else tr("Show more events")) } } @@ -118,7 +120,7 @@ fun DebugScreen(viewModel: DiagnosticsViewModel, onBack: () -> Unit = {}) { Text(trf("{0} packets captured", packetCount), style = MaterialTheme.typography.bodyMedium) Text("↓ = ring → app (response) ↑ = app → ring (command)", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) - TextButton(onClick = { showPackets = !showPackets }) { + PulseButton(PulseButtonStyle.Text, onClick = { showPackets = !showPackets }) { Text(if (showPackets) tr("Hide packets") else tr("Show recent packets")) } if (showPackets) packets.forEach { PacketRow(it, timeFmt) } @@ -137,7 +139,7 @@ fun DebugScreen(viewModel: DiagnosticsViewModel, onBack: () -> Unit = {}) { horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, ) { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { expandedTable = if (expandedTable == count.name) null else count.name viewModel.selectTable(count.name) }) { @@ -188,7 +190,7 @@ fun DebugScreen(viewModel: DiagnosticsViewModel, onBack: () -> Unit = {}) { } Switch(checked = maskSensitive, onCheckedChange = null) } - Button( + PulseButton( onClick = { scope.launch { try { diff --git a/app/src/main/java/com/pulseloop/ui/screens/DrinksUi.kt b/app/src/main/java/com/pulseloop/ui/screens/DrinksUi.kt index 9ad95193..8902e807 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/DrinksUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/DrinksUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -36,16 +38,13 @@ import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.SportsBar import androidx.compose.material.icons.filled.WineBar import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.RadioButton import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.* import androidx.compose.runtime.saveable.rememberSaveable @@ -144,11 +143,11 @@ private fun Stepper(label: String, value: String, onMinus: () -> Unit, onPlus: ( Text(label, fontSize = 14.sp, color = PulseColors.textPrimary) note?.let { Text(it, fontSize = 12.sp, color = PulseColors.textMuted) } } - TextButton(onClick = onMinus, modifier = Modifier.semantics { contentDescription = trf("Decrease {0}", label) }) { + PulseButton(PulseButtonStyle.Text, onClick = onMinus, modifier = Modifier.semantics { contentDescription = trf("Decrease {0}", label) }) { Text("−", fontSize = 16.sp, modifier = Modifier.clearAndSetSemantics {}) } Text(value, fontSize = 16.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary, textAlign = TextAlign.Center, modifier = Modifier.widthIn(min = 36.dp)) - TextButton(onClick = onPlus, modifier = Modifier.semantics { contentDescription = trf("Increase {0}", label) }) { + PulseButton(PulseButtonStyle.Text, onClick = onPlus, modifier = Modifier.semantics { contentDescription = trf("Increase {0}", label) }) { Text("+", fontSize = 16.sp, modifier = Modifier.clearAndSetSemantics {}) } } @@ -365,7 +364,7 @@ private fun DrinksWelcome(onStart: () -> Unit) { } } } - Button( + PulseButton( onClick = { DrinkPrefs.baselinePerWeek = typical.toDouble() DrinkPrefs.weeklyLimit = limit.toDouble() @@ -374,7 +373,7 @@ private fun DrinksWelcome(onStart: () -> Unit) { DrinkPrefs.setEnabled(true) onStart() }, - modifier = Modifier.fillMaxWidth().height(48.dp), + modifier = Modifier.fillMaxWidth(), ) { Text(tr("Start tracking")) } Text( tr("Private to this phone. If you drink most days, cut down gradually and talk to a doctor: stopping suddenly can be dangerous."), @@ -555,12 +554,12 @@ private fun LogCard(db: PulseLoopDatabase, s: DrinksRepository.Snapshot, onChang title = { Text(tr("Delete drink?")) }, text = { Text(trf("This {0} will be removed from your log.", DrinkType.of(e.type).label.lowercase())) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { toDelete = null scope.launch { DrinksRepository.delete(db, e); onChange() } }) { Text(tr("Delete"), color = PulseColors.danger) } }, - dismissButton = { TextButton(onClick = { toDelete = null }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { toDelete = null }) { Text(tr("Cancel")) } }, ) } @@ -621,9 +620,9 @@ private fun PlanSheet(s: DrinksRepository.Snapshot, onDone: () -> Unit) { Text(tr("Plan tonight"), fontSize = 16.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) Text(tr("Pick the number before the first drink. It's easier to keep a number you chose beforehand."), fontSize = 14.sp, color = PulseColors.textSecondary) Stepper(tr("Drinks tonight"), if (plan == 0) "none" else "$plan", { plan = (plan - 1).coerceAtLeast(0) }, { plan = (plan + 1).coerceAtMost(12) }) - Button(onClick = { DrinkPrefs.setPlan(s.today, plan); onDone() }, modifier = Modifier.fillMaxWidth()) { Text(tr("Save plan")) } + PulseButton(onClick = { DrinkPrefs.setPlan(s.today, plan); onDone() }, modifier = Modifier.fillMaxWidth()) { Text(tr("Save plan")) } if (s.planToday != null) { - TextButton(onClick = { DrinkPrefs.setPlan(s.today, null); onDone() }, modifier = Modifier.fillMaxWidth()) { Text(tr("Clear plan")) } + PulseButton(PulseButtonStyle.Text, onClick = { DrinkPrefs.setPlan(s.today, null); onDone() }, modifier = Modifier.fillMaxWidth()) { Text(tr("Clear plan")) } } } } @@ -670,7 +669,7 @@ private fun MoreDrinkSheet(onLog: (DrinkType, Int, Long, Double?) -> Unit) { keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal), singleLine = true, modifier = Modifier.fillMaxWidth(), ) - Button( + PulseButton( onClick = { onLog(type, count, hoursAgo, price.replace(',', '.').toDoubleOrNull()?.takeIf { it > 0 }) }, modifier = Modifier.fillMaxWidth(), ) { Text(trf("Log {0}", count)) } @@ -866,7 +865,7 @@ private fun AuditCard(s: DrinksRepository.Snapshot, onDone: () -> Unit) { Text(tr("The WHO's short alcohol check (AUDIT-C). Three questions, under a minute. A screen, not a diagnosis."), fontSize = 14.sp, color = PulseColors.textSecondary) } if (s.auditDue) { - OutlinedButton(onClick = { taking = true }, modifier = Modifier.fillMaxWidth()) { + PulseButton(PulseButtonStyle.Outlined, onClick = { taking = true }, modifier = Modifier.fillMaxWidth()) { Text(if (score == null) tr("Take the check") else tr("Retake (every 3 months)")) } } @@ -897,13 +896,13 @@ private fun AuditCard(s: DrinksRepository.Snapshot, onDone: () -> Unit) { } }, confirmButton = { - TextButton(enabled = answers.all { it >= 0 }, onClick = { + PulseButton(PulseButtonStyle.Text, enabled = answers.all { it >= 0 }, onClick = { DrinkPrefs.setAudit(LocalDate.now(), AuditC.score(answers)) taking = false onDone() }) { Text(tr("See result")) } }, - dismissButton = { TextButton(onClick = { taking = false }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { taking = false }) { Text(tr("Cancel")) } }, ) } } @@ -949,7 +948,7 @@ private fun DrinkSettings(onChange: () -> Unit, onTurnedOff: () -> Unit) { singleLine = true, modifier = Modifier.fillMaxWidth(), ) Text(tr("Your drinks stay on this phone. They aren't sent to Health Connect or included in diagnostics."), fontSize = 12.sp, color = PulseColors.textMuted) - TextButton(onClick = { confirmOff = true }) { + PulseButton(PulseButtonStyle.Text, onClick = { confirmOff = true }) { Icon(Icons.Filled.Close, null, tint = PulseColors.danger, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(6.dp)) Text(tr("Turn off Drinks"), color = PulseColors.danger) @@ -959,8 +958,8 @@ private fun DrinkSettings(onChange: () -> Unit, onTurnedOff: () -> Unit) { onDismissRequest = { confirmOff = false }, title = { Text(tr("Turn off Drinks?")) }, text = { Text(tr("The tile and the morning-after line disappear. Your logged drinks stay on this phone until you delete them or clear your data.")) }, - confirmButton = { TextButton(onClick = { DrinkPrefs.setEnabled(false); confirmOff = false; onTurnedOff() }) { Text(tr("Turn off")) } }, - dismissButton = { TextButton(onClick = { confirmOff = false }) { Text(tr("Keep")) } }, + confirmButton = { PulseButton(PulseButtonStyle.Text, onClick = { DrinkPrefs.setEnabled(false); confirmOff = false; onTurnedOff() }) { Text(tr("Turn off")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { confirmOff = false }) { Text(tr("Keep")) } }, ) } diff --git a/app/src/main/java/com/pulseloop/ui/screens/HealthConnectSourceUi.kt b/app/src/main/java/com/pulseloop/ui/screens/HealthConnectSourceUi.kt index c505d7d2..b2520f15 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/HealthConnectSourceUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/HealthConnectSourceUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -17,11 +19,8 @@ import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size -import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState @@ -156,7 +155,7 @@ fun HealthConnectSourceContent(onEnabled: (() -> Unit)? = null) { fontSize = 12.sp, color = PulseColors.warning, ) } else if (!canRead) { - Button(onClick = { launcher.launch(HealthConnectSource.request) }) { Text(tr("Allow access")) } + PulseButton(onClick = { launcher.launch(HealthConnectSource.request) }) { Text(tr("Allow access")) } } } @@ -186,13 +185,13 @@ fun HealthConnectSourceContent(onEnabled: (() -> Unit)? = null) { horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(4.dp), ) { - Button(onClick = { importNow() }, enabled = !importing && canRead) { Text(tr("Import now")) } + PulseButton(onClick = { importNow() }, enabled = !importing && canRead) { Text(tr("Import now")) } if (missing.isNotEmpty()) { - OutlinedButton(onClick = { launcher.launch(HealthConnectSource.request) }) { Text(tr("Allow more")) } + PulseButton(PulseButtonStyle.Outlined, onClick = { launcher.launch(HealthConnectSource.request) }) { Text(tr("Allow more")) } } if (importing) CircularProgressIndicator(Modifier.size(20.dp).align(Alignment.CenterVertically), strokeWidth = 2.dp) } - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { HealthConnectSource.disable(context) enabled = false doScan() @@ -214,14 +213,14 @@ fun HealthConnectSourceContent(onEnabled: (() -> Unit)? = null) { tr("In the Oura app: Settings → Health Connect, and turn on sharing. Then come back and look again."), fontSize = 12.sp, color = PulseColors.textMuted, ) - OutlinedButton(onClick = { doScan() }) { Text(tr("Look again")) } + PulseButton(PulseButtonStyle.Outlined, onClick = { doScan() }) { Text(tr("Look again")) } } } usable.forEach { src -> AccuracyCard { Text(HealthConnectSource.label(context, src.packageName), fontSize = 16.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) Text(src.metrics.joinToString(", ") { it.metric.label }, fontSize = 14.sp, color = PulseColors.textSecondary) - Button(onClick = { + PulseButton(onClick = { HealthConnectSource.enable(context, src.packageName) enabled = true source = src.packageName diff --git a/app/src/main/java/com/pulseloop/ui/screens/LabReportsUi.kt b/app/src/main/java/com/pulseloop/ui/screens/LabReportsUi.kt index c08ff21b..e115d302 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/LabReportsUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/LabReportsUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import android.content.ActivityNotFoundException +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import android.content.Context import android.content.Intent import android.net.Uri @@ -20,16 +22,13 @@ import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.AutoAwesome import androidx.compose.material.icons.filled.Delete import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -220,7 +219,7 @@ fun LabReportsScreen(onBack: () -> Unit, onMarker: (String) -> Unit, onAskCoach: .joinToString(" · "), fontSize = 12.sp, color = PulseColors.textMuted) } } - Button( + PulseButton( onClick = { picker.launch(arrayOf("application/pdf")) }, enabled = !reading, modifier = Modifier.fillMaxWidth().heightIn(min = 48.dp), @@ -316,12 +315,12 @@ fun LabReportsScreen(onBack: () -> Unit, onMarker: (String) -> Unit, onAskCoach: title = { Text(tr("Delete this report?")) }, text = { Text(tr("Its markers and its PDF are removed from this phone.")) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { scope.launch { LabReports.delete(context, db, r) } deleting = null }) { Text(tr("Delete"), color = PulseColors.danger) } }, - dismissButton = { TextButton(onClick = { deleting = null }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { deleting = null }) { Text(tr("Cancel")) } }, ) } } @@ -412,7 +411,7 @@ fun LabMarkerScreen(markerKey: String, onBack: () -> Unit, onAskCoach: (markerNa LabNotice(trf("Outside the lab's range on {0}. Worth bringing to your doctor.", dayLabel(l.day))) } - OutlinedButton(onClick = { onAskCoach(m.name) }, modifier = Modifier.fillMaxWidth().heightIn(min = 48.dp)) { + PulseButton(PulseButtonStyle.Outlined, onClick = { onAskCoach(m.name) }, modifier = Modifier.fillMaxWidth()) { Icon(Icons.Filled.AutoAwesome, null, tint = PulseColors.accent) Spacer(Modifier.width(8.dp)) Text(tr("Ask the coach for a plan"), color = PulseColors.accent) @@ -495,7 +494,7 @@ private fun LabReviewScreen( fontSize = 16.sp, fontWeight = FontWeight.Bold, color = if (draft.collectedOn == null) PulseColors.warning else PulseColors.textPrimary) } - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val d = draft.collectedOn ?: LocalDate.now() android.app.DatePickerDialog(context, { _, y, mo, day -> onChange(draft.copy(collectedOn = LocalDate.of(y, mo + 1, day))) @@ -533,8 +532,8 @@ private fun LabReviewScreen( Text(tr("Tap a row to fix or remove it."), fontSize = 12.sp, color = PulseColors.accent) } Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { - OutlinedButton(onClick = onDiscard, modifier = Modifier.weight(1f).heightIn(min = 48.dp)) { Text(tr("Discard")) } - Button( + PulseButton(PulseButtonStyle.Outlined, onClick = onDiscard, modifier = Modifier.weight(1f)) { Text(tr("Discard")) } + PulseButton( onClick = onSave, enabled = draft.results.isNotEmpty(), modifier = Modifier.weight(1f).heightIn(min = 48.dp), @@ -568,7 +567,7 @@ private fun LabReviewScreen( } }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val n = num(value) val updated = r.copy( name = name.trim().ifBlank { r.name }, @@ -581,11 +580,11 @@ private fun LabReviewScreen( }, dismissButton = { Row { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { onChange(draft.copy(results = draft.results.filterIndexed { i, _ -> i != index })) editing = null }) { Text(tr("Remove"), color = PulseColors.danger) } - TextButton(onClick = { editing = null }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { editing = null }) { Text(tr("Cancel")) } } }, ) diff --git a/app/src/main/java/com/pulseloop/ui/screens/LanguageSettingsScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/LanguageSettingsScreen.kt index 418a0ecf..d324e242 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/LanguageSettingsScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/LanguageSettingsScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import android.app.Activity +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import android.content.Context import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -12,7 +14,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.AlertDialog import androidx.compose.material3.RadioButton import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -87,8 +88,8 @@ fun LanguageSettingsScreen(onBack: () -> Unit) { ), ) }, - confirmButton = { TextButton(onClick = { confirming = null; switchTo(context, lang) }) { Text(tr("Bring it on")) } }, - dismissButton = { TextButton(onClick = { confirming = null }) { Text(tr("Never mind")) } }, + confirmButton = { PulseButton(PulseButtonStyle.Text, onClick = { confirming = null; switchTo(context, lang) }) { Text(tr("Bring it on")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { confirming = null }) { Text(tr("Never mind")) } }, ) } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/LogPastActivityScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/LogPastActivityScreen.kt index b1d7ec07..129ef014 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/LogPastActivityScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/LogPastActivityScreen.kt @@ -1,6 +1,7 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.tr +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.theme.dither import androidx.compose.foundation.background @@ -18,7 +19,6 @@ import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.CheckCircle import androidx.compose.material.icons.filled.Remove -import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Icon import androidx.compose.material3.Text @@ -126,7 +126,7 @@ fun LogPastActivityScreen(onBack: () -> Unit, onSaved: (String) -> Unit) { } item { - Button( + PulseButton( onClick = { saving = true scope.launch { @@ -147,7 +147,7 @@ fun LogPastActivityScreen(onBack: () -> Unit, onSaved: (String) -> Unit) { } }, enabled = isValid && !saving, - modifier = Modifier.fillMaxWidth().height(56.dp), + modifier = Modifier.fillMaxWidth(), shape = CircleShape, colors = ButtonDefaults.buttonColors(containerColor = PulseColors.accent), ) { diff --git a/app/src/main/java/com/pulseloop/ui/screens/LogSheet.kt b/app/src/main/java/com/pulseloop/ui/screens/LogSheet.kt index 355791d0..522eb406 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/LogSheet.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/LogSheet.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.tr +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.trf import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -197,7 +199,7 @@ private fun QuickDrinks(db: PulseLoopDatabase, onMore: () -> Unit) { maxLines = 1, overflow = TextOverflow.Ellipsis, ) if (last != null) { - androidx.compose.material3.TextButton( + PulseButton(PulseButtonStyle.Text, onClick = { scope.launch { last.second.forEach { DrinksRepository.delete(db, it) }; logged = null } }, modifier = Modifier.heightIn(min = 48.dp), ) { diff --git a/app/src/main/java/com/pulseloop/ui/screens/MealAnalysisSheet.kt b/app/src/main/java/com/pulseloop/ui/screens/MealAnalysisSheet.kt index e6f06e14..6cbabe4a 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/MealAnalysisSheet.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/MealAnalysisSheet.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -47,17 +49,14 @@ import androidx.compose.material.icons.filled.PhotoCamera import androidx.compose.material.icons.filled.PhotoLibrary import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Warning -import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.FilterChip import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -298,7 +297,7 @@ fun MealAnalysisDialog( color = PulseColors.textPrimary, modifier = Modifier.weight(1f), ) - TextButton(onClick = onDismiss) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } } Column( Modifier @@ -346,12 +345,12 @@ fun MealAnalysisDialog( } else { // Equal heights if a translated label wraps to a second line. Row(Modifier.fillMaxWidth().height(IntrinsicSize.Min), horizontalArrangement = Arrangement.spacedBy(12.dp)) { - OutlinedButton(onClick = { launchCamera() }, modifier = Modifier.weight(1f).fillMaxHeight()) { + PulseButton(PulseButtonStyle.Outlined, onClick = { launchCamera() }, modifier = Modifier.weight(1f).fillMaxHeight()) { Icon(Icons.Filled.PhotoCamera, null, Modifier.size(18.dp)) Spacer(Modifier.width(6.dp)) Text(tr("Camera"), maxLines = 2, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center) } - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { photoPicker.launch( PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly) @@ -383,7 +382,7 @@ fun MealAnalysisDialog( ) } - Button( + PulseButton( onClick = { analyze() }, enabled = canAnalyze, modifier = Modifier.fillMaxWidth(), @@ -486,7 +485,7 @@ fun MealAnalysisDialog( } } val canSave = MealAnalysisLogic.canSave(name, calories) - Button( + PulseButton( onClick = { save() }, enabled = canSave, modifier = Modifier.fillMaxWidth(), @@ -496,7 +495,7 @@ fun MealAnalysisDialog( Spacer(Modifier.width(6.dp)) Text(tr("Log meal")) } - TextButton( + PulseButton(PulseButtonStyle.Text, onClick = { phase = AnalysisPhase.Input }, modifier = Modifier.align(Alignment.CenterHorizontally), ) { @@ -521,7 +520,7 @@ fun MealAnalysisDialog( textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth(), ) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { phase = AnalysisPhase.Input }, modifier = Modifier.align(Alignment.CenterHorizontally), ) { diff --git a/app/src/main/java/com/pulseloop/ui/screens/MedsUi.kt b/app/src/main/java/com/pulseloop/ui/screens/MedsUi.kt index e0537ac8..1872f3fd 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/MedsUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/MedsUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -16,12 +18,10 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Delete import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -108,10 +108,10 @@ fun MedsScreen(onBack: () -> Unit) { when (d.state) { // Bounded so long translations can't squeeze the dose name beside them. Meds.State.TAKEN, Meds.State.SKIPPED -> - TextButton(onClick = { answer(d, null) }, modifier = Modifier.widthIn(max = 104.dp)) { Text(tr("Undo"), maxLines = 1, overflow = TextOverflow.Ellipsis) } + PulseButton(PulseButtonStyle.Text, onClick = { answer(d, null) }, modifier = Modifier.widthIn(max = 104.dp)) { Text(tr("Undo"), maxLines = 1, overflow = TextOverflow.Ellipsis) } else -> { - TextButton(onClick = { answer(d, "skipped") }, modifier = Modifier.widthIn(max = 96.dp)) { Text(tr("Skip"), color = PulseColors.textMuted, maxLines = 1, overflow = TextOverflow.Ellipsis) } - TextButton(onClick = { answer(d, "taken") }, modifier = Modifier.widthIn(max = 96.dp)) { Text(tr("Taken"), maxLines = 1, overflow = TextOverflow.Ellipsis) } + PulseButton(PulseButtonStyle.Text, onClick = { answer(d, "skipped") }, modifier = Modifier.widthIn(max = 96.dp)) { Text(tr("Skip"), color = PulseColors.textMuted, maxLines = 1, overflow = TextOverflow.Ellipsis) } + PulseButton(PulseButtonStyle.Text, onClick = { answer(d, "taken") }, modifier = Modifier.widthIn(max = 96.dp)) { Text(tr("Taken"), maxLines = 1, overflow = TextOverflow.Ellipsis) } } } } @@ -154,7 +154,7 @@ fun MedsScreen(onBack: () -> Unit) { } // With nothing added yet, adding is the only thing to do here: keep the big button. if (medsLoaded != null && meds.isEmpty()) { - Button(onClick = { adding = true }, modifier = Modifier.fillMaxWidth()) { Text(tr("Add medication or supplement")) } + PulseButton(onClick = { adding = true }, modifier = Modifier.fillMaxWidth()) { Text(tr("Add medication or supplement")) } } Text( tr("A record for you and your doctor. PulseLoop doesn't check interactions or doses; ask your pharmacist."), @@ -216,7 +216,7 @@ private fun MedDialog(initial: MedEntity?, onDismiss: () -> Unit, onSave: (MedEn Text(tr("Active"), fontSize = 14.sp, modifier = Modifier.weight(1f)) androidx.compose.material3.Switch(checked = active, onCheckedChange = { active = it }) } - onDelete?.let { del -> TextButton(onClick = del) { + onDelete?.let { del -> PulseButton(PulseButtonStyle.Text, onClick = del) { Icon(Icons.Filled.Delete, null, tint = PulseColors.danger, modifier = Modifier.size(16.dp)) Text(tr(" Delete"), color = PulseColors.danger) } } @@ -224,13 +224,13 @@ private fun MedDialog(initial: MedEntity?, onDismiss: () -> Unit, onSave: (MedEn } }, confirmButton = { - TextButton(enabled = name.isNotBlank() && times.isNotEmpty(), onClick = { + PulseButton(PulseButtonStyle.Text, enabled = name.isNotBlank() && times.isNotEmpty(), onClick = { onSave((initial ?: MedEntity(name = name.trim(), timesCsv = "")).copy( name = name.trim(), dose = dose.trim().ifEmpty { null }, kind = kind, timesCsv = times.sorted().joinToString(","), active = active, )) }) { Text(tr("Save")) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } }, ) } diff --git a/app/src/main/java/com/pulseloop/ui/screens/MyHealthUi.kt b/app/src/main/java/com/pulseloop/ui/screens/MyHealthUi.kt index 705d8a19..b0cbbd6c 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/MyHealthUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/MyHealthUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -30,10 +32,8 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Share import androidx.compose.material.icons.filled.ExpandMore -import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Switch import androidx.compose.material3.Text import androidx.compose.material3.minimumInteractiveComponentSize @@ -360,7 +360,7 @@ private fun StressSection(s: HealthInsightsRepository.Snapshot, onBreathe: () -> trf("Two hours after against two hours before, over {0} sessions. Readings during a session aren't counted: slow breathing raises HRV while it lasts.", e.sessions), ) } - OutlinedButton(onClick = onBreathe, modifier = Modifier.fillMaxWidth()) { Text(tr("Start a breathing session")) } + PulseButton(PulseButtonStyle.Outlined, onClick = onBreathe, modifier = Modifier.fillMaxWidth()) { Text(tr("Start a breathing session")) } } } @@ -568,7 +568,7 @@ fun BreatheScreen(onBack: () -> Unit) { ) Text("%d:%02d".format(remaining / 60, remaining % 60), fontSize = 28.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) Spacer(Modifier.height(16.dp)) - OutlinedButton(onClick = { finish() }) { Text(tr("End session")) } + PulseButton(PulseButtonStyle.Outlined, onClick = { finish() }) { Text(tr("End session")) } } r != null -> { Text(tr("Session saved"), fontSize = 24.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) @@ -580,7 +580,7 @@ fun BreatheScreen(onBack: () -> Unit) { } Text(tr("Tagged as \"Meditation or relaxing\" in today's journal."), fontSize = 12.sp, color = PulseColors.textMuted) Spacer(Modifier.height(16.dp)) - Button(onClick = onBack) { Text(tr("Done")) } + PulseButton(onClick = onBack) { Text(tr("Done")) } } else -> { Text(tr("Slow breathing: in for 4 seconds, out for 6."), fontSize = 16.sp, color = PulseColors.textSecondary) @@ -595,7 +595,7 @@ fun BreatheScreen(onBack: () -> Unit) { } } Spacer(Modifier.height(24.dp)) - Button(onClick = { result = null; elapsedMs = 0L; startedAt = System.currentTimeMillis() }) { Text(tr("Start")) } + PulseButton(onClick = { result = null; elapsedMs = 0L; startedAt = System.currentTimeMillis() }) { Text(tr("Start")) } } } Spacer(Modifier.weight(1f)) @@ -653,7 +653,7 @@ internal fun StepCalibrationCard(db: PulseLoopDatabase) { when { !granted -> { Text(tr("Your phone counts steps too. Comparing the two over a few days shows whether your ring over- or under-counts."), fontSize = 14.sp, color = PulseColors.textSecondary) - OutlinedButton(onClick = { + PulseButton(PulseButtonStyle.Outlined, onClick = { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) launcher.launch(android.Manifest.permission.ACTIVITY_RECOGNITION) }, modifier = Modifier.fillMaxWidth()) { Text(tr("Compare with my phone")) } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/NutritionScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/NutritionScreen.kt index c06cdb74..5f5aafb8 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/NutritionScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/NutritionScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -195,7 +197,7 @@ fun NutritionScreen( // reaches the earlier days the arrows open): Log meal, plus the AI ways in as icons. item { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { showAddDialog = true }, modifier = Modifier.weight(1f).heightIn(min = 48.dp), ) { @@ -286,7 +288,7 @@ fun NutritionScreen( title = { Text(tr("Delete meal?")) }, text = { Text(trf("\"{0}\" will be removed from this day's log.", meal.name)) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { mealToDelete = null scope.launch { db.mealEntryDao().deleteById(meal.id) @@ -295,7 +297,7 @@ fun NutritionScreen( } }) { Text(tr("Delete"), color = PulseColors.danger) } }, - dismissButton = { TextButton(onClick = { mealToDelete = null }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { mealToDelete = null }) { Text(tr("Cancel")) } }, ) } @@ -521,7 +523,7 @@ fun MealLogDialog( CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp) Spacer(Modifier.width(8.dp)) } - TextButton(onClick = { showScanner = true }, enabled = !lookingUp && !estimating) { + PulseButton(PulseButtonStyle.Text, onClick = { showScanner = true }, enabled = !lookingUp && !estimating) { Icon(Icons.Filled.QrCodeScanner, null, Modifier.size(18.dp)) Spacer(Modifier.width(4.dp)) Text(tr("Scan barcode"), maxLines = 1, overflow = TextOverflow.Ellipsis) @@ -569,7 +571,7 @@ fun MealLogDialog( } } if (aiAvailable) { - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { estimateWithAi() }, enabled = name.isNotBlank() && !estimating && !lookingUp, modifier = Modifier.fillMaxWidth(), @@ -607,7 +609,7 @@ fun MealLogDialog( } }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val kcal = cal.toDoubleOrNull() ?: 0.0 val pp = pendingProduct val ai = aiEstimate @@ -671,7 +673,7 @@ fun MealLogDialog( }) }, enabled = valid) { Text(tr("Save")) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } }, ) if (showScanner) { @@ -745,11 +747,11 @@ private fun NextMealCard( idea.note?.let { Text(it, fontSize = 12.sp, color = PulseColors.textSecondary) } // Same treatment as the Photo/Describe pair: two lines allowed, equal heights. Row(Modifier.fillMaxWidth().height(IntrinsicSize.Min), horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Button(onClick = onLog, modifier = Modifier.weight(1f).fillMaxHeight(), contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp)) { + PulseButton(onClick = onLog, modifier = Modifier.weight(1f).fillMaxHeight(), contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp)) { Text(tr("Log this"), maxLines = 2, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center) } if (onDiscuss != null) { - OutlinedButton(onClick = onDiscuss, modifier = Modifier.weight(1f).fillMaxHeight(), contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp)) { + PulseButton(PulseButtonStyle.Outlined, onClick = onDiscuss, modifier = Modifier.weight(1f).fillMaxHeight(), contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp)) { Text(tr("Other ideas"), maxLines = 2, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center) } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/PostpartumUi.kt b/app/src/main/java/com/pulseloop/ui/screens/PostpartumUi.kt index 889c03f5..526252b7 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/PostpartumUi.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/PostpartumUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import android.content.Context +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import android.content.Intent import android.net.Uri import androidx.compose.foundation.background @@ -15,16 +17,13 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Check -import androidx.compose.material3.Button import androidx.compose.material3.DatePicker import androidx.compose.material3.DatePickerDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberDatePickerState import androidx.compose.runtime.* import androidx.compose.ui.Alignment @@ -94,7 +93,7 @@ fun PostpartumProfileCard(onOpen: () -> Unit) { if (enabled) { Row(verticalAlignment = Alignment.CenterVertically) { Text(tr("Baby's birth date"), fontSize = 14.sp, color = PulseColors.textSecondary, modifier = Modifier.weight(1f)) - TextButton(onClick = { picking = true }) { Text(birth?.format(fmt) ?: tr("Set")) } + PulseButton(PulseButtonStyle.Text, onClick = { picking = true }) { Text(birth?.format(fmt) ?: tr("Set")) } } Text(tr("Feeding"), fontSize = 14.sp, color = PulseColors.textSecondary) FlowRow(horizontalArrangement = Arrangement.spacedBy(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { @@ -104,7 +103,7 @@ fun PostpartumProfileCard(onOpen: () -> Unit) { Postpartum.Feeding.NONE to tr("Not breastfeeding"), ).forEach { (f, label) -> Chip(label, feeding == f) { feeding = f; save() } } } - if (birth != null) OutlinedButton(onClick = onOpen, modifier = Modifier.fillMaxWidth()) { Text(tr("Open postpartum view")) } + if (birth != null) PulseButton(PulseButtonStyle.Outlined, onClick = onOpen, modifier = Modifier.fillMaxWidth()) { Text(tr("Open postpartum view")) } } } @@ -115,13 +114,13 @@ fun PostpartumProfileCard(onOpen: () -> Unit) { DatePickerDialog( onDismissRequest = { picking = false }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { state.selectedDateMillis?.let { Instant.ofEpochMilli(it).atZone(ZoneOffset.UTC).toLocalDate() } ?.takeIf { !it.isAfter(LocalDate.now()) }?.let { birth = it; save() } picking = false }) { Text(tr("Save")) } }, - dismissButton = { TextButton(onClick = { picking = false }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { picking = false }) { Text(tr("Cancel")) } }, ) { Text(tr("When was your baby born?"), modifier = Modifier.padding(start = 24.dp, top = 16.dp), fontSize = 16.sp, fontWeight = FontWeight.SemiBold) DatePicker(state = state, showModeToggle = false) @@ -244,7 +243,7 @@ fun PostpartumScreen(onBack: () -> Unit, onOpenProfile: () -> Unit) { if (birth == null) { Card { Text(tr("Set your baby's birth date in your profile to see this view."), fontSize = 14.sp, color = PulseColors.textSecondary) - Button(onClick = onOpenProfile) { Text(tr("Open profile")) } + PulseButton(onClick = onOpenProfile) { Text(tr("Open profile")) } } return@Column } @@ -296,7 +295,7 @@ fun PostpartumScreen(onBack: () -> Unit, onOpenProfile: () -> Unit) { Postpartum.nextCheckIn(birth, today, history)?.let { next -> Text(trf("Suggested next check-in: {0}", next.format(DateTimeFormatter.ofPattern("d MMM"))), fontSize = 12.sp, color = PulseColors.textMuted) } - Button(onClick = { checkIn = true }) { Text(tr("Start check-in")) } + PulseButton(onClick = { checkIn = true }) { Text(tr("Start check-in")) } Text(tr("Your answers stay on this phone. They aren't in backups, diagnostics or Health Connect."), fontSize = 12.sp, color = PulseColors.textMuted) } } val lastEpds = history.lastOrNull() @@ -483,8 +482,8 @@ private fun EpdsGuidance(score: Int, selfHarm: Int) { // FlowRow: the two translated labels don't fit side by side, and a crisis button // pushed off the edge of the screen is the worst place for an overflow. FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { - Button(onClick = { dial(context, "188") }) { Text(tr("Call CVV 188")) } - OutlinedButton(onClick = { dial(context, "192") }) { Text(tr("Call SAMU 192")) } + PulseButton(onClick = { dial(context, "188") }) { Text(tr("Call CVV 188")) } + PulseButton(PulseButtonStyle.Outlined, onClick = { dial(context, "192") }) { Text(tr("Call SAMU 192")) } } } } @@ -527,7 +526,7 @@ private fun EpdsCheckIn(onDone: (Postpartum.EpdsResult?) -> Unit) { Text(trf("Your score: {0} of 30", r.score), fontSize = 20.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) EpdsGuidance(r.score, r.selfHarm) } - Button(onClick = { onDone(r) }, modifier = Modifier.fillMaxWidth()) { Text(tr("Done")) } + PulseButton(onClick = { onDone(r) }, modifier = Modifier.fillMaxWidth()) { Text(tr("Done")) } return@Column } Text(form.instruction, fontSize = 14.sp, color = PulseColors.textSecondary) @@ -546,7 +545,7 @@ private fun EpdsCheckIn(onDone: (Postpartum.EpdsResult?) -> Unit) { } } } - Button( + PulseButton( enabled = answers.all { it != null }, onClick = { val scores = form.items.mapIndexed { i, item -> item.options[answers[i]!!].score } diff --git a/app/src/main/java/com/pulseloop/ui/screens/RecordScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/RecordScreen.kt index e6048886..df99d65d 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/RecordScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/RecordScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.tr +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.theme.PulseColors import androidx.activity.compose.BackHandler @@ -70,10 +72,10 @@ fun RecordScreen( title = { Text(tr("Workout in progress")) }, text = { Text(tr("Your workout is still recording. Finish it now, or keep recording?")) }, confirmButton = { - TextButton(onClick = { showLeaveDialog = false; onFinish() }) { Text(tr("Finish")) } + PulseButton(PulseButtonStyle.Text, onClick = { showLeaveDialog = false; onFinish() }) { Text(tr("Finish")) } }, dismissButton = { - TextButton(onClick = { showLeaveDialog = false }) { Text(tr("Keep recording")) } + PulseButton(PulseButtonStyle.Text, onClick = { showLeaveDialog = false }) { Text(tr("Keep recording")) } }, ) } @@ -139,19 +141,19 @@ fun RecordScreen( // Action buttons Row(Modifier.fillMaxWidth().padding(bottom = 16.dp), horizontalArrangement = Arrangement.spacedBy(12.dp)) { if (isPaused) { - Button(onClick = onResume, Modifier.weight(1f).height(52.dp)) { + PulseButton(onClick = onResume, modifier = Modifier.weight(1f)) { Icon(Icons.Filled.PlayArrow, null) Spacer(Modifier.width(8.dp)) Text(tr("Resume"), maxLines = 1, overflow = TextOverflow.Ellipsis) } } else { - OutlinedButton(onClick = onPause, Modifier.weight(1f).height(52.dp)) { + PulseButton(PulseButtonStyle.Outlined, onClick = onPause, modifier = Modifier.weight(1f)) { Icon(Icons.Filled.Pause, null) Spacer(Modifier.width(8.dp)) Text(tr("Pause"), maxLines = 1, overflow = TextOverflow.Ellipsis) } } - Button(onClick = onFinish, Modifier.weight(1f).height(52.dp), colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error)) { + PulseButton(onClick = onFinish, modifier = Modifier.weight(1f), colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error)) { Icon(Icons.Filled.Stop, null) Spacer(Modifier.width(8.dp)) Text(tr("Finish"), maxLines = 1, overflow = TextOverflow.Ellipsis) diff --git a/app/src/main/java/com/pulseloop/ui/screens/Screens.kt b/app/src/main/java/com/pulseloop/ui/screens/Screens.kt index f770e185..ef141d8a 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/Screens.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/Screens.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -413,7 +415,7 @@ fun VitalsScreen( } } var pickOpen by remember { mutableStateOf(false) } - Button( + PulseButton( enabled = !measuring, modifier = Modifier.widthIn(max = 160.dp), onClick = { pickOpen = true }, @@ -433,7 +435,7 @@ fun VitalsScreen( options[index].run() } } else { - Button( + PulseButton( enabled = !measuring, // Same reason as the bound above: the title is weighted, this isn't. modifier = Modifier.widthIn(max = 208.dp), @@ -1038,7 +1040,7 @@ private fun ReadingsCard( } } if (readings.size > visibleCount) { - TextButton( + PulseButton(PulseButtonStyle.Text, onClick = { visibleCount += READINGS_PAGE_SIZE }, modifier = Modifier.padding(start = 8.dp), ) { @@ -1070,13 +1072,13 @@ private fun ReadingsCard( ) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { onDelete(reading) pendingDelete = null }) { Text(tr("Delete"), color = MaterialTheme.colorScheme.error) } }, dismissButton = { - TextButton(onClick = { pendingDelete = null }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { pendingDelete = null }) { Text(tr("Cancel")) } }, ) } diff --git a/app/src/main/java/com/pulseloop/ui/screens/SettingsSubScreens.kt b/app/src/main/java/com/pulseloop/ui/screens/SettingsSubScreens.kt index 79a07ede..7c248b2f 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/SettingsSubScreens.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/SettingsSubScreens.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -325,7 +327,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Spacer(Modifier.height(4.dp)) var providerExpanded by remember { mutableStateOf(false) } Box { - OutlinedButton(onClick = { providerExpanded = true }, modifier = Modifier.fillMaxWidth()) { + PulseButton(PulseButtonStyle.Outlined, onClick = { providerExpanded = true }, modifier = Modifier.fillMaxWidth()) { Text(providerLabel, Modifier.weight(1f)) Icon(Icons.Filled.ArrowDropDown, null) } @@ -375,11 +377,11 @@ fun CoachSettingsScreen(onBack: () -> Unit) { keyboardActions = KeyboardActions(onDone = { if (value.isNotBlank()) save() }), ) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { - Button(onClick = save, enabled = value.isNotBlank(), modifier = Modifier.weight(1f)) { + PulseButton(onClick = save, enabled = value.isNotBlank(), modifier = Modifier.weight(1f)) { Text(if (saved) tr("Update Key") else tr("Save Key")) } if (saved) { - OutlinedButton(onClick = onRemove, modifier = Modifier.weight(1f)) { Text(tr("Remove")) } + PulseButton(PulseButtonStyle.Outlined, onClick = onRemove, modifier = Modifier.weight(1f)) { Text(tr("Remove")) } } } if (justSaved) { @@ -398,7 +400,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Spacer(Modifier.height(4.dp)) var expanded by remember { mutableStateOf(false) } Box { - OutlinedButton(onClick = { expanded = true }, modifier = Modifier.fillMaxWidth()) { + PulseButton(PulseButtonStyle.Outlined, onClick = { expanded = true }, modifier = Modifier.fillMaxWidth()) { Text(selected, Modifier.weight(1f)) Icon(Icons.Filled.ArrowDropDown, null) } @@ -522,7 +524,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { // `response_format` — which depend on launch flags that no metadata // endpoint exposes. The detected values are applied straight to the // controls below, which stay editable. - Button( + PulseButton( onClick = { localProbeBusy = true; localProbeResult = null; localProbeNotes = emptyList() scope.launch { @@ -826,7 +828,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Column(Modifier.padding(16.dp)) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Text(tr("Coach Memory"), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold, modifier = Modifier.weight(1f)) - TextButton(onClick = { showMemory = !showMemory }) { + PulseButton(PulseButtonStyle.Text, onClick = { showMemory = !showMemory }) { Text(if (showMemory) tr("Hide") else trf("Show ({0})", memories.size)) } } @@ -860,13 +862,13 @@ fun CoachSettingsScreen(onBack: () -> Unit) { title = { Text(tr("Delete memory?")) }, text = { Text(trf("The coach will forget \"{0}\". This can't be undone.", key)) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { memoryToDelete = null scope.launch { db.coachMemoryDao().deleteByKey(key) } }) { Text(tr("Delete"), color = MaterialTheme.colorScheme.error) } }, dismissButton = { - TextButton(onClick = { memoryToDelete = null }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { memoryToDelete = null }) { Text(tr("Cancel")) } }, ) } @@ -877,10 +879,10 @@ fun CoachSettingsScreen(onBack: () -> Unit) { title = { Text(tr("Enable Coach Check-Ins?")) }, text = { Text(tr("Get a daily check-in from your coach. You can change this anytime in Settings → Notifications.")) }, confirmButton = { - TextButton(onClick = { askEnableCheckIns = false; enableCheckIns() }) { Text(tr("Enable")) } + PulseButton(PulseButtonStyle.Text, onClick = { askEnableCheckIns = false; enableCheckIns() }) { Text(tr("Enable")) } }, dismissButton = { - TextButton(onClick = { askEnableCheckIns = false }) { Text(tr("Not now")) } + PulseButton(PulseButtonStyle.Text, onClick = { askEnableCheckIns = false }) { Text(tr("Not now")) } }, ) } @@ -1057,7 +1059,7 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { Text(tr("Morning"), Modifier.weight(1f)) var amExpanded by remember { mutableStateOf(false) } Box { - OutlinedButton(enabled = coachEnabled, onClick = { amExpanded = true }) { + PulseButton(PulseButtonStyle.Outlined, enabled = coachEnabled, onClick = { amExpanded = true }) { Text(String.format("%02d:00", morningHour)) } DropdownMenu(expanded = amExpanded, onDismissRequest = { amExpanded = false }) { @@ -1077,7 +1079,7 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { Text(tr("Evening"), Modifier.weight(1f)) var pmExpanded by remember { mutableStateOf(false) } Box { - OutlinedButton(enabled = coachEnabled, onClick = { pmExpanded = true }) { + PulseButton(PulseButtonStyle.Outlined, enabled = coachEnabled, onClick = { pmExpanded = true }) { Text(String.format("%02d:00", eveningHour)) } DropdownMenu(expanded = pmExpanded, onDismissRequest = { pmExpanded = false }) { @@ -1092,7 +1094,7 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { } Spacer(Modifier.height(8.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, enabled = coachEnabled, onClick = { scope.launch { @@ -1250,7 +1252,7 @@ fun ProfileSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> Unit, showUnits = true, ) if (keyStore.unitSystem != null) { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { keyStore.unitSystem = null profileDraft = draft.copy(units = keyStore.resolvedUnitSystem) com.pulseloop.widgets.WidgetSnapshotPublisher.publish(context) @@ -1277,7 +1279,7 @@ fun ProfileSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> Unit, } } - Button( + PulseButton( onClick = { scope.launch { val current = profileDraft ?: return@launch @@ -1374,7 +1376,7 @@ fun PhysiologySettingsScreen(onBack: () -> Unit) { TriStateRow(tr("Known lung condition"), lungCondition) { lungCondition = it; savedMsg = null } } - Button( + PulseButton( onClick = { keyStore.athleteMode = athleteMode keyStore.usesBetaBlockers = betaBlockers @@ -1480,7 +1482,7 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U ) } Spacer(Modifier.height(12.dp)) - Button( + PulseButton( onClick = { scope.launch { val sysI = bpSys.toIntOrNull() ?: 0 @@ -1518,7 +1520,7 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), singleLine = true, modifier = Modifier.weight(1.4f), ) - Button( + PulseButton( onClick = { scope.launch { val ref = glucoseRef.toDoubleOrNull() @@ -1550,7 +1552,7 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U modifier = Modifier.weight(1f), ) if (glucoseOffset != 0.0) { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { keyStore.glucoseOffsetMgdl = 0.0 keyStore.glucoseRefMgdl = 0.0 glucoseOffset = 0.0 @@ -1600,7 +1602,7 @@ fun GoalsSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> Unit) { units = goalUnits, includeWeeklyWorkouts = true, ) - Button( + PulseButton( onClick = { scope.launch { val existing = db.userGoalDao().get() @@ -1767,7 +1769,7 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U } Spacer(Modifier.height(12.dp)) - Button( + PulseButton( enabled = cfgLoaded, onClick = { scope.launch { @@ -1907,10 +1909,10 @@ private fun QuietHoursCard() { ) Spacer(Modifier.height(4.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { - OutlinedButton(onClick = { picking = "start" }, modifier = Modifier.weight(1f)) { + PulseButton(PulseButtonStyle.Outlined, onClick = { picking = "start" }, modifier = Modifier.weight(1f)) { Text(trf("From {0}", formatMinutesOfDay(start))) } - OutlinedButton(onClick = { picking = "end" }, modifier = Modifier.weight(1f)) { + PulseButton(PulseButtonStyle.Outlined, onClick = { picking = "end" }, modifier = Modifier.weight(1f)) { Text(trf("Until {0}", formatMinutesOfDay(end))) } } @@ -1931,7 +1933,7 @@ private fun QuietHoursCard() { ) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { showPermissionDialog = false try { val intent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) { @@ -1949,7 +1951,7 @@ private fun QuietHoursCard() { }) { Text(tr("Open Settings")) } }, dismissButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { showPermissionDialog = false if (!prefs.gateByZenMode) ZenModeListener.setEnabled(context, false) }) { Text(tr("Cancel")) } @@ -1969,7 +1971,7 @@ private fun QuietHoursCard() { title = { Text(if (which == "start") tr("Quiet from") else tr("Quiet until")) }, text = { TimePicker(state = pickerState) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val minutes = pickerState.hour * 60 + pickerState.minute if (which == "start") { start = minutes; prefs.startMinutes = minutes } else { end = minutes; prefs.endMinutes = minutes } @@ -1977,7 +1979,7 @@ private fun QuietHoursCard() { }) { Text(tr("Done")) } }, dismissButton = { - TextButton(onClick = { picking = null }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { picking = null }) { Text(tr("Cancel")) } }, ) } @@ -2063,7 +2065,7 @@ fun WearableSettingsScreen( if (deviceLoaded && device == null) { // No ring yet — route into the redesigned pairing screen (iOS #48). Spacer(Modifier.height(12.dp)) - Button(onClick = onAddRing, modifier = Modifier.fillMaxWidth()) { + PulseButton(onClick = onAddRing, modifier = Modifier.fillMaxWidth()) { Icon(Icons.Filled.Add, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) Text(tr("Add a ring")) @@ -2072,7 +2074,7 @@ fun WearableSettingsScreen( if (isConnected) { Spacer(Modifier.height(12.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { coordinator?.syncNow() }, modifier = Modifier.fillMaxWidth(), ) { @@ -2082,7 +2084,7 @@ fun WearableSettingsScreen( } if (supportsFindDevice) { Spacer(Modifier.height(8.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { coordinator?.findRing() }, modifier = Modifier.fillMaxWidth(), ) { @@ -2092,7 +2094,7 @@ fun WearableSettingsScreen( } } Spacer(Modifier.height(8.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { bleClient?.userDisconnect() }, modifier = Modifier.fillMaxWidth(), ) { @@ -2104,7 +2106,7 @@ fun WearableSettingsScreen( bleState.connectionState != RingConnectionState.RECONNECTING ) { Spacer(Modifier.height(12.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { bleClient.userConnect() }, modifier = Modifier.fillMaxWidth(), ) { @@ -2137,7 +2139,7 @@ fun WearableSettingsScreen( color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(12.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { showForgetRing = true }, modifier = Modifier.fillMaxWidth(), colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.error), @@ -2158,7 +2160,7 @@ fun WearableSettingsScreen( color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(12.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, enabled = !resetting, onClick = { showFactoryReset = true }, modifier = Modifier.fillMaxWidth(), @@ -2185,7 +2187,7 @@ fun WearableSettingsScreen( ) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { showForgetRing = false scope.launch { // Cancel background sync before unpair @@ -2207,7 +2209,7 @@ fun WearableSettingsScreen( }) { Text(tr("Forget"), color = MaterialTheme.colorScheme.error) } }, dismissButton = { - TextButton(onClick = { showForgetRing = false }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { showForgetRing = false }) { Text(tr("Cancel")) } }, ) } @@ -2224,7 +2226,7 @@ fun WearableSettingsScreen( ) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { showFactoryReset = false resetting = true resetStatus = tr("Syncing latest data…") @@ -2241,7 +2243,7 @@ fun WearableSettingsScreen( }) { Text(tr("Reset ring"), color = MaterialTheme.colorScheme.error) } }, dismissButton = { - TextButton(onClick = { showFactoryReset = false }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { showFactoryReset = false }) { Text(tr("Cancel")) } }, ) } @@ -2289,7 +2291,7 @@ private fun BackgroundSyncCard() { color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(12.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { val intent = if (exempt) { // Turning it back off is only possible from the system list. @@ -2524,7 +2526,7 @@ fun PrivacyDataSettingsScreen( ) Spacer(Modifier.height(12.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Button( + PulseButton( onClick = { exportInProgress = true scope.launch { @@ -2554,7 +2556,7 @@ fun PrivacyDataSettingsScreen( } Text(if (exportInProgress) tr("Exporting…") else tr("Export All Data")) } - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { filePicker.launch(arrayOf("application/json")) }, @@ -2584,7 +2586,7 @@ fun PrivacyDataSettingsScreen( color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(12.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { pendingReset = ResetAction.ResetAppData }, modifier = Modifier.fillMaxWidth(), colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.error), @@ -2594,7 +2596,7 @@ fun PrivacyDataSettingsScreen( Text(tr("Reset App Data")) } Spacer(Modifier.height(8.dp)) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { pendingReset = ResetAction.UnpairAndReset }, modifier = Modifier.fillMaxWidth(), colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.error), @@ -2617,11 +2619,11 @@ fun PrivacyDataSettingsScreen( color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(12.dp)) - Button(onClick = { showSeedDialog = true }, modifier = Modifier.fillMaxWidth()) { + PulseButton(onClick = { showSeedDialog = true }, modifier = Modifier.fillMaxWidth()) { Text(tr("Reseed Demo Data")) } Spacer(Modifier.height(8.dp)) - OutlinedButton(onClick = { showClearDialog = true }, modifier = Modifier.fillMaxWidth()) { + PulseButton(PulseButtonStyle.Outlined, onClick = { showClearDialog = true }, modifier = Modifier.fillMaxWidth()) { Text(tr("Clear Demo Data"), color = PulseColors.danger) } } @@ -2658,7 +2660,7 @@ fun PrivacyDataSettingsScreen( Switch(checked = maskSensitive, onCheckedChange = null) } Spacer(Modifier.height(12.dp)) - Button( + PulseButton( onClick = { scope.launch { val db = PulseLoopDatabase.getInstance(context) @@ -2688,7 +2690,7 @@ fun PrivacyDataSettingsScreen( title = { Text(tr("Error")) }, text = { Text(msg) }, confirmButton = { - TextButton(onClick = { statusMessage = null }) { Text("OK") } + PulseButton(PulseButtonStyle.Text, onClick = { statusMessage = null }) { Text("OK") } }, ) } @@ -2698,7 +2700,7 @@ fun PrivacyDataSettingsScreen( title = { Text(tr("Import Complete")) }, text = { Text(tr("Your data has been restored from the backup.")) }, confirmButton = { - TextButton(onClick = { showImportSuccess = false }) { Text("OK") } + PulseButton(PulseButtonStyle.Text, onClick = { showImportSuccess = false }) { Text("OK") } }, ) @@ -2709,9 +2711,9 @@ fun PrivacyDataSettingsScreen( Text(tr("This permanently deletes everything currently in the app and replaces it with the contents of this file. This can't be undone.")) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { showImportConfirm = false - val uri = pendingImportUri ?: return@TextButton + val uri = pendingImportUri ?: return@PulseButton pendingImportUri = null importInProgress = true scope.launch { @@ -2729,7 +2731,7 @@ fun PrivacyDataSettingsScreen( } }, dismissButton = { - TextButton(onClick = { showImportConfirm = false; pendingImportUri = null }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { showImportConfirm = false; pendingImportUri = null }) { Text(tr("Cancel")) } }, ) @@ -2740,7 +2742,7 @@ fun PrivacyDataSettingsScreen( title = { Text(action.title) }, text = { Text(action.message) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { pendingReset = null when (action) { is ResetAction.UnpairRing -> performUnpair() @@ -2752,7 +2754,7 @@ fun PrivacyDataSettingsScreen( } }, dismissButton = { - TextButton(onClick = { pendingReset = null }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { pendingReset = null }) { Text(tr("Cancel")) } }, ) } @@ -2762,7 +2764,7 @@ fun PrivacyDataSettingsScreen( title = { Text(tr("Reseed Demo Data?")) }, text = { Text(tr("This will replace all existing demo data. Your synced ring data — including sleep history — will not be affected.")) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { showSeedDialog = false scope.launch { DemoDataSeeder.seed(PulseLoopDatabase.getInstance(context)) @@ -2771,7 +2773,7 @@ fun PrivacyDataSettingsScreen( }) { Text(tr("Reseed")) } }, dismissButton = { - TextButton(onClick = { showSeedDialog = false }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { showSeedDialog = false }) { Text(tr("Cancel")) } }, ) @@ -2785,7 +2787,7 @@ fun PrivacyDataSettingsScreen( ) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { showClearDialog = false scope.launch { DemoDataSeeder.clear(PulseLoopDatabase.getInstance(context)) @@ -2794,7 +2796,7 @@ fun PrivacyDataSettingsScreen( }) { Text(tr("Clear"), color = PulseColors.danger) } }, dismissButton = { - TextButton(onClick = { showClearDialog = false }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { showClearDialog = false }) { Text(tr("Cancel")) } }, ) } @@ -3014,8 +3016,8 @@ fun NutritionSettingsScreen(onBack: () -> Unit, onNavigateToNutrition: () -> Uni NutrientStepper(tr("Fat (g)"), goal?.intakeFatG ?: 65.0, 5.0, 0.0, 300.0) { v -> scope.launch { goal = goal?.copy(intakeFatG = v)?.also { db.userGoalDao().upsert(it); com.pulseloop.service.GoalSync.noteEdits(context, it) } } } - OutlinedButton(onClick = { - val g = goal ?: return@OutlinedButton + PulseButton(PulseButtonStyle.Outlined, onClick = { + val g = goal ?: return@PulseButton scope.launch { val cal = g.intakeCalories ?: 2000.0 goal = g.copy(intakeProteinG = cal * 0.30 / 4.0, intakeCarbsG = cal * 0.40 / 4.0, intakeFatG = cal * 0.30 / 9.0) @@ -3031,7 +3033,7 @@ fun NutritionSettingsScreen(onBack: () -> Unit, onNavigateToNutrition: () -> Uni Column(Modifier.padding(16.dp)) { Text(tr("Quick Access"), fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) - Button( + PulseButton( onClick = onNavigateToNutrition, modifier = Modifier.fillMaxWidth(), ) { @@ -3048,9 +3050,9 @@ private fun NutrientStepper(label: String, value: Double, step: Double, min: Dou Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Text(label, Modifier.weight(1f)) Row(verticalAlignment = Alignment.CenterVertically) { - TextButton(onClick = { if (value > min) onChange((value - step).coerceAtLeast(min)) }) { Text("−", fontSize = 16.sp) } + PulseButton(PulseButtonStyle.Text, onClick = { if (value > min) onChange((value - step).coerceAtLeast(min)) }) { Text("−", fontSize = 16.sp) } Text("${value.roundToInt()}", fontWeight = FontWeight.Medium) - TextButton(onClick = { if (value < max) onChange((value + step).coerceAtMost(max)) }) { Text("+", fontSize = 16.sp) } + PulseButton(PulseButtonStyle.Text, onClick = { if (value < max) onChange((value + step).coerceAtMost(max)) }) { Text("+", fontSize = 16.sp) } } } } @@ -3119,7 +3121,7 @@ fun StravaSettingsScreen(onBack: () -> Unit) { Spacer(Modifier.height(12.dp)) if (isConnected) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { isUploading = true scope.launch { @@ -3144,7 +3146,7 @@ fun StravaSettingsScreen(onBack: () -> Unit) { ) { Text(if (isUploading) tr("Syncing…") else tr("Sync Now")) } - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { confirmDisconnect = true }, modifier = Modifier.weight(1f), colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.error), @@ -3153,7 +3155,7 @@ fun StravaSettingsScreen(onBack: () -> Unit) { } } } else { - Button( + PulseButton( onClick = { statusMessage = null tokenStore.clearLastError() @@ -3211,7 +3213,7 @@ fun StravaSettingsScreen(onBack: () -> Unit) { title = { Text(tr("Disconnect Strava?")) }, text = { Text(tr("PulseLoop will stop uploading workouts. Workouts already on Strava stay there.")) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { confirmDisconnect = false scope.launch { // Revoke on Strava's side first, so PulseLoop also disappears @@ -3228,7 +3230,7 @@ fun StravaSettingsScreen(onBack: () -> Unit) { }) { Text(tr("Disconnect"), color = MaterialTheme.colorScheme.error) } }, dismissButton = { - TextButton(onClick = { confirmDisconnect = false }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { confirmDisconnect = false }) { Text(tr("Cancel")) } }, ) } @@ -3376,7 +3378,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { color = MaterialTheme.colorScheme.error, ) Spacer(Modifier.height(8.dp)) - Button(onClick = { openHealthConnectPlayStore(context) }, modifier = Modifier.fillMaxWidth()) { + PulseButton(onClick = { openHealthConnectPlayStore(context) }, modifier = Modifier.fillMaxWidth()) { Text(tr("Install Health Connect")) } } @@ -3388,7 +3390,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { color = MaterialTheme.colorScheme.error, ) Spacer(Modifier.height(8.dp)) - Button(onClick = { openHealthConnectPlayStore(context) }, modifier = Modifier.fillMaxWidth()) { + PulseButton(onClick = { openHealthConnectPlayStore(context) }, modifier = Modifier.fillMaxWidth()) { Text(tr("Update Health Connect")) } } @@ -3418,7 +3420,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { // showing the permission sheet at all, so the master switch silently does // nothing. Both are resolved in the Health Connect app. Spacer(Modifier.height(8.dp)) - TextButton( + PulseButton(PulseButtonStyle.Text, onClick = { openHealthConnectApp(context) }, modifier = Modifier.align(Alignment.Start), ) { Text(tr("Open Health Connect")) } @@ -3594,7 +3596,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { } Spacer(Modifier.height(8.dp)) val removing = prefs.removalStatus == HealthConnectPrefs.REMOVAL_IN_PROGRESS - Button( + PulseButton( onClick = { showRemoveDialog = true }, enabled = !removing, colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error), @@ -3619,7 +3621,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { verticalAlignment = Alignment.CenterVertically, ) { Text(msg, style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f)) - TextButton(onClick = { store.update { it.copy(removalStatus = null) } }, modifier = Modifier.widthIn(max = 120.dp)) { + PulseButton(PulseButtonStyle.Text, onClick = { store.update { it.copy(removalStatus = null) } }, modifier = Modifier.widthIn(max = 120.dp)) { Text(tr("Dismiss"), maxLines = 1, overflow = TextOverflow.Ellipsis) } } @@ -3653,13 +3655,13 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { // "Remove PulseLoop data", which resets it to NOT_ASKED and re-offers this dialog. text = { Text(tr("Exporting all history can take a while on the first run.")) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { store.update { it.copy(backfillChoice = HealthConnectPrefs.BackfillChoice.EXPORT_ALL) } HealthConnectExportWorker.enqueue(context) // answer the gate → run the pass }) { Text(tr("Sync all history")) } }, dismissButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { store.update { it.copy(backfillChoice = HealthConnectPrefs.BackfillChoice.EXPORT_NEW_ONLY) } HealthConnectExportWorker.enqueue(context) // stamps watermarks, exports nothing }) { Text(tr("Only new data from now on")) } @@ -3676,7 +3678,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { title = { Text(tr("Health Connect permissions revoked")) }, text = { Text(tr("PulseLoop no longer has any Health Connect permissions. Reset the export so a later re-grant re-exports your history?")) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { store.clearWatermarks() store.update { it.copy(lastSyncAt = null, lastSyncSummary = null, revocationOfferDismissed = true) } showRevokeResetDialog = false @@ -3684,7 +3686,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { }) { Text(tr("Reset export")) } }, dismissButton = { - TextButton(onClick = { showRevokeResetDialog = false; store.update { it.copy(revocationOfferDismissed = true) } }) { Text(tr("Not now")) } + PulseButton(PulseButtonStyle.Text, onClick = { showRevokeResetDialog = false; store.update { it.copy(revocationOfferDismissed = true) } }) { Text(tr("Not now")) } }, ) } @@ -3697,7 +3699,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { title = { Text(tr("Remove PulseLoop data?")) }, text = { Text(tr("This deletes every record PulseLoop wrote to Health Connect and resets the export. It cannot be undone, and your ring data in PulseLoop is not affected.")) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { showRemoveDialog = false // Enqueued, not launched in this screen's scope (review pass 5): a back-press // mid-delete used to cancel the removal between record types, leaving some @@ -3707,7 +3709,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { }) { Text(tr("Remove")) } }, dismissButton = { - TextButton(onClick = { showRemoveDialog = false }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { showRemoveDialog = false }) { Text(tr("Cancel")) } }, ) } @@ -3863,7 +3865,7 @@ private fun AutoBackupCard() { trf("Folder: {0}", folderName ?: tr("not chosen")), style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f), ) - TextButton(onClick = { picker.launch(null) }, modifier = Modifier.widthIn(max = 120.dp)) { + PulseButton(PulseButtonStyle.Text, onClick = { picker.launch(null) }, modifier = Modifier.widthIn(max = 120.dp)) { Text(if (folderName == null) tr("Choose") else tr("Change"), maxLines = 1, overflow = TextOverflow.Ellipsis) } } @@ -3878,7 +3880,7 @@ private fun AutoBackupCard() { } Text(status, style = MaterialTheme.typography.bodySmall, color = if (com.pulseloop.data.AutoBackup.lastError(context) != null) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurfaceVariant) - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, enabled = !running && folderName != null, onClick = { running = true diff --git a/app/src/main/java/com/pulseloop/ui/screens/SleepScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/SleepScreen.kt index 5ec8cee7..08359a37 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/SleepScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/SleepScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -29,10 +31,8 @@ import androidx.compose.material3.DatePickerDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.SelectableDates import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TimeInput import androidx.compose.material3.TimePicker import androidx.compose.material3.rememberDatePickerState @@ -951,11 +951,11 @@ private fun SleepDayPickerDialog( DatePickerDialog( onDismissRequest = onDismiss, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { state.selectedDateMillis?.let { onPick(utcMillisToLocalDayKey(it)) } ?: onDismiss() }) { Text(tr("Done")) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } }, ) { DatePicker(state = state, title = null) } @@ -1139,7 +1139,7 @@ private fun SleepRecordsCard( ) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { pendingRun = null scope.launch { val removed = viewModel?.deleteSleepRecord(session.id, run.recordStartAt) ?: false @@ -1152,7 +1152,7 @@ private fun SleepRecordsCard( }) { Text(tr("Delete"), color = PulseColors.danger) } }, dismissButton = { - TextButton(onClick = { pendingRun = null }) { Text(tr("Keep")) } + PulseButton(PulseButtonStyle.Text, onClick = { pendingRun = null }) { Text(tr("Keep")) } }, ) } @@ -1187,13 +1187,13 @@ private fun SleepRecordEditDialog( Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp), ) { - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { pickingTime = "start" }, modifier = Modifier.weight(1f), ) { Text(trf("Start: {0}", SleepFormat.clockTime(currentStart))) } - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, onClick = { pickingTime = "end" }, modifier = Modifier.weight(1f), ) { @@ -1217,7 +1217,7 @@ private fun SleepRecordEditDialog( } }, confirmButton = { - TextButton( + PulseButton(PulseButtonStyle.Text, onClick = { onSave(currentStart, currentEnd) }, enabled = currentStart < currentEnd && (currentStart != run.startAt || currentEnd != run.endAt), ) { @@ -1225,7 +1225,7 @@ private fun SleepRecordEditDialog( } }, dismissButton = { - TextButton(onClick = onDismiss) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Cancel")) } }, ) @@ -1246,7 +1246,7 @@ private fun SleepRecordEditDialog( // The dial doesn't fit a landscape dialog; the keyboard entry form does. text = { if (landscape) TimeInput(state = timeState) else TimePicker(state = timeState) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val picked = resolveAdjustedTime(targetTs, run.startAt, run.endAt, timeState.hour, timeState.minute, zone) val resolved = picked.coerceIn(run.startAt, run.endAt) pickedOutside = isOutsideRecord(picked, run.startAt, run.endAt) @@ -1259,7 +1259,7 @@ private fun SleepRecordEditDialog( }) { Text(tr("Done")) } }, dismissButton = { - TextButton(onClick = { pickingTime = null }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { pickingTime = null }) { Text(tr("Cancel")) } }, ) } diff --git a/app/src/main/java/com/pulseloop/ui/screens/TodayGlance.kt b/app/src/main/java/com/pulseloop/ui/screens/TodayGlance.kt index 3fd97ad5..d44b1bd9 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/TodayGlance.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/TodayGlance.kt @@ -1,6 +1,7 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.theme.pressScale +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.trf import com.pulseloop.ui.i18n.tr @@ -244,7 +245,7 @@ fun CoachBriefSheet( } } if (askCoach) { - androidx.compose.material3.Button( + PulseButton( onClick = onAsk, modifier = Modifier.fillMaxWidth(), ) { Text(tr("Ask the coach about it")) } diff --git a/app/src/main/java/com/pulseloop/ui/screens/TodayScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/TodayScreen.kt index 03bf3d53..e640a95e 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/TodayScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/TodayScreen.kt @@ -15,7 +15,6 @@ import androidx.compose.material.pullrefresh.pullRefresh import androidx.compose.material.pullrefresh.rememberPullRefreshState import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.ui.text.style.TextOverflow import androidx.compose.runtime.* import androidx.compose.ui.Alignment @@ -724,7 +723,7 @@ private fun ColumnScope.NutritionTileBody(food: FoodTotals?, onLog: () -> Unit) } // A real button, so it gets the 48dp target Material gives its components (a bare // clickable does not). It makes the tile a little taller; the row grows to match. - TextButton( + PulseButton(PulseButtonStyle.Text, onClick = onLog, contentPadding = PaddingValues(horizontal = 0.dp), modifier = Modifier.heightIn(min = 48.dp), diff --git a/app/src/main/java/com/pulseloop/ui/screens/WorkoutSummaryScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/WorkoutSummaryScreen.kt index 7e49a909..99643d6d 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/WorkoutSummaryScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/WorkoutSummaryScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import com.pulseloop.ui.i18n.trf +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import com.pulseloop.ui.i18n.tr @@ -21,7 +23,6 @@ import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Share import androidx.compose.material.icons.filled.Check import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.DatePicker import androidx.compose.material3.DatePickerDialog @@ -30,10 +31,8 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.SelectableDates import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TimeInput import androidx.compose.material3.TimePicker import androidx.compose.material3.rememberDatePickerState @@ -182,7 +181,7 @@ fun WorkoutSummaryScreen( title = { Text(tr("Delete workout?")) }, text = { Text("This removes the session and its recorded route. This can't be undone.") }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { confirmDelete = false scope.launch { com.pulseloop.service.ActivityRollup.reverse(db, s) @@ -194,7 +193,7 @@ fun WorkoutSummaryScreen( } }) { Text(tr("Delete"), color = PulseColors.danger) } }, - dismissButton = { TextButton(onClick = { confirmDelete = false }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { confirmDelete = false }) { Text(tr("Cancel")) } }, ) } @@ -257,7 +256,7 @@ private fun EditWorkoutSheet( EditFieldRow(tr("Activity")) { Box { - OutlinedButton(onClick = { typeExpanded = true }) { + PulseButton(PulseButtonStyle.Outlined, onClick = { typeExpanded = true }) { Icon(ActivityMeta.icon(type), null, tint = PulseColors.accent, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(6.dp)) Text(ActivityMeta.label(type)) @@ -291,10 +290,10 @@ private fun EditWorkoutSheet( modifier = Modifier.fillMaxWidth(), ) - Button( + PulseButton( onClick = { onSave(type, startedAt, endedAt) }, enabled = validationMessage == null, - modifier = Modifier.fillMaxWidth().height(56.dp), + modifier = Modifier.fillMaxWidth(), shape = CircleShape, colors = ButtonDefaults.buttonColors(containerColor = PulseColors.accent), ) { @@ -303,7 +302,7 @@ private fun EditWorkoutSheet( Text(tr("Save changes"), fontWeight = FontWeight.SemiBold) } - TextButton(onClick = onDismiss, modifier = Modifier.fillMaxWidth().height(52.dp)) { + PulseButton(PulseButtonStyle.Text, onClick = onDismiss, modifier = Modifier.fillMaxWidth()) { Text(tr("Cancel"), color = PulseColors.textPrimary, fontWeight = FontWeight.SemiBold) } } @@ -340,7 +339,7 @@ internal fun DateTimeButton(valueMillis: Long, onChange: (Long) -> Unit) { var showTime by remember { mutableStateOf(false) } var pendingDayMillis by remember { mutableLongStateOf(valueMillis) } - TextButton(onClick = { showDate = true }) { + PulseButton(PulseButtonStyle.Text, onClick = { showDate = true }) { Text(formatDateTime(valueMillis), color = PulseColors.accent, fontWeight = FontWeight.Medium) } @@ -355,7 +354,7 @@ internal fun DateTimeButton(valueMillis: Long, onChange: (Long) -> Unit) { DatePickerDialog( onDismissRequest = { showDate = false }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val dayStart = state.selectedDateMillis?.let { utcMidnightToLocalDayStart(it) } if (dayStart != null) { val cal = Calendar.getInstance().apply { timeInMillis = valueMillis } @@ -370,7 +369,7 @@ internal fun DateTimeButton(valueMillis: Long, onChange: (Long) -> Unit) { showTime = true }) { Text(tr("Next")) } }, - dismissButton = { TextButton(onClick = { showDate = false }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { showDate = false }) { Text(tr("Cancel")) } }, ) { DatePicker(state = state, title = null) } } @@ -389,7 +388,7 @@ internal fun DateTimeButton(valueMillis: Long, onChange: (Long) -> Unit) { // The dial doesn't fit a landscape dialog; the keyboard entry form does. text = { if (landscape) TimeInput(state = timeState) else TimePicker(state = timeState) }, confirmButton = { - TextButton(onClick = { + PulseButton(PulseButtonStyle.Text, onClick = { val result = Calendar.getInstance().apply { timeInMillis = pendingDayMillis set(Calendar.HOUR_OF_DAY, timeState.hour) @@ -400,7 +399,7 @@ internal fun DateTimeButton(valueMillis: Long, onChange: (Long) -> Unit) { showTime = false }) { Text(tr("Done")) } }, - dismissButton = { TextButton(onClick = { showTime = false }) { Text(tr("Cancel")) } }, + dismissButton = { PulseButton(PulseButtonStyle.Text, onClick = { showTime = false }) { Text(tr("Cancel")) } }, ) } } @@ -637,6 +636,6 @@ private fun MissingWorkout(onBack: () -> Unit) { fontSize = 14.sp, color = PulseColors.textMuted, textAlign = TextAlign.Center, ) Spacer(Modifier.height(16.dp)) - TextButton(onClick = onBack) { Text(tr("Back"), color = PulseColors.accent) } + PulseButton(PulseButtonStyle.Text, onClick = onBack) { Text(tr("Back"), color = PulseColors.accent) } } } diff --git a/app/src/main/java/com/pulseloop/update/UpdateUi.kt b/app/src/main/java/com/pulseloop/update/UpdateUi.kt index 57ed3b57..ccb57894 100644 --- a/app/src/main/java/com/pulseloop/update/UpdateUi.kt +++ b/app/src/main/java/com/pulseloop/update/UpdateUi.kt @@ -1,6 +1,8 @@ package com.pulseloop.update import androidx.compose.foundation.layout.Column +import com.pulseloop.ui.components.PulseButtonStyle +import com.pulseloop.ui.components.PulseButton import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -10,9 +12,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialog import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext @@ -74,14 +74,14 @@ fun UpdateDialog(info: UpdateInfo, onDismiss: () -> Unit) { } }, confirmButton = { - TextButton( + PulseButton(PulseButtonStyle.Text, enabled = !downloading, onClick = { // Require the per-app "install unknown apps" grant first. if (!ApkInstaller.canInstall(context)) { error = tr("Allow installs from this app, then tap Update again.") context.startActivity(ApkInstaller.installPermissionIntent(context)) - return@TextButton + return@PulseButton } error = null progress = 0f @@ -117,9 +117,9 @@ fun UpdateDialog(info: UpdateInfo, onDismiss: () -> Unit) { dismissButton = { if (downloading) { // Cancel stops the download and deletes the part (UpdateChecker.download). - TextButton(onClick = { job?.cancel(); job = null }) { Text(tr("Cancel")) } + PulseButton(PulseButtonStyle.Text, onClick = { job?.cancel(); job = null }) { Text(tr("Cancel")) } } else { - TextButton(onClick = onDismiss) { Text(tr("Later")) } + PulseButton(PulseButtonStyle.Text, onClick = onDismiss) { Text(tr("Later")) } } }, ) @@ -147,7 +147,7 @@ fun CheckForUpdatesButton(modifier: Modifier = Modifier) { ) return@Column } - OutlinedButton( + PulseButton(PulseButtonStyle.Outlined, enabled = !checking, onClick = { checking = true diff --git a/app/src/main/java/com/pulseloop/widgets/WidgetConfigActivity.kt b/app/src/main/java/com/pulseloop/widgets/WidgetConfigActivity.kt index eb2ce674..d95d6d0e 100644 --- a/app/src/main/java/com/pulseloop/widgets/WidgetConfigActivity.kt +++ b/app/src/main/java/com/pulseloop/widgets/WidgetConfigActivity.kt @@ -20,7 +20,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button +import com.pulseloop.ui.components.PulseButton import androidx.compose.material3.RadioButton import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -140,7 +140,7 @@ private fun ConfigScreen( } Spacer(Modifier.height(16.dp)) - Button(onClick = { onDone(single, left, right) }, modifier = Modifier.fillMaxWidth()) { + PulseButton(onClick = { onDone(single, left, right) }, modifier = Modifier.fillMaxWidth()) { Text(tr("Add Widget")) } } diff --git a/app/src/test/java/com/pulseloop/ui/components/PulseButtonTest.kt b/app/src/test/java/com/pulseloop/ui/components/PulseButtonTest.kt new file mode 100644 index 00000000..4a1c34ca --- /dev/null +++ b/app/src/test/java/com/pulseloop/ui/components/PulseButtonTest.kt @@ -0,0 +1,41 @@ +package com.pulseloop.ui.components + +import org.junit.Assert.assertTrue +import org.junit.Test +import java.io.File + +/** + * Every button goes through [PulseButton], which holds the design system's button rules + * (52dp minimum height, the 97% press scale). A Material `Button`, `FilledTonalButton`, + * `OutlinedButton` or `TextButton` called directly would ship at Material's 40dp again. + * Glance widgets are exempt: their `Button` is a different component with its own sizing. + */ +class PulseButtonTest { + private fun root(): File { + val rel = "src/main/java/com/pulseloop" + return listOf(File(rel), File("app/$rel")).first { it.exists() } + } + + @Test + fun noMaterialButtonOutsidePulseButton() { + val call = Regex("""(? f.readText().contains("import androidx.glance.Button") } + .flatMap { file -> + file.readLines().mapIndexedNotNull { i, line -> + val t = line.trimStart() + if (t.startsWith("import") || t.startsWith("//") || t.startsWith("*")) return@mapIndexedNotNull null + if (call.containsMatchIn(line) || qualified.containsMatchIn(line)) "${file.relativeTo(base)}:${i + 1}" else null + } + }.toList() + assertTrue("Use PulseButton instead of a Material button:\n" + off.joinToString("\n"), off.isEmpty()) + } + + @Test + fun minimumHeightIsTheSystemsButtonSize() { + assertTrue(PulseButtonDefaults.MinHeight.value == 52f) + } +} diff --git a/audits/2026-11-04-v2.11.57-pulse-button.md b/audits/2026-11-04-v2.11.57-pulse-button.md new file mode 100644 index 00000000..aaf84d6e --- /dev/null +++ b/audits/2026-11-04-v2.11.57-pulse-button.md @@ -0,0 +1,85 @@ +# Audit: every button 52dp, through one PulseButton (v2.11.57) + +Date: 2026-11-04 · PR: see below · Auditor: Claude + +## Scope + +Closes open item P2-1 from `2026-11-04-v2.11.56-design-system.md`. The design system says buttons +are at least 52dp tall (DESIGN.md "Buttons"; the `button` size token, 52px). PulseLoop's buttons were +Material3 defaults: 40dp tall, 48dp touch target. + +- New `ui/components/PulseButton.kt`: one composable, `PulseButton(style, onClick, …)`, styles + Filled / Tonal / Outlined / Text over the matching Material3 buttons. It sets + `heightIn(min = 52.dp)` and the system's 97% press scale (`pressScale`), and keeps each style's + Material defaults for colours, border, shape and padding unless a caller passes its own. +- 247 calls in 32 files moved onto it (Button 53, OutlinedButton 54, FilledTonalButton 1, + TextButton 136, plus 3 fully qualified calls). Fixed `.height(48|52|56.dp)` and redundant + `heightIn(min = 48.dp)` on buttons were removed: the height is PulseButton's now, as a minimum. +- `PulseButtonTest` fails on any direct Material button call (Glance widgets exempt) and pins 52dp. +- No colour, radius or spacing token changed. `drift.py --pulseloop`: 0 differences. + +## graphic-design-fundamentals (§13 checklist) + +| # | Question | Result | +|---|---|---| +| 1 | Brief | Pass. One button size everywhere, the system's | +| 2 | Concept | Pass. A component, not 247 local decisions | +| 3 | Hierarchy | Pass. Unchanged: style still says rank (one filled accent, tonal, outlined, text) | +| 4 | Contrast | Pass. No colour changed | +| 5 | Alignment and grid | Pass. Buttons in a row now share one height; the 56dp Record / Save CTAs come down to 52 to match the rest | +| 6 | Spacing | Pass. Rows of buttons and dialogs grow by 12dp at most; no gap changed | +| 7 | Typography | Pass. Labels unchanged (Material's label style) | +| 8 | Colour | Pass. Unchanged | +| 9 | Consistency | **Was failing, now passes.** Three heights (40, 48–56 fixed) → one minimum | +| 10 | Simplicity | Pass. One component to read instead of four plus local heights | +| 11 | Real-size test | Not on a device (no SDK in this session). Risk: a text button inside a fixed-height row would clip; none found by search (no caller sets a fixed height on a button's parent row in the changed files' button sites) | +| 12 | Accessibility and ergonomics | Pass. Every button ≥ 52dp; a two-line label grows it instead of clipping | +| 13 | Production | Pass. Enforced by `PulseButtonTest` in CI | + +Issues: none critical. Polish (open): the system's button radius is 4 (`radius-s`); PulseLoop's +buttons keep Material's pill. Changing it is visible on every screen, so it is the owner's call, +recorded here as **P3-2**. + +## impeccable (audit, native / Android) + +Applied by hand from `.claude/skills/impeccable/reference/audit.native.md` and `android.md`. + +| # | Dimension | Score | Key finding | +|---|---|---|---| +| 1 | Accessibility | 4 | Targets ≥ 52dp everywhere; press feedback honours "Remove animations" | +| 2 | Performance | 4 | One extra `remember` and a graphicsLayer per button; no layout cost beyond the height | +| 3 | Appearance & theming | 3 | Pill shape vs the system's radius 4 (P3-2) | +| 4 | Platform conformance | 4 | Material3 buttons underneath; dialog actions stay TextButtons | +| 5 | Adaptivity | 3 | Min height, not fixed: large fonts and pt-BR grow; not checked on a device | +| | **Total** | **18/20** | **Good** | + +Findings: P2-1 (from v2.11.56) **fixed**. P3-2 open (button radius, owner's call). + +## less-is-more + +| Element | Question (1–5) | Kept / moved / merged / removed, and where | +|---|---|---| +| Four button kinds + local heights | 2 | Merged into one PulseButton with a style | +| Fixed 56dp on Record / Save | 2 | Removed: the system's 52 | + +| Dimension | 0–4 | +|---|---| +| Elements per screen, compared with before | 4 (same) | +| Duplicates left | 4 | +| Text to read when tired | 4 (unchanged) | +| Taps on the common actions (must not rise) | 4 (unchanged; targets bigger) | + +## Evidence + +- `PulseButtonTest`, `PulseTypeScaleTest` and the unit suite in CI. +- Before: `Button` 53, `OutlinedButton` 54, `FilledTonalButton` 1, `TextButton` 136 direct calls. + After: 0 outside `PulseButton.kt`. +- The `button` size token (52px) is in the design system's `uikit` layer only, so `GTokens.kt` + has no constant for it; PulseButton holds 52.dp with a pointer to DESIGN.md. Proposed for the + design-system repo: move `button` to core so the pulseloop layer generates it. +- The design canvas was not reachable from this session (its tools were disconnected), so its + `.btn` (48px) and `.btn.sm` (40px) are not yet 52px there. + +## Verdict + +Merge. Carried forward: P3-2 (button radius), the core `button` token proposal, the canvas `.btn` update.