Remove ios 16 conditions

meshtastic · Oct 5, 2024 · d477de8 · d477de8
1 parent 386042b
commit d477de8
Show file tree

Hide file tree

Showing 23 changed files with 385 additions and 597 deletions.
diff --git a/Localizable.xcstrings b/Localizable.xcstrings
@@ -11481,9 +11481,6 @@
     },
     "Map Tile Data" : {
 
-    },
-    "Map Type" : {
-
     },
     "map.centering" : {
       "extractionState" : "manual",

diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
@@ -1202,65 +1202,37 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 	@MainActor
 	public func getPositionFromPhoneGPS(destNum: Int64, fixedPosition: Bool) -> Position? {
 		var positionPacket = Position()
-		if #available(iOS 17.0, macOS 14.0, *) {
 
-			guard let lastLocation = LocationsHandler.shared.locationsArray.last else {
-				return nil
-			}
-
-			if lastLocation == CLLocation(latitude: 0, longitude: 0) {
-				return nil
-			}
+		guard let lastLocation = LocationsHandler.shared.locationsArray.last else {
+			return nil
+		}
 
-			positionPacket.latitudeI = Int32(lastLocation.coordinate.latitude * 1e7)
-			positionPacket.longitudeI = Int32(lastLocation.coordinate.longitude * 1e7)
-			let timestamp = lastLocation.timestamp
-			positionPacket.time = UInt32(timestamp.timeIntervalSince1970)
-			positionPacket.timestamp = UInt32(timestamp.timeIntervalSince1970)
-			positionPacket.altitude = Int32(lastLocation.altitude)
-			positionPacket.satsInView = UInt32(LocationsHandler.satsInView)
-			let currentSpeed = lastLocation.speed
-			if currentSpeed > 0 && (!currentSpeed.isNaN || !currentSpeed.isInfinite) {
-				positionPacket.groundSpeed = UInt32(currentSpeed)
-			}
-			let currentHeading = lastLocation.course
-			if (currentHeading > 0  && currentHeading <= 360) && (!currentHeading.isNaN || !currentHeading.isInfinite) {
-				positionPacket.groundTrack = UInt32(currentHeading)
-			}
-			/// Set location source for time
-			if !fixedPosition {
-				/// From GPS treat time as good
-				positionPacket.locationSource = Position.LocSource.locExternal
-			} else {
-				/// From GPS, but time can be old and have drifted
-				positionPacket.locationSource = Position.LocSource.locManual
-			}
+		if lastLocation == CLLocation(latitude: 0, longitude: 0) {
+			return nil
+		}
 
+		positionPacket.latitudeI = Int32(lastLocation.coordinate.latitude * 1e7)
+		positionPacket.longitudeI = Int32(lastLocation.coordinate.longitude * 1e7)
+		let timestamp = lastLocation.timestamp
+		positionPacket.time = UInt32(timestamp.timeIntervalSince1970)
+		positionPacket.timestamp = UInt32(timestamp.timeIntervalSince1970)
+		positionPacket.altitude = Int32(lastLocation.altitude)
+		positionPacket.satsInView = UInt32(LocationsHandler.satsInView)
+		let currentSpeed = lastLocation.speed
+		if currentSpeed > 0 && (!currentSpeed.isNaN || !currentSpeed.isInfinite) {
+			positionPacket.groundSpeed = UInt32(currentSpeed)
+		}
+		let currentHeading = lastLocation.course
+		if (currentHeading > 0  && currentHeading <= 360) && (!currentHeading.isNaN || !currentHeading.isInfinite) {
+			positionPacket.groundTrack = UInt32(currentHeading)
+		}
+		/// Set location source for time
+		if !fixedPosition {
+			/// From GPS treat time as good
+			positionPacket.locationSource = Position.LocSource.locExternal
 		} else {
-
-			positionPacket.latitudeI = Int32(LocationHelper.currentLocation.latitude * 1e7)
-			positionPacket.longitudeI = Int32(LocationHelper.currentLocation.longitude * 1e7)
-			let timestamp = LocationHelper.shared.locationManager.location?.timestamp ?? Date()
-			positionPacket.time = UInt32(timestamp.timeIntervalSince1970)
-			positionPacket.timestamp = UInt32(timestamp.timeIntervalSince1970)
-			positionPacket.altitude = Int32(LocationHelper.shared.locationManager.location?.altitude ?? 0)
-			positionPacket.satsInView = UInt32(LocationHelper.satsInView)
-			let currentSpeed = LocationHelper.shared.locationManager.location?.speed ?? 0
-			if currentSpeed > 0 && (!currentSpeed.isNaN || !currentSpeed.isInfinite) {
-				positionPacket.groundSpeed = UInt32(currentSpeed)
-			}
-			let currentHeading  = LocationHelper.shared.locationManager.location?.course ?? 0
-			if (currentHeading > 0  && currentHeading <= 360) && (!currentHeading.isNaN || !currentHeading.isInfinite) {
-				positionPacket.groundTrack = UInt32(currentHeading)
-			}
-			/// Set location source for time
-			if !fixedPosition {
-				/// From GPS treat time as good
-				positionPacket.locationSource = Position.LocSource.locExternal
-			} else {
-				/// From GPS, but time can be old and have drifted
-				positionPacket.locationSource = Position.LocSource.locManual
-			}
+			/// From GPS, but time can be old and have drifted
+			positionPacket.locationSource = Position.LocSource.locManual
 		}
 		return positionPacket
 	}

diff --git a/Meshtastic/MeshtasticApp.swift b/Meshtastic/MeshtasticApp.swift
@@ -5,7 +5,6 @@ import CoreData
 import OSLog
 import TipKit
 
-@available(iOS 17.0, *)
 @main
 struct MeshtasticAppleApp: App {
 
@@ -109,23 +108,21 @@ struct MeshtasticAppleApp: App {
 				}
 			})
 			.task {
-				if #available(iOS 17.0, macOS 14.0, *) {
-					#if DEBUG
-					/// Optionally, call `Tips.resetDatastore()` before `Tips.configure()` to reset the state of all tips. This will allow tips to re-appear even after they have been dismissed by the user.
-					/// This is for testing only, and should not be enabled in release builds.
-					try? Tips.resetDatastore()
-					#endif
-
-					try? Tips.configure(
-						[
-							// Reset which tips have been shown and what parameters have been tracked, useful during testing and for this sample project
-							.datastoreLocation(.applicationDefault),
-							// When should the tips be presented? If you use .immediate, they'll all be presented whenever a screen with a tip appears.
-							// You can adjust this on per tip level as well
-							.displayFrequency(.immediate)
-						]
-					)
-				}
+				#if DEBUG
+				/// Optionally, call `Tips.resetDatastore()` before `Tips.configure()` to reset the state of all tips. This will allow tips to re-appear even after they have been dismissed by the user.
+				/// This is for testing only, and should not be enabled in release builds.
+				try? Tips.resetDatastore()
+				#endif
+
+				try? Tips.configure(
+					[
+						// Reset which tips have been shown and what parameters have been tracked, useful during testing and for this sample project
+						.datastoreLocation(.applicationDefault),
+						// When should the tips be presented? If you use .immediate, they'll all be presented whenever a screen with a tip appears.
+						// You can adjust this on per tip level as well
+						.displayFrequency(.immediate)
+					]
+				)
 			}
 		}
 		.onChange(of: scenePhase) { (newScenePhase) in

diff --git a/Meshtastic/MeshtasticAppDelegate.swift b/Meshtastic/MeshtasticAppDelegate.swift
@@ -9,24 +9,21 @@ import SwiftUI
 import OSLog
 
 class MeshtasticAppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, ObservableObject {
-	
+
 	var router: Router?
-	
+
 	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
 		Logger.services.info("🚀 [App] Meshtstic Apple App launched!")
 		// Default User Default Values
 		UserDefaults.standard.register(defaults: ["meshMapRecentering": true])
 		UserDefaults.standard.register(defaults: ["meshMapShowNodeHistory": true])
 		UserDefaults.standard.register(defaults: ["meshMapShowRouteLines": true])
 		UNUserNotificationCenter.current().delegate = self
-		if #available(iOS 17.0, macOS 14.0, *) {
-			let locationsHandler = LocationsHandler.shared
-			locationsHandler.startLocationUpdates()
-
-			// If a background activity session was previously active, reinstantiate it after the background launch.
-			if locationsHandler.backgroundActivity {
-				locationsHandler.backgroundActivity = true
-			}
+		let locationsHandler = LocationsHandler.shared
+		locationsHandler.startLocationUpdates()
+		// If a background activity session was previously active, reinstantiate it after the background launch.
+		if locationsHandler.backgroundActivity {
+			locationsHandler.backgroundActivity = true
 		}
 		return true
 	}
@@ -38,19 +35,18 @@ class MeshtasticAppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificat
 	) {
 		completionHandler([.list, .banner, .sound])
 	}
