Skip to content

fix(ios): add missing monospacedDigit to relative timer text #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ludwig-pro wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ios): add missing monospacedDigit to relative timer text #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions ios/ui/Views/VoltraTimer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public struct VoltraTimer: VoltraView {
// Stopwatch support: if counting up (not down) and we have a start time
// but no end time or duration, treat it as an open-ended stopwatch.
if !countsDown(params: params),
let startAtMs = params.startAtMs,
params.endAtMs == nil,
params.durationMs == nil
let startAtMs = params.startAtMs,
params.endAtMs == nil,
params.durationMs == nil
{
let start = Date(timeIntervalSince1970: startAtMs / 1000)
return start ... Date.distantFuture
return start...Date.distantFuture
}

return VoltraProgressDriver.resolveRange(
Expand All @@ -28,7 +28,9 @@ public struct VoltraTimer: VoltraView {
)
}

private func resolvedEndDate(params: TimerParameters) -> Date? { progressRange(params: params)?.upperBound }
private func resolvedEndDate(params: TimerParameters) -> Date? {
progressRange(params: params)?.upperBound
}

private func countsDown(params: TimerParameters) -> Bool {
(params.direction.lowercased()) != "up"
Expand All @@ -45,7 +47,8 @@ public struct VoltraTimer: VoltraView {

private func textTemplates(params: TimerParameters) -> TextTemplates? {
guard let raw = params.textTemplates,
let data = raw.data(using: .utf8) else { return nil }
let data = raw.data(using: .utf8)
else { return nil }
return try? JSONDecoder().decode(TextTemplates.self, from: data)
}

Expand Down Expand Up @@ -87,7 +90,7 @@ public struct VoltraTimer: VoltraView {

if style == "relative" {
let targetDate = isCountDown ? range.upperBound : range.lowerBound
Text(targetDate, style: .relative)
Text(targetDate, style: .relative).monospacedDigit()
} else {
// Live Activities require Text(timerInterval:...) for automatic updates
Text(timerInterval: range, countsDown: isCountDown, showsHours: showHours)
Expand All @@ -98,15 +101,17 @@ public struct VoltraTimer: VoltraView {
@ViewBuilder
private func staticZeroText(style: String, showHours: Bool) -> some View {
if style == "relative" {
Text("0s")
Text("0s").monospacedDigit()
} else {
Text(showHours ? "0:00:00" : "0:00")
.monospacedDigit()
}
}

@ViewBuilder
private func renderTemplate<T: View>(template: String, @ViewBuilder timeView: @escaping () -> T) -> some View {
private func renderTemplate<T: View>(template: String, @ViewBuilder timeView: @escaping () -> T)
-> some View
{
let placeholder = "{time}"
let segments = template.components(separatedBy: placeholder)

Expand Down