From 89ca7858649bd4c219726d8a3bf2ee511acae5a5 Mon Sep 17 00:00:00 2001 From: Andrea Busi Date: Thu, 18 May 2023 17:40:47 +0200 Subject: [PATCH] refactor: Remove unused logic for Do not disturb notifications --- .../SettingsRealTimeAlertsViewController.m | 76 +------------------ .../Earthquake Network/Models/EQNData.swift | 31 -------- 2 files changed, 1 insertion(+), 106 deletions(-) diff --git a/Sources/Earthquake Network/Controllers/Settings/SettingsRealTimeAlertsViewController.m b/Sources/Earthquake Network/Controllers/Settings/SettingsRealTimeAlertsViewController.m index 87ff947..1f1fac4 100644 --- a/Sources/Earthquake Network/Controllers/Settings/SettingsRealTimeAlertsViewController.m +++ b/Sources/Earthquake Network/Controllers/Settings/SettingsRealTimeAlertsViewController.m @@ -20,16 +20,11 @@ @property (nonatomic, strong) EQNGenericValue *currentSeismicToNotify; @property (strong, nonatomic) EQNGenericValue *currentLowSeismicRadius; @property (strong, nonatomic) EQNGenericValue *currentStrongSeismicRadius; -@property (strong, nonatomic) NSDate *currentStartTime; -@property (nonatomic) BOOL isStartTimeExpanded; -@property (strong, nonatomic) NSDate *currentEndTime; -@property (nonatomic) BOOL isEndTimeExpanded; @property (nonatomic, strong) NSDateFormatter *dateFormatter; @property (nonatomic, assign) BOOL notificationEnabled; @property (nonatomic, assign) BOOL criticalAlertsEnabled; -@property (nonatomic, assign) BOOL doNotDisturbEnabled; @end @implementation SettingsRealTimeAlertsViewController @@ -39,10 +34,7 @@ typedef NS_ENUM(NSInteger, RowIdentifier) { RowIdentifierAbilitaCriticalAlerts, RowIdentifierSismiDaNotificare, RowIdentifierRaggioSismiLievi, - RowIndntifierRaggioSismiForti, - RowIdentifierNonDisturbare, - RowIdentifierNonDisturbareOraInizio, - RowIdentifierNonDisturbareOraFine + RowIndntifierRaggioSismiForti }; #pragma mark - Accessories @@ -99,7 +91,6 @@ typedef NS_ENUM(NSInteger, RowIdentifier) { { self.notificationEnabled = [EQNAllertaSismica sharedInstance].isAbilitato; self.criticalAlertsEnabled = [EQNAllertaSismica sharedInstance].isCriticalAlertsEnabled; - self.doNotDisturbEnabled = [EQNAllertaSismica sharedInstance].isintervalloAllarme; // sismi da notificare EQNGenericValue *sismiDaNotificare = [EQNData seismicToNotifyFor:[EQNAllertaSismica sharedInstance].sismiDaNotificare]; @@ -113,12 +104,6 @@ typedef NS_ENUM(NSInteger, RowIdentifier) { EQNGenericValue *raggioSismiForti = [EQNData raggioSismaFor:[EQNAllertaSismica sharedInstance].raggioSismiForti]; self.currentStrongSeismicRadius = raggioSismiForti; - // non disturbare, orari - NSDate *startTime = [EQNData doNotDisturbEndDateFrom:[EQNAllertaSismica sharedInstance].oraioInizio]; - self.currentStartTime = startTime; - - NSDate *endTime = [EQNData doNotDisturbEndDateFrom:[EQNAllertaSismica sharedInstance].orarioFine]; - self.currentEndTime = endTime; [[EQNAllertaSismica sharedInstance] saveUserInfo]; } @@ -172,15 +157,6 @@ typedef NS_ENUM(NSInteger, RowIdentifier) { [[EQNAllertaSismica sharedInstance] saveUserInfo]; [self.tableView reloadData]; }; - } else if (indexPath.row == RowIdentifierNonDisturbare) { - cell.toggleSwitch.on = self.doNotDisturbEnabled; - cell.isDisabled = !self.notificationEnabled; - cell.valueChanged = ^(BOOL enabled) { - self.doNotDisturbEnabled = enabled; - [EQNAllertaSismica sharedInstance].isintervalloAllarme = self.doNotDisturbEnabled; - [[EQNAllertaSismica sharedInstance] saveUserInfo]; - [self.tableView reloadData]; - }; } return cell; @@ -215,46 +191,12 @@ typedef NS_ENUM(NSInteger, RowIdentifier) { }; } - return cell; - } else if (setting.type == SettingTypeDate) { - SettingDateTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:SettingDateTableViewCell.Identifier forIndexPath:indexPath]; - cell.isDisabled = !self.doNotDisturbEnabled || !self.notificationEnabled; - cell.userInteractionEnabled = self.doNotDisturbEnabled && self.notificationEnabled; - cell.titleLabel.text = setting.title; - - if (indexPath.row == RowIdentifierNonDisturbareOraInizio) { - cell.isPickerVisible = self.isStartTimeExpanded; - [cell updateDate:self.currentStartTime]; - cell.valuesLabel.text = [self.dateFormatter stringFromDate:self.currentStartTime]; - cell.valueChanged = ^(NSDate *date) { - [self updateStartTime:date]; - }; - } else if (indexPath.row == RowIdentifierNonDisturbareOraFine) { - cell.isPickerVisible = self.isEndTimeExpanded; - [cell updateDate:self.currentEndTime]; - cell.valuesLabel.text = [self.dateFormatter stringFromDate:self.currentEndTime]; - cell.valueChanged = ^(NSDate *date) { - [self updateEndTime:date]; - }; - } - return cell; } return nil; } -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath -{ - if (indexPath.row == RowIdentifierNonDisturbareOraInizio) { - self.isStartTimeExpanded = !self.isStartTimeExpanded; - } else if (indexPath.row == RowIdentifierNonDisturbareOraFine) { - self.isEndTimeExpanded = !self.isEndTimeExpanded; - } - - [tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic]; -} - #pragma mark - Private - (void)updateSismicToNotify:(EQNGenericValue *)seismic @@ -281,22 +223,6 @@ typedef NS_ENUM(NSInteger, RowIdentifier) { [self loadDataSource]; } -- (void)updateStartTime:(NSDate *)date -{ - [EQNAllertaSismica sharedInstance].oraioInizio = date; - [[EQNAllertaSismica sharedInstance] saveUserInfo]; - - [self loadDataSource]; -} - -- (void)updateEndTime:(NSDate *)date -{ - [EQNAllertaSismica sharedInstance].orarioFine = date; - [[EQNAllertaSismica sharedInstance] saveUserInfo]; - - [self loadDataSource]; -} - - (void)askForCriticalAlertsPermission { UNAuthorizationOptions authOptions = UNAuthorizationOptionCriticalAlert; diff --git a/Sources/Earthquake Network/Models/EQNData.swift b/Sources/Earthquake Network/Models/EQNData.swift index a8e7503..317dcaf 100644 --- a/Sources/Earthquake Network/Models/EQNData.swift +++ b/Sources/Earthquake Network/Models/EQNData.swift @@ -15,8 +15,6 @@ import Foundation @objc public static let DefaultMagitudoDebole = EQNGenericValue(value:"2.0", display:"official_magnitude_value_20") @objc public static let DefaultMagitudoForte = EQNGenericValue(value:"5.5", display:"official_magnitude_value_55") @objc public static let DefaultSeismicToNotify = EQNGenericValue(value: "0", display: "eqn_intensity_any") - @objc public static let DefaultDoNotDisturbStartTime = 8 - @objc public static let DefaultDoNotDisturbEndTime = 22 @objc public static let DefaultPeriodoTemporale = EQNGenericValue(value: "1440", display: "report_timeframe_one_day") // MARK: - Public @@ -150,35 +148,6 @@ import Foundation return Self.DefaultSeismicToNotify } - @objc class func doNotDisturbStartDate(from date: Date?) -> Date { - if let date = date { - return date - } - - // return default - let calendar = Calendar(identifier: .gregorian) - let units: Set = [.year, .month, .day, .hour, .minute] - var components = calendar.dateComponents(units, from: Date()) - components.hour = Self.DefaultDoNotDisturbStartTime - components.minute = 00 - return calendar.date(from: components)! - } - - - @objc class func doNotDisturbEndDate(from date: Date?) -> Date { - if let date = date { - return date - } - - // return default - let calendar = Calendar(identifier: .gregorian) - let units: Set = [.year, .month, .day, .hour, .minute] - var components = calendar.dateComponents(units, from: Date()) - components.hour = Self.DefaultDoNotDisturbEndTime - components.minute = 00 - return calendar.date(from: components)! - } - @objc class func periodiTemporali() -> [EQNGenericValue] { [ EQNGenericValue(value: "10", display: "10 minuti"),