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

Add tips

Browse Source
release
Laurent 3 years ago
parent c5bd812620
commit d85761a82f
7 changed files with 115 additions and 5 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. 14
      LeCountdown.xcodeproj/project.pbxproj
  2. 2
      LeCountdown/LeCountdownApp.swift
  3. 9
      LeCountdown/Utils/Preferences.swift
  4. 29
      LeCountdown/Utils/Tip.swift
  5. 13
      LeCountdown/Views/ContentView.swift
  6. 6
      LeCountdown/Views/PresetsView.swift
  7. 47
      LeCountdown/Views/Reusable/TipView.swift

14
LeCountdown.xcodeproj/project.pbxproj
Unescape View File

@ -80,6 +80,10 @@
C473C31A29A926F50056B38A /* LaunchWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = C473C31C29A926F50056B38A /* LaunchWidget.intentdefinition */; }; C473C31A29A926F50056B38A /* LaunchWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = C473C31C29A926F50056B38A /* LaunchWidget.intentdefinition */; };
C473C32C29AA330E0056B38A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C473C32A29AA330E0056B38A /* Localizable.strings */; }; C473C32C29AA330E0056B38A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C473C32A29AA330E0056B38A /* Localizable.strings */; };
C473C33029ACADC80056B38A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C473C32A29AA330E0056B38A /* Localizable.strings */; }; C473C33029ACADC80056B38A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C473C32A29AA330E0056B38A /* Localizable.strings */; };
C473C33929ACDBD70056B38A /* TipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C473C33829ACDBD70056B38A /* TipView.swift */; };
C473C33A29ACDBD70056B38A /* TipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C473C33829ACDBD70056B38A /* TipView.swift */; };
C473C33C29ACEC4F0056B38A /* Tip.swift in Sources */ = {isa = PBXBuildFile; fileRef = C473C33B29ACEC4F0056B38A /* Tip.swift */; };
C473C33D29ACEC4F0056B38A /* Tip.swift in Sources */ = {isa = PBXBuildFile; fileRef = C473C33B29ACEC4F0056B38A /* Tip.swift */; };
C4742B5729840F6400D5D950 /* CoolPic.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B5629840F6400D5D950 /* CoolPic.swift */; }; C4742B5729840F6400D5D950 /* CoolPic.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B5629840F6400D5D950 /* CoolPic.swift */; };
C4742B59298411E800D5D950 /* CountdownFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B58298411E800D5D950 /* CountdownFormView.swift */; }; C4742B59298411E800D5D950 /* CountdownFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B58298411E800D5D950 /* CountdownFormView.swift */; };
C4742B5B298414B000D5D950 /* ImageSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B5A298414B000D5D950 /* ImageSelectionView.swift */; }; C4742B5B298414B000D5D950 /* ImageSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B5A298414B000D5D950 /* ImageSelectionView.swift */; };
@ -304,6 +308,8 @@
C473C32829AA30890056B38A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SiriIntents.strings; sourceTree = "<group>"; }; C473C32829AA30890056B38A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SiriIntents.strings; sourceTree = "<group>"; };
C473C32929AA30890056B38A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/LaunchWidget.strings; sourceTree = "<group>"; }; C473C32929AA30890056B38A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/LaunchWidget.strings; sourceTree = "<group>"; };
C473C32B29AA330E0056B38A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; }; C473C32B29AA330E0056B38A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
C473C33829ACDBD70056B38A /* TipView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipView.swift; sourceTree = "<group>"; };
C473C33B29ACEC4F0056B38A /* Tip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tip.swift; sourceTree = "<group>"; };
C4742B5629840F6400D5D950 /* CoolPic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoolPic.swift; sourceTree = "<group>"; }; C4742B5629840F6400D5D950 /* CoolPic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoolPic.swift; sourceTree = "<group>"; };
C4742B58298411E800D5D950 /* CountdownFormView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountdownFormView.swift; sourceTree = "<group>"; }; C4742B58298411E800D5D950 /* CountdownFormView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountdownFormView.swift; sourceTree = "<group>"; };
C4742B5A298414B000D5D950 /* ImageSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageSelectionView.swift; sourceTree = "<group>"; }; C4742B5A298414B000D5D950 /* ImageSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageSelectionView.swift; sourceTree = "<group>"; };
@ -575,9 +581,10 @@
C4BA2B5A299FFAB000CB4FBA /* Logger.swift */, C4BA2B5A299FFAB000CB4FBA /* Logger.swift */,
C4BA2B2C299E2DEE00CB4FBA /* Preferences.swift */, C4BA2B2C299E2DEE00CB4FBA /* Preferences.swift */,
C438C81029829EAF00BF3EF9 /* PropertyWrappers.swift */, C438C81029829EAF00BF3EF9 /* PropertyWrappers.swift */,
C4BA2B7229A60CF000CB4FBA /* Shortcut.swift */,
C40FDB612992985C0042A390 /* TextToSpeechRecorder.swift */, C40FDB612992985C0042A390 /* TextToSpeechRecorder.swift */,
C4060DF4297AE9A7003FAB80 /* TimeInterval+Extensions.swift */, C4060DF4297AE9A7003FAB80 /* TimeInterval+Extensions.swift */,
C4BA2B7229A60CF000CB4FBA /* Shortcut.swift */, C473C33B29ACEC4F0056B38A /* Tip.swift */,
C4BA2B7829A65C1400CB4FBA /* UIDevice+Extensions.swift */, C4BA2B7829A65C1400CB4FBA /* UIDevice+Extensions.swift */,
); );
path = Utils; path = Utils;
@ -734,6 +741,7 @@
C4BA2ADA299549BC00CB4FBA /* TimerModel.swift */, C4BA2ADA299549BC00CB4FBA /* TimerModel.swift */,
C4BA2B2E299E69A000CB4FBA /* View+Extension.swift */, C4BA2B2E299E69A000CB4FBA /* View+Extension.swift */,
C4742B5E2984205000D5D950 /* ViewModifiers.swift */, C4742B5E2984205000D5D950 /* ViewModifiers.swift */,
C473C33829ACDBD70056B38A /* TipView.swift */,
); );
path = Reusable; path = Reusable;
sourceTree = "<group>"; sourceTree = "<group>";
@ -988,9 +996,11 @@
C4BA2AF12996A11900CB4FBA /* CustomSound+CoreDataClass.swift in Sources */, C4BA2AF12996A11900CB4FBA /* CustomSound+CoreDataClass.swift in Sources */,
C4060DC2297AE73B003FAB80 /* ContentView.swift in Sources */, C4060DC2297AE73B003FAB80 /* ContentView.swift in Sources */,
C438C7C12980228B00BF3EF9 /* CountdownScheduler.swift in Sources */, C438C7C12980228B00BF3EF9 /* CountdownScheduler.swift in Sources */,
C473C33C29ACEC4F0056B38A /* Tip.swift in Sources */,
C498E5A3298D720600E90DE0 /* TestView.swift in Sources */, C498E5A3298D720600E90DE0 /* TestView.swift in Sources */,
C4BA2B06299A8F8D00CB4FBA /* PresetsView.swift in Sources */, C4BA2B06299A8F8D00CB4FBA /* PresetsView.swift in Sources */,
C473C31329A925D50056B38A /* SiriIntents.intentdefinition in Sources */, C473C31329A925D50056B38A /* SiriIntents.intentdefinition in Sources */,
C473C33929ACDBD70056B38A /* TipView.swift in Sources */,
C445FA8F2987B83B0054D761 /* SoundPlayer.swift in Sources */, C445FA8F2987B83B0054D761 /* SoundPlayer.swift in Sources */,
C4F8B1A7298AC2FC005C86A5 /* AbstractSoundTimer+CoreDataClass.swift in Sources */, C4F8B1A7298AC2FC005C86A5 /* AbstractSoundTimer+CoreDataClass.swift in Sources */,
C438C7C929803CA000BF3EF9 /* AppDelegate.swift in Sources */, C438C7C929803CA000BF3EF9 /* AppDelegate.swift in Sources */,
@ -1111,6 +1121,7 @@
C473C2F729A8DB6F0056B38A /* Preferences.swift in Sources */, C473C2F729A8DB6F0056B38A /* Preferences.swift in Sources */,
C4BA2B38299F82FF00CB4FBA /* Fakes.swift in Sources */, C4BA2B38299F82FF00CB4FBA /* Fakes.swift in Sources */,
C438C7F529812BB200BF3EF9 /* IntentHandler.swift in Sources */, C438C7F529812BB200BF3EF9 /* IntentHandler.swift in Sources */,
C473C33D29ACEC4F0056B38A /* Tip.swift in Sources */,
C4F8B19C298AC288005C86A5 /* AbstractTimer+CoreDataProperties.swift in Sources */, C4F8B19C298AC288005C86A5 /* AbstractTimer+CoreDataProperties.swift in Sources */,
C4BA2B1C299BE6A100CB4FBA /* IntervalGroup+CoreDataClass.swift in Sources */, C4BA2B1C299BE6A100CB4FBA /* IntervalGroup+CoreDataClass.swift in Sources */,
C4BA2B1F299BE6A100CB4FBA /* Countdown+CoreDataProperties.swift in Sources */, C4BA2B1F299BE6A100CB4FBA /* Countdown+CoreDataProperties.swift in Sources */,
@ -1144,6 +1155,7 @@
C473C2F529A8DAF30056B38A /* PropertyWrappers.swift in Sources */, C473C2F529A8DAF30056B38A /* PropertyWrappers.swift in Sources */,
C473C2F029A8CFFC0056B38A /* TimerRouter.swift in Sources */, C473C2F029A8CFFC0056B38A /* TimerRouter.swift in Sources */,
C438C800298130E900BF3EF9 /* IntentDataProvider.swift in Sources */, C438C800298130E900BF3EF9 /* IntentDataProvider.swift in Sources */,
C473C33A29ACDBD70056B38A /* TipView.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

2
LeCountdown/LeCountdownApp.swift
Unescape View File

@ -74,7 +74,7 @@ struct LeCountdownApp: App {
fileprivate func _onAppear() { fileprivate func _onAppear() {
Logger.log("Locale = \(Locale.preferredLanguages.first)") // Logger.log("Locale = \(Locale.preferredLanguages.first)")
Sound.computeSoundDurationsIfNecessary() Sound.computeSoundDurationsIfNecessary()

9
LeCountdown/Utils/Preferences.swift
Unescape View File

@ -13,6 +13,7 @@ enum PreferenceKey: String {
case showSilentModeAlert case showSilentModeAlert
case soundDurations case soundDurations
case lastSoundPlayed case lastSoundPlayed
case tips
} }
class Preferences { class Preferences {
@ -20,6 +21,7 @@ class Preferences {
@UserDefault(PreferenceKey.countdowns.rawValue, defaultValue: [:]) static var savedCountdowns: [String : DateInterval] @UserDefault(PreferenceKey.countdowns.rawValue, defaultValue: [:]) static var savedCountdowns: [String : DateInterval]
@UserDefault(PreferenceKey.soundDurations.rawValue, defaultValue: [:]) static var soundDurations: [Int : TimeInterval] @UserDefault(PreferenceKey.soundDurations.rawValue, defaultValue: [:]) static var soundDurations: [Int : TimeInterval]
@UserDefault(PreferenceKey.lastSoundPlayed.rawValue, defaultValue: [:]) static var lastSelectedSound: [String : Int] @UserDefault(PreferenceKey.lastSoundPlayed.rawValue, defaultValue: [:]) static var lastSelectedSound: [String : Int]
@UserDefault(PreferenceKey.tips.rawValue, defaultValue: nil) static var lastShownTip: Int?
static var hideSilentModeAlerts: Bool { static var hideSilentModeAlerts: Bool {
return UserDefaults.standard.bool(forKey: PreferenceKey.showSilentModeAlert.rawValue) return UserDefaults.standard.bool(forKey: PreferenceKey.showSilentModeAlert.rawValue)
@ -29,4 +31,11 @@ class Preferences {
UserDefaults.standard.setValue(true, forKey: PreferenceKey.showSilentModeAlert.rawValue) UserDefaults.standard.setValue(true, forKey: PreferenceKey.showSilentModeAlert.rawValue)
} }
static var tipToShow: Tip? {
if let tipRawValue = self.lastShownTip, let tip = Tip(rawValue: tipRawValue) {
return Tip(rawValue: tip.rawValue + 1)
}
return Tip.allCases.first
}
} }

29
LeCountdown/Utils/Tip.swift
Unescape View File

@ -0,0 +1,29 @@
//
// TipsManager.swift
// LeCountdown
//
// Created by Laurent Morvillier on 27/02/2023.
//
import Foundation
enum Tip: Int, CaseIterable, Identifiable {
case siri
case widget
var id: Int { self.rawValue }
var localizedString: String {
switch self {
case .widget: return NSLocalizedString("You can add widget for your timers and countdowns by modifying your home or lock screen", comment: "")
case .siri: return NSLocalizedString("You can ask Siri to create and launch countdowns and stopwatches", comment: "")
}
}
var pictoName: String {
switch self {
case .siri: return "wave.3.right" //"dot.radiowaves.right"
case .widget: return "app.badge"
}
}
}

13
LeCountdown/Views/ContentView.swift
Unescape View File

@ -55,6 +55,8 @@ struct ContentView<T : AbstractTimer>: View {
@State private var isEditing: Bool = false @State private var isEditing: Bool = false
@State private var tipsShown: Bool = false
fileprivate let itemSpacing: CGFloat = 10.0 fileprivate let itemSpacing: CGFloat = 10.0
var body: some View { var body: some View {
@ -86,6 +88,12 @@ struct ContentView<T : AbstractTimer>: View {
} }
}.padding(.horizontal, itemSpacing) }.padding(.horizontal, itemSpacing)
if !self.tipsShown, let tip = Preferences.tipToShow {
TipView(tip: tip) {
self._hideTip(tip)
}.padding()
}
if !conductor.liveTimers.isEmpty { if !conductor.liveTimers.isEmpty {
LiveTimerListView() LiveTimerListView()
.environment(\.managedObjectContext, viewContext) .environment(\.managedObjectContext, viewContext)
@ -155,6 +163,11 @@ struct ContentView<T : AbstractTimer>: View {
// MARK: - Business // MARK: - Business
fileprivate func _hideTip(_ tip: Tip) {
Preferences.lastShownTip = tip.rawValue
self.tipsShown = true
}
fileprivate func _reorder(from: IndexSet, to: Int) { fileprivate func _reorder(from: IndexSet, to: Int) {
var timers: [AbstractTimer] = Array(self.timers) var timers: [AbstractTimer] = Array(self.timers)
timers.move(fromOffsets: from, toOffset: to) timers.move(fromOffsets: from, toOffset: to)

6
LeCountdown/Views/PresetsView.swift
Unescape View File

@ -191,9 +191,9 @@ struct PresetsView: View {
Spacer() Spacer()
}.frame(height: 40.0) }.frame(height: 40.0)
SeparatorView() // SeparatorView()
Text("You can ask Siri to create and launch countdowns and stopwatches") // Text("You can ask Siri to create and launch countdowns and stopwatches")
.font(.callout) // .font(.callout)
SeparatorView() SeparatorView()
Text("Presets") Text("Presets")

47
LeCountdown/Views/Reusable/TipView.swift
Unescape View File

@ -0,0 +1,47 @@
//
// TipView.swift
// LeCountdown
//
// Created by Laurent Morvillier on 27/02/2023.
//
import SwiftUI
struct TipView: View {
var tip: Tip
var handler: () -> ()
var body: some View {
HStack {
Image(systemName: tip.pictoName)
Text(tip.localizedString).padding(.trailing)
Spacer()
Button {
self.handler()
} label: {
Image(systemName: "xmark.circle.fill")
.padding(8.0)
}.foregroundColor(.white)
}
.padding(12.0)
.foregroundColor(.white)
.background(.cyan)
.cornerRadius(16.0)
}
}
struct TipView_Previews: PreviewProvider {
static var previews: some View {
VStack {
ForEach(Tip.allCases) { tip in
TipView(tip: tip, handler: {})
}
}
}
}
Write Preview
Loading…
Cancel
Save