Egalware/eqn.ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Merge "Notifiche sismi" items in the main settings page

Browse Source
This commit is contained in:
Andrea Busi
2020-08-28 13:23:41 +02:00
parent 4fbbb8e4fc
commit 84ee7b7958
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Earthquake Network/Controllers/Settings/SettingsViewController.m
+5 -3
View File
@@ -17,7 +17,8 @@
@implementation SettingsViewController
static NSString * const SegueIdentifierAllertaSismica = @"ShowAllertaSismica";
static NSString * const SegueIdentifierNotificheSismi = @"ShowNotificheSismi";
static NSString * const SegueIdentifierNotificheSegnalazioniUtente = @"ShowNotificheSegnalazioniUtente";
static NSString * const SegueIdentifierNotificheRetiSismiche = @"ShowNotificheRetiSismiche";
#pragma mark - View Lifecycle
@@ -29,8 +30,9 @@ static NSString * const SegueIdentifierNotificheSismi = @"ShowNotificheSismi";
[self.tableView registerClass:[SettingDetailTableViewCell class] forCellReuseIdentifier:SettingDetailTableViewCell.Identifier];
self.settings = @[
[[SettingItem alloc] initWithType:SettingTypeDetail title:NSLocalizedString(@"Allerta in tempo reale", @"voce menu") subtitle:nil icon:@"🚨" segue:SegueIdentifierAllertaSismica],
[[SettingItem alloc] initWithType:SettingTypeDetail title:NSLocalizedString(@"Notifiche sismi", @"voce menu") subtitle:nil icon:@"🔔" segue:SegueIdentifierNotificheSismi]
[[SettingItem alloc] initWithType:SettingTypeDetail title:NSLocalizedString(@"Allerta in tempo reale", @"") subtitle:nil icon:@"🚨" segue:SegueIdentifierAllertaSismica],
[[SettingItem alloc] initWithType:SettingTypeDetail title:NSLocalizedString(@"Notifiche da reti sismiche", @"") subtitle:nil icon:@"🌍" segue:SegueIdentifierNotificheRetiSismiche],
[[SettingItem alloc] initWithType:SettingTypeDetail title:NSLocalizedString(@"Notifiche segnalazioni utente", @"") subtitle:nil icon:@"📱" segue:SegueIdentifierNotificheSegnalazioniUtente]
];
}
Sources/Earthquake Network/Storyboards/Base.lproj/Main.storyboard
+9 -10
View File
@@ -2840,8 +2840,9 @@ In più sostieni il progetto di ricerca il quale non riceve finanziamenti estern
</barButtonItem>
</navigationItem>
<connections>
<segue destination="e2e-CQ-gxv" kind="show" identifier="ShowNotificheSismi" id="N2Z-Km-HOK"/>
<segue destination="oA9-rq-Kqp" kind="show" identifier="ShowAllertaSismica" id="PKv-wx-VXN"/>
<segue destination="jlJ-xb-75r" kind="show" identifier="ShowNotificheRetiSismiche" id="jjk-tO-OBj"/>
<segue destination="foL-vg-Kyh" kind="show" identifier="ShowNotificheSegnalazioniUtente" id="f1i-I1-Cao"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Lzh-6m-4x5" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -2865,7 +2866,7 @@ In più sostieni il progetto di ricerca il quale non riceve finanziamenti estern
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Uvt-gu-Bum" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-4414" y="-379"/>
<point key="canvasLocation" x="-5901" y="-360"/>
</scene>
<!--Allerta Sismi Table View Controller-->
<scene sceneID="fj3-1O-nSI">
@@ -2884,14 +2885,14 @@ In più sostieni il progetto di ricerca il quale non riceve finanziamenti estern
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="z3g-sW-ZwB" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-6744" y="-991"/>
<point key="canvasLocation" x="-6853" y="-1093"/>
</scene>
<!--Tempo Reale Table View Controller-->
<scene sceneID="tpD-cn-0kA">
<objects>
<tableViewController id="KP6-Mh-GkS" customClass="TempoRealeTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="gVq-hw-zeL">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="548"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
@@ -3027,7 +3028,7 @@ In più sostieni il progetto di ricerca il quale non riceve finanziamenti estern
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="1iQ-ab-5VW" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-6118" y="1177"/>
<point key="canvasLocation" x="-6041" y="1257"/>
</scene>
<!--Segnalazioni Utenti Table View Controller-->
<scene sceneID="70o-xn-uI2">
@@ -3046,7 +3047,7 @@ In più sostieni il progetto di ricerca il quale non riceve finanziamenti estern
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="D0G-lo-3RH" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-5276" y="355"/>
<point key="canvasLocation" x="-6853" y="425"/>
</scene>
<!--Reti Sismiche Table View Controller-->
<scene sceneID="44E-lc-Pfe">
@@ -3068,7 +3069,7 @@ In più sostieni il progetto di ricerca il quale non riceve finanziamenti estern
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ycw-pT-hjt" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-5276" y="-379"/>
<point key="canvasLocation" x="-6853" y="-360"/>
</scene>
<!--Notifiche Sismi Table View Controller-->
<scene sceneID="SuQ-Fi-PSx">
@@ -3086,13 +3087,11 @@ In più sostieni il progetto di ricerca il quale non riceve finanziamenti estern
<navigationItem key="navigationItem" id="blw-2A-75C"/>
<connections>
<segue destination="KP6-Mh-GkS" kind="show" identifier="sismiTempoReale" id="yQf-2X-BWy"/>
<segue destination="foL-vg-Kyh" kind="show" identifier="segnalazioneUtenti" id="He6-4O-R27"/>
<segue destination="jlJ-xb-75r" kind="show" identifier="retiSismiche" id="9wI-wW-R9G"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="WQO-gw-z6e" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-6744" y="39"/>
<point key="canvasLocation" x="-6831" y="1258"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="bcf-1h-akt">