Fixes small issues

release
Laurent 3 years ago
parent 939e80d66d
commit cca8ba643d
  1. 2
      LeCountdown/Conductor.swift
  2. 22
      LeCountdown/Model/Model+SharedExtensions.swift
  3. 7
      LeCountdown/Views/PresetsView.swift

@ -236,7 +236,7 @@ class Conductor: ObservableObject {
fileprivate func _createTimerIntent(_ timer: AbstractTimer) { fileprivate func _createTimerIntent(_ timer: AbstractTimer) {
let intent = LaunchTimerIntent() let intent = LaunchTimerIntent()
let invocationPhrase = NSLocalizedString("Launch %@", comment: "") let invocationPhrase = String(format: NSLocalizedString("Launch %@", comment: ""), timer.displayName)
intent.suggestedInvocationPhrase = String(format: invocationPhrase, timer.displayName) intent.suggestedInvocationPhrase = String(format: invocationPhrase, timer.displayName)
intent.timer = TimerIdentifier(identifier: timer.stringId, display: timer.displayName) intent.timer = TimerIdentifier(identifier: timer.stringId, display: timer.displayName)

@ -10,13 +10,17 @@ import Foundation
extension AbstractTimer { extension AbstractTimer {
var displayName: String { var displayName: String {
return self.name ?? self.coolpic.emoji return self.name ?? self.defaultName
} }
var name: String? { var name: String? {
return self.activity?.name return self.activity?.name
} }
@objc var defaultName: String {
return NSLocalizedString("timer", comment: "")
}
var url: URL { var url: URL {
if let url = URL(string: self.stringId) { if let url = URL(string: self.stringId) {
return url return url
@ -37,3 +41,19 @@ extension AbstractTimer {
} }
} }
extension Countdown {
override var defaultName: String {
return NSLocalizedString("Countdown", comment: "")
}
}
extension Stopwatch {
override var defaultName: String {
return NSLocalizedString("Stopwatch", comment: "")
}
}

@ -262,10 +262,11 @@ struct TimerItemView: View {
var body: some View { var body: some View {
HStack { HStack {
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text(name.uppercased()).multilineTextAlignment(.leading) Text(self.name.uppercased())
Text(duration) Text(self.duration)
Text(sound.uppercased()).foregroundColor(Color(white: 0.7)) Text(self.sound.uppercased()).foregroundColor(Color(white: 0.7))
}.padding() }.padding()
.multilineTextAlignment(.leading)
Spacer() Spacer()
}.background(Color(white: 0.1)) }.background(Color(white: 0.1))
.cornerRadius(16.0) .cornerRadius(16.0)

Loading…
Cancel
Save