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

refactor: Rename PastquakesAnnotation in EQNMapAnnotationPastquakes

Browse Source
This commit is contained in:
Andrea Busi
2021-02-21 15:27:49 +01:00
parent e882a83694
commit 852e950428
8 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/EQNNotificationContent/NotificationViewController.m
+5 -5
View File
@@ -7,7 +7,7 @@
//
#import "NotificationViewController.h"
#import "PastquakesAnnotation.h"
#import "EQNMapAnnotationPastquakes.h"
#import "ReteSismicaAnnotation.h"
#import "EQNUtility.h"
@@ -61,7 +61,7 @@
[self.mapView setRegion:region animated:YES];
if ([userInfo[@"type"] isEqualToString:@"eqn"]) {
PastquakesAnnotation *annotation = [[PastquakesAnnotation alloc] initWithTitle:content.body
EQNMapAnnotationPastquakes *annotation = [[EQNMapAnnotationPastquakes alloc] initWithTitle:content.body
location:coordinate.coordinate
intensita:[userInfo[@"intensity"] intValue]];
[self.mapView addAnnotation:annotation];
@@ -139,9 +139,9 @@
- (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id<MKAnnotation>)annotation
{
if ([annotation isKindOfClass:[PastquakesAnnotation class]]) {
PastquakesAnnotation *anLocation = (PastquakesAnnotation *)annotation;
MKAnnotationView *annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:IDENTIFIER_ANNOTATION_PASTQUAKES];
if ([annotation isKindOfClass:[EQNMapAnnotationPastquakes class]]) {
EQNMapAnnotationPastquakes *anLocation = (EQNMapAnnotationPastquakes *)annotation;
MKAnnotationView *annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:EQNMapAnnotationPastquakesIdentifier];
if (annotationView == nil) {
annotationView = anLocation.annotationView;
} else {
Sources/Earthquake Network.xcodeproj/project.pbxproj
+8 -12
View File
@@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */
65DBFB4B25E29DD60041CBA6 /* SeismicNetworksMapDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DBFB4A25E29DD60041CBA6 /* SeismicNetworksMapDetailViewController.swift */; };
65DBFB5F25E2A5010041CBA6 /* EQNMapAnnotationPastquakes.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C602249218EDBE200C799C2 /* EQNMapAnnotationPastquakes.m */; };
8C10B0B92281FE7F00125C9F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8C10B0BD2281FE7F00125C9F /* Localizable.strings */; };
8C10B0BA2281FE7F00125C9F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8C10B0BD2281FE7F00125C9F /* Localizable.strings */; };
8C10B0BB2281FE7F00125C9F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8C10B0BD2281FE7F00125C9F /* Localizable.strings */; };
@@ -16,9 +17,6 @@
8C2B251121938BFD00E0E25E /* SegnalazioniUtenteDettagliMappa.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C2B251021938BFD00E0E25E /* SegnalazioniUtenteDettagliMappa.m */; };
8C465D9A21F653AB00F04673 /* Assets.xcassets in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CBD3DD12149B9AD0070C963 /* Assets.xcassets */; };
8C465D9B21F653CA00F04673 /* Assets.xcassets in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CBD3DD12149B9AD0070C963 /* Assets.xcassets */; };
8C465D9C21F7BBE700F04673 /* PastquakesAnnotation.m in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C602249218EDBE200C799C2 /* PastquakesAnnotation.m */; };
8C465D9D21F7BBE700F04673 /* PastquakesAnnotation.h in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C602248218EDBE200C799C2 /* PastquakesAnnotation.h */; };
8C465D9E21F7BD8700F04673 /* PastquakesAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C602249218EDBE200C799C2 /* PastquakesAnnotation.m */; };
8C465D9F21F7BE0600F04673 /* Assets.xcassets in Sources */ = {isa = PBXBuildFile; fileRef = 8CBD3DD12149B9AD0070C963 /* Assets.xcassets */; };
8C483CAE21FDA53B00259FD2 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C483CAD21FDA53B00259FD2 /* StoreKit.framework */; };
8C483CB821FDACD300259FD2 /* IAPHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C483CB721FDACD300259FD2 /* IAPHelper.swift */; };
@@ -34,7 +32,7 @@
8C5EA22D21763103002DC156 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C5EA22C21763102002DC156 /* MapKit.framework */; };
8C5EA23D2177B51C002DC156 /* SegnalazioniViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C5EA23C2177B51C002DC156 /* SegnalazioniViewController.m */; };
8C602246218D9DB200C799C2 /* PastquakesDettagliMappa.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C602245218D9DB200C799C2 /* PastquakesDettagliMappa.m */; };
8C60224A218EDBE200C799C2 /* PastquakesAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C602249218EDBE200C799C2 /* PastquakesAnnotation.m */; };
8C60224A218EDBE200C799C2 /* EQNMapAnnotationPastquakes.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C602249218EDBE200C799C2 /* EQNMapAnnotationPastquakes.m */; };
8C6CBAE521597E79005C426A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8C6CBAE421597E79005C426A /* GoogleService-Info.plist */; };
8C7A3B66225A5EA40045B266 /* NSDictionary+EQNExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C7A3B64225A5EA30045B266 /* NSDictionary+EQNExtensions.m */; };
8C7CD64821F7D0F800835812 /* ReteSismicaAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD08637218B3BEE0000CB5E /* ReteSismicaAnnotation.m */; };
@@ -318,8 +316,8 @@
8C5EA23C2177B51C002DC156 /* SegnalazioniViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SegnalazioniViewController.m; sourceTree = "<group>"; };
8C602244218D9DB200C799C2 /* PastquakesDettagliMappa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PastquakesDettagliMappa.h; sourceTree = "<group>"; };
8C602245218D9DB200C799C2 /* PastquakesDettagliMappa.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PastquakesDettagliMappa.m; sourceTree = "<group>"; };
8C602248218EDBE200C799C2 /* PastquakesAnnotation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PastquakesAnnotation.h; sourceTree = "<group>"; };
8C602249218EDBE200C799C2 /* PastquakesAnnotation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PastquakesAnnotation.m; sourceTree = "<group>"; };
8C602248218EDBE200C799C2 /* EQNMapAnnotationPastquakes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EQNMapAnnotationPastquakes.h; sourceTree = "<group>"; };
8C602249218EDBE200C799C2 /* EQNMapAnnotationPastquakes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EQNMapAnnotationPastquakes.m; sourceTree = "<group>"; };
8C6CBAE421597E79005C426A /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
8C7A3B64225A5EA30045B266 /* NSDictionary+EQNExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+EQNExtensions.m"; sourceTree = "<group>"; };
8C7A3B65225A5EA40045B266 /* NSDictionary+EQNExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+EQNExtensions.h"; sourceTree = "<group>"; };
@@ -572,8 +570,6 @@
files = (
8C7CD64921F7D11700835812 /* ReteSismicaAnnotation.m in Frameworks */,
8C7CD64A21F7D11700835812 /* ReteSismicaAnnotation.h in Frameworks */,
8C465D9C21F7BBE700F04673 /* PastquakesAnnotation.m in Frameworks */,
8C465D9D21F7BBE700F04673 /* PastquakesAnnotation.h in Frameworks */,
8C465D9A21F653AB00F04673 /* Assets.xcassets in Frameworks */,
8CF12CD521DE49B600613AC5 /* UserNotificationsUI.framework in Frameworks */,
8CF12CD321DE49B600613AC5 /* UserNotifications.framework in Frameworks */,
@@ -588,6 +584,8 @@
children = (
8CA46B9F2194532E00C63C16 /* EQNMapAnnotationSeismic.h */,
8CA46BA02194532E00C63C16 /* EQNMapAnnotationSeismic.m */,
8C602248218EDBE200C799C2 /* EQNMapAnnotationPastquakes.h */,
8C602249218EDBE200C799C2 /* EQNMapAnnotationPastquakes.m */,
);
path = "Map annotation";
sourceTree = "<group>";
@@ -640,8 +638,6 @@
children = (
8CD08636218B3BEE0000CB5E /* ReteSismicaAnnotation.h */,
8CD08637218B3BEE0000CB5E /* ReteSismicaAnnotation.m */,
8C602248218EDBE200C799C2 /* PastquakesAnnotation.h */,
8C602249218EDBE200C799C2 /* PastquakesAnnotation.m */,
);
path = annotation;
sourceTree = "<group>";
@@ -1584,7 +1580,7 @@
DCF4A54524F8DB8300B17326 /* SettingDateTableViewCell.swift in Sources */,
DC7EEE4A252A11C9004B4A2A /* AlertsSmartphoneNetworkTableViewCell.swift in Sources */,
DC7EEE4F252A1634004B4A2A /* AlertsPriorityServiceTableViewCell.swift in Sources */,
8C60224A218EDBE200C799C2 /* PastquakesAnnotation.m in Sources */,
8C60224A218EDBE200C799C2 /* EQNMapAnnotationPastquakes.m in Sources */,
8CC1B15A217CB09100F22178 /* DettagliMappaViewController.m in Sources */,
8C5EA23D2177B51C002DC156 /* SegnalazioniViewController.m in Sources */,
8CF4F4D8216D3A110057110B /* EQNAreaCheck.m in Sources */,
@@ -1614,9 +1610,9 @@
8C7CD64821F7D0F800835812 /* ReteSismicaAnnotation.m in Sources */,
8C465D9F21F7BE0600F04673 /* Assets.xcassets in Sources */,
DC0AE1B92538204100111307 /* EQNSegnalazione.m in Sources */,
65DBFB5F25E2A5010041CBA6 /* EQNMapAnnotationPastquakes.m in Sources */,
DC0AE1B52538202300111307 /* EQNUtility.m in Sources */,
DC0AE1BA2538204100111307 /* EQNPastquakes.m in Sources */,
8C465D9E21F7BD8700F04673 /* PastquakesAnnotation.m in Sources */,
8CF12CD921DE49B600613AC5 /* NotificationViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Sources/Earthquake Network/Controllers/Alerts/Cells/AlertsSeismicNotificationExpandedTableViewCell.swift
+3 -3
View File
@@ -80,17 +80,17 @@ class AlertsSeismicNotificationExpandedTableViewCell: EQNBaseTableViewCell, MKMa
mapView.setCenter(coordinate.coordinate, animated: false)
mapView.setRegion(region, animated: true)
let annotation = PastquakesAnnotation(title: "", location: coordinate.coordinate, intensita: intensity)
let annotation = EQNMapAnnotationPastquakes(title: "", location: coordinate.coordinate, intensita: intensity)
mapView.addAnnotation(annotation)
}
}
func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
guard let annotation = annotation as? PastquakesAnnotation else {
guard let annotation = annotation as? EQNMapAnnotationPastquakes else {
return nil
}
var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: IDENTIFIER_ANNOTATION_PASTQUAKES)
var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: EQNMapAnnotationPastquakesIdentifier)
if annotationView == nil {
annotationView = annotation.annotationView()
} else {
Sources/Earthquake Network/Costanti.h
-2
View File
@@ -101,8 +101,6 @@ static NSString * const EQNAdMobAppIdAdaptiveBanner = @"ca-app-pub-0053870219990
// rete Smartphone
#define IDENTIFIER_ANNOTATION_RETESMARTPHONE @"IDENTIFIER_ANNOTATION_RETESMARTPHONE"
// pastequakes
#define IDENTIFIER_ANNOTATION_PASTQUAKES @"IDENTIFIER_ANNOTATION_PASTQUAKES"
// rete smartphone notifiche
#define IDENTIFIER_ANNOTATION_RS_NOTIFICA @"IDENTIFIER_ANNOTATION_RS_NOTIFICA"
Sources/Earthquake Network/Earthquake Network-Bridging-Header.h
+1 -1
View File
@@ -10,7 +10,7 @@
#import "EQNSisma.h"
#import "EQNBaseViewController.h"
#import "SettingsBaseViewController.h"
#import "PastquakesAnnotation.h"
#import "EQNMapAnnotationPastquakes.h"
#import "EQNGeneratoreURLServer.h"
#import "ServerRequest.h"
#import "EQNMapAnnotationSeismic.h"
Sources/Earthquake Network/model/annotation/PastquakesAnnotation.h → Sources/Earthquake Network/Models/Map annotation/EQNMapAnnotationPastquakes.h
+7 -4
View File
@@ -1,9 +1,9 @@
//
// PastquakesAnnotation.h
// EQNMapAnnotationPastquakes.h
// Earthquake Network
//
// Created by Luca Beretta on 04/11/18.
// Copyright © 2018 Luca Beretta. All rights reserved.
// Refactored by Andrea Busi
// Copyright © 2021 Earthquake Network. All rights reserved.
//
#import <Foundation/Foundation.h>
@@ -11,7 +11,10 @@
NS_ASSUME_NONNULL_BEGIN
@interface PastquakesAnnotation : NSObject <MKAnnotation>
static NSString * const EQNMapAnnotationPastquakesIdentifier = @"EQNMapAnnotationPastquakesIdentifier";
@interface EQNMapAnnotationPastquakes : NSObject <MKAnnotation>
@property (nonatomic, readonly) CLLocationCoordinate2D coordinate;
@property (nonatomic, copy) NSString *title;
Sources/Earthquake Network/model/annotation/PastquakesAnnotation.m → Sources/Earthquake Network/Models/Map annotation/EQNMapAnnotationPastquakes.m
+6 -7
View File
@@ -1,15 +1,14 @@
//
// PastquakesAnnotation.m
// EQNMapAnnotationPastquakes.m
// Earthquake Network
//
// Created by Luca Beretta on 04/11/18.
// Copyright © 2018 Luca Beretta. All rights reserved.
// Refactored by Andrea Busi
// Copyright © 2021 Earthquake Network. All rights reserved.
//
#import "PastquakesAnnotation.h"
#import "Costanti.h"
#import "EQNMapAnnotationPastquakes.h"
@implementation PastquakesAnnotation
@implementation EQNMapAnnotationPastquakes
#pragma mark - Init
@@ -28,7 +27,7 @@
- (MKAnnotationView *)annotationView
{
MKAnnotationView *annotationView = [[MKAnnotationView alloc] initWithAnnotation:self reuseIdentifier:IDENTIFIER_ANNOTATION_PASTQUAKES];
MKAnnotationView *annotationView = [[MKAnnotationView alloc] initWithAnnotation:self reuseIdentifier:EQNMapAnnotationPastquakesIdentifier];
annotationView.enabled = YES;
annotationView.canShowCallout = YES;
NSString *imageString;
Sources/Earthquake Network/ViewController/Dettagli mappa/PastquakesDettagliMappa.m
+5 -5
View File
@@ -7,7 +7,7 @@
//
#import "PastquakesDettagliMappa.h"
#import "PastquakesAnnotation.h"
#import "EQNMapAnnotationPastquakes.h"
#import "EQNAdsUtility.h"
@interface PastquakesDettagliMappa () <MKMapViewDelegate>
@@ -53,7 +53,7 @@
EQNPastquakes *pasq = (EQNPastquakes *)segnalazione;
CLLocationCoordinate2D location = CLLocationCoordinate2DMake([pasq.latitude doubleValue], [pasq.longitude doubleValue]);
PastquakesAnnotation *anAnnotation = [[PastquakesAnnotation alloc] initWithTitle:[NSString stringWithFormat:@"%@ %@ %@",NSLocalizedString(@"Sisma rilevato da", @"") ,pasq.users, NSLocalizedString(@"smartphones", @"")] location:location intensita:[pasq.intensity intValue]];
EQNMapAnnotationPastquakes *anAnnotation = [[EQNMapAnnotationPastquakes alloc] initWithTitle:[NSString stringWithFormat:@"%@ %@ %@",NSLocalizedString(@"Sisma rilevato da", @"") ,pasq.users, NSLocalizedString(@"smartphones", @"")] location:location intensita:[pasq.intensity intValue]];
[self.annotationArray addObject:anAnnotation];
}
@@ -61,9 +61,9 @@
- (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id<MKAnnotation>)annotation
{
if ([annotation isKindOfClass:[PastquakesAnnotation class]]) {
PastquakesAnnotation *anLocation = (PastquakesAnnotation *)annotation;
MKAnnotationView *annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:IDENTIFIER_ANNOTATION_PASTQUAKES];
if ([annotation isKindOfClass:[EQNMapAnnotationPastquakes class]]) {
EQNMapAnnotationPastquakes *anLocation = (EQNMapAnnotationPastquakes *)annotation;
MKAnnotationView *annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:EQNMapAnnotationPastquakesIdentifier];
if (annotationView == nil)
annotationView = anLocation.annotationView;
else