staxriver
/
LeCountdown
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes rename confirmation popup

Browse Source
main
Laurent 2 years ago
parent 7d39da6ee9
commit 445e77a6e5
2 changed files with 35 additions and 86 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 72
      LeCountdown/Views/Countdown/NewCountdownView.swift
  2. 49
      LeCountdown/Views/Stopwatch/NewStopwatchView.swift

72
LeCountdown/Views/Countdown/NewCountdownView.swift
Unescape View File

@ -20,8 +20,6 @@ struct NewCountdownView : View {
init(isPresented: Binding<Bool>) { init(isPresented: Binding<Bool>) {
_isPresented = isPresented _isPresented = isPresented
self.userActivity = Shortcut.newCountdown.userActivity self.userActivity = Shortcut.newCountdown.userActivity
// let shortcut = INShortcut(userActivity: self.userActivity)
} }
var body: some View { var body: some View {
@ -94,7 +92,6 @@ struct CountdownEditView : View {
} }
} }
CountdownFormView( CountdownFormView(
focusedField: _focusedField, focusedField: _focusedField,
nameBinding: $nameString, nameBinding: $nameString,
@ -103,7 +100,6 @@ struct CountdownEditView : View {
repeatCountBinding: $soundRepeatCount) repeatCountBinding: $soundRepeatCount)
.environmentObject(self.model) .environmentObject(self.model)
// }
.toolbar { .toolbar {
ToolbarItemGroup(placement: .keyboard) { ToolbarItemGroup(placement: .keyboard) {
Button { Button {
@ -197,21 +193,6 @@ struct CountdownEditView : View {
fileprivate func _loadCountdown(_ countdown: Countdown) { fileprivate func _loadCountdown(_ countdown: Countdown) {
self.duration = countdown.duration self.duration = countdown.duration
// let hours = Int(countdown.duration / 3600.0)
// let minutes = Int(countdown.duration - Double(hours * 3600)) / 60
// let seconds = countdown.duration - Double(hours * 3600) - Double(minutes * 60)
//
// if hours > 0 {
// self.hoursString = self._numberFormatter.string(from: NSNumber(value: hours)) ?? ""
// }
// if minutes > 0 {
// self.minutesString = self._numberFormatter.string(from: NSNumber(value: minutes)) ?? ""
// }
// if seconds > 0 {
// self.secondsString = self._numberFormatter.string(from: NSNumber(value: seconds)) ?? ""
// }
if let name = countdown.activity?.name, !name.isEmpty { if let name = countdown.activity?.name, !name.isEmpty {
self.nameString = name self.nameString = name
} }
@ -226,20 +207,6 @@ struct CountdownEditView : View {
self.image = coolpic self.image = coolpic
} }
} }
// fileprivate let _numberFormatter = NumberFormatter()
//
// fileprivate var _seconds: Double {
// return self._numberFormatter.number(from: self.secondsString)?.doubleValue ?? 0.0
// }
//
// fileprivate var _minutes: Double {
// return self._numberFormatter.number(from: self.minutesString)?.doubleValue ?? 0.0
// }
//
// fileprivate var _hours: Double {
// return self._numberFormatter.number(from: self.hoursString)?.doubleValue ?? 0.0
// }
fileprivate func _cancel() { fileprivate func _cancel() {
self.viewContext.rollback() self.viewContext.rollback()
@ -255,7 +222,6 @@ struct CountdownEditView : View {
cd = Countdown(context: viewContext) cd = Countdown(context: viewContext)
} }
// cd.duration = self._hours * 3600.0 + self._minutes * 60.0 + self._seconds
cd.duration = self.duration cd.duration = self.duration
if self._isNewCountdown { if self._isNewCountdown {
@ -277,37 +243,34 @@ struct CountdownEditView : View {
cd.image = self.image.rawValue cd.image = self.image.rawValue
cd.playableIds = self.model.soundModel.playableIds cd.playableIds = self.model.soundModel.playableIds
cd.setConfirmationSounds(self.model.confirmationSoundModel.sounds) cd.setConfirmationSounds(self.model.confirmationSoundModel.sounds)
cd.repeatCount = self.soundRepeatCount cd.repeatCount = self.soundRepeatCount
if !self.nameString.isEmpty { if !self.nameString.isEmpty {
let trimmed = self.nameString.trimmingCharacters(in: .whitespacesAndNewlines) let trimmed = self.nameString.trimmingCharacters(in: .whitespacesAndNewlines)
cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed)
if let activity = cd.activity, let currentActivityName = activity.name, trimmed != currentActivityName { // if let activity = cd.activity, let currentActivityName = activity.name, trimmed != currentActivityName {
//
switch self._rename { // switch self._rename {
case .none: // case .none:
self.activityNameConfirmationShown = true // self.activityNameConfirmationShown = true
return // return
case .some(let rename): // case .some(let rename):
if rename { // if rename {
activity.name = trimmed // activity.name = trimmed
} else { // } else {
cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed) // cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed)
} // }
} // }
} else { // } else {
cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed) // cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed)
} // }
} }
self._saveContext() self._saveContext()
WidgetCenter.shared.reloadAllTimelines() // refreshes the visual of existing widgets WidgetCenter.shared.reloadAllTimelines() // refreshes the visual of existing widgets
self._popOrDismiss() self._popOrDismiss()
} }
@ -333,7 +296,6 @@ struct CountdownEditView : View {
WidgetCenter.shared.reloadAllTimelines() // refreshes the visual of existing widgets WidgetCenter.shared.reloadAllTimelines() // refreshes the visual of existing widgets
self._popOrDismiss() self._popOrDismiss()
} }
fileprivate func _saveContext() { fileprivate func _saveContext() {

49
LeCountdown/Views/Stopwatch/NewStopwatchView.swift
Unescape View File

@ -185,41 +185,28 @@ struct StopwatchEditView: View {
sw.playableIds = self.model.soundModel.playableIds sw.playableIds = self.model.soundModel.playableIds
sw.confirmationSoundList = self.model.confirmationSoundModel.playableIds sw.confirmationSoundList = self.model.confirmationSoundModel.playableIds
// sw.setConfirmationSounds(self.model.confirmationSoundModel.sounds)
// if self._isAdding {
// let max = self.countdowns.map { $0.order }.max() ?? 0
// cd.order = max + 1
// }
sw.image = self.image.rawValue sw.image = self.image.rawValue
// if self.playSound {
// sw.sound = Int16(self.sound.rawValue)
// } else {
//// sw.sound = nil
// }
if !self.nameString.isEmpty { if !self.nameString.isEmpty {
if let activity = sw.activity, let currentActivityName = activity.name, self.nameString != currentActivityName { sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString)
switch self._rename { // if let activity = sw.activity, let currentActivityName = activity.name, self.nameString != currentActivityName {
case .none: //
self.activityNameConfirmationShown = true // switch self._rename {
return // case .none:
case .some(let rename): // self.activityNameConfirmationShown = true
if rename { // return
activity.name = self.nameString // case .some(let rename):
} else { // if rename {
sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString) // activity.name = self.nameString
} // } else {
} // sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString)
} else { // }
sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString) // }
} // } else {
// sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString)
// }
} }

Write Preview
Loading…
Cancel
Save