1.1.2 RC

c22dev · Feb 22, 2024 · 4de4b23 · 4de4b23
1 parent 20880f3
commit 4de4b23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 78 deletions.
diff --git a/Geranium.xcodeproj/project.pbxproj b/Geranium.xcodeproj/project.pbxproj
@@ -835,7 +835,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = live.cclerc.geranium;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -874,7 +874,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = live.cclerc.geranium;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Geranium/LocSim/LocSimManager.swift b/Geranium/LocSim/LocSimManager.swift
@@ -73,40 +73,3 @@ extension LocationModel: CLLocationManagerDelegate {
         self.authorisationStatus = status
     }
 }
-
-
-func extractCoordinates(from url: String) -> (latitude: Double, longitude: Double)? {
-    var latitude: Double = 0.0
-    var longitude: Double = 0.0
-
-    if url.contains("maps.google") {
-        // Extracting coordinates from Google Maps link
-        if let range = url.range(of: #"@([-+]?\d*\.\d+),([-+]?\d*\.\d+)"#, options: .regularExpression) {
-            let coordinates = url[range]
-                .dropFirst()
-                .split(separator: ",")
-                .map { Double($0)! }
-            if coordinates.count == 2 {
-                latitude = coordinates[0]
-                longitude = coordinates[1]
-            }
-        }
-    } else if url.contains("maps.apple") {
-        // Extracting coordinates from Apple Maps link
-        if let range = url.range(of: #"&ll=([-+]?\d*\.\d+),([-+]?\d*\.\d+)&"#, options: .regularExpression) {
-            let coordinates = url[range]
-                .dropFirst(4)
-                .dropLast(1)
-                .split(separator: ",")
-                .map { Double($0)! }
-            if coordinates.count == 2 {
-                latitude = coordinates[0]
-                longitude = coordinates[1]
-            }
-        }
-    } else {
-        return nil // Unsupported URL
-    }
-
-    return (latitude, longitude)
-}
diff --git a/Geranium/LocSim/LocSimView.swift b/Geranium/LocSim/LocSimView.swift
@@ -20,8 +20,6 @@ struct LocSimView: View {
     @State private var appliedCust: Bool = false
     @State private var latTemp = ""
     @State private var longTemp = ""
-    @State private var stringTemp = ""
-    @State private var urldetected = false
     var body: some View {
             if #available(iOS 16.0, *) {
                 NavigationStack {
@@ -41,7 +39,6 @@ struct LocSimView: View {
                         CLLocationManager().requestAlwaysAuthorization()
                     }
             }
-            .ignoresSafeArea(.keyboard)
         .onAppear {
             LocationModel().requestAuthorisation()
         }
@@ -113,25 +110,8 @@ struct LocSimView: View {
             }
         }
         .alert("Enter your coordinates", isPresented: $appliedCust) {
-            if let url = UIPasteboard.general.string {
-                if url.contains("maps.google") || url.contains("maps.apple") {
-                    TextField("Enter your URL here...", text: $stringTemp)
-                        .onChange(of: stringTemp) { newValue in
-                            var coordinates = extractCoordinates(from: stringTemp)
-                            lat = coordinates!.latitude
-                            long = coordinates!.longitude
-                            urldetected = true
-                        }
-                }
-                else {
-                    TextField("Latitude", text: $latTemp)
-                    TextField("Longitude", text: $longTemp)
-                }
-            }
-            else {
-                TextField("Latitude", text: $latTemp)
-                TextField("Longitude", text: $longTemp)
-            }
+            TextField("Latitude", text: $latTemp)
+            TextField("Longitude", text: $longTemp)
             Button("OK", action: submit)
         } message: {
             Text("The location will be simulated on device\nPro tip: Press wherever on the map to move there.")
@@ -141,24 +121,8 @@ struct LocSimView: View {
         }
     }
     func submit() {
-        if !latTemp.isEmpty, !longTemp.isEmpty, !urldetected {
+        if !latTemp.isEmpty, !longTemp.isEmpty {
             LocSimManager.startLocSim(location: .init(latitude: Double(latTemp) ?? 0.0, longitude: Double(longTemp) ?? 0.0))
-            AlertKitAPI.present(
-                title: "Started !",
-                icon: .done,
-                style: .iOS17AppleMusic,
-                haptic: .success
-            )
-        }
-        if urldetected {
-            LocSimManager.startLocSim(location: .init(latitude: lat, longitude: long))
-            urldetected = false
-            AlertKitAPI.present(
-                title: "Started !",
-                icon: .done,
-                style: .iOS17AppleMusic,
-                haptic: .success
-            )
         }
         else {
             UIApplication.shared.alert(body: "Those are empty coordinates mate !")