Merge branch 'main' of github.com:hykilpikonna/ProjectClock into main
This commit is contained in:
@@ -83,18 +83,30 @@ class AlarmActivator: UITabBarController
|
|||||||
*/
|
*/
|
||||||
@objc func checkFamily()
|
@objc func checkFamily()
|
||||||
{
|
{
|
||||||
|
guard localStorage.string(forKey: "family") != nil else { return }
|
||||||
|
|
||||||
send(APIs.familyAlarmUpdates)
|
send(APIs.familyAlarmUpdates)
|
||||||
{
|
{
|
||||||
|
guard $0 != "" else { return }
|
||||||
|
|
||||||
|
var changed = false
|
||||||
let alarms = Alarms.fromLocal()
|
let alarms = Alarms.fromLocal()
|
||||||
$0.components(separatedBy: ",").forEach
|
$0.csv.forEach
|
||||||
{
|
{
|
||||||
guard let alarm = JSON.parse(Alarm.self, $0) else { return }
|
guard let alarm = JSON.parse(Alarm.self, $0) else { return }
|
||||||
if (!alarms.list.contains { $0.timeText == alarm.timeText })
|
if (!alarms.list.contains { $0.timeText == alarm.timeText })
|
||||||
{
|
{
|
||||||
alarms.list.append(alarm)
|
alarms.list.append(alarm)
|
||||||
|
changed = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
alarms.localSave()
|
alarms.localSave()
|
||||||
|
|
||||||
|
guard changed else { return }
|
||||||
|
self.msg("New alarm!", "A family member added an alarm for you!")
|
||||||
|
{
|
||||||
|
AlarmViewController.staticTable?.reloadData()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ struct Family: Codable
|
|||||||
var members: String
|
var members: String
|
||||||
// And a hidden field: admin pin
|
// And a hidden field: admin pin
|
||||||
|
|
||||||
var membersList: [String] { members.components(separatedBy: ",") }
|
var membersList: [String] { members.csv }
|
||||||
|
|
||||||
/// Save family to local storage
|
/// Save family to local storage
|
||||||
func localSave()
|
func localSave()
|
||||||
|
|||||||
@@ -253,3 +253,9 @@ extension UserDefaults
|
|||||||
set { self[key] = newValue?.rawValue }
|
set { self[key] = newValue?.rawValue }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// String CSV
|
||||||
|
extension String
|
||||||
|
{
|
||||||
|
var csv: [String] { components(separatedBy: ";") }
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user