bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Timer UI

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-12-09 17:15:33 +05:30
commit 547ed4d323
No known key found for this signature in database
GPG key ID: D04F1C2B9194DDFC
2 changed files with 57 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
DynamicIsland/Localizable.xcstrings
View file

@ -18106,7 +18106,6 @@
} }
}, },
"Start" : { "Start" : {
"extractionState" : "stale",
"localizations" : { "localizations" : {
"fr" : { "fr" : {
"stringUnit" : { "stringUnit" : {
@ -18173,10 +18172,6 @@
} }
} }
}, },
"Start Timer" : {
"comment" : "A button label that starts a custom timer.",
"isCommentAutoGenerated" : true
},
"Starts a 5-minute demo timer to test the timer live activity feature. Only works when timer feature is enabled." : { "Starts a 5-minute demo timer to test the timer live activity feature. Only works when timer feature is enabled." : {
}, },

67
DynamicIsland/components/Notch/NotchTimerView.swift
View file

@ -249,20 +249,49 @@ struct NotchTimerView: View {
} }
private var customTimerComposer: some View { private var customTimerComposer: some View {
VStack(alignment: .leading, spacing: 10) { VStack(alignment: .leading, spacing: 12) {
DurationInputRow(hours: $customHours, minutes: $customMinutes, seconds: $customSeconds) DurationInputRow(hours: $customHours, minutes: $customMinutes, seconds: $customSeconds)
Button { HStack(spacing: 10) {
withAnimation(.smooth) { Button {
timerManager.startTimer(duration: customDurationInSeconds, name: "Custom Timer") withAnimation(.smooth) {
coordinator.currentView = .timer timerManager.startTimer(duration: customDurationInSeconds, name: "Custom Timer")
coordinator.currentView = .timer
}
} label: {
Label("Start", systemImage: "play.fill")
.font(.system(size: 15, weight: .semibold))
.frame(maxWidth: .infinity)
.padding(.vertical, 10)
.foregroundStyle(Color.white)
} }
} label: { .buttonStyle(.plain)
Label("Start Timer", systemImage: "play.fill") .background(startButtonColor.opacity(isStartDisabled ? 0.5 : 1))
.frame(maxWidth: .infinity) .clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
.overlay(
RoundedRectangle(cornerRadius: 12, style: .continuous)
.stroke(Color.white.opacity(0.15), lineWidth: 1)
)
.opacity(isStartDisabled ? 0.7 : 1)
.disabled(isStartDisabled)
Button {
resetCustomTimerInputs()
} label: {
Label("Reset", systemImage: "arrow.counterclockwise")
.font(.system(size: 15, weight: .semibold))
.frame(maxWidth: .infinity)
.padding(.vertical, 10)
.foregroundStyle(.white.opacity(0.9))
}
.buttonStyle(.plain)
.background(Color.white.opacity(0.16))
.clipShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
.overlay(
RoundedRectangle(cornerRadius: 12, style: .continuous)
.stroke(Color.white.opacity(0.08), lineWidth: 1)
)
} }
.buttonStyle(.borderedProminent)
.disabled(customDurationInSeconds == 0)
} }
.padding(12) .padding(12)
.background(Color.white.opacity(0.04)) .background(Color.white.opacity(0.04))
@ -387,10 +416,27 @@ struct NotchTimerView: View {
timerManager.isPaused ? "Resume" : "Pause" timerManager.isPaused ? "Resume" : "Pause"
} }
private var startButtonColor: Color {
Color(red: 0.142, green: 0.633, blue: 0.265)
}
private var isStartDisabled: Bool {
customDurationInSeconds == 0
}
private var customDurationInSeconds: TimeInterval { private var customDurationInSeconds: TimeInterval {
TimeInterval(customHours * 3600 + customMinutes * 60 + customSeconds) TimeInterval(customHours * 3600 + customMinutes * 60 + customSeconds)
} }
private func resetCustomTimerInputs() {
withAnimation(.smooth(duration: 0.2)) {
customHours = 0
customMinutes = 0
customSeconds = 0
}
customTimerDuration = 0
}
private func syncCustomDuration(with value: Double) { private func syncCustomDuration(with value: Double) {
isSyncingCustomDuration = true isSyncingCustomDuration = true
let components = TimerPreset.components(for: value) let components = TimerPreset.components(for: value)
@ -421,6 +467,7 @@ private struct TimerControlButton: View {
.frame(width: 46, height: 46) .frame(width: 46, height: 46)
.background(background) .background(background)
.clipShape(Circle()) .clipShape(Circle())
.contentTransition(.symbolEffect(.replace))
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.help(accessibilityLabel) .help(accessibilityLabel)