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

feat: Save selected map pin style

Browse Source
This commit is contained in:
Andrea Busi
2025-02-28 16:49:36 +01:00
parent b933b900ed
commit d0d06394f0
7 changed files with 82 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Earthquake Network.xcodeproj/project.pbxproj
+8
View File
@@ -13,6 +13,9 @@
650247122A61832F001AC512 /* EQNBackgroundPositionDebugHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 650247112A61832F001AC512 /* EQNBackgroundPositionDebugHelper.swift */; };
650247152A618D7F001AC512 /* Foundation+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 650247142A618D7F001AC512 /* Foundation+Extensions.swift */; };
650B23AB2632CCD3007AE752 /* UIView+EQNExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 650B23AA2632CCD3007AE752 /* UIView+EQNExtensions.swift */; };
6514FF6A2D720C3F000A7BD0 /* MapPinStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6514FF692D720C3A000A7BD0 /* MapPinStyle.swift */; };
6514FF6C2D720CBE000A7BD0 /* MapPinStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6514FF692D720C3A000A7BD0 /* MapPinStyle.swift */; };
6514FF6D2D720CBE000A7BD0 /* MapPinStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6514FF692D720C3A000A7BD0 /* MapPinStyle.swift */; };
65172F532C25C496006D2A5C /* EQNSeismicAnnotationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65172F522C25C496006D2A5C /* EQNSeismicAnnotationView.swift */; };
651901B925F5358700CAFF20 /* EQNMapAnnotationSeismic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 651901B825F5358700CAFF20 /* EQNMapAnnotationSeismic.swift */; };
6525A82625E13FD4008FE0D0 /* SeismicNetworkAdvertiseTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6525A82525E13FD4008FE0D0 /* SeismicNetworkAdvertiseTableViewCell.swift */; };
@@ -314,6 +317,7 @@
650247112A61832F001AC512 /* EQNBackgroundPositionDebugHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EQNBackgroundPositionDebugHelper.swift; sourceTree = "<group>"; };
650247142A618D7F001AC512 /* Foundation+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Foundation+Extensions.swift"; sourceTree = "<group>"; };
650B23AA2632CCD3007AE752 /* UIView+EQNExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+EQNExtensions.swift"; sourceTree = "<group>"; };
6514FF692D720C3A000A7BD0 /* MapPinStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapPinStyle.swift; sourceTree = "<group>"; };
65172F522C25C496006D2A5C /* EQNSeismicAnnotationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EQNSeismicAnnotationView.swift; sourceTree = "<group>"; };
651901B825F5358700CAFF20 /* EQNMapAnnotationSeismic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EQNMapAnnotationSeismic.swift; sourceTree = "<group>"; };
6525A82525E13FD4008FE0D0 /* SeismicNetworkAdvertiseTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeismicNetworkAdvertiseTableViewCell.swift; sourceTree = "<group>"; };
@@ -677,6 +681,7 @@
65DBFB5225E2A2580041CBA6 /* Map annotation */ = {
isa = PBXGroup;
children = (
6514FF692D720C3A000A7BD0 /* MapPinStyle.swift */,
653C67FB25F3D63500FE52AC /* EQNMapAnnotationUserReport.swift */,
651901B825F5358700CAFF20 /* EQNMapAnnotationSeismic.swift */,
657415DE2D70B6F700F54890 /* EQNMapAnnotationShakemap.swift */,
@@ -1553,6 +1558,7 @@
files = (
65FFDC95292F672B00EA821B /* NotificationService.swift in Sources */,
6502470E2A6136F0001AC512 /* Constants.swift in Sources */,
6514FF6D2D720CBE000A7BD0 /* MapPinStyle.swift in Sources */,
6502470F2A613AD7001AC512 /* EQNUserData.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1630,6 +1636,7 @@
65BBB22C26064BE6005D6CDF /* SegnalazioniLast24HoursCell.swift in Sources */,
DC47D1BC252A0C2B004119F6 /* AlertsPastEartquakesTableViewCell.swift in Sources */,
654D18C925F93CD700BB6DB0 /* EQNMapAnnotationPastquake.swift in Sources */,
6514FF6A2D720C3F000A7BD0 /* MapPinStyle.swift in Sources */,
DCEFF21724F58569009D3FE1 /* SettingSectionHeaderView.swift in Sources */,
65DB60FD2C172C4A00164366 /* EQNSettingRealTimeAlert.swift in Sources */,
DCBB267A24D1E7F500F04559 /* SubscriptionsHeaderTableViewCell.swift in Sources */,
@@ -1698,6 +1705,7 @@
654D18DA25F9424700BB6DB0 /* EQNUtility+Extensions.swift in Sources */,
DC0AE1BA2538204100111307 /* EQNPastquakes.m in Sources */,
65D9938A29219DEC00F2B0EB /* UIKit+Extensions.swift in Sources */,
6514FF6C2D720CBE000A7BD0 /* MapPinStyle.swift in Sources */,
8CF12CD921DE49B600613AC5 /* NotificationViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Sources/Earthquake Network/Constants.swift
+2
View File
@@ -56,6 +56,8 @@ extension UserDefaults {
static let UserReportExpandedView = "EQNData.UserReportExpandedView"
/// Se `true` visualizza le opzioni nella singole card in reti sismiche
static let AlertsShowCardOptions = "EQNetwork.AlertsShowAllCards"
/// Indica lo stile di pin da visualizzare nelle mappe
static let MapPinStyle = "EQNetwork.MapPinStyle"
// Migrazioni
static let AppMigrationV5_3 = "EQNUserDefaultMigrationV5_3"
Sources/Earthquake Network/Controllers/Seismic Networks/SeismicNetworksIntensityMapViewController.swift
+13 -9
View File
@@ -13,8 +13,11 @@ class SeismicNetworksIntensityMapViewController: EQNBaseMapViewController {
private let seismic: EQNSisma
private var shakemaps: [EQNShakemap] = []
private var pinStyle: EQNSeismicAnnotationView.Style = .circle
private var pinStyle: MapPinStyle {
get { AppPreferences.shared.mapPinStyle }
set { AppPreferences.shared.mapPinStyle = newValue }
}
override var isFilterViewVisible: Bool { false }
override var isCloseButtonVisible: Bool { false }
@@ -76,9 +79,9 @@ class SeismicNetworksIntensityMapViewController: EQNBaseMapViewController {
}
override func registerMapAnnotationViews() {
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.Style.full.identifier)
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.Style.light.identifier)
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.Style.circle.identifier)
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.identifier(for: .full))
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.identifier(for: .light))
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.identifier(for: .circle))
}
override func loadDataSource() {
@@ -130,7 +133,7 @@ class SeismicNetworksIntensityMapViewController: EQNBaseMapViewController {
}
private func nextPinStyle() {
pinStyle = pinStyle.next()
pinStyle.next()
reloadMap()
}
@@ -208,16 +211,17 @@ class SeismicNetworksIntensityMapViewController: EQNBaseMapViewController {
extension EQNMapAnnotationShakemap {
func toAnnotationView(
mapView: MKMapView,
style: EQNSeismicAnnotationView.Style,
style: MapPinStyle,
isUserSelection: Bool = false
) -> MKAnnotationView? {
switch style {
case .full, .light:
let identifier = style.identifier
let identifier = EQNSeismicAnnotationView.identifier(for: style)
let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: identifier, for: self) as! EQNSeismicAnnotationView
annotationView.magnitude = String(format: "M%.1f", shakemap.intensity)
annotationView.magnitude = String(format: "%.1f", shakemap.intensity)
annotationView.magnitudeTextColor = intensityTextColor ?? .black
annotationView.magnitudeBackgroundColor = intensityColor
annotationView.canShowCallout = true
return annotationView
case .circle:
return nil
Sources/Earthquake Network/Controllers/Seismic Networks/SeismicNetworksMapDetailViewController.swift
+12 -8
View File
@@ -16,7 +16,10 @@ protocol SeismicNetworksMapDetailViewControllerDelegate: AnyObject {
class SeismicNetworksMapDetailViewController: EQNBaseMapViewController {
private var pinStyle: EQNSeismicAnnotationView.Style = .full
private var pinStyle: MapPinStyle {
get { AppPreferences.shared.mapPinStyle }
set { AppPreferences.shared.mapPinStyle = newValue }
}
private let eqnSeismic = EQNSeismic.shared
// MARK: - State
@@ -103,9 +106,9 @@ class SeismicNetworksMapDetailViewController: EQNBaseMapViewController {
}
override func registerMapAnnotationViews() {
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.Style.full.identifier)
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.Style.light.identifier)
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.Style.circle.identifier)
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.identifier(for: .full))
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.identifier(for: .light))
mapView.register(EQNSeismicAnnotationView.self, forAnnotationViewWithReuseIdentifier: EQNSeismicAnnotationView.identifier(for: .circle))
}
override func loadDataSource() {
@@ -175,7 +178,7 @@ class SeismicNetworksMapDetailViewController: EQNBaseMapViewController {
// MARK: - Private
private func nextPinStyle() {
pinStyle = pinStyle.next()
pinStyle.next()
reloadMap()
}
@@ -246,12 +249,12 @@ class SeismicNetworksMapDetailViewController: EQNBaseMapViewController {
extension EQNMapAnnotationSeismic {
func toAnnotationView(
mapView: MKMapView,
style: EQNSeismicAnnotationView.Style,
style: MapPinStyle,
isUserSelection: Bool = false
) -> MKAnnotationView {
switch style {
case .full, .light:
let identifier = style.identifier
let identifier = EQNSeismicAnnotationView.identifier(for: style)
let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: identifier, for: self) as! EQNSeismicAnnotationView
annotationView.title = self.title
annotationView.subtitle = self.subtitle
@@ -261,7 +264,8 @@ extension EQNMapAnnotationSeismic {
annotationView.isUserSelection = isUserSelection
return annotationView
case .circle:
let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: style.identifier, for: self) as! EQNSeismicAnnotationView
let identifier = EQNSeismicAnnotationView.identifier(for: style)
let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: identifier, for: self) as! EQNSeismicAnnotationView
annotationView.image = image(height: EQNSeismicAnnotationView.CircleViewHeight,
isUserSelection: isUserSelection)
return annotationView
Sources/Earthquake Network/Models/AppPreferences.swift
+10
View File
@@ -29,4 +29,14 @@ class AppPreferences: NSObject {
get { UserDefaults.standard.bool(forKey: UserDefaults.AlertsShowCardOptions) }
set { UserDefaults.standard.set(newValue, forKey: UserDefaults.AlertsShowCardOptions) }
}
var mapPinStyle: MapPinStyle {
get {
let saved = UserDefaults.standard.integer(forKey: UserDefaults.MapPinStyle)
return MapPinStyle(rawValue: saved) ?? .circle
}
set {
UserDefaults.standard.set(newValue.rawValue, forKey: UserDefaults.MapPinStyle)
}
}
}
Sources/Earthquake Network/Models/Map annotation/MapPinStyle.swift
+23
View File
@@ -0,0 +1,23 @@
//
// MapPinStyle.swift
// Earthquake Network
//
// Created by Andrea Busi on 28/02/25.
// Copyright © 2025 Earthquake Network. All rights reserved.
//
import Foundation
enum MapPinStyle: Int, CaseIterable {
case circle
case light
case full
mutating func next() {
let all = Self.allCases
let idx = all.firstIndex(of: self)!
let next = all.index(after: idx)
let newValue = all[next == all.endIndex ? all.startIndex : next]
self = newValue
}
}
Sources/Earthquake Network/UI/EQNSeismicAnnotationView.swift
+14 -24
View File
@@ -12,27 +12,6 @@ import MapKit
class EQNSeismicAnnotationView: MKAnnotationView {
enum Style: CaseIterable {
case circle
case light
case full
var identifier: String {
return switch self {
case .circle: "EQNSeismicAnnotationViewCircle"
case .light: "EQNSeismicAnnotationViewLight"
case .full: "EQNSeismicAnnotationViewFull"
}
}
func next() -> Self {
let all = Self.allCases
let idx = all.firstIndex(of: self)!
let next = all.index(after: idx)
return all[next == all.endIndex ? all.startIndex : next]
}
}
private static let LabelHeight: CGFloat = 15.0
private static let MagnitudeHeight: CGFloat = 25.0
private static let MagnitudeWidth: CGFloat = 45.0
@@ -128,13 +107,13 @@ class EQNSeismicAnnotationView: MKAnnotationView {
backgroundColor = .clear
if reuseIdentifier == Style.full.identifier {
if reuseIdentifier == Self.identifier(for: .full) {
frame = CGRect(x: 0, y: 0, width: Self.FullViewWidth, height: Self.FullViewHeight)
setupFullUI()
} else if reuseIdentifier == Style.light.identifier {
} else if reuseIdentifier == Self.identifier(for: .light) {
frame = CGRect(x: 0, y: 0, width: Self.SmallViewWidth, height: Self.SmallViewHeight)
setupLightUI()
} else if reuseIdentifier == Style.circle.identifier {
} else if reuseIdentifier == Self.identifier(for: .circle) {
frame = CGRect(x: 0, y: 0, width: Self.CircleViewHeight, height: Self.CircleViewHeight)
setupCircleUI()
}
@@ -179,3 +158,14 @@ class EQNSeismicAnnotationView: MKAnnotationView {
addSubview(imageView)
}
}
extension EQNSeismicAnnotationView {
static func identifier(for style: MapPinStyle) -> String {
return switch style {
case .circle: "EQNSeismicAnnotationViewCircle"
case .light: "EQNSeismicAnnotationViewLight"
case .full: "EQNSeismicAnnotationViewFull"
}
}
}