From 856f52a8d80b45947650b7faf61a4d68266299c5 Mon Sep 17 00:00:00 2001 From: Aleksandr Poryadin Date: Sat, 14 Nov 2026 15:48:42 +0000 Subject: [PATCH 1/2] Move user-visible strings into string resources English output is unchanged: values/strings.xml carries the original copy verbatim, and the existing unit tests pass without modification. - Composables use stringResource / pluralStringResource. Code without a Context goes through util/L10n, which in JVM tests reads the default values/strings.xml directly. - util/LocaleFormats picks date/time patterns from Android's best-pattern skeletons, falling back to the original pattern when java.time or SimpleDateFormat rejects the platform's one (zh-TW "Bh:mm" on Android 12/13). Patterns and formatters are cached per (skeleton, locale). - coach/context/CoachLanguage reads the coach_language resource, so the coach replies in the language the UI actually resolved. For English the directive is empty and prompts are byte-for-byte unchanged. Coach summary signatures carry the language, so a language switch regenerates cards. - Strings that would otherwise stick after a per-app language switch (tool progress labels, threshold units, the sleep no-data card) are resolved on read. - Coach chart colours also match a translation's own metric words. --- .../main/java/com/pulseloop/MainActivity.kt | 10 +- .../com/pulseloop/PulseLoopApplication.kt | 1 + .../pulseloop/coach/context/CoachLanguage.kt | 35 + .../pulseloop/coach/local/LocalEndpoint.kt | 12 +- .../coach/orchestration/CoachFallbacks.kt | 32 +- .../coach/orchestration/CoachOrchestrator.kt | 10 +- .../coach/orchestration/CoachTurnError.kt | 34 +- .../orchestration/PendingActionExecutor.kt | 29 +- .../pulseloop/coach/schema/CoachChartView.kt | 49 +- .../coach/summaries/CoachSummaryContent.kt | 8 +- .../summaries/CoachSummaryContextBuilder.kt | 25 +- .../coach/summaries/CoachSummaryGenerator.kt | 2 +- .../coach/summaries/CoachSummaryService.kt | 8 +- .../com/pulseloop/coach/tools/CoachTool.kt | 8 +- .../pulseloop/coach/tools/NutritionTools.kt | 20 +- .../coach/tools/ToolImplementations.kt | 62 +- .../pulseloop/health/HealthConnectExporter.kt | 8 +- .../health/HealthConnectRemovalWorker.kt | 15 +- .../notifications/BatteryNotifications.kt | 10 +- .../CoachNotificationSlotRunner.kt | 26 +- .../notifications/CoachNotifications.kt | 5 +- .../java/com/pulseloop/ring/RingBLEClient.kt | 10 +- .../java/com/pulseloop/ring/RingDisplay.kt | 6 +- .../pulseloop/service/LiveWorkoutManager.kt | 4 +- .../pulseloop/service/RingSyncCoordinator.kt | 6 +- .../com/pulseloop/service/SleepInsights.kt | 123 +- .../service/VitalsThresholdEngine.kt | 215 +-- .../com/pulseloop/service/VitalsZoneModel.kt | 32 +- .../service/WorkoutForegroundService.kt | 23 +- .../java/com/pulseloop/settings/UnitSystem.kt | 12 +- .../com/pulseloop/strava/StravaUploader.kt | 22 +- .../java/com/pulseloop/ui/PulseLoopApp.kt | 14 +- .../pulseloop/ui/components/ActivityMeta.kt | 46 +- .../com/pulseloop/ui/components/AppChrome.kt | 25 +- .../com/pulseloop/ui/components/Charts.kt | 13 +- .../pulseloop/ui/components/DeviceHeroCard.kt | 3 +- .../ui/components/DeviceHeroStatus.kt | 34 +- .../ui/components/MetricThresholds.kt | 25 +- .../com/pulseloop/ui/components/TodayTiles.kt | 8 +- .../pulseloop/ui/components/WorkoutMapView.kt | 9 +- .../pulseloop/ui/components/ZoneLineChart.kt | 6 +- .../pulseloop/ui/dashboard/DashboardCard.kt | 24 +- .../pulseloop/ui/dashboard/DashboardEdit.kt | 18 +- .../com/pulseloop/ui/onboarding/Editors.kt | 91 +- .../pulseloop/ui/screens/ActivityScreen.kt | 115 +- .../ui/screens/BarcodeScannerScreen.kt | 10 +- .../pulseloop/ui/screens/CoachHistorySheet.kt | 40 +- .../pulseloop/ui/screens/CoachModelPicker.kt | 27 +- .../com/pulseloop/ui/screens/CoachScreen.kt | 41 +- .../pulseloop/ui/screens/CoachUsageSheet.kt | 24 +- .../ui/screens/LogPastActivityScreen.kt | 33 +- .../pulseloop/ui/screens/MealAnalysisSheet.kt | 68 +- .../pulseloop/ui/screens/MeasurementModal.kt | 32 +- .../pulseloop/ui/screens/NutritionScreen.kt | 61 +- .../pulseloop/ui/screens/OnboardingScreen.kt | 59 +- .../com/pulseloop/ui/screens/PairingScreen.kt | 41 +- .../com/pulseloop/ui/screens/RecordScreen.kt | 26 +- .../java/com/pulseloop/ui/screens/Screens.kt | 225 +-- .../pulseloop/ui/screens/SettingsScreen.kt | 54 +- .../ui/screens/SettingsSubScreens.kt | 678 +++++---- .../com/pulseloop/ui/screens/SleepScreen.kt | 166 +-- .../com/pulseloop/ui/screens/TodayScreen.kt | 49 +- .../ui/screens/WorkoutSummaryScreen.kt | 85 +- .../com/pulseloop/ui/viewmodels/ViewModels.kt | 11 +- .../pulseloop/ui/viewmodels/VitalCardState.kt | 66 +- .../java/com/pulseloop/update/UpdateUi.kt | 22 +- app/src/main/java/com/pulseloop/util/L10n.kt | 82 ++ .../java/com/pulseloop/util/LocaleFormats.kt | 56 + .../pulseloop/widgets/WidgetConfigActivity.kt | 14 +- .../com/pulseloop/widgets/WidgetMetric.kt | 30 +- .../pulseloop/widgets/WidgetTileRenderer.kt | 24 +- app/src/main/res/values/strings.xml | 1228 +++++++++++++++++ .../coach/schema/CoachChartColorTest.kt | 37 + .../summaries/SummaryLanguageSignatureTest.kt | 21 + 74 files changed, 3128 insertions(+), 1475 deletions(-) create mode 100644 app/src/main/java/com/pulseloop/coach/context/CoachLanguage.kt create mode 100644 app/src/main/java/com/pulseloop/util/L10n.kt create mode 100644 app/src/main/java/com/pulseloop/util/LocaleFormats.kt create mode 100644 app/src/test/java/com/pulseloop/coach/schema/CoachChartColorTest.kt create mode 100644 app/src/test/java/com/pulseloop/coach/summaries/SummaryLanguageSignatureTest.kt diff --git a/app/src/main/java/com/pulseloop/MainActivity.kt b/app/src/main/java/com/pulseloop/MainActivity.kt index 00570b1a..457489ee 100644 --- a/app/src/main/java/com/pulseloop/MainActivity.kt +++ b/app/src/main/java/com/pulseloop/MainActivity.kt @@ -111,26 +111,26 @@ class MainActivity : ComponentActivity() { uri.getQueryParameter("error")?.takeIf { it.isNotBlank() }?.let { error -> store.takePendingAuthState() store.saveLastError( - if (error == "access_denied") "Strava authorization was declined." else "Strava denied authorization: $error" + if (error == "access_denied") getString(R.string.strava_auth_declined) else getString(R.string.strava_auth_denied, error) ) return } // CSRF: the state we generated must come back. One-shot, cleared either way. if (!StravaAuth.validateState(store, uri.getQueryParameter("state"))) { - store.saveLastError("Strava authorization could not be verified. Please try connecting again.") + store.saveLastError(getString(R.string.strava_auth_unverified)) return } // The consent screen lets the user untick "Upload your activities". Catch it here rather // than letting every future upload fail with an opaque 401. if (!StravaAuth.grantedScopeIncludesWrite(uri.getQueryParameter("scope"))) { - store.saveLastError("Strava did not grant upload permission. Reconnect and keep \"Upload your activities\" checked.") + store.saveLastError(getString(R.string.strava_auth_no_upload)) return } val code = uri.getQueryParameter("code")?.takeIf { it.isNotBlank() } ?: run { - store.saveLastError("Strava returned an unexpected authorization response.") + store.saveLastError(getString(R.string.strava_auth_unexpected)) return } @@ -140,7 +140,7 @@ class MainActivity : ComponentActivity() { store.clearLastError() } catch (e: Exception) { // The code may have expired, or the configured secrets are wrong. - store.saveLastError("Could not complete the Strava sign-in: ${e.message ?: "unknown error"}") + store.saveLastError(getString(R.string.strava_auth_failed, e.message ?: getString(R.string.strava_unknown_error))) } } } diff --git a/app/src/main/java/com/pulseloop/PulseLoopApplication.kt b/app/src/main/java/com/pulseloop/PulseLoopApplication.kt index 9f528895..e0901586 100644 --- a/app/src/main/java/com/pulseloop/PulseLoopApplication.kt +++ b/app/src/main/java/com/pulseloop/PulseLoopApplication.kt @@ -27,6 +27,7 @@ class PulseLoopApplication : Application() { override fun onCreate() { super.onCreate() + com.pulseloop.util.L10n.init(this) CrashLogger.install(this) RWfitSleepJournal.init(this) // Before any sync can read them: Bedtime tracking no longer needs the schedule (issue #126), diff --git a/app/src/main/java/com/pulseloop/coach/context/CoachLanguage.kt b/app/src/main/java/com/pulseloop/coach/context/CoachLanguage.kt new file mode 100644 index 00000000..ba1bcd80 --- /dev/null +++ b/app/src/main/java/com/pulseloop/coach/context/CoachLanguage.kt @@ -0,0 +1,35 @@ +package com.pulseloop.coach.context + +import com.pulseloop.R +import com.pulseloop.util.L10n + +/** + * The language the coach should write in: the language of the strings the app is showing. + * + * Prompts, tool schemas and tool results stay in English: the model reads English most + * reliably, and several parsers depend on exact English tokens. Only the *output language* is + * steered, by appending a directive to each system prompt that produces user-visible text + * (chat, summaries, check-in notifications, meal estimates). For English the directive is + * empty, so the prompts are byte-for-byte what they were before localization. + * + * The name comes from the `coach_language` string resource rather than from the device locale, + * so it follows whichever translation Android actually resolved. A phone set to a language the + * app has no translation for shows English UI and gets an English coach, not a coach in a + * language the rest of the app isn't speaking. + */ +object CoachLanguage { + /** English name of the app's resolved language ("Russian"), or null when it is English. */ + fun languageName(): String? = + L10n.get(R.string.coach_language).trim().takeIf { it.isNotEmpty() && !it.equals("English", ignoreCase = true) } + + /** + * A sentence to append to a system prompt, or "" for English. [what] names the output, + * e.g. "all replies" or "the meal name and assumptions". + */ + fun directive(what: String = "all replies"): String { + val language = languageName() ?: return "" + return "\n\nWrite $what in $language — the user's app language — even though these " + + "instructions and the data you receive are in English. Keep numbers, units and " + + "proper names as they are." + } +} diff --git a/app/src/main/java/com/pulseloop/coach/local/LocalEndpoint.kt b/app/src/main/java/com/pulseloop/coach/local/LocalEndpoint.kt index 76f97aaf..b40bdedf 100644 --- a/app/src/main/java/com/pulseloop/coach/local/LocalEndpoint.kt +++ b/app/src/main/java/com/pulseloop/coach/local/LocalEndpoint.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.local +import com.pulseloop.R +import com.pulseloop.util.L10n import java.net.URI /** @@ -78,13 +80,11 @@ object LocalEndpoint { /** A short, user-facing explanation for a [Problem], for the Settings field. */ fun message(problem: Problem): String = when (problem) { - Problem.BLANK -> "Enter your server's address, e.g. http://192.168.1.50:11434" - Problem.MALFORMED -> "That doesn't look like a URL — use host:port or http://host:port" - Problem.UNSUPPORTED_SCHEME -> "Only http:// and https:// are supported." + Problem.BLANK -> L10n.get(R.string.le_blank) + Problem.MALFORMED -> L10n.get(R.string.le_malformed) + Problem.UNSUPPORTED_SCHEME -> L10n.get(R.string.le_scheme) Problem.PUBLIC_CLEARTEXT -> - "Plain http:// is only allowed for a server on this device or your local network " + - "(an IP address, a plain hostname, or a .local / .lan / .ts.net name). " + - "Use https:// to reach one over the internet." + L10n.get(R.string.le_cleartext) } /** diff --git a/app/src/main/java/com/pulseloop/coach/orchestration/CoachFallbacks.kt b/app/src/main/java/com/pulseloop/coach/orchestration/CoachFallbacks.kt index 1887787d..5ccbd912 100644 --- a/app/src/main/java/com/pulseloop/coach/orchestration/CoachFallbacks.kt +++ b/app/src/main/java/com/pulseloop/coach/orchestration/CoachFallbacks.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.orchestration +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.coach.context.CoachContextPacket import com.pulseloop.coach.schema.CoachConfidence import com.pulseloop.coach.schema.CoachResponse @@ -15,10 +17,10 @@ object CoachFallbacks { /** Used after an API failure or unrepairable output. */ fun fallback(): CoachResponse = CoachResponse( responseType = CoachResponseType.ERROR_RECOVERY, - title = "I had trouble with that", - summary = "I checked your data but couldn't finish preparing the answer. Try asking again, or narrow the question.", - dataQualityNote = "No changes were made.", - followUpChips = listOf("How am I doing today?", "Summarize my week", "What data is missing?"), + title = L10n.get(R.string.fb_trouble_title), + summary = L10n.get(R.string.fb_trouble), + dataQualityNote = L10n.get(R.string.fb_no_changes), + followUpChips = listOf(L10n.get(R.string.coach_suggest_today), L10n.get(R.string.coach_suggest_week), L10n.get(R.string.fb_chip_missing)), confidence = CoachConfidence.LOW, ) @@ -30,27 +32,27 @@ object CoachFallbacks { val avgSteps = if (steps7d.isNotEmpty()) steps7d.average().toInt() else 0 val bullets = mutableListOf() - if (todaySteps > 0) bullets.add("Steps today: ${todaySteps}") - if (avgSteps > 0) bullets.add("7-day average: ${avgSteps} steps/day") + if (todaySteps > 0) bullets.add(L10n.get(R.string.fb_steps_today, todaySteps)) + if (avgSteps > 0) bullets.add(L10n.plural(R.plurals.fb_steps_avg, avgSteps, avgSteps)) if (bullets.isEmpty()) { return CoachResponse( responseType = CoachResponseType.DATA_MISSING, - title = "No activity synced yet", - summary = "I don't have today's activity from the ring yet. Sync the ring or take a measurement and I'll summarize what comes in. (The AI coach is off — add an OpenAI key in Settings to enable full coaching.)", + title = L10n.get(R.string.fb_no_activity_title), + summary = L10n.get(R.string.fb_no_activity), dataQualityNote = packet.dataQualityWarnings.firstOrNull(), - followUpChips = listOf("Is my ring connected?", "What data is missing?"), + followUpChips = listOf(L10n.get(R.string.fb_chip_connected), L10n.get(R.string.fb_chip_missing)), confidence = CoachConfidence.LOW, ) } return CoachResponse( responseType = CoachResponseType.INSIGHT, - title = "Here's where you are today", - summary = "You're at ${todaySteps} steps so far today. The AI coach is off — add an OpenAI key in Settings for trends and tailored guidance.", + title = L10n.get(R.string.fb_today_title), + summary = L10n.plural(R.plurals.fb_today, todaySteps, todaySteps), bullets = bullets, dataQualityNote = packet.dataQualityWarnings.lastOrNull(), - followUpChips = listOf("How does today compare to yesterday?", "What's my heart rate trend?"), + followUpChips = listOf(L10n.get(R.string.fb_chip_compare), L10n.get(R.string.fb_chip_hr_trend)), confidence = CoachConfidence.MEDIUM, ) } @@ -58,9 +60,9 @@ object CoachFallbacks { /** Parser failure — couldn't decode model output. */ fun parseError(): CoachResponse = CoachResponse( responseType = CoachResponseType.ERROR_RECOVERY, - title = "Parse Error", - summary = "I had trouble formatting my response. Please try again.", - followUpChips = listOf("Try again", "Summarize my day", "What's new?"), + title = L10n.get(R.string.fb_parse_title), + summary = L10n.get(R.string.fb_parse), + followUpChips = listOf(L10n.get(R.string.action_try_again), L10n.get(R.string.fb_chip_day), L10n.get(R.string.fb_chip_new)), confidence = CoachConfidence.LOW, ) } diff --git a/app/src/main/java/com/pulseloop/coach/orchestration/CoachOrchestrator.kt b/app/src/main/java/com/pulseloop/coach/orchestration/CoachOrchestrator.kt index a8160792..464b3f79 100644 --- a/app/src/main/java/com/pulseloop/coach/orchestration/CoachOrchestrator.kt +++ b/app/src/main/java/com/pulseloop/coach/orchestration/CoachOrchestrator.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.orchestration +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.coach.attachments.CoachImagePayload import com.pulseloop.coach.context.CoachContextPacket import com.pulseloop.coach.context.CoachPromptBuilder @@ -113,7 +115,7 @@ class CoachOrchestrator( // Initial input: system + developer + recent turns + the new user message. // Images only ever ride on user turns (system/developer/assistant stay text). val input = mutableListOf() - input.add(OpenAIRequestBuilder.message("system", CoachPromptBuilder.systemPrompt)) + input.add(OpenAIRequestBuilder.message("system", CoachPromptBuilder.systemPrompt + com.pulseloop.coach.context.CoachLanguage.directive())) input.add(OpenAIRequestBuilder.message("developer", CoachPromptBuilder.developerMessage(packet))) for (m in recentMessages) { val isUser = m.role == "user" @@ -199,7 +201,7 @@ class CoachOrchestrator( assistant = CoachFallbacks.parseError(), trace = trace, pendingActions = toolContext.pendingActions.toList(), usage = tally, modelUsed = flags.model, providerUsed = flags.providerMode.rawValue, - error = CoachTurnError(code = "Bad response", reason = e.reason)) + error = CoachTurnError(code = L10n.get(R.string.cte_bad_response), reason = e.reason)) } catch (e: kotlinx.coroutines.CancellationException) { throw e } catch (e: Exception) { @@ -228,8 +230,8 @@ class CoachOrchestrator( if (attempts > maxFinalAttempts) { val snippet = current.outputText.trim().take(200) throw ParseExhausted( - "The model didn't return a valid structured answer after $maxFinalAttempts attempts." + - if (snippet.isEmpty()) "" else " It replied: “$snippet…”") + L10n.plural(R.plurals.cte_invalid_structured, maxFinalAttempts, maxFinalAttempts) + + if (snippet.isEmpty()) "" else " " + L10n.get(R.string.cte_it_replied, snippet)) } val repair = OpenAIRequestBuilder.message("user", "Your previous output did not match the required coach_response JSON schema. Return only valid JSON for that schema now.") current = send(client, flags, listOf(repair), emptyList(), coachResponseTextFormat, current.id) diff --git a/app/src/main/java/com/pulseloop/coach/orchestration/CoachTurnError.kt b/app/src/main/java/com/pulseloop/coach/orchestration/CoachTurnError.kt index 2c4c1791..fc4b8e24 100644 --- a/app/src/main/java/com/pulseloop/coach/orchestration/CoachTurnError.kt +++ b/app/src/main/java/com/pulseloop/coach/orchestration/CoachTurnError.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.orchestration +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.coach.openai.ResponsesError import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json @@ -22,7 +24,7 @@ data class CoachTurnError( val reason: String, ) { /** Plain-text form stored in the message body (history/search fallback). */ - val plainText: String get() = "Coach error · $code\n$reason" + val plainText: String get() = L10n.get(R.string.cte_plain, code, reason) /** JSON form stored alongside the message so the error bubble can render * the structured code/reason. Reuses the existing field — no schema change. */ @@ -48,19 +50,19 @@ data class CoachTurnError( * app's `ResponsesError` cases explicitly and falls back to `message`. */ fun from(error: Throwable): CoachTurnError = when (error) { is ResponsesError.MissingAPIKey -> CoachTurnError( - code = "No API key", - reason = "No API key is configured for the selected provider. Add one in Settings → AI Coach.") + code = L10n.get(R.string.cte_no_key), + reason = L10n.get(R.string.cte_no_key_reason)) is ResponsesError.Transport -> CoachTurnError( - code = "Network", + code = L10n.get(R.string.cte_network), reason = transportReason(error.underlying)) is ResponsesError.Http -> CoachTurnError( code = "HTTP ${error.status}", reason = cleanReason(error.body, error.status)) - is ResponsesError.Decoding -> CoachTurnError(code = "Response error", reason = error.msg) + is ResponsesError.Decoding -> CoachTurnError(code = L10n.get(R.string.cte_response_error), reason = error.msg) is ResponsesError.EmptyOutput -> CoachTurnError( - code = "No output", - reason = "The model returned an empty response. Try again, or pick a different model.") - else -> CoachTurnError(code = "Error", reason = error.message ?: "Something went wrong.") + code = L10n.get(R.string.cte_no_output), + reason = L10n.get(R.string.cte_no_output_reason)) + else -> CoachTurnError(code = L10n.get(R.string.dialog_error), reason = error.message ?: L10n.get(R.string.cte_generic)) } /** @@ -77,23 +79,19 @@ data class CoachTurnError( return when (underlying) { is java.net.UnknownHostException -> { val host = hostFrom(detail) - "Couldn't look up ${host ?: "the provider"}. Your device can't resolve it right " + - "now — check your connection, and whether a VPN or a Private DNS setting is " + - "blocking it. (${detail.ifEmpty { "unknown host" }})" + L10n.get(R.string.cte_dns, host ?: L10n.get(R.string.cte_the_provider), detail.ifEmpty { "unknown host" }) } // OkHttp reports connect and read timeouts as this same exception, and only the // message tells them apart ("failed to connect to … after 30000ms" vs "timeout"). // The copy therefore stays neutral about which one happened, and the raw text is // appended like every other branch so a bug report can still distinguish them. is java.net.SocketTimeoutException -> - "The provider took too long to answer. Check your connection and try again — a " + - "VPN or a weak signal will do this. (${detail.ifEmpty { "timeout" }})" + L10n.get(R.string.cte_timeout, detail.ifEmpty { "timeout" }) is javax.net.ssl.SSLException -> - "The secure connection to the provider failed. This is usually a VPN, a proxy, " + - "or a network that intercepts traffic. (${detail.ifEmpty { "TLS error" }})" + L10n.get(R.string.cte_tls, detail.ifEmpty { "TLS error" }) is java.net.ConnectException -> - "Couldn't connect to the provider. (${detail.ifEmpty { "connection refused" }})" - else -> detail.ifEmpty { "The network request failed." } + L10n.get(R.string.cte_connect, detail.ifEmpty { "connection refused" }) + else -> detail.ifEmpty { L10n.get(R.string.cte_network_failed) } } } @@ -123,7 +121,7 @@ data class CoachTurnError( } catch (_: Exception) { // not JSON — fall through to the raw body } - if (trimmed.isEmpty()) return "The provider returned HTTP $status with no details." + if (trimmed.isEmpty()) return L10n.get(R.string.cte_http_empty, status) return trimmed.take(400) } } diff --git a/app/src/main/java/com/pulseloop/coach/orchestration/PendingActionExecutor.kt b/app/src/main/java/com/pulseloop/coach/orchestration/PendingActionExecutor.kt index e87da0de..d0f27a12 100644 --- a/app/src/main/java/com/pulseloop/coach/orchestration/PendingActionExecutor.kt +++ b/app/src/main/java/com/pulseloop/coach/orchestration/PendingActionExecutor.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.orchestration +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.coach.tools.CoachDataAccess import com.pulseloop.data.PulseLoopDatabase import com.pulseloop.data.entity.ActivitySessionEntity @@ -10,12 +12,13 @@ import com.pulseloop.data.entity.ActivitySessionEntity * taps Confirm on the action card. Returns a short human result string. */ object PendingActionExecutor { - private val activityLabels = mapOf( - "walk" to "Walking", "run" to "Running", "cycle" to "Cycling", - "gym" to "Gym", "squash" to "Squash", "sport" to "Sport", - "yoga" to "Yoga", "dance" to "Dance", "hike" to "Hiking", "other" to "Workout", - "outdoor_run" to "Running", "outdoor_walk" to "Walking", - ) + /** The session's display name. `outdoor_*` are older aliases of `run`/`walk`. */ + internal fun typeLabel(type: String): String = when (type) { + "outdoor_run" -> com.pulseloop.ui.components.ActivityMeta.label("run") + "outdoor_walk" -> com.pulseloop.ui.components.ActivityMeta.label("walk") + "other" -> L10n.get(R.string.workout_generic) + else -> com.pulseloop.ui.components.ActivityMeta.label(type) + } suspend fun execute(action: PendingAction, db: PulseLoopDatabase): String { // Meal actions (iOS #96) target a MealEntry, not an ActivitySession — branch before @@ -28,9 +31,9 @@ object PendingActionExecutor { val sessions = db.activitySessionDao().recent(200) val session = sessions.firstOrNull { it.id == action.activityId } - ?: return "That workout no longer exists." + ?: return L10n.get(R.string.pa_workout_gone) - val typeLabel = activityLabels[session.type] ?: session.type + val typeLabel = typeLabel(session.type) return when (action.kind) { // Meal kinds are handled by the early return above (before the session lookup, since @@ -46,11 +49,11 @@ object PendingActionExecutor { updatedAt = System.currentTimeMillis(), ) ) - "Deleted the $typeLabel session." + L10n.get(R.string.pa_deleted_session, typeLabel) } PendingActionKind.UPDATE_ACTIVITY_SESSION -> { applyUpdates(db, action.updates, session) - "Updated the $typeLabel session." + L10n.get(R.string.pa_updated_session, typeLabel) } } } @@ -64,19 +67,19 @@ object PendingActionExecutor { */ private suspend fun executeMeal(action: PendingAction, db: PulseLoopDatabase): String { val entry = db.mealEntryDao().byId(action.activityId) - ?: return "That meal no longer exists." + ?: return L10n.get(R.string.pa_meal_gone) return when (action.kind) { PendingActionKind.DELETE_MEAL_ENTRY -> { val name = entry.name db.mealEntryDao().deleteById(entry.id) - "Deleted \"$name\"." + L10n.get(R.string.pa_deleted_name, name) } PendingActionKind.UPDATE_MEAL_ENTRY -> { val updated = action.mealUpdates?.let { com.pulseloop.coach.tools.NutritionTools.applyMealUpdates(it, entry) } ?: entry db.mealEntryDao().upsert(updated) - "Updated \"${updated.name}\"." + L10n.get(R.string.pa_updated_name, updated.name) } // Unreachable: execute() routes only the two meal kinds here. else -> "" diff --git a/app/src/main/java/com/pulseloop/coach/schema/CoachChartView.kt b/app/src/main/java/com/pulseloop/coach/schema/CoachChartView.kt index 65b57e34..f752a8e8 100644 --- a/app/src/main/java/com/pulseloop/coach/schema/CoachChartView.kt +++ b/app/src/main/java/com/pulseloop/coach/schema/CoachChartView.kt @@ -18,6 +18,8 @@ import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp +import androidx.compose.ui.res.stringResource +import com.pulseloop.R /** * Ported from CoachChartView.swift. @@ -30,13 +32,14 @@ fun CoachChartView( modifier: Modifier = Modifier, height: Int = 170, ) { - val color = when { - chart.title.contains("HR", ignoreCase = true) || chart.yLabel.contains("bpm", ignoreCase = true) -> Color(0xFFE53935) - chart.title.contains("SpO2", ignoreCase = true) || chart.yLabel.contains("%", ignoreCase = true) -> Color(0xFF1E88E5) - chart.title.contains("sleep", ignoreCase = true) -> Color(0xFF7E57C2) - chart.title.contains("step", ignoreCase = true) -> Color(0xFF4CAF50) - else -> MaterialTheme.colorScheme.primary - } + val color = chartColor( + chart, + heartWords = stringResource(R.string.chart_words_heart), + heartUnits = stringResource(R.string.chart_words_heart_unit), + oxygenWords = stringResource(R.string.chart_words_oxygen), + sleepWords = stringResource(R.string.chart_words_sleep), + stepWords = stringResource(R.string.chart_words_steps), + ) ?: MaterialTheme.colorScheme.primary Column( modifier = modifier @@ -47,14 +50,14 @@ fun CoachChartView( verticalArrangement = Arrangement.spacedBy(8.dp), ) { Text( - chart.title.ifEmpty { "${chart.xLabel} vs ${chart.yLabel}" }, + chart.title.ifEmpty { stringResource(R.string.chart_x_vs_y, chart.xLabel, chart.yLabel) }, style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) if (chart.points.isEmpty()) { Box(Modifier.fillMaxWidth().height(60.dp), contentAlignment = Alignment.Center) { - Text("No data to plot for this range.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.chart_no_data), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } } else { when (chart.chartType.lowercase()) { @@ -67,6 +70,34 @@ fun CoachChartView( } } +/** + * The series colour, picked from the chart's own title and axis label. The coach writes those in + * the app's language, so the translation's words for each metric (comma-separated string + * resources) are matched as well as the English ones, which the model also uses. In English the + * resources repeat the English words, so the colours are what they always were. + */ +internal fun chartColor( + chart: CoachChart, + heartWords: String = "", + heartUnits: String = "", + oxygenWords: String = "", + sleepWords: String = "", + stepWords: String = "", +): Color? { + fun words(extra: String, vararg english: String) = + english.toList() + extra.split(',').map { it.trim() }.filter { it.isNotEmpty() } + fun CharSequence.hasAny(list: List) = list.any { contains(it, ignoreCase = true) } + val title = chart.title + val y = chart.yLabel + return when { + title.hasAny(words(heartWords, "HR")) || y.hasAny(words(heartUnits, "bpm")) -> Color(0xFFE53935) + title.hasAny(words(oxygenWords, "SpO2")) || y.contains("%") -> Color(0xFF1E88E5) + title.hasAny(words(sleepWords, "sleep")) -> Color(0xFF7E57C2) + title.hasAny(words(stepWords, "step")) -> Color(0xFF4CAF50) + else -> null + } +} + // ── Plot Composables ────────────────────────────────────────────────────── @Composable diff --git a/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryContent.kt b/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryContent.kt index 2ee59307..88951041 100644 --- a/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryContent.kt +++ b/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryContent.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.summaries +import com.pulseloop.R +import com.pulseloop.util.L10n import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import com.pulseloop.coach.schema.CoachResponse @@ -60,9 +62,9 @@ enum class CoachSummaryKind(val rawValue: String) { SLEEP_RANGE_YEAR("sleep_range_year"); val conversationTitle: String get() = when (this) { - TODAY -> "Today recap" - SLEEP_DAY -> "Sleep recap" - else -> "Sleep trend" + TODAY -> L10n.get(R.string.summary_today_recap) + SLEEP_DAY -> L10n.get(R.string.summary_sleep_recap) + else -> L10n.get(R.string.summary_sleep_trend) } companion object { diff --git a/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryContextBuilder.kt b/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryContextBuilder.kt index 363bd5ba..944a48f0 100644 --- a/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryContextBuilder.kt +++ b/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryContextBuilder.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.summaries +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.coach.context.CoachContextBuilder import com.pulseloop.coach.context.CoachContextPacket import com.pulseloop.data.PulseLoopDatabase @@ -74,16 +76,16 @@ object CoachSummaryContextBuilder { // Scripted fallback — same display value as the Today tile, so the two cannot disagree. val displaySteps = tp.steps ?: 0 - val title = if (displaySteps > 0) "Today's snapshot" else "No activity synced yet" + val title = if (displaySteps > 0) L10n.get(R.string.summary_fb_today_title) else L10n.get(R.string.fb_no_activity_title) val body = if (displaySteps > 0) - "$displaySteps steps so far today. Your ring is tracking — sync for the latest readings." - else "I don't have today's activity yet. Wear your ring and sync for a daily recap." + L10n.plural(R.plurals.summary_fb_today_body, displaySteps, displaySteps) + else L10n.get(R.string.summary_fb_today_empty) return Built( scopeKey = todayDate, contextJson = contextJson, signature = sig, - fallback = CoachSummaryContent(title, body, listOf("How am I doing today?", "Summarize my week")), + fallback = CoachSummaryContent(title, body, listOf(L10n.get(R.string.coach_suggest_today), L10n.get(R.string.coach_suggest_week))), ) } @@ -151,6 +153,19 @@ object CoachSummaryContextBuilder { // ── Helpers ────────────────────────────────────────────────────────── + /** + * The coach writes in the app's language, so a cached card is stale after a language + * switch even when the data hasn't moved. Non-English languages are folded into the + * signature; English adds nothing, so signatures stored before localization still match. + */ private fun signature(parts: List): String = - parts.joinToString("|") { it ?: "·" } + parts.joinToString("|") { it ?: "·" } + languageSuffix(com.pulseloop.coach.context.CoachLanguage.languageName()) + + private const val LANGUAGE_MARK = "|lang=" + + internal fun languageSuffix(language: String?): String = language?.let { LANGUAGE_MARK + it }.orEmpty() + + /** The language part of a stored signature ("" for English). */ + internal fun languageOf(signature: String): String = + signature.substringAfter(LANGUAGE_MARK, missingDelimiterValue = "") } diff --git a/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryGenerator.kt b/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryGenerator.kt index 908dff6e..48a09e5d 100644 --- a/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryGenerator.kt +++ b/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryGenerator.kt @@ -32,7 +32,7 @@ object CoachSummaryGenerator { if (!flags.coachEnabled || apiKey.isBlank()) return@withContext fallback try { val input = JsonArray(listOf( - message("system", CoachSummaryPromptBuilder.systemPrompt(kind)), + message("system", CoachSummaryPromptBuilder.systemPrompt(kind) + com.pulseloop.coach.context.CoachLanguage.directive("the title, body and chips")), message("developer", CoachSummaryPromptBuilder.developerMessage(contextJSON, angle, recentTexts)), )) val textFormat = JsonObject(mapOf( diff --git a/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryService.kt b/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryService.kt index d555b73a..014bc6a3 100644 --- a/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryService.kt +++ b/app/src/main/java/com/pulseloop/coach/summaries/CoachSummaryService.kt @@ -52,7 +52,7 @@ class CoachSummaryService( if (existing != null) { if (existing.dataSignature == built.signature) return // no new data - if (now - existing.updatedAt < minIntervalMs) return // rate limited + if (now - existing.updatedAt < minIntervalMs && sameLanguage(existing, built)) return // rate limited } generateAndUpsert(CoachSummaryKind.TODAY, built, existing) } @@ -69,11 +69,15 @@ class CoachSummaryService( val existing = db.coachSummaryDao().get(CoachSummaryKind.SLEEP_DAY.rawValue, built.scopeKey) if (existing != null) { if (existing.dataSignature == built.signature) return - if (now - existing.updatedAt < minIntervalMs) return + if (now - existing.updatedAt < minIntervalMs && sameLanguage(existing, built)) return } generateAndUpsert(CoachSummaryKind.SLEEP_DAY, built, existing) } + /** A card written in another language is replaced at once; the rate limit is for data churn. */ + private fun sameLanguage(existing: CoachSummaryEntity, built: CoachSummaryContextBuilder.Built): Boolean = + CoachSummaryContextBuilder.languageOf(existing.dataSignature) == CoachSummaryContextBuilder.languageOf(built.signature) + // ── Generate + Persist ─────────────────────────────────────────────── private suspend fun generateAndUpsert( diff --git a/app/src/main/java/com/pulseloop/coach/tools/CoachTool.kt b/app/src/main/java/com/pulseloop/coach/tools/CoachTool.kt index 249c27b1..315abbab 100644 --- a/app/src/main/java/com/pulseloop/coach/tools/CoachTool.kt +++ b/app/src/main/java/com/pulseloop/coach/tools/CoachTool.kt @@ -8,12 +8,16 @@ import kotlinx.serialization.json.JsonObject */ data class CoachToolDef( val name: String, - val publicLabel: String, + /** The progress line shown while the tool runs ("Looking at your sleep"). */ + @androidx.annotation.StringRes val publicLabelRes: Int, val description: String, val parameters: JsonObject, val strict: Boolean = true, val run: (String, ToolExecutionContext) -> ToolResult, -) +) { + /** Resolved per call, so it follows a language change without rebuilding the registry. */ + val publicLabel: String get() = com.pulseloop.util.L10n.get(publicLabelRes) +} data class ToolResult( val jsonString: String, diff --git a/app/src/main/java/com/pulseloop/coach/tools/NutritionTools.kt b/app/src/main/java/com/pulseloop/coach/tools/NutritionTools.kt index 32a0893a..b1a0bb51 100644 --- a/app/src/main/java/com/pulseloop/coach/tools/NutritionTools.kt +++ b/app/src/main/java/com/pulseloop/coach/tools/NutritionTools.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.tools +import com.pulseloop.util.L10n +import com.pulseloop.R import com.pulseloop.coach.orchestration.MealUpdates import com.pulseloop.coach.orchestration.PendingAction import com.pulseloop.coach.orchestration.PendingActionKind @@ -74,7 +76,7 @@ object NutritionTools { */ private fun makeSearchFoodDatabase() = CoachToolDef( name = "search_food_database", - publicLabel = "Checking the food database", + publicLabelRes = R.string.tool_food_db, description = "Search Open Food Facts for a food's verified nutrition (per 100 g). " + "Use before logging any nameable or packaged food. " + "If it errors, estimate instead and say so, with source 'estimate'.", @@ -146,7 +148,7 @@ object NutritionTools { */ private fun makeGetNutritionLog() = CoachToolDef( name = "get_nutrition_log", - publicLabel = "Reading your food log", + publicLabelRes = R.string.tool_food_log, description = "Get the user's logged meals and calorie/macro totals for a date (YYYY-MM-DD).", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -209,7 +211,7 @@ object NutritionTools { */ private fun makeLogMeal() = CoachToolDef( name = "log_meal", - publicLabel = "Logging your meal", + publicLabelRes = R.string.tool_log_meal, description = "Log a meal/food/drink the user ate. Values are TOTALS for what was eaten. " + "Ground nameable foods via search_food_database first (source 'database'); " + "for home-cooked or unverifiable food use source 'estimate' with honest confidence " + @@ -323,7 +325,7 @@ object NutritionTools { */ private fun makeUpdateMealEntry() = CoachToolDef( name = "update_meal_entry", - publicLabel = "Updating that meal", + publicLabelRes = R.string.tool_update_meal, description = "Edit a logged meal. Applies immediately for a meal logged today; " + "for an older meal, returns needs_confirmation and shows a Confirm card.", parameters = JsonObject(mapOf( @@ -379,8 +381,8 @@ object NutritionTools { ctx.pendingActions.add(PendingAction( kind = PendingActionKind.UPDATE_MEAL_ENTRY, activityId = mealId, - summary = "Update \"${entry.name}\" from ${CoachDataAccess.localDateString(entry.timestamp)}?", - confirmLabel = "Save changes", + summary = L10n.get(R.string.pa_confirm_update_meal, entry.name, CoachDataAccess.localDateString(entry.timestamp)), + confirmLabel = L10n.get(R.string.action_save_changes), mealUpdates = updates, )) ToolResult("""{"ok":true,"needs_confirmation":true,"summary":"Awaiting your confirmation to edit that meal."}""") @@ -395,7 +397,7 @@ object NutritionTools { */ private fun makeDeleteMealEntry() = CoachToolDef( name = "delete_meal_entry", - publicLabel = "Removing that meal", + publicLabelRes = R.string.tool_delete_meal, description = "Delete a logged meal. Always returns needs_confirmation and shows a " + "Confirm card; the deletion only happens after the user taps Confirm.", parameters = JsonObject(mapOf( @@ -417,8 +419,8 @@ object NutritionTools { ctx.pendingActions.add(PendingAction( kind = PendingActionKind.DELETE_MEAL_ENTRY, activityId = mealId, - summary = "Delete \"${entry.name}\" (${entry.calories.roundToLong()} kcal) from ${CoachDataAccess.localDateString(entry.timestamp)}?", - confirmLabel = "Delete", + summary = L10n.get(R.string.pa_confirm_delete_meal, entry.name, entry.calories.roundToLong(), CoachDataAccess.localDateString(entry.timestamp)), + confirmLabel = L10n.get(R.string.action_delete), )) ToolResult("""{"ok":true,"needs_confirmation":true,"summary":"Awaiting your confirmation to delete that meal."}""") } diff --git a/app/src/main/java/com/pulseloop/coach/tools/ToolImplementations.kt b/app/src/main/java/com/pulseloop/coach/tools/ToolImplementations.kt index 62a085d9..252172be 100644 --- a/app/src/main/java/com/pulseloop/coach/tools/ToolImplementations.kt +++ b/app/src/main/java/com/pulseloop/coach/tools/ToolImplementations.kt @@ -1,5 +1,7 @@ package com.pulseloop.coach.tools +import com.pulseloop.util.L10n +import com.pulseloop.R import com.pulseloop.ring.MeasurementKind import kotlinx.serialization.json.* @@ -17,7 +19,7 @@ object RetrievalTools { private fun makeProfile() = CoachToolDef( name = "get_profile_context", - publicLabel = "Checking your profile and ring status", + publicLabelRes = R.string.tool_profile, description = "Get user profile, goals, device sync status, and data-quality warnings.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -42,7 +44,7 @@ object RetrievalTools { private fun makeDailySummary() = CoachToolDef( name = "get_daily_summary", - publicLabel = "Reading that day's ring data", + publicLabelRes = R.string.tool_day, description = "Fetch daily activity and biometric summary for a local date (YYYY-MM-DD).", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -74,7 +76,7 @@ object RetrievalTools { private fun makeMetricSeries() = CoachToolDef( name = "get_metric_series", - publicLabel = "Fetching your trend data", + publicLabelRes = R.string.tool_trend_data, description = "Fetch a time series for a metric over a date range.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -111,7 +113,7 @@ object RetrievalTools { private fun makeSleepSummary() = CoachToolDef( name = "get_sleep_summary", - publicLabel = "Looking at your sleep", + publicLabelRes = R.string.tool_sleep, description = "Get sleep summary for a date or date range.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -149,7 +151,7 @@ object RetrievalTools { private fun makeRangeSummary() = CoachToolDef( name = "get_range_summary", - publicLabel = "Fetching your ring data for that range", + publicLabelRes = R.string.tool_range, description = "Fetch summarized activity, HR, SpO2, and sleep over a date range.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -195,7 +197,7 @@ object RetrievalTools { private fun makeActivitySessions() = CoachToolDef( name = "get_activity_sessions", - publicLabel = "Looking up your workouts", + publicLabelRes = R.string.tool_workouts, description = "Fetch saved activity sessions over a date range.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -225,7 +227,7 @@ object RetrievalTools { private fun makeSummarizeSession() = CoachToolDef( name = "summarize_activity_session", - publicLabel = "Summarizing that workout", + publicLabelRes = R.string.tool_workout_summary, description = "Compute summary statistics for one activity session.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -247,7 +249,7 @@ object RetrievalTools { private fun makeSyncStatus() = CoachToolDef( name = "get_sync_status", - publicLabel = "Checking ring connection", + publicLabelRes = R.string.tool_ring_connection, description = "Get the ring's current connection state, battery, last sync time.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -265,7 +267,7 @@ object RetrievalTools { private fun makeDataAvailability() = CoachToolDef( name = "get_data_availability", - publicLabel = "Checking what data exists", + publicLabelRes = R.string.tool_data_coverage, description = "Report how many readings exist per metric in a date range.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -289,7 +291,7 @@ object RetrievalTools { private fun makeSleepTrends() = CoachToolDef( name = "get_sleep_trends", - publicLabel = "Reviewing your sleep", + publicLabelRes = R.string.tool_sleep_summary, description = "Summarize sleep over a range: average duration, nights tracked.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -314,7 +316,7 @@ object RetrievalTools { private fun makeGoalProgress() = CoachToolDef( name = "get_goal_progress", - publicLabel = "Checking your goals", + publicLabelRes = R.string.tool_goals, description = "Compare today's metrics against the user's goals.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -335,7 +337,7 @@ object RetrievalTools { private fun makeRecentAnomalies() = CoachToolDef( name = "get_recent_anomalies", - publicLabel = "Scanning for anything unusual", + publicLabelRes = R.string.tool_anomalies, description = "Detect statistical outliers in steps and resting HR over last ~14 days.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -361,7 +363,7 @@ object AnalysisTools { private val analyzeTrend = CoachToolDef( name = "analyze_trend", - publicLabel = "Analyzing your trends", + publicLabelRes = R.string.tool_trends, description = "Run a basic trend analysis on a metric series (returns slope, direction, significance).", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -391,7 +393,7 @@ object AnalysisTools { private val comparePeriods = CoachToolDef( name = "compare_periods", - publicLabel = "Comparing two time periods", + publicLabelRes = R.string.tool_compare_periods, description = "Compare a metric between two time periods (e.g., this week vs last week).", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -419,7 +421,7 @@ object AnalysisTools { private val computeCorrelation = CoachToolDef( name = "compute_correlation", - publicLabel = "Computing correlation", + publicLabelRes = R.string.tool_correlation, description = "Compute Pearson correlation between two sets of paired values.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -455,7 +457,7 @@ object AnalysisTools { private val detectOutliers = CoachToolDef( name = "detect_outliers", - publicLabel = "Detecting outliers", + publicLabelRes = R.string.tool_outliers, description = "Detect statistical outliers (z-score > 2) in a series of values.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -487,7 +489,7 @@ object AnalysisTools { private val summarizeDistribution = CoachToolDef( name = "summarize_distribution", - publicLabel = "Summarizing distribution", + publicLabelRes = R.string.tool_distribution, description = "Compute statistical summary: mean, median, min, max, std dev.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -517,7 +519,7 @@ object ChartTools { private val prepareChart = CoachToolDef( name = "prepare_chart", - publicLabel = "Preparing a chart", + publicLabelRes = R.string.tool_chart, description = "Generate a chart from data points. Call this when you want to show a chart.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -559,7 +561,7 @@ object MemoryTools { private val saveMemory = CoachToolDef( name = "save_memory", - publicLabel = "Saving this for later", + publicLabelRes = R.string.tool_memory, description = "Save a key-value memory for future conversations.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -617,7 +619,7 @@ object ActionTools { private val setGoal = CoachToolDef( name = "set_goal", - publicLabel = "Setting your goal", + publicLabelRes = R.string.tool_set_goal, description = "Set a daily step goal.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -651,7 +653,7 @@ object ActionTools { private val triggerMeasurement = CoachToolDef( name = "trigger_measurement", - publicLabel = "Taking a live reading", + publicLabelRes = R.string.tool_live_reading, description = "Trigger a live heart rate or SpO2 measurement from the ring.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -693,7 +695,7 @@ object ActionTools { private val logUserNote = CoachToolDef( name = "log_user_note", - publicLabel = "Noting that down", + publicLabelRes = R.string.tool_note, description = "Save a dated note about symptoms, perceived exertion, mood, injury, sleep, diet, or activity context.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -729,7 +731,7 @@ object ActionTools { private val logActivityCorrection = CoachToolDef( name = "log_activity_correction", - publicLabel = "Logging your activity", + publicLabelRes = R.string.tool_log_activity, description = "Log or correct a user-stated activity the ring missed or misclassified.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -773,7 +775,7 @@ object ActionTools { private val createActivitySession = CoachToolDef( name = "create_activity_session_from_description", - publicLabel = "Logging your session", + publicLabelRes = R.string.tool_log_session, description = "Create a finished manual workout from a description.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -839,7 +841,7 @@ object ActionTools { private val updateActivitySession = CoachToolDef( name = "update_activity_session", - publicLabel = "Updating that workout", + publicLabelRes = R.string.tool_update_workout, description = "Edit a saved workout. For older sessions returns needs_confirmation.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -888,8 +890,8 @@ object ActionTools { ctx.pendingActions.add(com.pulseloop.coach.orchestration.PendingAction( kind = com.pulseloop.coach.orchestration.PendingActionKind.UPDATE_ACTIVITY_SESSION, activityId = activityId, - summary = "Update your ${session.type} session from ${CoachDataAccess.localDateString(session.startedAt)}?", - confirmLabel = "Save changes", + summary = L10n.get(R.string.pa_confirm_update_session, com.pulseloop.coach.orchestration.PendingActionExecutor.typeLabel(session.type), CoachDataAccess.localDateString(session.startedAt)), + confirmLabel = L10n.get(R.string.action_save_changes), updates = updates, )) ToolResult("""{"ok":true,"needs_confirmation":true,"summary":"Awaiting your confirmation to edit that workout."}""") @@ -900,7 +902,7 @@ object ActionTools { private val deleteActivitySession = CoachToolDef( name = "delete_activity_session", - publicLabel = "Removing that workout", + publicLabelRes = R.string.tool_delete_workout, description = "Delete a workout. Always returns needs_confirmation.", parameters = JsonObject(mapOf( "type" to JsonPrimitive("object"), @@ -925,8 +927,8 @@ object ActionTools { ctx.pendingActions.add(com.pulseloop.coach.orchestration.PendingAction( kind = com.pulseloop.coach.orchestration.PendingActionKind.DELETE_ACTIVITY_SESSION, activityId = activityId, - summary = "Delete your ${session.type} session from ${CoachDataAccess.localDateString(session.startedAt)}? This can't be undone.", - confirmLabel = "Delete", + summary = L10n.get(R.string.pa_confirm_delete_session, com.pulseloop.coach.orchestration.PendingActionExecutor.typeLabel(session.type), CoachDataAccess.localDateString(session.startedAt)), + confirmLabel = L10n.get(R.string.action_delete), )) ToolResult("""{"ok":true,"needs_confirmation":true,"summary":"Awaiting your confirmation to delete that workout."}""") } diff --git a/app/src/main/java/com/pulseloop/health/HealthConnectExporter.kt b/app/src/main/java/com/pulseloop/health/HealthConnectExporter.kt index 86731814..fbe57bcd 100644 --- a/app/src/main/java/com/pulseloop/health/HealthConnectExporter.kt +++ b/app/src/main/java/com/pulseloop/health/HealthConnectExporter.kt @@ -1,5 +1,7 @@ package com.pulseloop.health +import com.pulseloop.R +import com.pulseloop.util.L10n import androidx.health.connect.client.HealthConnectClient import androidx.health.connect.client.PermissionController import androidx.health.connect.client.records.ExerciseRoute @@ -693,11 +695,11 @@ class HealthConnectExporter( fun summary(): String { val bits = mutableListOf() if (inserted.isNotEmpty()) { - bits += "exported " + inserted.entries.joinToString(", ") { "${it.key} ${it.value}" } + bits += L10n.get(R.string.hcs_exported, inserted.entries.joinToString(", ") { "${it.key} ${it.value}" }) } - if (skipped.isNotEmpty()) bits += "skipped: " + skipped.joinToString("; ") + if (skipped.isNotEmpty()) bits += L10n.get(R.string.hcs_skipped, skipped.joinToString("; ")) if (errors.isNotEmpty()) bits += errors.joinToString("; ") - return if (bits.isEmpty()) "nothing new to export" else bits.joinToString(" · ") + return if (bits.isEmpty()) L10n.get(R.string.hcs_nothing) else bits.joinToString(" · ") } } } diff --git a/app/src/main/java/com/pulseloop/health/HealthConnectRemovalWorker.kt b/app/src/main/java/com/pulseloop/health/HealthConnectRemovalWorker.kt index 105da871..a1e18a65 100644 --- a/app/src/main/java/com/pulseloop/health/HealthConnectRemovalWorker.kt +++ b/app/src/main/java/com/pulseloop/health/HealthConnectRemovalWorker.kt @@ -1,5 +1,7 @@ package com.pulseloop.health +import com.pulseloop.R +import com.pulseloop.util.L10n import android.content.Context import android.util.Log import androidx.health.connect.client.HealthConnectClient @@ -32,30 +34,29 @@ class HealthConnectRemovalWorker( override suspend fun doWork(): Result { val store = HealthConnectPrefsStore.get(applicationContext) if (HealthConnectSdk.availability(applicationContext) != HealthConnectAvailability.AVAILABLE) { - store.update { it.copy(removalStatus = "Health Connect isn't available right now. Try again.") } + store.update { it.copy(removalStatus = L10n.get(R.string.hcr_unavailable)) } return Result.success() } val client = runCatching { HealthConnectClient.getOrCreate(applicationContext) }.getOrNull() if (client == null) { - store.update { it.copy(removalStatus = "Could not reach Health Connect. Try again.") } + store.update { it.copy(removalStatus = L10n.get(R.string.hcr_unreachable)) } return Result.success() } return try { val result = HealthConnectRemoval.removeAll(applicationContext, client, store) val message = when { result.failedTypes > 0 -> - "Removed PulseLoop data, but ${result.failedTypes} type(s) could not be deleted — try again." + L10n.get(R.string.hcr_partial, result.failedTypes) result.deletedTypes == 0 -> - "Nothing to remove: PulseLoop has no write permissions left, so it can't delete " + - "what it wrote. Delete it in the Health Connect app, or re-grant and try again." - else -> "Removed PulseLoop data from Health Connect." + L10n.get(R.string.hcr_no_permission) + else -> L10n.get(R.string.hcr_done) } store.update { it.copy(removalStatus = message) } Log.i(TAG, "removal done: $message") Result.success() } catch (e: Exception) { Log.w(TAG, "removal failed", e) - store.update { it.copy(removalStatus = "Could not remove PulseLoop data. Try again.") } + store.update { it.copy(removalStatus = L10n.get(R.string.hcr_failed)) } Result.success() } } diff --git a/app/src/main/java/com/pulseloop/notifications/BatteryNotifications.kt b/app/src/main/java/com/pulseloop/notifications/BatteryNotifications.kt index 1c3ecc73..19e434b9 100644 --- a/app/src/main/java/com/pulseloop/notifications/BatteryNotifications.kt +++ b/app/src/main/java/com/pulseloop/notifications/BatteryNotifications.kt @@ -1,5 +1,7 @@ package com.pulseloop.notifications +import com.pulseloop.R +import com.pulseloop.util.L10n import android.Manifest import android.app.NotificationChannel import android.app.NotificationManager @@ -29,9 +31,9 @@ object BatteryNotifications { fun createChannel(context: Context) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val channel = NotificationChannel( - CHANNEL_ID, "Ring Battery", NotificationManager.IMPORTANCE_DEFAULT + CHANNEL_ID, context.getString(R.string.channel_battery), NotificationManager.IMPORTANCE_DEFAULT ).apply { - description = "Alerts when your ring's battery runs low" + description = context.getString(R.string.channel_battery_desc) } val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager nm.createNotificationChannel(channel) @@ -49,9 +51,9 @@ object BatteryNotifications { val (title, body) = when (alert) { is BatteryAlertKind.Low -> - "Ring battery low" to "Your ring is at ${alert.percent}%. Charge it soon so tracking doesn't stop." + L10n.get(R.string.battery_low_title) to L10n.get(R.string.battery_low_body, alert.percent) is BatteryAlertKind.Critical -> - "Ring battery critically low" to "Your ring is at ${alert.percent}% and will shut down soon. Charge it now." + L10n.get(R.string.battery_critical_title) to L10n.get(R.string.battery_critical_body, alert.percent) } val intent = Intent(context, MainActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK } diff --git a/app/src/main/java/com/pulseloop/notifications/CoachNotificationSlotRunner.kt b/app/src/main/java/com/pulseloop/notifications/CoachNotificationSlotRunner.kt index a47deb6b..f4ece5b8 100644 --- a/app/src/main/java/com/pulseloop/notifications/CoachNotificationSlotRunner.kt +++ b/app/src/main/java/com/pulseloop/notifications/CoachNotificationSlotRunner.kt @@ -1,5 +1,7 @@ package com.pulseloop.notifications +import com.pulseloop.R +import com.pulseloop.util.L10n import android.content.Context import androidx.lifecycle.Lifecycle import androidx.lifecycle.ProcessLifecycleOwner @@ -258,8 +260,8 @@ class CoachNotificationSlotRunner( companion object { /** The generic scripted check-in (pre-extraction worker fallback text). */ - const val GENERIC_TITLE = "PulseLoop Coach" - const val GENERIC_BODY = "Good morning! Sync your ring and check your vitals to start the day." + val GENERIC_TITLE: String get() = L10n.get(R.string.checkins_test_title) + val GENERIC_BODY: String get() = L10n.get(R.string.notif_generic_body) /** * iOS `CoachNotificationService.runInFlight` — process-wide, because each entry @@ -500,7 +502,7 @@ private class CoachSlotProductionEngine( val input = JsonArray(listOf( JsonObject(mapOf( "role" to JsonPrimitive("system"), - "content" to JsonPrimitive(NotificationPromptBuilder.systemPrompt(slot)), + "content" to JsonPrimitive(NotificationPromptBuilder.systemPrompt(slot) + com.pulseloop.coach.context.CoachLanguage.directive("the notification title and body")), )), JsonObject(mapOf( "role" to JsonPrimitive("developer"), @@ -549,13 +551,13 @@ private class CoachSlotProductionEngine( val h = sleep.totalMin / 60 val m = sleep.totalMin % 60 CoachNotificationContent( - title = "Good morning$name", - body = "You logged ${h}h ${m}m of sleep. Here's to a strong day — get moving when you can.", + title = L10n.get(R.string.notif_good_morning, name), + body = L10n.get(R.string.notif_morning_sleep, h, m), ) } else { CoachNotificationContent( - title = "Good morning$name", - body = "Ready to start the day? Take a measurement and I'll help you plan it.", + title = L10n.get(R.string.notif_good_morning, name), + body = L10n.get(R.string.notif_morning_none), ) } } @@ -563,15 +565,15 @@ private class CoachSlotProductionEngine( val steps = packet.today.steps if (steps != null) { val goal = packet.goals.stepsDaily - val hit = if (steps >= goal) "You hit your $goal step goal — nice work." else "${goal - steps} steps to your goal." + val hit = if (steps >= goal) L10n.plural(R.plurals.notif_goal_hit, goal, goal) else L10n.plural(R.plurals.notif_goal_left, goal - steps, goal - steps) CoachNotificationContent( - title = "Evening check-in", - body = "$steps steps today. $hit Time to start winding down.", + title = L10n.get(R.string.notif_evening), + body = L10n.plural(R.plurals.notif_evening_steps, steps, steps, hit), ) } else { CoachNotificationContent( - title = "Evening check-in", - body = "How did today feel? Sync your ring and I'll recap your day.", + title = L10n.get(R.string.notif_evening), + body = L10n.get(R.string.notif_evening_none), ) } } diff --git a/app/src/main/java/com/pulseloop/notifications/CoachNotifications.kt b/app/src/main/java/com/pulseloop/notifications/CoachNotifications.kt index b5d73387..e7ee6951 100644 --- a/app/src/main/java/com/pulseloop/notifications/CoachNotifications.kt +++ b/app/src/main/java/com/pulseloop/notifications/CoachNotifications.kt @@ -1,5 +1,6 @@ package com.pulseloop.notifications +import com.pulseloop.R import android.Manifest import android.app.NotificationChannel import android.app.NotificationManager @@ -31,9 +32,9 @@ object CoachNotifications { fun createChannel(context: Context) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val channel = NotificationChannel( - CHANNEL_ID, "Coach Check-ins", NotificationManager.IMPORTANCE_DEFAULT + CHANNEL_ID, context.getString(R.string.channel_coach), NotificationManager.IMPORTANCE_DEFAULT ).apply { - description = "Daily AI-generated health insights based on your ring data" + description = context.getString(R.string.channel_coach_desc) } val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager nm.createNotificationChannel(channel) diff --git a/app/src/main/java/com/pulseloop/ring/RingBLEClient.kt b/app/src/main/java/com/pulseloop/ring/RingBLEClient.kt index 10545b17..45d474f1 100644 --- a/app/src/main/java/com/pulseloop/ring/RingBLEClient.kt +++ b/app/src/main/java/com/pulseloop/ring/RingBLEClient.kt @@ -1,5 +1,7 @@ package com.pulseloop.ring +import com.pulseloop.R +import com.pulseloop.util.L10n import android.Manifest import android.annotation.SuppressLint import android.bluetooth.* @@ -287,7 +289,7 @@ class RingBLEClient( return } if (!bluetoothAdapter.isEnabled) { - updateState { copy(lastError = "Bluetooth is not powered on") } + updateState { copy(lastError = L10n.get(R.string.ble_off)) } return } // A user-initiated scan (pairing screen) must never be hijacked by a leftover @@ -324,7 +326,7 @@ class RingBLEClient( val target = discoveredPeripherals[id] ?: run { try { bluetoothAdapter.getRemoteDevice(id) } catch (_: Exception) { null } } ?: run { - updateState { copy(lastError = "Ring no longer available; scan again.") } + updateState { copy(lastError = L10n.get(R.string.ble_ring_gone)) } return } val discoveredRing = _state.value.discovered.firstOrNull { it.id == id } @@ -411,7 +413,7 @@ class RingBLEClient( // The classic wedge: the ring still thinks it's connected (stale ACL in // the phone's stack) so it never advertises. Only the user can fix that. updateState { copy(lastError = - "Ring not found in scans. It may be held by a stale Bluetooth connection — try toggling Bluetooth off and on.") } + L10n.get(R.string.ble_stale)) } } } reconnectAttempts++ @@ -1562,7 +1564,7 @@ class RingBLEClient( } override fun onScanFailed(errorCode: Int) { - updateState { copy(lastError = "Scan failed: $errorCode") } + updateState { copy(lastError = L10n.get(R.string.ble_scan_failed, errorCode)) } } } diff --git a/app/src/main/java/com/pulseloop/ring/RingDisplay.kt b/app/src/main/java/com/pulseloop/ring/RingDisplay.kt index 7f60fc46..d3e3dee8 100644 --- a/app/src/main/java/com/pulseloop/ring/RingDisplay.kt +++ b/app/src/main/java/com/pulseloop/ring/RingDisplay.kt @@ -1,5 +1,9 @@ package com.pulseloop.ring +import com.pulseloop.R +import com.pulseloop.util.L10n + + /** * Trailing "_" suffix on advertised ring names (e.g. "COLMI R10_1203"). * ONE rule, shared by the UI label below and [com.pulseloop.diagnostics.DiagnosticsRedactor], @@ -20,7 +24,7 @@ fun ringNameWithoutSerial(name: String): String = RING_SERIAL_SUFFIX.replace(nam * family display name when the name carries no recognizable model token. */ fun ringModelLabel(name: String?, deviceType: RingDeviceType?): String { - val type = deviceType ?: return name?.takeIf { it.isNotBlank() } ?: "Ring" + val type = deviceType ?: return name?.takeIf { it.isNotBlank() } ?: L10n.get(R.string.ring_generic) // Exact catalog model first (iOS #49): correct branding for e.g. "R11_BEEF" → "Yawell R11". com.pulseloop.wearables.WearableModel.modelForAdvertisedName(name) ?.takeIf { it.family == type } diff --git a/app/src/main/java/com/pulseloop/service/LiveWorkoutManager.kt b/app/src/main/java/com/pulseloop/service/LiveWorkoutManager.kt index 9b5cdb7a..4c61e2b2 100644 --- a/app/src/main/java/com/pulseloop/service/LiveWorkoutManager.kt +++ b/app/src/main/java/com/pulseloop/service/LiveWorkoutManager.kt @@ -1,5 +1,7 @@ package com.pulseloop.service +import com.pulseloop.R +import com.pulseloop.util.L10n import android.content.Context import android.content.Intent import androidx.work.WorkManager @@ -232,7 +234,7 @@ class LiveWorkoutManager( serviceIntent.apply { val s = _state.value val notification = Intent(context, WorkoutForegroundService::class.java).apply { - putExtra("activityName", s.activeSession?.let { ActivityMeta.label(it.type) } ?: "Workout") + putExtra("activityName", s.activeSession?.let { ActivityMeta.label(it.type) } ?: L10n.get(R.string.workout_generic)) putExtra("status", if (s.isPaused) "paused" else "recording") putExtra("elapsedSeconds", s.elapsedSeconds) putExtra("distanceMeters", s.distanceMeters) diff --git a/app/src/main/java/com/pulseloop/service/RingSyncCoordinator.kt b/app/src/main/java/com/pulseloop/service/RingSyncCoordinator.kt index 988b1bdf..ea21cd85 100644 --- a/app/src/main/java/com/pulseloop/service/RingSyncCoordinator.kt +++ b/app/src/main/java/com/pulseloop/service/RingSyncCoordinator.kt @@ -1,5 +1,7 @@ package com.pulseloop.service +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.data.PulseLoopDatabase import com.pulseloop.data.entity.DeviceEntity import com.pulseloop.data.entity.MeasurementEntity @@ -499,7 +501,7 @@ class RingSyncCoordinator( fun factoryResetRing(onProgress: (String) -> Unit = {}, onCleared: suspend () -> Unit) { scope.launch { if (isConnected) { - onProgress("Syncing latest data…") + onProgress(L10n.get(R.string.wearable_syncing_latest)) syncNow() // Wait for the history sync to drain (progress reaches 100 or clears), capped // so a stale link can never hang the reset. @@ -507,7 +509,7 @@ class RingSyncCoordinator( syncProgress.first { it == null || it >= 100 } } kotlinx.coroutines.delay(800) // let the final history writes flush - onProgress("Resetting ring…") + onProgress(L10n.get(R.string.wearable_resetting_ring)) engine?.factoryReset() // The reset frame is only ENQUEUED on the GATT op queue; wait until it has // actually been written and acked before forget() tears the queue down — diff --git a/app/src/main/java/com/pulseloop/service/SleepInsights.kt b/app/src/main/java/com/pulseloop/service/SleepInsights.kt index dcd7eed1..a049be8e 100644 --- a/app/src/main/java/com/pulseloop/service/SleepInsights.kt +++ b/app/src/main/java/com/pulseloop/service/SleepInsights.kt @@ -1,5 +1,7 @@ package com.pulseloop.service +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.data.DemoDataPolicy import com.pulseloop.data.entity.SleepSessionEntity import com.pulseloop.data.entity.SleepStageBlockEntity @@ -354,14 +356,12 @@ object SleepFormat { fun duration(minutes: Int?): String { if (minutes == null || minutes < 0) return "—" val h = minutes / 60; val m = minutes % 60 - return if (h <= 0) "${m}m" else "${h}h ${m.toString().padStart(2, '0')}m" + return if (h <= 0) L10n.get(R.string.duration_m, m) else L10n.get(R.string.duration_hm, h, m) } fun clockTime(ts: Long): String { val t = Instant.ofEpochMilli(ts).atZone(ZoneId.systemDefault()) - val h = t.hour % 12; val displayH = if (h == 0) 12 else h - val ampm = if (t.hour < 12) "AM" else "PM" - return "$displayH:${t.minute.toString().padStart(2, '0')} $ampm" + return t.format(com.pulseloop.util.LocaleFormats.time()) } } @@ -387,11 +387,11 @@ data class SleepBar( ) object SleepInsights { - val rangeHeroLabel = mapOf( - SleepRangeKey.DAY to "Last Sleep", - SleepRangeKey.WEEK to "Weekly Sleep", - SleepRangeKey.MONTH to "Monthly Sleep", - SleepRangeKey.YEAR to "Yearly Sleep", + val rangeHeroLabel get() = mapOf( + SleepRangeKey.DAY to L10n.get(R.string.sleep_last), + SleepRangeKey.WEEK to L10n.get(R.string.sleep_weekly), + SleepRangeKey.MONTH to L10n.get(R.string.sleep_monthly), + SleepRangeKey.YEAR to L10n.get(R.string.sleep_yearly), ) private const val minAggNights = 2 @@ -483,43 +483,45 @@ object SleepInsights { val deepPct = score.deepPct val awakePct = score.awakePct val chips = mutableListOf() - if (session.totalMinutes in 420..540) chips.add("Good duration") - if (deepPct in 13..23) chips.add("Deep sleep balanced") - else if (deepPct > 23) chips.add("Deep sleep strong") - if (awakePct != null && awakePct <= 10) chips.add("Awake time low") + if (session.totalMinutes in 420..540) chips.add(L10n.get(R.string.sc_chip_good_duration)) + if (deepPct in 13..23) chips.add(L10n.get(R.string.sc_chip_deep_balanced)) + else if (deepPct > 23) chips.add(L10n.get(R.string.sc_chip_deep_strong)) + if (awakePct != null && awakePct <= 10) chips.add(L10n.get(R.string.sc_chip_awake_low)) if (score.score >= 85) { val body = if ((activitySteps ?: 0) > 5000) - "Looks like a strong night after a more active day. Your duration was solid and deep sleep made up a healthy part of the night, which kept the score high." - else "Your sleep duration and stage balance were strong. Deep sleep looked supportive, which helped keep the overall score high." - return SleepCoach("Strong recovery signal", body, chips.ifEmpty { listOf("Excellent") }.take(3)) + L10n.get(R.string.sc_strong_active) + else L10n.get(R.string.sc_strong) + return SleepCoach(L10n.get(R.string.sc_strong_title), body, chips.ifEmpty { listOf(L10n.get(R.string.quality_excellent)) }.take(3)) } if (awakePct != null && awakePct > 15) { return SleepCoach( - "Good sleep, with some restlessness", - "You slept long enough, but awake time was a bit elevated. If this repeats, look at late caffeine, alcohol, temperature, or stress near bedtime.", - (listOf("Awake time elevated") + chips).take(3), + L10n.get(R.string.sc_restless_title), + L10n.get(R.string.sc_restless), + (listOf(L10n.get(R.string.sc_chip_awake_elevated)) + chips).take(3), ) } if (session.totalMinutes < 390) { return SleepCoach( - "Duration held the score back", - "The stage mix was useful, but total sleep time was short for a full recovery window. A slightly earlier wind-down would likely improve tomorrow's score.", - (listOf("Short duration") + chips).take(3), + L10n.get(R.string.sc_short_title), + L10n.get(R.string.sc_short), + (listOf(L10n.get(R.string.sc_chip_short)) + chips).take(3), ) } return SleepCoach( - "Solid night overall", - "Your sleep was in a workable range, with the score shaped mostly by duration and stage balance. Deep and light sleep were readable enough to give a useful recovery snapshot.", - chips.ifEmpty { listOf("Good") }.take(3), + L10n.get(R.string.sc_solid_title), + L10n.get(R.string.sc_solid), + chips.ifEmpty { listOf(L10n.get(R.string.quality_good)) }.take(3), ) } - val dayNoDataCoach = SleepCoach( - "No sleep tracked last night", - "I don't see sleep data for last night. Wear your ring overnight and sync in the morning so I can compare your sleep against your baseline.", - emptyList(), - ) + /** A getter, not a stored value, so the copy follows a language change. */ + val dayNoDataCoach: SleepCoach + get() = SleepCoach( + L10n.get(R.string.sc_none_title), + L10n.get(R.string.sc_none), + emptyList(), + ) fun aggregateCoach( range: SleepRangeKey, @@ -530,13 +532,15 @@ object SleepInsights { ): SleepCoach { val valid = validSessions(sessions) val avgMin = averageDuration(valid) - val periodWord = when (range) { SleepRangeKey.WEEK -> "week"; SleepRangeKey.MONTH -> "month"; else -> "year" } - if (valid.size < minAggNights) { - val nightWord = if (valid.size == 1) "night" else "nights" + val (titleRes, bodyRes) = when (range) { + SleepRangeKey.WEEK -> R.string.sc_few_week_title to R.plurals.sc_few_week + SleepRangeKey.MONTH -> R.string.sc_few_month_title to R.plurals.sc_few_month + else -> R.string.sc_few_year_title to R.plurals.sc_few_year + } return SleepCoach( - "Not enough $periodWord data yet", - "I only have ${valid.size} tracked $nightWord for this $periodWord. Wear the ring overnight for a few more nights and I'll build a reliable ${periodWord}ly picture.", + L10n.get(titleRes), + L10n.plural(bodyRes, valid.size, valid.size), listOf(nightsTrackedChip(valid.size, expectedNights)), ) } @@ -546,59 +550,58 @@ object SleepInsights { durationConsistency(valid)?.let { consistencyChip(it) }?.let { chips.add(it) } val avgText = SleepFormat.duration(avgMin) - val coveragePhrase = "${valid.size} of $expectedNights nights tracked" + val coveragePhrase = L10n.get(R.string.sleep_tracked_of, valid.size, expectedNights) return when (range) { SleepRangeKey.WEEK -> { val incomplete = valid.size < expectedNights val missing = expectedNights - valid.size - val missingWord = if (missing == 1) "night" else "nights" val body = if (incomplete) - "You averaged $avgText across ${valid.size} tracked nights this week. That's a useful read, but $missing missing $missingWord mean the trend is still incomplete." - else "You averaged $avgText across the full week. Your nights were tracked consistently, so this is a dependable picture of where your sleep sits right now." - SleepCoach("Your week at a glance", body, chips.take(3)) + L10n.plural(R.plurals.sc_week_incomplete, valid.size, avgText, valid.size, L10n.plural(R.plurals.sc_missing_nights, missing, missing)) + else L10n.get(R.string.sc_week_full, avgText) + SleepCoach(L10n.get(R.string.sc_week_title), body, chips.take(3)) } SleepRangeKey.MONTH -> { val sparse = valid.size.toDouble() < expectedNights.toDouble() * 0.5 val body = if (sparse) - "Your monthly average is $avgText, but coverage is low ($coveragePhrase), so I'd treat that number cautiously. More nights tracked will sharpen the trend." - else "Your monthly average is $avgText across $coveragePhrase. The biggest lever is consistency — a few short nights move this number more than any single great one." - SleepCoach("Your month in sleep", body, chips.take(3)) + L10n.get(R.string.sc_month_sparse, avgText, coveragePhrase) + else L10n.get(R.string.sc_month, avgText, coveragePhrase) + SleepCoach(L10n.get(R.string.sc_month_title), body, chips.take(3)) } else -> SleepCoach( - "Your long-term sleep trend", - "Across the year your tracked average is $avgText over ${valid.size} nights. The long-term trend is still forming — as more months fill in, I'll be able to compare seasonal changes and consistency.", + L10n.get(R.string.sc_year_title), + L10n.plural(R.plurals.sc_year, valid.size, avgText, valid.size), chips.take(3), ) } } - private fun nightsTrackedChip(valid: Int, expected: Int) = "$valid of $expected tracked" + private fun nightsTrackedChip(valid: Int, expected: Int) = L10n.get(R.string.sc_chip_tracked, valid, expected) private fun goalDeltaChip(avgMin: Int, goalMin: Int?): String? { if (goalMin == null) return null val delta = avgMin - goalMin - if (abs(delta) <= 20) return "On target" - return if (delta < 0) "Below goal" else "Above goal" + if (abs(delta) <= 20) return L10n.get(R.string.sc_chip_on_target) + return if (delta < 0) L10n.get(R.string.sc_chip_below_goal) else L10n.get(R.string.sc_chip_above_goal) } private fun consistencyChip(sd: Double): String? = when { - sd <= 40 -> "Consistent" - sd >= 80 -> "Variable nights" + sd <= 40 -> L10n.get(R.string.sc_chip_consistent) + sd >= 80 -> L10n.get(R.string.sc_chip_variable) else -> null } // ── No-data states ─────────────────────────────────────────────────── fun noDataState(range: SleepRangeKey): SleepNoDataState = when (range) { - SleepRangeKey.DAY -> SleepNoDataState("Last Sleep", "No sleep captured last night", - "Wear your ring overnight so PulseLoop can track your next night.") - SleepRangeKey.WEEK -> SleepNoDataState("Weekly Sleep", "Not enough weekly data", - "Wear your ring overnight for a few nights to build a weekly view.") - SleepRangeKey.MONTH -> SleepNoDataState("Monthly Sleep", "Not enough monthly data", - "Track more nights this month to see a monthly average.") - SleepRangeKey.YEAR -> SleepNoDataState("Yearly Sleep", "Not enough yearly data", - "Long-term insights appear as more nights are tracked.") + SleepRangeKey.DAY -> SleepNoDataState(L10n.get(R.string.sleep_last), L10n.get(R.string.nd_day_title), + L10n.get(R.string.nd_day)) + SleepRangeKey.WEEK -> SleepNoDataState(L10n.get(R.string.sleep_weekly), L10n.get(R.string.nd_week_title), + L10n.get(R.string.nd_week)) + SleepRangeKey.MONTH -> SleepNoDataState(L10n.get(R.string.sleep_monthly), L10n.get(R.string.nd_month_title), + L10n.get(R.string.nd_month)) + SleepRangeKey.YEAR -> SleepNoDataState(L10n.get(R.string.sleep_yearly), L10n.get(R.string.nd_year_title), + L10n.get(R.string.nd_year)) } // ── Histogram builders ─────────────────────────────────────────────── @@ -616,7 +619,7 @@ object SleepInsights { val bars = mutableListOf() var cursor = Instant.ofEpochMilli(start).atZone(ZoneId.systemDefault()).truncatedTo(ChronoUnit.DAYS) val last = Instant.ofEpochMilli(end).atZone(ZoneId.systemDefault()).truncatedTo(ChronoUnit.DAYS) - val weekdayFmt = DateTimeFormatter.ofPattern("EEEEE") + val weekdayFmt = DateTimeFormatter.ofPattern("EEEEE", java.util.Locale.getDefault()) while (!cursor.isAfter(last)) { val cursorMs = cursor.toInstant().toEpochMilli() @@ -641,7 +644,7 @@ object SleepInsights { val t = Instant.ofEpochMilli(it.date).atZone(ZoneId.systemDefault()) "${t.year}-${t.monthValue}" } - val monthFmt = DateTimeFormatter.ofPattern("MMM") + val monthFmt = DateTimeFormatter.ofPattern("MMM", java.util.Locale.getDefault()) val endZ = Instant.ofEpochMilli(end).atZone(ZoneId.systemDefault()) return (11 downTo 0).map { i -> val monthDate = endZ.minusMonths(i.toLong()) diff --git a/app/src/main/java/com/pulseloop/service/VitalsThresholdEngine.kt b/app/src/main/java/com/pulseloop/service/VitalsThresholdEngine.kt index b9a1f989..413f9f2d 100644 --- a/app/src/main/java/com/pulseloop/service/VitalsThresholdEngine.kt +++ b/app/src/main/java/com/pulseloop/service/VitalsThresholdEngine.kt @@ -1,5 +1,7 @@ package com.pulseloop.service +import com.pulseloop.R +import com.pulseloop.util.L10n import kotlin.math.abs import kotlin.math.roundToInt @@ -126,7 +128,7 @@ object VitalsThresholdEngine { val worse = ZoneSeverity.worst(sysZone.severity, diaZone.severity) // Pick whichever axis produced the worse severity for the label/explanation. val primary = if (worse == sysZone.severity) sysZone else diaZone - val confidence = if (hasCuffReference) "Estimated" else "Estimated · calibrate with a cuff" + val confidence = if (hasCuffReference) L10n.get(R.string.badge_estimated) else L10n.get(R.string.zc_estimated_calibrate) return MetricInterpretation( primaryZone = primary, allZones = systolicZones(), @@ -182,40 +184,40 @@ object VitalsThresholdEngine { val lowColor: VitalColorToken when { athlete -> { - lowLabel = "Athletic" + lowLabel = L10n.get(R.string.zl_athletic) lowSeverity = ZoneSeverity.OPTIMAL lowColor = VitalColorToken.MetricAccent(MetricKind.HEART_RATE) - lowExplanation = "A low resting heart rate is common with high fitness." + lowExplanation = L10n.get(R.string.ze_hr_athletic_low) } profile.usesBetaBlockers -> { - lowLabel = "Low (medication)" + lowLabel = L10n.get(R.string.zl_low_medication) lowSeverity = ZoneSeverity.NORMAL lowColor = VitalColorToken.Blue - lowExplanation = "Beta-blockers lower heart rate; this is expected on that medication." + lowExplanation = L10n.get(R.string.ze_hr_betablockers) } else -> { - lowLabel = "Low" + lowLabel = L10n.get(R.string.zl_low) lowSeverity = ZoneSeverity.WATCH lowColor = VitalColorToken.Blue - lowExplanation = "Below the typical resting range. Often fine, but worth noting if you feel faint." + lowExplanation = L10n.get(R.string.ze_hr_low) } } val zones = mutableListOf() zones.add(MetricZone("hr.low", lowLabel, null, lowUpper, lowSeverity, lowColor, lowExplanation)) if (athlete && athleticUpper != null) { - zones.add(MetricZone("hr.athletic", "Athletic", lowUpper, athleticUpper, ZoneSeverity.OPTIMAL, VitalColorToken.Mint, "Athletic resting range.")) + zones.add(MetricZone("hr.athletic", L10n.get(R.string.zl_athletic), lowUpper, athleticUpper, ZoneSeverity.OPTIMAL, VitalColorToken.Mint, L10n.get(R.string.ze_hr_athletic))) } val normalLow = if (athlete && athleticUpper != null) athleticUpper else lowUpper - zones.add(MetricZone("hr.normal", "Normal", normalLow, elevatedStart, + zones.add(MetricZone("hr.normal", L10n.get(R.string.zl_normal), normalLow, elevatedStart, ZoneSeverity.NORMAL, VitalColorToken.MetricAccent(MetricKind.HEART_RATE), - "A typical resting heart rate for adults.")) - zones.add(MetricZone("hr.elevated", "Elevated", elevatedStart, highStart, + L10n.get(R.string.ze_hr_normal))) + zones.add(MetricZone("hr.elevated", L10n.get(R.string.zl_elevated), elevatedStart, highStart, ZoneSeverity.WATCH, VitalColorToken.Amber, - "Above the typical resting range. Activity, caffeine, or stress can raise it.")) - zones.add(MetricZone("hr.high", "High", highStart, null, + L10n.get(R.string.ze_hr_elevated))) + zones.add(MetricZone("hr.high", L10n.get(R.string.zl_high), highStart, null, ZoneSeverity.HIGH, VitalColorToken.BrightRed, - "A high resting heart rate. Talk to a clinician if it persists at rest.")) + L10n.get(R.string.ze_hr_high))) return zones } @@ -229,27 +231,27 @@ object VitalsThresholdEngine { // and note it, rather than alarming on a normal-for-altitude reading. val highAltitude = (profile.altitudeMeters ?: 0.0) > 2000 val watchUpper = if (highAltitude || profile.hasKnownLungCondition) 93.0 else 95.0 - val altitudeNote = if (highAltitude) " Expected values are lower at altitude." else "" + val altitudeNote = if (highAltitude) " " + L10n.get(R.string.ze_spo2_altitude) else "" return listOf( MetricZone( - "spo2.critical", "Very low", null, 89.0, + "spo2.critical", L10n.get(R.string.zl_very_low), null, 89.0, ZoneSeverity.CRITICAL, VitalColorToken.Red, - "An urgently low oxygen reading. Seek care if you also feel unwell.$altitudeNote", + L10n.get(R.string.ze_spo2_critical) + altitudeNote, ), MetricZone( - "spo2.high", "Low", 89.0, 93.0, + "spo2.high", L10n.get(R.string.zl_low), 89.0, 93.0, ZoneSeverity.HIGH, VitalColorToken.Orange, - "Low blood oxygen. Re-measure when still; talk to a clinician if persistent.$altitudeNote", + L10n.get(R.string.ze_spo2_low) + altitudeNote, ), MetricZone( - "spo2.watch", "Slightly low", 93.0, watchUpper, + "spo2.watch", L10n.get(R.string.zl_slightly_low), 93.0, watchUpper, ZoneSeverity.WATCH, VitalColorToken.Amber, - "Slightly below the typical range.$altitudeNote", + L10n.get(R.string.ze_spo2_watch) + altitudeNote, ), MetricZone( - "spo2.normal", "Normal", watchUpper, null, + "spo2.normal", L10n.get(R.string.zl_normal), watchUpper, null, ZoneSeverity.NORMAL, VitalColorToken.Cyan, - "A normal blood-oxygen level is 95–100%.$altitudeNote", + L10n.get(R.string.ze_spo2_normal) + altitudeNote, ), ) } @@ -261,9 +263,9 @@ object VitalsThresholdEngine { // No baseline yet → show the metric's own purple accent (not a gray "unknown" color). return listOf( MetricZone( - "hrv.building", "Building baseline", null, null, + "hrv.building", L10n.get(R.string.zl_building_baseline), null, null, ZoneSeverity.UNKNOWN, VitalColorToken.MetricAccent(MetricKind.HRV), - "HRV is personal. Wear your ring for about a week to learn your baseline.", + L10n.get(R.string.ze_hrv_building), ), ) } @@ -271,24 +273,24 @@ object VitalsThresholdEngine { val sd = baseline.standardDeviation return listOf( MetricZone( - "hrv.below", "Below baseline", null, mean - sd, + "hrv.below", L10n.get(R.string.zl_below_baseline), null, mean - sd, ZoneSeverity.HIGH, VitalColorToken.Amber, - "Notably below your typical HRV — often linked to stress, poor sleep, or strain.", + L10n.get(R.string.ze_hrv_below), ), MetricZone( - "hrv.slightlyBelow", "Slightly below", mean - sd, mean - 0.5 * sd, + "hrv.slightlyBelow", L10n.get(R.string.zl_slightly_below), mean - sd, mean - 0.5 * sd, ZoneSeverity.WATCH, VitalColorToken.SoftAmber, - "A little below your usual range.", + L10n.get(R.string.ze_hrv_slightly_below), ), MetricZone( - "hrv.near", "Near baseline", mean - 0.5 * sd, mean + 0.5 * sd, + "hrv.near", L10n.get(R.string.zl_near_baseline), mean - 0.5 * sd, mean + 0.5 * sd, ZoneSeverity.NORMAL, VitalColorToken.MetricAccent(MetricKind.HRV), - "Around your personal baseline.", + L10n.get(R.string.ze_hrv_near), ), MetricZone( - "hrv.above", "Above baseline", mean + 0.5 * sd, null, + "hrv.above", L10n.get(R.string.zl_above_baseline), mean + 0.5 * sd, null, ZoneSeverity.OPTIMAL, VitalColorToken.Mint, - "Above your typical HRV — often a sign of good recovery.", + L10n.get(R.string.ze_hrv_above), ), ) } @@ -300,17 +302,20 @@ object VitalsThresholdEngine { val zone = zones[0] return MetricInterpretation( primaryZone = zone, allZones = zones, displayLabel = zone.label, - explanation = zone.explanation, confidenceLabel = "Building baseline", isEstimated = false, + explanation = zone.explanation, confidenceLabel = L10n.get(R.string.zl_building_baseline), isEstimated = false, ) } val zone = zoneContaining(value, zones) val deltaPct = if (baseline.mean > 0) (value - baseline.mean) / baseline.mean * 100 else 0.0 val delta = abs(deltaPct.roundToInt()) - val direction = if (deltaPct >= 0) "above" else "below" return MetricInterpretation( primaryZone = zone, allZones = zones, displayLabel = zone.label, explanation = zone.explanation, - confidenceLabel = if (delta == 0) "At baseline" else "$delta% $direction baseline", + confidenceLabel = when { + delta == 0 -> L10n.get(R.string.zc_at_baseline) + deltaPct >= 0 -> L10n.get(R.string.zc_above_baseline_pct, delta) + else -> L10n.get(R.string.zc_below_baseline_pct, delta) + }, isEstimated = false, ) } @@ -319,39 +324,39 @@ object VitalsThresholdEngine { private fun stressZones(): List = listOf( MetricZone( - "stress.calm", "Calm", null, 26.0, - ZoneSeverity.OPTIMAL, VitalColorToken.Mint, "Low stress score — relaxed.", + "stress.calm", L10n.get(R.string.zl_calm), null, 26.0, + ZoneSeverity.OPTIMAL, VitalColorToken.Mint, L10n.get(R.string.ze_stress_calm), ), MetricZone( - "stress.normal", "Normal", 26.0, 51.0, - ZoneSeverity.NORMAL, VitalColorToken.Cyan, "A typical daytime stress score.", + "stress.normal", L10n.get(R.string.zl_normal), 26.0, 51.0, + ZoneSeverity.NORMAL, VitalColorToken.Cyan, L10n.get(R.string.ze_stress_normal), ), MetricZone( - "stress.elevated", "Elevated", 51.0, 76.0, - ZoneSeverity.WATCH, VitalColorToken.Amber, "Elevated stress — consider a short break.", + "stress.elevated", L10n.get(R.string.zl_elevated), 51.0, 76.0, + ZoneSeverity.WATCH, VitalColorToken.Amber, L10n.get(R.string.ze_stress_elevated), ), MetricZone( - "stress.high", "High", 76.0, null, - ZoneSeverity.HIGH, VitalColorToken.Red, "High stress score. Wellness estimate, not a diagnosis.", + "stress.high", L10n.get(R.string.zl_high), 76.0, null, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_stress_high), ), ) private fun fatigueZones(): List = listOf( MetricZone( - "fatigue.fresh", "Fresh", null, 25.0, - ZoneSeverity.OPTIMAL, VitalColorToken.Mint, "Low fatigue — well recovered.", + "fatigue.fresh", L10n.get(R.string.zl_fresh), null, 25.0, + ZoneSeverity.OPTIMAL, VitalColorToken.Mint, L10n.get(R.string.ze_fatigue_fresh), ), MetricZone( - "fatigue.mild", "Mild", 25.0, 50.0, - ZoneSeverity.NORMAL, VitalColorToken.Cyan, "Mild fatigue.", + "fatigue.mild", L10n.get(R.string.zl_mild), 25.0, 50.0, + ZoneSeverity.NORMAL, VitalColorToken.Cyan, L10n.get(R.string.ze_fatigue_mild), ), MetricZone( - "fatigue.tired", "Tired", 50.0, 75.0, - ZoneSeverity.WATCH, VitalColorToken.Amber, "Tired — consider lighter activity and good sleep.", + "fatigue.tired", L10n.get(R.string.zl_tired), 50.0, 75.0, + ZoneSeverity.WATCH, VitalColorToken.Amber, L10n.get(R.string.ze_fatigue_tired), ), MetricZone( - "fatigue.high", "High fatigue", 75.0, null, - ZoneSeverity.HIGH, VitalColorToken.Red, "High fatigue score. Wellness estimate from the ring.", + "fatigue.high", L10n.get(R.string.zl_high_fatigue), 75.0, null, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_fatigue_high), ), ) @@ -365,52 +370,52 @@ object VitalsThresholdEngine { private fun systolicZones(): List = listOf( MetricZone( - "bp.sys.low", "Low", null, 90.0, - ZoneSeverity.WATCH, VitalColorToken.Blue, "Low systolic pressure (below 90).", + "bp.sys.low", L10n.get(R.string.zl_low), null, 90.0, + ZoneSeverity.WATCH, VitalColorToken.Blue, L10n.get(R.string.ze_bp_sys_low), ), MetricZone( - "bp.sys.normal", "Normal", 90.0, 120.0, - ZoneSeverity.NORMAL, VitalColorToken.Mint, "Normal blood pressure is below 120/80.", + "bp.sys.normal", L10n.get(R.string.zl_normal), 90.0, 120.0, + ZoneSeverity.NORMAL, VitalColorToken.Mint, L10n.get(R.string.ze_bp_sys_normal), ), MetricZone( - "bp.sys.elevated", "Elevated", 120.0, 130.0, - ZoneSeverity.WATCH, VitalColorToken.Amber, "Elevated systolic (120–129).", + "bp.sys.elevated", L10n.get(R.string.zl_elevated), 120.0, 130.0, + ZoneSeverity.WATCH, VitalColorToken.Amber, L10n.get(R.string.ze_bp_sys_elevated), ), MetricZone( - "bp.sys.stage1", "Stage 1", 130.0, 140.0, - ZoneSeverity.HIGH, VitalColorToken.Orange, "Stage 1 hypertension range (systolic 130–139).", + "bp.sys.stage1", L10n.get(R.string.zl_stage1), 130.0, 140.0, + ZoneSeverity.HIGH, VitalColorToken.Orange, L10n.get(R.string.ze_bp_sys_stage1), ), MetricZone( - "bp.sys.stage2", "Stage 2", 140.0, 180.0, - ZoneSeverity.HIGH, VitalColorToken.Red, "Stage 2 hypertension range (systolic ≥140).", + "bp.sys.stage2", L10n.get(R.string.zl_stage2), 140.0, 180.0, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_bp_sys_stage2), ), MetricZone( - "bp.sys.crisis", "Severe", 180.0, null, - ZoneSeverity.CRITICAL, VitalColorToken.Red, "Severe range (systolic >180). Seek care if confirmed.", + "bp.sys.crisis", L10n.get(R.string.zl_severe), 180.0, null, + ZoneSeverity.CRITICAL, VitalColorToken.Red, L10n.get(R.string.ze_bp_sys_crisis), ), ) private fun diastolicZones(): List = listOf( MetricZone( - "bp.dia.low", "Low", null, 60.0, - ZoneSeverity.WATCH, VitalColorToken.Blue, "Low diastolic pressure (below 60).", + "bp.dia.low", L10n.get(R.string.zl_low), null, 60.0, + ZoneSeverity.WATCH, VitalColorToken.Blue, L10n.get(R.string.ze_bp_dia_low), ), MetricZone( - "bp.dia.normal", "Normal", 60.0, 80.0, - ZoneSeverity.NORMAL, VitalColorToken.Mint, "Normal diastolic is below 80.", + "bp.dia.normal", L10n.get(R.string.zl_normal), 60.0, 80.0, + ZoneSeverity.NORMAL, VitalColorToken.Mint, L10n.get(R.string.ze_bp_dia_normal), ), // Note: there is no diastolic "Elevated" category — 80–89 is already Stage 1 by AHA. MetricZone( - "bp.dia.stage1", "Stage 1", 80.0, 90.0, - ZoneSeverity.HIGH, VitalColorToken.Orange, "Stage 1 hypertension range (diastolic 80–89).", + "bp.dia.stage1", L10n.get(R.string.zl_stage1), 80.0, 90.0, + ZoneSeverity.HIGH, VitalColorToken.Orange, L10n.get(R.string.ze_bp_dia_stage1), ), MetricZone( - "bp.dia.stage2", "Stage 2", 90.0, 120.0, - ZoneSeverity.HIGH, VitalColorToken.Red, "Stage 2 hypertension range (diastolic ≥90).", + "bp.dia.stage2", L10n.get(R.string.zl_stage2), 90.0, 120.0, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_bp_dia_stage2), ), MetricZone( - "bp.dia.crisis", "Severe", 120.0, null, - ZoneSeverity.CRITICAL, VitalColorToken.Red, "Severe range (diastolic >120). Seek care if confirmed.", + "bp.dia.crisis", L10n.get(R.string.zl_severe), 120.0, null, + ZoneSeverity.CRITICAL, VitalColorToken.Red, L10n.get(R.string.ze_bp_dia_crisis), ), ) @@ -419,58 +424,58 @@ object VitalsThresholdEngine { private fun glucoseZones(context: MeasurementContext): List = when (context) { MeasurementContext.FASTING -> listOf( MetricZone( - "glucose.low", "Low", null, 70.0, - ZoneSeverity.HIGH, VitalColorToken.Red, "Below 70 mg/dL is low.", + "glucose.low", L10n.get(R.string.zl_low), null, 70.0, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_glu_low), ), MetricZone( - "glucose.normal", "Normal", 70.0, 100.0, - ZoneSeverity.NORMAL, VitalColorToken.Mint, "Fasting normal is up to 99 mg/dL.", + "glucose.normal", L10n.get(R.string.zl_normal), 70.0, 100.0, + ZoneSeverity.NORMAL, VitalColorToken.Mint, L10n.get(R.string.ze_glu_fasting_normal), ), MetricZone( - "glucose.elevated", "Elevated", 100.0, 126.0, - ZoneSeverity.WATCH, VitalColorToken.Amber, "Fasting 100–125 is above the typical range.", + "glucose.elevated", L10n.get(R.string.zl_elevated), 100.0, 126.0, + ZoneSeverity.WATCH, VitalColorToken.Amber, L10n.get(R.string.ze_glu_fasting_elevated), ), MetricZone( - "glucose.high", "High", 126.0, null, - ZoneSeverity.HIGH, VitalColorToken.Red, "Fasting ≥126. Talk to a clinician if confirmed by a meter.", + "glucose.high", L10n.get(R.string.zl_high), 126.0, null, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_glu_fasting_high), ), ) MeasurementContext.POST_MEAL -> listOf( MetricZone( - "glucose.low", "Low", null, 70.0, - ZoneSeverity.HIGH, VitalColorToken.Red, "Below 70 mg/dL is low.", + "glucose.low", L10n.get(R.string.zl_low), null, 70.0, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_glu_low), ), MetricZone( - "glucose.normal", "Normal", 70.0, 140.0, - ZoneSeverity.NORMAL, VitalColorToken.Mint, "Two-hour post-meal normal is up to 140 mg/dL.", + "glucose.normal", L10n.get(R.string.zl_normal), 70.0, 140.0, + ZoneSeverity.NORMAL, VitalColorToken.Mint, L10n.get(R.string.ze_glu_post_normal), ), MetricZone( - "glucose.elevated", "Elevated", 140.0, 200.0, - ZoneSeverity.WATCH, VitalColorToken.Amber, "Two-hour 140–199 is above the typical range.", + "glucose.elevated", L10n.get(R.string.zl_elevated), 140.0, 200.0, + ZoneSeverity.WATCH, VitalColorToken.Amber, L10n.get(R.string.ze_glu_post_elevated), ), MetricZone( - "glucose.high", "High", 200.0, null, - ZoneSeverity.HIGH, VitalColorToken.Red, "Two-hour ≥200. Confirm with a meter and a clinician.", + "glucose.high", L10n.get(R.string.zl_high), 200.0, null, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_glu_post_high), ), ) else -> // Unknown / random context: conservative labels, NO "prediabetes"/"diabetes" wording. listOf( MetricZone( - "glucose.low", "Low", null, 70.0, - ZoneSeverity.HIGH, VitalColorToken.Red, "Below 70 mg/dL is low.", + "glucose.low", L10n.get(R.string.zl_low), null, 70.0, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_glu_low), ), MetricZone( - "glucose.typical", "Typical", 70.0, 140.0, - ZoneSeverity.NORMAL, VitalColorToken.Mint, "Within a typical range for a non-fasting reading.", + "glucose.typical", L10n.get(R.string.zl_typical), 70.0, 140.0, + ZoneSeverity.NORMAL, VitalColorToken.Mint, L10n.get(R.string.ze_glu_typical), ), MetricZone( - "glucose.elevated", "Elevated", 140.0, 200.0, - ZoneSeverity.WATCH, VitalColorToken.Amber, "Above the typical range. Context (meals) affects this.", + "glucose.elevated", L10n.get(R.string.zl_elevated), 140.0, 200.0, + ZoneSeverity.WATCH, VitalColorToken.Amber, L10n.get(R.string.ze_glu_elevated), ), MetricZone( - "glucose.veryHigh", "Very high", 200.0, null, - ZoneSeverity.HIGH, VitalColorToken.Red, "A high reading regardless of context. Confirm with a meter.", + "glucose.veryHigh", L10n.get(R.string.zl_very_high), 200.0, null, + ZoneSeverity.HIGH, VitalColorToken.Red, L10n.get(R.string.ze_glu_very_high), ), ) } @@ -481,7 +486,7 @@ object VitalsThresholdEngine { return MetricInterpretation( primaryZone = zone, allZones = zones, displayLabel = zone.label, explanation = zone.explanation, - confidenceLabel = "Estimated — not for dosing or diagnosis", + confidenceLabel = L10n.get(R.string.zc_estimated_no_dosing), isEstimated = true, ) } @@ -493,17 +498,17 @@ object VitalsThresholdEngine { // absolute, so we keep a single soft "typical" band and flag extremes only. listOf( MetricZone( - "temp.low", "Cool", null, 31.0, - ZoneSeverity.WATCH, VitalColorToken.Blue, "Cooler than typical skin temperature.", + "temp.low", L10n.get(R.string.zl_cool), null, 31.0, + ZoneSeverity.WATCH, VitalColorToken.Blue, L10n.get(R.string.ze_temp_low), ), MetricZone( - "temp.normal", "Typical", 31.0, 36.0, + "temp.normal", L10n.get(R.string.zl_typical), 31.0, 36.0, ZoneSeverity.NORMAL, VitalColorToken.MetricAccent(MetricKind.TEMPERATURE), - "A typical skin-temperature range from the ring.", + L10n.get(R.string.ze_temp_normal), ), MetricZone( - "temp.high", "Warm", 36.0, null, - ZoneSeverity.WATCH, VitalColorToken.Amber, "Warmer than typical. Trends matter more than a single reading.", + "temp.high", L10n.get(R.string.zl_warm), 36.0, null, + ZoneSeverity.WATCH, VitalColorToken.Amber, L10n.get(R.string.ze_temp_high), ), ) diff --git a/app/src/main/java/com/pulseloop/service/VitalsZoneModel.kt b/app/src/main/java/com/pulseloop/service/VitalsZoneModel.kt index e4eceda4..51958624 100644 --- a/app/src/main/java/com/pulseloop/service/VitalsZoneModel.kt +++ b/app/src/main/java/com/pulseloop/service/VitalsZoneModel.kt @@ -1,5 +1,7 @@ package com.pulseloop.service +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.ring.MeasurementKind import kotlin.math.sqrt @@ -47,25 +49,25 @@ enum class MetricKind { val title: String get() = when (this) { - HEART_RATE -> "Heart rate" - SPO2 -> "Blood oxygen" - HRV -> "HRV" - BLOOD_PRESSURE -> "Blood pressure" - STRESS -> "Stress" - FATIGUE -> "Fatigue" - GLUCOSE -> "Blood sugar" - TEMPERATURE -> "Skin temperature" + HEART_RATE -> L10n.get(R.string.metric_heart_rate) + SPO2 -> L10n.get(R.string.metric_blood_oxygen) + HRV -> L10n.get(R.string.abbr_hrv) + BLOOD_PRESSURE -> L10n.get(R.string.metric_blood_pressure) + STRESS -> L10n.get(R.string.metric_stress) + FATIGUE -> L10n.get(R.string.metric_fatigue) + GLUCOSE -> L10n.get(R.string.metric_blood_sugar) + TEMPERATURE -> L10n.get(R.string.metric_skin_temperature) } /** Display unit shown after the big value. Empty for unit-less device scores. */ val unit: String get() = when (this) { - HEART_RATE -> "bpm" + HEART_RATE -> L10n.get(R.string.unit_bpm) SPO2 -> "%" - HRV -> "ms" - BLOOD_PRESSURE -> "mmHg" + HRV -> L10n.get(R.string.unit_ms) + BLOOD_PRESSURE -> L10n.get(R.string.unit_mmhg) STRESS, FATIGUE -> "" - GLUCOSE -> "mg/dL" + GLUCOSE -> L10n.get(R.string.unit_mgdl) TEMPERATURE -> "°C" } @@ -174,9 +176,9 @@ enum class BiologicalSex { } } -enum class GlucoseUnit(val label: String) { - MGDL("mg/dL"), - MMOL("mmol/L"); +enum class GlucoseUnit(@androidx.annotation.StringRes val labelRes: Int) { + MGDL(com.pulseloop.R.string.unit_mgdl), + MMOL(com.pulseloop.R.string.unit_mmol); /** Convert a canonical mg/dL value into this display unit (mmol/L = mg/dL ÷ 18.0182). */ fun fromMgdl(mgdl: Double): Double = if (this == MMOL) mgdl / MGDL_PER_MMOL else mgdl diff --git a/app/src/main/java/com/pulseloop/service/WorkoutForegroundService.kt b/app/src/main/java/com/pulseloop/service/WorkoutForegroundService.kt index 5717382a..a7045cdc 100644 --- a/app/src/main/java/com/pulseloop/service/WorkoutForegroundService.kt +++ b/app/src/main/java/com/pulseloop/service/WorkoutForegroundService.kt @@ -1,5 +1,6 @@ package com.pulseloop.service +import com.pulseloop.util.L10n import android.app.* import android.content.Context import android.content.Intent @@ -38,7 +39,7 @@ class WorkoutForegroundService : Service() { private var elapsedSec = 0 private var distanceM = 0.0 private var heartRate: Int? = null - private var activityName = "Workout" + private var activityName = L10n.get(R.string.workout_generic) override fun onCreate() { super.onCreate() @@ -135,27 +136,27 @@ class WorkoutForegroundService : Service() { val elapsed = formatElapsed(elapsedSec) val units = com.pulseloop.settings.ApiKeyStore(this).resolvedUnitSystem val dist = formatDistance(distanceM, units) ?: "—" - val hr = heartRate?.let { "$it bpm" } ?: "--" + val hr = heartRate?.let { L10n.get(R.string.value_bpm, it) } ?: "--" val pauseResumeAction = if (status == "paused") { - NotificationCompat.Action.Builder(android.R.drawable.ic_media_play, "Resume", + NotificationCompat.Action.Builder(android.R.drawable.ic_media_play, L10n.get(R.string.record_resume), PendingIntent.getService(this, 3, Intent(this, WorkoutForegroundService::class.java).apply { action = ACTION_RESUME }, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)).build() } else { - NotificationCompat.Action.Builder(android.R.drawable.ic_media_pause, "Pause", + NotificationCompat.Action.Builder(android.R.drawable.ic_media_pause, L10n.get(R.string.record_pause), PendingIntent.getService(this, 2, Intent(this, WorkoutForegroundService::class.java).apply { action = ACTION_PAUSE }, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)).build() } return NotificationCompat.Builder(this, CHANNEL_ID) - .setContentTitle("$activityName · $status") + .setContentTitle("$activityName · " + if (status == "paused") L10n.get(R.string.workout_status_paused) else L10n.get(R.string.workout_status_recording)) .setContentText("$elapsed · $dist · $hr") .setSmallIcon(android.R.drawable.ic_dialog_map) .setOngoing(true) .setPriority(NotificationCompat.PRIORITY_LOW) .setContentIntent(contentIntent(sessionId = null)) .addAction(pauseResumeAction) - .addAction(NotificationCompat.Action.Builder(android.R.drawable.ic_media_play, "Finish", + .addAction(NotificationCompat.Action.Builder(android.R.drawable.ic_media_play, L10n.get(R.string.record_finish), PendingIntent.getService(this, 1, Intent(this, WorkoutForegroundService::class.java).apply { action = ACTION_STOP }, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)).build()) .build() @@ -172,11 +173,11 @@ class WorkoutForegroundService : Service() { val units = com.pulseloop.settings.ApiKeyStore(this).resolvedUnitSystem val parts = mutableListOf(formatElapsed(elapsedSeconds)) formatDistance(distanceMeters, units)?.let { parts += it } - calories?.let { parts += "${it.toInt()} cal" } - avgHeartRate?.let { parts += "avg ${it.toInt()} bpm" } + calories?.let { parts += L10n.get(R.string.value_cal, it.toInt()) } + avgHeartRate?.let { parts += L10n.get(R.string.activity_bpm_avg, it.toInt()) } return NotificationCompat.Builder(this, CHANNEL_ID) - .setContentTitle("$name complete") + .setContentTitle(L10n.get(R.string.workout_complete_title, name)) .setContentText(parts.joinToString(" · ")) .setSmallIcon(android.R.drawable.ic_dialog_map) .setOngoing(false) @@ -215,8 +216,8 @@ class WorkoutForegroundService : Service() { private fun createChannel() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val channel = NotificationChannel( - CHANNEL_ID, "Workout Live", NotificationManager.IMPORTANCE_LOW - ).apply { description = "Live workout tracking" } + CHANNEL_ID, L10n.get(R.string.channel_workout), NotificationManager.IMPORTANCE_LOW + ).apply { description = L10n.get(R.string.channel_workout_desc) } val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager nm.createNotificationChannel(channel) } diff --git a/app/src/main/java/com/pulseloop/settings/UnitSystem.kt b/app/src/main/java/com/pulseloop/settings/UnitSystem.kt index 746ffe4d..bea52800 100644 --- a/app/src/main/java/com/pulseloop/settings/UnitSystem.kt +++ b/app/src/main/java/com/pulseloop/settings/UnitSystem.kt @@ -1,5 +1,7 @@ package com.pulseloop.settings +import com.pulseloop.R +import com.pulseloop.util.L10n import java.util.Locale /** @@ -29,8 +31,8 @@ object UnitConverter { } fun distanceUnit(system: UnitSystem): String = when (system) { - UnitSystem.METRIC -> "km" - UnitSystem.IMPERIAL -> "mi" + UnitSystem.METRIC -> L10n.get(R.string.unit_km) + UnitSystem.IMPERIAL -> L10n.get(R.string.unit_mi) } fun weight(kg: Double, system: UnitSystem): Double = when (system) { @@ -39,12 +41,12 @@ object UnitConverter { } fun weightUnit(system: UnitSystem): String = when (system) { - UnitSystem.METRIC -> "kg" - UnitSystem.IMPERIAL -> "lbs" + UnitSystem.METRIC -> L10n.get(R.string.unit_kg) + UnitSystem.IMPERIAL -> L10n.get(R.string.unit_lbs) } fun height(cm: Double, system: UnitSystem): String = when (system) { - UnitSystem.METRIC -> "%.0f cm".format(cm) + UnitSystem.METRIC -> L10n.get(R.string.value_cm_s, "%.0f".format(cm)) UnitSystem.IMPERIAL -> { val totalInches = cm / 2.54 val feet = (totalInches / 12).toInt() diff --git a/app/src/main/java/com/pulseloop/strava/StravaUploader.kt b/app/src/main/java/com/pulseloop/strava/StravaUploader.kt index 2a77ba3e..c178c34f 100644 --- a/app/src/main/java/com/pulseloop/strava/StravaUploader.kt +++ b/app/src/main/java/com/pulseloop/strava/StravaUploader.kt @@ -1,5 +1,7 @@ package com.pulseloop.strava +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.data.PulseLoopDatabase import com.pulseloop.data.entity.ActivitySessionEntity import com.pulseloop.ring.MeasurementKind @@ -34,7 +36,7 @@ object StravaUploader { db: PulseLoopDatabase, tokenStore: StravaTokenStore, ): Result { - val tokens = tokenStore.get() ?: return Result.Failure("Not connected to Strava.") + val tokens = tokenStore.get() ?: return Result.Failure(L10n.get(R.string.sv_not_connected)) val name = activityName(session) val gpsPoints = db.activityGpsPointDao().forSession(session.id) @@ -90,22 +92,22 @@ object StravaUploader { val response = StravaAuth.authenticatedRequest(tokens, tokenStore, "POST", "$API_BASE/uploads", body) val respBody = response.body?.string().orEmpty() - if (response.code == 429) return Result.Failure("Strava rate limit reached. Try again later.") + if (response.code == 429) return Result.Failure(L10n.get(R.string.sv_rate_limit)) if (response.code == 409) { val dupId = parseDuplicate(respBody) return if (dupId != null) { fixSportType(dupId, session.type, tokens, tokenStore) Result.Success(dupId) } else { - Result.Failure("Already on Strava.") + Result.Failure(L10n.get(R.string.sv_already)) } } if (!response.isSuccessful) { - return Result.Failure("Strava upload failed (HTTP ${response.code}): ${respBody.take(200)}") + return Result.Failure(L10n.get(R.string.sv_upload_failed, response.code, respBody.take(200))) } val initial = runCatching { json.decodeFromString(respBody) }.getOrNull() - ?: return Result.Failure("Unexpected response from Strava.") + ?: return Result.Failure(L10n.get(R.string.sv_unexpected)) return when (val outcome = pollUpload(initial, tokens, tokenStore)) { is Result.Success -> { @@ -130,7 +132,7 @@ object StravaUploader { while (true) { terminalResult(status)?.let { return it } if (++attempts > MAX_POLL_ATTEMPTS) { - return Result.Failure("Timed out waiting for Strava to process the upload.") + return Result.Failure(L10n.get(R.string.sv_timeout)) } kotlinx.coroutines.delay(POLL_INTERVAL_MS) val response = StravaAuth.authenticatedRequest( @@ -147,9 +149,9 @@ object StravaUploader { if (!error.isNullOrEmpty()) { if (error.contains("duplicate", ignoreCase = true)) { val dupId = parseDuplicate(error) - return if (dupId != null) Result.Success(dupId) else Result.Failure("Already on Strava.") + return if (dupId != null) Result.Success(dupId) else Result.Failure(L10n.get(R.string.sv_already)) } - return Result.Failure("Strava could not process the upload: $error") + return Result.Failure(L10n.get(R.string.sv_process_failed, error)) } return status.activity_id?.let { Result.Success(it) } } @@ -177,10 +179,10 @@ object StravaUploader { val response = StravaAuth.authenticatedRequest(tokens, tokenStore, "POST", "$API_BASE/activities", form) val body = response.body?.string().orEmpty() if (!response.isSuccessful) { - return Result.Failure("Strava rejected the activity (HTTP ${response.code}): ${body.take(200)}") + return Result.Failure(L10n.get(R.string.sv_rejected, response.code, body.take(200))) } val summary = runCatching { json.decodeFromString(body) }.getOrNull() - ?: return Result.Failure("Unexpected response from Strava.") + ?: return Result.Failure(L10n.get(R.string.sv_unexpected)) return Result.Success(summary.id) } diff --git a/app/src/main/java/com/pulseloop/ui/PulseLoopApp.kt b/app/src/main/java/com/pulseloop/ui/PulseLoopApp.kt index 43417021..8f5d7bcc 100644 --- a/app/src/main/java/com/pulseloop/ui/PulseLoopApp.kt +++ b/app/src/main/java/com/pulseloop/ui/PulseLoopApp.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui +import com.pulseloop.R +import com.pulseloop.util.L10n import android.content.res.Configuration import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons @@ -310,11 +312,11 @@ fun PulseLoopApp() { } val tabs = listOf( - Tab("today", "Today", Icons.Filled.Adjust, Icons.Outlined.Adjust), - Tab("vitals", "Vitals", Icons.Filled.Favorite, Icons.Outlined.FavoriteBorder), - Tab("activity", "Activity", Icons.Filled.MonitorHeart, Icons.Outlined.MonitorHeart), - Tab("sleep", "Sleep", Icons.Filled.Bedtime, Icons.Outlined.Bedtime), - Tab("coach", "Coach", Icons.Filled.AutoAwesome, Icons.Outlined.AutoAwesome), + Tab("today", L10n.get(R.string.period_today), Icons.Filled.Adjust, Icons.Outlined.Adjust), + Tab("vitals", L10n.get(R.string.vitals_title), Icons.Filled.Favorite, Icons.Outlined.FavoriteBorder), + Tab("activity", L10n.get(R.string.tab_activity), Icons.Filled.MonitorHeart, Icons.Outlined.MonitorHeart), + Tab("sleep", L10n.get(R.string.metric_sleep), Icons.Filled.Bedtime, Icons.Outlined.Bedtime), + Tab("coach", L10n.get(R.string.tab_coach), Icons.Filled.AutoAwesome, Icons.Outlined.AutoAwesome), ) // ── Self-update: release-only. Checked on every return to foreground (ON_START also @@ -703,7 +705,7 @@ fun PulseLoopApp() { } } RecordScreen( - activityName = workoutState.activeSession?.type ?: "Workout", + activityName = workoutState.activeSession?.type ?: L10n.get(R.string.workout_generic), elapsedSeconds = workoutState.elapsedSeconds, distanceMeters = workoutState.distanceMeters, heartRate = workoutState.latestHeartRate, diff --git a/app/src/main/java/com/pulseloop/ui/components/ActivityMeta.kt b/app/src/main/java/com/pulseloop/ui/components/ActivityMeta.kt index 22c27623..11ec1556 100644 --- a/app/src/main/java/com/pulseloop/ui/components/ActivityMeta.kt +++ b/app/src/main/java/com/pulseloop/ui/components/ActivityMeta.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.components +import com.pulseloop.R +import com.pulseloop.util.L10n import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.DirectionsBike import androidx.compose.material.icons.automirrored.filled.DirectionsRun @@ -23,29 +25,29 @@ object ActivityMeta { val ORDER = listOf("walk", "run", "cycle", "gym", "squash", "sport", "yoga", "dance", "hike", "other") fun label(type: String): String = when (type) { - "walk" -> "Walking" - "run" -> "Running" - "cycle" -> "Cycling" - "gym" -> "Gym" - "squash" -> "Squash" - "sport" -> "Sport" - "yoga" -> "Yoga" - "dance" -> "Dance" - "hike" -> "Hiking" + "walk" -> L10n.get(R.string.act_walk) + "run" -> L10n.get(R.string.act_run) + "cycle" -> L10n.get(R.string.act_cycle) + "gym" -> L10n.get(R.string.act_gym) + "squash" -> L10n.get(R.string.act_squash) + "sport" -> L10n.get(R.string.act_sport) + "yoga" -> L10n.get(R.string.act_yoga) + "dance" -> L10n.get(R.string.act_dance) + "hike" -> L10n.get(R.string.act_hike) else -> type.replaceFirstChar { it.uppercase() } } fun helper(type: String): String = when (type) { - "walk" -> "Casual or brisk walking" - "run" -> "Outdoor or treadmill runs" - "cycle" -> "Road, trail, or stationary" - "gym" -> "Strength or circuit training" - "squash" -> "Court sessions" - "sport" -> "Team or racket sports" - "yoga" -> "Flow, stretch, or breathwork" - "dance" -> "Studio, cardio, or freestyle" - "hike" -> "Trails and elevation" - else -> "Anything else" + "walk" -> L10n.get(R.string.act_walk_desc) + "run" -> L10n.get(R.string.act_run_desc) + "cycle" -> L10n.get(R.string.act_cycle_desc) + "gym" -> L10n.get(R.string.act_gym_desc) + "squash" -> L10n.get(R.string.act_squash_desc) + "sport" -> L10n.get(R.string.act_sport_desc) + "yoga" -> L10n.get(R.string.act_yoga_desc) + "dance" -> L10n.get(R.string.act_dance_desc) + "hike" -> L10n.get(R.string.act_hike_desc) + else -> L10n.get(R.string.act_other_desc) } fun icon(type: String): ImageVector = when (type) { @@ -107,7 +109,7 @@ object ActivityMeta { return "%d:%02d".format(total / 60, total % 60) } - fun paceUnit(units: UnitSystem): String = if (units == UnitSystem.IMPERIAL) "/mi" else "/km" + fun paceUnit(units: UnitSystem): String = if (units == UnitSystem.IMPERIAL) L10n.get(R.string.pace_per_mi) else L10n.get(R.string.pace_per_km) /** * Average speed for cycling (iOS LivePaceTile / RecordSummaryComponents hero), or null when @@ -121,7 +123,7 @@ object ActivityMeta { fun speedParts(distanceMeters: Double?, durationSeconds: Int?, units: UnitSystem): Pair? { if (distanceMeters == null || durationSeconds == null || durationSeconds <= 0 || distanceMeters < 50) return null val mps = distanceMeters / durationSeconds - return if (units == UnitSystem.IMPERIAL) "%.1f".format(mps * 2.23694) to "MPH" - else "%.1f".format(mps * 3.6) to "KM/H" + return if (units == UnitSystem.IMPERIAL) "%.1f".format(mps * 2.23694) to L10n.get(R.string.speed_mph) + else "%.1f".format(mps * 3.6) to L10n.get(R.string.speed_kmh) } } diff --git a/app/src/main/java/com/pulseloop/ui/components/AppChrome.kt b/app/src/main/java/com/pulseloop/ui/components/AppChrome.kt index 413a0d8e..ddb98c50 100644 --- a/app/src/main/java/com/pulseloop/ui/components/AppChrome.kt +++ b/app/src/main/java/com/pulseloop/ui/components/AppChrome.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.components +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.animateFloat import androidx.compose.animation.core.infiniteRepeatable @@ -52,7 +55,7 @@ fun AppHeader( ) { Column(modifier = Modifier.weight(1f)) { Text( - "PULSELOOP", + stringResource(R.string.app_header), fontSize = 10.sp, fontWeight = FontWeight.Medium, letterSpacing = 1.2.sp, @@ -73,7 +76,7 @@ fun AppHeader( modifier = Modifier.clickable(onClick = onOpenSettings), ) IconButton(onClick = onOpenSettings) { - Icon(Icons.Outlined.Settings, "Settings", tint = PulseColors.textSecondary) + Icon(Icons.Outlined.Settings, stringResource(R.string.settings_title), tint = PulseColors.textSecondary) } } } @@ -97,11 +100,11 @@ fun ConnectionStatusPill( } val label = when (state) { RingConnectionState.CONNECTED -> - if (batteryPercent != null && batteryPercent > 0) "Connected · $batteryPercent%" else "Connected" - RingConnectionState.CONNECTING -> "Connecting…" - RingConnectionState.RECONNECTING -> "Reconnecting…" - RingConnectionState.FAILED -> "Sync failed" - else -> "Disconnected" + if (batteryPercent != null && batteryPercent > 0) stringResource(R.string.pill_connected_battery, batteryPercent) else stringResource(R.string.status_connected) + RingConnectionState.CONNECTING -> stringResource(R.string.pill_connecting) + RingConnectionState.RECONNECTING -> stringResource(R.string.pill_reconnecting) + RingConnectionState.FAILED -> stringResource(R.string.pill_sync_failed) + else -> stringResource(R.string.pill_disconnected) } val pulse by rememberInfiniteTransition(label = "pill").animateFloat( initialValue = 1f, @@ -138,10 +141,10 @@ fun ConnectionStatusPill( /** Time-of-day greeting, mirroring RootViews.swift `greetingForHour()`. */ fun greetingForHour(): String = when (Calendar.getInstance().get(Calendar.HOUR_OF_DAY)) { - in 5..11 -> "Good morning" - in 12..16 -> "Good afternoon" - in 17..21 -> "Good evening" - else -> "Good night" + in 5..11 -> L10n.get(R.string.greeting_morning) + in 12..16 -> L10n.get(R.string.greeting_afternoon) + in 17..21 -> L10n.get(R.string.greeting_evening) + else -> L10n.get(R.string.greeting_night) } /** diff --git a/app/src/main/java/com/pulseloop/ui/components/Charts.kt b/app/src/main/java/com/pulseloop/ui/components/Charts.kt index 7358a3c8..f8a752a4 100644 --- a/app/src/main/java/com/pulseloop/ui/components/Charts.kt +++ b/app/src/main/java/com/pulseloop/ui/components/Charts.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.components +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.gestures.awaitEachGesture @@ -203,12 +205,11 @@ private fun timeAxisTicks(visStart: Long, visEnd: Long, zone: ZoneId): Pair= 1440 -> "MMM d" - stepMin < 60 -> "h:mm a" - else -> "h a" + val fmt = when { + stepMin >= 1440 -> com.pulseloop.util.LocaleFormats.formatter("MMMd", "MMM d") + stepMin < 60 -> com.pulseloop.util.LocaleFormats.formatter("jmm", "h:mm a") + else -> com.pulseloop.util.LocaleFormats.formatter("j", "h a") } - val fmt = DateTimeFormatter.ofPattern(pattern, Locale.getDefault()) // Align ticks to local midnight so labels land on clean boundaries. val dayStart = Instant.ofEpochMilli(visStart).atZone(zone) .truncatedTo(ChronoUnit.DAYS).toInstant().toEpochMilli() @@ -558,7 +559,7 @@ fun TrendChart( IconButton(onClick = { zoom = 1f; windowStart = 0f }) { Icon( Icons.Filled.Refresh, - contentDescription = "Reset zoom", + contentDescription = stringResource(R.string.chart_reset_zoom), tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } diff --git a/app/src/main/java/com/pulseloop/ui/components/DeviceHeroCard.kt b/app/src/main/java/com/pulseloop/ui/components/DeviceHeroCard.kt index 83eaa7b4..7f45c225 100644 --- a/app/src/main/java/com/pulseloop/ui/components/DeviceHeroCard.kt +++ b/app/src/main/java/com/pulseloop/ui/components/DeviceHeroCard.kt @@ -1,5 +1,6 @@ package com.pulseloop.ui.components +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -143,7 +144,7 @@ fun DeviceHeroCard( } Icon( Icons.AutoMirrored.Filled.KeyboardArrowRight, - contentDescription = "Opens ring settings", + contentDescription = stringResource(R.string.hero_opens_settings), modifier = Modifier.size(20.dp), tint = PulseColors.textMuted, ) diff --git a/app/src/main/java/com/pulseloop/ui/components/DeviceHeroStatus.kt b/app/src/main/java/com/pulseloop/ui/components/DeviceHeroStatus.kt index 65f20899..0c8310b6 100644 --- a/app/src/main/java/com/pulseloop/ui/components/DeviceHeroStatus.kt +++ b/app/src/main/java/com/pulseloop/ui/components/DeviceHeroStatus.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.components +import com.pulseloop.R +import com.pulseloop.util.L10n import androidx.compose.ui.graphics.Color import com.pulseloop.ring.RingConnectionState import com.pulseloop.ui.theme.PulseColors @@ -28,10 +30,10 @@ data class DeviceHeroStatus( val actionTitle: String get() = when (action) { - Action.DISCONNECT -> "Disconnect" - Action.CONNECT -> "Connect" - Action.SET_UP -> "Set up a ring" - Action.PENDING -> "Connecting…" + Action.DISCONNECT -> L10n.get(R.string.wearable_disconnect) + Action.CONNECT -> L10n.get(R.string.hero_connect) + Action.SET_UP -> L10n.get(R.string.hero_set_up) + Action.PENDING -> L10n.get(R.string.pill_connecting) } /** The action button is inert while a single connection attempt is in flight, so a tap @@ -53,35 +55,35 @@ data class DeviceHeroStatus( lastSyncAt: Long?, now: Long, ): DeviceHeroStatus { - val title = connectedName ?: knownName ?: "No ring connected" + val title = connectedName ?: knownName ?: L10n.get(R.string.hero_no_ring) val statusLine: String val statusTint: Color when (state) { RingConnectionState.CONNECTED -> { - statusLine = "Connected"; statusTint = PulseColors.success + statusLine = L10n.get(R.string.status_connected); statusTint = PulseColors.success } RingConnectionState.CONNECTING -> { - statusLine = "Connecting…"; statusTint = PulseColors.warning + statusLine = L10n.get(R.string.pill_connecting); statusTint = PulseColors.warning } RingConnectionState.RECONNECTING -> { - statusLine = "Reconnecting…"; statusTint = PulseColors.warning + statusLine = L10n.get(R.string.pill_reconnecting); statusTint = PulseColors.warning } RingConnectionState.SCANNING -> { - statusLine = "Searching…"; statusTint = PulseColors.warning + statusLine = L10n.get(R.string.hero_searching); statusTint = PulseColors.warning } RingConnectionState.FAILED -> { - statusLine = "Connection failed"; statusTint = PulseColors.danger + statusLine = L10n.get(R.string.hero_connection_failed); statusTint = PulseColors.danger } RingConnectionState.IDLE, RingConnectionState.DISCONNECTED -> { - statusLine = if (knownName == null) "No ring paired" else "Disconnected" + statusLine = if (knownName == null) L10n.get(R.string.wearable_none_paired) else L10n.get(R.string.pill_disconnected) statusTint = PulseColors.textSecondary } } val batteryText = batteryPercent?.let { "${it.coerceIn(0, 100)}%" } - val syncText = lastSyncAt?.let { "Synced ${relativeShort(it, now)}" } + val syncText = lastSyncAt?.let { L10n.get(R.string.hero_synced, relativeShort(it, now)) } val action = when (state) { RingConnectionState.CONNECTED, @@ -103,10 +105,10 @@ data class DeviceHeroStatus( fun relativeShort(fromMillis: Long, nowMillis: Long): String { val seconds = ((nowMillis - fromMillis) / 1000).coerceAtLeast(0) return when { - seconds < 60 -> "just now" - seconds < 3_600 -> "${seconds / 60}m ago" - seconds < 86_400 -> "${seconds / 3_600}h ago" - else -> "${seconds / 86_400}d ago" + seconds < 60 -> L10n.get(R.string.ago_just_now) + seconds < 3_600 -> L10n.get(R.string.ago_minutes, seconds / 60) + seconds < 86_400 -> L10n.get(R.string.ago_hours, seconds / 3_600) + else -> L10n.get(R.string.ago_days, seconds / 86_400) } } } diff --git a/app/src/main/java/com/pulseloop/ui/components/MetricThresholds.kt b/app/src/main/java/com/pulseloop/ui/components/MetricThresholds.kt index 0a6168d4..59a32066 100644 --- a/app/src/main/java/com/pulseloop/ui/components/MetricThresholds.kt +++ b/app/src/main/java/com/pulseloop/ui/components/MetricThresholds.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.components +import com.pulseloop.R +import com.pulseloop.util.L10n import androidx.compose.ui.graphics.Color import com.pulseloop.ring.MeasurementKind import com.pulseloop.ui.theme.MetricColors @@ -22,8 +24,13 @@ data class MetricThresholds( val displayMax: Double, val zones: List, val higherIsBetter: Boolean? = null, // null = neutral / personal / relative - val unitLabel: String = "", + /** A unit that needs no translation ("%", "°C"). Ignored when [unitRes] is set. */ + val unitText: String = "", + /** A translatable unit, resolved on each read so it follows a language change. */ + @androidx.annotation.StringRes val unitRes: Int? = null, ) { + val unitLabel: String get() = unitRes?.let { L10n.get(it) } ?: unitText + fun zoneFor(value: Double): ThresholdZone? = zones.firstOrNull { value >= it.start && value < it.end } ?: zones.lastOrNull() } @@ -66,7 +73,7 @@ object MetricThresholdTable { private val heartRate = MetricThresholds( displayMin = 40.0, displayMax = 140.0, higherIsBetter = false, - unitLabel = "bpm", + unitRes = R.string.unit_bpm, zones = listOf( ThresholdZone("Low", 40.0, 50.0, MetricColors.ZoneLow), ThresholdZone("Good", 50.0, 90.0, MetricColors.ZoneGood), @@ -78,7 +85,7 @@ object MetricThresholdTable { private val spo2 = MetricThresholds( displayMin = 85.0, displayMax = 100.0, higherIsBetter = true, - unitLabel = "%", + unitText = "%", zones = listOf( ThresholdZone("Concerning", 85.0, 90.0, MetricColors.ZoneConcern), ThresholdZone("Low", 90.0, 95.0, MetricColors.ZoneBorderline), @@ -89,7 +96,7 @@ object MetricThresholdTable { private val stress = MetricThresholds( displayMin = 0.0, displayMax = 100.0, higherIsBetter = false, - unitLabel = "", + unitText = "", zones = listOf( ThresholdZone("Relaxed", 0.0, 30.0, MetricColors.ZoneGood), ThresholdZone("Normal", 30.0, 60.0, MetricColors.ZoneNormal), @@ -101,7 +108,7 @@ object MetricThresholdTable { private val fatigue = MetricThresholds( displayMin = 0.0, displayMax = 100.0, higherIsBetter = false, - unitLabel = "", + unitText = "", zones = listOf( ThresholdZone("Relaxed", 0.0, 30.0, MetricColors.ZoneGood), ThresholdZone("Normal", 30.0, 60.0, MetricColors.ZoneNormal), @@ -113,7 +120,7 @@ object MetricThresholdTable { private val hrv = MetricThresholds( displayMin = 0.0, displayMax = 120.0, higherIsBetter = true, - unitLabel = "ms", + unitRes = R.string.unit_ms, zones = listOf( ThresholdZone("Low", 0.0, 20.0, MetricColors.ZoneConcern), ThresholdZone("Below avg", 20.0, 50.0, MetricColors.ZoneBorderline), @@ -124,7 +131,7 @@ object MetricThresholdTable { private val skinTemp = MetricThresholds( displayMin = 28.0, displayMax = 38.0, higherIsBetter = null, // personal / relative - unitLabel = "°C", + unitText = "°C", zones = listOf( ThresholdZone("Low", 28.0, 31.0, MetricColors.ZoneLow), ThresholdZone("Normal", 31.0, 36.0, MetricColors.ZoneGood), @@ -135,7 +142,7 @@ object MetricThresholdTable { private val bloodPressure = MetricThresholds( displayMin = 80.0, displayMax = 180.0, higherIsBetter = false, - unitLabel = "mmHg", + unitRes = R.string.unit_mmhg, zones = listOf( ThresholdZone("Normal", 80.0, 120.0, MetricColors.ZoneGood), ThresholdZone("Elevated", 120.0, 130.0, MetricColors.ZoneBorderline), @@ -147,7 +154,7 @@ object MetricThresholdTable { private val bloodSugar = MetricThresholds( displayMin = 50.0, displayMax = 200.0, higherIsBetter = false, - unitLabel = "mg/dL", + unitRes = R.string.unit_mgdl, zones = listOf( ThresholdZone("Low", 50.0, 70.0, MetricColors.ZoneLow), ThresholdZone("Normal", 70.0, 100.0, MetricColors.ZoneGood), diff --git a/app/src/main/java/com/pulseloop/ui/components/TodayTiles.kt b/app/src/main/java/com/pulseloop/ui/components/TodayTiles.kt index 95ea08d0..bac88dc3 100644 --- a/app/src/main/java/com/pulseloop/ui/components/TodayTiles.kt +++ b/app/src/main/java/com/pulseloop/ui/components/TodayTiles.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.components +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -150,7 +152,7 @@ fun ActivityTile( modifier: Modifier = Modifier, onTap: () -> Unit, ) { - TodayTile(label = "Activity", color = PulseColors.steps, modifier = modifier, onTap = onTap) { + TodayTile(label = stringResource(R.string.tab_activity), color = PulseColors.steps, modifier = modifier, onTap = onTap) { Row( Modifier.weight(1f).fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, @@ -321,7 +323,7 @@ fun SleepTile( modifier: Modifier = Modifier, onTap: () -> Unit, ) { - TodayTile(label = "Sleep", color = PulseColors.sleep, modifier = modifier, onTap = onTap) { + TodayTile(label = stringResource(R.string.metric_sleep), color = PulseColors.sleep, modifier = modifier, onTap = onTap) { if (durationText != null) { Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(10.dp)) { Text( @@ -364,7 +366,7 @@ fun SleepTile( ) Spacer(Modifier.height(6.dp)) Text( - "No sleep recorded", + stringResource(R.string.sleep_none_recorded), fontSize = 13.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary, diff --git a/app/src/main/java/com/pulseloop/ui/components/WorkoutMapView.kt b/app/src/main/java/com/pulseloop/ui/components/WorkoutMapView.kt index 125906f8..e065e1e0 100644 --- a/app/src/main/java/com/pulseloop/ui/components/WorkoutMapView.kt +++ b/app/src/main/java/com/pulseloop/ui/components/WorkoutMapView.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.components +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -43,8 +46,8 @@ fun WorkoutMapView( contentAlignment = Alignment.Center, ) { Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text("No route yet", style = MaterialTheme.typography.labelMedium, color = Color.White) - Text("Move outdoors to start tracking your route.", style = MaterialTheme.typography.labelSmall, color = Color.White.copy(alpha = 0.6f)) + Text(stringResource(R.string.map_no_route), style = MaterialTheme.typography.labelMedium, color = Color.White) + Text(stringResource(R.string.map_no_route_hint), style = MaterialTheme.typography.labelSmall, color = Color.White.copy(alpha = 0.6f)) } } } else { @@ -99,7 +102,7 @@ fun WorkoutMapView( // Info overlay val accuracy = points.last().horizontalAccuracy - val infoText = if (accuracy != null) "±${accuracy.toInt()}m · ${points.size} pts" else "${points.size} pts" + val infoText = if (accuracy != null) L10n.get(R.string.map_info_accuracy, accuracy.toInt(), points.size) else L10n.get(R.string.map_info_points, points.size) Text( infoText, modifier = Modifier.align(Alignment.BottomStart).padding(8.dp), diff --git a/app/src/main/java/com/pulseloop/ui/components/ZoneLineChart.kt b/app/src/main/java/com/pulseloop/ui/components/ZoneLineChart.kt index 6f6b5052..a9e3c107 100644 --- a/app/src/main/java/com/pulseloop/ui/components/ZoneLineChart.kt +++ b/app/src/main/java/com/pulseloop/ui/components/ZoneLineChart.kt @@ -188,9 +188,7 @@ fun ZoneLineChart( private fun timeLabel(ts: Long, spanMs: Long): String { val t = Instant.ofEpochMilli(ts).atZone(ZoneId.systemDefault()) if (spanMs > 48 * 3600_000L) { - return "${t.dayOfMonth} ${t.month.name.take(3).lowercase().replaceFirstChar { it.uppercase() }}" + return t.format(com.pulseloop.util.LocaleFormats.formatter("dMMM", "d MMM")) } - val h = t.hour % 12 - val displayH = if (h == 0) 12 else h - return "$displayH ${if (t.hour < 12) "AM" else "PM"}" + return t.format(com.pulseloop.util.LocaleFormats.formatter("j", "h a")) } diff --git a/app/src/main/java/com/pulseloop/ui/dashboard/DashboardCard.kt b/app/src/main/java/com/pulseloop/ui/dashboard/DashboardCard.kt index 06eda2c4..19018e68 100644 --- a/app/src/main/java/com/pulseloop/ui/dashboard/DashboardCard.kt +++ b/app/src/main/java/com/pulseloop/ui/dashboard/DashboardCard.kt @@ -1,5 +1,9 @@ package com.pulseloop.ui.dashboard +import com.pulseloop.R +import com.pulseloop.util.L10n + + /** * Which dashboard the visibility/order preferences apply to. Today and Vitals are fully * independent scopes (a card hidden on Today can still show on Vitals). Ported from iOS @@ -29,16 +33,16 @@ enum class DashboardCard(val key: String) { /** Human label for the Hidden tray / edit-mode affordances. */ val displayName: String get() = when (this) { - ACTIVITY -> "Activity" - SLEEP -> "Sleep" - HEART_RATE -> "Heart Rate" - SPO2 -> "SpO₂" - HRV -> "HRV" - TEMPERATURE -> "Temperature" - STRESS -> "Stress" - FATIGUE -> "Fatigue" - GLUCOSE -> "Glucose" - BLOOD_PRESSURE -> "Blood Pressure" + ACTIVITY -> L10n.get(R.string.tab_activity) + SLEEP -> L10n.get(R.string.metric_sleep) + HEART_RATE -> L10n.get(R.string.metric_heart_rate) + SPO2 -> L10n.get(R.string.abbr_spo2) + HRV -> L10n.get(R.string.abbr_hrv) + TEMPERATURE -> L10n.get(R.string.metric_temperature) + STRESS -> L10n.get(R.string.metric_stress) + FATIGUE -> L10n.get(R.string.metric_fatigue) + GLUCOSE -> L10n.get(R.string.metric_glucose) + BLOOD_PRESSURE -> L10n.get(R.string.metric_blood_pressure) } companion object { 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 566a63d9..886c4600 100644 --- a/app/src/main/java/com/pulseloop/ui/dashboard/DashboardEdit.kt +++ b/app/src/main/java/com/pulseloop/ui/dashboard/DashboardEdit.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.dashboard +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -148,21 +150,21 @@ fun EditableCard( modifier = Modifier.align(Alignment.TopStart).padding(6.dp).size(28.dp), ) { IconButton(onClick = { editState.setHidden(card, true) }) { - Icon(Icons.Filled.Remove, contentDescription = "Hide ${card.displayName}", tint = MaterialTheme.colorScheme.onErrorContainer) + Icon(Icons.Filled.Remove, contentDescription = stringResource(R.string.dash_hide, card.displayName), tint = MaterialTheme.colorScheme.onErrorContainer) } } Row(Modifier.align(Alignment.TopEnd).padding(6.dp)) { if (editState.canMoveUp(card)) { Surface(shape = RoundedCornerShape(50), color = MaterialTheme.colorScheme.secondaryContainer, modifier = Modifier.size(28.dp)) { IconButton(onClick = { editState.moveUp(card) }) { - Icon(Icons.Filled.KeyboardArrowUp, contentDescription = "Move ${card.displayName} up") + Icon(Icons.Filled.KeyboardArrowUp, contentDescription = stringResource(R.string.dash_move_up, card.displayName)) } } } if (editState.canMoveDown(card)) { Surface(shape = RoundedCornerShape(50), color = MaterialTheme.colorScheme.secondaryContainer, modifier = Modifier.padding(start = 4.dp).size(28.dp)) { IconButton(onClick = { editState.moveDown(card) }) { - Icon(Icons.Filled.KeyboardArrowDown, contentDescription = "Move ${card.displayName} down") + Icon(Icons.Filled.KeyboardArrowDown, contentDescription = stringResource(R.string.dash_move_down, card.displayName)) } } } @@ -179,7 +181,7 @@ fun EditableCard( fun HiddenMetricsTray(hidden: List, onRestore: (DashboardCard) -> Unit) { if (hidden.isEmpty()) return Column(Modifier.fillMaxWidth().padding(vertical = 8.dp)) { - Text("HIDDEN", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.dash_hidden), style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant) hidden.forEach { card -> Row( Modifier.fillMaxWidth().padding(vertical = 2.dp), @@ -188,7 +190,7 @@ fun HiddenMetricsTray(hidden: List, onRestore: (DashboardCard) -> ) { Text(card.displayName, style = MaterialTheme.typography.bodyMedium) IconButton(onClick = { onRestore(card) }) { - Icon(Icons.Filled.Add, contentDescription = "Show ${card.displayName}") + Icon(Icons.Filled.Add, contentDescription = stringResource(R.string.dash_show, card.displayName)) } } } @@ -200,7 +202,7 @@ fun HiddenMetricsTray(hidden: List, onRestore: (DashboardCard) -> @Composable fun CustomizeCardsButton(onClick: () -> Unit) { TextButton(onClick = onClick) { - Text("Customize", style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.dash_customize), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) } } @@ -214,12 +216,12 @@ fun ReorderDoneBar(onDone: () -> Unit) { ) { Row(Modifier.padding(horizontal = 8.dp), verticalAlignment = Alignment.CenterVertically) { Text( - "Reorder or hide cards", + stringResource(R.string.dash_reorder_hint), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp), ) - TextButton(onClick = onDone) { Text("Done") } + TextButton(onClick = onDone) { Text(stringResource(R.string.action_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 5b2113fc..a6a8cb80 100644 --- a/app/src/main/java/com/pulseloop/ui/onboarding/Editors.kt +++ b/app/src/main/java/com/pulseloop/ui/onboarding/Editors.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.onboarding +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -63,17 +66,17 @@ fun ProfileEditor( Column(modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(16.dp)) { if (showUnits) { - SectionHeaderCaps("Units") + SectionHeaderCaps(stringResource(R.string.physiology_units)) FormCard { Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { Text( - "Measurement units", + stringResource(R.string.editor_measurement_units), fontSize = 14.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary, ) SegmentedRow( - options = listOf("Metric", "Imperial"), + options = listOf(stringResource(R.string.units_metric), stringResource(R.string.units_imperial)), selectedIndex = if (draft.units == UnitSystem.METRIC) 0 else 1, onSelect = { index -> onDraftChange(draft.copy(units = if (index == 0) UnitSystem.METRIC else UnitSystem.IMPERIAL)) @@ -83,7 +86,7 @@ fun ProfileEditor( } } - SectionHeaderCaps("Identity") + SectionHeaderCaps(stringResource(R.string.editor_identity)) FormCard { Column { Row( @@ -92,14 +95,14 @@ fun ProfileEditor( horizontalArrangement = Arrangement.spacedBy(12.dp), ) { Text( - "Name", + stringResource(R.string.editor_name), fontSize = 14.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary, ) Box(Modifier.weight(1f), contentAlignment = Alignment.CenterEnd) { if (draft.name.isEmpty()) { - Text("Optional", fontSize = 14.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.editor_optional), fontSize = 14.sp, color = PulseColors.textMuted) } BasicTextField( value = draft.name, @@ -123,13 +126,13 @@ fun ProfileEditor( verticalArrangement = Arrangement.spacedBy(8.dp), ) { Text( - "Sex", + stringResource(R.string.editor_sex), fontSize = 14.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary, ) SegmentedRow( - options = listOf("Not set", "Female", "Male", "Other"), + options = listOf(stringResource(R.string.tristate_not_set), stringResource(R.string.sex_female), stringResource(R.string.sex_male), stringResource(R.string.sex_other)), selectedIndex = when (draft.sex?.lowercase()) { "female" -> 1 "male" -> 2 @@ -151,25 +154,25 @@ fun ProfileEditor( } } - SectionHeaderCaps("Body metrics", action = { - Text("Optional", fontSize = 12.sp, color = PulseColors.textMuted) + SectionHeaderCaps(stringResource(R.string.editor_body_metrics), action = { + Text(stringResource(R.string.editor_optional), fontSize = 12.sp, color = PulseColors.textMuted) }) FormCard { Column { PickerRow( - title = "Age", - value = draft.age?.let { "$it years" }, + title = stringResource(R.string.editor_age), + value = draft.age?.let { L10n.plural(R.plurals.age_years, it, it) }, onClick = { activePicker = ProfilePickerKind.AGE }, ) HorizontalDivider(color = PulseColors.borderSubtle) PickerRow( - title = "Height", + title = stringResource(R.string.editor_height), value = heightLabel(draft), onClick = { activePicker = ProfilePickerKind.HEIGHT }, ) HorizontalDivider(color = PulseColors.borderSubtle) PickerRow( - title = "Weight", + title = stringResource(R.string.editor_weight), value = weightLabel(draft), onClick = { activePicker = ProfilePickerKind.WEIGHT }, ) @@ -179,29 +182,29 @@ fun ProfileEditor( when (activePicker) { ProfilePickerKind.AGE -> NumberPickerSheet( - title = "Age", + title = stringResource(R.string.editor_age), values = (13..100).toList(), initialValue = draft.age, fallback = 30, - label = { "$it years" }, + label = { L10n.plural(R.plurals.age_years, it, it) }, onSave = { onDraftChange(draft.copy(age = it)) }, onDismiss = { activePicker = null }, ) ProfilePickerKind.HEIGHT -> NumberPickerSheet( - title = "Height", + title = stringResource(R.string.editor_height), values = if (draft.units == UnitSystem.METRIC) (120..220).toList() else (48..87).toList(), initialValue = draft.heightDisplayValue, fallback = if (draft.units == UnitSystem.METRIC) 175 else 69, label = { value -> - if (draft.units == UnitSystem.METRIC) "$value cm" else "${value / 12}' ${value % 12}\"" + if (draft.units == UnitSystem.METRIC) L10n.get(R.string.value_cm, value) else "${value / 12}' ${value % 12}\"" }, onSave = { onDraftChange(draft.settingHeight(it)) }, onDismiss = { activePicker = null }, ) ProfilePickerKind.WEIGHT -> DecimalValueSheet( - title = "Weight", + title = stringResource(R.string.editor_weight), initialValue = draft.weightDisplayValue, - unit = if (draft.units == UnitSystem.METRIC) "kg" else "lb", + unit = if (draft.units == UnitSystem.METRIC) stringResource(R.string.unit_kg) else stringResource(R.string.unit_lb), validRange = if (draft.units == UnitSystem.METRIC) 35.0..250.0 else 77.0..551.0, onSave = { onDraftChange(draft.settingWeight(it)) }, onDismiss = { activePicker = null }, @@ -214,12 +217,12 @@ private enum class ProfilePickerKind { AGE, HEIGHT, WEIGHT } private fun heightLabel(draft: ProfileDraft): String? { val value = draft.heightDisplayValue ?: return null - return if (draft.units == UnitSystem.METRIC) "$value cm" else "${value / 12}' ${value % 12}\"" + return if (draft.units == UnitSystem.METRIC) L10n.get(R.string.value_cm, value) else "${value / 12}' ${value % 12}\"" } private fun weightLabel(draft: ProfileDraft): String? { val value = draft.weightDisplayValue ?: return null - return "${LocalizedDecimalInput.format(value)} ${if (draft.units == UnitSystem.METRIC) "kg" else "lb"}" + return "${LocalizedDecimalInput.format(value)} ${if (draft.units == UnitSystem.METRIC) L10n.get(R.string.unit_kg) else L10n.get(R.string.unit_lb)}" } @Composable @@ -291,7 +294,7 @@ private fun PickerRow(title: String, value: String?, onClick: () -> Unit) { ) Spacer(Modifier.weight(1f)) Text( - value ?: "Not set", + value ?: stringResource(R.string.tristate_not_set), fontSize = 14.sp, color = if (value == null) PulseColors.textMuted else PulseColors.textSecondary, ) @@ -335,7 +338,7 @@ private fun NumberPickerSheet( TextButton(onClick = { onSave(null) onDismiss() - }) { Text("Clear", color = PulseColors.textSecondary) } + }) { Text(stringResource(R.string.action_clear), color = PulseColors.textSecondary) } Spacer(Modifier.weight(1f)) Text( title, @@ -347,7 +350,7 @@ private fun NumberPickerSheet( TextButton(onClick = { onSave(selection) onDismiss() - }) { Text("Done", color = PulseColors.accent, fontWeight = FontWeight.SemiBold) } + }) { Text(stringResource(R.string.action_done), color = PulseColors.accent, fontWeight = FontWeight.SemiBold) } } LazyColumn( state = listState, @@ -409,7 +412,7 @@ private fun DecimalValueSheet( TextButton(onClick = { onSave(null) onDismiss() - }) { Text("Clear", color = PulseColors.textSecondary) } + }) { Text(stringResource(R.string.action_clear), color = PulseColors.textSecondary) } Spacer(Modifier.weight(1f)) Text( title, @@ -426,8 +429,8 @@ private fun DecimalValueSheet( }, ) { Text( - "Done", - color = if (parsedValue != null) PulseColors.accent else PulseColors.textMuted, + stringResource(R.string.action_done), +color = if (parsedValue != null) PulseColors.accent else PulseColors.textMuted, fontWeight = FontWeight.SemiBold, ) } @@ -438,7 +441,7 @@ private fun DecimalValueSheet( verticalArrangement = Arrangement.spacedBy(12.dp), ) { Text( - "Enter your weight in $unit", + stringResource(R.string.editor_weight_in, unit), fontSize = 14.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary, @@ -480,14 +483,14 @@ private fun DecimalValueSheet( } Text( - "You can use either a comma or a period as the decimal separator.", + stringResource(R.string.editor_decimal_hint), fontSize = 12.sp, color = PulseColors.textMuted, ) if (text.isNotEmpty() && parsedValue == null) { Text( - "Enter a weight between ${validRange.start.toInt()} and ${validRange.endInclusive.toInt()} $unit.", + stringResource(R.string.editor_weight_range, validRange.start.toInt(), validRange.endInclusive.toInt(), unit), fontSize = 12.sp, color = PulseColors.danger, ) @@ -509,13 +512,13 @@ fun GoalEditor( modifier: Modifier = Modifier, includeWeeklyWorkouts: Boolean = true, ) { - val distanceUnit = if (units == UnitSystem.METRIC) "km" else "mi" + val distanceUnit = if (units == UnitSystem.METRIC) stringResource(R.string.unit_km) else stringResource(R.string.unit_mi) val distanceRange = if (units == UnitSystem.METRIC) 1f..30f else 1f..20f Column(modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(16.dp)) { - SectionHeaderCaps("Daily targets") + SectionHeaderCaps(stringResource(R.string.editor_daily_targets)) GoalSliderCard( - title = "Steps", + title = stringResource(R.string.metric_steps), icon = Icons.AutoMirrored.Filled.DirectionsWalk, tint = PulseColors.steps, value = draft.steps.toFloat(), @@ -525,7 +528,7 @@ fun GoalEditor( onValueChange = { onDraftChange(draft.copy(steps = it)) }, ) GoalSliderCard( - title = "Distance", + title = stringResource(R.string.metric_distance), icon = Icons.Filled.Place, tint = PulseColors.distance, value = draft.distance.toFloat(), @@ -535,46 +538,46 @@ fun GoalEditor( onValueChange = { onDraftChange(draft.copy(distance = it)) }, ) GoalSliderCard( - title = "Calories", + title = stringResource(R.string.metric_calories), icon = Icons.Filled.LocalFireDepartment, tint = PulseColors.calories, value = draft.calories.toFloat(), range = 100f..2_000f, step = 50f, - label = "${draft.calories.toInt()} cal", + label = stringResource(R.string.value_cal, draft.calories.toInt()), onValueChange = { onDraftChange(draft.copy(calories = it)) }, ) GoalSliderCard( - title = "Active minutes", + title = stringResource(R.string.goal_active_minutes), icon = Icons.Filled.Timer, tint = PulseColors.readiness, value = draft.activeMinutes.toFloat(), range = 10f..180f, step = 5f, - label = "${draft.activeMinutes.toInt()} min", + label = stringResource(R.string.value_min, draft.activeMinutes.toInt()), onValueChange = { onDraftChange(draft.copy(activeMinutes = it)) }, ) GoalSliderCard( - title = "Sleep", + title = stringResource(R.string.metric_sleep), icon = Icons.Filled.Bedtime, tint = PulseColors.sleep, value = draft.sleepHours.toFloat(), range = 5f..10f, step = 0.5f, - label = "%.1f h".format(draft.sleepHours), + label = stringResource(R.string.value_hours_decimal, "%.1f".format(draft.sleepHours)), onValueChange = { onDraftChange(draft.copy(sleepHours = it)) }, ) if (includeWeeklyWorkouts) { - SectionHeaderCaps("Weekly target") + SectionHeaderCaps(stringResource(R.string.editor_weekly_target)) GoalSliderCard( - title = "Workouts", + title = stringResource(R.string.metric_workouts), icon = Icons.Filled.DirectionsRun, tint = PulseColors.success, value = draft.workouts.toFloat(), range = 1f..7f, step = 1f, - label = "${draft.workouts.toInt()} / week", + label = stringResource(R.string.value_per_week, draft.workouts.toInt()), onValueChange = { onDraftChange(draft.copy(workouts = it)) }, ) } 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 319a7894..1f1df499 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/ActivityScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/ActivityScreen.kt @@ -1,5 +1,9 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.res.stringResource import android.Manifest import android.content.pm.PackageManager import androidx.activity.compose.rememberLauncherForActivityResult @@ -59,7 +63,9 @@ import java.time.ZoneId import java.time.format.DateTimeFormatter import java.util.Calendar -private val weekLabels = listOf("M", "T", "W", "T", "F", "S", "S") +private val weekLabels get() = java.time.DayOfWeek.entries.map { + it.getDisplayName(java.time.format.TextStyle.NARROW_STANDALONE, java.util.Locale.getDefault()).uppercase() +} /** * Activity dashboard — ported from ActivityView.swift: the daily summary card (colored stats + @@ -146,7 +152,7 @@ fun ActivityScreen( item { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { Text( - "+ Record Activity", + stringResource(R.string.activity_record), fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = Color.White, @@ -168,7 +174,7 @@ fun ActivityScreen( .clickable { historyOpen = true }, contentAlignment = Alignment.Center, ) { - Icon(Icons.Filled.CalendarMonth, "Workout history", tint = PulseColors.textSecondary) + Icon(Icons.Filled.CalendarMonth, stringResource(R.string.activity_workout_history), tint = PulseColors.textSecondary) } } } @@ -193,8 +199,8 @@ fun ActivityScreen( } Spacer(Modifier.width(12.dp)) Column(Modifier.weight(1f)) { - Text("Log Past Activity", fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) - Text("Add a workout you forgot to record", fontSize = 12.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.activity_log_past), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) + Text(stringResource(R.string.activity_log_past_desc), fontSize = 12.sp, color = PulseColors.textMuted) } Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, null, tint = PulseColors.textMuted) } @@ -202,7 +208,7 @@ fun ActivityScreen( item { Text( - "TODAY", + stringResource(R.string.header_today), fontSize = 11.sp, fontWeight = FontWeight.Medium, letterSpacing = 1.4.sp, color = PulseColors.textMuted, ) @@ -219,8 +225,8 @@ fun ActivityScreen( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(4.dp), ) { - Text("No workouts recorded today", fontSize = 14.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary) - Text("Start one manually when your ring misses an activity.", fontSize = 12.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.activity_no_workouts_today), fontSize = 14.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary) + Text(stringResource(R.string.activity_no_workouts_hint), fontSize = 12.sp, color = PulseColors.textMuted) } } } else { @@ -314,7 +320,7 @@ private fun shownDayStart(state: ActivityViewModel.ActivityState): Long = /** Label for the RECORDS card's empty text: "today" as before, else the shown date. */ private fun shownDayLabel(state: ActivityViewModel.ActivityState): String { val today = com.pulseloop.util.TimeUtil.startOfTodayLocal() - return if (shownDayStart(state) == today) "today" + return if (shownDayStart(state) == today) L10n.get(R.string.period_today).lowercase() else dayHeaderLabel(shownDayStart(state)).lowercase() } @@ -329,14 +335,14 @@ private fun ActivityDayNavHeader(state: ActivityViewModel.ActivityState, viewMod verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, ) { - ActivityNavChevron(Icons.Filled.ChevronLeft, "Previous day", canOlder) { viewModel?.stepDay(older = true) } + ActivityNavChevron(Icons.Filled.ChevronLeft, stringResource(R.string.action_previous_day), canOlder) { viewModel?.stepDay(older = true) } Text( dayHeaderLabel(shownDayStart(state)), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary, modifier = Modifier.weight(1f), textAlign = androidx.compose.ui.text.style.TextAlign.Center, ) - ActivityNavChevron(Icons.Filled.ChevronRight, "Next day", canNewer) { viewModel?.stepDay(older = false) } + ActivityNavChevron(Icons.Filled.ChevronRight, stringResource(R.string.action_next_day), canNewer) { viewModel?.stepDay(older = false) } } } @@ -367,11 +373,11 @@ private fun dayHeaderLabel(dayMillis: Long): String { val daysAgo = ((today - dayMillis) / 86_400_000L).toInt() val date = Instant.ofEpochMilli(dayMillis).atZone(ZoneId.systemDefault()) return when { - daysAgo <= 0 -> "Today" - daysAgo == 1 -> "Yesterday" - daysAgo < 7 -> date.format(DateTimeFormatter.ofPattern("EEEE")) - date.year == java.time.Year.now().value -> date.format(DateTimeFormatter.ofPattern("EEE, MMM d")) - else -> date.format(DateTimeFormatter.ofPattern("MMM d, yyyy")) + daysAgo <= 0 -> L10n.get(R.string.period_today) + daysAgo == 1 -> L10n.get(R.string.day_yesterday) + daysAgo < 7 -> date.format(DateTimeFormatter.ofPattern("EEEE", java.util.Locale.getDefault())).replaceFirstChar { it.titlecase() } + date.year == java.time.Year.now().value -> date.format(com.pulseloop.util.LocaleFormats.formatter("EEEMMMd", "EEE, MMM d")) + else -> date.format(com.pulseloop.util.LocaleFormats.formatter("yMMMd", "MMM d, yyyy")) } } @@ -408,11 +414,11 @@ private fun DailyActivitySummaryCard(state: ActivityViewModel.ActivityState, uni ) { Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(18.dp)) { Row { - SummaryMetric("Steps", today?.steps?.let { Formats.count(it) } ?: "—", null, PulseColors.steps, Modifier.weight(1f)) - SummaryMetric("Distance", distValue ?: "—", if (distValue != null) UnitConverter.distanceUnit(units) else null, PulseColors.distance, Modifier.weight(1f)) + SummaryMetric(stringResource(R.string.metric_steps), today?.steps?.let { Formats.count(it) } ?: "—", null, PulseColors.steps, Modifier.weight(1f)) + SummaryMetric(stringResource(R.string.metric_distance), distValue ?: "—", if (distValue != null) UnitConverter.distanceUnit(units) else null, PulseColors.distance, Modifier.weight(1f)) } // The same figure the Today screen shows, not the row's raw `calories` (issue #101). - SummaryMetric("Calories", calories?.let { Formats.count(it.toInt()) } ?: "—", if (calories != null) "cal" else null, PulseColors.calories) + SummaryMetric(stringResource(R.string.metric_calories), calories?.let { Formats.count(it.toInt()) } ?: "—", if (calories != null) stringResource(R.string.unit_cal) else null, PulseColors.calories) } ActivityRings( rings = listOf( @@ -494,7 +500,7 @@ fun ActivityWorkoutRow(session: ActivitySessionEntity, units: UnitSystem, onTap: ) } session.avgHeartRate?.let { - Text("${it.toInt()} bpm avg", fontSize = 12.sp, color = PulseColors.textSecondary) + Text(stringResource(R.string.activity_bpm_avg, it.toInt()), fontSize = 12.sp, color = PulseColors.textSecondary) } Spacer(Modifier.weight(1f)) if (session.useGps && session.gpsPointCount > 1) { @@ -534,21 +540,21 @@ private fun WeeklyGoalCard(state: ActivityViewModel.ActivityState, days: List Unit, onStart: (String, Bool var useGps by remember { mutableStateOf(true) } AlertDialog( onDismissRequest = onDismiss, - title = { Text("Record activity") }, + title = { Text(stringResource(R.string.activity_record_title)) }, text = { Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { ActivityMeta.ORDER.forEach { type -> @@ -665,16 +671,16 @@ private fun RecordTypePickerDialog(onDismiss: () -> Unit, onStart: (String, Bool Modifier.fillMaxWidth().padding(top = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { - Text("Track GPS route", fontSize = 14.sp, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.activity_track_gps), fontSize = 14.sp, modifier = Modifier.weight(1f)) Switch(checked = useGps, onCheckedChange = { useGps = it }) } } } }, confirmButton = { - TextButton(onClick = { onStart(selected, useGps && ActivityMeta.gpsCapable(selected)) }) { Text("Start") } + TextButton(onClick = { onStart(selected, useGps && ActivityMeta.gpsCapable(selected)) }) { Text(stringResource(R.string.action_start)) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -689,15 +695,15 @@ private fun WorkoutHistoryDialog( onSelect: (String) -> Unit, ) { val zone = remember { ZoneId.systemDefault() } - val headerFmt = remember { DateTimeFormatter.ofPattern("EEEE, MMM d") } + val headerFmt = remember { com.pulseloop.util.LocaleFormats.formatter("EEEEMMMd", "EEEE, MMM d") } val today = remember { LocalDate.now(zone) } val groups = remember(sessions) { sessions.groupBy { Instant.ofEpochMilli(it.startedAt).atZone(zone).toLocalDate() } .toList().sortedByDescending { it.first } } fun header(day: LocalDate): String = when (day) { - today -> "TODAY" - today.minusDays(1) -> "YESTERDAY" + today -> L10n.get(R.string.header_today) + today.minusDays(1) -> L10n.get(R.string.header_yesterday) // Locale.ROOT: iOS's uppercased() is locale-insensitive; a Turkish locale would turn // month-name i's into dotted İ otherwise. else -> headerFmt.format(day).uppercase(java.util.Locale.ROOT) @@ -705,10 +711,10 @@ private fun WorkoutHistoryDialog( AlertDialog( onDismissRequest = onDismiss, - title = { Text("Workout history") }, + title = { Text(stringResource(R.string.activity_workout_history)) }, text = { if (groups.isEmpty()) { - Text("No workouts yet — recorded workouts will appear here.") + Text(stringResource(R.string.activity_history_empty)) } else { LazyColumn(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.heightIn(max = 420.dp)) { groups.forEachIndexed { index, (day, daySessions) -> @@ -731,7 +737,7 @@ private fun WorkoutHistoryDialog( } } }, - confirmButton = { TextButton(onClick = onDismiss) { Text("Done") } }, + confirmButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_done)) } }, ) } @@ -748,21 +754,21 @@ private fun GoalEditorDialog( var workouts by remember { mutableStateOf(state.workoutsPerWeekGoal.toFloat()) } AlertDialog( onDismissRequest = onDismiss, - title = { Text("Edit goals") }, + title = { Text(stringResource(R.string.activity_edit_goals)) }, text = { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - GoalSlider("Steps", Formats.count((steps / 500).toInt() * 500), steps, 2000f..20000f) { steps = it } - GoalSlider("Active minutes", "${active.toInt()} min", active, 10f..180f) { active = it } - GoalSlider("Sleep", "%.1f h".format((sleepH * 2).toInt() / 2f), sleepH, 5f..10f) { sleepH = it } - GoalSlider("Workouts / week", "${workouts.toInt()}", workouts, 1f..7f) { workouts = it } + GoalSlider(stringResource(R.string.metric_steps), Formats.count((steps / 500).toInt() * 500), steps, 2000f..20000f) { steps = it } + GoalSlider(stringResource(R.string.goal_active_minutes), stringResource(R.string.value_min, active.toInt()), active, 10f..180f) { active = it } + GoalSlider(stringResource(R.string.metric_sleep), stringResource(R.string.value_hours_decimal, "%.1f".format((sleepH * 2).toInt() / 2f)), sleepH, 5f..10f) { sleepH = it } + GoalSlider(stringResource(R.string.goal_workouts_week), "${workouts.toInt()}", workouts, 1f..7f) { workouts = it } } }, confirmButton = { TextButton(onClick = { onSave((steps / 500).toInt() * 500, active.toInt(), ((sleepH * 2).toInt() * 30), workouts.toInt()) - }) { Text("Save") } + }) { Text(stringResource(R.string.action_save)) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -808,7 +814,7 @@ private fun ActivityRecordsCard( } fun timeOf(startEpoch: Long): String = - DateTimeFormatter.ofPattern("h:mm a") + com.pulseloop.util.LocaleFormats.time() .format(Instant.ofEpochMilli(startEpoch).atZone(ZoneId.systemDefault())) Column( @@ -819,7 +825,7 @@ private fun ActivityRecordsCard( verticalAlignment = Alignment.CenterVertically, ) { Text( - "RECORDS", + stringResource(R.string.activity_records), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp, color = PulseColors.textMuted, ) @@ -829,7 +835,7 @@ private fun ActivityRecordsCard( } Icon( if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore, - contentDescription = if (expanded) "Hide activity records" else "Show activity records", + contentDescription = if (expanded) stringResource(R.string.activity_records_hide) else stringResource(R.string.activity_records_show), tint = PulseColors.textMuted, modifier = Modifier.size(20.dp), ) @@ -839,12 +845,12 @@ private fun ActivityRecordsCard( val rows = buckets when { rows == null -> Text( - "Loading…", + stringResource(R.string.status_loading), fontSize = 13.sp, color = PulseColors.textMuted, modifier = Modifier.padding(start = 16.dp, bottom = 12.dp), ) rows.isEmpty() -> Text( - "No activity records synced for $dayLabel yet.", + stringResource(R.string.activity_records_empty, dayLabel), fontSize = 13.sp, color = PulseColors.textMuted, modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 12.dp), ) @@ -861,7 +867,7 @@ private fun ActivityRecordsCard( modifier = Modifier.weight(1f), ) Text( - "${Formats.count(bucket.steps)} steps", + pluralStringResource(R.plurals.steps_count, bucket.steps, Formats.count(bucket.steps)), fontSize = 13.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary, ) if (bucket.distanceMeters > 0) { @@ -873,7 +879,7 @@ private fun ActivityRecordsCard( IconButton(onClick = { pending = bucket }, modifier = Modifier.size(36.dp)) { Icon( Icons.Filled.DeleteOutline, - contentDescription = "Delete this activity record", + contentDescription = stringResource(R.string.activity_record_delete), tint = PulseColors.textMuted, modifier = Modifier.size(18.dp), ) @@ -885,7 +891,8 @@ private fun ActivityRecordsCard( onClick = { visibleCount += ACTIVITY_RECORDS_PAGE_SIZE }, modifier = Modifier.padding(start = 8.dp), ) { - Text("Show ${minOf(ACTIVITY_RECORDS_PAGE_SIZE, rows.size - visibleCount)} more", fontSize = 13.sp) + val more = minOf(ACTIVITY_RECORDS_PAGE_SIZE, rows.size - visibleCount) + Text(pluralStringResource(R.plurals.detail_show_more, more, more), fontSize = 13.sp) } } Spacer(Modifier.height(8.dp)) @@ -897,12 +904,10 @@ private fun ActivityRecordsCard( pending?.let { bucket -> AlertDialog( onDismissRequest = { pending = null }, - title = { Text("Delete this activity record?") }, + title = { Text(stringResource(R.string.activity_record_delete_title)) }, text = { Text( - "${Formats.count(bucket.steps)} steps at ${timeOf(bucket.startEpoch)}." + - "\n\nThe day's total drops by that much. This can't be undone, and the record " + - "stays deleted the next time this day syncs.", + stringResource(R.string.activity_record_delete_body, pluralStringResource(R.plurals.steps_count, bucket.steps, Formats.count(bucket.steps)), timeOf(bucket.startEpoch)), ) }, confirmButton = { @@ -910,9 +915,9 @@ private fun ActivityRecordsCard( val target = bucket pending = null scope.launch { buckets = viewModel?.deleteBucket(target.startEpoch) ?: buckets } - }) { Text("Delete", color = MaterialTheme.colorScheme.error) } + }) { Text(stringResource(R.string.action_delete), color = MaterialTheme.colorScheme.error) } }, - dismissButton = { TextButton(onClick = { pending = null }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { pending = null }) { Text(stringResource(R.string.action_cancel)) } }, ) } } 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 55a67410..16021779 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/BarcodeScannerScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/BarcodeScannerScreen.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import android.Manifest import android.content.Context import android.content.pm.PackageManager @@ -204,13 +206,13 @@ fun BarcodeScannerScreen(onScan: (String) -> Unit, onDismiss: () -> Unit) { verticalAlignment = Alignment.CenterVertically, ) { Text( - "Scan barcode", + stringResource(R.string.nutrition_scan_barcode), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary, modifier = Modifier.weight(1f), ) - TextButton(onClick = onDismiss) { Text("Cancel") } + TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } } when (availability) { ScanAvailability.Granted -> @@ -236,14 +238,14 @@ fun BarcodeScannerScreen(onScan: (String) -> Unit, onDismiss: () -> Unit) { ) Spacer(Modifier.height(10.dp)) Text( - "Scanning unavailable", + stringResource(R.string.barcode_unavailable), fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary, ) Spacer(Modifier.height(6.dp)) Text( - "Barcode scanning needs a device camera and camera access. Search by name instead.", + stringResource(R.string.barcode_unavailable_desc), fontSize = 12.sp, color = PulseColors.textMuted, textAlign = TextAlign.Center, diff --git a/app/src/main/java/com/pulseloop/ui/screens/CoachHistorySheet.kt b/app/src/main/java/com/pulseloop/ui/screens/CoachHistorySheet.kt index 8104f692..90400790 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/CoachHistorySheet.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/CoachHistorySheet.kt @@ -1,5 +1,9 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -54,14 +58,14 @@ fun CoachHistorySheet( .padding(bottom = 24.dp), verticalArrangement = Arrangement.spacedBy(12.dp), ) { - Text("Past conversations", fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) + Text(stringResource(R.string.coach_past_conversations), fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) if (conversations.isEmpty()) { Text( - "No conversations yet. Ask the coach something and it will show up here.", + stringResource(R.string.coach_history_empty), fontSize = 13.sp, color = PulseColors.textMuted, ) } else { - Text("Swipe a conversation to delete it.", fontSize = 12.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.coach_history_swipe), fontSize = 12.sp, color = PulseColors.textMuted) LazyColumn( Modifier.weight(1f, fill = false), verticalArrangement = Arrangement.spacedBy(8.dp), @@ -78,7 +82,7 @@ fun CoachHistorySheet( TextButton( onClick = { confirmDeleteAll = true }, modifier = Modifier.align(Alignment.CenterHorizontally), - ) { Text("Delete all conversations", color = PulseColors.danger) } + ) { Text(stringResource(R.string.coach_delete_all), color = PulseColors.danger) } } } } @@ -86,27 +90,27 @@ fun CoachHistorySheet( pendingDelete?.let { convo -> AlertDialog( onDismissRequest = { pendingDelete = null }, - title = { Text("Delete this conversation?") }, - text = { Text("“${CoachHistoryText.title(convo.firstQuestion)}” and its replies will be deleted. This can't be undone.") }, + title = { Text(stringResource(R.string.coach_delete_one_title)) }, + text = { Text(stringResource(R.string.coach_delete_one_body, CoachHistoryText.title(convo.firstQuestion))) }, confirmButton = { TextButton(onClick = { onDelete(convo.id); pendingDelete = null }) { - Text("Delete", color = PulseColors.danger) + Text(stringResource(R.string.action_delete), color = PulseColors.danger) } }, - dismissButton = { TextButton(onClick = { pendingDelete = null }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { pendingDelete = null }) { Text(stringResource(R.string.action_cancel)) } }, ) } if (confirmDeleteAll) { AlertDialog( onDismissRequest = { confirmDeleteAll = false }, - title = { Text("Delete all conversations?") }, - text = { Text("All ${conversations.size} conversations and their replies will be deleted. This can't be undone.") }, + title = { Text(stringResource(R.string.coach_delete_all_title)) }, + text = { Text(pluralStringResource(R.plurals.coach_delete_all_body, conversations.size, conversations.size)) }, confirmButton = { TextButton(onClick = { confirmDeleteAll = false; onDeleteAll() }) { - Text("Delete all", color = PulseColors.danger) + Text(stringResource(R.string.action_delete_all), color = PulseColors.danger) } }, - dismissButton = { TextButton(onClick = { confirmDeleteAll = false }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { confirmDeleteAll = false }) { Text(stringResource(R.string.action_cancel)) } }, ) } } @@ -139,7 +143,7 @@ private fun HistoryRow( .padding(horizontal = 16.dp), contentAlignment = Alignment.CenterEnd, ) { - Icon(Icons.Filled.Delete, "Delete", tint = PulseColors.danger) + Icon(Icons.Filled.Delete, stringResource(R.string.action_delete), tint = PulseColors.danger) } }, ) { @@ -171,7 +175,7 @@ internal object CoachHistoryText { fun title(firstQuestion: String?): String = firstQuestion?.replace(Regex("\\s+"), " ")?.trim()?.takeIf { it.isNotEmpty() } - ?: "Untitled conversation" + ?: L10n.get(R.string.coach_untitled) fun subtitle( convo: CoachConversationSummary, @@ -180,8 +184,8 @@ internal object CoachHistoryText { today: LocalDate = LocalDate.now(zone), ): String { val parts = mutableListOf(whenText(convo.updatedAt, zone, today)) - parts += if (convo.messageCount == 1) "1 message" else "${convo.messageCount} messages" - if (isCurrent) parts += "open now" + parts += L10n.plural(R.plurals.coach_messages, convo.messageCount, convo.messageCount) + if (isCurrent) parts += L10n.get(R.string.coach_open_now) return parts.joinToString(" · ") } @@ -189,8 +193,8 @@ internal object CoachHistoryText { val at = Instant.ofEpochMilli(epochMs).atZone(zone) val day = at.toLocalDate() return when { - day == today -> "Today " + at.format(TIME) - day == today.minusDays(1) -> "Yesterday " + at.format(TIME) + day == today -> L10n.get(R.string.when_today_at, at.format(TIME)) + day == today.minusDays(1) -> L10n.get(R.string.when_yesterday_at, at.format(TIME)) day.year == today.year -> at.format(SAME_YEAR) else -> at.format(OTHER_YEAR) } 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 636519f4..db139630 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/CoachModelPicker.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/CoachModelPicker.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowDropDown @@ -62,7 +65,7 @@ fun CoachModelPicker( val presetSlugs = presets.map { it.first }.toSet() val others = success?.entries?.filter { it.id !in presetSlugs }.orEmpty() - Text("Model", style = MaterialTheme.typography.labelMedium) + Text(stringResource(R.string.coach_model), style = MaterialTheme.typography.labelMedium) Spacer(Modifier.height(4.dp)) var expanded by remember { mutableStateOf(false) } var filter by remember(provider) { mutableStateOf("") } @@ -83,19 +86,19 @@ fun CoachModelPicker( onClick = { onPick(slug); expanded = false }, ) - if (presets.isNotEmpty()) MenuHeader("Recommended") + if (presets.isNotEmpty()) MenuHeader(stringResource(R.string.picker_recommended)) presets.forEach { (slug, blurb) -> Item(slug, blurb) } if (others.isNotEmpty()) { HorizontalDivider() - MenuHeader("All models from $providerName (${others.size})") + MenuHeader(stringResource(R.string.picker_all_models, providerName, others.size)) // OpenRouter lists hundreds; a filter beats scrolling, and the cap keeps the // (non-lazy) menu from composing every row. if (others.size > FILTER_THRESHOLD) { OutlinedTextField( value = filter, onValueChange = { filter = it }, - placeholder = { Text("Filter, e.g. claude") }, + placeholder = { Text(stringResource(R.string.picker_filter)) }, singleLine = true, modifier = Modifier.padding(horizontal = 12.dp).fillMaxWidth(), ) @@ -107,12 +110,12 @@ fun CoachModelPicker( matches.take(MAX_ROWS).forEach { e -> val detail = listOfNotNull( e.name?.takeIf { it != e.id }, - e.expiresOn?.let { "retiring $it" }, + e.expiresOn?.let { L10n.get(R.string.picker_retiring, it) }, ).joinToString(" · ") Item(e.id, detail) } if (matches.size > MAX_ROWS) { - MenuHeader("${matches.size - MAX_ROWS} more — type to narrow") + MenuHeader(stringResource(R.string.picker_more, matches.size - MAX_ROWS)) } } } @@ -123,28 +126,28 @@ fun CoachModelPicker( val unlisted = success != null && CoachModelCatalog.isUnlisted(provider, success, selected) Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { val (status, color) = when { - savedKey.isBlank() -> "Save your key to see every model $providerName offers." to MaterialTheme.colorScheme.onSurfaceVariant - loading -> "Loading models from $providerName…" to MaterialTheme.colorScheme.onSurfaceVariant + savedKey.isBlank() -> stringResource(R.string.picker_save_key, providerName) to MaterialTheme.colorScheme.onSurfaceVariant + loading -> stringResource(R.string.picker_loading, providerName) to MaterialTheme.colorScheme.onSurfaceVariant listing is CoachModelCatalog.Result.Failure -> (listing as CoachModelCatalog.Result.Failure).message to PulseColors.danger - success != null -> "${success.entries.size} models available from $providerName" to MaterialTheme.colorScheme.onSurfaceVariant + success != null -> stringResource(R.string.picker_available, success.entries.size, providerName) to MaterialTheme.colorScheme.onSurfaceVariant else -> "" to MaterialTheme.colorScheme.onSurfaceVariant } Text(status, style = MaterialTheme.typography.bodySmall, color = color, modifier = Modifier.weight(1f)) if (savedKey.isNotBlank() && !loading) { TextButton(onClick = { load(force = true) }) { - Text(if (listing is CoachModelCatalog.Result.Failure) "Retry" else "Refresh") + Text(if (listing is CoachModelCatalog.Result.Failure) stringResource(R.string.action_retry) else stringResource(R.string.action_refresh)) } } } if (unlisted) { Text( - "$providerName doesn't list “$selected” any more — it may have been retired. Pick another model.", + stringResource(R.string.picker_missing, providerName, selected), style = MaterialTheme.typography.bodySmall, color = PulseColors.danger, ) } else if (expiry != null) { Text( - "$providerName is retiring this model on $expiry.", + stringResource(R.string.picker_retiring_on, providerName, expiry), style = MaterialTheme.typography.bodySmall, color = PulseColors.warning, ) diff --git a/app/src/main/java/com/pulseloop/ui/screens/CoachScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/CoachScreen.kt index 0e69331c..df58491c 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/CoachScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/CoachScreen.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import android.content.res.Configuration import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.PickVisualMediaRequest @@ -94,7 +97,7 @@ fun CoachScreen( if (state.isThinking) { item { Text( - "Coach is thinking…", + stringResource(R.string.coach_thinking), fontSize = 12.sp, color = PulseColors.textMuted, modifier = Modifier.padding(start = 8.dp), ) @@ -102,7 +105,7 @@ fun CoachScreen( } if (state.error != null) { item { - Text("Error: ${state.error}", fontSize = 12.sp, color = PulseColors.danger, modifier = Modifier.padding(start = 8.dp)) + Text(stringResource(R.string.coach_error, state.error ?: ""), fontSize = 12.sp, color = PulseColors.danger, modifier = Modifier.padding(start = 8.dp)) } } } @@ -160,8 +163,8 @@ fun CoachHeader( ) } Column(Modifier.weight(1f)) { - Text("PulseLoop Coach", fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) - Text("Using your latest ring sync", fontSize = 12.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.checkins_test_title), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) + Text(stringResource(R.string.coach_using_sync), fontSize = 12.sp, color = PulseColors.textMuted) } if (onOpenUsage != null) { Box( @@ -173,7 +176,7 @@ fun CoachHeader( .clickable(onClick = onOpenUsage), contentAlignment = Alignment.Center, ) { - Icon(Icons.Filled.Info, "Usage & cost", tint = PulseColors.textSecondary, modifier = Modifier.size(16.dp)) + Icon(Icons.Filled.Info, stringResource(R.string.coach_usage_cost), tint = PulseColors.textSecondary, modifier = Modifier.size(16.dp)) } } if (onOpenHistory != null) { @@ -186,7 +189,7 @@ fun CoachHeader( .clickable(onClick = onOpenHistory), contentAlignment = Alignment.Center, ) { - Icon(Icons.Filled.History, "Past conversations", tint = PulseColors.textSecondary, modifier = Modifier.size(18.dp)) + Icon(Icons.Filled.History, stringResource(R.string.coach_past_conversations), tint = PulseColors.textSecondary, modifier = Modifier.size(18.dp)) } } Box( @@ -198,7 +201,7 @@ fun CoachHeader( .clickable(onClick = onNewChat), contentAlignment = Alignment.Center, ) { - Icon(Icons.Filled.Add, "New chat", tint = PulseColors.textSecondary, modifier = Modifier.size(18.dp)) + Icon(Icons.Filled.Add, stringResource(R.string.coach_new_chat), tint = PulseColors.textSecondary, modifier = Modifier.size(18.dp)) } } } @@ -236,7 +239,7 @@ private fun MessageBubble(msg: CoachViewModel.ChatMessage, viewModel: CoachViewM bmp?.let { Image( bitmap = it.asImageBitmap(), - contentDescription = "Attached photo", + contentDescription = stringResource(R.string.coach_attached_photo), modifier = Modifier.size(96.dp).clip(RoundedCornerShape(10.dp)), contentScale = ContentScale.Crop, ) @@ -262,11 +265,11 @@ private fun MessageBubble(msg: CoachViewModel.ChatMessage, viewModel: CoachViewM // ─────────────────────────── Composer ─────────────────────────── -private val SUGGESTIONS = listOf( - "How am I doing today?", - "Explain my heart rate trend", - "Summarize my week", - "How can I sleep better?", +private val SUGGESTIONS get() = listOf( + L10n.get(R.string.coach_suggest_today), + L10n.get(R.string.coach_suggest_hr), + L10n.get(R.string.coach_suggest_week), + L10n.get(R.string.coach_suggest_sleep), ) @Composable @@ -348,7 +351,7 @@ private fun Composer( bmp?.let { Image( bitmap = it.asImageBitmap(), - contentDescription = "Staged photo", + contentDescription = stringResource(R.string.coach_staged_photo), modifier = Modifier.size(56.dp).clip(RoundedCornerShape(8.dp)), contentScale = ContentScale.Crop, ) @@ -359,7 +362,7 @@ private fun Composer( staged = staged - ref }, modifier = Modifier.size(20.dp).align(Alignment.TopEnd), - ) { Icon(Icons.Filled.Close, "Remove photo", Modifier.size(14.dp), tint = Color.White) } + ) { Icon(Icons.Filled.Close, stringResource(R.string.meal_remove_photo), Modifier.size(14.dp), tint = Color.White) } } } } @@ -382,7 +385,7 @@ private fun Composer( .clickable(onClick = onNewChat), contentAlignment = Alignment.Center, ) { - Icon(Icons.Filled.Add, "New chat", tint = PulseColors.textSecondary, modifier = Modifier.size(18.dp)) + Icon(Icons.Filled.Add, stringResource(R.string.coach_new_chat), tint = PulseColors.textSecondary, modifier = Modifier.size(18.dp)) } } if (imageInputEnabled) { @@ -396,7 +399,7 @@ private fun Composer( }, contentAlignment = Alignment.Center, ) { - Icon(Icons.Filled.Add, "Attach photo", tint = PulseColors.textMuted, modifier = Modifier.size(20.dp)) + Icon(Icons.Filled.Add, stringResource(R.string.coach_attach_photo), tint = PulseColors.textMuted, modifier = Modifier.size(20.dp)) } } // Pill text field (iOS composer): filled capsule, no outline. @@ -408,7 +411,7 @@ private fun Composer( .padding(horizontal = 16.dp, vertical = 12.dp), ) { if (inputText.isEmpty()) { - Text("Ask the coach...", fontSize = 14.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.coach_ask_placeholder), fontSize = 14.sp, color = PulseColors.textMuted) } BasicTextField( value = inputText, @@ -434,7 +437,7 @@ private fun Composer( contentAlignment = Alignment.Center, ) { Icon( - Icons.Filled.ArrowUpward, "Send", + Icons.Filled.ArrowUpward, stringResource(R.string.action_send), tint = if (canSend) Color.White else PulseColors.textMuted, modifier = Modifier.size(20.dp), ) diff --git a/app/src/main/java/com/pulseloop/ui/screens/CoachUsageSheet.kt b/app/src/main/java/com/pulseloop/ui/screens/CoachUsageSheet.kt index 45bf0ad2..c25da0ae 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/CoachUsageSheet.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/CoachUsageSheet.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* @@ -70,7 +72,7 @@ fun CoachUsageSheet( .padding(bottom = 24.dp), verticalArrangement = Arrangement.spacedBy(12.dp), ) { - Text("Usage & cost", fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) + Text(stringResource(R.string.coach_usage_cost), fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) SummaryCard(providerLabel, models, totalInputTokens, totalOutputTokens, totalCost) if (showsCostNote) CostNote() if (accounted.isNotEmpty()) BreakdownCard(accounted) @@ -90,15 +92,15 @@ private fun SummaryCard( .background(PulseColors.card) .padding(horizontal = 16.dp), ) { - UsageRow("Provider", providerLabel) + UsageRow(stringResource(R.string.coach_provider), providerLabel) Divider() - UsageRow(if (models.size > 1) "Models" else "Model", models.joinToString(", ")) + UsageRow(if (models.size > 1) stringResource(R.string.usage_models) else stringResource(R.string.coach_model), models.joinToString(", ")) Divider() - UsageRow("Input tokens", formatTokens(totalInputTokens), mono = true) + UsageRow(stringResource(R.string.usage_input_tokens), formatTokens(totalInputTokens), mono = true) Divider() - UsageRow("Output tokens", formatTokens(totalOutputTokens), mono = true) + UsageRow(stringResource(R.string.usage_output_tokens), formatTokens(totalOutputTokens), mono = true) Divider() - UsageRow("Estimated cost", totalCost?.let { "$" + "%.4f".format(it) } ?: "—", mono = true) + UsageRow(stringResource(R.string.usage_estimated_cost), totalCost?.let { "$" + "%.4f".format(it) } ?: "—", mono = true) } } @@ -114,7 +116,7 @@ private fun CostNote() { ) { Icon(Icons.Filled.Info, null, tint = PulseColors.textMuted, modifier = Modifier.size(14.dp)) Text( - "Cost estimates aren't available for on-device or custom models.", + stringResource(R.string.usage_cost_note), fontSize = 12.sp, color = PulseColors.textMuted, ) } @@ -136,10 +138,10 @@ private fun BreakdownCard(accounted: List) { verticalAlignment = Alignment.CenterVertically, ) { Text( - "Per-message breakdown", fontSize = 13.sp, fontWeight = FontWeight.Medium, + stringResource(R.string.usage_breakdown), fontSize = 13.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary, ) - Text(if (expanded) "Hide" else "Show", fontSize = 12.sp, color = PulseColors.textSecondary) + Text(if (expanded) stringResource(R.string.action_hide) else stringResource(R.string.action_show), fontSize = 12.sp, color = PulseColors.textSecondary) } if (expanded) { Column(Modifier.padding(top = 8.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { @@ -152,10 +154,10 @@ private fun BreakdownCard(accounted: List) { @Composable private fun MessageBreakdownRow(message: CoachMessageEntity) { val preview = message.body.replace("\n", " ").take(30) - val tokens = "${message.inputTokens ?: 0} in · ${message.outputTokens ?: 0} out" + val tokens = stringResource(R.string.usage_tokens_line, message.inputTokens ?: 0, message.outputTokens ?: 0) val cost = message.costUSD?.let { "$" + "%.4f".format(it) } ?: "—" Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { - Text(preview.ifEmpty { "(no text)" }, fontSize = 12.sp, color = PulseColors.textPrimary, maxLines = 1) + Text(preview.ifEmpty { stringResource(R.string.usage_no_text) }, fontSize = 12.sp, color = PulseColors.textPrimary, maxLines = 1) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { Text(tokens, fontSize = 11.sp, color = PulseColors.textMuted) Text(cost, fontSize = 11.sp, color = PulseColors.textMuted) 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 7ada9135..eb8b365d 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/LogPastActivityScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/LogPastActivityScreen.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -66,20 +69,20 @@ fun LogPastActivityScreen(onBack: () -> Unit, onSaved: (String) -> Unit) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { CircleIconButton(Icons.AutoMirrored.Filled.ArrowBack, tint = PulseColors.textSecondary, onTap = onBack) Spacer(Modifier.width(12.dp)) - Text("Log Past Activity", fontSize = 20.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) + Text(stringResource(R.string.activity_log_past), fontSize = 20.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) } } item { Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - Text("What did you do?", fontSize = 20.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) + Text(stringResource(R.string.logpast_what), fontSize = 20.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) Text( - "Choose an activity, when it started, and how long it lasted.", + stringResource(R.string.logpast_hint), fontSize = 14.sp, color = PulseColors.textMuted, ) } } - item { SectionLabel("Activity type") } + item { SectionLabel(stringResource(R.string.logpast_type)) } item { ActivityTypeGrid(selectedType) { type -> selectedType = type @@ -87,14 +90,14 @@ fun LogPastActivityScreen(onBack: () -> Unit, onSaved: (String) -> Unit) { } } - item { SectionLabel("When") } + item { SectionLabel(stringResource(R.string.logpast_when)) } item { - EditFieldRow("Started") { + EditFieldRow(stringResource(R.string.logpast_started)) { DateTimeButton(startedAt) { startedAt = it; saveError = null } } } item { - EditFieldRow("Ends") { + EditFieldRow(stringResource(R.string.workout_field_ends)) { Text( formatDateTime(endedAt), fontSize = 14.sp, @@ -103,7 +106,7 @@ fun LogPastActivityScreen(onBack: () -> Unit, onSaved: (String) -> Unit) { } } - item { SectionLabel("Duration") } + item { SectionLabel(stringResource(R.string.sleep_duration)) } item { PastActivityDurationCard(durationMinutes) { newValue -> durationMinutes = newValue @@ -112,7 +115,7 @@ fun LogPastActivityScreen(onBack: () -> Unit, onSaved: (String) -> Unit) { } if (!isValid) { - item { Text("The workout must finish before now.", fontSize = 12.sp, color = PulseColors.warning) } + item { Text(stringResource(R.string.logpast_must_finish), fontSize = 12.sp, color = PulseColors.warning) } } saveError?.let { error -> item { Text(error, fontSize = 12.sp, color = PulseColors.danger) } @@ -146,7 +149,7 @@ fun LogPastActivityScreen(onBack: () -> Unit, onSaved: (String) -> Unit) { ) { Icon(Icons.Filled.Check, null) Spacer(Modifier.width(8.dp)) - Text("Log Activity", fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.logpast_save), fontWeight = FontWeight.SemiBold) } } item { Spacer(Modifier.height(24.dp)) } @@ -230,7 +233,7 @@ private fun PastActivityDurationCard(minutes: Int, onChange: (Int) -> Unit) { DurationStepButton(Icons.Filled.Remove, enabled = !atFloor) { onChange(maxOf(5, minutes - 5)) } Column(Modifier.weight(1f), horizontalAlignment = Alignment.CenterHorizontally) { Text(durationText(minutes), fontSize = 28.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) - Text("DURATION", fontSize = 10.sp, letterSpacing = 1.1.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.workout_duration_caps), fontSize = 10.sp, letterSpacing = 1.1.sp, color = PulseColors.textMuted) } DurationStepButton(Icons.Filled.Add, enabled = true) { onChange(minutes + 5) } } @@ -238,7 +241,7 @@ private fun PastActivityDurationCard(minutes: Int, onChange: (Int) -> Unit) { listOf(15, 30, 45, 60, 90).forEach { value -> val selected = minutes == value Text( - "${value}m", + L10n.get(R.string.duration_m, value), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = if (selected) PulseColors.accent else PulseColors.textSecondary, modifier = Modifier @@ -274,8 +277,8 @@ private fun durationText(minutes: Int): String { val hours = minutes / 60 val remaining = minutes % 60 return when { - hours == 0 -> "$remaining min" - remaining == 0 -> "$hours hr" - else -> "$hours hr $remaining min" + hours == 0 -> L10n.get(R.string.value_min, remaining) + remaining == 0 -> L10n.get(R.string.value_hr, hours) + else -> L10n.get(R.string.value_hr_min, hours, remaining) } } 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 b316fffa..786604d3 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/MealAnalysisSheet.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/MealAnalysisSheet.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -276,13 +279,13 @@ fun MealAnalysisDialog( verticalAlignment = Alignment.CenterVertically, ) { Text( - "AI meal log", + stringResource(R.string.meal_ai_log), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary, modifier = Modifier.weight(1f), ) - TextButton(onClick = onDismiss) { Text("Cancel") } + TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } } Column( Modifier @@ -298,7 +301,7 @@ fun MealAnalysisDialog( FilterChip( selected = mealType == t, onClick = { mealType = t }, - label = { Text(t.replaceFirstChar { it.uppercase() }) }, + label = { Text(mealTypeLabel(t)) }, ) } } @@ -321,7 +324,7 @@ fun MealAnalysisDialog( onClick = { image = null }, modifier = Modifier.align(Alignment.TopEnd), ) { - Icon(Icons.Filled.Close, "Remove photo", tint = Color.White) + Icon(Icons.Filled.Close, stringResource(R.string.meal_remove_photo), tint = Color.White) } } } else { @@ -329,7 +332,7 @@ fun MealAnalysisDialog( OutlinedButton(onClick = { launchCamera() }, modifier = Modifier.weight(1f)) { Icon(Icons.Filled.PhotoCamera, null, Modifier.size(18.dp)) Spacer(Modifier.width(6.dp)) - Text("Camera") + Text(stringResource(R.string.meal_camera)) } OutlinedButton( onClick = { @@ -341,14 +344,14 @@ fun MealAnalysisDialog( ) { Icon(Icons.Filled.PhotoLibrary, null, Modifier.size(18.dp)) Spacer(Modifier.width(6.dp)) - Text("Library") + Text(stringResource(R.string.meal_library)) } } } Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Text( - if (image == null) "OR DESCRIBE IT" else "ADD DETAIL (OPTIONAL)", + if (image == null) stringResource(R.string.meal_or_describe) else stringResource(R.string.meal_add_detail), fontSize = 11.sp, letterSpacing = 1.4.sp, color = PulseColors.textMuted, @@ -356,7 +359,7 @@ fun MealAnalysisDialog( OutlinedTextField( value = describeText, onValueChange = { describeText = it }, - placeholder = { Text("e.g. two eggs, toast with butter, black coffee") }, + placeholder = { Text(stringResource(R.string.meal_describe_placeholder)) }, modifier = Modifier.fillMaxWidth(), minLines = 2, ) @@ -370,12 +373,12 @@ fun MealAnalysisDialog( ) { Icon(Icons.Filled.AutoAwesome, null, Modifier.size(18.dp)) Spacer(Modifier.width(6.dp)) - Text("Analyze") + Text(stringResource(R.string.meal_analyze)) } // iOS disclaimer, verbatim (:145-148). Text( - "Sent to your configured AI provider only when you tap Analyze. Estimates are labeled and editable.", + stringResource(R.string.meal_privacy_note), fontSize = 12.sp, color = PulseColors.textMuted, textAlign = TextAlign.Center, @@ -393,7 +396,7 @@ fun MealAnalysisDialog( ) } CircularProgressIndicator(color = PulseColors.accent, modifier = Modifier.size(28.dp)) - Text("Estimating nutrition…", fontSize = 14.sp, color = PulseColors.textSecondary) + Text(stringResource(R.string.meal_estimating), fontSize = 14.sp, color = PulseColors.textSecondary) } AnalysisPhase.Review -> { @@ -411,7 +414,7 @@ fun MealAnalysisDialog( Icon(Icons.Filled.AutoAwesome, null, tint = PulseColors.accent, modifier = Modifier.size(12.dp)) Spacer(Modifier.width(4.dp)) Text( - "AI estimate", + stringResource(R.string.meal_ai_estimate), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.accent, @@ -422,7 +425,7 @@ fun MealAnalysisDialog( // iOS confidence caption (:174-178). Spacer(Modifier.width(8.dp)) Text( - "${confidence.replaceFirstChar { it.uppercase() }} confidence", + when (confidence) { "low" -> stringResource(R.string.meal_confidence_low); else -> stringResource(R.string.meal_confidence_medium) }, fontSize = 12.sp, color = PulseColors.textMuted, ) @@ -441,12 +444,12 @@ fun MealAnalysisDialog( ) } Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { - Text("Review & adjust", fontWeight = FontWeight.SemiBold, color = PulseColors.calories) - EditRow("Name", name) { name = it } - EditRow("Calories (kcal)", calories) { calories = it } - EditRow("Protein (g)", protein) { protein = it } - EditRow("Carbs (g)", carbs) { carbs = it } - EditRow("Fat (g)", fat) { fat = it } + Text(stringResource(R.string.meal_review), fontWeight = FontWeight.SemiBold, color = PulseColors.calories) + EditRow(stringResource(R.string.editor_name), name) { name = it } + EditRow(stringResource(R.string.nutrition_calories_kcal), calories) { calories = it } + EditRow(stringResource(R.string.nutrition_protein_g), protein) { protein = it } + EditRow(stringResource(R.string.nutrition_carbs_g), carbs) { carbs = it } + EditRow(stringResource(R.string.nutrition_fat_g), fat) { fat = it } } val canSave = MealAnalysisLogic.canSave(name, calories) Button( @@ -457,7 +460,7 @@ fun MealAnalysisDialog( ) { Icon(Icons.Filled.Check, null, Modifier.size(18.dp)) Spacer(Modifier.width(6.dp)) - Text("Log meal") + Text(stringResource(R.string.meal_log)) } TextButton( onClick = { phase = AnalysisPhase.Input }, @@ -465,7 +468,7 @@ fun MealAnalysisDialog( ) { Icon(Icons.Filled.Refresh, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Re-analyze", color = PulseColors.accent) + Text(stringResource(R.string.meal_reanalyze), color = PulseColors.accent) } } @@ -490,7 +493,7 @@ fun MealAnalysisDialog( ) { Icon(Icons.Filled.Refresh, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Try again") + Text(stringResource(R.string.action_try_again)) } } } @@ -516,6 +519,15 @@ private fun EditRow(label: String, value: String, onChange: (String) -> Unit) { /** iOS \(Int(value.rounded())) for the review fields (MealAnalysisSheet.swift:273-276). */ private fun Double.roundedText(): String = Math.round(this).toString() +@Composable +internal fun mealTypeLabel(type: String): String = when (type) { + "breakfast" -> stringResource(R.string.meal_breakfast) + "lunch" -> stringResource(R.string.meal_lunch) + "dinner" -> stringResource(R.string.meal_dinner) + "snack" -> stringResource(R.string.meal_snack) + else -> type.replaceFirstChar { it.uppercase() } +} + /** Subsampled decode from a stream opener (two opens: bounds, then pixels) — the same * power-of-two subsample CoachAttachmentStore.save(uri) applies before its downscale. */ private fun decodeSubsampled(open: () -> InputStream?): Bitmap? { @@ -690,8 +702,7 @@ object MealEstimator { val resolution = CoachClientResolver.resolve(providerStore, keyStore) if (!keyStore.coachEnabled || resolution.key == null) { return@withContext Result.Failure( - "AI analysis needs the coach enabled with a configured provider (Settings → AI Coach). " + - "You can still search the database or enter the meal manually.", + L10n.get(R.string.meal_needs_coach), ) } val model = CoachClientResolver.activeModel(providerStore.snapshot(), keyStore.model) @@ -706,14 +717,15 @@ object MealEstimator { CoachAttachmentStore.delete(appContext, ref) } if (images.isEmpty()) { - return@withContext Result.Failure("Couldn't process that photo. Try again or describe the meal.") + return@withContext Result.Failure(L10n.get(R.string.meal_photo_failed)) } } // iOS :392 — the description, or the photo-only prompt. val prompt = description.trim().ifEmpty { "Estimate the nutrition of the meal in the photo." } val input = JsonArray(listOf( - OpenAIRequestBuilder.message("system", MealAnalysisLogic.systemPrompt), + OpenAIRequestBuilder.message("system", MealAnalysisLogic.systemPrompt + + com.pulseloop.coach.context.CoachLanguage.directive("the meal name and assumptions")), OpenAIRequestBuilder.message("user", prompt, images), )) // iOS passes flags.settings.resolvedReasoningEffort through OpenAIRequestBuilder.data @@ -728,13 +740,13 @@ object MealEstimator { val response = resolution.client.send(requestBody.toString().toByteArray()) val estimate = MealAnalysisLogic.decode(response.outputText) ?: return@withContext Result.Failure( - "The AI didn't return a usable estimate. Try again or enter the meal manually.", + L10n.get(R.string.meal_no_estimate), ) Result.Success(estimate) } catch (e: CancellationException) { throw e } catch (e: Exception) { - Result.Failure("Analysis failed: ${e.message ?: e.javaClass.simpleName}") + Result.Failure(L10n.get(R.string.meal_analysis_failed, e.message ?: e.javaClass.simpleName)) } } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/MeasurementModal.kt b/app/src/main/java/com/pulseloop/ui/screens/MeasurementModal.kt index d005bc54..560a1fe5 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/MeasurementModal.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/MeasurementModal.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import androidx.compose.animation.core.* import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.* @@ -40,19 +42,19 @@ fun MeasurementModal( else -> MaterialTheme.colorScheme.primary } val name = when (kind) { - MeasurementKind.HEART_RATE -> "Heart Rate" - MeasurementKind.SPO2 -> "Blood Oxygen" - else -> "Measurement" + MeasurementKind.HEART_RATE -> stringResource(R.string.metric_heart_rate) + MeasurementKind.SPO2 -> stringResource(R.string.metric_blood_oxygen) + else -> stringResource(R.string.measure_generic) } val unit = when (kind) { - MeasurementKind.HEART_RATE -> "bpm" + MeasurementKind.HEART_RATE -> stringResource(R.string.unit_bpm) MeasurementKind.SPO2 -> "%" else -> "" } val instruction = when (kind) { - MeasurementKind.HEART_RATE -> "Keep your hand still and rest your wrist on a flat surface." - MeasurementKind.SPO2 -> "Breathe normally. Keep the sensor pressed firmly to your skin." - else -> "Stay still during the measurement." + MeasurementKind.HEART_RATE -> stringResource(R.string.measure_hint_hr) + MeasurementKind.SPO2 -> stringResource(R.string.measure_hint_spo2) + else -> stringResource(R.string.measure_hint_generic) } var phase by remember { mutableStateOf(MeasurePhase.PREPARING) } @@ -114,11 +116,11 @@ fun MeasurementModal( ) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Top) { Column { - Text("MEASURING", style = MaterialTheme.typography.labelSmall, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.measure_measuring_caps), style = MaterialTheme.typography.labelSmall, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onSurfaceVariant) Text(name, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) } TextButton(onClick = onDismiss) { - Text(if (phase == MeasurePhase.MEASURING) "Finish" else "Cancel") + Text(if (phase == MeasurePhase.MEASURING) stringResource(R.string.record_finish) else stringResource(R.string.action_cancel)) } } @@ -132,11 +134,11 @@ fun MeasurementModal( } } Text( - "Couldn't get a reading. Make sure the ring is snug and worn on your finger, then try again.", + stringResource(R.string.measure_failed), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - Button(onClick = onDismiss) { Text("Close") } + Button(onClick = onDismiss) { Text(stringResource(R.string.action_close)) } } } else { Box(contentAlignment = Alignment.Center, modifier = Modifier.size(240.dp)) { @@ -158,7 +160,7 @@ fun MeasurementModal( Text(unit.uppercase(), style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } else { Text( - if (phase == MeasurePhase.PREPARING) "READY" else "MEASURING", + if (phase == MeasurePhase.PREPARING) stringResource(R.string.measure_ready_caps) else stringResource(R.string.measure_measuring_caps), style = MaterialTheme.typography.labelMedium, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onSurfaceVariant, @@ -173,8 +175,8 @@ fun MeasurementModal( Text( when (phase) { MeasurePhase.PREPARING -> instruction - MeasurePhase.MEASURING -> if (kind == MeasurementKind.SPO2) "Measuring SpO₂… keep your hand still." else "Measuring… stay still." - MeasurePhase.RESULT -> "Reading saved." + MeasurePhase.MEASURING -> if (kind == MeasurementKind.SPO2) stringResource(R.string.measure_spo2_progress) else stringResource(R.string.measure_progress) + MeasurePhase.RESULT -> stringResource(R.string.measure_saved_msg) MeasurePhase.ERROR -> "" }, style = MaterialTheme.typography.bodySmall, @@ -189,7 +191,7 @@ fun MeasurementModal( Modifier.fillMaxWidth().padding(bottom = 28.dp).clip(RoundedCornerShape(16.dp)), color = Color(0xFF4CAF50).copy(alpha = 0.1f), ) { - Text("Saved", Modifier.fillMaxWidth().padding(vertical = 14.dp), + Text(stringResource(R.string.status_saved), Modifier.fillMaxWidth().padding(vertical = 14.dp), style = MaterialTheme.typography.labelMedium, fontWeight = FontWeight.Medium, color = Color(0xFF4CAF50), textAlign = TextAlign.Center) } 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 cf6515aa..f57cbe33 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/NutritionScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/NutritionScreen.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -52,7 +55,7 @@ fun NutritionScreen(onBack: () -> Unit) { } } val dateLabel = remember(todayStart) { - java.text.SimpleDateFormat("EEE, MMM d", java.util.Locale.US).format(java.util.Date(todayStart)) + com.pulseloop.util.LocaleFormats.simpleDateFormat("EEEMMMd", "EEE, MMM d").format(java.util.Date(todayStart)) } var meals by remember { mutableStateOf>(emptyList()) } @@ -85,10 +88,10 @@ fun NutritionScreen(onBack: () -> Unit) { contentWindowInsets = WindowInsets(0, 0, 0, 0), topBar = { TopAppBar( - title = { Text("Nutrition") }, + title = { Text(stringResource(R.string.settings_nutrition)) }, navigationIcon = { IconButton(onClick = onBack) { - Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back") + Icon(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.action_back)) } }, windowInsets = WindowInsets(0, 0, 0, 0), @@ -104,9 +107,9 @@ fun NutritionScreen(onBack: () -> Unit) { // Day navigation — left goes to older dates (higher offset), right goes to today (offset 0). item { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically) { - IconButton(onClick = { dayOffset++ }) { Icon(Icons.Filled.ChevronLeft, "Previous") } + IconButton(onClick = { dayOffset++ }) { Icon(Icons.Filled.ChevronLeft, stringResource(R.string.action_previous)) } Text(dateLabel, fontWeight = FontWeight.SemiBold, fontSize = 16.sp) - IconButton(onClick = { if (dayOffset > 0) dayOffset-- }, enabled = dayOffset > 0) { Icon(Icons.Filled.ChevronRight, "Next") } + IconButton(onClick = { if (dayOffset > 0) dayOffset-- }, enabled = dayOffset > 0) { Icon(Icons.Filled.ChevronRight, stringResource(R.string.action_next)) } } } @@ -117,8 +120,8 @@ fun NutritionScreen(onBack: () -> Unit) { val pct = if (goalCal > 0) (totalCal / goalCal).coerceAtMost(1.0) else 0.0 Card(Modifier.fillMaxWidth(), shape = RoundedCornerShape(20.dp), colors = CardDefaults.cardColors(containerColor = PulseColors.card)) { Column(Modifier.padding(20.dp), horizontalAlignment = Alignment.CenterHorizontally) { - Text("${totalCal.roundToInt()} kcal", fontSize = 32.sp, fontWeight = FontWeight.Bold) - Text("of ${goalCal.roundToInt()}", color = PulseColors.textMuted) + Text(stringResource(R.string.value_kcal, totalCal.roundToInt()), fontSize = 32.sp, fontWeight = FontWeight.Bold) + Text(stringResource(R.string.nutrition_of_goal, goalCal.roundToInt()), color = PulseColors.textMuted) Spacer(Modifier.height(8.dp)) LinearProgressIndicator( progress = { pct.toFloat() }, @@ -128,9 +131,9 @@ fun NutritionScreen(onBack: () -> Unit) { ) Spacer(Modifier.height(8.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) { - MacroBar("Protein", totals.sumOf { it.totalP }, goal?.intakeProteinG ?: 150.0, PulseColors.heartRate) - MacroBar("Carbs", totals.sumOf { it.totalC }, goal?.intakeCarbsG ?: 250.0, PulseColors.calories) - MacroBar("Fat", totals.sumOf { it.totalF }, goal?.intakeFatG ?: 65.0, PulseColors.warning) + MacroBar(stringResource(R.string.macro_protein), totals.sumOf { it.totalP }, goal?.intakeProteinG ?: 150.0, PulseColors.heartRate) + MacroBar(stringResource(R.string.macro_carbs), totals.sumOf { it.totalC }, goal?.intakeCarbsG ?: 250.0, PulseColors.calories) + MacroBar(stringResource(R.string.macro_fat), totals.sumOf { it.totalF }, goal?.intakeFatG ?: 65.0, PulseColors.warning) } } } @@ -142,14 +145,14 @@ fun NutritionScreen(onBack: () -> Unit) { val typeMeals = meals.filter { it.mealTypeRaw == type } if (typeMeals.isNotEmpty()) { item { - Text(type.replaceFirstChar { it.uppercase() }, fontWeight = FontWeight.SemiBold, fontSize = 14.sp, color = PulseColors.textSecondary) + Text(mealTypeLabel(type), fontWeight = FontWeight.SemiBold, fontSize = 14.sp, color = PulseColors.textSecondary) } items(typeMeals, key = { it.id }) { meal -> Card(Modifier.fillMaxWidth(), shape = RoundedCornerShape(14.dp), colors = CardDefaults.cardColors(containerColor = PulseColors.card)) { Row(Modifier.padding(12.dp), verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { Text(meal.name, fontWeight = FontWeight.Medium) - Text("${meal.calories.roundToInt()} kcal · P${meal.proteinG.roundToInt()} C${meal.carbsG.roundToInt()} F${meal.fatG.roundToInt()}", fontSize = 12.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.nutrition_meal_line, meal.calories.roundToInt(), meal.proteinG.roundToInt(), meal.carbsG.roundToInt(), meal.fatG.roundToInt()), fontSize = 12.sp, color = PulseColors.textMuted) } IconButton(onClick = { scope.launch { @@ -157,7 +160,7 @@ fun NutritionScreen(onBack: () -> Unit) { reload() } }) { - Icon(Icons.Filled.Delete, "Delete", tint = PulseColors.danger, modifier = Modifier.size(18.dp)) + Icon(Icons.Filled.Delete, stringResource(R.string.action_delete), tint = PulseColors.danger, modifier = Modifier.size(18.dp)) } } } @@ -176,7 +179,7 @@ fun NutritionScreen(onBack: () -> Unit) { ) { Icon(Icons.Filled.PhotoCamera, null, Modifier.size(18.dp)) Spacer(Modifier.width(6.dp)) - Text("Photo") + Text(stringResource(R.string.nutrition_photo)) } OutlinedButton( onClick = { analysisRequest = AnalysisRequest(startWithCamera = false) }, @@ -184,7 +187,7 @@ fun NutritionScreen(onBack: () -> Unit) { ) { Icon(Icons.Filled.AutoAwesome, null, Modifier.size(18.dp)) Spacer(Modifier.width(6.dp)) - Text("Describe") + Text(stringResource(R.string.nutrition_describe)) } } } @@ -198,7 +201,7 @@ fun NutritionScreen(onBack: () -> Unit) { ) { Icon(Icons.Filled.Add, null, Modifier.size(18.dp)) Spacer(Modifier.width(6.dp)) - Text("Log Meal") + Text(stringResource(R.string.nutrition_log_meal)) } } } @@ -273,7 +276,7 @@ private fun MacroBar(label: String, value: Double, goal: Double, color: Color) { val pct = if (goal > 0) (value / goal).coerceAtMost(1.0) else 0.0 Column(horizontalAlignment = Alignment.CenterHorizontally) { Text(label, fontSize = 10.sp, color = PulseColors.textMuted) - Text("${value.roundToInt()}g", fontSize = 13.sp, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.value_grams, value.roundToInt()), fontSize = 13.sp, fontWeight = FontWeight.SemiBold) LinearProgressIndicator( progress = { pct.toFloat() }, modifier = Modifier.width(60.dp).height(4.dp), @@ -324,7 +327,7 @@ fun MealLogDialog( } if (product == null) { // iOS MealLogSheet.swift:128-130. - scanNotice = "Product not found for that barcode. Enter it manually instead." + scanNotice = L10n.get(R.string.nutrition_barcode_not_found) } else { // Clear on success too: two scans in quick succession run two lookups, and // an earlier-started "not found" completing after a later success would @@ -353,7 +356,7 @@ fun MealLogDialog( throw e } catch (e: Exception) { // iOS MealLogSheet.swift:258-260 catch-all. - scanNotice = "Couldn't look up that barcode. Check your connection or enter the meal manually." + scanNotice = L10n.get(R.string.nutrition_barcode_failed) } finally { lookingUp = false } @@ -362,7 +365,7 @@ fun MealLogDialog( AlertDialog( onDismissRequest = onDismiss, - title = { Text("Log Meal") }, + title = { Text(stringResource(R.string.nutrition_log_meal)) }, text = { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Row( @@ -377,26 +380,26 @@ fun MealLogDialog( TextButton(onClick = { showScanner = true }, enabled = !lookingUp) { Icon(Icons.Filled.QrCodeScanner, null, Modifier.size(18.dp)) Spacer(Modifier.width(4.dp)) - Text("Scan barcode") + Text(stringResource(R.string.nutrition_scan_barcode)) } } scanNotice?.let { // iOS inlineNotice copy (MealLogSheet.swift:128-130 / :259). Text(it, fontSize = 12.sp, color = PulseColors.warning) } - OutlinedTextField(value = name, onValueChange = { name = it }, label = { Text("Name") }, modifier = Modifier.fillMaxWidth(), singleLine = true) + OutlinedTextField(value = name, onValueChange = { name = it }, label = { Text(stringResource(R.string.editor_name)) }, modifier = Modifier.fillMaxWidth(), singleLine = true) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { listOf("breakfast", "lunch", "dinner", "snack").forEach { t -> - FilterChip(selected = type == t, onClick = { type = t }, label = { Text(t.replaceFirstChar { it.uppercase() }) }) + FilterChip(selected = type == t, onClick = { type = t }, label = { Text(mealTypeLabel(t)) }) } } Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { - OutlinedTextField(value = cal, onValueChange = { cal = it }, label = { Text("kcal") }, modifier = Modifier.weight(1f), singleLine = true) - OutlinedTextField(value = protein, onValueChange = { protein = it }, label = { Text("P(g)") }, modifier = Modifier.weight(1f), singleLine = true) + OutlinedTextField(value = cal, onValueChange = { cal = it }, label = { Text(stringResource(R.string.unit_kcal)) }, modifier = Modifier.weight(1f), singleLine = true) + OutlinedTextField(value = protein, onValueChange = { protein = it }, label = { Text(stringResource(R.string.nutrition_p_g)) }, modifier = Modifier.weight(1f), singleLine = true) } Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { - OutlinedTextField(value = carbs, onValueChange = { carbs = it }, label = { Text("C(g)") }, modifier = Modifier.weight(1f), singleLine = true) - OutlinedTextField(value = fat, onValueChange = { fat = it }, label = { Text("F(g)") }, modifier = Modifier.weight(1f), singleLine = true) + OutlinedTextField(value = carbs, onValueChange = { carbs = it }, label = { Text(stringResource(R.string.nutrition_c_g)) }, modifier = Modifier.weight(1f), singleLine = true) + OutlinedTextField(value = fat, onValueChange = { fat = it }, label = { Text(stringResource(R.string.nutrition_f_g)) }, modifier = Modifier.weight(1f), singleLine = true) } } }, @@ -431,9 +434,9 @@ fun MealLogDialog( userEdited = edited, ) }) - }, enabled = valid) { Text("Save") } + }, enabled = valid) { Text(stringResource(R.string.action_save)) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } }, ) if (showScanner) { diff --git a/app/src/main/java/com/pulseloop/ui/screens/OnboardingScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/OnboardingScreen.kt index 49797203..b9484a6d 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/OnboardingScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/OnboardingScreen.kt @@ -1,5 +1,6 @@ package com.pulseloop.ui.screens +import androidx.compose.ui.res.stringResource import android.Manifest import android.content.Context import android.content.pm.PackageManager @@ -226,14 +227,14 @@ private fun OnboardingTopBar( IconButton(onClick = onBack) { Icon( Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back", + contentDescription = stringResource(R.string.action_back), tint = PulseColors.textSecondary, ) } } } Text( - "Step ${step.index + 1} of $total", + stringResource(R.string.onboarding_step, step.index + 1, total), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, fontFamily = FontFamily.Monospace, @@ -244,7 +245,7 @@ private fun OnboardingTopBar( Box(Modifier.size(width = 60.dp, height = 44.dp), contentAlignment = Alignment.CenterEnd) { if (showsSkip) { Text( - "Skip", + stringResource(R.string.action_skip), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textSecondary, @@ -282,19 +283,19 @@ private data class WelcomeFeature( @Composable private fun WelcomeStep(getStarted: () -> Unit, exploreWithoutRing: () -> Unit) { val features = listOf( - WelcomeFeature(Icons.Filled.Paid, "No subscription", "Own your ring data", PulseColors.success), - WelcomeFeature(Icons.Filled.Lock, "Privacy first", "Data stays on device", PulseColors.info), - WelcomeFeature(Icons.Filled.AutoAwesome, "AI health coach", "Learns your baseline", PulseColors.accent), - WelcomeFeature(Icons.Filled.MonitorHeart, "See your vitals", "HR, SpO₂, HRV & stress", PulseColors.heartRate), - WelcomeFeature(Icons.Filled.Bedtime, "Sleep tracking", "Stages and trends", PulseColors.sleep), - WelcomeFeature(Icons.Filled.DirectionsRun, "Activity recording", "Live workout tracking", PulseColors.steps), + WelcomeFeature(Icons.Filled.Paid, stringResource(R.string.welcome_no_sub), stringResource(R.string.welcome_no_sub_desc), PulseColors.success), + WelcomeFeature(Icons.Filled.Lock, stringResource(R.string.welcome_privacy), stringResource(R.string.welcome_privacy_desc), PulseColors.info), + WelcomeFeature(Icons.Filled.AutoAwesome, stringResource(R.string.welcome_coach), stringResource(R.string.welcome_coach_desc), PulseColors.accent), + WelcomeFeature(Icons.Filled.MonitorHeart, stringResource(R.string.welcome_vitals), stringResource(R.string.welcome_vitals_desc), PulseColors.heartRate), + WelcomeFeature(Icons.Filled.Bedtime, stringResource(R.string.welcome_sleep), stringResource(R.string.welcome_sleep_desc), PulseColors.sleep), + WelcomeFeature(Icons.Filled.DirectionsRun, stringResource(R.string.welcome_activity), stringResource(R.string.welcome_activity_desc), PulseColors.steps), ) StepScaffold( footer = { Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { - PrimaryButton("Get started", icon = Icons.Filled.ArrowForward, onClick = getStarted) - SecondaryButton("Explore without ring", icon = Icons.Filled.GridView, onClick = exploreWithoutRing) + PrimaryButton(stringResource(R.string.onboarding_get_started), icon = Icons.Filled.ArrowForward, onClick = getStarted) + SecondaryButton(stringResource(R.string.onboarding_explore), icon = Icons.Filled.GridView, onClick = exploreWithoutRing) } }, ) { @@ -312,8 +313,8 @@ private fun WelcomeStep(getStarted: () -> Unit, exploreWithoutRing: () -> Unit) .clip(RoundedCornerShape(22.dp)), ) StepHeader( - title = "Set up PulseLoop", - subtitle = "Your health, on your terms — no subscription, no cloud.", + title = stringResource(R.string.onboarding_setup_title), + subtitle = stringResource(R.string.onboarding_setup_subtitle), ) // Two-column feature grid (rows of two, since we're inside a scroll column). @@ -388,7 +389,7 @@ private fun ProfileStep( StepScaffold( footer = { - PrimaryButton("Continue", icon = Icons.Filled.ArrowForward, enabled = draft != null) { + PrimaryButton(stringResource(R.string.action_continue), icon = Icons.Filled.ArrowForward, enabled = draft != null) { val current = draft ?: return@PrimaryButton scope.launch { val existing = db.userProfileDao().get() @@ -402,8 +403,8 @@ private fun ProfileStep( }, ) { StepHeader( - title = "Profile", - subtitle = "Used to tune calories, activity goals, and summaries.", + title = stringResource(R.string.onboarding_profile), + subtitle = stringResource(R.string.onboarding_profile_subtitle), ) draft?.let { current -> ProfileEditor(draft = current, onDraftChange = { draft = it }) @@ -432,7 +433,7 @@ private fun GoalsStep( StepScaffold( footer = { - PrimaryButton("Save goals", icon = Icons.Filled.Check, enabled = draft != null) { + PrimaryButton(stringResource(R.string.goals_save), icon = Icons.Filled.Check, enabled = draft != null) { val current = draft ?: return@PrimaryButton scope.launch { val existing = db.userGoalDao().get() @@ -446,8 +447,8 @@ private fun GoalsStep( }, ) { StepHeader( - title = "Daily goals", - subtitle = "Start with recommended targets. You can change these anytime.", + title = stringResource(R.string.onboarding_goals), + subtitle = stringResource(R.string.onboarding_goals_subtitle), ) draft?.let { current -> GoalEditor( @@ -473,9 +474,9 @@ private data class BaselineMilestone( private fun BaselineStep(finish: () -> Unit) { // iOS #75 finale copy: Today / First sync / Days 3–7. val milestones = listOf( - BaselineMilestone(null, "Today", "Activity and live vitals, right away", PulseColors.info), - BaselineMilestone(Icons.Filled.Bedtime, "First sync", "Sleep stages and nightly trends", PulseColors.sleep), - BaselineMilestone(Icons.AutoMirrored.Filled.TrendingUp, "Days 3–7", "Your personalized baseline unlocks", PulseColors.success), + BaselineMilestone(null, stringResource(R.string.period_today), stringResource(R.string.milestone_today), PulseColors.info), + BaselineMilestone(Icons.Filled.Bedtime, stringResource(R.string.milestone_first_sync), stringResource(R.string.milestone_first_sync_desc), PulseColors.sleep), + BaselineMilestone(Icons.AutoMirrored.Filled.TrendingUp, stringResource(R.string.milestone_days), stringResource(R.string.milestone_days_desc), PulseColors.success), ) // Celebratory finale (iOS #75): the medallion scales in on appear. reduceMotion-equivalent @@ -490,14 +491,14 @@ private fun BaselineStep(finish: () -> Unit) { StepScaffold( footer = { - PrimaryButton("Start using PulseLoop", icon = Icons.Filled.ArrowForward, onClick = finish) + PrimaryButton(stringResource(R.string.onboarding_start_using), icon = Icons.Filled.ArrowForward, onClick = finish) }, ) { SuccessMedallion(scale = medallionScale) SetupCompleteEyebrow() StepHeader( - title = "You're all set", - subtitle = "Wear your ring today. Your baseline builds from here.", + title = stringResource(R.string.onboarding_done_title), + subtitle = stringResource(R.string.onboarding_done_subtitle), ) Column( @@ -515,13 +516,13 @@ private fun BaselineStep(finish: () -> Unit) { ) { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Text( - "PulseLoop learns your baseline over time", + stringResource(R.string.onboarding_learns), fontSize = 20.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary, ) Text( - "Wear your ring during the day and sync after sleep. Trends become more personal after a few days.", + stringResource(R.string.onboarding_learns_desc), fontSize = 14.sp, color = PulseColors.textSecondary, lineHeight = 20.sp, @@ -581,7 +582,7 @@ private fun SuccessMedallion(scale: Float) { ) { Icon( Icons.Filled.Verified, - contentDescription = "Setup complete", + contentDescription = stringResource(R.string.onboarding_setup_complete), tint = PulseColors.accent, modifier = Modifier.size(56.dp), ) @@ -601,7 +602,7 @@ private fun SetupCompleteEyebrow() { .padding(horizontal = 12.dp, vertical = 6.dp), ) { Icon(Icons.Filled.Verified, contentDescription = null, Modifier.size(14.dp), tint = PulseColors.accent) - Text("Setup complete", fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.accent) + Text(stringResource(R.string.onboarding_setup_complete), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.accent) } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/PairingScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/PairingScreen.kt index bfc9526e..8f9e5d6f 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/PairingScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/PairingScreen.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import android.content.Intent import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animateFloatAsState @@ -158,8 +161,8 @@ fun PairingScreen( horizontalAlignment = Alignment.CenterHorizontally, ) { PairingHeader( - title = "Add your ring", - subtitle = "Swipe to find your model, then tap to connect.\nYou can also explore first and pair later.", + title = stringResource(R.string.pairing_title), + subtitle = stringResource(R.string.pairing_subtitle), ) if (!btReady) { @@ -208,7 +211,7 @@ fun PairingScreen( if (!connected && (isLooking || state.diagnostics.isNotEmpty())) { Text( - if (showDiagnostics) "Hide connection details" else "Show connection details", + if (showDiagnostics) stringResource(R.string.pairing_hide_details) else stringResource(R.string.pairing_show_details), fontSize = 12.sp, color = PulseColors.textSecondary, modifier = Modifier.clickable { showDiagnostics = !showDiagnostics }, @@ -222,7 +225,7 @@ fun PairingScreen( val trace = buildList { addAll(state.diagnostics.takeLast(4)) state.lastError?.let { if (it !in this) add(it) } - }.joinToString("\n").ifBlank { "Waiting for BLE connection events…" } + }.joinToString("\n").ifBlank { L10n.get(R.string.pairing_waiting_events) } Box( Modifier .fillMaxWidth() @@ -252,14 +255,14 @@ fun PairingScreen( horizontalAlignment = Alignment.CenterHorizontally, ) { if (!isLooking && btReady) { - PrimaryButton("Connect ring", icon = Icons.Filled.Sensors) { + PrimaryButton(stringResource(R.string.pairing_connect), icon = Icons.Filled.Sensors) { isLooking = true bleClient.startScanning() } if (bleClient.hasLastKnownRing && state.connectionState != RingConnectionState.RECONNECTING ) { - SecondaryButton("Reconnect last ring", icon = Icons.Filled.Refresh) { + SecondaryButton(stringResource(R.string.wearable_reconnect), icon = Icons.Filled.Refresh) { // See SettingsScreen's onConnect (issue #72): a user-initiated // reconnect must clear the stay-off flag a manual Disconnect set, // or it is silently suppressed. @@ -268,9 +271,9 @@ fun PairingScreen( } } if (onSkip != null) { - SecondaryButton("Skip for now", icon = Icons.Filled.ArrowForward, onClick = onSkip) + SecondaryButton(stringResource(R.string.pairing_skip), icon = Icons.Filled.ArrowForward, onClick = onSkip) Text( - "You can pair a ring later from Settings.", + stringResource(R.string.pairing_later_hint), fontSize = 12.sp, color = PulseColors.textMuted, textAlign = TextAlign.Center, @@ -339,7 +342,7 @@ private fun BrandTabs( contentAlignment = Alignment.Center, ) { Text( - brand, + if (brand == ALL_BRANDS_TAB) stringResource(R.string.pairing_all_brands) else brand, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = if (isSelected) Color.White else PulseColors.textSecondary, @@ -455,8 +458,8 @@ private fun ScanningCard( color = PulseColors.accent, ) Text( - if (connecting) "Connecting to ${selectedModel.displayName}…" - else "Scanning for ${selectedModel.displayName}…", + if (connecting) stringResource(R.string.pairing_connecting_to, selectedModel.displayName) + else stringResource(R.string.pairing_scanning_for, selectedModel.displayName), fontSize = 12.sp, color = PulseColors.textMuted, ) @@ -468,13 +471,13 @@ private fun ScanningCard( if (matchingRings.isEmpty()) { InlineEmptyState( - title = "No rings found yet", - message = "Wake the ring by tapping or moving it, and keep it close.", + title = stringResource(R.string.pairing_none_found), + message = stringResource(R.string.pairing_none_found_hint), modifier = Modifier.padding(top = 8.dp), ) } - SecondaryButton("Stop scanning", icon = Icons.Filled.StopCircle, onClick = onStop) + SecondaryButton(stringResource(R.string.pairing_stop_scan), icon = Icons.Filled.StopCircle, onClick = onStop) } } @@ -592,14 +595,14 @@ private fun ConnectedCard( tint = PulseColors.success, ) Text( - "Connected to $deviceName", + stringResource(R.string.pairing_connected_to, deviceName), fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary, ) } if (onContinue != null) { - PrimaryButton("Continue", icon = Icons.Filled.Check, onClick = onContinue) + PrimaryButton(stringResource(R.string.action_continue), icon = Icons.Filled.Check, onClick = onContinue) } } } @@ -623,18 +626,18 @@ private fun BluetoothOffCard() { tint = PulseColors.textMuted, ) Text( - "Bluetooth is off", + stringResource(R.string.pairing_bt_off), fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary, ) Text( - "Turn on Bluetooth to find and connect your ring.", + stringResource(R.string.pairing_bt_off_desc), fontSize = 14.sp, color = PulseColors.textMuted, textAlign = TextAlign.Center, ) - SecondaryButton("Open Settings", icon = Icons.Filled.Settings) { + SecondaryButton(stringResource(R.string.action_open_settings), icon = Icons.Filled.Settings) { try { context.startActivity(Intent(android.provider.Settings.ACTION_BLUETOOTH_SETTINGS)) } catch (_: Exception) { 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 1f8c9e28..ae0a7391 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/RecordScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/RecordScreen.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid @@ -45,10 +47,10 @@ fun RecordScreen( val paceOrSpeedLabel: String val paceOrSpeedValue: String if (metricSet.showsSpeed) { - paceOrSpeedLabel = "Speed" + paceOrSpeedLabel = stringResource(R.string.record_speed) paceOrSpeedValue = ActivityMeta.speed(distanceMeters, elapsedSeconds, units) ?: "—" } else { - paceOrSpeedLabel = "Pace" + paceOrSpeedLabel = stringResource(R.string.record_pace) paceOrSpeedValue = ActivityMeta.pace(distanceMeters, elapsedSeconds, units) ?.let { it + ActivityMeta.paceUnit(units) } ?: "—" } @@ -59,7 +61,7 @@ fun RecordScreen( Text(ActivityMeta.label(activityName), style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold) if (isPaused) { Surface(color = MaterialTheme.colorScheme.errorContainer, shape = MaterialTheme.shapes.small) { - Text("PAUSED", Modifier.padding(horizontal = 12.dp, vertical = 4.dp), style = MaterialTheme.typography.labelMedium, fontWeight = FontWeight.Bold) + Text(stringResource(R.string.record_paused), Modifier.padding(horizontal = 12.dp, vertical = 4.dp), style = MaterialTheme.typography.labelMedium, fontWeight = FontWeight.Bold) } } } @@ -70,7 +72,7 @@ fun RecordScreen( Column(Modifier.padding(20.dp), horizontalAlignment = Alignment.CenterHorizontally) { Text(elapsed, style = MaterialTheme.typography.displayMedium, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.primary) Spacer(Modifier.height(4.dp)) - val hrText = heartRate?.let { "$it bpm" } ?: "-- bpm" + val hrText = heartRate?.let { stringResource(R.string.value_bpm, it) } ?: stringResource(R.string.record_bpm_none) val zoneColor = when (hrZone) { HeartRateZones.Zone.REST, HeartRateZones.Zone.FAT_BURN -> Color(0xFF4CAF50) HeartRateZones.Zone.CARDIO -> Color(0xFFFFC107) @@ -89,11 +91,11 @@ fun RecordScreen( if (useGps && metricSet.showsDistance) { item { val distText = if (units == UnitSystem.METRIC && distanceMeters < 1000) { - "%.0f m".format(distanceMeters) + stringResource(R.string.value_meters, "%.0f".format(distanceMeters)) } else { "%.2f %s".format(UnitConverter.distance(distanceMeters, units), UnitConverter.distanceUnit(units)) } - StatTile("Distance", distText) + StatTile(stringResource(R.string.metric_distance), distText) } } if (useGps && (metricSet.showsPace || metricSet.showsSpeed)) { @@ -108,21 +110,21 @@ fun RecordScreen( Row(Modifier.fillMaxWidth().padding(bottom = 16.dp), horizontalArrangement = Arrangement.spacedBy(12.dp)) { if (isPaused) { Button(onClick = onResume, Modifier.weight(1f).height(52.dp)) { - Icon(Icons.Filled.PlayArrow, "Resume") + Icon(Icons.Filled.PlayArrow, stringResource(R.string.record_resume)) Spacer(Modifier.width(8.dp)) - Text("Resume") + Text(stringResource(R.string.record_resume)) } } else { OutlinedButton(onClick = onPause, Modifier.weight(1f).height(52.dp)) { - Icon(Icons.Filled.Pause, "Pause") + Icon(Icons.Filled.Pause, stringResource(R.string.record_pause)) Spacer(Modifier.width(8.dp)) - Text("Pause") + Text(stringResource(R.string.record_pause)) } } Button(onClick = onFinish, Modifier.weight(1f).height(52.dp), colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error)) { - Icon(Icons.Filled.Stop, "Finish") + Icon(Icons.Filled.Stop, stringResource(R.string.record_finish)) Spacer(Modifier.width(8.dp)) - Text("Finish") + Text(stringResource(R.string.record_finish)) } } } 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 8a2e223d..1f8b7863 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/Screens.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/Screens.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -150,7 +153,7 @@ fun VitalsScreen( referenceBands = c.referenceBands, dashedRules = c.dashedRules, ) } else { - Text("No HR samples yet — sync your ring to start your trend.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.vitals_empty_hr), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } } DashboardCard.SPO2 -> VitalCard( @@ -168,10 +171,10 @@ fun VitalsScreen( // Issue #103: the card's ESTIMATED chip says *that*; this says what, and that a // spot reading is still a measurement. if (state.spo2IsEstimated) { - Text(ESTIMATED_SPO2_NOTE, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.vitals_spo2_estimated_note), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } } else { - Text("No SpO₂ samples yet — take a reading to start your trend.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.vitals_empty_spo2), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } } DashboardCard.BLOOD_PRESSURE -> VitalCard( @@ -186,23 +189,23 @@ fun VitalsScreen( horizontalArrangement = Arrangement.spacedBy(16.dp), ) { BpGaugeColumn( - title = "Systolic", value = sys, domain = 80.0..190.0, + title = stringResource(R.string.bp_systolic), value = sys, domain = 80.0..190.0, zones = cards.getValue(MetricKind.BLOOD_PRESSURE).zones, fallback = ZonePalette.accent(MetricKind.BLOOD_PRESSURE), modifier = Modifier.weight(1f), ) BpGaugeColumn( - title = "Diastolic", value = dia, domain = 50.0..130.0, + title = stringResource(R.string.bp_diastolic), value = dia, domain = 50.0..130.0, zones = com.pulseloop.service.VitalsThresholdEngine.diastolicReferenceZones(), fallback = ZonePalette.accent(MetricKind.BLOOD_PRESSURE).copy(alpha = 0.7f), modifier = Modifier.weight(1f), ) } } else { - Text("No blood pressure data yet.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.vitals_empty_bp), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } if (measuring) { - Text("Measuring… updates when complete", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) + Text(stringResource(R.string.vitals_measuring_updates), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) } } DashboardCard.HRV -> VitalCard( @@ -217,7 +220,7 @@ fun VitalsScreen( referenceBands = c.referenceBands, dashedRules = c.dashedRules, ) } else { - Text("No HRV data yet — HRV builds up over a few hours of wear.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.vitals_empty_hrv), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } } DashboardCard.STRESS -> VitalGaugeCardItem( @@ -227,22 +230,22 @@ fun VitalsScreen( // scores below 10 — so the floor would hide exactly the reading it was asked for. hasReading = state.stressSamples.isNotEmpty() && (state.stressIsDerived || (state.latestStress?.toInt() ?: 0) >= 10), - emptyText = "No stress data yet — take a measurement.", + emptyText = stringResource(R.string.vitals_empty_stress), // Issue #67: say so on the card itself. A derived figure presented as a measurement // would be worse than the empty card it replaces. - footnote = if (state.stressIsDerived) "Estimated from HRV — your ring doesn't measure stress" else null, + footnote = if (state.stressIsDerived) stringResource(R.string.vitals_stress_derived_short) else null, onTap = { navController?.navigate("vitals/stress") }, ) DashboardCard.FATIGUE -> VitalGaugeCardItem( card = cards.getValue(MetricKind.FATIGUE), hasReading = state.fatigueSamples.isNotEmpty() && (state.latestFatigue?.toInt() ?: 0) >= 10, - emptyText = "No fatigue data yet — take a measurement.", + emptyText = stringResource(R.string.vitals_empty_fatigue), onTap = { navController?.navigate("vitals/fatigue") }, ) DashboardCard.GLUCOSE -> VitalGaugeCardItem( card = cards.getValue(MetricKind.GLUCOSE), hasReading = state.bloodSugar != null, - emptyText = "No blood sugar data yet.", + emptyText = stringResource(R.string.vitals_empty_glucose), measuring = measuring, onTap = { navController?.navigate("vitals/glucose") }, ) @@ -259,7 +262,7 @@ fun VitalsScreen( referenceBands = c.referenceBands, dashedRules = c.dashedRules, ) } else { - Text("No temperature data yet — temperature trends appear after overnight wear.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.vitals_empty_temp), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } } else -> {} @@ -277,8 +280,8 @@ fun VitalsScreen( item { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Vitals", style = MaterialTheme.typography.headlineLarge, fontWeight = FontWeight.Bold) - Text("Live measurements and trends", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.vitals_title), style = MaterialTheme.typography.headlineLarge, fontWeight = FontWeight.Bold) + Text(stringResource(R.string.vitals_subtitle), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } // Measure button: combined (0x23) for 56ff/Jring, or sequential live // HR + SpO₂ (0x69) for Colmi. Hidden for rings that support neither. @@ -339,6 +342,12 @@ fun VitalsScreen( // that runs them sequentially — 45 s against 75 s, with completely different // sample spacing — so a user after one should not be held for the other. The // combined flow keeps its single button: there it really is one packet. + val labelHr = stringResource(R.string.abbr_hr) + val labelSpo2 = stringResource(R.string.abbr_spo2) + val capHr = stringResource(R.string.vitals_caption_hr) + val capSpo2 = stringResource(R.string.vitals_caption_spo2) + val capCombined = stringResource(R.string.vitals_caption_combined) + val capSpot = stringResource(R.string.vitals_caption_spot) val separateLegs = !combinedMode && coordinator.canMeasureHeartRate && coordinator.canMeasureSpO2 // The legs the two separate controls don't cover. `measureSpot()` was the only @@ -348,12 +357,13 @@ fun VitalsScreen( // A ring that streams HRV gets it on its own control in the row below. val hrvOnRemaining = coordinator.canMeasureHrv && !coordinator.streamsSpotVitals val remainingLegsLabel = when { - coordinator.canMeasureBloodPressure && hrvOnRemaining -> "BP & HRV" - coordinator.canMeasureBloodPressure -> "BP" - hrvOnRemaining -> "HRV" + coordinator.canMeasureBloodPressure && hrvOnRemaining -> stringResource(R.string.vitals_bp_and_hrv) + coordinator.canMeasureBloodPressure -> stringResource(R.string.abbr_bp) + hrvOnRemaining -> stringResource(R.string.abbr_hrv) else -> null } // On-demand HRV / stress / temperature, one control each (issue #66's rule). + val capLegs = remainingLegsLabel?.let { stringResource(R.string.vitals_caption_fmt, it) } ?: "" val spotVitals = coordinator.measurableSpotVitals if (separateLegs) { // Stacked, not side by side: this sits in the header Row beside the title, @@ -367,14 +377,14 @@ fun VitalsScreen( enabled = !measuring, onClick = { runMeasurement( - coordinator.heartRateMeasureSeconds, "HR", - caption = "Keep still — measuring heart rate…", + coordinator.heartRateMeasureSeconds, labelHr, + caption = capHr, failed = { coordinator.hrState == failedState }, ) { coordinator.measureHeartRateOnly() } }, ) { Text( - if (measuring && measuringLabel == "HR") "HR ${remaining}s" else "HR", + if (measuring && measuringLabel == labelHr) stringResource(R.string.label_with_seconds, labelHr, remaining) else labelHr, color = androidx.compose.ui.graphics.Color.White, ) } @@ -382,14 +392,14 @@ fun VitalsScreen( enabled = !measuring, onClick = { runMeasurement( - coordinator.spo2OnlyMeasureSeconds, "SpO₂", - caption = "Keep still — measuring blood oxygen…", + coordinator.spo2OnlyMeasureSeconds, labelSpo2, + caption = capSpo2, failed = { coordinator.spo2State == failedState }, ) { coordinator.measureSpO2Only() } }, ) { Text( - if (measuring && measuringLabel == "SpO₂") "SpO₂ ${remaining}s" else "SpO₂", + if (measuring && measuringLabel == labelSpo2) stringResource(R.string.label_with_seconds, labelSpo2, remaining) else labelSpo2, color = androidx.compose.ui.graphics.Color.White, ) } @@ -399,7 +409,7 @@ fun VitalsScreen( onClick = { runMeasurement( coordinator.remainingLegsMeasureSeconds, remainingLegsLabel, - caption = "Keep still — measuring $remainingLegsLabel…", + caption = capLegs, failed = { (coordinator.canMeasureBloodPressure && coordinator.bloodPressureState == failedState) || @@ -410,7 +420,7 @@ fun VitalsScreen( ) { Text( if (measuring && measuringLabel == remainingLegsLabel) - "$remainingLegsLabel ${remaining}s" else remainingLegsLabel, + stringResource(R.string.label_with_seconds, remainingLegsLabel, remaining) else remainingLegsLabel, color = androidx.compose.ui.graphics.Color.White, ) } @@ -419,7 +429,8 @@ fun VitalsScreen( if (spotVitals.isNotEmpty()) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { for (vital in spotVitals) { - val label = vital.label + val label = spotVitalLabel(vital) + val capVital = stringResource(R.string.vitals_caption_fmt, spotVitalDescription(vital)) Button( enabled = !measuring, // Three to a row beside the title: tighter than the default 24 dp. @@ -427,13 +438,13 @@ fun VitalsScreen( onClick = { runMeasurement( coordinator.spotVitalMeasureSeconds, label, - caption = "Keep still — measuring ${vital.description}…", + caption = capVital, failed = { coordinator.vitalState(vital) == failedState }, ) { coordinator.measureVitalOnly(vital) } }, ) { Text( - if (measuring && measuringLabel == label) "$label ${remaining}s" else label, + if (measuring && measuringLabel == label) stringResource(R.string.label_with_seconds, label, remaining) else label, color = androidx.compose.ui.graphics.Color.White, ) } @@ -447,10 +458,7 @@ fun VitalsScreen( onClick = { runMeasurement( measureSeconds, "all", - caption = if (combinedMode) - "Keep still — measuring blood pressure, SpO₂, stress, fatigue & blood sugar…" - else - "Keep still — measuring heart rate & SpO₂…", + caption = if (combinedMode) capCombined else capSpot, failed = { !combinedMode && (coordinator.hrState == failedState || coordinator.spo2State == failedState) @@ -461,7 +469,7 @@ fun VitalsScreen( }, ) { Text( - if (measuring) "Measuring… ${remaining}s" else "Measure", + if (measuring) stringResource(R.string.vitals_measuring_seconds, remaining) else stringResource(R.string.vitals_measure), color = androidx.compose.ui.graphics.Color.White, ) } @@ -494,11 +502,11 @@ fun VitalsScreen( Text( when { measureDisconnectedHint -> - "The ring disconnected during measurement." + stringResource(R.string.vitals_fail_disconnected) measureNotWornHint -> - "The ring isn't detecting your finger. Put it on snugly, then try again." + stringResource(R.string.vitals_fail_not_worn) else -> - "Couldn't get a steady reading. Keep the ring snug and your hand still, then try again." + stringResource(R.string.vitals_fail_generic) }, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error, @@ -582,7 +590,7 @@ private fun VitalGaugeCardItem( Text(emptyText, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } if (measuring) { - Text("Measuring… updates when complete", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) + Text(stringResource(R.string.vitals_measuring_updates), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) } } } @@ -613,7 +621,7 @@ private fun BpGaugeColumn( zones = zones, valueColor = valueColor, centerValue = "${value.toInt()}", - centerUnit = "mmHg", + centerUnit = stringResource(R.string.unit_mmhg), size = 130.dp, lineWidth = 11.dp, ) @@ -652,13 +660,14 @@ fun VitalDetailScreen( val state by vm.state.collectAsState() val title = metricDisplayName(metric) + val disclaimerText = metricDisclaimer(metric, state.isDerived) Column(Modifier.fillMaxSize()) { // Inline nav bar (iOS .navigationBarTitleDisplayMode(.inline)): back on the leading // edge, title centered. Box(Modifier.fillMaxWidth().padding(vertical = 4.dp)) { IconButton(onClick = onBack, modifier = Modifier.align(Alignment.CenterStart)) { - Icon(Icons.Filled.ArrowBack, "Back") + Icon(Icons.Filled.ArrowBack, stringResource(R.string.action_back)) } Text( title, @@ -714,7 +723,7 @@ fun VitalDetailScreen( ) Row(verticalAlignment = Alignment.CenterVertically) { IconButton(onClick = { vm.prev() }, modifier = Modifier.size(28.dp)) { - Icon(Icons.Filled.ChevronLeft, "Previous", tint = PulseColors.textMuted) + Icon(Icons.Filled.ChevronLeft, stringResource(R.string.action_previous), tint = PulseColors.textMuted) } Text( text = dateLabel(state.anchor, state.period), @@ -728,7 +737,7 @@ fun VitalDetailScreen( modifier = Modifier.size(28.dp), ) { Icon( - Icons.Filled.ChevronRight, "Next", + Icons.Filled.ChevronRight, stringResource(R.string.action_next), tint = if (vm.canGoForward()) PulseColors.textMuted else PulseColors.textMuted.copy(alpha = 0.3f), ) } @@ -740,7 +749,7 @@ fun VitalDetailScreen( contentAlignment = Alignment.Center, ) { Text( - "Not enough data for this period.", + stringResource(R.string.detail_not_enough_data), fontSize = 13.sp, color = PulseColors.textMuted, ) @@ -753,8 +762,8 @@ fun VitalDetailScreen( ?: MaterialTheme.colorScheme.primary, secondary = state.secondary, colorSecondary = ZonePalette.accent(MetricKind.BLOOD_PRESSURE).copy(alpha = 0.5f), - legendPrimary = if (state.isBP) "Systolic" else null, - legendSecondary = if (state.isBP) "Diastolic" else null, + legendPrimary = if (state.isBP) stringResource(R.string.bp_systolic) else null, + legendSecondary = if (state.isBP) stringResource(R.string.bp_diastolic) else null, // Points arrive in display units from the VM; convert the zone/axis // reference to match so temp bands (°F) and glucose bands (mmol/L) // line up with the plotted line (iOS #43 §2/§3). @@ -780,13 +789,13 @@ fun VitalDetailScreen( .padding(horizontal = 10.dp, vertical = 14.dp), verticalAlignment = Alignment.CenterVertically, ) { - DetailStat("Latest", state.latest?.let { formatStat(it, metric, gUnit) } ?: "--", Modifier.weight(1f)) + DetailStat(stringResource(R.string.stat_latest), state.latest?.let { formatStat(it, metric, gUnit) } ?: "--", Modifier.weight(1f)) DetailStatDivider() - DetailStat("Average", state.avg?.let { formatStat(it, metric, gUnit) } ?: "--", Modifier.weight(1f)) + DetailStat(stringResource(R.string.stat_average), state.avg?.let { formatStat(it, metric, gUnit) } ?: "--", Modifier.weight(1f)) DetailStatDivider() - DetailStat("Min", state.min?.let { formatStat(it, metric, gUnit) } ?: "--", Modifier.weight(1f)) + DetailStat(stringResource(R.string.stat_min), state.min?.let { formatStat(it, metric, gUnit) } ?: "--", Modifier.weight(1f)) DetailStatDivider() - DetailStat("Max", state.max?.let { formatStat(it, metric, gUnit) } ?: "--", Modifier.weight(1f)) + DetailStat(stringResource(R.string.stat_max), state.max?.let { formatStat(it, metric, gUnit) } ?: "--", Modifier.weight(1f)) } } @@ -820,7 +829,7 @@ fun VitalDetailScreen( verticalArrangement = Arrangement.spacedBy(8.dp), ) { Text( - "REFERENCE ZONES", + stringResource(R.string.detail_reference_zones), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp, @@ -867,7 +876,7 @@ fun VitalDetailScreen( verticalArrangement = Arrangement.spacedBy(6.dp), ) { Text( - "WHAT THIS MEANS", + stringResource(R.string.detail_what_this_means), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp, @@ -885,7 +894,7 @@ fun VitalDetailScreen( // 7. Estimated-metric disclaimer (BP + glucose, iOS warning card; plus derived // stress, issue #67 — the card that opened this chart labels its number, and this // chart shows the same number, so it says the same thing here). - metricDisclaimer(metric, state.isDerived)?.let { disclaimer -> + disclaimerText?.let { disclaimer -> item { val cardShape = RoundedCornerShape(20.dp) Row( @@ -961,7 +970,7 @@ private fun ReadingsCard( verticalAlignment = Alignment.CenterVertically, ) { Text( - "READINGS", + stringResource(R.string.detail_readings), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp, @@ -976,7 +985,7 @@ private fun ReadingsCard( ) Icon( if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore, - contentDescription = if (expanded) "Hide readings" else "Show readings", + contentDescription = if (expanded) stringResource(R.string.detail_hide_readings) else stringResource(R.string.detail_show_readings), tint = PulseColors.textMuted, modifier = Modifier.size(20.dp), ) @@ -1012,7 +1021,7 @@ private fun ReadingsCard( if (reading.isEstimated) { Spacer(Modifier.width(4.dp)) Text( - "Estimated", + stringResource(R.string.badge_estimated), fontSize = 10.sp, color = PulseColors.warning, modifier = Modifier @@ -1026,7 +1035,7 @@ private fun ReadingsCard( ) { Icon( Icons.Filled.DeleteOutline, - contentDescription = "Delete this reading", + contentDescription = stringResource(R.string.detail_delete_reading), tint = PulseColors.textMuted, modifier = Modifier.size(18.dp), ) @@ -1038,7 +1047,8 @@ private fun ReadingsCard( onClick = { visibleCount += READINGS_PAGE_SIZE }, modifier = Modifier.padding(start = 8.dp), ) { - Text("Show ${minOf(READINGS_PAGE_SIZE, readings.size - visibleCount)} more", fontSize = 13.sp) + val more = minOf(READINGS_PAGE_SIZE, readings.size - visibleCount) + Text(pluralStringResource(R.plurals.detail_show_more, more, more), fontSize = 13.sp) } } Spacer(Modifier.height(8.dp)) @@ -1048,19 +1058,17 @@ private fun ReadingsCard( pendingDelete?.let { reading -> AlertDialog( onDismissRequest = { pendingDelete = null }, - title = { Text("Delete this reading?") }, + title = { Text(stringResource(R.string.detail_delete_reading_title)) }, text = { Text( buildString { - append(readingText(reading)) - if (unitLabel.isNotEmpty()) append(" $unitLabel") - append(" at ") - append(tooltipTime(reading.timestamp, period)) - append(".\n\nThis can't be undone.") + val valueText = readingText(reading) + if (unitLabel.isNotEmpty()) " $unitLabel" else "" + append(stringResource(R.string.detail_delete_reading_body, valueText, tooltipTime(reading.timestamp, period))) // Say so plainly rather than letting a user wonder why the reading // didn't come back after a re-sync — that is deliberate. if (reading.fromHistory) { - append(" The reading stays deleted the next time this day syncs.") + append(" ") + append(stringResource(R.string.detail_delete_reading_history)) } }, ) @@ -1069,10 +1077,10 @@ private fun ReadingsCard( TextButton(onClick = { onDelete(reading) pendingDelete = null - }) { Text("Delete", color = MaterialTheme.colorScheme.error) } + }) { Text(stringResource(R.string.action_delete), color = MaterialTheme.colorScheme.error) } }, dismissButton = { - TextButton(onClick = { pendingDelete = null }) { Text("Cancel") } + TextButton(onClick = { pendingDelete = null }) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -1103,7 +1111,7 @@ private fun PeriodSegmentedControl(selected: Period, onSelect: (Period) -> Unit) contentAlignment = Alignment.Center, ) { Text( - p.label, + stringResource(p.labelRes), fontSize = 13.sp, fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Medium, color = if (isSelected) PulseColors.textPrimary else PulseColors.textSecondary, @@ -1177,9 +1185,19 @@ private fun zoneRangeText( } /** Issue #103: the SpO₂ card's footnote, shared with the detail disclaimer so they never drift. */ -private const val ESTIMATED_SPO2_NOTE = - "Hourly readings are estimated from heart rate — this ring's hourly SpO₂ isn't a separate " + - "measurement. Spot readings you take are measured." +@Composable +private fun spotVitalLabel(vital: com.pulseloop.ring.SpotVital): String = when (vital) { + com.pulseloop.ring.SpotVital.HRV -> stringResource(R.string.abbr_hrv) + com.pulseloop.ring.SpotVital.STRESS -> stringResource(R.string.spot_label_stress) + com.pulseloop.ring.SpotVital.TEMPERATURE -> stringResource(R.string.spot_label_temp) +} + +@Composable +private fun spotVitalDescription(vital: com.pulseloop.ring.SpotVital): String = when (vital) { + com.pulseloop.ring.SpotVital.HRV -> stringResource(R.string.spot_desc_hrv) + com.pulseloop.ring.SpotVital.STRESS -> stringResource(R.string.spot_desc_stress) + com.pulseloop.ring.SpotVital.TEMPERATURE -> stringResource(R.string.spot_desc_temp) +} /** * Warning-card copy for estimated metrics (iOS `disclaimerText`); null hides the card. @@ -1189,54 +1207,41 @@ private const val ESTIMATED_SPO2_NOTE = * an inference, and the user is entitled to know that without leaving the chart. For SpO₂ it is * issue #103: hourly readings this ring computes from heart rate rather than measures. */ +@Composable private fun metricDisclaimer(metric: String, isDerived: Boolean): String? = when { - metric == "stress" && isDerived -> - "Estimated from HRV — your ring doesn't measure stress. Scored against your own recent " + - "HRV readings, so it says how this reading compares with your normal, not how you compare " + - "with anyone else." + metric == "stress" && isDerived -> stringResource(R.string.disclaimer_stress_derived) metric == "spo2" && isDerived -> - "$ESTIMATED_SPO2_NOTE On this ring the same heart rate always comes with the same hourly " + - "SpO₂, so a night-time dip here follows a low sleeping heart rate rather than measuring oxygen." - metric == "glucose" -> - "Estimated wellness metric — not for dosing or diabetes decisions. No smart ring or watch is " + - "FDA-authorized to measure or estimate glucose on its own." - metric == "bp" -> - "Ring blood pressure is an estimate. Calibrate against a validated cuff in Settings → Calibration, " + - "and talk to a clinician about persistent high or low readings." + stringResource(R.string.vitals_spo2_estimated_note) + " " + stringResource(R.string.disclaimer_spo2_derived) + metric == "glucose" -> stringResource(R.string.disclaimer_glucose) + metric == "bp" -> stringResource(R.string.disclaimer_bp) else -> null } /** Detail titles use MetricKind.title's sentence case (iOS navigation titles). */ +@Composable private fun metricDisplayName(metric: String): String = when (metric) { - "hr" -> "Heart rate" - "spo2" -> "Blood oxygen" - "stress" -> "Stress" - "fatigue" -> "Fatigue" - "hrv" -> "HRV" - "temp" -> "Skin temperature" - "bp" -> "Blood pressure" - "glucose" -> "Blood sugar" + "hr" -> stringResource(R.string.metric_heart_rate) + "spo2" -> stringResource(R.string.metric_blood_oxygen) + "stress" -> stringResource(R.string.metric_stress) + "fatigue" -> stringResource(R.string.metric_fatigue) + "hrv" -> stringResource(R.string.abbr_hrv) + "temp" -> stringResource(R.string.metric_skin_temperature) + "bp" -> stringResource(R.string.metric_blood_pressure) + "glucose" -> stringResource(R.string.metric_blood_sugar) else -> metric } /** "WHAT THIS MEANS" copy, verbatim from iOS MetricDetailView `explainerText`. */ +@Composable private fun metricExplainer(metric: String): String = when (metric) { - "hr" -> "Resting heart rate reflects how hard your heart works at rest. A typical adult range is 60–100 bpm; " + - "fitness, medication, caffeine, and stress all shift it." - "spo2" -> "Blood oxygen (SpO₂) is the percentage of oxygen your blood carries. 95–100% is normal; " + - "altitude and lung conditions can lower it." - "hrv" -> "Heart-rate variability is the variation between beats. It's highly individual, so we track it " + - "against your personal baseline rather than a universal cutoff." - "bp" -> "Blood pressure is systolic over diastolic (mmHg). The category is the worse of the two. " + - "A ring estimate is not a substitute for a cuff." - "stress" -> "A device wellness score from 0–100 based on heart-rate patterns. Lower is calmer. " + - "It's an estimate, not a medical stress measure." - "fatigue" -> "A device wellness score from 0–100 estimating tiredness. Higher means more fatigue. " + - "It's a ring estimate, not a clinical scale." - "glucose" -> "An estimated glucose value. No smart ring is cleared to measure glucose, so treat this " + - "as a wellness estimate only." - "temp" -> "Skin temperature from the ring runs cooler than core body temperature. " + - "Trends over time matter more than any single reading." + "hr" -> stringResource(R.string.explainer_hr) + "spo2" -> stringResource(R.string.explainer_spo2) + "hrv" -> stringResource(R.string.explainer_hrv) + "bp" -> stringResource(R.string.explainer_bp) + "stress" -> stringResource(R.string.explainer_stress) + "fatigue" -> stringResource(R.string.explainer_fatigue) + "glucose" -> stringResource(R.string.explainer_glucose) + "temp" -> stringResource(R.string.explainer_temp) else -> "" } @@ -1249,7 +1254,7 @@ private fun dateLabel(anchor: Long, period: Period): String { val end = dt.plusDays(6) "${dt.toLocalDate()} – ${end.toLocalDate()}" } - Period.MONTH -> "${dt.month.name.take(3)} ${dt.year}" + Period.MONTH -> dt.format(com.pulseloop.util.LocaleFormats.formatter("LLLyyyy", "MMM yyyy")) } } @@ -1257,9 +1262,9 @@ private fun dateLabel(anchor: Long, period: Period): String { private fun tooltipTime(ts: Long, period: Period): String { val z = java.time.Instant.ofEpochMilli(ts).atZone(java.time.ZoneId.systemDefault()) return when (period) { - Period.DAY -> z.format(java.time.format.DateTimeFormatter.ofPattern("h:mm a", java.util.Locale.getDefault())) - Period.WEEK -> "${z.dayOfWeek.name.take(3)} ${z.dayOfMonth}" - Period.MONTH -> "${z.month.name.take(3)} ${z.dayOfMonth}" + Period.DAY -> z.format(com.pulseloop.util.LocaleFormats.time()) + Period.WEEK -> z.format(com.pulseloop.util.LocaleFormats.formatter("EEEd", "EEE d")) + Period.MONTH -> z.format(com.pulseloop.util.LocaleFormats.formatter("MMMd", "MMM d")) } } diff --git a/app/src/main/java/com/pulseloop/ui/screens/SettingsScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/SettingsScreen.kt index 419e8e71..de3deeb5 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/SettingsScreen.kt @@ -1,6 +1,8 @@ package com.pulseloop.ui.screens import androidx.activity.compose.rememberLauncherForActivityResult +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.* import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll @@ -72,18 +74,18 @@ fun SettingsScreen( // Provider-aware AI Coach summary — mirrors iOS `coachTrailing` (no Apple on-device // mode on Android; hosted providers show the selected model slug). - val coachTrailing = if (!coachEnabled) "Off" else when (providerStore.providerMode) { - CoachProviderMode.OFFLINE_STUB -> "Offline" + val coachTrailing = if (!coachEnabled) stringResource(R.string.status_off) else when (providerStore.providerMode) { + CoachProviderMode.OFFLINE_STUB -> stringResource(R.string.status_offline) CoachProviderMode.USER_GEMINI_KEY -> providerStore.geminiModel CoachProviderMode.USER_OPENROUTER_KEY -> providerStore.openRouterModel CoachProviderMode.USER_MINIMAX_KEY -> providerStore.minimaxModel // Local: the model name, or just "Local" for a server (llama.cpp) that ignores the field. CoachProviderMode.LOCAL_OPENAI_COMPAT -> - providerStore.localModel.ifBlank { "Local" } - CoachProviderMode.BACKEND_PROXY -> "Backend proxy" + providerStore.localModel.ifBlank { stringResource(R.string.coach_local_short) } + CoachProviderMode.BACKEND_PROXY -> stringResource(R.string.coach_backend_proxy) else -> keyStore.model } - val notificationsTrailing = if (keyStore.notificationsEnabled) "On" else "Off" + val notificationsTrailing = if (keyStore.notificationsEnabled) stringResource(R.string.status_on) else stringResource(R.string.status_off) // The Health Connect READ_STEPS permission is requested only from the Step Source // row below, on the user's explicit action. MainActivity deliberately does not @@ -131,7 +133,7 @@ fun SettingsScreen( Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(16.dp), verticalArrangement = Arrangement.spacedBy(20.dp), ) { - Text("Settings", style = MaterialTheme.typography.headlineLarge, fontWeight = FontWeight.Bold) + Text(stringResource(R.string.settings_title), style = MaterialTheme.typography.headlineLarge, fontWeight = FontWeight.Bold) DeviceHeroCard( bleState = bleState, @@ -149,13 +151,13 @@ fun SettingsScreen( // AI COACH — check-ins are a coach sub-feature, only shown once the coach is on. SettingsSection( - title = "AI Coach", + title = stringResource(R.string.coach_title), rows = buildList { - add(SettingsRowItem(Icons.Filled.AutoAwesome, PulseColors.accent, "AI Coach", coachTrailing) { + add(SettingsRowItem(Icons.Filled.AutoAwesome, PulseColors.accent, stringResource(R.string.coach_title), coachTrailing) { navigate("settings/coach") }) if (coachEnabled) { - add(SettingsRowItem(Icons.Filled.NotificationsActive, PulseColors.warning, "Coach Check-Ins", notificationsTrailing) { + add(SettingsRowItem(Icons.Filled.NotificationsActive, PulseColors.warning, stringResource(R.string.settings_checkins), notificationsTrailing) { navigate("settings/checkins") }) } @@ -168,16 +170,16 @@ fun SettingsScreen( // MEASUREMENT_INTERVAL, so the generic 56ff jring never shows this row (iOS #74: dropped the // old ring-only "Device" section for this since the row had no other members). SettingsSection( - title = "General", + title = stringResource(R.string.settings_general), rows = buildList { - add(SettingsRowItem(Icons.Filled.AccountCircle, PulseColors.accent, "User Profile") { + add(SettingsRowItem(Icons.Filled.AccountCircle, PulseColors.accent, stringResource(R.string.settings_profile)) { navigate("settings/profile") }) - add(SettingsRowItem(Icons.Filled.MonitorHeart, PulseColors.hrv, "Physiology") { + add(SettingsRowItem(Icons.Filled.MonitorHeart, PulseColors.hrv, stringResource(R.string.settings_physiology)) { navigate("settings/physiology") }) if (capabilities.contains(WearableCapability.MEASUREMENT_INTERVAL)) { - add(SettingsRowItem(Icons.Filled.Timer, PulseColors.spo2, "Measurement Frequency") { + add(SettingsRowItem(Icons.Filled.Timer, PulseColors.spo2, stringResource(R.string.settings_measurement)) { navigate("settings/measurement") }) } @@ -186,12 +188,12 @@ fun SettingsScreen( // METRICS SettingsSection( - title = "Metrics", + title = stringResource(R.string.settings_metrics), rows = listOf( - SettingsRowItem(Icons.Filled.TrackChanges, PulseColors.readiness, "Goals") { + SettingsRowItem(Icons.Filled.TrackChanges, PulseColors.readiness, stringResource(R.string.settings_goals)) { navigate("settings/goals") }, - SettingsRowItem(Icons.Filled.RestaurantMenu, PulseColors.calories, "Nutrition") { + SettingsRowItem(Icons.Filled.RestaurantMenu, PulseColors.calories, stringResource(R.string.settings_nutrition)) { navigate("settings/nutrition") }, ), @@ -205,13 +207,13 @@ fun SettingsScreen( // events and writes each day's row; the Activity screen's Flows pick up the new // rows automatically. SettingsSection( - title = "Step Source", + title = stringResource(R.string.step_source_section), rows = listOf( SettingsRowItem( icon = Icons.Filled.Timeline, tint = PulseColors.accent, - title = "Data Source", - trailingValue = if (stepSource == StepSourcePrefs.SOURCE_PHONE) "Phone" else "Ring" + title = stringResource(R.string.step_source_row), + trailingValue = if (stepSource == StepSourcePrefs.SOURCE_PHONE) stringResource(R.string.step_source_phone) else stringResource(R.string.step_source_ring) ) { val newSource = if (stepSource == StepSourcePrefs.SOURCE_RING) StepSourcePrefs.SOURCE_PHONE else StepSourcePrefs.SOURCE_RING stepSource = newSource // optimistic UI; persisted only once proven valid @@ -236,9 +238,9 @@ fun SettingsScreen( context, when (availability) { HealthConnectAvailability.PROVIDER_UPDATE_REQUIRED -> - "Health Connect needs an update before phone steps can be used." + context.getString(R.string.step_source_hc_update) else -> - "Health Connect isn't available on this device." + context.getString(R.string.step_source_hc_missing) }, Toast.LENGTH_LONG, ).show() @@ -286,21 +288,21 @@ fun SettingsScreen( // RESOURCES — Calibration is jring-only (Colmi rings measure neither BP nor blood // sugar); Developer is hidden until unlocked by tapping the version 7× in About. SettingsSection( - title = "Resources", + title = stringResource(R.string.settings_resources), rows = buildList { if (capabilities.contains(WearableCapability.BLOOD_PRESSURE) || capabilities.contains(WearableCapability.BLOOD_SUGAR) ) { - add(SettingsRowItem(Icons.Filled.Tune, PulseColors.bloodPressure, "Calibration") { + add(SettingsRowItem(Icons.Filled.Tune, PulseColors.bloodPressure, stringResource(R.string.settings_calibration)) { navigate("settings/calibration") }) } if (developerUnlocked) { - add(SettingsRowItem(Icons.Filled.BugReport, PulseColors.danger, "Developer") { + add(SettingsRowItem(Icons.Filled.BugReport, PulseColors.danger, stringResource(R.string.settings_developer)) { navigate("debug") }) } - add(SettingsRowItem(Icons.Filled.Shield, PulseColors.success, "Privacy & Data") { + add(SettingsRowItem(Icons.Filled.Shield, PulseColors.success, stringResource(R.string.settings_privacy)) { navigate("settings/privacy") }) add(SettingsRowItem(Icons.Filled.TrendingUp, PulseColors.calories, "Strava") { @@ -309,7 +311,7 @@ fun SettingsScreen( add(SettingsRowItem(Icons.Filled.Sync, PulseColors.success, "Health Connect") { navigate("settings/health-connect") }) - add(SettingsRowItem(Icons.Filled.Info, PulseColors.textMuted, "About PulseLoop") { + add(SettingsRowItem(Icons.Filled.Info, PulseColors.textMuted, stringResource(R.string.settings_about_app)) { navigate("settings/about") }) }, 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 a1e8bb9c..18ed6700 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/SettingsSubScreens.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/SettingsSubScreens.kt @@ -1,5 +1,9 @@ package com.pulseloop.ui.screens +import com.pulseloop.util.L10n +import androidx.compose.ui.res.pluralStringResource +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import android.Manifest import android.content.Context import android.content.Intent @@ -118,7 +122,7 @@ private fun SettingsSubScreen( title = { Text(title) }, navigationIcon = { IconButton(onClick = onBack) { - Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back") + Icon(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.action_back)) } }, windowInsets = WindowInsets(0, 0, 0, 0), @@ -211,24 +215,24 @@ fun CoachSettingsScreen(onBack: () -> Unit) { // / o4-mini are gone from it (issue #77), and a stored one reads as the default. val models = com.pulseloop.coach.config.OpenAIModel.entries.map { it.slug to it.blurb } - SettingsSubScreen(title = "AI Coach", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.coach_title), onBack = onBack) { // AI Coach section — ported from CoachSettingsSection.swift Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("AI Coach", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.coach_title), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) // Readiness differs by provider: the local mode is gated by the server address, // not a key, so the old key-only check told a correctly-configured user their // "API key" was missing. val isLocal = providerStore.providerMode == CoachProviderMode.LOCAL_OPENAI_COMPAT val ready = if (isLocal) providerStore.hasLocalBaseUrl else keyStore.apiKey.isNotBlank() - val activeModel = if (isLocal) providerStore.localModel.ifBlank { "local server" } + val activeModel = if (isLocal) providerStore.localModel.ifBlank { context.getString(R.string.coach_local_server) } else selectedModel Text( - if (coachEnabled && ready) "Active — $activeModel" - else if (coachEnabled && isLocal) "Server address needed" - else if (coachEnabled) "API key needed" - else "Disabled", + if (coachEnabled && ready) stringResource(R.string.coach_status_active, activeModel) + else if (coachEnabled && isLocal) stringResource(R.string.coach_status_server_needed) + else if (coachEnabled) stringResource(R.string.coach_status_key_needed) + else stringResource(R.string.status_disabled), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -236,7 +240,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { // Master toggle Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - Text("Enable AI Coach") + Text(stringResource(R.string.coach_enable)) Switch(checked = coachEnabled, onCheckedChange = { enabled -> coachEnabled = enabled; keyStore.coachEnabled = enabled if (!enabled) { @@ -254,7 +258,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { if (checkInPermissionDenied) { Spacer(Modifier.height(4.dp)) Text( - "Notifications are off for PulseLoop. Turn them on in Android Settings to get check-ins.", + stringResource(R.string.coach_notifications_off), style = MaterialTheme.typography.bodySmall, color = PulseColors.danger, ) @@ -304,13 +308,13 @@ fun CoachSettingsScreen(onBack: () -> Unit) { val providerOptions = listOf( CoachProviderMode.USER_OPENAI_KEY to "OpenAI", CoachProviderMode.USER_GEMINI_KEY to "Google Gemini", - CoachProviderMode.USER_OPENROUTER_KEY to "OpenRouter (100+ models)", + CoachProviderMode.USER_OPENROUTER_KEY to stringResource(R.string.coach_provider_openrouter), CoachProviderMode.USER_MINIMAX_KEY to "MiniMax", - CoachProviderMode.LOCAL_OPENAI_COMPAT to "Local / self-hosted (no key needed)", + CoachProviderMode.LOCAL_OPENAI_COMPAT to stringResource(R.string.coach_provider_local), ) val providerLabel = providerOptions.firstOrNull { it.first == providerMode }?.second ?: "OpenAI" - Text("Provider", style = MaterialTheme.typography.labelMedium) + Text(stringResource(R.string.coach_provider), style = MaterialTheme.typography.labelMedium) Spacer(Modifier.height(4.dp)) var providerExpanded by remember { mutableStateOf(false) } Box { @@ -357,7 +361,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { IconButton(onClick = onVisibility) { Icon( if (visible) Icons.Filled.VisibilityOff else Icons.Filled.Visibility, - contentDescription = "Toggle visibility" + contentDescription = stringResource(R.string.action_toggle_visibility) ) } }, @@ -365,15 +369,15 @@ fun CoachSettingsScreen(onBack: () -> Unit) { ) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { Button(onClick = save, enabled = value.isNotBlank(), modifier = Modifier.weight(1f)) { - Text(if (saved) "Update Key" else "Save Key") + Text(if (saved) stringResource(R.string.coach_key_update) else stringResource(R.string.coach_key_save)) } if (saved) { - OutlinedButton(onClick = onRemove, modifier = Modifier.weight(1f)) { Text("Remove") } + OutlinedButton(onClick = onRemove, modifier = Modifier.weight(1f)) { Text(stringResource(R.string.action_remove)) } } } if (justSaved) { Text( - "Saved ✓", + stringResource(R.string.status_saved_check), style = MaterialTheme.typography.bodySmall, color = PulseColors.success, modifier = Modifier.padding(top = 4.dp), @@ -413,7 +417,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { onListing = { liveListing = it }, ) KeyField( - label = "Gemini API Key", value = geminiKey, visible = geminiKeyVisible, + label = stringResource(R.string.coach_key_label, "Gemini"), value = geminiKey, visible = geminiKeyVisible, saved = providerStore.hasGeminiKey, onValue = { geminiKey = it }, onVisibility = { geminiKeyVisible = !geminiKeyVisible }, onSave = { providerStore.geminiApiKey = geminiKey; keySaves++ }, @@ -433,13 +437,13 @@ fun CoachSettingsScreen(onBack: () -> Unit) { OutlinedTextField( value = orModel, onValueChange = { orModel = it; providerStore.openRouterModel = it }, - label = { Text("Custom model slug (vendor/model)") }, + label = { Text(stringResource(R.string.coach_custom_slug)) }, modifier = Modifier.fillMaxWidth(), singleLine = true, ) Spacer(Modifier.height(8.dp)) KeyField( - label = "OpenRouter API Key", value = orKey, visible = orKeyVisible, + label = stringResource(R.string.coach_key_label, "OpenRouter"), value = orKey, visible = orKeyVisible, saved = providerStore.hasOpenRouterKey, onValue = { orKey = it }, onVisibility = { orKeyVisible = !orKeyVisible }, onSave = { providerStore.openRouterApiKey = orKey; keySaves++ }, @@ -448,14 +452,14 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Spacer(Modifier.height(8.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Privacy routing") - Text("Only providers that don't retain data", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.coach_privacy_routing)) + Text(stringResource(R.string.coach_privacy_routing_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } Switch(checked = orPrivacy, onCheckedChange = { orPrivacy = it; providerStore.orPrivacyRouting = it }) } ModelDropdown( - "Route by", orSort ?: "auto", - listOf("auto" to "Balanced (default)", "price" to "Cheapest first", "throughput" to "Fastest first", "latency" to "Lowest latency first"), + stringResource(R.string.coach_route_by), orSort ?: "auto", + listOf("auto" to stringResource(R.string.coach_route_auto), "price" to stringResource(R.string.coach_route_price), "throughput" to stringResource(R.string.coach_route_throughput), "latency" to stringResource(R.string.coach_route_latency)), ) { providerStore.orProviderSort = it.takeIf { s -> s != "auto" }; orSort = providerStore.orProviderSort } } CoachProviderMode.USER_MINIMAX_KEY -> { @@ -467,7 +471,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { onListing = { liveListing = it }, ) KeyField( - label = "MiniMax API Key", value = minimaxKey, visible = minimaxKeyVisible, + label = stringResource(R.string.coach_key_label, "MiniMax"), value = minimaxKey, visible = minimaxKeyVisible, saved = providerStore.hasMinimaxKey, onValue = { minimaxKey = it }, onVisibility = { minimaxKeyVisible = !minimaxKeyVisible }, onSave = { providerStore.minimaxApiKey = minimaxKey; keySaves++ }, @@ -487,7 +491,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { localProbeResult = null; localProbeOk = false localProbeNotes = emptyList(); localDiscovered = emptyList() }, - label = { Text("Server address") }, + label = { Text(stringResource(R.string.coach_server_address)) }, placeholder = { Text("http://192.168.1.50:11434") }, modifier = Modifier.fillMaxWidth(), singleLine = true, @@ -496,8 +500,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { ) Text( urlProblem?.let { LocalEndpoint.message(it) } - ?: "Default ports — Ollama 11434 · LM Studio 1234 · llama.cpp 8080 · vLLM 8000 · SGLang 30000. " + - "The /v1 path is added for you.", + ?: stringResource(R.string.coach_default_ports), style = MaterialTheme.typography.bodySmall, color = if (urlProblem != null) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurfaceVariant, @@ -559,18 +562,17 @@ fun CoachSettingsScreen(onBack: () -> Unit) { localProbeOk = false; localProbeResult = e.reason } catch (e: Exception) { localProbeOk = false - localProbeResult = e.message ?: "Couldn't reach the server." + localProbeResult = e.message ?: context.getString(R.string.coach_server_unreachable) } localProbeBusy = false } }, enabled = localBaseUrl.isNotBlank() && urlProblem == null && !localProbeBusy, modifier = Modifier.fillMaxWidth(), - ) { Text(if (localProbeBusy) "Detecting…" else "Detect server & configure") } + ) { Text(if (localProbeBusy) stringResource(R.string.coach_detecting) else stringResource(R.string.coach_detect)) } if (localProbeBusy) { Text( - "Sending three tiny test messages. This can take a minute if the model " + - "still has to load.", + stringResource(R.string.coach_detect_hint), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp), @@ -598,7 +600,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Spacer(Modifier.height(8.dp)) if (localDiscovered.isNotEmpty()) { ModelDropdown( - "Model", localModel.ifBlank { "Choose a model" }, + stringResource(R.string.coach_model), localModel.ifBlank { context.getString(R.string.coach_choose_model) }, localDiscovered.map { it to "" }, ) { localModel = it; providerStore.localModel = it } } @@ -607,7 +609,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { OutlinedTextField( value = localModel, onValueChange = { localModel = it; providerStore.localModel = it }, - label = { Text("Model name") }, + label = { Text(stringResource(R.string.coach_model_name)) }, placeholder = { Text("qwen3:8b") }, modifier = Modifier.fillMaxWidth(), singleLine = true, @@ -615,14 +617,14 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Spacer(Modifier.height(8.dp)) KeyField( - label = "API key (optional)", value = localKey, visible = localKeyVisible, + label = stringResource(R.string.coach_key_optional), value = localKey, visible = localKeyVisible, saved = providerStore.hasLocalKey, onValue = { localKey = it }, onVisibility = { localKeyVisible = !localKeyVisible }, onSave = { providerStore.localApiKey = localKey }, onRemove = { localKey = ""; providerStore.localApiKey = "" }, ) Text( - "Only needed if you started the server with --api-key. Leave blank otherwise.", + stringResource(R.string.coach_key_optional_hint), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -630,10 +632,9 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Spacer(Modifier.height(8.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Tool calling") + Text(stringResource(R.string.coach_tool_calling)) Text( - "Lets the coach read your data. Detect sets this for you; turn it off " + - "if your server rejects tools (vLLM needs --enable-auto-tool-choice).", + stringResource(R.string.coach_tool_calling_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -645,7 +646,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Spacer(Modifier.height(8.dp)) ModelDropdown( - "Response format", localStructured.label, + stringResource(R.string.coach_response_format), localStructured.label, LocalStructuredOutput.entries.map { it.label to it.blurb }, ) { picked -> val mode = LocalStructuredOutput.entries.first { it.label == picked } @@ -659,7 +660,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { localMaxTokens = it.filter { c -> c.isDigit() } providerStore.localMaxTokens = localMaxTokens.toIntOrNull() ?: 0 }, - label = { Text("Max tokens") }, + label = { Text(stringResource(R.string.coach_max_tokens)) }, placeholder = { Text("auto") }, modifier = Modifier.weight(1f), singleLine = true, @@ -671,7 +672,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { localTimeout = it.filter { c -> c.isDigit() } localTimeout.toIntOrNull()?.let { v -> providerStore.localTimeoutSeconds = v } }, - label = { Text("Timeout (s)") }, + label = { Text(stringResource(R.string.coach_timeout)) }, modifier = Modifier .weight(1f) // The store clamps to 10..1800 on write, and a blank field @@ -689,8 +690,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { ) } Text( - "Leave max tokens blank to let the server decide. Raise the timeout for a large " + - "model on CPU — a slow reply is not retried.", + stringResource(R.string.coach_tokens_hint), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp), @@ -706,7 +706,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { onListing = { liveListing = it }, ) KeyField( - label = "OpenAI API Key", value = apiKey, visible = apiKeyVisible, + label = stringResource(R.string.coach_key_label, "OpenAI"), value = apiKey, visible = apiKeyVisible, saved = keyStore.apiKey.isNotBlank(), onValue = { apiKey = it }, onVisibility = { apiKeyVisible = !apiKeyVisible }, onSave = { keyStore.apiKey = apiKey; keySaves++ }, @@ -716,7 +716,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { } Spacer(Modifier.height(4.dp)) Text( - "Stored securely in Android Keystore. Never leaves your device except to call the model. Provider changes apply from your next message.", + stringResource(R.string.coach_key_storage_note), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -741,17 +741,17 @@ fun CoachSettingsScreen(onBack: () -> Unit) { val shownEffort = com.pulseloop.coach.config.ReasoningEfforts.resolve(effortProvider, effortModel, reasoningEffort, liveEntry) Spacer(Modifier.height(8.dp)) ModelDropdown( - "Reasoning effort", - com.pulseloop.coach.config.ReasoningEffort.fromRaw(shownEffort)?.label ?: "Default", - listOf("default" to "Model decides (default)") + effortOptions.map { it.rawValue to it.label }, + stringResource(R.string.coach_reasoning_effort), + com.pulseloop.coach.config.ReasoningEffort.fromRaw(shownEffort)?.label ?: stringResource(R.string.coach_effort_default), + listOf("default" to stringResource(R.string.coach_effort_model_decides)) + effortOptions.map { it.rawValue to it.label }, ) { providerStore.reasoningEffort = it.takeIf { s -> s != "default" }; reasoningEffort = providerStore.reasoningEffort } } // Image attachments (iOS #31): gates the attach button in the coach chat. Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Image attachments") - Text("Attach photos to coach messages", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.coach_image_attachments)) + Text(stringResource(R.string.coach_image_attachments_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } Switch(checked = imageInput, onCheckedChange = { imageInput = it; providerStore.imageInputEnabled = it }) } @@ -765,12 +765,12 @@ fun CoachSettingsScreen(onBack: () -> Unit) { providerMode != CoachProviderMode.LOCAL_OPENAI_COMPAT) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Web Search") - Text("Uses additional tokens", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.coach_web_search)) + Text(stringResource(R.string.coach_web_search_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) // Free-tier Gemini keys can be refused Google Search grounding (HTTP 429) // while every other call works; the coach then answers without it (issue #123). if (providerMode == CoachProviderMode.USER_GEMINI_KEY) { - Text("Google Search grounding may need a paid Gemini plan — free-tier keys can be refused, and the coach then answers without web results.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.coach_gemini_search_note), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } } Switch(checked = webSearch, onCheckedChange = { @@ -780,8 +780,8 @@ fun CoachSettingsScreen(onBack: () -> Unit) { } Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Write Actions") - Text("Set goals, log, edit data", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.coach_write_actions)) + Text(stringResource(R.string.coach_write_actions_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } Switch(checked = writeTools, onCheckedChange = { writeTools = it; keyStore.writeToolsEnabled = it @@ -789,8 +789,8 @@ fun CoachSettingsScreen(onBack: () -> Unit) { } Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Live Measurements") - Text("Trigger real-time ring readings", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.coach_live_measurements)) + Text(stringResource(R.string.coach_live_measurements_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } Switch(checked = liveMeasurements, onCheckedChange = { liveMeasurements = it; keyStore.liveMeasurementsEnabled = it @@ -798,8 +798,8 @@ fun CoachSettingsScreen(onBack: () -> Unit) { } Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Use location & weather") - Text("Grounds suggestions in your city's current weather", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.coach_location_weather)) + Text(stringResource(R.string.coach_location_weather_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) } Switch(checked = environmentContext, onCheckedChange = { setEnvironmentContext(it) }) } @@ -812,9 +812,9 @@ fun CoachSettingsScreen(onBack: () -> Unit) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - Text("Coach Memory", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.coach_memory), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) TextButton(onClick = { showMemory = !showMemory }) { - Text(if (showMemory) "Hide" else "Show (${memories.size})") + Text(if (showMemory) stringResource(R.string.action_hide) else stringResource(R.string.action_show_count, memories.size)) } } if (showMemory) { @@ -832,7 +832,7 @@ fun CoachSettingsScreen(onBack: () -> Unit) { IconButton(onClick = { scope.launch { db.coachMemoryDao().deleteByKey(memory.key) } }) { - Icon(Icons.Filled.Delete, "Delete", tint = MaterialTheme.colorScheme.error) + Icon(Icons.Filled.Delete, stringResource(R.string.action_delete), tint = MaterialTheme.colorScheme.error) } } } @@ -846,13 +846,13 @@ fun CoachSettingsScreen(onBack: () -> Unit) { if (askEnableCheckIns) { AlertDialog( onDismissRequest = { askEnableCheckIns = false }, - title = { Text("Enable Coach Check-Ins?") }, - text = { Text("Get a daily check-in from your coach. You can change this anytime in Coach Check-Ins.") }, + title = { Text(stringResource(R.string.checkins_enable_title)) }, + text = { Text(stringResource(R.string.checkins_enable_body)) }, confirmButton = { - TextButton(onClick = { askEnableCheckIns = false; enableCheckIns() }) { Text("Enable") } + TextButton(onClick = { askEnableCheckIns = false; enableCheckIns() }) { Text(stringResource(R.string.action_enable)) } }, dismissButton = { - TextButton(onClick = { askEnableCheckIns = false }) { Text("Not now") } + TextButton(onClick = { askEnableCheckIns = false }) { Text(stringResource(R.string.action_not_now)) } }, ) } @@ -929,14 +929,14 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { } } - SettingsSubScreen(title = "Coach Check-Ins", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.settings_checkins), onBack = onBack) { if (!coachEnabled) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("AI Coach is off", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.checkins_coach_off), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "Enable the AI Coach to change these — daily check-ins are written by the coach from your recent trends.", + stringResource(R.string.checkins_coach_off_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -946,11 +946,11 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Daily check-ins", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.checkins_daily), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(12.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - Text("Daily Check-in Notifications") + Text(stringResource(R.string.checkins_daily_notifications)) Switch( enabled = coachEnabled, checked = notificationEnabled, @@ -960,7 +960,7 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { if (notifPermissionDenied) { Text( - "Notifications are disabled for PulseLoop in Android Settings.", + stringResource(R.string.notifications_disabled_system), style = MaterialTheme.typography.bodySmall, color = PulseColors.danger, ) @@ -971,7 +971,7 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { // Morning time picker var morningHour by remember { mutableStateOf(keyStore.morningHour) } Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - Text("Morning") + Text(stringResource(R.string.checkins_morning)) var amExpanded by remember { mutableStateOf(false) } Box { OutlinedButton(enabled = coachEnabled, onClick = { amExpanded = true }) { @@ -991,7 +991,7 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { // Evening time picker var eveningHour by remember { mutableStateOf(keyStore.eveningHour) } Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - Text("Evening") + Text(stringResource(R.string.checkins_evening)) var pmExpanded by remember { mutableStateOf(false) } Box { OutlinedButton(enabled = coachEnabled, onClick = { pmExpanded = true }) { @@ -1015,14 +1015,14 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { scope.launch { CoachNotifications.showNow( context, - "PulseLoop Coach", - "This is a test check-in notification.", + context.getString(R.string.checkins_test_title), + context.getString(R.string.checkins_test_body), ) } }, modifier = Modifier.fillMaxWidth(), ) { - Text("Send Test Check-in Now") + Text(stringResource(R.string.checkins_send_test)) } } } @@ -1032,16 +1032,16 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { // NotificationsSettingsView section): a local notification at <20% / <10%, once per day. Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Ring battery alerts", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.battery_alerts_title), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "Get notified when your ring drops below 20% and 10%, so tracking doesn't stop mid-day.", + stringResource(R.string.battery_alerts_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(12.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - Text("Low Battery Notifications") + Text(stringResource(R.string.battery_alerts_switch)) Switch( checked = batteryAlertsEnabled, onCheckedChange = { setBatteryAlerts(it) }, @@ -1049,7 +1049,7 @@ fun CheckInsSettingsScreen(onBack: () -> Unit) { } if (batteryPermDenied) { Text( - "Notifications are disabled for PulseLoop in Android Settings.", + stringResource(R.string.notifications_disabled_system), style = MaterialTheme.typography.bodySmall, color = PulseColors.danger, ) @@ -1083,10 +1083,9 @@ fun ProfileSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> Unit) ) } - SettingsSubScreen(title = "User Profile", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.settings_profile), onBack = onBack) { Text( - "Your age, sex, height and weight let the ring compute accurate calories (and, on " + - "56ff/Jring rings, blood sugar). Blood pressure is measured directly by the sensor.", + stringResource(R.string.profile_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1114,7 +1113,7 @@ fun ProfileSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> Unit) profileDraft = draft.copy(units = keyStore.resolvedUnitSystem) com.pulseloop.widgets.WidgetSnapshotPublisher.publish(context) }) { - Text("Reset units to auto-detect", style = MaterialTheme.typography.labelSmall) + Text(stringResource(R.string.profile_reset_units), style = MaterialTheme.typography.labelSmall) } } @@ -1131,11 +1130,11 @@ fun ProfileSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> Unit) // Profile (age/sex) shifts widget reference zones — republish. com.pulseloop.widgets.WidgetSnapshotPublisher.publish(context) savedMsg = if (coordinator?.isConnected == true) - "Saved & sent to ring ✓" else "Saved — will sync on next connect" + context.getString(R.string.status_saved_sent) else context.getString(R.string.status_saved_pending) } }, modifier = Modifier.fillMaxWidth(), - ) { Text("Save profile") } + ) { Text(stringResource(R.string.profile_save)) } savedMsg?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) } @@ -1177,32 +1176,31 @@ fun PhysiologySettingsScreen(onBack: () -> Unit) { } } - SettingsSubScreen(title = "Physiology", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.settings_physiology), onBack = onBack) { Text( - "Optional refinements to how your vitals are interpreted. Leave anything unset and " + - "PulseLoop uses sensible defaults.", + stringResource(R.string.physiology_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) PhysiologyCard( - title = "Fitness", - footer = "Treats a low resting heart rate as a sign of fitness rather than a concern, and relaxes the low-HR threshold.", + title = stringResource(R.string.physiology_fitness), + footer = stringResource(R.string.physiology_fitness_footer), ) { Row(verticalAlignment = Alignment.CenterVertically) { - Text("Athlete mode", style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.physiology_athlete_mode), style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f)) Switch(checked = athleteMode, onCheckedChange = { athleteMode = it; savedMsg = null }) } } PhysiologyCard( - title = "Environment", - footer = "Above ~2000 m, normal blood-oxygen readings run lower. We use this to avoid false low-oxygen warnings.", + title = stringResource(R.string.physiology_environment), + footer = stringResource(R.string.physiology_environment_footer), ) { OutlinedTextField( value = altitudeText, onValueChange = { altitudeText = it.filter(Char::isDigit).take(5); savedMsg = null }, - label = { Text(if (imperial) "Typical altitude (ft)" else "Typical altitude (m)") }, + label = { Text(if (imperial) stringResource(R.string.physiology_altitude_ft) else stringResource(R.string.physiology_altitude_m)) }, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), singleLine = true, modifier = Modifier.fillMaxWidth(), @@ -1210,24 +1208,24 @@ fun PhysiologySettingsScreen(onBack: () -> Unit) { } PhysiologyCard( - title = "Health context", - footer = "Optional. Both can change what's expected for your heart rate or oxygen, so we adjust labels instead of alarming.", + title = stringResource(R.string.physiology_health_context), + footer = stringResource(R.string.physiology_health_context_footer), ) { - TriStateRow("Beta-blockers", betaBlockers) { betaBlockers = it; savedMsg = null } + TriStateRow(stringResource(R.string.physiology_beta_blockers), betaBlockers) { betaBlockers = it; savedMsg = null } Spacer(Modifier.height(12.dp)) - TriStateRow("Known lung condition", lungCondition) { lungCondition = it; savedMsg = null } + TriStateRow(stringResource(R.string.physiology_lung_condition), lungCondition) { lungCondition = it; savedMsg = null } } - PhysiologyCard(title = "Units", footer = null) { + PhysiologyCard(title = stringResource(R.string.physiology_units), footer = null) { Row(verticalAlignment = Alignment.CenterVertically) { - Text("Glucose unit", style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.physiology_glucose_unit), style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f)) SingleChoiceSegmentedButtonRow { GlucoseUnit.entries.forEachIndexed { i, u -> SegmentedButton( selected = glucoseUnit == u, onClick = { glucoseUnit = u; savedMsg = null }, shape = SegmentedButtonDefaults.itemShape(i, GlucoseUnit.entries.size), - ) { Text(u.label) } + ) { Text(stringResource(u.labelRes)) } } } } @@ -1244,10 +1242,10 @@ fun PhysiologySettingsScreen(onBack: () -> Unit) { if (entered != null && entered > 0) (if (imperial) entered * 0.3048 else entered) else null // Physiology shifts the vitals reference zones the widgets render — republish. com.pulseloop.widgets.WidgetSnapshotPublisher.publish(context) - savedMsg = "Saved ✓" + savedMsg = context.getString(R.string.status_saved_check) }, modifier = Modifier.fillMaxWidth(), - ) { Text("Save") } + ) { Text(stringResource(R.string.action_save)) } savedMsg?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) } @@ -1274,7 +1272,11 @@ private fun PhysiologyCard(title: String, footer: String?, content: @Composable @OptIn(ExperimentalMaterial3Api::class) @Composable private fun TriStateRow(title: String, value: Boolean?, onChange: (Boolean?) -> Unit) { - val options = listOf>("Not set" to null, "No" to false, "Yes" to true) + val options = listOf>( + stringResource(R.string.tristate_not_set) to null, + stringResource(R.string.tristate_no) to false, + stringResource(R.string.tristate_yes) to true, + ) Row(verticalAlignment = Alignment.CenterVertically) { Text(title, style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f)) SingleChoiceSegmentedButtonRow { @@ -1318,12 +1320,12 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U glucoseRef = keyStore.glucoseRefMgdl.takeIf { it > 0 }?.let { "%.0f".format(it) } ?: "" } - SettingsSubScreen(title = "Calibration", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.settings_calibration), onBack = onBack) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Blood pressure calibration", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.calibration_bp_title), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold) Text( - "Optional. Enter a recent cuff reading so the ring offsets its values to match.", + stringResource(R.string.calibration_bp_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1331,13 +1333,13 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { OutlinedTextField( value = bpSys, onValueChange = { bpSys = it.filter(Char::isDigit).take(3) }, - label = { Text("Systolic") }, + label = { Text(stringResource(R.string.bp_systolic)) }, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), singleLine = true, modifier = Modifier.weight(1f), ) OutlinedTextField( value = bpDia, onValueChange = { bpDia = it.filter(Char::isDigit).take(3) }, - label = { Text("Diastolic") }, + label = { Text(stringResource(R.string.bp_diastolic)) }, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), singleLine = true, modifier = Modifier.weight(1f), ) @@ -1352,11 +1354,11 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U keyStore.bpAdjustDiastolic = diaI coordinator?.applyUserSettings(db.userProfileDao().get(), sysI, diaI) savedMsg = if (coordinator?.isConnected == true) - "Saved & sent to ring ✓" else "Saved — will sync on next connect" + context.getString(R.string.status_saved_sent) else context.getString(R.string.status_saved_pending) } }, modifier = Modifier.fillMaxWidth(), - ) { Text("Save calibration") } + ) { Text(stringResource(R.string.calibration_save)) } savedMsg?.let { Spacer(Modifier.height(6.dp)) Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) @@ -1366,10 +1368,9 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Blood sugar calibration", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.calibration_glucose_title), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold) Text( - "Optional. The ring estimates glucose from your profile, not a real sensor. " + - "Enter a recent lab/meter reading (mg/dL) to offset the displayed value to match.", + stringResource(R.string.calibration_glucose_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1377,7 +1378,7 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { OutlinedTextField( value = glucoseRef, onValueChange = { glucoseRef = it.filter(Char::isDigit).take(3) }, - label = { Text("Reading (mg/dL)") }, + label = { Text(stringResource(R.string.calibration_glucose_reading)) }, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), singleLine = true, modifier = Modifier.weight(1.4f), ) @@ -1386,12 +1387,12 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U scope.launch { val ref = glucoseRef.toDoubleOrNull() if (ref == null || ref <= 0) { - glucoseMsg = "Enter a valid mg/dL reading" + glucoseMsg = context.getString(R.string.calibration_glucose_invalid) return@launch } val latestRaw = db.measurementDao().latest(MeasurementKind.BLOOD_SUGAR.name) if (latestRaw == null) { - glucoseMsg = "Take a blood sugar measurement first, then calibrate" + glucoseMsg = context.getString(R.string.calibration_glucose_measure_first) return@launch } // Stored readings are raw (offset is applied only at display), @@ -1399,15 +1400,15 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U keyStore.glucoseOffsetMgdl = ref - latestRaw keyStore.glucoseRefMgdl = ref glucoseOffset = keyStore.glucoseOffsetMgdl - glucoseMsg = "Calibrated ✓ (offset %+.0f mg/dL)".format(glucoseOffset) + glucoseMsg = context.getString(R.string.calibration_glucose_done, "%+.0f".format(glucoseOffset)) } }, modifier = Modifier.weight(1f), - ) { Text("Calibrate") } + ) { Text(stringResource(R.string.calibration_calibrate)) } } Row(verticalAlignment = Alignment.CenterVertically) { Text( - if (glucoseOffset != 0.0) "Current offset: %+.0f mg/dL".format(glucoseOffset) else "No calibration set", + if (glucoseOffset != 0.0) stringResource(R.string.calibration_current_offset, "%+.0f".format(glucoseOffset)) else stringResource(R.string.calibration_none), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.weight(1f), @@ -1418,8 +1419,8 @@ fun CalibrationSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U keyStore.glucoseRefMgdl = 0.0 glucoseOffset = 0.0 glucoseRef = "" - glucoseMsg = "Calibration cleared" - }) { Text("Reset") } + glucoseMsg = context.getString(R.string.calibration_cleared) + }) { Text(stringResource(R.string.action_reset)) } } } glucoseMsg?.let { @@ -1447,9 +1448,9 @@ fun GoalsSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> Unit) { goalDraft = com.pulseloop.ui.onboarding.GoalDraft.from(db.userGoalDao().get(), goalUnits) } - SettingsSubScreen(title = "Goals", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.settings_goals), onBack = onBack) { Text( - "Daily and weekly targets behind the activity rings.", + stringResource(R.string.goals_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1476,11 +1477,11 @@ fun GoalsSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> Unit) { // Ring goals drive the widget's activity rings — republish. com.pulseloop.widgets.WidgetSnapshotPublisher.publish(context) goalSavedMsg = if (coordinator?.isConnected == true) - "Saved & sent to ring ✓" else "Saved" + context.getString(R.string.status_saved_sent) else context.getString(R.string.status_saved) } }, modifier = Modifier.fillMaxWidth(), - ) { Text("Save goals") } + ) { Text(stringResource(R.string.goals_save)) } goalSavedMsg?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) } @@ -1570,13 +1571,13 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U } } - SettingsSubScreen(title = "Measurement Frequency", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.settings_measurement), onBack = onBack) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Measurement", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.measurement_title), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "How often the ring measures in the background. Shorter heart-rate intervals give finer history at the cost of battery.", + stringResource(R.string.measurement_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1584,15 +1585,15 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U if (device == null) { Text( - "Pair a ring to configure its all-day measurements.", + stringResource(R.string.measurement_pair_first), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) } else { - VitalToggle("All-day heart rate", cfgHrEnabled) { cfgHrEnabled = it } + VitalToggle(stringResource(R.string.measurement_allday_hr), cfgHrEnabled) { cfgHrEnabled = it } if (cfgHrEnabled) { Text( - "Every $cfgHrInterval min", + stringResource(R.string.measurement_every_min, cfgHrInterval), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1606,7 +1607,7 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U } HorizontalDivider(Modifier.padding(vertical = 8.dp)) if (WearableCapability.SPO2 in capabilities) { - VitalToggle("Blood oxygen (SpO₂)", cfgSpo2) { cfgSpo2 = it } + VitalToggle(stringResource(R.string.measurement_spo2), cfgSpo2) { cfgSpo2 = it } // The monitor command takes the same shape for every vital // (`01 {enable, interval}`), so blood oxygen always had an interval — // it just wasn't surfaced and silently followed heart rate. On a ring @@ -1615,7 +1616,7 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U Text( // The blood-oxygen command keeps the 60-min ceiling whatever the // heart-rate slider shows (no evidence past 60 on that key). - if (cfgSpo2Interval <= 0) "Same as heart rate, at most every 60 min" else "Every $cfgSpo2Interval min", + if (cfgSpo2Interval <= 0) stringResource(R.string.measurement_spo2_same_as_hr) else stringResource(R.string.measurement_every_min, cfgSpo2Interval), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1636,13 +1637,13 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U // Issue #103: this ring's own SpO₂ is computed from heart rate, so the app // can run the ring's real spot measurement on the schedule instead. if (supportsScheduledSpo2) { - VitalToggle("Measure SpO₂ from the app", cfgAppSpo2) { + VitalToggle(stringResource(R.string.measurement_app_spo2), cfgAppSpo2) { cfgAppSpo2 = it cfgSavedMsg = null } if (cfgAppSpo2) { Text( - "This ring's all-day SpO₂ is estimated from heart rate. When on, PulseLoop starts a real spot measurement on the schedule below, between the ring's own readings, about a minute each, which uses more battery. Android may delay or skip runs while the phone is asleep.", + stringResource(R.string.measurement_app_spo2_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1650,7 +1651,7 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U // itself, so the ring's limits don't apply (issue #103). Each run is // ~50 s of red LED, which is what 2–3 h spacing is for. Text( - if (cfgAppSpo2Interval == 60) "Every hour" else "Every ${cfgAppSpo2Interval / 60} hours", + if (cfgAppSpo2Interval == 60) stringResource(R.string.measurement_every_hour) else pluralStringResource(R.plurals.measurement_every_hours, cfgAppSpo2Interval / 60, cfgAppSpo2Interval / 60), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1664,12 +1665,12 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U valueRange = 60f..180f, steps = 1, ) - VitalToggle("Hide estimated SpO₂", cfgHideEstimatedSpo2) { + VitalToggle(stringResource(R.string.measurement_hide_estimated), cfgHideEstimatedSpo2) { cfgHideEstimatedSpo2 = it cfgSavedMsg = null } Text( - "Display only real spot measurements on charts and vitals cards, hiding the hourly estimates.", + stringResource(R.string.measurement_hide_estimated_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1677,13 +1678,13 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U } } if (supportsStressSetting) { - VitalToggle("Stress", cfgStress) { cfgStress = it } + VitalToggle(stringResource(R.string.metric_stress), cfgStress) { cfgStress = it } } if (WearableCapability.HRV in capabilities) { - VitalToggle("HRV", cfgHrv) { cfgHrv = it } + VitalToggle(stringResource(R.string.abbr_hrv), cfgHrv) { cfgHrv = it } } if (WearableCapability.TEMPERATURE in capabilities) { - VitalToggle("Temperature", cfgTemp) { cfgTemp = it } + VitalToggle(stringResource(R.string.metric_temperature), cfgTemp) { cfgTemp = it } } Spacer(Modifier.height(12.dp)) @@ -1711,11 +1712,11 @@ fun MeasurementSettingsScreen(coordinator: RingSyncCoordinator?, onBack: () -> U scheduledSpo2Prefs.hideEstimated = cfgHideEstimatedSpo2 ScheduledSpo2Worker.reschedule(context.applicationContext) cfgSavedMsg = if (coordinator?.isConnected == true) - "Saved & sent to ring ✓" else "Saved — will sync on next connect" + context.getString(R.string.status_saved_sent) else context.getString(R.string.status_saved_pending) } }, modifier = Modifier.fillMaxWidth(), - ) { Text("Save measurement settings") } + ) { Text(stringResource(R.string.measurement_save)) } cfgSavedMsg?.let { Spacer(Modifier.height(6.dp)) Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary) @@ -1767,10 +1768,9 @@ private fun QuietHoursCard() { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Sleep trimming", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.sleep_trimming), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Text( - "A still wrist reads as sleep, so an evening on the sofa can run the night high. " + - "Trimmed minutes are never imported — changing these later won't bring them back.", + stringResource(R.string.sleep_trimming_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1784,13 +1784,13 @@ private fun QuietHoursCard() { ) { Column(Modifier.weight(1f).padding(end = 8.dp)) { Text( - "Track Bedtime / DND mode", + stringResource(R.string.sleep_track_bedtime), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium, ) Text( - "Keep only sleep inside Android's Bedtime or Do Not Disturb. " + - if (enabled) "Nights without it use the schedule." else "Nights without it are kept whole.", + stringResource(R.string.sleep_track_bedtime_desc) + " " + + if (enabled) stringResource(R.string.sleep_track_bedtime_schedule) else stringResource(R.string.sleep_track_bedtime_whole), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1822,13 +1822,13 @@ private fun QuietHoursCard() { ) { Column(Modifier.weight(1f).padding(end = 8.dp)) { Text( - "Sleep quiet hours", + stringResource(R.string.sleep_quiet_hours), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium, ) Text( - if (gateByZenMode) "Daily schedule for nights without Bedtime/DND." - else "Keep only sleep inside a daily schedule. Naps outside it are skipped.", + if (gateByZenMode) stringResource(R.string.sleep_quiet_hours_zen) + else stringResource(R.string.sleep_quiet_hours_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -1839,10 +1839,10 @@ private fun QuietHoursCard() { Spacer(Modifier.height(8.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { OutlinedButton(onClick = { picking = "start" }, modifier = Modifier.weight(1f)) { - Text("From ${formatMinutesOfDay(start)}") + Text(stringResource(R.string.sleep_from, formatMinutesOfDay(start))) } OutlinedButton(onClick = { picking = "end" }, modifier = Modifier.weight(1f)) { - Text("Until ${formatMinutesOfDay(end)}") + Text(stringResource(R.string.sleep_until, formatMinutesOfDay(end))) } } } @@ -1852,14 +1852,10 @@ private fun QuietHoursCard() { if (showPermissionDialog) { AlertDialog( onDismissRequest = { showPermissionDialog = false }, - title = { Text("Permission required") }, + title = { Text(stringResource(R.string.permission_required)) }, text = { Text( - "To log when Bedtime or Do Not Disturb turns on and off while PulseLoop is " + - "in the background, Android requires Notification access. PulseLoop only " + - "listens for Mode changes and does not read your notifications.\n\n" + - "If the switch is greyed out, open PulseLoop's App info, tap ⋮ → " + - "Allow restricted settings, then come back here.", + stringResource(R.string.sleep_zen_permission_body), ) }, confirmButton = { @@ -1878,13 +1874,13 @@ private fun QuietHoursCard() { context.startActivity(intent) prefs.gateByZenMode = true } catch (_: Exception) {} - }) { Text("Open Settings") } + }) { Text(stringResource(R.string.action_open_settings)) } }, dismissButton = { TextButton(onClick = { showPermissionDialog = false if (!prefs.gateByZenMode) ZenModeListener.setEnabled(context, false) - }) { Text("Cancel") } + }) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -1898,7 +1894,7 @@ private fun QuietHoursCard() { ) AlertDialog( onDismissRequest = { picking = null }, - title = { Text(if (which == "start") "Quiet from" else "Quiet until") }, + title = { Text(if (which == "start") stringResource(R.string.sleep_quiet_from) else stringResource(R.string.sleep_quiet_until)) }, text = { TimePicker(state = pickerState) }, confirmButton = { TextButton(onClick = { @@ -1906,10 +1902,10 @@ private fun QuietHoursCard() { if (which == "start") { start = minutes; prefs.startMinutes = minutes } else { end = minutes; prefs.endMinutes = minutes } picking = null - }) { Text("Done") } + }) { Text(stringResource(R.string.action_done)) } }, dismissButton = { - TextButton(onClick = { picking = null }) { Text("Cancel") } + TextButton(onClick = { picking = null }) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -1955,9 +1951,9 @@ fun WearableSettingsScreen( val battery = bleState.batteryPercent ?: device?.batteryPercent val lastSyncedLabel = (coordinator?.lastSyncAt ?: device?.lastSyncAt) ?.let { DeviceHeroStatus.relativeShort(it, System.currentTimeMillis()) } - ?: "Not yet" + ?: stringResource(R.string.status_not_yet) - SettingsSubScreen(title = "Wearable", onBack = onBack) { +SettingsSubScreen(title = stringResource(R.string.settings_wearable), onBack = onBack) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { Row(verticalAlignment = Alignment.CenterVertically) { @@ -1967,8 +1963,8 @@ fun WearableSettingsScreen( ) Spacer(Modifier.width(8.dp)) Text( - if (isConnected) "Connected — $wearableDisplayName · ${battery ?: 0}%" - else device?.let { "Last seen: $wearableDisplayName" } ?: "No ring paired", + if (isConnected) stringResource(R.string.wearable_connected_status, wearableDisplayName, battery ?: 0) + else device?.let { stringResource(R.string.wearable_last_seen, wearableDisplayName) } ?: stringResource(R.string.wearable_none_paired), style = MaterialTheme.typography.bodyMedium, ) } @@ -1977,12 +1973,12 @@ fun WearableSettingsScreen( if (device?.firmwareVersion != null) { val rawFw = device!!.firmwareVersion!! val fwDisplay = if (rawFw.contains("V")) "V" + rawFw.substringAfterLast("V") else rawFw - Text("Firmware: $fwDisplay", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp)) + Text(stringResource(R.string.wearable_firmware, fwDisplay), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp)) } else if (device != null) { - Text("Firmware: reading… (connect ring to read)", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp)) + Text(stringResource(R.string.wearable_firmware_reading), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp)) } if (device != null) { - Text("Last synced: $lastSyncedLabel", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp)) + Text(stringResource(R.string.wearable_last_synced, lastSyncedLabel), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp)) } if (device == null) { @@ -1991,7 +1987,7 @@ fun WearableSettingsScreen( Button(onClick = onAddRing, modifier = Modifier.fillMaxWidth()) { Icon(Icons.Filled.Add, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Add a ring") + Text(stringResource(R.string.wearable_add_ring)) } } @@ -2003,7 +1999,7 @@ fun WearableSettingsScreen( ) { Icon(Icons.Filled.Sync, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Sync now") + Text(stringResource(R.string.wearable_sync_now)) } if (supportsFindDevice) { Spacer(Modifier.height(8.dp)) @@ -2013,7 +2009,7 @@ fun WearableSettingsScreen( ) { Icon(Icons.Filled.NotificationsActive, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Find ring") + Text(stringResource(R.string.wearable_find_ring)) } } Spacer(Modifier.height(8.dp)) @@ -2023,7 +2019,7 @@ fun WearableSettingsScreen( ) { Icon(Icons.Filled.Close, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Disconnect") + Text(stringResource(R.string.wearable_disconnect)) } } else if (bleState.connectionState == RingConnectionState.RECONNECTING) { // Automatic recovery can scan for minutes; let the user stop it (issue #124). @@ -2034,7 +2030,7 @@ fun WearableSettingsScreen( ) { Icon(Icons.Filled.Close, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Disconnect") + Text(stringResource(R.string.wearable_disconnect)) } } else if (bleClient?.hasLastKnownRing == true) { Spacer(Modifier.height(12.dp)) @@ -2044,7 +2040,7 @@ fun WearableSettingsScreen( ) { Icon(Icons.Filled.Refresh, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Reconnect last ring") + Text(stringResource(R.string.wearable_reconnect)) } } } @@ -2061,11 +2057,10 @@ fun WearableSettingsScreen( if (device != null) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Ring management", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.wearable_management), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) Text( - "Forget unbinds the ring and removes it from the app so it can be paired " + - "elsewhere. The app stays connected automatically the rest of the time.", + stringResource(R.string.wearable_forget_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2095,7 +2090,7 @@ fun WearableSettingsScreen( ) { Icon(Icons.Filled.DeleteForever, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Forget Ring") + Text(stringResource(R.string.wearable_forget)) } // Factory reset — destructive, ring-side wipe. Only for connected rings that @@ -2103,8 +2098,7 @@ fun WearableSettingsScreen( if (isConnected && supportsFactoryReset) { Spacer(Modifier.height(8.dp)) Text( - "Factory reset erases all data stored on the ring itself and resets " + - "it to factory state. Your synced data in the app is kept.", + stringResource(R.string.wearable_factory_reset_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2117,7 +2111,7 @@ fun WearableSettingsScreen( ) { Icon(Icons.Filled.Refresh, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text(if (resetting) (resetStatus.ifEmpty { "Resetting…" }) else "Factory Reset Ring") + Text(if (resetting) (resetStatus.ifEmpty { stringResource(R.string.wearable_resetting) }) else stringResource(R.string.wearable_factory_reset)) } } } @@ -2128,19 +2122,17 @@ fun WearableSettingsScreen( if (showFactoryReset) { AlertDialog( onDismissRequest = { showFactoryReset = false }, - title = { Text("Factory reset ring?") }, + title = { Text(stringResource(R.string.wearable_factory_reset_title)) }, text = { Text( - "This erases all data stored on the ring and resets it to factory " + - "state. We'll sync its latest data into the app first, but this " + - "can't be undone. The ring will need to be re-paired afterward." + stringResource(R.string.wearable_factory_reset_body) ) }, confirmButton = { TextButton(onClick = { showFactoryReset = false resetting = true - resetStatus = "Syncing latest data…" + resetStatus = context.getString(R.string.wearable_syncing_latest) RingSyncWorker.cancel(context) // onCleared runs on the coordinator's long-lived scope: the reset // takes up to ~30s, and the device row must be cleared even if the @@ -2151,10 +2143,10 @@ fun WearableSettingsScreen( db.deviceDao().clear() resetting = false } - }) { Text("Reset ring", color = MaterialTheme.colorScheme.error) } + }) { Text(stringResource(R.string.wearable_reset_ring), color = MaterialTheme.colorScheme.error) } }, dismissButton = { - TextButton(onClick = { showFactoryReset = false }) { Text("Cancel") } + TextButton(onClick = { showFactoryReset = false }) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -2169,10 +2161,10 @@ private enum class BatteryHistoryRange(val label: String, val spanMs: Long) { /** Fixed 0–100 zone coloring for the battery line — mirrors iOS `colorForValue` * (≤20 danger, ≤50 warning, else success). Zone boundaries use an exclusive upper bound * (`ZoneLineChart` matches `lower <= value < upper`), so 21/51 sit just above each cut. */ -private val batteryZones = listOf( - MetricZone("critical", "Critical", null, 21.0, ZoneSeverity.CRITICAL, VitalColorToken.Red, "Battery critically low"), - MetricZone("low", "Low", 21.0, 51.0, ZoneSeverity.WATCH, VitalColorToken.Amber, "Battery low"), - MetricZone("good", "Good", 51.0, null, ZoneSeverity.OPTIMAL, VitalColorToken.Mint, "Battery healthy"), +private val batteryZones get() = listOf( + MetricZone("critical", L10n.get(R.string.zone_critical), null, 21.0, ZoneSeverity.CRITICAL, VitalColorToken.Red, L10n.get(R.string.battery_zone_critical)), + MetricZone("low", L10n.get(R.string.zone_low), 21.0, 51.0, ZoneSeverity.WATCH, VitalColorToken.Amber, L10n.get(R.string.battery_zone_low)), + MetricZone("good", L10n.get(R.string.zone_good), 51.0, null, ZoneSeverity.OPTIMAL, VitalColorToken.Mint, L10n.get(R.string.battery_zone_good)), ) /** @@ -2197,7 +2189,7 @@ private fun BatteryHistorySection(db: PulseLoopDatabase) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - Text("Battery history", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.battery_history), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) SingleChoiceSegmentedButtonRow { BatteryHistoryRange.entries.forEachIndexed { i, r -> SegmentedButton( @@ -2211,7 +2203,7 @@ private fun BatteryHistorySection(db: PulseLoopDatabase) { Spacer(Modifier.height(8.dp)) if (samples.size < 2) { Text( - "Not enough data yet — battery history builds up as the ring reports its level.", + stringResource(R.string.battery_history_empty), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2244,19 +2236,19 @@ private sealed class ResetAction { data object UnpairAndReset : ResetAction() val title: String get() = when (this) { - is UnpairRing -> "Unpair ring?" - is ResetAppData -> "Reset app data?" - is UnpairAndReset -> "Unpair ring & reset app data?" + is UnpairRing -> L10n.get(R.string.reset_unpair_title) + is ResetAppData -> L10n.get(R.string.reset_app_title) + is UnpairAndReset -> L10n.get(R.string.reset_both_title) } val message: String get() = when (this) { - is UnpairRing -> "Unpair your ring? The ring will forget this phone; your data stays." - is ResetAppData -> "This permanently erases all your data — metrics, sleep, activity, coach history, settings, and saved API keys — and can't be undone." - is UnpairAndReset -> "This unpairs your ring, then permanently erases all your data — metrics, sleep, activity, coach history, settings, and saved API keys — and can't be undone." + is UnpairRing -> L10n.get(R.string.reset_unpair_body) + is ResetAppData -> L10n.get(R.string.reset_app_body) + is UnpairAndReset -> L10n.get(R.string.reset_both_body) } val confirmLabel: String get() = when (this) { - is UnpairRing -> "Unpair ring" - is ResetAppData -> "Reset app data" - is UnpairAndReset -> "Unpair & reset" + is UnpairRing -> L10n.get(R.string.reset_unpair_confirm) + is ResetAppData -> L10n.get(R.string.reset_app_confirm) + is UnpairAndReset -> L10n.get(R.string.reset_both_confirm) } } @@ -2342,14 +2334,14 @@ fun PrivacyDataSettingsScreen( } } - SettingsSubScreen(title = "Privacy & Data", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.settings_privacy), onBack = onBack) { // Data Backup — export/import full app data as JSON. Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Data Backup", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.privacy_backup), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) Text( - "Export all your data to a single JSON file for backup, device migration, or external analysis. Import restores everything — replacing all current data.", + stringResource(R.string.privacy_backup_desc), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2368,10 +2360,10 @@ fun PrivacyDataSettingsScreen( putExtra(Intent.EXTRA_STREAM, uri) addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) } - context.startActivity(Intent.createChooser(shareIntent, "Export PulseLoop Data")) + context.startActivity(Intent.createChooser(shareIntent, context.getString(R.string.privacy_export_chooser))) } } catch (_: Exception) { - statusMessage = "Export failed" + statusMessage = context.getString(R.string.privacy_export_failed) } exportInProgress = false } @@ -2383,7 +2375,7 @@ fun PrivacyDataSettingsScreen( CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp) Spacer(Modifier.width(8.dp)) } - Text(if (exportInProgress) "Exporting…" else "Export All Data") + Text(if (exportInProgress) stringResource(R.string.privacy_exporting) else stringResource(R.string.privacy_export_all)) } OutlinedButton( onClick = { @@ -2396,7 +2388,7 @@ fun PrivacyDataSettingsScreen( CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp) Spacer(Modifier.width(8.dp)) } - Text(if (importInProgress) "Importing…" else "Import Data") + Text(if (importInProgress) stringResource(R.string.privacy_importing) else stringResource(R.string.privacy_import)) } } } @@ -2405,10 +2397,10 @@ fun PrivacyDataSettingsScreen( // App data — destructive reset/restore actions. Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("App Data", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.privacy_app_data), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) Text( - "Destructive actions: unpair the ring, factory-reset app data, or both.", + stringResource(R.string.privacy_app_data_desc), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2420,7 +2412,7 @@ fun PrivacyDataSettingsScreen( ) { Icon(Icons.Filled.BluetoothDisabled, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Unpair Ring") + Text(stringResource(R.string.reset_unpair_confirm)) } Spacer(Modifier.height(8.dp)) OutlinedButton( @@ -2430,7 +2422,7 @@ fun PrivacyDataSettingsScreen( ) { Icon(Icons.Filled.DeleteForever, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Reset App Data") + Text(stringResource(R.string.reset_app_confirm)) } Spacer(Modifier.height(8.dp)) OutlinedButton( @@ -2440,7 +2432,7 @@ fun PrivacyDataSettingsScreen( ) { Icon(Icons.Filled.Warning, null, Modifier.size(16.dp)) Spacer(Modifier.width(4.dp)) - Text("Unpair & Reset") + Text(stringResource(R.string.reset_both_confirm)) } } } @@ -2448,20 +2440,20 @@ fun PrivacyDataSettingsScreen( // Demo data — Android-only (iOS seeds via the Simulator's SeedData). Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Demo Data", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.privacy_demo), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) Text( - "Explore the app without a ring. Seeds activity, HR, SpO2, sleep, and a coach conversation.", + stringResource(R.string.privacy_demo_desc), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(12.dp)) Button(onClick = { showSeedDialog = true }, modifier = Modifier.fillMaxWidth()) { - Text("Reseed Demo Data") + Text(stringResource(R.string.privacy_demo_reseed)) } Spacer(Modifier.height(8.dp)) OutlinedButton(onClick = { showClearDialog = true }, modifier = Modifier.fillMaxWidth()) { - Text("Clear Demo Data", color = PulseColors.danger) + Text(stringResource(R.string.privacy_demo_clear), color = PulseColors.danger) } } } @@ -2470,22 +2462,22 @@ fun PrivacyDataSettingsScreen( Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { var maskSensitive by remember { mutableStateOf(true) } - Text("Diagnostics", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.privacy_diagnostics), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) Text( - "Export app, device, and wearable logs as JSON for bug reports.", + stringResource(R.string.privacy_diagnostics_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(12.dp)) Row(verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Anonymize export", style = MaterialTheme.typography.bodyMedium) + Text(stringResource(R.string.privacy_anonymize), style = MaterialTheme.typography.bodyMedium) Text( if (maskSensitive) - "Removes health values, ring serial & MAC addresses. Keeps models, opcodes & errors." + stringResource(R.string.privacy_anonymize_on) else - "OFF — includes full unmasked BLE frames and health values (for protocol debugging only).", + stringResource(R.string.privacy_anonymize_off), style = MaterialTheme.typography.bodySmall, color = if (maskSensitive) MaterialTheme.colorScheme.onSurfaceVariant else MaterialTheme.colorScheme.error, @@ -2509,7 +2501,7 @@ fun PrivacyDataSettingsScreen( ) { Icon(Icons.Filled.Share, null) Spacer(Modifier.width(8.dp)) - Text(if (maskSensitive) "Export Diagnostics" else "Export Full (Unmasked)") + Text(if (maskSensitive) stringResource(R.string.privacy_export_diag) else stringResource(R.string.privacy_export_diag_full)) } } } @@ -2521,28 +2513,28 @@ fun PrivacyDataSettingsScreen( val msg = statusMessage!! AlertDialog( onDismissRequest = { statusMessage = null }, - title = { Text("Error") }, + title = { Text(stringResource(R.string.dialog_error)) }, text = { Text(msg) }, confirmButton = { - TextButton(onClick = { statusMessage = null }) { Text("OK") } + TextButton(onClick = { statusMessage = null }) { Text(stringResource(R.string.action_ok)) } }, ) } showImportSuccess -> AlertDialog( onDismissRequest = { showImportSuccess = false }, - title = { Text("Import Complete") }, - text = { Text("Your data has been restored from the backup.") }, + title = { Text(stringResource(R.string.privacy_import_done)) }, + text = { Text(stringResource(R.string.privacy_import_done_body)) }, confirmButton = { - TextButton(onClick = { showImportSuccess = false }) { Text("OK") } + TextButton(onClick = { showImportSuccess = false }) { Text(stringResource(R.string.action_ok)) } }, ) showImportConfirm -> AlertDialog( onDismissRequest = { showImportConfirm = false; pendingImportUri = null }, - title = { Text("Replace all data?") }, + title = { Text(stringResource(R.string.privacy_replace_title)) }, text = { - Text("This permanently deletes everything currently in the app and replaces it with the contents of this file. This can't be undone.") + Text(stringResource(R.string.privacy_replace_body)) }, confirmButton = { TextButton(onClick = { @@ -2556,16 +2548,16 @@ fun PrivacyDataSettingsScreen( com.pulseloop.data.DataArchiveService.importFile(context, uri, db) showImportSuccess = true } catch (_: Exception) { - statusMessage = "Import failed — the file may be corrupt or from a newer version." + statusMessage = context.getString(R.string.privacy_import_failed) } importInProgress = false } }) { - Text("Delete old data & import", color = MaterialTheme.colorScheme.error) + Text(stringResource(R.string.privacy_delete_and_import), color = MaterialTheme.colorScheme.error) } }, dismissButton = { - TextButton(onClick = { showImportConfirm = false; pendingImportUri = null }) { Text("Cancel") } + TextButton(onClick = { showImportConfirm = false; pendingImportUri = null }) { Text(stringResource(R.string.action_cancel)) } }, ) @@ -2588,15 +2580,15 @@ fun PrivacyDataSettingsScreen( } }, dismissButton = { - TextButton(onClick = { pendingReset = null }) { Text("Cancel") } + TextButton(onClick = { pendingReset = null }) { Text(stringResource(R.string.action_cancel)) } }, ) } showSeedDialog -> AlertDialog( onDismissRequest = { showSeedDialog = false }, - title = { Text("Reseed Demo Data?") }, - text = { Text("This will replace all existing demo data. Your synced ring data — including sleep history — will not be affected.") }, + title = { Text(stringResource(R.string.privacy_reseed_title)) }, + text = { Text(stringResource(R.string.privacy_reseed_body)) }, confirmButton = { TextButton(onClick = { showSeedDialog = false @@ -2604,20 +2596,19 @@ fun PrivacyDataSettingsScreen( DemoDataSeeder.seed(PulseLoopDatabase.getInstance(context)) com.pulseloop.widgets.WidgetSnapshotPublisher.publish(context) } - }) { Text("Reseed") } + }) { Text(stringResource(R.string.privacy_reseed)) } }, dismissButton = { - TextButton(onClick = { showSeedDialog = false }) { Text("Cancel") } + TextButton(onClick = { showSeedDialog = false }) { Text(stringResource(R.string.action_cancel)) } }, ) showClearDialog -> AlertDialog( onDismissRequest = { showClearDialog = false }, - title = { Text("Clear Demo Data?") }, + title = { Text(stringResource(R.string.privacy_clear_demo_title)) }, text = { Text( - "Removes all demo measurements, activity, sleep, and the demo device. " + - "Synced ring data is not affected.", + stringResource(R.string.privacy_clear_demo_body), ) }, confirmButton = { @@ -2627,10 +2618,10 @@ fun PrivacyDataSettingsScreen( DemoDataSeeder.clear(PulseLoopDatabase.getInstance(context)) com.pulseloop.widgets.WidgetSnapshotPublisher.publish(context) } - }) { Text("Clear", color = PulseColors.danger) } + }) { Text(stringResource(R.string.action_clear), color = PulseColors.danger) } }, dismissButton = { - TextButton(onClick = { showClearDialog = false }) { Text("Cancel") } + TextButton(onClick = { showClearDialog = false }) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -2678,7 +2669,7 @@ fun AboutSettingsScreen(onOpenDebug: () -> Unit, onBack: () -> Unit) { lastVersionTap = now if (developerUnlocked) { - showToast("Developer options are already enabled.") + showToast(context.getString(R.string.about_dev_already)) return } @@ -2692,15 +2683,15 @@ fun AboutSettingsScreen(onOpenDebug: () -> Unit, onBack: () -> Unit) { developerUnlocked = true keyStore.developerUnlocked = true haptics.performHapticFeedback(HapticFeedbackType.LongPress) - showToast("You are now a developer!") + showToast(context.getString(R.string.about_dev_enabled)) onOpenDebug() } else if (remaining <= 3) { - showToast("You're $remaining step${if (remaining == 1) "" else "s"} away from Developer options.") + showToast(context.resources.getQuantityString(R.plurals.about_dev_steps, remaining, remaining)) } } SettingsSubScreen( - title = "About", + title = stringResource(R.string.settings_about), onBack = onBack, bottomOverlay = { toast?.let { message -> @@ -2734,7 +2725,7 @@ fun AboutSettingsScreen(onOpenDebug: () -> Unit, onBack: () -> Unit) { .background(PulseColors.accent.copy(alpha = tapProgress * 0.22f)) .padding(16.dp), ) { - Text("Version", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.about_version), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( "PulseLoop v${com.pulseloop.BuildConfig.VERSION_NAME} (${com.pulseloop.BuildConfig.VERSION_CODE})", @@ -2748,9 +2739,7 @@ fun AboutSettingsScreen(onOpenDebug: () -> Unit, onBack: () -> Unit) { Text("PulseLoop", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "An LLM-native health app that turns a cheap Bluetooth smart ring into a real, " + - "conversational health tracker. It talks to the ring directly over Bluetooth — no " + - "vendor cloud, no account — and layers an AI coach on top of your own data.", + stringResource(R.string.about_description), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2771,7 +2760,7 @@ fun AboutSettingsScreen(onOpenDebug: () -> Unit, onBack: () -> Unit) { ) { Row(Modifier.padding(16.dp).fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Source on GitHub", style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.about_source), style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold) Text( REPO_URL.removePrefix("https://"), style = MaterialTheme.typography.bodySmall, @@ -2784,11 +2773,10 @@ fun AboutSettingsScreen(onOpenDebug: () -> Unit, onBack: () -> Unit) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("License", style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.about_license), style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "Open-source health tracker. Ported from iOS.\nCC BY 4.0 · Free to share and " + - "adapt, including commercially, with appropriate credit.", + stringResource(R.string.about_license_body), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2812,13 +2800,13 @@ fun NutritionSettingsScreen(onBack: () -> Unit, onNavigateToNutrition: () -> Uni var goalLoaded by remember { mutableStateOf(false) } LaunchedEffect(Unit) { goal = db.userGoalDao().get(); goalLoaded = true } - SettingsSubScreen(title = "Nutrition", onBack = onBack) { + SettingsSubScreen(title = stringResource(R.string.settings_nutrition), onBack = onBack) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Enable Nutrition Tracking", fontWeight = FontWeight.Medium) - Text("Log meals and track calories & macros", fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.nutrition_enable), fontWeight = FontWeight.Medium) + Text(stringResource(R.string.nutrition_enable_desc), fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) } Switch( checked = goal?.nutritionEnabled == true, @@ -2837,17 +2825,17 @@ fun NutritionSettingsScreen(onBack: () -> Unit, onNavigateToNutrition: () -> Uni if (goal?.nutritionEnabled == true) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { - Text("Daily Goals", fontWeight = FontWeight.SemiBold) - NutrientStepper("Calories (kcal)", goal?.intakeCalories ?: 2000.0, 50.0, 100.0, 10000.0) { v -> + Text(stringResource(R.string.nutrition_daily_goals), fontWeight = FontWeight.SemiBold) + NutrientStepper(stringResource(R.string.nutrition_calories_kcal), goal?.intakeCalories ?: 2000.0, 50.0, 100.0, 10000.0) { v -> scope.launch { goal = goal?.copy(intakeCalories = v)?.also { db.userGoalDao().upsert(it) } } } - NutrientStepper("Protein (g)", goal?.intakeProteinG ?: 150.0, 5.0, 0.0, 500.0) { v -> + NutrientStepper(stringResource(R.string.nutrition_protein_g), goal?.intakeProteinG ?: 150.0, 5.0, 0.0, 500.0) { v -> scope.launch { goal = goal?.copy(intakeProteinG = v)?.also { db.userGoalDao().upsert(it) } } } - NutrientStepper("Carbs (g)", goal?.intakeCarbsG ?: 250.0, 5.0, 0.0, 800.0) { v -> + NutrientStepper(stringResource(R.string.nutrition_carbs_g), goal?.intakeCarbsG ?: 250.0, 5.0, 0.0, 800.0) { v -> scope.launch { goal = goal?.copy(intakeCarbsG = v)?.also { db.userGoalDao().upsert(it) } } } - NutrientStepper("Fat (g)", goal?.intakeFatG ?: 65.0, 5.0, 0.0, 300.0) { v -> + NutrientStepper(stringResource(R.string.nutrition_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) } } } OutlinedButton(onClick = { @@ -2858,20 +2846,20 @@ fun NutritionSettingsScreen(onBack: () -> Unit, onNavigateToNutrition: () -> Uni .also { db.userGoalDao().upsert(it) } } }, modifier = Modifier.fillMaxWidth()) { - Text("Balance Macros (30/40/30)") + Text(stringResource(R.string.nutrition_balance_macros)) } } } Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Quick Access", fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.nutrition_quick_access), fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) Button( onClick = onNavigateToNutrition, modifier = Modifier.fillMaxWidth(), ) { - Text("Open Nutrition Log") + Text(stringResource(R.string.nutrition_open_log)) } } } @@ -2929,10 +2917,10 @@ fun StravaSettingsScreen(onBack: () -> Unit) { if (!isConfigured) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Strava Not Configured", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.strava_not_configured), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) Text( - "Add stravaClientId and stravaClientSecret to local.properties to enable Strava integration.", + stringResource(R.string.strava_not_configured_desc), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2943,11 +2931,11 @@ fun StravaSettingsScreen(onBack: () -> Unit) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Strava Integration", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.strava_integration), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(8.dp)) Text( - if (isConnected) "Connected as $athleteName. Workouts sync automatically when finished." - else "Connect your Strava account to automatically upload workouts with GPS routes and heart rate data.", + if (isConnected) stringResource(R.string.strava_connected_as, athleteName ?: "") + else stringResource(R.string.strava_connect_desc), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -2964,12 +2952,11 @@ fun StravaSettingsScreen(onBack: () -> Unit) { // uploadAuto records why it stopped, if it stopped. statusMessage = tokenStore.lastError()?.also { tokenStore.clearLastError() } ?: when (count) { - 0 -> "Nothing new to upload" - 1 -> "Uploaded 1 workout" - else -> "Uploaded $count workouts" + 0 -> context.getString(R.string.strava_nothing_new) + else -> context.resources.getQuantityString(R.plurals.strava_uploaded, count, count) } } catch (e: Exception) { - statusMessage = "Upload failed: ${e.message ?: "unknown error"}" + statusMessage = context.getString(R.string.strava_upload_failed, e.message ?: context.getString(R.string.error_unknown)) } isUploading = false } @@ -2977,7 +2964,7 @@ fun StravaSettingsScreen(onBack: () -> Unit) { modifier = Modifier.weight(1f), enabled = !isUploading, ) { - Text(if (isUploading) "Syncing…" else "Sync Now") + Text(if (isUploading) stringResource(R.string.status_syncing) else stringResource(R.string.wearable_sync_now)) } OutlinedButton( onClick = { @@ -2991,13 +2978,13 @@ fun StravaSettingsScreen(onBack: () -> Unit) { tokenStore.clear() isConnected = false athleteName = null - statusMessage = "Disconnected from Strava" + statusMessage = context.getString(R.string.strava_disconnected) } }, modifier = Modifier.weight(1f), colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.error), ) { - Text("Disconnect") + Text(stringResource(R.string.wearable_disconnect)) } } } else { @@ -3011,14 +2998,14 @@ fun StravaSettingsScreen(onBack: () -> Unit) { val intent = Intent(Intent.ACTION_VIEW, android.net.Uri.parse(authUrl)) try { context.startActivity(intent) - statusMessage = "Authorize in your browser — you'll return to PulseLoop automatically." + statusMessage = context.getString(R.string.strava_authorize_browser) } catch (_: Exception) { - statusMessage = "Could not open browser" + statusMessage = context.getString(R.string.error_open_browser) } }, modifier = Modifier.fillMaxWidth(), ) { - Text("Connect Strava") + Text(stringResource(R.string.strava_connect)) } } } @@ -3027,10 +3014,10 @@ fun StravaSettingsScreen(onBack: () -> Unit) { if (isConnected) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Auto Upload", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.strava_auto_upload), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "Finished workouts are automatically uploaded to Strava. GPS routes, heart rate data, and sport type are included.", + stringResource(R.string.strava_auto_upload_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -3122,9 +3109,9 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { ) } statusMessage = if (got.isEmpty()) { - "No Health Connect permissions granted — nothing to export." + context.getString(R.string.hc_no_permissions) } else { - "Connected. ${got.size} of ${HealthConnectPermissions.all.size} permission types granted." + context.getString(R.string.hc_connected_count, got.size, HealthConnectPermissions.all.size) } // First-enable backfill dialog: the derived showBackfillDialog above now turns true from // the persisted state (enabled + connected + NOT_ASKED) this callback just set, so there @@ -3193,7 +3180,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { Text("Health Connect", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "Export ring data to Health Connect so other apps and dashboards can show it. Write-only: PulseLoop never reads data back.", + stringResource(R.string.hc_desc), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -3202,34 +3189,34 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { when (availability) { HealthConnectAvailability.UNAVAILABLE -> { Text( - "Health Connect isn't available on this device. Install the Health Connect app to use this feature.", + stringResource(R.string.hc_unavailable), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.error, ) Spacer(Modifier.height(8.dp)) Button(onClick = { openHealthConnectPlayStore(context) }, modifier = Modifier.fillMaxWidth()) { - Text("Install Health Connect") + Text(stringResource(R.string.hc_install)) } } HealthConnectAvailability.PROVIDER_UPDATE_REQUIRED -> { Text( - "The Health Connect app on this device needs an update before it can be used.", + stringResource(R.string.hc_needs_update), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.error, ) Spacer(Modifier.height(8.dp)) Button(onClick = { openHealthConnectPlayStore(context) }, modifier = Modifier.fillMaxWidth()) { - Text("Update Health Connect") + Text(stringResource(R.string.hc_update)) } } HealthConnectAvailability.AVAILABLE -> { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f)) { - Text("Export PulseLoop data", style = MaterialTheme.typography.bodyLarge) + Text(stringResource(R.string.hc_export), style = MaterialTheme.typography.bodyLarge) Text( - if (prefs.isConnected) "Connected" else "Not connected", + if (prefs.isConnected) stringResource(R.string.status_connected) else stringResource(R.string.status_not_connected), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -3254,10 +3241,10 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { TextButton( onClick = { openHealthConnectApp(context) }, modifier = Modifier.align(Alignment.Start), - ) { Text("Open Health Connect") } + ) { Text(stringResource(R.string.hc_open)) } if (!prefs.isConnected) { Text( - "Manage or re-grant permissions, and review or delete PulseLoop's data, in the Health Connect app.", + stringResource(R.string.hc_manage_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -3270,29 +3257,29 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { if (availability == HealthConnectAvailability.AVAILABLE && prefs.isConnected) { Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Data Types", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.hc_data_types), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "Exported only when switched on. A row stays dim until its permission is granted.", + stringResource(R.string.hc_data_types_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(Modifier.height(8.dp)) val rows = listOf( - HealthConnectPermissions.DataTypeRow.HEART_RATE to "Heart rate", - HealthConnectPermissions.DataTypeRow.OXYGEN_SATURATION to "Oxygen saturation (SpO₂)", - HealthConnectPermissions.DataTypeRow.HEART_RATE_VARIABILITY to "Heart rate variability (HRV)", - HealthConnectPermissions.DataTypeRow.BODY_TEMPERATURE to "Body temperature", - HealthConnectPermissions.DataTypeRow.SLEEP to "Sleep", - HealthConnectPermissions.DataTypeRow.STEPS_AND_ACTIVITY to "Steps & activity", - HealthConnectPermissions.DataTypeRow.WORKOUTS to "Workouts", - HealthConnectPermissions.DataTypeRow.NUTRITION to "Nutrition", + HealthConnectPermissions.DataTypeRow.HEART_RATE to stringResource(R.string.metric_heart_rate), + HealthConnectPermissions.DataTypeRow.OXYGEN_SATURATION to stringResource(R.string.hc_type_spo2), + HealthConnectPermissions.DataTypeRow.HEART_RATE_VARIABILITY to stringResource(R.string.hc_type_hrv), + HealthConnectPermissions.DataTypeRow.BODY_TEMPERATURE to stringResource(R.string.hc_type_body_temp), + HealthConnectPermissions.DataTypeRow.SLEEP to stringResource(R.string.metric_sleep), + HealthConnectPermissions.DataTypeRow.STEPS_AND_ACTIVITY to stringResource(R.string.hc_type_steps), + HealthConnectPermissions.DataTypeRow.WORKOUTS to stringResource(R.string.metric_workouts), + HealthConnectPermissions.DataTypeRow.NUTRITION to stringResource(R.string.settings_nutrition), // Phase 5 (beyond iOS). - HealthConnectPermissions.DataTypeRow.BLOOD_PRESSURE to "Blood pressure", - HealthConnectPermissions.DataTypeRow.BLOOD_GLUCOSE to "Blood glucose", - HealthConnectPermissions.DataTypeRow.RESPIRATORY_RATE to "Respiratory rate", - HealthConnectPermissions.DataTypeRow.VO2_MAX to "VO\u2082 max", - HealthConnectPermissions.DataTypeRow.RESTING_HEART_RATE to "Resting heart rate", + HealthConnectPermissions.DataTypeRow.BLOOD_PRESSURE to stringResource(R.string.metric_blood_pressure), + HealthConnectPermissions.DataTypeRow.BLOOD_GLUCOSE to stringResource(R.string.hc_type_glucose), + HealthConnectPermissions.DataTypeRow.RESPIRATORY_RATE to stringResource(R.string.metric_respiratory_rate), + HealthConnectPermissions.DataTypeRow.VO2_MAX to stringResource(R.string.metric_vo2max), + HealthConnectPermissions.DataTypeRow.RESTING_HEART_RATE to stringResource(R.string.metric_resting_hr), ) for ((row, label) in rows) { val isRespRateOnYcbt = row == HealthConnectPermissions.DataTypeRow.RESPIRATORY_RATE && isYcbtDevice @@ -3306,13 +3293,13 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { Text(label, style = MaterialTheme.typography.bodyMedium) if (isRespRateOnYcbt) { Text( - "Derived from heart rate by current ring — export disabled", + stringResource(R.string.hc_resp_derived), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) } else if (!rowGranted) { Text( - "Awaiting permission", + stringResource(R.string.hc_awaiting_permission), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -3341,7 +3328,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { // Plan §7 open item: the rings' HRV metric is vendor-undocumented, and // Health Connect has no SDNN type — we export it as RMSSD. Text( - "HRV is exported as RMSSD — Health Connect has no SDNN type, and the rings' metric is vendor-undocumented.", + stringResource(R.string.hc_hrv_note), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -3372,10 +3359,9 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { if (syncedAt != null) { // The label promises a time, so show one (review pass 5): the summary // alone read as "Last sync: skipped: …" with no indication of when. - "Last sync ${DeviceHeroStatus.relativeShort(syncedAt, System.currentTimeMillis())} — " + - (prefs.lastSyncSummary ?: "unknown") + stringResource(R.string.hc_last_sync, DeviceHeroStatus.relativeShort(syncedAt, System.currentTimeMillis()), prefs.lastSyncSummary ?: stringResource(R.string.status_unknown)) } else { - "No export has run yet. With the master switch on and a backfill choice made, PulseLoop exports automatically." + stringResource(R.string.hc_no_export_yet) }, modifier = Modifier.padding(16.dp), style = MaterialTheme.typography.bodyMedium, @@ -3387,17 +3373,17 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { // stamp so the export state matches an empty Health store. Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(16.dp)) { - Text("Remove exported data", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.hc_remove_exported), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Spacer(Modifier.height(4.dp)) Text( - "Delete every record PulseLoop wrote to Health Connect and reset the export to start fresh. Your ring data in PulseLoop is untouched.", + stringResource(R.string.hc_remove_desc), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) if (!prefs.isConnected) { Spacer(Modifier.height(4.dp)) Text( - "Deleting needs write permission, and PulseLoop has none right now — re-grant above, or delete the data in the Health Connect app.", + stringResource(R.string.hc_remove_no_permission), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error, ) @@ -3409,7 +3395,7 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { enabled = !removing, colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error), modifier = Modifier.fillMaxWidth(), - ) { Text(if (removing) "Removing…" else "Remove PulseLoop data") } + ) { Text(if (removing) stringResource(R.string.status_removing) else stringResource(R.string.hc_remove_data)) } } } } @@ -3429,7 +3415,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) } }) { Text("Dismiss") } + TextButton(onClick = { store.update { it.copy(removalStatus = null) } }) { Text(stringResource(R.string.action_dismiss)) } } } } @@ -3456,21 +3442,21 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { // false (it no longer holds enabled + connected + NOT_ASKED), which also keeps the // on-screen state honest — re-enabling re-offers the dialog. onDismissRequest = { store.update { it.copy(enabled = false) } }, - title = { Text("How much history should we export?") }, + title = { Text(stringResource(R.string.hc_backfill_title)) }, // No "change this later" promise: there is no UI to change backfillChoice short of // "Remove PulseLoop data", which resets it to NOT_ASKED and re-offers this dialog. - text = { Text("Exporting all history can take a while on the first run.") }, + text = { Text(stringResource(R.string.hc_backfill_body)) }, confirmButton = { TextButton(onClick = { store.update { it.copy(backfillChoice = HealthConnectPrefs.BackfillChoice.EXPORT_ALL) } HealthConnectExportWorker.enqueue(context) // answer the gate → run the pass - }) { Text("Sync all history") } + }) { Text(stringResource(R.string.hc_backfill_all)) } }, dismissButton = { TextButton(onClick = { store.update { it.copy(backfillChoice = HealthConnectPrefs.BackfillChoice.EXPORT_NEW_ONLY) } HealthConnectExportWorker.enqueue(context) // stamps watermarks, exports nothing - }) { Text("Only new data from now on") } + }) { Text(stringResource(R.string.hc_backfill_new)) } }, ) } @@ -3481,18 +3467,18 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { if (showRevokeResetDialog) { AlertDialog( onDismissRequest = { showRevokeResetDialog = false; store.update { it.copy(revocationOfferDismissed = true) } }, - title = { Text("Health Connect permissions revoked") }, - text = { Text("PulseLoop no longer has any Health Connect permissions. Reset the export so a later re-grant re-exports your history?") }, + title = { Text(stringResource(R.string.hc_revoked_title)) }, + text = { Text(stringResource(R.string.hc_revoked_body)) }, confirmButton = { TextButton(onClick = { store.clearWatermarks() store.update { it.copy(lastSyncAt = null, lastSyncSummary = null, revocationOfferDismissed = true) } showRevokeResetDialog = false - statusMessage = "Export reset — re-grant permissions to sync again." - }) { Text("Reset export") } + statusMessage = context.getString(R.string.hc_export_reset_done) + }) { Text(stringResource(R.string.hc_reset_export)) } }, dismissButton = { - TextButton(onClick = { showRevokeResetDialog = false; store.update { it.copy(revocationOfferDismissed = true) } }) { Text("Not now") } + TextButton(onClick = { showRevokeResetDialog = false; store.update { it.copy(revocationOfferDismissed = true) } }) { Text(stringResource(R.string.action_not_now)) } }, ) } @@ -3502,8 +3488,8 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { if (showRemoveDialog) { AlertDialog( onDismissRequest = { showRemoveDialog = false }, - title = { Text("Remove PulseLoop data?") }, - text = { Text("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.") }, + title = { Text(stringResource(R.string.hc_remove_title)) }, + text = { Text(stringResource(R.string.hc_remove_body)) }, confirmButton = { TextButton(onClick = { showRemoveDialog = false @@ -3512,10 +3498,10 @@ fun HealthConnectSettingsScreen(onBack: () -> Unit) { // deleted, the rest alive, and the watermarks never cleared — unrepairable // from a write-only client. The worker reports back via prefs.removalStatus. HealthConnectRemovalWorker.enqueue(context) - }) { Text("Remove") } + }) { Text(stringResource(R.string.action_remove)) } }, dismissButton = { - TextButton(onClick = { showRemoveDialog = false }) { Text("Cancel") } + TextButton(onClick = { showRemoveDialog = false }) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -3567,7 +3553,7 @@ private fun BatteryRuntimeEstimate(samples: List) { } if (estimate == null) { Text( - "Not enough of a trend to estimate runtime yet — it appears after a few hours of discharge.", + stringResource(R.string.battery_runtime_not_enough), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -3575,12 +3561,12 @@ private fun BatteryRuntimeEstimate(samples: List) { } Column { Text( - "About ${estimate.label} left", + stringResource(R.string.battery_runtime_left, estimate.label), style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold, ) Text( - "Estimated from the current discharge at %.1f %%/h.".format(estimate.percentPerHour), + stringResource(R.string.battery_runtime_rate, "%.1f".format(estimate.percentPerHour)), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) 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 79e5c00e..03c8b436 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/SleepScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/SleepScreen.kt @@ -1,5 +1,9 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -117,15 +121,15 @@ private fun androidx.compose.foundation.lazy.LazyListScope.dayItems( val noData = SleepInsights.noDataState(SleepRangeKey.DAY) item { SleepHeroCard(label = noData.label, value = noData.value, support = noData.support, score = null, scoreLabel = null, noData = true) } item { - VisualizationCard(eyebrow = "Stages", title = "Sleep architecture", legend = false) { + VisualizationCard(eyebrow = stringResource(R.string.sleep_stages), title = stringResource(R.string.sleep_architecture), legend = false) { Column( Modifier.fillMaxWidth().height(180.dp), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) { - Text("No sleep recorded", fontSize = 14.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary) + Text(stringResource(R.string.sleep_none_recorded), fontSize = 14.sp, fontWeight = FontWeight.Medium, color = PulseColors.textPrimary) Text( - "Wear your ring overnight to see your hypnogram here.", + stringResource(R.string.sleep_none_recorded_hint), fontSize = 12.sp, color = PulseColors.textMuted, ) } @@ -143,7 +147,7 @@ private fun androidx.compose.foundation.lazy.LazyListScope.dayItems( val summary = state.daySummary val fallback = state.coach CoachMessageCard( - headline = summary?.title ?: fallback?.headline ?: "Sleep insights", + headline = summary?.title ?: fallback?.headline ?: stringResource(R.string.sleep_insights), body = summary?.body ?: fallback?.body ?: "", chips = summary?.let { parseChipsJson(it.chipsJSON) } ?: fallback?.chips ?: emptyList(), onTap = { navController?.navigate("coach") }, @@ -160,7 +164,7 @@ private fun androidx.compose.foundation.lazy.LazyListScope.sessionPageItems( ) { item { SessionHero(session, blocks) } item { - VisualizationCard(eyebrow = "Stages", title = "Sleep architecture", legend = true) { + VisualizationCard(eyebrow = stringResource(R.string.sleep_stages), title = stringResource(R.string.sleep_architecture), legend = true) { SleepHypnogram(blocks = remember(blocks) { com.pulseloop.service.hypnogramBlocks(blocks) }, spanMin = session.spanMinutes, startTs = session.startAt) } } @@ -187,9 +191,9 @@ private fun androidx.compose.foundation.lazy.LazyListScope.sessionPageItems( private fun SessionHero(session: SleepSessionEntity, blocks: List) { val score = remember(session.id, blocks) { com.pulseloop.service.SleepScore.calculate(session, blocks) } SleepHeroCard( - label = "Last Sleep", + label = stringResource(R.string.sleep_last), value = SleepFormat.duration(session.totalMinutes), - support = "${clockTime(session.startAt)} to ${clockTime(session.endAt)}", + support = stringResource(R.string.sleep_from_to, clockTime(session.startAt), clockTime(session.endAt)), score = score.score, scoreLabel = qualityText(score.label), ) @@ -218,12 +222,12 @@ private fun SleepCarousel( val blocks = blocksBySession[s.id] ?: emptyList() Column(verticalArrangement = Arrangement.spacedBy(16.dp)) { Text( - "${page + 1} of ${sessions.size} · ${clockTime(s.startAt)}–${clockTime(s.endAt)}".uppercase(), + stringResource(R.string.sleep_carousel_page, page + 1, sessions.size, clockTime(s.startAt), clockTime(s.endAt)).uppercase(), fontSize = 11.sp, fontWeight = FontWeight.Medium, letterSpacing = 0.8.sp, color = PulseColors.textSecondary, ) SessionHero(s, blocks) - VisualizationCard(eyebrow = "Stages", title = "Sleep architecture", legend = true) { + VisualizationCard(eyebrow = stringResource(R.string.sleep_stages), title = stringResource(R.string.sleep_architecture), legend = true) { SleepHypnogram(blocks = remember(blocks) { com.pulseloop.service.hypnogramBlocks(blocks) }, spanMin = s.spanMinutes, startTs = s.startAt) } // Unlike the single-session page, shown even for a one-record session: on a @@ -272,12 +276,12 @@ private fun androidx.compose.foundation.lazy.LazyListScope.aggregateItems( val noData = SleepInsights.noDataState(state.range) item { SleepHeroCard( - label = SleepInsights.rangeHeroLabel[state.range] ?: "Sleep", + label = SleepInsights.rangeHeroLabel[state.range] ?: stringResource(R.string.metric_sleep), value = if (enough) SleepFormat.duration(state.avgMinutes ?: 0) else noData.value, support = if (state.range == SleepRangeKey.YEAR) - "Tracked ${valid.size} ${if (valid.size == 1) "night" else "nights"} this year" + pluralStringResource(R.plurals.sleep_tracked_year, valid.size, valid.size) else - "${valid.size} of ${state.expectedNights} nights tracked", + stringResource(R.string.sleep_tracked_of, valid.size, state.expectedNights), score = if (enough) state.avgScore else null, scoreLabel = if (enough) state.avgScore?.let { qualityText(com.pulseloop.service.SleepScore.qualityLabel(it)) } else null, noData = !enough, @@ -285,8 +289,8 @@ private fun androidx.compose.foundation.lazy.LazyListScope.aggregateItems( } item { VisualizationCard( - eyebrow = "Duration", - title = if (state.range == SleepRangeKey.YEAR) "Monthly average" else "Nightly sleep", + eyebrow = stringResource(R.string.sleep_duration), + title = if (state.range == SleepRangeKey.YEAR) stringResource(R.string.sleep_monthly_average) else stringResource(R.string.sleep_nightly), legend = false, ) { SleepDurationHistogram( @@ -298,7 +302,7 @@ private fun androidx.compose.foundation.lazy.LazyListScope.aggregateItems( } item { SleepStageSummaryCards( - prefix = "Avg ", + average = true, deep = state.stageAvg?.let { SleepFormat.duration(it.first) } ?: "—", light = state.stageAvg?.let { SleepFormat.duration(it.second) } ?: "—", awake = state.stageAvg?.let { SleepFormat.duration(it.third) } ?: "—", @@ -308,7 +312,7 @@ private fun androidx.compose.foundation.lazy.LazyListScope.aggregateItems( val summary = state.rangeSummary val fallback = state.aggregateCoach CoachMessageCard( - headline = summary?.title ?: fallback?.headline ?: "Sleep insights", + headline = summary?.title ?: fallback?.headline ?: stringResource(R.string.sleep_insights), body = summary?.body ?: fallback?.body ?: "", chips = summary?.let { parseChipsJson(it.chipsJSON) } ?: fallback?.chips ?: emptyList(), onTap = { navController?.navigate("coach") }, @@ -322,8 +326,8 @@ private fun androidx.compose.foundation.lazy.LazyListScope.aggregateItems( @Composable private fun SleepRangeSelector(selection: SleepRangeKey, onSelect: (SleepRangeKey) -> Unit) { val options = listOf( - SleepRangeKey.DAY to "Day", SleepRangeKey.WEEK to "Week", - SleepRangeKey.MONTH to "Month", SleepRangeKey.YEAR to "Year", + SleepRangeKey.DAY to stringResource(R.string.range_day), SleepRangeKey.WEEK to stringResource(R.string.period_week), + SleepRangeKey.MONTH to stringResource(R.string.period_month), SleepRangeKey.YEAR to stringResource(R.string.range_year), ) Row( Modifier @@ -437,10 +441,10 @@ private fun VisualizationCard( } if (legend) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { - LegendItem("Deep", PulseColors.stageDeep) - LegendItem("Light", PulseColors.stageLight) - LegendItem("REM", PulseColors.stageRem) - LegendItem("Awake", PulseColors.stageAwake) + LegendItem(stringResource(R.string.stage_deep), PulseColors.stageDeep) + LegendItem(stringResource(R.string.stage_light), PulseColors.stageLight) + LegendItem(stringResource(R.string.stage_rem), PulseColors.stageRem) + LegendItem(stringResource(R.string.stage_awake), PulseColors.stageAwake) } } } @@ -534,8 +538,14 @@ private fun SleepHypnogram( } fun readoutText(block: SleepStageBlockEntity): String { - val stage = if (isAdded(block.stageRaw)) "Added by you" - else block.stageRaw.replaceFirstChar { it.uppercase() } + val stage = when (block.stageRaw) { + SleepStage.ADDED.name -> L10n.get(R.string.stage_added) + "DEEP" -> L10n.get(R.string.stage_deep) + "LIGHT" -> L10n.get(R.string.stage_light) + "REM" -> L10n.get(R.string.stage_rem) + "AWAKE" -> L10n.get(R.string.stage_awake) + else -> block.stageRaw.lowercase().replaceFirstChar { it.uppercase() } + } val startTime = clockTime(startTs + block.startMinute * 60_000L) val endTime = clockTime(startTs + (block.startMinute + block.durationMinutes) * 60_000L) return "$stage · $startTime – $endTime" @@ -752,7 +762,7 @@ private fun SleepHypnogram( ) { Box(Modifier.size(width = 10.dp, height = 6.dp).background(ADDED_BAND_COLOR.copy(alpha = 0.45f))) Text( - "Added by you · asleep, no stage measured", + stringResource(R.string.sleep_added_legend), fontSize = 10.sp, color = PulseColors.textMuted, ) } @@ -766,11 +776,11 @@ private val ADDED_BAND_COLOR = Color(0xFF9A97B5) /** Three side-by-side stage duration cards (SleepStageSummaryCardsView in Swift). */ @Composable -private fun SleepStageSummaryCards(prefix: String = "", deep: String, light: String, awake: String) { +private fun SleepStageSummaryCards(average: Boolean = false, deep: String, light: String, awake: String) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { - StageStat("${prefix}Deep", deep, PulseColors.stageDeep, Modifier.weight(1f)) - StageStat("${prefix}Light", light, PulseColors.stageLight, Modifier.weight(1f)) - StageStat("${prefix}Awake", awake, PulseColors.stageAwake, Modifier.weight(1f)) + StageStat(if (average) stringResource(R.string.stage_avg_deep) else stringResource(R.string.stage_deep), deep, PulseColors.stageDeep, Modifier.weight(1f)) + StageStat(if (average) stringResource(R.string.stage_avg_light) else stringResource(R.string.stage_light), light, PulseColors.stageLight, Modifier.weight(1f)) + StageStat(if (average) stringResource(R.string.stage_avg_awake) else stringResource(R.string.stage_awake), awake, PulseColors.stageAwake, Modifier.weight(1f)) } } @@ -815,7 +825,7 @@ private fun SleepDurationHistogram( ) { if (bars.isEmpty()) { Box(Modifier.fillMaxWidth().height(height), contentAlignment = Alignment.Center) { - Text("No nights tracked in this range yet.", fontSize = 12.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.sleep_no_nights_range), fontSize = 12.sp, color = PulseColors.textMuted) } return } @@ -883,7 +893,7 @@ private fun SleepDayNavHeader(state: SleepViewModel.SleepState, viewModel: Sleep verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, ) { - NavChevron(Icons.Filled.ChevronLeft, "Previous day", canOlder) { viewModel?.stepDay(older = true) } + NavChevron(Icons.Filled.ChevronLeft, stringResource(R.string.action_previous_day), canOlder) { viewModel?.stepDay(older = true) } Column( Modifier .weight(1f) @@ -903,7 +913,7 @@ private fun SleepDayNavHeader(state: SleepViewModel.SleepState, viewModel: Sleep letterSpacing = 0.5.sp, color = PulseColors.textSecondary, ) } - NavChevron(Icons.Filled.ChevronRight, "Next day", canNewer) { viewModel?.stepDay(older = false) } + NavChevron(Icons.Filled.ChevronRight, stringResource(R.string.action_next_day), canNewer) { viewModel?.stepDay(older = false) } } if (showPicker) { @@ -972,9 +982,9 @@ private fun SleepDayPickerDialog( confirmButton = { TextButton(onClick = { state.selectedDateMillis?.let { onPick(utcMillisToLocalDayKey(it)) } ?: onDismiss() - }) { Text("Done") } + }) { Text(stringResource(R.string.action_done)) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } }, ) { DatePicker(state = state, title = null) } @@ -998,11 +1008,11 @@ private fun dayLabel(dayMillis: Long): String { val daysAgo = ((today - dayMillis) / 86_400_000L).toInt() val date = java.time.Instant.ofEpochMilli(dayMillis).atZone(java.time.ZoneId.systemDefault()) return when { - daysAgo <= 0 -> "Today" - daysAgo == 1 -> "Yesterday" - daysAgo < 7 -> date.format(java.time.format.DateTimeFormatter.ofPattern("EEEE")) - date.year == java.time.Year.now().value -> date.format(java.time.format.DateTimeFormatter.ofPattern("EEE, MMM d")) - else -> date.format(java.time.format.DateTimeFormatter.ofPattern("MMM d, yyyy")) + daysAgo <= 0 -> L10n.get(R.string.period_today) + daysAgo == 1 -> L10n.get(R.string.day_yesterday) + daysAgo < 7 -> date.format(java.time.format.DateTimeFormatter.ofPattern("EEEE", java.util.Locale.getDefault())).replaceFirstChar { it.titlecase() } + date.year == java.time.Year.now().value -> date.format(com.pulseloop.util.LocaleFormats.formatter("EEEMMMd", "EEE, MMM d")) + else -> date.format(com.pulseloop.util.LocaleFormats.formatter("yMMMd", "MMM d, yyyy")) } } @@ -1012,7 +1022,7 @@ private fun daySubLabel(dayMillis: Long): String { val daysAgo = ((today - dayMillis) / 86_400_000L).toInt() if (daysAgo >= 7) return "" val date = java.time.Instant.ofEpochMilli(dayMillis).atZone(java.time.ZoneId.systemDefault()) - return date.format(java.time.format.DateTimeFormatter.ofPattern("EEE, MMM d")).uppercase(java.util.Locale.ROOT) + return date.format(com.pulseloop.util.LocaleFormats.formatter("EEEMMMd", "EEE, MMM d")).uppercase(java.util.Locale.getDefault()) } // ─────────────────────────── Helpers ─────────────────────────── @@ -1020,10 +1030,10 @@ private fun daySubLabel(dayMillis: Long): String { private fun clockTime(ts: Long): String = SleepFormat.clockTime(ts) private fun qualityText(label: SleepQualityLabel): String = when (label) { - SleepQualityLabel.EXCELLENT -> "Excellent" - SleepQualityLabel.GOOD -> "Good" - SleepQualityLabel.FAIR -> "Fair" - SleepQualityLabel.NEEDS_WORK -> "Needs work" + SleepQualityLabel.EXCELLENT -> L10n.get(R.string.quality_excellent) + SleepQualityLabel.GOOD -> L10n.get(R.string.quality_good) + SleepQualityLabel.FAIR -> L10n.get(R.string.quality_fair) + SleepQualityLabel.NEEDS_WORK -> L10n.get(R.string.quality_needs_work) } internal fun parseChipsJson(json: String?): List { @@ -1065,10 +1075,10 @@ private fun SleepRecordsCard( var pendingRun by remember { mutableStateOf(null) } var editingRun by remember { mutableStateOf(null) } VisualizationCard( - eyebrow = "Records", + eyebrow = stringResource(R.string.sleep_records), // One run only happens on a carousel page, which may be a nap rather than a night. - title = if (runs.size == 1) "The ring recorded this as one record" - else "The ring recorded this night in ${runs.size} parts", + title = if (runs.size == 1) stringResource(R.string.sleep_records_one) + else pluralStringResource(R.plurals.sleep_records_parts, runs.size, runs.size), legend = false, ) { Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { @@ -1087,15 +1097,14 @@ private fun SleepRecordsCard( color = PulseColors.textPrimary, ) Text( - "Asleep ${SleepFormat.duration(run.asleepMinutes)}", + stringResource(R.string.sleep_asleep_duration, SleepFormat.duration(run.asleepMinutes)), fontSize = 12.sp, color = PulseColors.textMuted, ) // Minutes the wearer added over time the ring missed (issue #106). if (run.addedMinutes > 0) { Text( - "Includes ${SleepFormat.duration(run.addedMinutes)} added by you, " + - "not staged or scored", + stringResource(R.string.sleep_includes_added, SleepFormat.duration(run.addedMinutes)), fontSize = 12.sp, color = PulseColors.textMuted, ) @@ -1105,7 +1114,7 @@ private fun SleepRecordsCard( IconButton(onClick = { editingRun = run }) { Icon( Icons.Filled.Edit, - contentDescription = "Edit this record's times", + contentDescription = stringResource(R.string.sleep_edit_record_times), tint = PulseColors.textMuted, modifier = Modifier.size(18.dp), ) @@ -1116,7 +1125,7 @@ private fun SleepRecordsCard( IconButton(onClick = { pendingRun = run }) { Icon( Icons.Filled.DeleteOutline, - contentDescription = "Delete this record", + contentDescription = stringResource(R.string.sleep_delete_record), tint = PulseColors.textMuted, modifier = Modifier.size(18.dp), ) @@ -1129,7 +1138,7 @@ private fun SleepRecordsCard( } else 0 if (gapMinutes > 0) { Text( - "Awake ${SleepFormat.duration(gapMinutes)} between", + stringResource(R.string.sleep_awake_between, SleepFormat.duration(gapMinutes)), fontSize = 12.sp, color = PulseColors.textMuted, modifier = Modifier.padding(start = 18.dp), @@ -1158,7 +1167,7 @@ private fun SleepRecordsCard( val updated = viewModel?.editSleepRecord(session.id, run.recordStartAt, newStart, newEnd) ?: false if (!updated) { android.widget.Toast.makeText( - context, "Couldn't update this record", android.widget.Toast.LENGTH_SHORT, + context, context.getString(R.string.sleep_update_failed), android.widget.Toast.LENGTH_SHORT, ).show() } } @@ -1169,11 +1178,10 @@ private fun SleepRecordsCard( pendingRun?.let { run -> AlertDialog( onDismissRequest = { pendingRun = null }, - title = { Text("Delete this record?") }, + title = { Text(stringResource(R.string.sleep_delete_record_title)) }, text = { Text( - "${SleepFormat.clockTime(run.startAt)} – ${SleepFormat.clockTime(run.endAt)} " + - "leaves tonight's totals and the hypnogram, and it won't come back on re-sync.", + stringResource(R.string.sleep_delete_record_body, SleepFormat.clockTime(run.startAt), SleepFormat.clockTime(run.endAt)), ) }, confirmButton = { @@ -1183,14 +1191,14 @@ private fun SleepRecordsCard( val removed = viewModel?.deleteSleepRecord(session.id, run.recordStartAt) ?: false if (!removed) { android.widget.Toast.makeText( - context, "Couldn't delete this record", android.widget.Toast.LENGTH_SHORT, + context, context.getString(R.string.sleep_delete_failed), android.widget.Toast.LENGTH_SHORT, ).show() } } - }) { Text("Delete", color = PulseColors.danger) } + }) { Text(stringResource(R.string.action_delete), color = PulseColors.danger) } }, dismissButton = { - TextButton(onClick = { pendingRun = null }) { Text("Keep") } + TextButton(onClick = { pendingRun = null }) { Text(stringResource(R.string.action_keep)) } }, ) } @@ -1213,12 +1221,11 @@ private fun SleepRecordEditDialog( AlertDialog( onDismissRequest = onDismiss, - title = { Text("Edit sleep record") }, + title = { Text(stringResource(R.string.sleep_edit_title)) }, text = { Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Text( - "Trim this record, or extend it over time the ring missed. Added time counts " + - "as asleep but has no stage, so it stays out of the stage breakdown and score.", + stringResource(R.string.sleep_edit_desc), style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = PulseColors.textMuted, ) @@ -1230,13 +1237,13 @@ private fun SleepRecordEditDialog( onClick = { pickingTime = "start" }, modifier = Modifier.weight(1f), ) { - Text("Start: ${SleepFormat.clockTime(currentStart)}") + Text(stringResource(R.string.sleep_edit_start, SleepFormat.clockTime(currentStart))) } OutlinedButton( onClick = { pickingTime = "end" }, modifier = Modifier.weight(1f), ) { - Text("End: ${SleepFormat.clockTime(currentEnd)}") + Text(stringResource(R.string.sleep_edit_end, SleepFormat.clockTime(currentEnd))) } } limitMessage?.let { @@ -1244,7 +1251,7 @@ private fun SleepRecordEditDialog( } if (currentStart >= currentEnd) { Text( - "Start time must be before end time.", + stringResource(R.string.sleep_edit_order_error), color = PulseColors.danger, fontSize = 12.sp, ) @@ -1256,11 +1263,11 @@ private fun SleepRecordEditDialog( onClick = { onSave(currentStart, currentEnd) }, enabled = currentStart < currentEnd && (currentStart != run.startAt || currentEnd != run.endAt), ) { - Text("Save") + Text(stringResource(R.string.action_save)) } }, dismissButton = { - TextButton(onClick = onDismiss) { Text("Cancel") } + TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } }, ) @@ -1275,7 +1282,7 @@ private fun SleepRecordEditDialog( AlertDialog( onDismissRequest = { pickingTime = null }, - title = { Text(if (which == "start") "Adjust start time" else "Adjust end time") }, + title = { Text(if (which == "start") stringResource(R.string.sleep_adjust_start) else stringResource(R.string.sleep_adjust_end)) }, text = { TimePicker(state = timeState) }, confirmButton = { TextButton(onClick = { @@ -1296,10 +1303,10 @@ private fun SleepRecordEditDialog( currentEnd = clamped.at } pickingTime = null - }) { Text("Done") } + }) { Text(stringResource(R.string.action_done)) } }, dismissButton = { - TextButton(onClick = { pickingTime = null }) { Text("Cancel") } + TextButton(onClick = { pickingTime = null }) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -1317,16 +1324,17 @@ internal fun editLimitMessage( ): String { val time = SleepFormat.clockTime(at) return when (limit) { - com.pulseloop.service.RecordEditLimit.PREVIOUS_RECORD -> "The previous record ends at $time." - com.pulseloop.service.RecordEditLimit.NEXT_RECORD -> "The next record starts at $time." - com.pulseloop.service.RecordEditLimit.OUTWARD_CAP -> - "A record can be extended by up to ${com.pulseloop.service.MAX_OUTWARD_EXTENSION_MINUTES / 60} " + - "hours, so ${if (isStart) "it can start at $time at the earliest" else "it can end at $time at the latest"}." + com.pulseloop.service.RecordEditLimit.PREVIOUS_RECORD -> L10n.get(R.string.edit_limit_previous, time) + com.pulseloop.service.RecordEditLimit.NEXT_RECORD -> L10n.get(R.string.edit_limit_next, time) + com.pulseloop.service.RecordEditLimit.OUTWARD_CAP -> { + val hours = com.pulseloop.service.MAX_OUTWARD_EXTENSION_MINUTES / 60 + if (isStart) L10n.plural(R.plurals.edit_limit_outward_start, hours, hours, time) + else L10n.plural(R.plurals.edit_limit_outward_end, hours, hours, time) + } com.pulseloop.service.RecordEditLimit.NIGHT_BOUNDARY -> - "${if (isStart) "Starting" else "Ending"} past $time would move it into another night." + if (isStart) L10n.get(R.string.edit_limit_night_start, time) else L10n.get(R.string.edit_limit_night_end, time) com.pulseloop.service.RecordEditLimit.RING_MINUTES -> - "Keep at least a minute of what the ring recorded " + - "(${SleepFormat.clockTime(limits.measuredStart)} – ${SleepFormat.clockTime(limits.measuredEnd)})." + L10n.get(R.string.edit_limit_ring_minutes, SleepFormat.clockTime(limits.measuredStart), SleepFormat.clockTime(limits.measuredEnd)) } } 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 5e7fc189..69b80127 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/TodayScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/TodayScreen.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.* import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.pullrefresh.PullRefreshIndicator @@ -165,8 +168,8 @@ fun TodayScreen( onTap = { navController?.navigate("coach") }, ) coachEnabled -> CoachMessageCard( - headline = "Want a recap?", - body = "Want a summary from the latest ring context? Tap to open the coach.", + headline = stringResource(R.string.today_recap_title), + body = stringResource(R.string.today_recap_body), chips = emptyList(), onTap = { navController?.navigate("coach") }, ) @@ -233,9 +236,9 @@ private fun ActivityTileFor( ActivityRing(state.calories, state.caloriesGoal.toDouble(), PulseColors.calories), ), values = buildList { - state.steps?.let { add(ActivityTileValue("STEPS", Formats.count(it), PulseColors.steps)) } + state.steps?.let { add(ActivityTileValue(stringResource(R.string.tile_steps), Formats.count(it), PulseColors.steps)) } distText?.let { add(ActivityTileValue(UnitConverter.distanceUnit(units), it, PulseColors.distance)) } - state.calories?.let { add(ActivityTileValue("CAL", Formats.count(it.toInt()), PulseColors.calories)) } + state.calories?.let { add(ActivityTileValue(stringResource(R.string.tile_cal), Formats.count(it.toInt()), PulseColors.calories)) } }, modifier = modifier, onTap = onTap, @@ -278,7 +281,7 @@ private fun ChartTile(card: VitalCardState, values: List, modifier: Modi // Issue #103: hourly SpO₂ computed from heart rate is labelled on every surface it reaches. if (card.isEstimated) { Text( - "Estimated from heart rate", fontSize = 11.sp, color = ZonePalette.ZoneAmber, + stringResource(R.string.today_estimated_from_hr), fontSize = 11.sp, color = ZonePalette.ZoneAmber, maxLines = 1, overflow = TextOverflow.Ellipsis, ) } @@ -345,13 +348,13 @@ private fun BloodPressureTile( val dia = vitals.bpDiastolic?.toDouble() Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) { if (sys == null || dia == null) { - Text("No reading", fontSize = 12.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.today_no_reading), fontSize = 12.sp, color = PulseColors.textMuted) } else { val sysZones = VitalsThresholdEngine.zones(MetricKind.BLOOD_PRESSURE, vitals.profile) val diaZones = VitalsThresholdEngine.diastolicReferenceZones() Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { - BpRingColumn("SYS", sys, 80.0..190.0, sysZones, PulseColors.bloodPressure, Modifier.weight(1f)) - BpRingColumn("DIA", dia, 50.0..130.0, diaZones, PulseColors.bloodPressure.copy(alpha = 0.7f), Modifier.weight(1f)) + BpRingColumn(stringResource(R.string.bp_sys_short), sys, 80.0..190.0, sysZones, PulseColors.bloodPressure, Modifier.weight(1f)) + BpRingColumn(stringResource(R.string.bp_dia_short), dia, 50.0..130.0, diaZones, PulseColors.bloodPressure.copy(alpha = 0.7f), Modifier.weight(1f)) } } } @@ -395,12 +398,12 @@ private data class Hero(val title: String, val summary: String, val chips: List< /** Ported from TodayInsights.deriveHero (TodayView.swift), minus the iOS calibration branch. */ private fun deriveHero(state: TodayViewModel.TodayState, sleep: SleepViewModel.SleepState): Hero { val steps = state.steps ?: return Hero( - title = "Waiting for first sync", - summary = "Sync your ring to start collecting movement, heart rate, blood oxygen, and recovery context.", + title = L10n.get(R.string.hero_waiting_title), + summary = L10n.get(R.string.hero_waiting_summary), chips = listOf( - ToneChip("Baseline pending", ChipTone.WARN), - ToneChip(if (state.heartRate == null) "HR pending" else "HR collected", ChipTone.NEUTRAL), - ToneChip("Sleep pending", ChipTone.WARN), + ToneChip(L10n.get(R.string.chip_baseline_pending), ChipTone.WARN), + ToneChip(if (state.heartRate == null) L10n.get(R.string.chip_hr_pending) else L10n.get(R.string.chip_hr_collected), ChipTone.NEUTRAL), + ToneChip(L10n.get(R.string.chip_sleep_pending), ChipTone.WARN), ), ) @@ -411,19 +414,17 @@ private fun deriveHero(state: TodayViewModel.TodayState, sleep: SleepViewModel.S val stepsDelta = if (base == 0.0) 0 else (((steps - base) / base) * 100).toInt() val title = when { - stepsDelta >= 20 -> "Building momentum" - stepsDelta <= -20 -> "Take it easy" - else -> "Steady build" + stepsDelta >= 20 -> L10n.get(R.string.hero_momentum) + stepsDelta <= -20 -> L10n.get(R.string.hero_take_it_easy) + else -> L10n.get(R.string.hero_steady) } - val hrStr = state.heartRate?.let { "$it bpm" } ?: "—" + val hrStr = state.heartRate?.let { L10n.get(R.string.value_bpm, it) } ?: "—" val night = sleep.lastNight val summary = if (night == null) { - "You're at %,d steps. Sync after waking to add recovery context.".format(steps) + L10n.plural(R.plurals.hero_steps_only, steps, steps) } else { - "You're at %,d steps, %dh %02dm of sleep, and your latest reading is %s.".format( - steps, night.totalMinutes / 60, night.totalMinutes % 60, hrStr, - ) + L10n.plural(R.plurals.hero_steps_sleep, steps, steps, night.totalMinutes / 60, night.totalMinutes % 60, hrStr) } val stepsTone = if (stepsDelta > 5) ChipTone.UP else if (stepsDelta < -5) ChipTone.DOWN else ChipTone.NEUTRAL @@ -437,11 +438,11 @@ private fun deriveHero(state: TodayViewModel.TodayState, sleep: SleepViewModel.S summary = summary, chips = listOf( ToneChip( - if (series.size > 1) "Steps ${if (stepsDelta >= 0) "+" else ""}$stepsDelta%" else "Steps collected", + if (series.size > 1) L10n.get(R.string.chip_steps_delta, (if (stepsDelta >= 0) "+" else "") + stepsDelta) else L10n.get(R.string.chip_steps_collected), stepsTone, ), - ToneChip(if (state.heartRate == null) "HR pending" else "HR collected", hrTone), - ToneChip(if (night != null) "Sleep synced" else "Sleep pending", if (night != null) ChipTone.NEUTRAL else ChipTone.WARN), + ToneChip(if (state.heartRate == null) L10n.get(R.string.chip_hr_pending) else L10n.get(R.string.chip_hr_collected), hrTone), + ToneChip(if (night != null) L10n.get(R.string.chip_sleep_synced) else L10n.get(R.string.chip_sleep_pending), if (night != null) ChipTone.NEUTRAL else ChipTone.WARN), ), ) } 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 02ae2258..2f7f8847 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/WorkoutSummaryScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/WorkoutSummaryScreen.kt @@ -1,5 +1,8 @@ package com.pulseloop.ui.screens +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -149,8 +152,8 @@ fun WorkoutSummaryScreen( if (confirmDelete) { AlertDialog( onDismissRequest = { confirmDelete = false }, - title = { Text("Delete workout?") }, - text = { Text("This removes the session and its recorded route. This can't be undone.") }, + title = { Text(stringResource(R.string.workout_delete_title)) }, + text = { Text(stringResource(R.string.workout_delete_body)) }, confirmButton = { TextButton(onClick = { confirmDelete = false @@ -162,9 +165,9 @@ fun WorkoutSummaryScreen( com.pulseloop.health.HealthConnectWorkoutDeletion.removeSessionRecords(context, s.id) onBack() } - }) { Text("Delete", color = PulseColors.danger) } + }) { Text(stringResource(R.string.action_delete), color = PulseColors.danger) } }, - dismissButton = { TextButton(onClick = { confirmDelete = false }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { confirmDelete = false }) { Text(stringResource(R.string.action_cancel)) } }, ) } @@ -205,11 +208,11 @@ private fun EditWorkoutSheet( val pauseMs = (session.totalPauseSeconds * 1000).toLong() val validationMessage = when { - endedAt > System.currentTimeMillis() -> "End time can't be in the future." + endedAt > System.currentTimeMillis() -> stringResource(R.string.workout_end_future) endedAt - startedAt <= pauseMs -> if (session.totalPauseSeconds > 0) - "The window must be longer than the ${maxOf(1, (session.totalPauseSeconds / 60).toInt())} min of pauses in this workout." - else "End must be after the start." + stringResource(R.string.workout_window_pauses, maxOf(1, (session.totalPauseSeconds / 60).toInt())) + else stringResource(R.string.workout_end_after_start) else -> null } @@ -218,9 +221,9 @@ private fun EditWorkoutSheet( Modifier.fillMaxWidth().padding(horizontal = 20.dp).padding(bottom = 24.dp), verticalArrangement = Arrangement.spacedBy(14.dp), ) { - Text("Edit workout", fontSize = 20.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) + Text(stringResource(R.string.workout_edit), fontSize = 20.sp, fontWeight = FontWeight.Bold, color = PulseColors.textPrimary) - EditFieldRow("Activity") { + EditFieldRow(stringResource(R.string.workout_field_activity)) { Box { OutlinedButton(onClick = { typeExpanded = true }) { Icon(ActivityMeta.icon(type), null, tint = PulseColors.accent, modifier = Modifier.size(16.dp)) @@ -239,16 +242,16 @@ private fun EditWorkoutSheet( } } - EditFieldRow("Starts") { + EditFieldRow(stringResource(R.string.workout_field_starts)) { DateTimeButton(startedAt) { startedAt = it } } - EditFieldRow("Ends") { + EditFieldRow(stringResource(R.string.workout_field_ends)) { DateTimeButton(endedAt) { endedAt = it } } Text( validationMessage - ?: "Distance, calories, and heart-rate stats are recalculated for the new window.", + ?: stringResource(R.string.workout_recalc_note), fontSize = 12.sp, color = if (validationMessage != null) PulseColors.warning else PulseColors.textMuted, textAlign = androidx.compose.ui.text.style.TextAlign.Center, @@ -264,11 +267,11 @@ private fun EditWorkoutSheet( ) { Icon(Icons.Filled.Check, null) Spacer(Modifier.width(8.dp)) - Text("Save changes", fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.action_save_changes), fontWeight = FontWeight.SemiBold) } TextButton(onClick = onDismiss, modifier = Modifier.fillMaxWidth().height(52.dp)) { - Text("Cancel", color = PulseColors.textPrimary, fontWeight = FontWeight.SemiBold) + Text(stringResource(R.string.action_cancel), color = PulseColors.textPrimary, fontWeight = FontWeight.SemiBold) } } } @@ -328,9 +331,9 @@ internal fun DateTimeButton(valueMillis: Long, onChange: (Long) -> Unit) { } showDate = false showTime = true - }) { Text("Next") } + }) { Text(stringResource(R.string.action_next)) } }, - dismissButton = { TextButton(onClick = { showDate = false }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { showDate = false }) { Text(stringResource(R.string.action_cancel)) } }, ) { DatePicker(state = state, title = null) } } @@ -344,7 +347,7 @@ internal fun DateTimeButton(valueMillis: Long, onChange: (Long) -> Unit) { ) AlertDialog( onDismissRequest = { showTime = false }, - title = { Text("Time") }, + title = { Text(stringResource(R.string.workout_time)) }, text = { TimePicker(state = timeState) }, confirmButton = { TextButton(onClick = { @@ -356,15 +359,15 @@ internal fun DateTimeButton(valueMillis: Long, onChange: (Long) -> Unit) { }.timeInMillis onChange(result) showTime = false - }) { Text("Done") } + }) { Text(stringResource(R.string.action_done)) } }, - dismissButton = { TextButton(onClick = { showTime = false }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { showTime = false }) { Text(stringResource(R.string.action_cancel)) } }, ) } } internal fun formatDateTime(millis: Long): String = - SimpleDateFormat("MMM d, h:mm a", Locale.getDefault()).format(Date(millis)) + com.pulseloop.util.LocaleFormats.simpleDateFormat("MMMdjmm", "MMM d, h:mm a").format(Date(millis)) /** The calendar date of a local-epoch millis value, expressed at UTC midnight (what DatePicker wants). */ internal fun localMillisToUtcMidnight(localMillis: Long): Long { @@ -403,13 +406,13 @@ private fun dateRange(s: ActivitySessionEntity): String { it.get(Calendar.YEAR) == startCal.get(Calendar.YEAR) && it.get(Calendar.DAY_OF_YEAR) == startCal.get(Calendar.DAY_OF_YEAR) } val day = when { - sameDay -> "Today" - yesterday -> "Yesterday" - else -> SimpleDateFormat("MMM d", Locale.getDefault()).format(Date(s.startedAt)) + sameDay -> L10n.get(R.string.period_today) + yesterday -> L10n.get(R.string.day_yesterday) + else -> com.pulseloop.util.LocaleFormats.simpleDateFormat("MMMd", "MMM d").format(Date(s.startedAt)) } val ended = s.endedAt ?: return day - val start = SimpleDateFormat("h:mm", Locale.getDefault()).format(Date(s.startedAt)) - val end = SimpleDateFormat("h:mm a", Locale.getDefault()).format(Date(ended)) + val start = com.pulseloop.util.LocaleFormats.simpleDateFormat("jmm", "h:mm").format(Date(s.startedAt)) + val end = com.pulseloop.util.LocaleFormats.simpleDateFormat("jmm", "h:mm a").format(Date(ended)) return "$day · $start – $end" } @@ -425,23 +428,23 @@ private fun SummaryHeroBand(s: ActivitySessionEntity, durationSec: Int?, units: val dist = s.distanceMeters?.let { "%.2f".format(UnitConverter.distance(it, units)) } val third = when { metricSet.showsPace -> - M(ActivityMeta.pace(s.distanceMeters, durationSec, units) ?: "—", "PACE ${ActivityMeta.paceUnit(units)}", PulseColors.accent) + M(ActivityMeta.pace(s.distanceMeters, durationSec, units) ?: "—", stringResource(R.string.workout_pace_unit, ActivityMeta.paceUnit(units)), PulseColors.accent) metricSet.showsSpeed -> { val parts = ActivityMeta.speedParts(s.distanceMeters, durationSec, units) - M(parts?.first ?: "—", parts?.second ?: "SPEED", PulseColors.accent) + M(parts?.first ?: "—", parts?.second ?: stringResource(R.string.workout_speed), PulseColors.accent) } - else -> M(s.calories?.let { "${it.toInt()}" } ?: "—", "CALORIES", PulseColors.calories) + else -> M(s.calories?.let { "${it.toInt()}" } ?: "—", stringResource(R.string.workout_calories_caps), PulseColors.calories) } listOf( M(dist ?: "—", UnitConverter.distanceUnit(units).uppercase(java.util.Locale.ROOT), PulseColors.distance), - M(dur, "DURATION", PulseColors.textPrimary), + M(dur, stringResource(R.string.workout_duration_caps), PulseColors.textPrimary), third, ) } else { listOf( - M(dur, "DURATION", PulseColors.textPrimary), - M(durationSec?.let { "${it / 60}" } ?: "—", "ACTIVE MIN", PulseColors.success), - M(s.calories?.let { "${it.toInt()}" } ?: "—", "CALORIES", PulseColors.calories), + M(dur, stringResource(R.string.workout_duration_caps), PulseColors.textPrimary), + M(durationSec?.let { "${it / 60}" } ?: "—", stringResource(R.string.workout_active_min_caps), PulseColors.success), + M(s.calories?.let { "${it.toInt()}" } ?: "—", stringResource(R.string.workout_calories_caps), PulseColors.calories), ) } val shape = RoundedCornerShape(20.dp) @@ -470,10 +473,10 @@ private fun SummaryHeroBand(s: ActivitySessionEntity, durationSec: Int?, units: @Composable private fun StatsGrid(s: ActivitySessionEntity) { val stats = buildList { - if (s.useGps) add("Calories" to (s.calories?.let { "${it.toInt()}" } ?: "—")) - add("Avg HR" to (s.avgHeartRate?.let { "${it.toInt()}" } ?: "—")) - add("Max HR" to (s.maxHeartRate?.let { "${it.toInt()}" } ?: "—")) - add("Min HR" to (s.minHeartRate?.let { "${it.toInt()}" } ?: "—")) + if (s.useGps) add(L10n.get(R.string.metric_calories) to (s.calories?.let { "${it.toInt()}" } ?: "—")) + add(L10n.get(R.string.workout_avg_hr) to (s.avgHeartRate?.let { "${it.toInt()}" } ?: "—")) + add(L10n.get(R.string.workout_max_hr) to (s.maxHeartRate?.let { "${it.toInt()}" } ?: "—")) + add(L10n.get(R.string.workout_min_hr) to (s.minHeartRate?.let { "${it.toInt()}" } ?: "—")) add("SpO₂" to (s.latestSpO2?.let { "${it.toInt()}%" } ?: "—")) } Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { @@ -505,7 +508,7 @@ private fun StatsGrid(s: ActivitySessionEntity) { @Composable private fun SplitsCard(points: List, units: UnitSystem, activityType: String) { val splitMeters = if (units == UnitSystem.IMPERIAL) 1609.344 else 1000.0 - val splitLabel = if (units == UnitSystem.IMPERIAL) "MI" else "KM" + val splitLabel = if (units == UnitSystem.IMPERIAL) stringResource(R.string.unit_mi).uppercase() else stringResource(R.string.unit_km).uppercase() val paceUnit = ActivityMeta.paceUnit(units) val profile = remember(activityType) { ActivityTrackingProfile.profile(activityType) } val splits = remember(points, splitMeters, profile) { RouteDistanceEngine.splitSeconds(points, splitMeters, profile) } @@ -523,7 +526,7 @@ private fun SplitsCard(points: List, units: UnitSystem, .padding(16.dp), verticalArrangement = Arrangement.spacedBy(10.dp), ) { - Text("SPLITS", fontSize = 11.sp, fontWeight = FontWeight.Medium, letterSpacing = 1.sp, color = PulseColors.textMuted) + Text(stringResource(R.string.workout_splits), fontSize = 11.sp, fontWeight = FontWeight.Medium, letterSpacing = 1.sp, color = PulseColors.textMuted) splits.forEachIndexed { index, seconds -> val isFastest = seconds == fastest val frac = if (slowest > fastest) (seconds - fastest) / (slowest - fastest) else 0.0 @@ -576,13 +579,13 @@ private fun MissingWorkout(onBack: () -> Unit) { ) { Icon(Icons.AutoMirrored.Filled.DirectionsRun, null, tint = PulseColors.textMuted, modifier = Modifier.size(48.dp)) Spacer(Modifier.height(12.dp)) - Text("Workout not found", fontSize = 20.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) + Text(stringResource(R.string.workout_not_found), fontSize = 20.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary) Spacer(Modifier.height(6.dp)) Text( - "This workout is no longer in local storage. It may have been deleted or replaced.", + stringResource(R.string.workout_not_found_desc), fontSize = 14.sp, color = PulseColors.textMuted, textAlign = TextAlign.Center, ) Spacer(Modifier.height(16.dp)) - TextButton(onClick = onBack) { Text("Back", color = PulseColors.accent) } + TextButton(onClick = onBack) { Text(stringResource(R.string.action_back), color = PulseColors.accent) } } } diff --git a/app/src/main/java/com/pulseloop/ui/viewmodels/ViewModels.kt b/app/src/main/java/com/pulseloop/ui/viewmodels/ViewModels.kt index 0ba8035f..03ba50dd 100644 --- a/app/src/main/java/com/pulseloop/ui/viewmodels/ViewModels.kt +++ b/app/src/main/java/com/pulseloop/ui/viewmodels/ViewModels.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.viewmodels +import com.pulseloop.util.L10n +import com.pulseloop.R import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.room.withTransaction @@ -1001,8 +1003,7 @@ class CoachViewModel( val id: String? = null, ) - private val greeting = ChatMessage("assistant", - "Hi! I'm your PulseLoop coach. I can answer questions about your sleep, heart rate, activity, and recovery. What would you like to know?") + private val greeting get() = ChatMessage("assistant", L10n.get(R.string.coach_greeting)) private val _state = MutableStateFlow(CoachState(messages = listOf(greeting))) val state: StateFlow = _state.asStateFlow() @@ -1232,7 +1233,7 @@ class CoachViewModel( } catch (e: Exception) { if (currentConversation.id == conversationId) { _state.update { it.copy( - messages = it.messages + ChatMessage("assistant", "Sorry, something went wrong: ${e.message}"), + messages = it.messages + ChatMessage("assistant", L10n.get(R.string.coach_something_wrong, e.message ?: "")), isThinking = false, error = e.message, ) } } @@ -1243,7 +1244,9 @@ class CoachViewModel( // ──────────────────────── Vital Detail ──────────────────────── -enum class Period(val label: String) { DAY("Today"), WEEK("Week"), MONTH("Month") } +enum class Period(@androidx.annotation.StringRes val labelRes: Int) { + DAY(R.string.period_today), WEEK(R.string.period_week), MONTH(R.string.period_month) +} /** * VitalDetailViewModel — drives a single-metric detail screen with Today/Week/Month diff --git a/app/src/main/java/com/pulseloop/ui/viewmodels/VitalCardState.kt b/app/src/main/java/com/pulseloop/ui/viewmodels/VitalCardState.kt index c32f6aca..cc0a05e3 100644 --- a/app/src/main/java/com/pulseloop/ui/viewmodels/VitalCardState.kt +++ b/app/src/main/java/com/pulseloop/ui/viewmodels/VitalCardState.kt @@ -1,5 +1,7 @@ package com.pulseloop.ui.viewmodels +import com.pulseloop.R +import com.pulseloop.util.L10n import com.pulseloop.service.BaselineStats import com.pulseloop.service.MeasurementContext import com.pulseloop.service.MetricContext @@ -58,7 +60,7 @@ data class TrendSummary( // HRV: latest vs personal baseline. if (metric == MetricKind.HRV && baseline != null && baseline.isEstablished) { val latest = values.lastOrNull() ?: baseline.mean - return summarize(latest - baseline.mean, unitLabel, "vs baseline") + return summarize(latest - baseline.mean, unitLabel, L10n.get(R.string.trend_vs_baseline)) } // Dense (≥8 points over the window): split at the time midpoint, compare half means. @@ -69,14 +71,14 @@ data class TrendSummary( val recent = samples.filter { it.timestampMs >= mid }.map { it.value } val prior = samples.filter { it.timestampMs < mid }.map { it.value } if (recent.isNotEmpty() && prior.isNotEmpty()) { - return summarize(recent.average() - prior.average(), unitLabel, "vs earlier") + return summarize(recent.average() - prior.average(), unitLabel, L10n.get(R.string.trend_vs_earlier)) } } // Sparse: latest minus previous. val latest = values[values.size - 1] val previous = values[values.size - 2] - return summarize(latest - previous, unitLabel, "vs previous") + return summarize(latest - previous, unitLabel, L10n.get(R.string.trend_vs_previous)) } /** @@ -87,7 +89,7 @@ data class TrendSummary( // Sub-unit deltas keep one decimal (truncated, matching iOS Int-cast); larger deltas round. val rounded = if (abs(delta) < 1 && delta != 0.0) (delta * 10).toInt() / 10.0 else roundAwayFromZero(delta) if (abs(rounded) < 0.5) { - return TrendSummary(TrendDirection.STABLE, "Stable $suffix", "→") + return TrendSummary(TrendDirection.STABLE, L10n.get(R.string.trend_stable, suffix), "→") } val unit = if (unitLabel.isEmpty()) "" else " $unitLabel" val sign = if (rounded > 0) "+" else "−" @@ -207,20 +209,20 @@ object VitalsCardFactory { val interp = latest?.let { VitalsThresholdEngine.interpret(it, MetricKind.HEART_RATE, profile) } val valueText = rangeLabel(samples, latest) - val resting = inputs.restingHr?.let { "Resting ${it.toInt()}" } ?: "Resting calibrating" - val peak = inputs.peakHr?.let { "Peak ${it.toInt()}" } ?: "Peak —" + val resting = inputs.restingHr?.let { L10n.get(R.string.card_resting, it.toInt()) } ?: L10n.get(R.string.card_resting_calibrating) + val peak = inputs.peakHr?.let { L10n.get(R.string.card_peak, it.toInt()) } ?: L10n.get(R.string.card_peak_none) val domain = clampedDomain(samples, 40.0..140.0, pad = 8.0, hardLower = 40.0, hardUpper = 220.0) return VitalCardState( metric = MetricKind.HEART_RATE, title = MetricKind.HEART_RATE.title, valueText = valueText, latestValue = latest, - unitText = if (latest != null) "bpm range" else null, - statusText = interp?.displayLabel ?: "No reading", + unitText = if (latest != null) L10n.get(R.string.card_bpm_range) else null, + statusText = interp?.displayLabel ?: L10n.get(R.string.today_no_reading), statusToken = interp?.statusColorToken ?: VitalColorToken.Neutral, subtitleText = "$resting · $peak", samples = samples, zones = VitalsThresholdEngine.zones(MetricKind.HEART_RATE, profile), yDomain = domain, referenceBands = normalBand(MetricKind.HEART_RATE, profile, domain), dashedRules = emptyList(), - trend = TrendSummary.compute(samples, MetricKind.HEART_RATE, unitLabel = "bpm"), + trend = TrendSummary.compute(samples, MetricKind.HEART_RATE, unitLabel = L10n.get(R.string.unit_bpm)), sourceQuality = quality, isEstimated = false, confidenceLabel = null, lastUpdatedText = lastUpdated(samples.lastOrNull()?.timestampMs, inputs.nowMs), isEmpty = samples.size < 2, @@ -235,12 +237,12 @@ object VitalsCardFactory { val quality = quality(MetricKind.SPO2, samples.lastOrNull()?.timestampMs, inputs) val interp = latest?.let { VitalsThresholdEngine.interpret(it, MetricKind.SPO2, profile) } val lowest = samples.map { it.value }.filter { it > 0 }.minOrNull() - val subtitle = lowest?.let { "Lowest ${it.toInt()} · ${samples.size} readings" } + val subtitle = lowest?.let { L10n.get(R.string.card_lowest, it.toInt(), L10n.plural(R.plurals.readings_count, samples.size, samples.size)) } return VitalCardState( metric = MetricKind.SPO2, title = MetricKind.SPO2.title, valueText = averageLabel(samples, latest), latestValue = latest, - unitText = if (latest != null) "% avg" else null, - statusText = interp?.displayLabel ?: "No reading", + unitText = if (latest != null) L10n.get(R.string.card_pct_avg) else null, + statusText = interp?.displayLabel ?: L10n.get(R.string.today_no_reading), statusToken = interp?.statusColorToken ?: VitalColorToken.Neutral, subtitleText = subtitle, samples = samples, zones = VitalsThresholdEngine.zones(MetricKind.SPO2, profile), @@ -271,22 +273,22 @@ object VitalsCardFactory { ) } val subtitle = if (baseline != null && baseline.isEstablished) { - "Baseline ${baseline.mean.toInt()} ms" + L10n.get(R.string.card_baseline_ms, baseline.mean.toInt()) } else { - "Building baseline" + L10n.get(R.string.zl_building_baseline) } return VitalCardState( metric = MetricKind.HRV, title = MetricKind.HRV.title, valueText = latest?.let { "${it.toInt()}" } ?: "--", latestValue = latest, - unitText = if (latest != null) "ms" else null, - statusText = interp?.displayLabel ?: "Building baseline", + unitText = if (latest != null) L10n.get(R.string.unit_ms) else null, + statusText = interp?.displayLabel ?: L10n.get(R.string.zl_building_baseline), statusToken = interp?.statusColorToken ?: VitalColorToken.Neutral, subtitleText = subtitle, samples = samples, zones = VitalsThresholdEngine.zones(MetricKind.HRV, profile, baseline = baseline), yDomain = domain, referenceBands = bands, dashedRules = baseline?.let { listOf(it.mean) } ?: emptyList(), - trend = TrendSummary.compute(samples, MetricKind.HRV, baseline = baseline, unitLabel = "ms"), + trend = TrendSummary.compute(samples, MetricKind.HRV, baseline = baseline, unitLabel = L10n.get(R.string.unit_ms)), sourceQuality = quality, isEstimated = false, confidenceLabel = interp?.confidenceLabel, lastUpdatedText = lastUpdated(samples.lastOrNull()?.timestampMs, inputs.nowMs), isEmpty = samples.size < 2, @@ -304,11 +306,11 @@ object VitalsCardFactory { val latest = samples.lastOrNull()?.value val quality = quality(metric, samples.lastOrNull()?.timestampMs, inputs) val interp = latest?.let { VitalsThresholdEngine.interpret(it, metric, profile) } - val subtitle = if (metric == MetricKind.STRESS) "Lower is calmer" else "Ring model estimate" + val subtitle = if (metric == MetricKind.STRESS) L10n.get(R.string.card_lower_calmer) else L10n.get(R.string.card_ring_estimate) return VitalCardState( metric = metric, title = metric.title, valueText = latest?.let { "${it.toInt()}" } ?: "--", latestValue = latest, unitText = null, - statusText = interp?.displayLabel ?: "No data", + statusText = interp?.displayLabel ?: L10n.get(R.string.status_no_data), statusToken = interp?.statusColorToken ?: VitalColorToken.Neutral, subtitleText = subtitle, samples = samples, zones = VitalsThresholdEngine.zones(metric, profile), @@ -350,7 +352,7 @@ object VitalsCardFactory { valueText = latest?.let { "%.1f".format(tempValue(it, units)) } ?: "--", latestValue = latest?.let { tempValue(it, units) }, unitText = if (latest != null) tempUnit(units) else null, - statusText = interp?.displayLabel ?: "No data", + statusText = interp?.displayLabel ?: L10n.get(R.string.status_no_data), statusToken = interp?.statusColorToken ?: VitalColorToken.Neutral, subtitleText = null, samples = dispSamples, zones = zones, @@ -377,8 +379,8 @@ object VitalsCardFactory { metric = MetricKind.BLOOD_PRESSURE, title = MetricKind.BLOOD_PRESSURE.title, // No latestValue: the "sys/dia" label has no single number; BP gauges read the two // series directly. - valueText = valueText, unitText = if (sys != null) "mmHg" else null, - statusText = interp?.displayLabel ?: "No reading", + valueText = valueText, unitText = if (sys != null) L10n.get(R.string.unit_mmhg) else null, + statusText = interp?.displayLabel ?: L10n.get(R.string.today_no_reading), statusToken = interp?.statusColorToken ?: VitalColorToken.Neutral, // Systolic/diastolic values are shown under each of the two gauges on the card, so the // subtitle would just repeat them. @@ -386,9 +388,9 @@ object VitalsCardFactory { samples = inputs.systolic, zones = VitalsThresholdEngine.zones(MetricKind.BLOOD_PRESSURE, profile), yDomain = 80.0..190.0, referenceBands = emptyList(), dashedRules = emptyList(), - trend = TrendSummary.compute(inputs.systolic, MetricKind.BLOOD_PRESSURE, unitLabel = "mmHg"), + trend = TrendSummary.compute(inputs.systolic, MetricKind.BLOOD_PRESSURE, unitLabel = L10n.get(R.string.unit_mmhg)), sourceQuality = quality, isEstimated = true, - confidenceLabel = if (inputs.hasBPReference) "Estimated" else "Estimated · calibrate with a cuff", + confidenceLabel = if (inputs.hasBPReference) L10n.get(R.string.badge_estimated) else L10n.get(R.string.zc_estimated_calibrate), lastUpdatedText = lastUpdated(inputs.systolic.lastOrNull()?.timestampMs, inputs.nowMs), isEmpty = sys == null || dia == null, ) @@ -423,15 +425,15 @@ object VitalsCardFactory { return VitalCardState( metric = MetricKind.GLUCOSE, title = MetricKind.GLUCOSE.title, valueText = valueText ?: "--", latestValue = latest?.let(::gv), - unitText = if (latest != null) gUnit.label else null, - statusText = interp?.displayLabel ?: "No estimate", + unitText = if (latest != null) L10n.get(gUnit.labelRes) else null, + statusText = interp?.displayLabel ?: L10n.get(R.string.status_no_estimate), statusToken = interp?.statusColorToken ?: VitalColorToken.Neutral, - subtitleText = "Estimated wellness metric", + subtitleText = L10n.get(R.string.card_wellness_estimate), samples = dispSamples, zones = zones, yDomain = domain, referenceBands = listOf(ReferenceBand(gv(70.0), gv(140.0), VitalColorToken.Mint)), dashedRules = emptyList(), - trend = TrendSummary.compute(dispSamples, MetricKind.GLUCOSE, unitLabel = gUnit.label), + trend = TrendSummary.compute(dispSamples, MetricKind.GLUCOSE, unitLabel = L10n.get(gUnit.labelRes)), sourceQuality = quality, isEstimated = true, confidenceLabel = interp?.confidenceLabel, lastUpdatedText = lastUpdated(samples.lastOrNull()?.timestampMs, inputs.nowMs), isEmpty = samples.size < 2, @@ -511,11 +513,11 @@ object VitalsCardFactory { private fun lastUpdated(dateMs: Long?, nowMs: Long): String? { if (dateMs == null) return null val minutes = ((nowMs - dateMs) / 60_000L).toInt() - if (minutes < 1) return "Updated just now" - if (minutes < 60) return "Updated ${minutes}m ago" + if (minutes < 1) return L10n.get(R.string.updated_just_now) + if (minutes < 60) return L10n.get(R.string.updated_ago, L10n.get(R.string.ago_minutes, minutes)) val hours = minutes / 60 - if (hours < 24) return "Updated ${hours}h ago" - return "Updated ${hours / 24}d ago" + if (hours < 24) return L10n.get(R.string.updated_ago, L10n.get(R.string.ago_hours, hours)) + return L10n.get(R.string.updated_ago, L10n.get(R.string.ago_days, hours / 24)) } // Unit conversions (iOS UnitsFormatter). °C is canonical for temperature; mg/dL for glucose. diff --git a/app/src/main/java/com/pulseloop/update/UpdateUi.kt b/app/src/main/java/com/pulseloop/update/UpdateUi.kt index 031065d3..3645e4d1 100644 --- a/app/src/main/java/com/pulseloop/update/UpdateUi.kt +++ b/app/src/main/java/com/pulseloop/update/UpdateUi.kt @@ -1,5 +1,8 @@ package com.pulseloop.update +import com.pulseloop.R +import com.pulseloop.util.L10n +import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth @@ -35,11 +38,11 @@ fun UpdateDialog(info: UpdateInfo, onDismiss: () -> Unit) { AlertDialog( onDismissRequest = { if (!downloading) onDismiss() }, - title = { Text("Update available — ${info.versionName}") }, + title = { Text(stringResource(R.string.update_available, info.versionName)) }, text = { Column { if (downloading) { - Text("Downloading… ${(progress * 100).toInt()}%", style = MaterialTheme.typography.bodyMedium) + Text(stringResource(R.string.update_downloading_pct, (progress * 100).toInt()), style = MaterialTheme.typography.bodyMedium) Spacer(Modifier.height(8.dp)) LinearProgressIndicator(progress = { progress }, modifier = Modifier.fillMaxWidth()) } else { @@ -81,14 +84,14 @@ fun UpdateDialog(info: UpdateInfo, onDismiss: () -> Unit) { ApkInstaller.install(context, file) onDismiss() } else { - error = "Download failed. Please try again." + error = L10n.get(R.string.update_download_failed) } } }, - ) { Text(if (downloading) "Downloading…" else "Update") } + ) { Text(if (downloading) stringResource(R.string.update_downloading) else stringResource(R.string.update_action)) } }, dismissButton = { - TextButton(enabled = !downloading, onClick = onDismiss) { Text("Later") } + TextButton(enabled = !downloading, onClick = onDismiss) { Text(stringResource(R.string.action_later)) } }, ) } @@ -109,8 +112,7 @@ fun CheckForUpdatesButton(modifier: Modifier = Modifier) { Column(modifier) { if (!UpdateChecker.isSupported()) { Text( - "Self-update is available in the release build only " + - "(current: ${BuildConfig.VERSION_NAME} / ${BuildConfig.APPLICATION_ID}).", + stringResource(R.string.update_release_only, BuildConfig.VERSION_NAME, BuildConfig.APPLICATION_ID), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -125,14 +127,14 @@ fun CheckForUpdatesButton(modifier: Modifier = Modifier) { when (val result = UpdateChecker.check(context, force = true)) { is UpdateCheckResult.UpdateAvailable -> update = result.info is UpdateCheckResult.Failed -> - status = "Couldn't check for updates (${result.reason}). Please try again." - else -> status = "You're on the latest version (${BuildConfig.VERSION_NAME})." + status = L10n.get(R.string.update_check_failed, result.reason) + else -> status = L10n.get(R.string.update_latest, BuildConfig.VERSION_NAME) } checking = false } }, modifier = Modifier.fillMaxWidth(), - ) { Text(if (checking) "Checking…" else "Check for updates") } + ) { Text(if (checking) stringResource(R.string.update_checking) else stringResource(R.string.update_check)) } status?.let { Spacer(Modifier.height(8.dp)) Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) diff --git a/app/src/main/java/com/pulseloop/util/L10n.kt b/app/src/main/java/com/pulseloop/util/L10n.kt new file mode 100644 index 00000000..e7fa1af9 --- /dev/null +++ b/app/src/main/java/com/pulseloop/util/L10n.kt @@ -0,0 +1,82 @@ +package com.pulseloop.util + +import android.content.Context +import androidx.annotation.PluralsRes +import androidx.annotation.StringRes +import java.io.File + +/** + * String resources for code that has no [Context] of its own: services, view-model state + * builders, threshold engines, notification text. + * + * Composables use `stringResource`, and anything already holding a Context should call + * `context.getString` directly. This exists for the layers below the UI, which were written + * against literals and are exercised by plain JVM unit tests. + * + * In the app, [init] is called from `PulseLoopApplication.onCreate`, and lookups go through the + * application's resources, so they follow the system or per-app language. In a JVM unit test there + * is no Context, so lookups read the default (English) `values/strings.xml` straight from the + * module's source tree. Tests asserting on English copy therefore keep passing without + * duplicating any text in code. + */ +object L10n { + @Volatile + private var appContext: Context? = null + + fun init(context: Context) { + appContext = context.applicationContext + } + + fun get(@StringRes id: Int, vararg args: Any?): String { + appContext?.let { return if (args.isEmpty()) it.getString(id) else it.getString(id, *args) } + val raw = JvmFallback.string(id) + return if (args.isEmpty()) raw else String.format(raw, *args) + } + + fun plural(@PluralsRes id: Int, count: Int, vararg args: Any?): String { + appContext?.let { return it.resources.getQuantityString(id, count, *args) } + val raw = JvmFallback.plural(id, count) + return String.format(raw, *args) + } + + /** Reads `values/strings.xml` for JVM unit tests, where no Android resources exist. */ + private object JvmFallback { + private val strings = mutableMapOf() + private val plurals = mutableMapOf>() + + init { + val file = listOf( + "src/main/res/values/strings.xml", + "app/src/main/res/values/strings.xml", + ).map(::File).firstOrNull { it.exists() } + val xml = file?.readText().orEmpty() + Regex("""]*>(.*?)""", RegexOption.DOT_MATCHES_ALL) + .findAll(xml).forEach { strings[it.groupValues[1]] = unescape(it.groupValues[2]) } + Regex("""]*>(.*?)""", RegexOption.DOT_MATCHES_ALL) + .findAll(xml).forEach { p -> + plurals[p.groupValues[1]] = Regex("""(.*?)""", RegexOption.DOT_MATCHES_ALL) + .findAll(p.groupValues[2]).associate { it.groupValues[1] to unescape(it.groupValues[2]) } + } + } + + private fun name(id: Int, type: String): String { + val cls = Class.forName("com.pulseloop.R\$$type") + return cls.fields.firstOrNull { it.getInt(null) == id }?.name + ?: error("No R.$type resource with id $id") + } + + fun string(id: Int): String = name(id, "string").let { strings[it] ?: error("Missing string $it") } + + fun plural(id: Int, count: Int): String { + val forms = name(id, "plurals").let { plurals[it] ?: error("Missing plurals $it") } + return forms[if (count == 1) "one" else "other"] ?: forms.getValue("other") + } + + private fun unescape(s: String): String { + var t = s.trim() + if (t.length >= 2 && t.startsWith("\"") && t.endsWith("\"")) t = t.substring(1, t.length - 1) + return t.replace("\\n", "\n").replace("\\'", "'").replace("\\\"", "\"").replace("\\@", "@") + .replace("\\?", "?").replace("<", "<").replace(">", ">").replace("&", "&") + } + } +} diff --git a/app/src/main/java/com/pulseloop/util/LocaleFormats.kt b/app/src/main/java/com/pulseloop/util/LocaleFormats.kt new file mode 100644 index 00000000..f0537979 --- /dev/null +++ b/app/src/main/java/com/pulseloop/util/LocaleFormats.kt @@ -0,0 +1,56 @@ +package com.pulseloop.util + +import java.time.format.DateTimeFormatter +import java.util.Locale +import java.util.concurrent.ConcurrentHashMap + +/** + * Locale-aware date/time patterns for user-visible labels. + * + * A fixed pattern such as `"MMM d"` or `"h:mm a"` hard-codes English field order and the 12-hour + * clock. A skeleton asks the platform for the locale's own arrangement of the same fields: + * `"MMMd"` is "Nov 11" in English and "11 нояб." in Russian; `"jmm"` is "3:45 PM" in en-US and + * "15:45" in Russian. + * + * The platform pattern is only used if `java.time` accepts it. Some locales get symbols that + * `DateTimeFormatter` on older Android releases rejects (zh-TW's `Bh:mm` day period, for + * example); those fall back to [fallback] rather than crash the screen. + * + * In JVM unit tests the Android call returns null (`isReturnDefaultValues`), so the skeleton + * falls back to [fallback], keeping test expectations on the original English patterns. + * + * Patterns and formatters are cached per (skeleton, fallback, locale): charts and sleep rows ask + * for them on every tick. + */ +object LocaleFormats { + private data class Key(val skeleton: String, val fallback: String, val locale: Locale) + + private val patterns = ConcurrentHashMap() + private val formatters = ConcurrentHashMap() + + fun pattern(skeleton: String, fallback: String, locale: Locale = Locale.getDefault()): String = + patterns.getOrPut(Key(skeleton, fallback, locale)) { resolve(skeleton, fallback, locale).first } + + fun formatter(skeleton: String, fallback: String, locale: Locale = Locale.getDefault()): DateTimeFormatter = + formatters.getOrPut(Key(skeleton, fallback, locale)) { resolve(skeleton, fallback, locale).second } + + /** Hours and minutes in the locale's preferred clock ("3:45 PM" / "15:45"). */ + fun time(): DateTimeFormatter = formatter("jmm", "h:mm a") + + /** A new [java.text.SimpleDateFormat] each call: the class is not thread-safe. */ + fun simpleDateFormat(skeleton: String, fallback: String, locale: Locale = Locale.getDefault()) = + java.text.SimpleDateFormat(pattern(skeleton, fallback, locale), locale) + + private fun resolve(skeleton: String, fallback: String, locale: Locale): Pair { + val platform = runCatching { android.text.format.DateFormat.getBestDateTimePattern(locale, skeleton) } + .getOrNull() + ?.takeIf { it.isNotEmpty() } + if (platform != null) { + val formatter = runCatching { DateTimeFormatter.ofPattern(platform, locale) }.getOrNull() + // SimpleDateFormat parses patterns with its own rules; it must accept the pattern too. + val legacyOk = runCatching { java.text.SimpleDateFormat(platform, locale) }.isSuccess + if (formatter != null && legacyOk) return platform to formatter + } + return fallback to DateTimeFormatter.ofPattern(fallback, locale) + } +} diff --git a/app/src/main/java/com/pulseloop/widgets/WidgetConfigActivity.kt b/app/src/main/java/com/pulseloop/widgets/WidgetConfigActivity.kt index d9f61488..4d93b4a8 100644 --- a/app/src/main/java/com/pulseloop/widgets/WidgetConfigActivity.kt +++ b/app/src/main/java/com/pulseloop/widgets/WidgetConfigActivity.kt @@ -1,5 +1,7 @@ package com.pulseloop.widgets +import com.pulseloop.R +import androidx.compose.ui.res.stringResource import android.appwidget.AppWidgetManager import android.content.Intent import android.os.Bundle @@ -116,30 +118,30 @@ private fun ConfigScreen( verticalArrangement = Arrangement.spacedBy(8.dp), ) { Text( - if (isDual) "Choose Metrics" else "Choose Metric", + if (isDual) stringResource(R.string.widget_choose_metrics) else stringResource(R.string.widget_choose_metric), fontSize = 24.sp, fontWeight = FontWeight.SemiBold, color = PulseColors.textPrimary, ) Text( - if (isDual) "Pick the left and right PulseLoop metrics." - else "Pick which PulseLoop metric this widget shows.", + if (isDual) stringResource(R.string.widget_pick_dual) + else stringResource(R.string.widget_pick_single), fontSize = 14.sp, color = PulseColors.textSecondary, ) Spacer(Modifier.height(8.dp)) if (isDual) { - MetricPicker("LEFT METRIC", left) { left = it } + MetricPicker(stringResource(R.string.widget_left_metric), left) { left = it } Spacer(Modifier.height(12.dp)) - MetricPicker("RIGHT METRIC", right) { right = it } + MetricPicker(stringResource(R.string.widget_right_metric), right) { right = it } } else { MetricPicker(null, single) { single = it } } Spacer(Modifier.height(16.dp)) Button(onClick = { onDone(single, left, right) }, modifier = Modifier.fillMaxWidth()) { - Text("Add Widget") + Text(stringResource(R.string.widget_add)) } } } diff --git a/app/src/main/java/com/pulseloop/widgets/WidgetMetric.kt b/app/src/main/java/com/pulseloop/widgets/WidgetMetric.kt index f082c95f..7ef9be5f 100644 --- a/app/src/main/java/com/pulseloop/widgets/WidgetMetric.kt +++ b/app/src/main/java/com/pulseloop/widgets/WidgetMetric.kt @@ -1,5 +1,7 @@ package com.pulseloop.widgets +import com.pulseloop.R +import com.pulseloop.util.L10n import androidx.compose.ui.graphics.Color import com.pulseloop.service.MetricKind import com.pulseloop.ui.components.ZonePalette @@ -10,17 +12,19 @@ import com.pulseloop.ui.theme.PulseColors * Ported from PulseLoopWidgets/WidgetMetric.swift. [key] values are stable identifiers persisted * in the user's widget configuration (Glance preferences); don't rename them. */ -enum class WidgetMetric(val key: String, val displayName: String) { - ACTIVITY("activity", "Activity"), - SLEEP("sleep", "Sleep"), - HEART_RATE("heartRate", "Heart Rate"), - SPO2("spo2", "Blood Oxygen"), - HRV("hrv", "HRV"), - TEMPERATURE("temperature", "Skin Temperature"), - STRESS("stress", "Stress"), - FATIGUE("fatigue", "Fatigue"), - BLOOD_PRESSURE("bloodPressure", "Blood Pressure"), - GLUCOSE("glucose", "Blood Sugar"); +enum class WidgetMetric(val key: String, @androidx.annotation.StringRes private val nameRes: Int) { + ACTIVITY("activity", R.string.tab_activity), + SLEEP("sleep", R.string.metric_sleep), + HEART_RATE("heartRate", R.string.metric_heart_rate), + SPO2("spo2", R.string.metric_blood_oxygen), + HRV("hrv", R.string.abbr_hrv), + TEMPERATURE("temperature", R.string.metric_skin_temperature), + STRESS("stress", R.string.metric_stress), + FATIGUE("fatigue", R.string.metric_fatigue), + BLOOD_PRESSURE("bloodPressure", R.string.metric_blood_pressure), + GLUCOSE("glucose", R.string.metric_blood_sugar); + + val displayName: String get() = L10n.get(nameRes) /** The vitals kind whose payload backs this tile; null for the two non-vitals tiles. */ val metricKind: MetricKind? @@ -51,8 +55,8 @@ enum class WidgetMetric(val key: String, val displayName: String) { /** Header eyebrow label, matching the in-app tile chrome. */ val headerLabel: String get() = when (this) { - ACTIVITY -> "Activity" - SLEEP -> "Sleep" + ACTIVITY -> L10n.get(R.string.tab_activity) + SLEEP -> L10n.get(R.string.metric_sleep) else -> metricKind?.title ?: key } diff --git a/app/src/main/java/com/pulseloop/widgets/WidgetTileRenderer.kt b/app/src/main/java/com/pulseloop/widgets/WidgetTileRenderer.kt index ee7732ca..1c9abaec 100644 --- a/app/src/main/java/com/pulseloop/widgets/WidgetTileRenderer.kt +++ b/app/src/main/java/com/pulseloop/widgets/WidgetTileRenderer.kt @@ -1,5 +1,7 @@ package com.pulseloop.widgets +import com.pulseloop.R +import com.pulseloop.util.L10n import android.graphics.Bitmap import android.graphics.BlurMaskFilter import android.graphics.Canvas @@ -107,7 +109,7 @@ class WidgetTileRenderer(private val density: Float) { if (payload == null || rolledOver) { drawEmptyMessage( canvas, rect, - if (rolledOver) "No data yet today" else "Open PulseLoop to sync", + if (rolledOver) L10n.get(R.string.widget_no_data_today) else L10n.get(R.string.widget_open_to_sync), PulseColors.steps.toArgb(), ) } else { @@ -161,7 +163,7 @@ class WidgetTileRenderer(private val density: Float) { if (payload == null) { drawEmptyMessage( canvas, content, - if (snapshot == null) "Open PulseLoop to sync" else "No data", + if (snapshot == null) L10n.get(R.string.widget_open_to_sync) else L10n.get(R.string.status_no_data), accent, ) } else { @@ -247,14 +249,14 @@ class WidgetTileRenderer(private val density: Float) { /** Small-tile activity body: 88 dp rings + stacked 10 sp labels / 26 sp values (iOS WidgetActivityContent). */ private fun drawActivitySmallContent(canvas: Canvas, rect: RectF, payload: WidgetActivityPayload?, rolledOver: Boolean) { val values: List> = if (payload == null || rolledOver) emptyList() else buildList { - payload.stepsText?.let { add(Triple("STEPS", it, PulseColors.steps.toArgb())) } + payload.stepsText?.let { add(Triple(L10n.get(R.string.tile_steps), it, PulseColors.steps.toArgb())) } payload.distanceText?.let { add(Triple(payload.distanceUnitLabel, it, PulseColors.distance.toArgb())) } - payload.caloriesText?.let { add(Triple("CAL", it, PulseColors.calories.toArgb())) } + payload.caloriesText?.let { add(Triple(L10n.get(R.string.tile_cal), it, PulseColors.calories.toArgb())) } } if (values.isEmpty()) { drawEmptyMessage( canvas, rect, - if (rolledOver) "No data yet today" else "Open PulseLoop to sync", + if (rolledOver) L10n.get(R.string.widget_no_data_today) else L10n.get(R.string.widget_open_to_sync), PulseColors.steps.toArgb(), ) return @@ -312,15 +314,15 @@ class WidgetTileRenderer(private val density: Float) { val rowH = textHeight(textPaint(15f, 0)) + dp(5f) + textHeight(textPaint(32f, 0)) val totalH = rowH * 2 + dp(14f) val top = rect.top + ((rect.height() - totalH) / 2f).coerceAtLeast(0f) - metricBlock(rect.left, top, "Steps", payload.stepsText, null, PulseColors.steps.toArgb(), colW - dp(6f)) + metricBlock(rect.left, top, L10n.get(R.string.metric_steps), payload.stepsText, null, PulseColors.steps.toArgb(), colW - dp(6f)) metricBlock( - rect.left + colW, top, "Distance", payload.distanceText, + rect.left + colW, top, L10n.get(R.string.metric_distance), payload.distanceText, if (payload.distanceText != null) payload.distanceUnitLabel.lowercase() else null, PulseColors.distance.toArgb(), colW - dp(6f), ) metricBlock( - rect.left, top + rowH + dp(14f), "Calories", payload.caloriesText, - if (payload.caloriesText != null) "cal" else null, + rect.left, top + rowH + dp(14f), L10n.get(R.string.metric_calories), payload.caloriesText, + if (payload.caloriesText != null) L10n.get(R.string.unit_cal) else null, PulseColors.calories.toArgb(), colW - dp(6f), ) } @@ -329,7 +331,7 @@ class WidgetTileRenderer(private val density: Float) { private fun drawSleepContent(canvas: Canvas, rect: RectF, payload: WidgetSleepPayload?, rolledOver: Boolean) { if (payload == null || rolledOver) { - drawEmptyMessage(canvas, rect, "No sleep recorded", PulseColors.sleep.toArgb()) + drawEmptyMessage(canvas, rect, L10n.get(R.string.sleep_none_recorded), PulseColors.sleep.toArgb()) return } var y = rect.top @@ -344,7 +346,7 @@ class WidgetTileRenderer(private val density: Float) { val baseline = y - scorePaint.fontMetrics.ascent canvas.drawText(scoreText, rect.left, baseline, scorePaint) val capPaint = textPaint(10f, textMuted, Weight.SEMIBOLD, trackingEm = 0.1f) - canvas.drawText("SCORE", rect.left + scorePaint.measureText(scoreText) + dp(5f), baseline, capPaint) + canvas.drawText(L10n.get(R.string.widget_score), rect.left + scorePaint.measureText(scoreText) + dp(5f), baseline, capPaint) } /** Proportional stage bar + per-stage labels for segments ≥10% share (SleepStageBar parity). */ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8888a79e..537f6620 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,9 @@ + + English PulseLoop @@ -11,4 +15,1228 @@ A Today tile of your choice — activity, sleep, heart rate, and more. Two Metric Tiles Two Today tiles side by side, each configurable. + No HR samples yet — sync your ring to start your trend. + Hourly readings are estimated from heart rate — this ring\'s hourly SpO₂ isn\'t a separate measurement. Spot readings you take are measured. + No SpO₂ samples yet — take a reading to start your trend. + Systolic + Diastolic + No blood pressure data yet. + Measuring… updates when complete + No HRV data yet — HRV builds up over a few hours of wear. + No stress data yet — take a measurement. + Estimated from HRV — your ring doesn\'t measure stress + No fatigue data yet — take a measurement. + No blood sugar data yet. + No temperature data yet — temperature trends appear after overnight wear. + Vitals + Live measurements and trends + HR + SpO₂ + BP + HRV + Keep still — measuring heart rate… + Keep still — measuring blood oxygen… + Keep still — measuring blood pressure, SpO₂, stress, fatigue & blood sugar… + Keep still — measuring heart rate & SpO₂… + Keep still — measuring %1$s… + BP & HRV + %1$s %2$ds + Measuring… %1$ds + Measure + The ring disconnected during measurement. + The ring isn\'t detecting your finger. Put it on snugly, then try again. + Couldn\'t get a steady reading. Keep the ring snug and your hand still, then try again. + mmHg + Back + Previous + Next + Not enough data for this period. + Latest + Average + Min + Max + REFERENCE ZONES + WHAT THIS MEANS + READINGS + Hide readings + Show readings + Estimated + Delete this reading + + Show %1$d more + Show %1$d more + + Delete this reading? + %1$s at %2$s.\n\nThis can\'t be undone. + The reading stays deleted the next time this day syncs. + Delete + Cancel + Stress + Temp + heart rate variability + stress + temperature + Estimated from HRV — your ring doesn\'t measure stress. Scored against your own recent HRV readings, so it says how this reading compares with your normal, not how you compare with anyone else. + On this ring the same heart rate always comes with the same hourly SpO₂, so a night-time dip here follows a low sleeping heart rate rather than measuring oxygen. + Estimated wellness metric — not for dosing or diabetes decisions. No smart ring or watch is FDA-authorized to measure or estimate glucose on its own. + Ring blood pressure is an estimate. Calibrate against a validated cuff in Settings → Calibration, and talk to a clinician about persistent high or low readings. + Heart rate + Blood oxygen + Stress + Fatigue + Skin temperature + Blood pressure + Blood sugar + Resting heart rate reflects how hard your heart works at rest. A typical adult range is 60–100 bpm; fitness, medication, caffeine, and stress all shift it. + Blood oxygen (SpO₂) is the percentage of oxygen your blood carries. 95–100% is normal; altitude and lung conditions can lower it. + Heart-rate variability is the variation between beats. It\'s highly individual, so we track it against your personal baseline rather than a universal cutoff. + Blood pressure is systolic over diastolic (mmHg). The category is the worse of the two. A ring estimate is not a substitute for a cuff. + A device wellness score from 0–100 based on heart-rate patterns. Lower is calmer. It\'s an estimate, not a medical stress measure. + A device wellness score from 0–100 estimating tiredness. Higher means more fatigue. It\'s a ring estimate, not a clinical scale. + An estimated glucose value. No smart ring is cleared to measure glucose, so treat this as a wellness estimate only. + Skin temperature from the ring runs cooler than core body temperature. Trends over time matter more than any single reading. + Today + Week + Month + AI Coach + local server + Active — %1$s + Server address needed + API key needed + Disabled + Enable AI Coach + Notifications are off for PulseLoop. Turn them on in Android Settings to get check-ins. + OpenRouter (100+ models) + Local / self-hosted (no key needed) + Provider + Toggle visibility + Update Key + Save Key + Remove + Saved ✓ + %1$s API Key + Custom model slug (vendor/model) + Privacy routing + Only providers that don\'t retain data + Route by + Balanced (default) + Cheapest first + Fastest first + Lowest latency first + Server address + Default ports — Ollama 11434 · LM Studio 1234 · llama.cpp 8080 · vLLM 8000 · SGLang 30000. The /v1 path is added for you. + Couldn\'t reach the server. + Detecting… + Detect server & configure + Sending three tiny test messages. This can take a minute if the model still has to load. + Model + Choose a model + Model name + API key (optional) + Only needed if you started the server with --api-key. Leave blank otherwise. + Tool calling + Lets the coach read your data. Detect sets this for you; turn it off if your server rejects tools (vLLM needs --enable-auto-tool-choice). + Response format + Max tokens + Timeout (s) + Leave max tokens blank to let the server decide. Raise the timeout for a large model on CPU — a slow reply is not retried. + Stored securely in Android Keystore. Never leaves your device except to call the model. Provider changes apply from your next message. + Reasoning effort + Default + Model decides (default) + Image attachments + Attach photos to coach messages + Web Search + Uses additional tokens + Google Search grounding may need a paid Gemini plan — free-tier keys can be refused, and the coach then answers without web results. + Write Actions + Set goals, log, edit data + Live Measurements + Trigger real-time ring readings + Use location & weather + Grounds suggestions in your city\'s current weather + Coach Memory + Hide + Show (%1$d) + Enable Coach Check-Ins? + Get a daily check-in from your coach. You can change this anytime in Coach Check-Ins. + Enable + Not now + Coach Check-Ins + AI Coach is off + Enable the AI Coach to change these — daily check-ins are written by the coach from your recent trends. + Daily check-ins + Daily Check-in Notifications + Notifications are disabled for PulseLoop in Android Settings. + Morning + Evening + PulseLoop Coach + This is a test check-in notification. + Send Test Check-in Now + Ring battery alerts + Get notified when your ring drops below 20% and 10%, so tracking doesn\'t stop mid-day. + Low Battery Notifications + User Profile + Your age, sex, height and weight let the ring compute accurate calories (and, on 56ff/Jring rings, blood sugar). Blood pressure is measured directly by the sensor. + Reset units to auto-detect + Saved & sent to ring ✓ + Saved — will sync on next connect + Save profile + Physiology + Optional refinements to how your vitals are interpreted. Leave anything unset and PulseLoop uses sensible defaults. + Fitness + Treats a low resting heart rate as a sign of fitness rather than a concern, and relaxes the low-HR threshold. + Athlete mode + Environment + Above ~2000 m, normal blood-oxygen readings run lower. We use this to avoid false low-oxygen warnings. + Typical altitude (ft) + Typical altitude (m) + Health context + Optional. Both can change what\'s expected for your heart rate or oxygen, so we adjust labels instead of alarming. + Beta-blockers + Known lung condition + Units + Glucose unit + Save + Not set + No + Yes + Calibration + Blood pressure calibration + Optional. Enter a recent cuff reading so the ring offsets its values to match. + Save calibration + Blood sugar calibration + Optional. The ring estimates glucose from your profile, not a real sensor. Enter a recent lab/meter reading (mg/dL) to offset the displayed value to match. + Reading (mg/dL) + Enter a valid mg/dL reading + Take a blood sugar measurement first, then calibrate + Calibrated ✓ (offset %1$s mg/dL) + Calibrate + Current offset: %1$s mg/dL + No calibration set + Calibration cleared + Reset + Goals + Daily and weekly targets behind the activity rings. + Saved + Save goals + mg/dL + mmol/L + bpm + Measurement Frequency + Measurement + How often the ring measures in the background. Shorter heart-rate intervals give finer history at the cost of battery. + Pair a ring to configure its all-day measurements. + All-day heart rate + Every %1$d min + Blood oxygen (SpO₂) + Same as heart rate, at most every 60 min + Measure SpO₂ from the app + This ring\'s all-day SpO₂ is estimated from heart rate. When on, PulseLoop starts a real spot measurement on the schedule below, between the ring\'s own readings, about a minute each, which uses more battery. Android may delay or skip runs while the phone is asleep. + Every hour + + Every %1$d hour + Every %1$d hours + + Hide estimated SpO₂ + Display only real spot measurements on charts and vitals cards, hiding the hourly estimates. + Temperature + Save measurement settings + Sleep trimming + A still wrist reads as sleep, so an evening on the sofa can run the night high. Trimmed minutes are never imported — changing these later won\'t bring them back. + Track Bedtime / DND mode + Keep only sleep inside Android\'s Bedtime or Do Not Disturb. + Nights without it use the schedule. + Nights without it are kept whole. + Sleep quiet hours + Daily schedule for nights without Bedtime/DND. + Keep only sleep inside a daily schedule. Naps outside it are skipped. + From %1$s + Until %1$s + Permission required + To log when Bedtime or Do Not Disturb turns on and off while PulseLoop is in the background, Android requires Notification access. PulseLoop only listens for Mode changes and does not read your notifications.\n\nIf the switch is greyed out, open PulseLoop\'s App info, tap ⋮ → Allow restricted settings, then come back here. + Open Settings + Quiet from + Quiet until + Done + Not yet + Wearable + Connected — %1$s · %2$d%% + Last seen: %1$s + No ring paired + Firmware: %1$s + Firmware: reading… (connect ring to read) + Last synced: %1$s + Add a ring + Sync now + Find ring + Disconnect + Reconnect last ring + Ring management + Forget unbinds the ring and removes it from the app so it can be paired elsewhere. The app stays connected automatically the rest of the time. + Forget Ring + Factory reset erases all data stored on the ring itself and resets it to factory state. Your synced data in the app is kept. + Resetting… + Factory Reset Ring + Factory reset ring? + This erases all data stored on the ring and resets it to factory state. We\'ll sync its latest data into the app first, but this can\'t be undone. The ring will need to be re-paired afterward. + Syncing latest data… + Reset ring + Critical + Low + Good + Battery critically low + Battery low + Battery healthy + Unpair ring? + Reset app data? + Unpair ring & reset app data? + Unpair your ring? The ring will forget this phone; your data stays. + This permanently erases all your data — metrics, sleep, activity, coach history, settings, and saved API keys — and can\'t be undone. + This unpairs your ring, then permanently erases all your data — metrics, sleep, activity, coach history, settings, and saved API keys — and can\'t be undone. + Unpair ring + Reset app data + Unpair & reset + Privacy & Data + Data Backup + Export all your data to a single JSON file for backup, device migration, or external analysis. Import restores everything — replacing all current data. + Export PulseLoop Data + Export failed + Exporting… + Export All Data + Importing… + Import Data + App Data + Destructive actions: unpair the ring, factory-reset app data, or both. + Demo Data + Explore the app without a ring. Seeds activity, HR, SpO2, sleep, and a coach conversation. + Reseed Demo Data + Clear Demo Data + Diagnostics + Export app, device, and wearable logs as JSON for bug reports. + Anonymize export + Removes health values, ring serial & MAC addresses. Keeps models, opcodes & errors. + OFF — includes full unmasked BLE frames and health values (for protocol debugging only). + Export Diagnostics + Export Full (Unmasked) + Error + OK + Import Complete + Your data has been restored from the backup. + Replace all data? + This permanently deletes everything currently in the app and replaces it with the contents of this file. This can\'t be undone. + Import failed — the file may be corrupt or from a newer version. + Delete old data & import + Reseed Demo Data? + This will replace all existing demo data. Your synced ring data — including sleep history — will not be affected. + Reseed + Clear Demo Data? + Removes all demo measurements, activity, sleep, and the demo device. Synced ring data is not affected. + Clear + Developer options are already enabled. + You are now a developer! + + You\'re %1$d step away from Developer options. + You\'re %1$d steps away from Developer options. + + About + Version + An LLM-native health app that turns a cheap Bluetooth smart ring into a real, conversational health tracker. It talks to the ring directly over Bluetooth — no vendor cloud, no account — and layers an AI coach on top of your own data. + Source on GitHub + License + Open-source health tracker. Ported from iOS.\nCC BY 4.0 · Free to share and adapt, including commercially, with appropriate credit. + Nutrition + Enable Nutrition Tracking + Log meals and track calories & macros + Daily Goals + Calories (kcal) + Protein (g) + Carbs (g) + Fat (g) + Balance Macros (30/40/30) + Quick Access + Open Nutrition Log + Strava Not Configured + Add stravaClientId and stravaClientSecret to local.properties to enable Strava integration. + Strava Integration + Connected as %1$s. Workouts sync automatically when finished. + Connect your Strava account to automatically upload workouts with GPS routes and heart rate data. + Nothing new to upload + + Uploaded %1$d workout + Uploaded %1$d workouts + + Upload failed: %1$s + unknown error + Syncing… + Disconnected from Strava + Authorize in your browser — you\'ll return to PulseLoop automatically. + Could not open browser + Connect Strava + Auto Upload + Finished workouts are automatically uploaded to Strava. GPS routes, heart rate data, and sport type are included. + No Health Connect permissions granted — nothing to export. + Connected. %1$d of %2$d permission types granted. + Export ring data to Health Connect so other apps and dashboards can show it. Write-only: PulseLoop never reads data back. + Health Connect isn\'t available on this device. Install the Health Connect app to use this feature. + Install Health Connect + The Health Connect app on this device needs an update before it can be used. + Update Health Connect + Export PulseLoop data + Connected + Not connected + Open Health Connect + Manage or re-grant permissions, and review or delete PulseLoop\'s data, in the Health Connect app. + Data Types + Exported only when switched on. A row stays dim until its permission is granted. + Oxygen saturation (SpO₂) + Heart rate variability (HRV) + Body temperature + Sleep + Steps & activity + Workouts + Blood glucose + Respiratory rate + VO₂ max + Resting heart rate + Derived from heart rate by current ring — export disabled + Awaiting permission + HRV is exported as RMSSD — Health Connect has no SDNN type, and the rings\' metric is vendor-undocumented. + Last sync %1$s — %2$s + unknown + No export has run yet. With the master switch on and a backfill choice made, PulseLoop exports automatically. + Remove exported data + Delete every record PulseLoop wrote to Health Connect and reset the export to start fresh. Your ring data in PulseLoop is untouched. + Deleting needs write permission, and PulseLoop has none right now — re-grant above, or delete the data in the Health Connect app. + Removing… + Remove PulseLoop data + Dismiss + How much history should we export? + Exporting all history can take a while on the first run. + Sync all history + Only new data from now on + Health Connect permissions revoked + PulseLoop no longer has any Health Connect permissions. Reset the export so a later re-grant re-exports your history? + Export reset — re-grant permissions to sync again. + Reset export + Remove PulseLoop data? + 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. + Not enough of a trend to estimate runtime yet — it appears after a few hours of discharge. + About %1$s left + Estimated from the current discharge at %1$s %%/h. + Battery history + Not enough data yet — battery history builds up as the ring reports its level. + Off + On + Offline + Local + Backend proxy + Settings + General + Metrics + Resources + Developer + About PulseLoop + Want a recap? + Want a summary from the latest ring context? Tap to open the coach. + STEPS + CAL + Estimated from heart rate + No reading + SYS + DIA + Waiting for first sync + Sync your ring to start collecting movement, heart rate, blood oxygen, and recovery context. + Baseline pending + HR pending + HR collected + Sleep pending + Sleep synced + Building momentum + Take it easy + Steady build + %1$d bpm + + You\'re at %1$,d step. Sync after waking to add recovery context. + You\'re at %1$,d steps. Sync after waking to add recovery context. + + + You\'re at %1$,d step, %2$dh %3$02dm of sleep, and your latest reading is %4$s. + You\'re at %1$,d steps, %2$dh %3$02dm of sleep, and your latest reading is %4$s. + + Steps %1$s%% + Steps collected + Stages + Sleep architecture + No sleep recorded + Wear your ring overnight to see your hypnogram here. + Sleep insights + Last Sleep + %1$s to %2$s + %1$d of %2$d · %3$s–%4$s + + Tracked %1$d night this year + Tracked %1$d nights this year + + %1$d of %2$d nights tracked + Duration + Monthly average + Nightly sleep + Day + Year + Deep + Light + REM + Awake + Added by you + Added by you · asleep, no stage measured + Avg Deep + Avg Light + Avg Awake + No nights tracked in this range yet. + Previous day + Next day + Yesterday + Excellent + Good + Fair + Needs work + Records + The ring recorded this as one record + + The ring recorded this night in %1$d part + The ring recorded this night in %1$d parts + + Asleep %1$s + Includes %1$s added by you, not staged or scored + Edit this record\'s times + Delete this record + Awake %1$s between + Couldn\'t update this record + Delete this record? + %1$s – %2$s leaves tonight\'s totals and the hypnogram, and it won\'t come back on re-sync. + Couldn\'t delete this record + Keep + Edit sleep record + Trim this record, or extend it over time the ring missed. Added time counts as asleep but has no stage, so it stays out of the stage breakdown and score. + Start: %1$s + End: %1$s + Start time must be before end time. + Adjust start time + Adjust end time + The previous record ends at %1$s. + The next record starts at %1$s. + + A record can be extended by up to %1$d hour, so it can start at %2$s at the earliest. + A record can be extended by up to %1$d hours, so it can start at %2$s at the earliest. + + + A record can be extended by up to %1$d hour, so it can end at %2$s at the latest. + A record can be extended by up to %1$d hours, so it can end at %2$s at the latest. + + Starting past %1$s would move it into another night. + Ending past %1$s would move it into another night. + Keep at least a minute of what the ring recorded (%1$s – %2$s). + %1$dm + %1$dh %2$02dm + Weekly Sleep + Monthly Sleep + Yearly Sleep + + Record Activity + Workout history + Log Past Activity + Add a workout you forgot to record + TODAY + YESTERDAY + No workouts recorded today + Start one manually when your ring misses an activity. + Steps + Distance + Calories + cal + %1$d bpm avg + MIN + WEEKLY GOAL + %1$d of 7 active days + TAP TO EDIT GOALS + Record activity + Track GPS route + Start + No workouts yet — recorded workouts will appear here. + Edit goals + Active minutes + %1$d min + %1$s h + Workouts / week + RECORDS + Hide activity records + Show activity records + Loading… + No activity records synced for %1$s yet. + + %1$s step + %1$s steps + + Delete this activity record + Delete this activity record? + %1$s at %2$s.\n\nThe day\'s total drops by that much. This can\'t be undone, and the record stays deleted the next time this day syncs. + Step %1$d of %2$d + Skip + No subscription + Own your ring data + Privacy first + Data stays on device + AI health coach + Learns your baseline + See your vitals + HR, SpO₂, HRV & stress + Sleep tracking + Stages and trends + Activity recording + Live workout tracking + Get started + Explore without ring + Set up PulseLoop + Your health, on your terms — no subscription, no cloud. + Continue + Profile + Used to tune calories, activity goals, and summaries. + Daily goals + Start with recommended targets. You can change these anytime. + Activity and live vitals, right away + First sync + Sleep stages and nightly trends + Days 3–7 + Your personalized baseline unlocks + Start using PulseLoop + You\'re all set + Wear your ring today. Your baseline builds from here. + PulseLoop learns your baseline over time + Wear your ring during the day and sync after sleep. Trends become more personal after a few days. + Setup complete + Measurement units + Metric + Imperial + Identity + Name + Optional + Sex + Female + Male + Other + Body metrics + Age + + %1$d year + %1$d years + + Height + Weight + %1$d cm + kg + lb + Enter your weight in %1$s + You can use either a comma or a period as the decimal separator. + Enter a weight between %1$d and %2$d %3$s. + km + mi + Daily targets + %1$d cal + Weekly target + %1$d / week + All + Add your ring + Swipe to find your model, then tap to connect.\nYou can also explore first and pair later. + Hide connection details + Show connection details + Waiting for BLE connection events… + Connect ring + Skip for now + You can pair a ring later from Settings. + Connecting to %1$s… + Scanning for %1$s… + No rings found yet + Wake the ring by tapping or moving it, and keep it close. + Stop scanning + Connected to %1$s + Bluetooth is off + Turn on Bluetooth to find and connect your ring. + Delete workout? + This removes the session and its recorded route. This can\'t be undone. + End time can\'t be in the future. + The window must be longer than the %1$d min of pauses in this workout. + End must be after the start. + Edit workout + Activity + Starts + Ends + Distance, calories, and heart-rate stats are recalculated for the new window. + Save changes + Time + PACE %1$s + SPEED + CALORIES + DURATION + ACTIVE MIN + Avg HR + Max HR + Min HR + SPLITS + Workout not found + This workout is no longer in local storage. It may have been deleted or replaced. + AI meal log + Remove photo + Camera + Library + OR DESCRIBE IT + ADD DETAIL (OPTIONAL) + e.g. two eggs, toast with butter, black coffee + Analyze + Sent to your configured AI provider only when you tap Analyze. Estimates are labeled and editable. + Estimating nutrition… + AI estimate + Low confidence + Medium confidence + Review & adjust + Log meal + Re-analyze + Try again + Breakfast + Lunch + Dinner + Snack + AI analysis needs the coach enabled with a configured provider (Settings → AI Coach). You can still search the database or enter the meal manually. + Couldn\'t process that photo. Try again or describe the meal. + The AI didn\'t return a usable estimate. Try again or enter the meal manually. + Analysis failed: %1$s + %1$d kcal + of %1$d + Protein + Carbs + Fat + %1$d kcal · P%2$d C%3$d F%4$d + Photo + Describe + Log Meal + %1$dg + Product not found for that barcode. Enter it manually instead. + Couldn\'t look up that barcode. Check your connection or enter the meal manually. + Scan barcode + kcal + P(g) + C(g) + F(g) + Coach is thinking… + Error: %1$s + Using your latest ring sync + Usage & cost + Past conversations + New chat + Attached photo + How am I doing today? + Explain my heart rate trend + Summarize my week + How can I sleep better? + Staged photo + Attach photo + Ask the coach... + Send + No conversations yet. Ask the coach something and it will show up here. + Swipe a conversation to delete it. + Delete all conversations + Delete this conversation? + “%1$s” and its replies will be deleted. This can\'t be undone. + Delete all conversations? + + All %1$d conversation and its replies will be deleted. This can\'t be undone. + All %1$d conversations and their replies will be deleted. This can\'t be undone. + + Delete all + Untitled conversation + + %1$d message + %1$d messages + + open now + Today %1$s + Yesterday %1$s + Activity + Coach + Workout + PULSELOOP + Connected · %1$d%% + Connecting… + Reconnecting… + Sync failed + Disconnected + Good morning + Good afternoon + Good evening + Good night + Walking + Running + Cycling + Gym + Squash + Sport + Yoga + Dance + Hiking + Casual or brisk walking + Outdoor or treadmill runs + Road, trail, or stationary + Strength or circuit training + Court sessions + Team or racket sports + Flow, stretch, or breathwork + Studio, cardio, or freestyle + Trails and elevation + Anything else + /mi + /km + MPH + KM/H + Connect + Set up a ring + No ring connected + Searching… + Connection failed + Synced %1$s + just now + %1$dm ago + %1$dh ago + %1$dd ago + Glucose + Hide %1$s + Move %1$s up + Move %1$s down + HIDDEN + Show %1$s + Customize + Reorder or hide cards + %1$d%% above baseline + %1$d%% below baseline + Athletic + Low (medication) + Low + Normal + Elevated + High + Very low + Slightly low + Building baseline + Below baseline + Slightly below + Near baseline + Above baseline + Calm + Fresh + Mild + Tired + High fatigue + Stage 1 + Stage 2 + Severe + Typical + Very high + Cool + Warm + Estimated · calibrate with a cuff + Estimated — not for dosing or diagnosis + At baseline + A low resting heart rate is common with high fitness. + Beta-blockers lower heart rate; this is expected on that medication. + Below the typical resting range. Often fine, but worth noting if you feel faint. + Athletic resting range. + A typical resting heart rate for adults. + Above the typical resting range. Activity, caffeine, or stress can raise it. + A high resting heart rate. Talk to a clinician if it persists at rest. + Expected values are lower at altitude. + An urgently low oxygen reading. Seek care if you also feel unwell. + Low blood oxygen. Re-measure when still; talk to a clinician if persistent. + Slightly below the typical range. + A normal blood-oxygen level is 95–100%. + HRV is personal. Wear your ring for about a week to learn your baseline. + Notably below your typical HRV — often linked to stress, poor sleep, or strain. + A little below your usual range. + Around your personal baseline. + Above your typical HRV — often a sign of good recovery. + Low stress score — relaxed. + A typical daytime stress score. + Elevated stress — consider a short break. + High stress score. Wellness estimate, not a diagnosis. + Low fatigue — well recovered. + Mild fatigue. + Tired — consider lighter activity and good sleep. + High fatigue score. Wellness estimate from the ring. + Low systolic pressure (below 90). + Normal blood pressure is below 120/80. + Elevated systolic (120–129). + Stage 1 hypertension range (systolic 130–139). + Stage 2 hypertension range (systolic ≥140). + Severe range (systolic >180). Seek care if confirmed. + Low diastolic pressure (below 60). + Normal diastolic is below 80. + Stage 1 hypertension range (diastolic 80–89). + Stage 2 hypertension range (diastolic ≥90). + Severe range (diastolic >120). Seek care if confirmed. + Below 70 mg/dL is low. + Fasting normal is up to 99 mg/dL. + Fasting 100–125 is above the typical range. + Fasting ≥126. Talk to a clinician if confirmed by a meter. + Two-hour post-meal normal is up to 140 mg/dL. + Two-hour 140–199 is above the typical range. + Two-hour ≥200. Confirm with a meter and a clinician. + Within a typical range for a non-fasting reading. + Above the typical range. Context (meals) affects this. + A high reading regardless of context. Confirm with a meter. + Cooler than typical skin temperature. + A typical skin-temperature range from the ring. + Warmer than typical. Trends matter more than a single reading. + ms + vs baseline + vs earlier + vs previous + Stable %1$s + Resting %1$d + Resting calibrating + Peak %1$d + Peak — + bpm range + Lowest %1$d · %2$s + + %1$d reading + %1$d readings + + % avg + Baseline %1$d ms + Lower is calmer + Ring model estimate + No data + No estimate + Estimated wellness metric + Updated just now + Updated %1$s + What did you do? + Choose an activity, when it started, and how long it lasted. + Activity type + When + Started + The workout must finish before now. + Log Activity + %1$d hr + %1$d hr %2$d min + Speed + Pace + PAUSED + -- bpm + %1$s m + Resume + Pause + Finish + Measurement + Keep your hand still and rest your wrist on a flat surface. + Breathe normally. Keep the sensor pressed firmly to your skin. + Stay still during the measurement. + MEASURING + Couldn\'t get a reading. Make sure the ring is snug and worn on your finger, then try again. + Close + READY + Measuring SpO₂… keep your hand still. + Measuring… stay still. + Reading saved. + Recommended + All models from %1$s (%2$d) + Filter, e.g. claude + retiring %1$s + %1$d more — type to narrow + Save your key to see every model %1$s offers. + Loading models from %1$s… + %1$d models available from %2$s + Retry + Refresh + %1$s doesn\'t list “%2$s” any more — it may have been retired. Pick another model. + %1$s is retiring this model on %2$s. + Models + Input tokens + Output tokens + Estimated cost + Cost estimates aren\'t available for on-device or custom models. + Per-message breakdown + Show + %1$d in · %2$d out + (no text) + Scanning unavailable + Barcode scanning needs a device camera and camera access. Search by name instead. + lbs + %1$s cm + No data yet today + Open PulseLoop to sync + SCORE + Choose Metrics + Choose Metric + Pick the left and right PulseLoop metrics. + Pick which PulseLoop metric this widget shows. + LEFT METRIC + RIGHT METRIC + Add Widget + Ring Battery + Alerts when your ring\'s battery runs low + Ring battery low + Your ring is at %1$d%%. Charge it soon so tracking doesn\'t stop. + Ring battery critically low + Your ring is at %1$d%% and will shut down soon. Charge it now. + Coach Check-ins + Daily AI-generated health insights based on your ring data + Reset zoom + No route yet + Move outdoors to start tracking your route. + ±%1$dm · %2$d pts + %1$d pts + Opens ring settings + Hi! I\'m your PulseLoop coach. I can answer questions about your sleep, heart rate, activity, and recovery. What would you like to know? + Sorry, something went wrong: %1$s + Update available — %1$s + Downloading… %1$d%% + Download failed. Please try again. + Downloading… + Update + Later + Self-update is available in the release build only (current: %1$s / %2$s). + Couldn\'t check for updates (%1$s). Please try again. + You\'re on the latest version (%1$s). + Checking… + Check for updates + Good duration + Deep sleep balanced + Deep sleep strong + Awake time low + Looks like a strong night after a more active day. Your duration was solid and deep sleep made up a healthy part of the night, which kept the score high. + Your sleep duration and stage balance were strong. Deep sleep looked supportive, which helped keep the overall score high. + Strong recovery signal + Good sleep, with some restlessness + You slept long enough, but awake time was a bit elevated. If this repeats, look at late caffeine, alcohol, temperature, or stress near bedtime. + Awake time elevated + Duration held the score back + The stage mix was useful, but total sleep time was short for a full recovery window. A slightly earlier wind-down would likely improve tomorrow\'s score. + Short duration + Solid night overall + Your sleep was in a workable range, with the score shaped mostly by duration and stage balance. Deep and light sleep were readable enough to give a useful recovery snapshot. + No sleep tracked last night + I don\'t see sleep data for last night. Wear your ring overnight and sync in the morning so I can compare your sleep against your baseline. + Not enough week data yet + Not enough month data yet + Not enough year data yet + + I only have %1$d tracked night for this week. Wear the ring overnight for a few more nights and I\'ll build a reliable weekly picture. + I only have %1$d tracked nights for this week. Wear the ring overnight for a few more nights and I\'ll build a reliable weekly picture. + + + I only have %1$d tracked night for this month. Wear the ring overnight for a few more nights and I\'ll build a reliable monthly picture. + I only have %1$d tracked nights for this month. Wear the ring overnight for a few more nights and I\'ll build a reliable monthly picture. + + + I only have %1$d tracked night for this year. Wear the ring overnight for a few more nights and I\'ll build a reliable yearly picture. + I only have %1$d tracked nights for this year. Wear the ring overnight for a few more nights and I\'ll build a reliable yearly picture. + + + You averaged %1$s across %2$d tracked night this week. That\'s a useful read, but %3$s mean the trend is still incomplete. + You averaged %1$s across %2$d tracked nights this week. That\'s a useful read, but %3$s mean the trend is still incomplete. + + + %1$d missing night + %1$d missing nights + + You averaged %1$s across the full week. Your nights were tracked consistently, so this is a dependable picture of where your sleep sits right now. + Your week at a glance + Your monthly average is %1$s, but coverage is low (%2$s), so I\'d treat that number cautiously. More nights tracked will sharpen the trend. + Your monthly average is %1$s across %2$s. The biggest lever is consistency — a few short nights move this number more than any single great one. + Your month in sleep + Your long-term sleep trend + + Across the year your tracked average is %1$s over %2$d night. The long-term trend is still forming — as more months fill in, I\'ll be able to compare seasonal changes and consistency. + Across the year your tracked average is %1$s over %2$d nights. The long-term trend is still forming — as more months fill in, I\'ll be able to compare seasonal changes and consistency. + + %1$d of %2$d tracked + On target + Below goal + Above goal + Consistent + Variable nights + No sleep captured last night + Wear your ring overnight so PulseLoop can track your next night. + Not enough weekly data + Wear your ring overnight for a few nights to build a weekly view. + Not enough monthly data + Track more nights this month to see a monthly average. + Not enough yearly data + Long-term insights appear as more nights are tracked. + Coach error · %1$s\n%2$s + No API key + No API key is configured for the selected provider. Add one in Settings → AI Coach. + Network + Response error + No output + The model returned an empty response. Try again, or pick a different model. + Something went wrong. + Couldn\'t look up %1$s. Your device can\'t resolve it right now — check your connection, and whether a VPN or a Private DNS setting is blocking it. (%2$s) + the provider + The provider took too long to answer. Check your connection and try again — a VPN or a weak signal will do this. (%1$s) + The secure connection to the provider failed. This is usually a VPN, a proxy, or a network that intercepts traffic. (%1$s) + Couldn\'t connect to the provider. (%1$s) + The network request failed. + The provider returned HTTP %1$d with no details. + I had trouble with that + I checked your data but couldn\'t finish preparing the answer. Try asking again, or narrow the question. + No changes were made. + What data is missing? + Steps today: %1$d + + 7-day average: %1$d step/day + 7-day average: %1$d steps/day + + No activity synced yet + I don\'t have today\'s activity from the ring yet. Sync the ring or take a measurement and I\'ll summarize what comes in. (The AI coach is off — add an OpenAI key in Settings to enable full coaching.) + Is my ring connected? + Here\'s where you are today + + You\'re at %1$d step so far today. The AI coach is off — add an OpenAI key in Settings for trends and tailored guidance. + You\'re at %1$d steps so far today. The AI coach is off — add an OpenAI key in Settings for trends and tailored guidance. + + How does today compare to yesterday? + What\'s my heart rate trend? + Parse Error + I had trouble formatting my response. Please try again. + Summarize my day + What\'s new? + paused + recording + %1$s complete + Workout Live + Live workout tracking + Could not reach Health Connect. Try again. + Removed PulseLoop data, but %1$d type(s) could not be deleted — try again. + Nothing to remove: PulseLoop has no write permissions left, so it can\'t delete what it wrote. Delete it in the Health Connect app, or re-grant and try again. + Removed PulseLoop data from Health Connect. + Could not remove PulseLoop data. Try again. + Resetting ring… + Bluetooth is not powered on + Ring no longer available; scan again. + Ring not found in scans. It may be held by a stale Bluetooth connection — try toggling Bluetooth off and on. + Scan failed: %1$d + Good morning! Sync your ring and check your vitals to start the day. + Good morning%1$s + You logged %1$dh %2$dm of sleep. Here\'s to a strong day — get moving when you can. + Ready to start the day? Take a measurement and I\'ll help you plan it. + + You hit your %1$d step goal — nice work. + You hit your %1$d step goal — nice work. + + + %1$d step to your goal. + %1$d steps to your goal. + + Evening check-in + + %1$d step today. %2$s Time to start winding down. + %1$d steps today. %2$s Time to start winding down. + + How did today feel? Sync your ring and I\'ll recap your day. + Enter your server\'s address, e.g. http://192.168.1.50:11434 + That doesn\'t look like a URL — use host:port or http://host:port + Only http:// and https:// are supported. + Plain http:// is only allowed for a server on this device or your local network (an IP address, a plain hostname, or a .local / .lan / .ts.net name). Use https:// to reach one over the internet. + Not connected to Strava. + Strava rate limit reached. Try again later. + Already on Strava. + Strava upload failed (HTTP %1$d): %2$s + Unexpected response from Strava. + Timed out waiting for Strava to process the upload. + Strava could not process the upload: %1$s + Strava rejected the activity (HTTP %1$d): %2$s + exported %1$s + skipped: %1$s + nothing new to export + Ring + Today recap + Sleep recap + Sleep trend + That workout no longer exists. + Deleted the %1$s session. + Updated the %1$s session. + That meal no longer exists. + Deleted “%1$s”. + Updated “%1$s”. + Bad response + + The model didn\'t return a valid structured answer after %1$d attempt. + The model didn\'t return a valid structured answer after %1$d attempts. + + It replied: “%1$s…” + + Analyzing your trends + Checking ring connection + Checking the food database + Checking what data exists + Checking your goals + Checking your profile and ring status + Comparing two time periods + Computing correlation + Detecting outliers + Fetching your ring data for that range + Fetching your trend data + Logging your activity + Logging your meal + Logging your session + Looking at your sleep + Looking up your workouts + Noting that down + Preparing a chart + Reading that day\'s ring data + Reading your food log + Removing that meal + Removing that workout + Reviewing your sleep + Saving this for later + Scanning for anything unusual + Setting your goal + Summarizing distribution + Summarizing that workout + Taking a live reading + Updating that meal + Updating that workout + Health Connect isn\'t available right now. Try again. + Today\'s snapshot + + %1$d step so far today. Your ring is tracking — sync for the latest readings. + %1$d steps so far today. Your ring is tracking — sync for the latest readings. + + I don\'t have today\'s activity yet. Wear your ring and sync for a daily recap. + Step Source + Data Source + Phone + Ring + Health Connect needs an update before phone steps can be used. + Health Connect isn\'t available on this device. + Update your %1$s session from %2$s? + Delete your %1$s session from %2$s? This can\'t be undone. + Update “%1$s” from %2$s? + Delete “%1$s” (%2$d kcal) from %3$s? + Strava authorization was declined. + Strava denied authorization: %1$s + Strava authorization could not be verified. Please try connecting again. + Strava did not grant upload permission. Reconnect and keep \"Upload your activities\" checked. + Strava returned an unexpected authorization response. + Could not complete the Strava sign-in: %1$s + unknown error + + HR + bpm + SpO2 + sleep + step + %1$s vs %2$s + No data to plot for this range. diff --git a/app/src/test/java/com/pulseloop/coach/schema/CoachChartColorTest.kt b/app/src/test/java/com/pulseloop/coach/schema/CoachChartColorTest.kt new file mode 100644 index 00000000..80ad9c4c --- /dev/null +++ b/app/src/test/java/com/pulseloop/coach/schema/CoachChartColorTest.kt @@ -0,0 +1,37 @@ +package com.pulseloop.coach.schema + +import androidx.compose.ui.graphics.Color +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class CoachChartColorTest { + private val russian = arrayOf("пульс,ЧСС,сердц", "уд/мин", "кислород,сатурац", "сон,сна,сну,сном", "шаг") + + private fun color(title: String, y: String = "", words: Array = emptyArray()): Color? { + val chart = CoachChart(title = title, yLabel = y) + return if (words.isEmpty()) chartColor(chart) + else chartColor(chart, words[0], words[1], words[2], words[3], words[4]) + } + + @Test fun englishKeywordsKeepTheirColours() { + assertEquals(Color(0xFFE53935), color("Resting HR")) + assertEquals(Color(0xFFE53935), color("Week", y = "bpm")) + assertEquals(Color(0xFF1E88E5), color("SpO2 trend")) + assertEquals(Color(0xFF7E57C2), color("Sleep this week")) + assertEquals(Color(0xFF4CAF50), color("Daily steps")) + assertNull(color("Calories")) + } + + @Test fun translatedTitlesAreMatchedThroughTheResourceWords() { + assertEquals(Color(0xFFE53935), color("Пульс в покое", words = russian)) + assertEquals(Color(0xFFE53935), color("Неделя", y = "уд/мин", words = russian)) + assertEquals(Color(0xFF7E57C2), color("Длительность сна", words = russian)) + assertEquals(Color(0xFF4CAF50), color("Шаги за неделю", words = russian)) + assertNull(color("Калории", words = russian)) + } + + @Test fun englishWordsStillMatchUnderATranslation() { + assertEquals(Color(0xFFE53935), color("HR за неделю", words = russian)) + } +} diff --git a/app/src/test/java/com/pulseloop/coach/summaries/SummaryLanguageSignatureTest.kt b/app/src/test/java/com/pulseloop/coach/summaries/SummaryLanguageSignatureTest.kt new file mode 100644 index 00000000..db455ebc --- /dev/null +++ b/app/src/test/java/com/pulseloop/coach/summaries/SummaryLanguageSignatureTest.kt @@ -0,0 +1,21 @@ +package com.pulseloop.coach.summaries + +import com.pulseloop.coach.context.CoachLanguage +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class SummaryLanguageSignatureTest { + @Test fun englishAddsNothingToTheSignature() { + // JVM tests resolve the default (English) strings.xml. + assertNull(CoachLanguage.languageName()) + assertEquals("", CoachLanguage.directive()) + assertEquals("", CoachSummaryContextBuilder.languageSuffix(null)) + } + + @Test fun languageRoundTripsThroughTheSignature() { + val sig = "1200|·|30" + CoachSummaryContextBuilder.languageSuffix("Russian") + assertEquals("Russian", CoachSummaryContextBuilder.languageOf(sig)) + assertEquals("", CoachSummaryContextBuilder.languageOf("1200|·|30")) + } +} From 60d30e5a3bdd586b4a7a2b59115edb650bc68837 Mon Sep 17 00:00:00 2001 From: Aleksandr Poryadin Date: Sat, 14 Nov 2026 15:49:27 +0000 Subject: [PATCH 2/2] Add Russian translation - values-ru/strings.xml covers every string in values/strings.xml (except app_name), with Russian plural forms wherever a count precedes a noun. - coach_language = "Russian", so the coach replies in Russian when the app shows Russian. - res/xml/locales_config.xml enables the Android 13+ per-app language picker. - README.ru.md, linked from README.md. - Onboarding welcome tiles grow to fit a wrapped title instead of clipping it at a fixed height; the Russian titles surfaced this. --- README.md | 2 + README.ru.md | 114 ++ app/src/main/AndroidManifest.xml | 1 + .../pulseloop/ui/screens/OnboardingScreen.kt | 9 +- app/src/main/res/values-ru/strings.xml | 1286 +++++++++++++++++ app/src/main/res/xml/locales_config.xml | 6 + 6 files changed, 1415 insertions(+), 3 deletions(-) create mode 100644 README.ru.md create mode 100644 app/src/main/res/values-ru/strings.xml create mode 100644 app/src/main/res/xml/locales_config.xml diff --git a/README.md b/README.md index 64dfdfef..1f53a0e5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # PulseLoop Android +🇷🇺 [Русская версия README](README.ru.md) + > ⚠️ **Disclaimer:** This app is provided as-is and is not a medical application. > The rings are not medical devices. This app does not replace professional > healthcare. Always consult your doctor for any medical concerns. diff --git a/README.ru.md b/README.ru.md new file mode 100644 index 00000000..7984171e --- /dev/null +++ b/README.ru.md @@ -0,0 +1,114 @@ +# PulseLoop Android + +> ⚠️ **Важно:** приложение предоставляется «как есть» и не является медицинским. +> Кольца — не медицинские устройства. Приложение не заменяет врача: по любым +> вопросам здоровья обращайтесь к специалисту. + +PulseLoop Android — порт [PulseLoop для iOS](https://github.com/saksham2001/PulseLoopiOS): +приложения-компаньона для недорогих смарт-колец на платформах 56ff/Jring и Colmi/Yawell QRing. +Приложение работает с кольцом напрямую по Bluetooth, без облака производителя и без аккаунта, +и добавляет поверх ваших данных ИИ-коуча. Полная документация — в [README на английском](README.md). + +

+ PulseLoop +

+ +## Русский язык в приложении + +- **Весь интерфейс**: экраны «Сегодня», «Показатели», «Сон», «Активность», «Коуч», + настройки и все их разделы, онбординг, подключение кольца, питание, тренировки, виджеты. +- **Уведомления**: сводки коуча, низкий заряд кольца, тренировка в реальном времени. +- **Описания зон и показателей**: нормы пульса, SpO₂, ВСР, давления, глюкозы, температуры, + стресса и усталости, а также анализ сна. +- **ИИ-коуч отвечает по-русски.** Промпты и описания инструментов остались на английском: + модели надёжнее работают с ними в оригинале, а часть ответов разбирается по точным + английским токенам. К каждому системному промпту добавляется указание писать ответ на + языке приложения. Это касается чата, карточек-сводок, уведомлений и ИИ-оценки еды. +- **Даты и время** выводятся по правилам языка: 24-часовой формат и порядок «11 нояб.». +- Склонение по числам (`1 шаг`, `3 шага`, `5 шагов`) сделано через plurals. + +Остались на английском: экран для разработчиков (Debug), технические заметки автоопределения +локального LLM-сервера, названия моделей и их описания, а также журналы и экспорт +диагностики — они нужны для отчётов об ошибках в оригинальном проекте. + +## Язык приложения + +Язык берётся из системы. Если телефон на русском, приложение тоже будет на русском. В остальных +случаях оно останется на английском. На Android 13+ язык можно выбрать отдельно для приложения: +**Настройки Android → Приложения → PulseLoop → Язык**. + +## Подключение кольца + +1. При первом запуске мастер настройки проведёт через подключение: пролистайте карусель до + своей модели и нажмите **«Подключить кольцо»**. +2. Если мастер уже пройден, откройте **«Настройки»** и нажмите карточку устройства вверху. +3. Держите кольцо рядом и «разбудите» его (ненадолго снимите с зарядки), затем выберите его + в списке найденных. +4. Кольцо подключится, синхронизирует историю, и показатели начнут заполняться. + +### Профиль и калибровка + +Кольцам **56ff/Jring** для точной оценки сахара в крови и калорий нужен ваш профиль: +**возраст, рост, вес и пол**. Их можно указать при первой настройке или в +**«Настройки → Профиль»**. Данные хранятся **только на телефоне**. + +Давление измеряется датчиком напрямую, и профиль для него не нужен. Кольцам **Colmi** +профиль не нужен вообще: давление и сахар они не поддерживают. + +Для 56ff/Jring можно откалибровать давление по тонометру, а сахар — по результату анализа +или глюкометра: **«Настройки → Калибровка»**. Раздел показывается только для колец, которые +поддерживают эти показатели. + +## Поддержка колец + +| Возможность | 56ff / Jring | Colmi QRing | +|---|---|---| +| Пульс (разовый замер, в реальном времени, история) | ✅ | ✅ | +| SpO₂ (разовый замер, история) | ✅ | ✅ | +| Шаги, расстояние, калории | ✅ | ✅ | +| Сон (лёгкий, глубокий, бодрствование) | ✅ | ✅ | +| Сон (REM) | ❌ | ✅ | +| Давление | ✅ | ❌ | +| Сахар в крови | ✅ | ❌ | +| ВСР | ❌ | ✅ | +| Стресс | ✅ | ✅ | +| Усталость | ✅ | ✅ | +| Температура кожи | ❌ | ✅ | +| Заряд батареи | ✅ | ✅ | +| Поиск устройства | ✅ | ✅ | + +Полный список моделей, особенности протоколов и раздел про диагностику — в +[README на английском](README.md). + +## Известные проблемы + +- **«Забыть кольцо» может не до конца очистить стек Bluetooth.** Тогда при следующем поиске + кольцо не видно ни PulseLoop, ни другим приложениям. **Помогает перезагрузка телефона.** + +## Сборка + +```bash +./gradlew assembleDebug +``` + +Минимальная версия: Android 8.0 (SDK 26). + +## Как устроен перевод (для разработчиков) + +- Строки лежат в `app/src/main/res/values/strings.xml` (английский) и + `app/src/main/res/values-ru/strings.xml` (русский). +- В Composable-функциях используется `stringResource(...)` / `pluralStringResource(...)`. +- Коду без `Context` (сервисы, построители состояния, движок порогов) строки отдаёт + `com.pulseloop.util.L10n`. В приложении он берёт их из ресурсов, а в JVM-юнит-тестах читает + английский `values/strings.xml`, поэтому тесты с английскими строками проходят без изменений. +- Даты форматирует `com.pulseloop.util.LocaleFormats` по шаблонам-«скелетам» Android. +- Язык ответов ИИ задаёт `com.pulseloop.coach.context.CoachLanguage` по строке `coach_language` + из того перевода, который Android реально выбрал. Если для языка телефона перевода нет, + интерфейс и коуч остаются на английском. + +Чтобы добавить ещё один язык, создайте `values-<код>/strings.xml` (в `coach_language` укажите +английское название языка, например `German`) и добавьте код в `res/xml/locales_config.xml`. + +## Лицензия + +См. [README](README.md) и [родительский проект](https://github.com/saksham2001/PulseLoopiOS). diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9cbb15d9..10e06093 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:networkSecurityConfig="@xml/network_security_config" + android:localeConfig="@xml/locales_config" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:theme="@android:style/Theme.Material.Light.NoActionBar"> diff --git a/app/src/main/java/com/pulseloop/ui/screens/OnboardingScreen.kt b/app/src/main/java/com/pulseloop/ui/screens/OnboardingScreen.kt index b9484a6d..15a32afb 100644 --- a/app/src/main/java/com/pulseloop/ui/screens/OnboardingScreen.kt +++ b/app/src/main/java/com/pulseloop/ui/screens/OnboardingScreen.kt @@ -319,16 +319,19 @@ private fun WelcomeStep(getStarted: () -> Unit, exploreWithoutRing: () -> Unit) // Two-column feature grid (rows of two, since we're inside a scroll column). features.chunked(2).forEach { pair -> - Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + // IntrinsicSize.Min + fillMaxHeight: both tiles in a row match the taller one, and a + // title that wraps (longer in some languages) grows the tile instead of clipping. + Row(Modifier.fillMaxWidth().height(IntrinsicSize.Min), horizontalArrangement = Arrangement.spacedBy(12.dp)) { pair.forEach { feature -> Column( Modifier .weight(1f) - .height(118.dp) + .fillMaxHeight() + .heightIn(min = 118.dp) .clip(RoundedCornerShape(16.dp)) .background(PulseColors.card) .border(1.dp, PulseColors.borderSubtle, RoundedCornerShape(16.dp)) - .padding(horizontal = 13.dp), + .padding(horizontal = 13.dp, vertical = 12.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically), ) { diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml new file mode 100644 index 00000000..4ad2a943 --- /dev/null +++ b/app/src/main/res/values-ru/strings.xml @@ -0,0 +1,1286 @@ + + + Russian + Активность за день + Шаги, расстояние и калории с кольцами прогресса. + Плитка показателя + Плитка «Сегодня» на выбор — активность, сон, пульс и другое. + Две плитки показателей + Две плитки «Сегодня» рядом, каждая настраивается. + Данных о пульсе пока нет — синхронизируйте кольцо, чтобы увидеть динамику. + Почасовые значения рассчитываются по пульсу — это кольцо не измеряет SpO₂ отдельно каждый час. Разовые замеры, которые вы запускаете сами, — настоящие измерения. + Данных SpO₂ пока нет — сделайте замер, чтобы увидеть динамику. + Систолическое + Диастолическое + Данных о давлении пока нет. + Идёт измерение… значение обновится по завершении + Данных о ВСР пока нет — они накапливаются за несколько часов ношения. + Данных о стрессе пока нет — сделайте замер. + Оценка по ВСР — ваше кольцо не измеряет стресс + Данных об усталости пока нет — сделайте замер. + Данных о сахаре в крови пока нет. + Данных о температуре пока нет — динамика появится после ночи в кольце. + Показатели + Измерения и динамика + ЧСС + SpO₂ + АД + ВСР + Не двигайтесь — измеряем пульс… + Не двигайтесь — измеряем кислород в крови… + Не двигайтесь — измеряем давление, SpO₂, стресс, усталость и сахар в крови… + Не двигайтесь — измеряем пульс и SpO₂… + Не двигайтесь — измеряем: %1$s… + АД и ВСР + %1$s %2$d с + Измерение… %1$d с + Измерить + Кольцо отключилось во время измерения. + Кольцо не чувствует палец. Наденьте его плотнее и попробуйте снова. + Не удалось получить стабильное значение. Наденьте кольцо плотнее, держите руку неподвижно и попробуйте снова. + мм рт. ст. + Назад + Назад + Далее + Недостаточно данных за этот период. + Последнее + Среднее + Мин. + Макс. + ДИАПАЗОНЫ НОРМЫ + ЧТО ЭТО ЗНАЧИТ + ЗАМЕРЫ + Скрыть замеры + Показать замеры + Оценка + Удалить замер + + Показать ещё %1$d + Показать ещё %1$d + Показать ещё %1$d + Показать ещё %1$d + + Удалить этот замер? + %1$s в %2$s.\n\nЭто действие нельзя отменить. + Замер не вернётся при следующей синхронизации этого дня. + Удалить + Отмена + Стресс + Темп. + вариабельность пульса + стресс + температура + Оценка по ВСР — ваше кольцо не измеряет стресс. Значение считается относительно ваших недавних показателей ВСР: оно говорит, как этот замер соотносится с вашей нормой, а не с другими людьми. + На этом кольце одному и тому же пульсу всегда соответствует одно и то же почасовое SpO₂, поэтому ночное снижение здесь отражает низкий пульс во сне, а не измеренный уровень кислорода. + Это оценочный показатель для самочувствия — не используйте его для дозировки лекарств или решений по диабету. Ни одно умное кольцо или часы не одобрены FDA для самостоятельного измерения или оценки глюкозы. + Давление с кольца — это оценка. Откалибруйте его по проверенному тонометру в разделе «Настройки → Калибровка» и обратитесь к врачу, если значения стабильно высокие или низкие. + Пульс + Кислород в крови + Стресс + Усталость + Температура кожи + Давление + Сахар в крови + Пульс в покое показывает, насколько интенсивно работает сердце в состоянии отдыха. Обычный диапазон для взрослых — 60–100 уд/мин; на него влияют тренированность, лекарства, кофеин и стресс. + Кислород в крови (SpO₂) — процент насыщения крови кислородом. Норма — 95–100%; высота над уровнем моря и заболевания лёгких могут его снижать. + Вариабельность пульса (ВСР) — разброс интервалов между ударами сердца. Она очень индивидуальна, поэтому мы сравниваем её с вашей личной нормой, а не с общим порогом. + Давление записывается как систолическое/диастолическое (мм рт. ст.). Категория определяется по худшему из двух значений. Оценка с кольца не заменяет тонометр. + Оценка самочувствия от 0 до 100 на основе характера пульса. Чем ниже, тем спокойнее. Это оценка, а не медицинское измерение стресса. + Оценка утомления от 0 до 100. Чем выше, тем сильнее усталость. Это оценка кольца, а не клиническая шкала. + Оценочное значение глюкозы. Ни одно умное кольцо не сертифицировано для измерения глюкозы, поэтому воспринимайте его только как ориентир для самочувствия. + Температура кожи под кольцом ниже температуры тела. Важна динамика со временем, а не отдельный замер. + Сегодня + Неделя + Месяц + ИИ-коуч + локальный сервер + Включён — %1$s + Нужен адрес сервера + Нужен API-ключ + Выключен + Включить ИИ-коуча + Уведомления PulseLoop отключены. Включите их в настройках Android, чтобы получать сводки. + OpenRouter (100+ моделей) + Локальный / свой сервер (ключ не нужен) + Провайдер + Показать или скрыть + Обновить ключ + Сохранить ключ + Удалить + Сохранено ✓ + API-ключ %1$s + Свой идентификатор модели (vendor/model) + Приватная маршрутизация + Только провайдеры, которые не хранят данные + Приоритет маршрутизации + Сбалансированно (по умолчанию) + Сначала дешёвые + Сначала быстрые + Сначала с наименьшей задержкой + Адрес сервера + Порты по умолчанию — Ollama 11434 · LM Studio 1234 · llama.cpp 8080 · vLLM 8000 · SGLang 30000. Путь /v1 добавляется автоматически. + Не удалось связаться с сервером. + Определяем… + Определить сервер и настроить + Отправляем три коротких тестовых сообщения. Это может занять минуту, если модель ещё загружается. + Модель + Выберите модель + Название модели + API-ключ (необязательно) + Нужен, только если сервер запущен с --api-key. Иначе оставьте пустым. + Вызов инструментов + Позволяет коучу читать ваши данные. Автоопределение настроит это само; выключите, если сервер не принимает инструменты (vLLM нужен флаг --enable-auto-tool-choice). + Формат ответа + Макс. токенов + Тайм-аут (с) + Оставьте поле токенов пустым, чтобы решал сервер. Увеличьте тайм-аут для большой модели на CPU — медленный ответ не повторяется. + Хранится в защищённом Android Keystore. Покидает устройство только для запросов к модели. Смена провайдера применяется со следующего сообщения. + Глубина рассуждений + По умолчанию + Решает модель (по умолчанию) + Вложения-изображения + Прикреплять фото к сообщениям коучу + Поиск в интернете + Расходует дополнительные токены + Поиск Google может требовать платного тарифа Gemini — бесплатным ключам могут отказать, и тогда коуч отвечает без результатов из интернета. + Изменение данных + Ставить цели, вести записи, править данные + Живые замеры + Запускать замеры на кольце в реальном времени + Учитывать местоположение и погоду + Советы с учётом текущей погоды в вашем городе + Память коуча + Скрыть + Показать (%1$d) + Включить сводки от коуча? + Получайте ежедневную сводку от коуча. Это можно изменить в любой момент в разделе «Сводки коуча». + Включить + Не сейчас + Сводки коуча + ИИ-коуч выключен + Включите ИИ-коуча, чтобы изменить эти настройки: ежедневные сводки коуч пишет на основе ваших недавних показателей. + Ежедневные сводки + Уведомления со сводками + Уведомления PulseLoop отключены в настройках Android. + Утро + Вечер + Коуч PulseLoop + Это тестовое уведомление со сводкой. + Отправить тестовую сводку + Заряд кольца + Уведомлять, когда заряд кольца опускается ниже 20% и 10%, чтобы отслеживание не прервалось посреди дня. + Уведомления о низком заряде + Профиль + Возраст, пол, рост и вес нужны кольцу для точного расчёта калорий (а на кольцах 56ff/Jring — и сахара в крови). Давление измеряется датчиком напрямую. + Определять единицы автоматически + Сохранено и отправлено на кольцо ✓ + Сохранено — отправится при следующем подключении + Сохранить профиль + Физиология + Необязательные уточнения того, как интерпретируются ваши показатели. Если что-то не задано, PulseLoop использует разумные значения по умолчанию. + Тренированность + Низкий пульс в покое считается признаком тренированности, а не поводом для беспокойства; порог низкого пульса смягчается. + Режим спортсмена + Окружающая среда + Выше ~2000 м нормальный уровень кислорода в крови ниже. Мы учитываем это, чтобы не выдавать ложных предупреждений. + Обычная высота (фут) + Обычная высота (м) + Состояние здоровья + Необязательно. Оба фактора влияют на ожидаемые пульс и уровень кислорода, поэтому мы корректируем оценки, а не бьём тревогу. + Бета-блокаторы + Заболевание лёгких + Единицы измерения + Единица глюкозы + Сохранить + Не указано + Нет + Да + Калибровка + Калибровка давления + Необязательно. Введите недавний результат тонометра, и кольцо скорректирует свои значения. + Сохранить калибровку + Калибровка сахара в крови + Необязательно. Кольцо оценивает глюкозу по вашему профилю, а не настоящим датчиком. Введите недавний результат анализа или глюкометра (мг/дл), чтобы скорректировать отображаемое значение. + Значение (мг/дл) + Введите корректное значение в мг/дл + Сначала измерьте сахар в крови, затем выполните калибровку + Откалибровано ✓ (поправка %1$s мг/дл) + Откалибровать + Текущая поправка: %1$s мг/дл + Калибровка не задана + Калибровка сброшена + Сбросить + Цели + Дневные и недельные цели для колец активности. + Сохранено + Сохранить цели + мг/дл + ммоль/л + уд/мин + Частота измерений + Измерения + Как часто кольцо измеряет показатели в фоне. Короткий интервал пульса даёт более подробную историю, но расходует больше заряда. + Подключите кольцо, чтобы настроить круглосуточные измерения. + Круглосуточный пульс + Каждые %1$d мин + Кислород в крови (SpO₂) + Как у пульса, но не чаще раза в 60 мин + Измерять SpO₂ из приложения + Круглосуточный SpO₂ этого кольца рассчитывается по пульсу. Если включено, PulseLoop по расписанию ниже запускает настоящий разовый замер между собственными замерами кольца — примерно на минуту, что расходует больше заряда. Android может откладывать или пропускать запуски, пока телефон в режиме сна. + Каждый час + + Каждый %1$d час + Каждые %1$d часа + Каждые %1$d часов + Каждые %1$d часа + + Скрывать расчётный SpO₂ + Показывать на графиках и карточках только настоящие разовые замеры, скрывая почасовые оценки. + Температура + Сохранить настройки измерений + Обрезка сна + Неподвижная рука выглядит как сон, поэтому вечер на диване может завысить продолжительность ночи. Обрезанные минуты не импортируются — если позже изменить эти настройки, они не вернутся. + Учитывать режим сна / «Не беспокоить» + Учитывать только сон в режиме сна Android или «Не беспокоить». + Для ночей без этого режима используется расписание. + Ночи без этого режима сохраняются целиком. + Часы сна + Ежедневное расписание для ночей без режима сна / «Не беспокоить». + Учитывать только сон в рамках ежедневного расписания. Дневной сон вне его пропускается. + С %1$s + До %1$s + Требуется разрешение + Чтобы фиксировать включение и выключение режима сна или «Не беспокоить», пока PulseLoop работает в фоне, Android требует доступ к уведомлениям. PulseLoop отслеживает только смену режимов и не читает ваши уведомления.\n\nЕсли переключатель неактивен, откройте «О приложении» PulseLoop, нажмите ⋮ → «Разрешить настройки с ограниченным доступом» и вернитесь сюда. + Открыть настройки + Начало + Окончание + Готово + Ещё нет + Устройство + Подключено — %1$s · %2$d%% + Последнее подключение: %1$s + Кольцо не подключено + Прошивка: %1$s + Прошивка: чтение… (подключите кольцо) + Последняя синхронизация: %1$s + Добавить кольцо + Синхронизировать + Найти кольцо + Отключить + Переподключить последнее кольцо + Управление кольцом + «Забыть» отвязывает кольцо и удаляет его из приложения, чтобы его можно было подключить к другому устройству. В остальное время приложение подключается автоматически. + Забыть кольцо + Сброс к заводским настройкам стирает все данные на самом кольце. Синхронизированные данные в приложении сохранятся. + Сброс… + Сбросить кольцо до заводских настроек + Сбросить кольцо до заводских настроек? + Все данные на кольце будут стёрты, а настройки сброшены до заводских. Сначала мы синхронизируем последние данные в приложение, но отменить сброс нельзя. После этого кольцо придётся подключить заново. + Синхронизация последних данных… + Сбросить кольцо + Критично + Низкий + Хорошо + Заряд критически низкий + Низкий заряд + Заряд в норме + Отвязать кольцо? + Сбросить данные приложения? + Отвязать кольцо и сбросить данные приложения? + Отвязать кольцо? Кольцо забудет этот телефон, ваши данные сохранятся. + Все ваши данные будут удалены навсегда — показатели, сон, активность, история коуча, настройки и сохранённые API-ключи. Это действие нельзя отменить. + Кольцо будет отвязано, а затем все ваши данные удалены навсегда — показатели, сон, активность, история коуча, настройки и сохранённые API-ключи. Это действие нельзя отменить. + Отвязать кольцо + Сбросить данные + Отвязать и сбросить + Конфиденциальность и данные + Резервная копия + Экспортируйте все данные в один JSON-файл для резервной копии, переноса на другое устройство или внешнего анализа. Импорт восстанавливает всё, заменяя текущие данные. + Экспорт данных PulseLoop + Не удалось экспортировать + Экспорт… + Экспортировать все данные + Импорт… + Импортировать данные + Данные приложения + Необратимые действия: отвязать кольцо, сбросить данные приложения или и то и другое. + Демо-данные + Познакомьтесь с приложением без кольца: будут созданы примеры активности, пульса, SpO2, сна и диалога с коучем. + Пересоздать демо-данные + Удалить демо-данные + Диагностика + Экспорт журналов приложения, телефона и кольца в JSON для отчётов об ошибках. + Обезличить экспорт + Удаляет показатели здоровья, серийный номер и MAC-адреса кольца. Модели, коды команд и ошибки сохраняются. + ВЫКЛ — включает полные BLE-кадры и показатели здоровья без маскировки (только для отладки протокола). + Экспортировать диагностику + Экспортировать полностью (без маскировки) + Ошибка + ОК + Импорт завершён + Данные восстановлены из резервной копии. + Заменить все данные? + Всё, что сейчас есть в приложении, будет удалено навсегда и заменено содержимым этого файла. Это действие нельзя отменить. + Не удалось импортировать — файл повреждён или создан более новой версией. + Удалить старые данные и импортировать + Пересоздать демо-данные? + Текущие демо-данные будут заменены. Синхронизированные данные кольца, включая историю сна, не пострадают. + Пересоздать + Удалить демо-данные? + Будут удалены все демо-замеры, активность, сон и демо-устройство. Синхронизированные данные кольца не пострадают. + Удалить + Параметры разработчика уже включены. + Теперь вы разработчик! + + До параметров разработчика остался %1$d шаг. + До параметров разработчика осталось %1$d шага. + До параметров разработчика осталось %1$d шагов. + До параметров разработчика осталось %1$d шага. + + О приложении + Версия + Приложение для здоровья со встроенной языковой моделью: превращает недорогое Bluetooth-кольцо в полноценный трекер, с которым можно разговаривать. Оно работает с кольцом напрямую по Bluetooth — без облака производителя и без аккаунта — и добавляет ИИ-коуча поверх ваших собственных данных. + Исходный код на GitHub + Лицензия + Трекер здоровья с открытым исходным кодом, портированный с iOS.\nCC BY 4.0 · Можно свободно распространять и изменять, в том числе в коммерческих целях, с указанием авторства. + Питание + Включить учёт питания + Записывайте приёмы пищи и следите за калориями и БЖУ + Цели на день + Калории (ккал) + Белки (г) + Углеводы (г) + Жиры (г) + Сбалансировать БЖУ (30/40/30) + Быстрый доступ + Открыть дневник питания + Strava не настроена + Добавьте stravaClientId и stravaClientSecret в local.properties, чтобы включить интеграцию со Strava. + Интеграция со Strava + Подключено как %1$s. Тренировки синхронизируются автоматически после завершения. + Подключите аккаунт Strava, чтобы автоматически загружать тренировки с GPS-маршрутами и данными пульса. + Нет новых тренировок для загрузки + + Загружена %1$d тренировка + Загружено %1$d тренировки + Загружено %1$d тренировок + Загружено %1$d тренировки + + Не удалось загрузить: %1$s + неизвестная ошибка + Синхронизация… + Strava отключена + Подтвердите доступ в браузере — вы автоматически вернётесь в PulseLoop. + Не удалось открыть браузер + Подключить Strava + Автозагрузка + Завершённые тренировки автоматически загружаются в Strava вместе с GPS-маршрутом, данными пульса и видом спорта. + Разрешения Health Connect не выданы — экспортировать нечего. + Подключено. Выдано разрешений: %1$d из %2$d. + Экспортируйте данные кольца в Health Connect, чтобы их видели другие приложения. Только запись: PulseLoop никогда не читает данные обратно. + Health Connect недоступен на этом устройстве. Установите приложение Health Connect, чтобы пользоваться этой функцией. + Установить Health Connect + Приложение Health Connect на этом устройстве нужно обновить. + Обновить Health Connect + Экспортировать данные PulseLoop + Подключено + Не подключено + Открыть Health Connect + Управляйте разрешениями, просматривайте и удаляйте данные PulseLoop в приложении Health Connect. + Типы данных + Экспортируется только включённое. Строка остаётся неактивной, пока не выдано разрешение. + Насыщение кислородом (SpO₂) + Вариабельность пульса (ВСР) + Температура тела + Сон + Шаги и активность + Тренировки + Глюкоза в крови + Частота дыхания + МПК (VO₂ max) + Пульс в покое + Текущее кольцо вычисляет это по пульсу — экспорт отключён + Ожидает разрешения + ВСР экспортируется как RMSSD — в Health Connect нет типа SDNN, а метрика колец производителем не документирована. + Последняя синхронизация %1$s — %2$s + неизвестно + Экспорт ещё не выполнялся. Когда главный переключатель включён и выбран объём истории, PulseLoop экспортирует данные автоматически. + Удалить экспортированные данные + Удалить все записи PulseLoop из Health Connect и начать экспорт заново. Данные кольца в PulseLoop не пострадают. + Для удаления нужно разрешение на запись, а сейчас у PulseLoop его нет — выдайте его выше или удалите данные в приложении Health Connect. + Удаление… + Удалить данные PulseLoop + Скрыть + Какой объём истории экспортировать? + Первый экспорт всей истории может занять время. + Вся история + Только новые данные + Разрешения Health Connect отозваны + У PulseLoop больше нет разрешений Health Connect. Сбросить экспорт, чтобы при повторной выдаче разрешений история экспортировалась заново? + Экспорт сброшен — выдайте разрешения снова, чтобы синхронизировать. + Сбросить экспорт + Удалить данные PulseLoop? + Все записи PulseLoop в Health Connect будут удалены, а экспорт сброшен. Это нельзя отменить; данные кольца в PulseLoop не пострадают. + Пока недостаточно данных для оценки времени работы — она появится через несколько часов разряда. + Осталось около %1$s + Оценка по текущей скорости разряда: %1$s %%/ч. + История заряда + Пока недостаточно данных — история накапливается по мере того, как кольцо сообщает уровень заряда. + Выкл. + Вкл. + Офлайн + Локально + Прокси-сервер + Настройки + Общие + Показатели + Прочее + Для разработчиков + О PulseLoop + Нужна сводка? + Хотите сводку по последним данным кольца? Нажмите, чтобы открыть коуча. + ШАГИ + ККАЛ + Оценка по пульсу + Нет данных + СИС + ДИА + Ждём первую синхронизацию + Синхронизируйте кольцо, чтобы начать собирать данные о движении, пульсе, кислороде в крови и восстановлении. + Норма ещё не определена + Пульса пока нет + Пульс получен + Сна пока нет + Сон синхронизирован + Набираете темп + Полегче сегодня + Ровный прогресс + %1$d уд/мин + + У вас %1$,d шаг. Синхронизируйтесь после пробуждения, чтобы добавить данные о восстановлении. + У вас %1$,d шага. Синхронизируйтесь после пробуждения, чтобы добавить данные о восстановлении. + У вас %1$,d шагов. Синхронизируйтесь после пробуждения, чтобы добавить данные о восстановлении. + У вас %1$,d шага. Синхронизируйтесь после пробуждения, чтобы добавить данные о восстановлении. + + + У вас %1$,d шаг, %2$d ч %3$02d мин сна, последний пульс — %4$s. + У вас %1$,d шага, %2$d ч %3$02d мин сна, последний пульс — %4$s. + У вас %1$,d шагов, %2$d ч %3$02d мин сна, последний пульс — %4$s. + У вас %1$,d шага, %2$d ч %3$02d мин сна, последний пульс — %4$s. + + Шаги %1$s%% + Шаги получены + Фазы + Структура сна + Сон не записан + Наденьте кольцо на ночь, чтобы увидеть здесь гипнограмму. + Анализ сна + Последний сон + с %1$s до %2$s + %1$d из %2$d · %3$s–%4$s + + В этом году записана %1$d ночь + В этом году записано %1$d ночи + В этом году записано %1$d ночей + В этом году записано %1$d ночи + + Записано ночей: %1$d из %2$d + Продолжительность + Среднее за месяц + Сон по ночам + День + Год + Глубокий + Лёгкий + REM + Бодрствование + Добавлено вами + Добавлено вами · сон без определения фазы + Сред. глубокий + Сред. лёгкий + Сред. бодрств. + За этот период ночей пока нет. + Предыдущий день + Следующий день + Вчера + Отлично + Хорошо + Удовлетворительно + Есть над чем поработать + Записи + Кольцо записало это одной записью + + Кольцо записало эту ночь %1$d частью + Кольцо записало эту ночь в %1$d части + Кольцо записало эту ночь в %1$d частей + Кольцо записало эту ночь в %1$d части + + Сон: %1$s + Включает %1$s, добавленные вами, без фаз и без учёта в оценке + Изменить время записи + Удалить запись + Бодрствование между записями: %1$s + Не удалось изменить запись + Удалить эту запись? + Запись %1$s – %2$s будет исключена из итогов ночи и гипнограммы и не вернётся при повторной синхронизации. + Не удалось удалить запись + Оставить + Изменить запись сна + Обрежьте запись или продлите её на время, которое кольцо пропустило. Добавленное время считается сном без фазы, поэтому не учитывается в разбивке по фазам и в оценке. + Начало: %1$s + Конец: %1$s + Время начала должно быть раньше времени окончания. + Изменить время начала + Изменить время окончания + Предыдущая запись заканчивается в %1$s. + Следующая запись начинается в %1$s. + + Запись можно продлить не более чем на %1$d час, поэтому она может начинаться не раньше %2$s. + Запись можно продлить не более чем на %1$d часа, поэтому она может начинаться не раньше %2$s. + Запись можно продлить не более чем на %1$d часов, поэтому она может начинаться не раньше %2$s. + Запись можно продлить не более чем на %1$d часа, поэтому она может начинаться не раньше %2$s. + + + Запись можно продлить не более чем на %1$d час, поэтому она может заканчиваться не позже %2$s. + Запись можно продлить не более чем на %1$d часа, поэтому она может заканчиваться не позже %2$s. + Запись можно продлить не более чем на %1$d часов, поэтому она может заканчиваться не позже %2$s. + Запись можно продлить не более чем на %1$d часа, поэтому она может заканчиваться не позже %2$s. + + Начало раньше %1$s перенесёт запись в другую ночь. + Окончание позже %1$s перенесёт запись в другую ночь. + Оставьте хотя бы минуту из того, что записало кольцо (%1$s – %2$s). + %1$d мин + %1$d ч %2$02d мин + Сон за неделю + Сон за месяц + Сон за год + + Записать активность + История тренировок + Добавить прошлую активность + Добавьте тренировку, которую забыли записать + СЕГОДНЯ + ВЧЕРА + Сегодня тренировок нет + Запустите тренировку вручную, если кольцо пропустило активность. + Шаги + Расстояние + Калории + ккал + сред. %1$d уд/мин + МИН + ЦЕЛЬ НА НЕДЕЛЮ + Активных дней: %1$d из 7 + НАЖМИТЕ, ЧТОБЫ ИЗМЕНИТЬ ЦЕЛИ + Записать активность + Записывать GPS-маршрут + Старт + Тренировок пока нет — записанные тренировки появятся здесь. + Изменить цели + Активные минуты + %1$d мин + %1$s ч + Тренировок в неделю + ЗАПИСИ + Скрыть записи активности + Показать записи активности + Загрузка… + Записей активности за %1$s пока нет. + + %1$s шаг + %1$s шага + %1$s шагов + %1$s шага + + Удалить запись активности + Удалить эту запись активности? + %1$s в %2$s.\n\nИтог дня уменьшится на это значение. Действие нельзя отменить, и запись не вернётся при следующей синхронизации этого дня. + Шаг %1$d из %2$d + Пропустить + Без подписки + Данные — ваши + Приватность + Данные на устройстве + ИИ-коуч + Изучает вашу норму + Показатели + Пульс, SpO₂, ВСР, стресс + Сон + Фазы и динамика + Тренировки + Запись в реальном времени + Начать + Посмотреть без кольца + Настройка PulseLoop + Ваше здоровье на ваших условиях — без подписки и без облака. + Продолжить + Профиль + Используется для расчёта калорий, целей активности и сводок. + Цели на день + Начните с рекомендуемых целей — их можно изменить в любой момент. + Активность и показатели — сразу + Первая синхронизация + Фазы сна и ночная динамика + Дни 3–7 + Открывается ваша персональная норма + Начать пользоваться PulseLoop + Всё готово + Носите кольцо сегодня — с этого момента начнёт формироваться ваша норма. + PulseLoop постепенно изучает вашу норму + Носите кольцо днём и синхронизируйте после сна. Через несколько дней динамика станет более персональной. + Настройка завершена + Система единиц + Метрическая + Имперская + О вас + Имя + Необязательно + Пол + Женский + Мужской + Другой + Параметры тела + Возраст + + %1$d год + %1$d года + %1$d лет + %1$d года + + Рост + Вес + %1$d см + кг + фунт + Введите вес в единицах: %1$s + В качестве десятичного разделителя можно использовать запятую или точку. + Введите вес от %1$d до %2$d %3$s. + км + ми + Цели на день + %1$d ккал + Цель на неделю + %1$d в неделю + Все + Добавьте кольцо + Пролистайте, чтобы найти свою модель, и нажмите, чтобы подключить.\nМожно сначала осмотреться и подключить кольцо позже. + Скрыть подробности подключения + Показать подробности подключения + Ожидание событий BLE-подключения… + Подключить кольцо + Пропустить + Кольцо можно подключить позже в настройках. + Подключение к %1$s… + Поиск %1$s… + Кольца пока не найдены + Разбудите кольцо касанием или движением и держите его рядом. + Остановить поиск + Подключено: %1$s + Bluetooth выключен + Включите Bluetooth, чтобы найти и подключить кольцо. + Удалить тренировку? + Тренировка и её маршрут будут удалены. Это действие нельзя отменить. + Время окончания не может быть в будущем. + Интервал должен быть длиннее пауз в этой тренировке (%1$d мин). + Окончание должно быть позже начала. + Изменить тренировку + Активность + Начало + Окончание + Расстояние, калории и пульс будут пересчитаны для нового интервала. + Сохранить изменения + Время + ТЕМП %1$s + СКОРОСТЬ + КАЛОРИИ + ДЛИТЕЛЬНОСТЬ + АКТИВНЫХ МИН + Сред. пульс + Макс. пульс + Мин. пульс + ОТРЕЗКИ + Тренировка не найдена + Этой тренировки больше нет в памяти устройства. Возможно, она была удалена или заменена. + ИИ-запись еды + Убрать фото + Камера + Галерея + ИЛИ ОПИШИТЕ + ДОБАВЬТЕ ПОДРОБНОСТИ (НЕОБЯЗАТЕЛЬНО) + например: два яйца, тост с маслом, чёрный кофе + Проанализировать + Отправляется настроенному ИИ-провайдеру только по нажатию «Проанализировать». Оценки помечаются и их можно изменить. + Оцениваем пищевую ценность… + Оценка ИИ + Низкая уверенность + Средняя уверенность + Проверьте и поправьте + Записать + Проанализировать заново + Попробовать снова + Завтрак + Обед + Ужин + Перекус + Для ИИ-анализа нужен включённый коуч с настроенным провайдером («Настройки → ИИ-коуч»). Можно найти продукт в базе или ввести приём пищи вручную. + Не удалось обработать фото. Попробуйте снова или опишите блюдо. + ИИ не вернул пригодную оценку. Попробуйте снова или введите приём пищи вручную. + Ошибка анализа: %1$s + %1$d ккал + из %1$d + Белки + Углеводы + Жиры + %1$d ккал · Б%2$d У%3$d Ж%4$d + Фото + Описать + Записать приём пищи + %1$d г + Продукт с таким штрихкодом не найден. Введите его вручную. + Не удалось найти штрихкод. Проверьте подключение или введите приём пищи вручную. + Сканировать штрихкод + ккал + Б (г) + У (г) + Ж (г) + Коуч думает… + Ошибка: %1$s + По данным последней синхронизации + Расход и стоимость + Прошлые разговоры + Новый чат + Прикреплённое фото + Как у меня дела сегодня? + Объясни динамику моего пульса + Подведи итоги моей недели + Как мне лучше спать? + Выбранное фото + Прикрепить фото + Спросите коуча… + Отправить + Разговоров пока нет. Задайте коучу вопрос — он появится здесь. + Смахните разговор, чтобы удалить его. + Удалить все разговоры + Удалить этот разговор? + Разговор «%1$s» и ответы на него будут удалены. Это действие нельзя отменить. + Удалить все разговоры? + + %1$d разговор и ответы будут удалены. Это действие нельзя отменить. + Все %1$d разговора и ответы будут удалены. Это действие нельзя отменить. + Все %1$d разговоров и ответы будут удалены. Это действие нельзя отменить. + Все %1$d разговора и ответы будут удалены. Это действие нельзя отменить. + + Удалить все + Разговор без названия + + %1$d сообщение + %1$d сообщения + %1$d сообщений + %1$d сообщения + + открыт сейчас + Сегодня %1$s + Вчера %1$s + Активность + Коуч + Тренировка + PULSELOOP + Подключено · %1$d%% + Подключение… + Переподключение… + Ошибка синхронизации + Отключено + Доброе утро + Добрый день + Добрый вечер + Доброй ночи + Ходьба + Бег + Велосипед + Тренажёрный зал + Сквош + Спорт + Йога + Танцы + Поход + Спокойная или быстрая ходьба + Бег на улице или на дорожке + Шоссе, трейл или велотренажёр + Силовая или круговая тренировка + Игра на корте + Командные виды или с ракеткой + Йога, растяжка или дыхательные практики + Студия, кардио или фристайл + Тропы и перепады высот + Что-то другое + /ми + /км + МИЛЬ/Ч + КМ/Ч + Подключить + Настроить кольцо + Кольцо не подключено + Поиск… + Не удалось подключиться + Синхр. %1$s + только что + %1$d мин назад + %1$d ч назад + %1$d дн. назад + Глюкоза + Скрыть: %1$s + Переместить вверх: %1$s + Переместить вниз: %1$s + СКРЫТЫЕ + Показать: %1$s + Настроить + Меняйте порядок или скрывайте карточки + на %1$d%% выше нормы + на %1$d%% ниже нормы + Спортивный + Низкий (лекарства) + Низкий + Норма + Повышенный + Высокий + Очень низкий + Немного понижен + Определяем норму + Ниже нормы + Чуть ниже нормы + Около нормы + Выше нормы + Спокойствие + Бодрость + Лёгкая + Усталость + Сильная усталость + Стадия 1 + Стадия 2 + Опасный + Обычный + Очень высокий + Прохладно + Тепло + Оценка · откалибруйте по тонометру + Оценка — не для дозировки и диагностики + На уровне нормы + Низкий пульс в покое часто встречается у хорошо тренированных людей. + Бета-блокаторы снижают пульс — при их приёме это ожидаемо. + Ниже обычного пульса в покое. Часто это нормально, но стоит обратить внимание, если вы чувствуете слабость. + Пульс в покое, характерный для спортсменов. + Обычный пульс в покое для взрослых. + Выше обычного пульса в покое. Его могут повышать нагрузка, кофеин или стресс. + Высокий пульс в покое. Обратитесь к врачу, если он сохраняется в состоянии покоя. + На высоте ожидаемые значения ниже. + Опасно низкий уровень кислорода. Обратитесь за помощью, если вы также плохо себя чувствуете. + Низкий уровень кислорода в крови. Повторите замер в покое; если не проходит — обратитесь к врачу. + Немного ниже обычного диапазона. + Нормальный уровень кислорода в крови — 95–100%. + ВСР индивидуальна. Носите кольцо около недели, чтобы определить вашу норму. + Заметно ниже вашей обычной ВСР — часто связано со стрессом, плохим сном или перегрузкой. + Немного ниже вашего обычного диапазона. + Около вашей личной нормы. + Выше вашей обычной ВСР — часто признак хорошего восстановления. + Низкий уровень стресса — вы расслаблены. + Обычный уровень стресса днём. + Повышенный стресс — сделайте небольшой перерыв. + Высокий уровень стресса. Это оценка самочувствия, а не диагноз. + Низкая усталость — вы хорошо восстановились. + Лёгкая усталость. + Усталость — стоит снизить нагрузку и хорошо выспаться. + Сильная усталость. Это оценка самочувствия по данным кольца. + Низкое систолическое давление (ниже 90). + Нормальное давление — ниже 120/80. + Повышенное систолическое (120–129). + Гипертония 1-й стадии (систолическое 130–139). + Гипертония 2-й стадии (систолическое ≥140). + Опасный уровень (систолическое >180). Если подтвердится — обратитесь за помощью. + Низкое диастолическое давление (ниже 60). + Нормальное диастолическое — ниже 80. + Гипертония 1-й стадии (диастолическое 80–89). + Гипертония 2-й стадии (диастолическое ≥90). + Опасный уровень (диастолическое >120). Если подтвердится — обратитесь за помощью. + Ниже 70 мг/дл — низкий уровень. + Норма натощак — до 99 мг/дл. + Натощак 100–125 — выше обычного диапазона. + Натощак ≥126. Обратитесь к врачу, если глюкометр подтвердит. + Норма через два часа после еды — до 140 мг/дл. + Через два часа 140–199 — выше обычного диапазона. + Через два часа ≥200. Проверьте глюкометром и обратитесь к врачу. + В обычном диапазоне для замера не натощак. + Выше обычного диапазона. Влияет контекст (приёмы пищи). + Высокое значение вне зависимости от контекста. Проверьте глюкометром. + Ниже обычной температуры кожи. + Обычный диапазон температуры кожи по данным кольца. + Выше обычного. Динамика важнее отдельного замера. + мс + к норме + к прошлым + к предыдущему + Стабильно %1$s + В покое %1$d + В покое: калибровка + Пик %1$d + Пик — + уд/мин, диапазон + Минимум %1$d · %2$s + + %1$d замер + %1$d замера + %1$d замеров + %1$d замера + + % в среднем + Норма %1$d мс + Чем ниже, тем спокойнее + Оценка модели кольца + Нет данных + Нет оценки + Оценочный показатель самочувствия + Обновлено только что + Обновлено %1$s + Чем вы занимались? + Выберите активность, время начала и продолжительность. + Вид активности + Когда + Начало + Тренировка должна закончиться раньше текущего момента. + Сохранить активность + %1$d ч + %1$d ч %2$d мин + Скорость + Темп + ПАУЗА + -- уд/мин + %1$s м + Продолжить + Пауза + Завершить + Измерение + Держите руку неподвижно, положив запястье на ровную поверхность. + Дышите как обычно. Датчик должен плотно прилегать к коже. + Не двигайтесь во время измерения. + ИЗМЕРЕНИЕ + Не удалось получить значение. Убедитесь, что кольцо плотно сидит на пальце, и попробуйте снова. + Закрыть + ГОТОВО + Измеряем SpO₂… держите руку неподвижно. + Идёт измерение… не двигайтесь. + Значение сохранено. + Рекомендуемые + Все модели %1$s (%2$d) + Фильтр, например claude + снимается %1$s + Ещё %1$d — уточните поиск + Сохраните ключ, чтобы увидеть все модели %1$s. + Загружаем модели %1$s… + Доступно моделей %2$s: %1$d + Повторить + Обновить + %1$s больше не показывает «%2$s» — возможно, модель снята. Выберите другую. + %1$s снимает эту модель %2$s. + Модели + Входные токены + Выходные токены + Примерная стоимость + Оценка стоимости недоступна для локальных и пользовательских моделей. + По сообщениям + Показать + %1$d вх. · %2$d вых. + (без текста) + Сканирование недоступно + Для сканирования штрихкода нужна камера и доступ к ней. Попробуйте поиск по названию. + фунт. + %1$s см + Сегодня данных пока нет + Откройте PulseLoop для синхронизации + ОЦЕНКА + Выберите показатели + Выберите показатель + Выберите левый и правый показатели PulseLoop. + Выберите показатель PulseLoop для этого виджета. + ЛЕВЫЙ ПОКАЗАТЕЛЬ + ПРАВЫЙ ПОКАЗАТЕЛЬ + Добавить виджет + Заряд кольца + Оповещения о низком заряде кольца + Низкий заряд кольца + Заряд кольца — %1$d%%. Зарядите его в ближайшее время, чтобы отслеживание не прервалось. + Заряд кольца критически низкий + Заряд кольца — %1$d%%, скоро оно выключится. Зарядите его сейчас. + Сводки коуча + Ежедневные ИИ-сводки о здоровье по данным кольца + Сбросить масштаб + Маршрута пока нет + Выйдите на улицу, чтобы начать запись маршрута. + ±%1$d м · %2$d точ. + %1$d точ. + Открывает настройки кольца + Привет! Я ваш коуч PulseLoop. Могу ответить на вопросы о вашем сне, пульсе, активности и восстановлении. Что вас интересует? + Извините, что-то пошло не так: %1$s + Доступно обновление — %1$s + Загрузка… %1$d%% + Не удалось загрузить. Попробуйте снова. + Загрузка… + Обновить + Позже + Автообновление доступно только в релизной сборке (текущая: %1$s / %2$s). + Не удалось проверить обновления (%1$s). Попробуйте снова. + У вас последняя версия (%1$s). + Проверка… + Проверить обновления + Хорошая продолжительность + Глубокий сон в норме + Много глубокого сна + Мало пробуждений + Похоже, после активного дня ночь удалась. Продолжительность была хорошей, а глубокий сон занял здоровую долю ночи — поэтому оценка высокая. + Продолжительность сна и баланс фаз были отличными. Глубокого сна было достаточно, это помогло сохранить высокую общую оценку. + Хорошее восстановление + Хороший сон, но беспокойный + Вы спали достаточно, но пробуждений было многовато. Если это повторяется, обратите внимание на поздний кофеин, алкоголь, температуру в спальне или стресс перед сном. + Много пробуждений + Оценку снизила продолжительность + Соотношение фаз было хорошим, но общего времени сна не хватило для полноценного восстановления. Если лечь немного раньше, завтрашняя оценка, скорее всего, будет выше. + Короткий сон + В целом хорошая ночь + Сон был в приемлемых пределах; оценку в основном определили продолжительность и баланс фаз. Глубокий и лёгкий сон читались достаточно чётко, чтобы оценить восстановление. + Прошлой ночью сон не записан + Я не вижу данных о сне за прошлую ночь. Носите кольцо ночью и синхронизируйте утром, чтобы я мог сравнить сон с вашей нормой. + Пока мало данных за неделю + Пока мало данных за месяц + Пока мало данных за год + + За эту неделю записана только %1$d ночь. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за неделю. + За эту неделю записано только %1$d ночи. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за неделю. + За эту неделю записано только %1$d ночей. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за неделю. + За эту неделю записано только %1$d ночи. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за неделю. + + + За этот месяц записана только %1$d ночь. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за месяц. + За этот месяц записано только %1$d ночи. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за месяц. + За этот месяц записано только %1$d ночей. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за месяц. + За этот месяц записано только %1$d ночи. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за месяц. + + + За этот год записана только %1$d ночь. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за год. + За этот год записано только %1$d ночи. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за год. + За этот год записано только %1$d ночей. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за год. + За этот год записано только %1$d ночи. Поносите кольцо ещё несколько ночей, и я составлю надёжную картину за год. + + + В среднем вы спали %1$s за %2$d записанную ночь на этой неделе. Это полезный ориентир, но из-за пропусков (%3$s) картина пока неполная. + В среднем вы спали %1$s за %2$d записанные ночи на этой неделе. Это полезный ориентир, но из-за пропусков (%3$s) картина пока неполная. + В среднем вы спали %1$s за %2$d записанных ночей на этой неделе. Это полезный ориентир, но из-за пропусков (%3$s) картина пока неполная. + В среднем вы спали %1$s за %2$d записанной ночи на этой неделе. Это полезный ориентир, но из-за пропусков (%3$s) картина пока неполная. + + + не хватает %1$d ночи + не хватает %1$d ночей + не хватает %1$d ночей + не хватает %1$d ночи + + В среднем вы спали %1$s за всю неделю. Все ночи записаны, так что это надёжная картина вашего сна на сегодня. + Ваша неделя + Среднее за месяц — %1$s, но данных мало (%2$s), поэтому к этой цифре стоит относиться осторожно. Чем больше ночей будет записано, тем точнее динамика. + Среднее за месяц — %1$s (%2$s). Главное — регулярность: несколько коротких ночей влияют на это число сильнее, чем одна отличная. + Ваш сон за месяц + Долгосрочная динамика сна + + За год ваш средний сон — %1$s за %2$d ночь. Долгосрочная картина ещё складывается: когда наберётся больше месяцев, я смогу сравнить сезонные изменения и регулярность. + За год ваш средний сон — %1$s за %2$d ночи. Долгосрочная картина ещё складывается: когда наберётся больше месяцев, я смогу сравнить сезонные изменения и регулярность. + За год ваш средний сон — %1$s за %2$d ночей. Долгосрочная картина ещё складывается: когда наберётся больше месяцев, я смогу сравнить сезонные изменения и регулярность. + За год ваш средний сон — %1$s за %2$d ночи. Долгосрочная картина ещё складывается: когда наберётся больше месяцев, я смогу сравнить сезонные изменения и регулярность. + + Записано %1$d из %2$d + В пределах цели + Ниже цели + Выше цели + Стабильно + Нестабильные ночи + Прошлой ночью сон не записан + Наденьте кольцо на ночь, чтобы PulseLoop записал следующую ночь. + Мало данных за неделю + Поносите кольцо несколько ночей, чтобы увидеть картину за неделю. + Мало данных за месяц + Запишите больше ночей в этом месяце, чтобы увидеть среднее значение. + Мало данных за год + Долгосрочный анализ появится по мере записи новых ночей. + Ошибка коуча · %1$s\n%2$s + Нет API-ключа + Для выбранного провайдера не задан API-ключ. Добавьте его в «Настройки → ИИ-коуч». + Сеть + Ошибка ответа + Пустой ответ + Модель вернула пустой ответ. Попробуйте снова или выберите другую модель. + Что-то пошло не так. + Не удалось найти %1$s: устройство сейчас не может определить адрес. Проверьте подключение и не блокирует ли его VPN или настройка «Частный DNS». (%2$s) + провайдера + Провайдер слишком долго не отвечает. Проверьте подключение и попробуйте снова — так бывает при VPN или слабом сигнале. (%1$s) + Не удалось установить защищённое соединение с провайдером. Обычно причина — VPN, прокси или сеть, которая перехватывает трафик. (%1$s) + Не удалось подключиться к провайдеру. (%1$s) + Сетевой запрос не выполнен. + Провайдер вернул HTTP %1$d без подробностей. + С этим возникла проблема + Я проверил ваши данные, но не смог подготовить ответ. Спросите ещё раз или уточните вопрос. + Изменения не вносились. + Каких данных не хватает? + Шагов сегодня: %1$d + + Среднее за 7 дней: %1$d шаг в день + Среднее за 7 дней: %1$d шага в день + Среднее за 7 дней: %1$d шагов в день + Среднее за 7 дней: %1$d шага в день + + Активность ещё не синхронизирована + У меня пока нет сегодняшней активности с кольца. Синхронизируйте кольцо или сделайте замер — и я подведу итог. (ИИ-коуч выключен — добавьте ключ OpenAI в настройках, чтобы включить полноценные советы.) + Кольцо подключено? + Ваши итоги на сегодня + + Сегодня у вас уже %1$d шаг. ИИ-коуч выключен — добавьте ключ OpenAI в настройках, чтобы получать анализ динамики и персональные советы. + Сегодня у вас уже %1$d шага. ИИ-коуч выключен — добавьте ключ OpenAI в настройках, чтобы получать анализ динамики и персональные советы. + Сегодня у вас уже %1$d шагов. ИИ-коуч выключен — добавьте ключ OpenAI в настройках, чтобы получать анализ динамики и персональные советы. + Сегодня у вас уже %1$d шага. ИИ-коуч выключен — добавьте ключ OpenAI в настройках, чтобы получать анализ динамики и персональные советы. + + Как сегодня по сравнению со вчера? + Какая у меня динамика пульса? + Ошибка обработки + Не удалось оформить ответ. Попробуйте ещё раз. + Подведи итоги дня + Что нового? + пауза + запись + Тренировка завершена: %1$s + Тренировка + Отслеживание тренировки в реальном времени + Не удалось связаться с Health Connect. Попробуйте снова. + Данные PulseLoop удалены, но некоторые типы (%1$d) удалить не удалось — попробуйте снова. + Нечего удалять: у PulseLoop больше нет разрешений на запись, поэтому он не может удалить свои данные. Удалите их в приложении Health Connect или выдайте разрешения снова и повторите. + Данные PulseLoop удалены из Health Connect. + Не удалось удалить данные PulseLoop. Попробуйте снова. + Сброс кольца… + Bluetooth не включён + Кольцо больше недоступно — выполните поиск снова. + Кольцо не найдено при поиске. Возможно, его удерживает зависшее Bluetooth-подключение — выключите и снова включите Bluetooth. + Ошибка поиска: %1$d + Доброе утро! Синхронизируйте кольцо и посмотрите показатели, чтобы начать день. + Доброе утро%1$s + Вы проспали %1$d ч %2$d мин. Пусть день будет продуктивным — двигайтесь, когда получится. + Готовы начать день? Сделайте замер, и я помогу его спланировать. + + Цель в %1$d шаг выполнена — отлично! + Цель в %1$d шага выполнена — отлично! + Цель в %1$d шагов выполнена — отлично! + Цель в %1$d шага выполнена — отлично! + + + До цели остался %1$d шаг. + До цели осталось %1$d шага. + До цели осталось %1$d шагов. + До цели осталось %1$d шага. + + Вечерняя сводка + + Сегодня %1$d шаг. %2$s Пора потихоньку готовиться ко сну. + Сегодня %1$d шага. %2$s Пора потихоньку готовиться ко сну. + Сегодня %1$d шагов. %2$s Пора потихоньку готовиться ко сну. + Сегодня %1$d шага. %2$s Пора потихоньку готовиться ко сну. + + Как прошёл день? Синхронизируйте кольцо, и я подведу итоги. + Введите адрес сервера, например http://192.168.1.50:11434 + Это не похоже на URL — используйте host:port или http://host:port + Поддерживаются только http:// и https://. + Обычный http:// разрешён только для сервера на этом устройстве или в локальной сети (IP-адрес, простое имя хоста или имя .local / .lan / .ts.net). Для доступа через интернет используйте https://. + Strava не подключена. + Достигнут лимит запросов Strava. Попробуйте позже. + Уже есть в Strava. + Не удалось загрузить в Strava (HTTP %1$d): %2$s + Неожиданный ответ от Strava. + Превышено время ожидания обработки загрузки в Strava. + Strava не смогла обработать загрузку: %1$s + Strava отклонила активность (HTTP %1$d): %2$s + экспортировано: %1$s + пропущено: %1$s + нового для экспорта нет + Кольцо + Итоги дня + Итоги сна + Динамика сна + Этой тренировки больше нет. + Удалена тренировка: %1$s. + Обновлена тренировка: %1$s. + Этого приёма пищи больше нет. + Удалено: «%1$s». + Обновлено: «%1$s». + Некорректный ответ + + Модель не вернула корректный структурированный ответ за %1$d попытку. + Модель не вернула корректный структурированный ответ за %1$d попытки. + Модель не вернула корректный структурированный ответ за %1$d попыток. + Модель не вернула корректный структурированный ответ за %1$d попытки. + + Ответ: «%1$s…» + Анализирую динамику + Проверяю подключение кольца + Ищу в базе продуктов + Смотрю, какие есть данные + Проверяю ваши цели + Проверяю профиль и состояние кольца + Сравниваю два периода + Считаю корреляцию + Ищу выбросы + Загружаю данные кольца за период + Загружаю данные для графика + Записываю активность + Записываю приём пищи + Записываю тренировку + Смотрю ваш сон + Ищу ваши тренировки + Записываю + Готовлю график + Читаю данные кольца за этот день + Читаю дневник питания + Удаляю приём пищи + Удаляю тренировку + Анализирую ваш сон + Запоминаю на будущее + Ищу что-нибудь необычное + Устанавливаю цель + Считаю статистику + Подвожу итоги тренировки + Делаю замер + Обновляю приём пищи + Обновляю тренировку + Health Connect сейчас недоступен. Попробуйте ещё раз. + Сегодня + + Сегодня пока %1$d шаг. Кольцо записывает — синхронизируйте, чтобы увидеть свежие данные. + Сегодня пока %1$d шага. Кольцо записывает — синхронизируйте, чтобы увидеть свежие данные. + Сегодня пока %1$d шагов. Кольцо записывает — синхронизируйте, чтобы увидеть свежие данные. + Сегодня пока %1$d шага. Кольцо записывает — синхронизируйте, чтобы увидеть свежие данные. + + Данных об активности за сегодня пока нет. Наденьте кольцо и синхронизируйте его, чтобы получить сводку за день. + Источник шагов + Откуда брать + Телефон + Кольцо + Чтобы брать шаги с телефона, обновите Health Connect. + На этом устройстве нет Health Connect. + Изменить тренировку «%1$s» от %2$s? + Удалить тренировку «%1$s» от %2$s? Это действие нельзя отменить. + Изменить «%1$s» от %2$s? + Удалить «%1$s» (%2$d ккал) от %3$s? + Вход в Strava отклонён. + Strava отказала в авторизации: %1$s + Не удалось проверить авторизацию Strava. Попробуйте подключиться ещё раз. + Strava не дала разрешения на загрузку. Подключитесь заново и оставьте отмеченным пункт «Upload your activities». + Strava вернула неожиданный ответ при авторизации. + Не удалось войти в Strava: %1$s + неизвестная ошибка + пульс,ЧСС,сердц + уд/мин + кислород,сатурац + сон,сна,сну,сном + шаг + %1$s и %2$s + Нет данных за этот период. + diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml new file mode 100644 index 00000000..96eacbc6 --- /dev/null +++ b/app/src/main/res/xml/locales_config.xml @@ -0,0 +1,6 @@ + + + + + +