Initial Commit
This commit is contained in:
@ -0,0 +1,11 @@
|
||||
{
|
||||
"colors" : [
|
||||
{
|
||||
"idiom" : "universal"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
@ -0,0 +1,14 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"filename" : "Frame 1(1).png",
|
||||
"idiom" : "universal",
|
||||
"platform" : "ios",
|
||||
"size" : "1024x1024"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 100 KiB |
6
Screaming Reminder/Assets.xcassets/Contents.json
Normal file
6
Screaming Reminder/Assets.xcassets/Contents.json
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
33
Screaming Reminder/Models/Extensions.swift
Normal file
33
Screaming Reminder/Models/Extensions.swift
Normal file
@ -0,0 +1,33 @@
|
||||
//
|
||||
// Extensions.swift
|
||||
// Screaming Reminder
|
||||
//
|
||||
// Created by Amine Bou on 23/07/2024.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
extension Date {
|
||||
func withSpecificHour(hour: Int) -> Date {
|
||||
var dateComponents = Calendar.current.dateComponents(in: TimeZone.current, from: self)
|
||||
dateComponents.hour = hour
|
||||
dateComponents.minute = 0
|
||||
return Calendar.current.date(from: dateComponents).unsafelyUnwrapped
|
||||
}
|
||||
|
||||
func atZeroMinutes() -> Date {
|
||||
var dateComponents = Calendar.current.dateComponents(in: TimeZone.current, from: self)
|
||||
dateComponents.minute = 0
|
||||
return Calendar.current.date(from: dateComponents).unsafelyUnwrapped
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension Set {
|
||||
mutating func insertAll(_ newMembers: [Set.Element]) {
|
||||
newMembers.forEach { (member) in
|
||||
self.insert(member)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
35
Screaming Reminder/Models/Notification.swift
Normal file
35
Screaming Reminder/Models/Notification.swift
Normal file
@ -0,0 +1,35 @@
|
||||
//
|
||||
// Item.swift
|
||||
// Screaming Reminder
|
||||
//
|
||||
// Created by Amine Bou on 11/07/2024.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import SwiftUI
|
||||
|
||||
final class Notification: CustomStringConvertible {
|
||||
var reminder: Reminder
|
||||
var triggers: [UNCalendarNotificationTrigger]
|
||||
|
||||
|
||||
init(reminder: Reminder) {
|
||||
self.reminder = reminder
|
||||
self.triggers = getTriggersForReminder(reminder: reminder)
|
||||
}
|
||||
|
||||
public var description: String { return "\(reminder) + \(triggers)" }
|
||||
|
||||
|
||||
}
|
||||
|
||||
func getTriggersForReminder(reminder: Reminder) -> [UNCalendarNotificationTrigger] {
|
||||
return reminder.when.map {
|
||||
let components = NSCalendar.current.dateComponents([.second, .minute, .hour], from: $0)
|
||||
return UNCalendarNotificationTrigger(dateMatching: components, repeats: true)
|
||||
}
|
||||
}
|
||||
|
||||
func getIdentifier(reminder: Reminder, trigger: UNCalendarNotificationTrigger) -> String {
|
||||
return "\(reminder.label)-\(trigger.dateComponents.hour ?? -1)-\(trigger.dateComponents.minute ?? -1)"
|
||||
}
|
33
Screaming Reminder/Models/Reminder.swift
Normal file
33
Screaming Reminder/Models/Reminder.swift
Normal file
@ -0,0 +1,33 @@
|
||||
//
|
||||
// Reminder.swift
|
||||
// Screaming Reminder
|
||||
//
|
||||
// Created by Amine Bou on 11/07/2024.
|
||||
//
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
|
||||
@Model
|
||||
final class Reminder: CustomStringConvertible {
|
||||
|
||||
var label: String
|
||||
var when: [Date]
|
||||
|
||||
|
||||
required init(label: String, when: [Date]) {
|
||||
self.label = label
|
||||
self.when = when
|
||||
|
||||
}
|
||||
|
||||
public var description: String {
|
||||
let dateFormatter: DateFormatter = {
|
||||
let formatter = DateFormatter()
|
||||
formatter.timeStyle = .short
|
||||
return formatter
|
||||
}()
|
||||
let smallestDate = self.when.sorted()[0]
|
||||
return "\(label) - Tous les jours, à partir de \(dateFormatter.string(from: smallestDate))"
|
||||
}
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
64
Screaming Reminder/Screaming_ReminderApp.swift
Normal file
64
Screaming Reminder/Screaming_ReminderApp.swift
Normal file
@ -0,0 +1,64 @@
|
||||
//
|
||||
// Screaming_ReminderApp.swift
|
||||
// Screaming Reminder
|
||||
//
|
||||
// Created by Amine Bou on 11/07/2024.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
@main
|
||||
struct Screaming_ReminderApp: App {
|
||||
private var notificDelegate : NotificationDelegate = NotificationDelegate()
|
||||
let modelContainer: ModelContainer
|
||||
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView()
|
||||
}
|
||||
.modelContainer(modelContainer)
|
||||
}
|
||||
|
||||
init() {
|
||||
do {
|
||||
let schema = Schema([
|
||||
Reminder.self,
|
||||
])
|
||||
let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
|
||||
|
||||
modelContainer = try ModelContainer(for: schema, configurations: [modelConfiguration])
|
||||
} catch {
|
||||
fatalError("Could not create ModelContainer: \(error)")
|
||||
}
|
||||
registerForNotification()
|
||||
|
||||
// Define the custom actions.
|
||||
let doneAction = UNNotificationAction(identifier: "DONE_ACTION",
|
||||
title: "Fait !",
|
||||
options: [])
|
||||
|
||||
let notificationCategory =
|
||||
UNNotificationCategory(identifier: "CAT",
|
||||
actions: [doneAction],
|
||||
intentIdentifiers: [],
|
||||
hiddenPreviewsBodyPlaceholder: "",
|
||||
options: .customDismissAction)
|
||||
// Register the reminder type.
|
||||
let notificationCenter = UNUserNotificationCenter.current()
|
||||
notificationCenter.setNotificationCategories([notificationCategory])
|
||||
|
||||
UNUserNotificationCenter.current().delegate = notificDelegate
|
||||
|
||||
}
|
||||
|
||||
func registerForNotification() {
|
||||
UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound]) { success, error in
|
||||
if success {
|
||||
} else {
|
||||
exit(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
44
Screaming Reminder/Utils/NotificationDelegate.swift
Normal file
44
Screaming Reminder/Utils/NotificationDelegate.swift
Normal file
@ -0,0 +1,44 @@
|
||||
//
|
||||
// NotificationDelegate.swift
|
||||
// Screaming Reminder
|
||||
//
|
||||
// Created by Amine Bou on 12/07/2024.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
class NotificationDelegate: NSObject , UNUserNotificationCenterDelegate{
|
||||
|
||||
func userNotificationCenter(_ center: UNUserNotificationCenter,
|
||||
didReceive response: UNNotificationResponse,
|
||||
withCompletionHandler completionHandler:
|
||||
@escaping () -> Void) {
|
||||
|
||||
let title = response.notification.request.content.title
|
||||
switch response.actionIdentifier {
|
||||
case "DONE_ACTION":
|
||||
let content = UNMutableNotificationContent()
|
||||
content.title = "Bravo !"
|
||||
content.subtitle = "Tu as fais ce que tu devais faire ! (Il faudra ignorer les autres notifications 😅)"
|
||||
content.sound = UNNotificationSound.default
|
||||
|
||||
let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 3, repeats: false)
|
||||
|
||||
// choose a random identifier
|
||||
let request = UNNotificationRequest(identifier: "\(title)-done", content: content, trigger: trigger)
|
||||
|
||||
// add our reminder request
|
||||
UNUserNotificationCenter.current().add(request)
|
||||
|
||||
break
|
||||
default:
|
||||
exit(0)
|
||||
break
|
||||
}
|
||||
|
||||
// Always call the completion handler when done.
|
||||
completionHandler()
|
||||
}
|
||||
}
|
35
Screaming Reminder/Utils/NotificationsUtils.swift
Normal file
35
Screaming Reminder/Utils/NotificationsUtils.swift
Normal file
@ -0,0 +1,35 @@
|
||||
//
|
||||
// NotificationsUtils.swift
|
||||
// Screaming Reminder
|
||||
//
|
||||
// Created by Amine Bou on 12/07/2024.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
|
||||
func scheduleNotifications(reminder: Reminder) {
|
||||
let notification = Notification(reminder: reminder)
|
||||
notification.triggers.forEach {
|
||||
let content = UNMutableNotificationContent()
|
||||
content.title = notification.reminder.label
|
||||
content.sound = UNNotificationSound.defaultCritical
|
||||
content.categoryIdentifier = "CAT"
|
||||
|
||||
let request = UNNotificationRequest(identifier: getIdentifier(reminder: reminder, trigger: $0), content: content, trigger: $0)
|
||||
|
||||
// add our reminder request
|
||||
UNUserNotificationCenter.current().add(request)
|
||||
}
|
||||
}
|
||||
|
||||
func cancelNotifications(reminder: Reminder) {
|
||||
let identifiers = getTriggersForReminder(reminder: reminder).map {
|
||||
getIdentifier(reminder: reminder, trigger: $0)
|
||||
}
|
||||
|
||||
UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: identifiers)
|
||||
UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: identifiers)
|
||||
}
|
90
Screaming Reminder/Views/ContentView.swift
Normal file
90
Screaming Reminder/Views/ContentView.swift
Normal file
@ -0,0 +1,90 @@
|
||||
//
|
||||
// ContentView.swift
|
||||
// Screaming Reminder
|
||||
//
|
||||
// Created by Amine Bou on 11/07/2024.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
struct ContentView: View {
|
||||
@Query private var reminders: [Reminder]
|
||||
|
||||
@State var shouldPresentSheet = false
|
||||
@State var selectedLabel: String = ""
|
||||
@State var selectedReminder: Reminder?
|
||||
@State var selectedDate = [Date()]
|
||||
@State var showingAlert: Bool = false
|
||||
|
||||
var body: some View {
|
||||
NavigationSplitView {
|
||||
List {
|
||||
ForEach(reminders) { reminder in
|
||||
Button {
|
||||
showModal(reminder: reminder)
|
||||
} label: {
|
||||
Text("\(reminder)")
|
||||
}
|
||||
}
|
||||
}
|
||||
.toolbar {
|
||||
ToolbarItem {
|
||||
Button {
|
||||
showModal()
|
||||
} label : {
|
||||
Label("Add Item", systemImage: "plus")
|
||||
}
|
||||
}
|
||||
#if targetEnvironment(simulator)
|
||||
ToolbarItem {
|
||||
Button(action: testNotifs) {
|
||||
Label("Test notifs", systemImage: "volume")
|
||||
}
|
||||
}
|
||||
ToolbarItem {
|
||||
Button(action: {
|
||||
UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
|
||||
}) {
|
||||
Label("Delete", systemImage: "speaker.slash")
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}.sheet(isPresented: $shouldPresentSheet) {
|
||||
selectedDate = [Date()]
|
||||
selectedReminder = nil
|
||||
selectedLabel = ""
|
||||
} content: {
|
||||
SheetView(selectedLabel: $selectedLabel, selectedReminder: $selectedReminder, selectedDate: $selectedDate)
|
||||
}
|
||||
} detail: {
|
||||
Text("Select a reminder")
|
||||
}
|
||||
}
|
||||
|
||||
private func testNotifs() {
|
||||
UNUserNotificationCenter.current().getPendingNotificationRequests(completionHandler: {
|
||||
for notification in $0 {
|
||||
print("\(notification.identifier) - \(notification.trigger!) \((notification.trigger! as! UNCalendarNotificationTrigger).nextTriggerDate())")
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
private func showModal(reminder: Reminder? = nil) {
|
||||
withAnimation {
|
||||
if (reminder != nil) {
|
||||
selectedReminder = reminder
|
||||
selectedLabel = reminder!.label
|
||||
selectedDate = reminder!.when
|
||||
}
|
||||
shouldPresentSheet = true
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#Preview {
|
||||
ContentView()
|
||||
.modelContainer(for: Reminder.self, inMemory: true)
|
||||
}
|
96
Screaming Reminder/Views/SheetView.swift
Normal file
96
Screaming Reminder/Views/SheetView.swift
Normal file
@ -0,0 +1,96 @@
|
||||
//
|
||||
// SheetView.swift
|
||||
// Screaming Reminder
|
||||
//
|
||||
// Created by Amine Bou on 20/07/2024.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
struct SheetView: View {
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
@Environment(\.modelContext) private var modelContext
|
||||
|
||||
|
||||
@Binding var selectedLabel: String
|
||||
@Binding var selectedReminder: Reminder?
|
||||
@Binding var selectedDate: [Date]
|
||||
|
||||
var body: some View {
|
||||
|
||||
Form {
|
||||
LabeledContent {
|
||||
TextField("", text: $selectedLabel)
|
||||
} label: {
|
||||
Text("Nom")
|
||||
}
|
||||
|
||||
VStack {
|
||||
ForEach($selectedDate.indices, id: \.self) { i in
|
||||
HStack {
|
||||
DatePicker("Quand", selection: $selectedDate[i], displayedComponents: .hourAndMinute)
|
||||
Button(action: {
|
||||
selectedDate.remove(at: i)
|
||||
}) {
|
||||
Label("", systemImage: "minus.circle.fill")
|
||||
}.buttonStyle(.borderless)
|
||||
.disabled(selectedDate.count == 1)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Button(action: {
|
||||
selectedDate.append(selectedDate.last!)
|
||||
}) {
|
||||
Label("Ajouter une notification", systemImage: "plus")
|
||||
}.buttonStyle(.borderless)
|
||||
|
||||
HStack {
|
||||
Button("Cancel") {
|
||||
dismiss()
|
||||
}
|
||||
if ($selectedReminder.wrappedValue != nil) {
|
||||
Spacer()
|
||||
Button("Supprimer") {
|
||||
deleteReminder()
|
||||
dismiss()
|
||||
}.buttonStyle(.bordered)
|
||||
}
|
||||
Spacer()
|
||||
Button("Confirm") {
|
||||
upsertReminder()
|
||||
dismiss()
|
||||
}.buttonStyle(.borderedProminent)
|
||||
}
|
||||
}.formStyle(.grouped)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
|
||||
}
|
||||
|
||||
private func deleteReminder() {
|
||||
withAnimation {
|
||||
cancelNotifications(reminder: $selectedReminder.wrappedValue!)
|
||||
modelContext.delete($selectedReminder.wrappedValue!)
|
||||
}
|
||||
}
|
||||
private func upsertReminder() {
|
||||
withAnimation {
|
||||
let reminder: Reminder
|
||||
if (selectedReminder != nil) {
|
||||
cancelNotifications(reminder: $selectedReminder.wrappedValue!)
|
||||
// Should i Wait ?
|
||||
|
||||
selectedReminder!.label = $selectedLabel.wrappedValue
|
||||
selectedReminder!.when = $selectedDate.wrappedValue
|
||||
reminder = selectedReminder!
|
||||
} else {
|
||||
reminder = Reminder(label: $selectedLabel.wrappedValue, when: $selectedDate.wrappedValue)
|
||||
modelContext.insert(reminder)
|
||||
}
|
||||
scheduleNotifications(reminder: reminder)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user