-	
+
 	// This method is called when a user clicks on the notification
 	func userNotificationCenter(
 		_ center: UNUserNotificationCenter,
 		didReceive response: UNNotificationResponse,
 		withCompletionHandler completionHandler: @escaping () -> Void
 	) {
 		let userInfo = response.notification.request.content.userInfo
-		
+
 		switch response.actionIdentifier {
 		case UNNotificationDefaultActionIdentifier:
 			break
-
 		case "messageNotification.thumbsUpAction":
 			if let channel = userInfo["channel"] as? Int32,
 			   let replyID = userInfo["messageId"] as? Int64 {
@@ -66,7 +62,6 @@ class MeshtasticAppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificat
 				Logger.services.error("Failed to retrieve channel or messageId from userInfo")
 			}
 			break
-
 		case "messageNotification.thumbsDownAction":
 			if let channel = userInfo["channel"] as? Int32,
 			   let replyID = userInfo["messageId"] as? Int64 {
@@ -82,7 +77,6 @@ class MeshtasticAppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificat
 				Logger.services.error("Failed to retrieve channel or messageId from userInfo")
 			}
 			break
-
 		case "messageNotification.replyInputAction":
 			if let userInput = (response as? UNTextInputNotificationResponse)?.userText,
 			   let channel = userInfo["channel"] as? Int32,
@@ -99,11 +93,10 @@ class MeshtasticAppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificat
 				Logger.services.error("Failed to retrieve user input, channel, or messageId from userInfo")
 			}
 			break
-
 		default:
 			break
 		}
-		
+
 		if let targetValue = userInfo["target"] as? String,
 		   let deepLink = userInfo["path"] as? String,
 		   let url = URL(string: deepLink) {
@@ -112,7 +105,6 @@ class MeshtasticAppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificat
 		} else {
 			Logger.services.error("Failed to handle notification response: \(userInfo)")
 		}
-
 		completionHandler()
 	}
 }
diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift
@@ -47,9 +47,7 @@ struct Connect: View {
 					if bleManager.isSwitchedOn {
 						Section(header: Text("connected.radio").font(.title)) {
 							if let connectedPeripheral = bleManager.connectedPeripheral, connectedPeripheral.peripheral.state == .connected {
-								if #available(iOS 17.0, macOS 14.0, *) {
-									TipView(BluetoothConnectionTip(), arrowEdge: .bottom)
-								}
+								TipView(BluetoothConnectionTip(), arrowEdge: .bottom)
 								VStack(alignment: .leading) {
 									HStack {
 										VStack(alignment: .center) {
@@ -76,12 +74,10 @@ struct Connect: View {
 													.foregroundColor(.green)
 											} else {
 												HStack {
-													if #available(iOS 17.0, macOS 14.0, *) {
-														Image(systemName: "square.stack.3d.down.forward")
-															.symbolRenderingMode(.multicolor)
-															.symbolEffect(.variableColor.reversing.cumulative, options: .repeat(20).speed(3))
-															.foregroundColor(.orange)
-													}
+													Image(systemName: "square.stack.3d.down.forward")
+														.symbolRenderingMode(.multicolor)
+														.symbolEffect(.variableColor.reversing.cumulative, options: .repeat(20).speed(3))
+														.foregroundColor(.orange)
 													Text("communicating").font(.callout)
 														.foregroundColor(.orange)
 												}

diff --git a/Meshtastic/Views/ContentView.swift b/Meshtastic/Views/ContentView.swift
@@ -4,7 +4,6 @@
 
 import SwiftUI
 
-@available(iOS 17.0, *)
 struct ContentView: View {
 	@ObservedObject
 	var appState: AppState
@@ -39,20 +38,12 @@ struct ContentView: View {
 			}
 			.tag(NavigationState.Tab.nodes)
 
-			if #available(iOS 17.0, macOS 14.0, *), !UserDefaults.mapUseLegacy {
-				MeshMap(router: appState.router)
-					.tabItem {
-						Label("map", systemImage: "map")
-					}
-					.tag(NavigationState.Tab.map)
-			} else {
-				NodeMap(router: appState.router)
-					.tabItem {
-						Label("map", systemImage: "map")
-					}
-					.tag(NavigationState.Tab.map)
-			}
-
+			MeshMap(router: appState.router)
+				.tabItem {
+					Label("map", systemImage: "map")
+				}
+				.tag(NavigationState.Tab.map)
+
 			Settings(
 				router: appState.router
 			)