Merge pull request #749 from OneBusAway/dependencies

Make ridiculous changes to how we ask for location services to placat…
OneBusAway · Oct 1, 2024 · 9b79182 · 9b79182
2 parents b5afb2c + f0c5039
commit 9b79182
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 11 deletions.
diff --git a/OBAKit/Mapping/MapViewController.swift b/OBAKit/Mapping/MapViewController.swift
@@ -202,7 +202,7 @@ class MapViewController: UIViewController,
 
         switch mapStatusViewState {
         case .notDetermined:
-            alert.addAction(title: OBALoc("locationservices_alert_request_access.button", value: "Allow Access to Location", comment: "")) { _ in
+            alert.addAction(title: Strings.continue) { _ in
                 self.application.locationService.requestInUseAuthorization()
             }
             alert.addAction(keepLocationOffButton)

diff --git a/OBAKit/Onboarding/RegionPicker/RegionPickerLocationAuthorizationView.swift b/OBAKit/Onboarding/RegionPicker/RegionPickerLocationAuthorizationView.swift
@@ -41,13 +41,6 @@ public struct RegionPickerLocationAuthorizationView<Provider: RegionProvider>: V
                 .cornerRadius(8)
                 .labelStyle(.titleAndIcon)
                 .foregroundColor(.white)
-
-                Button {
-                    regionProvider.automaticallySelectRegion = false
-                    dismiss()
-                } label: {
-                    Label(OBALoc("location_permission_bulletin.do_not_use_location_button_text", value: "Don't use my location", comment: "Button the user can tap on to disallow access to their location."), systemImage: "location.slash")
-                }
             }
             .symbolVariant(.fill)
             .tint(.blue) // .accentColor might fail LocationButton's contrast test, so we'll just use the standard blue.

diff --git a/OBAKit/Strings/en.lproj/Localizable.strings b/OBAKit/Strings/en.lproj/Localizable.strings
@@ -212,9 +212,6 @@
 /* No comment provided by engineer. */
 "locationservices_alert_off.title" = "OneBusAway works best with your location.";
 
-/* No comment provided by engineer. */
-"locationservices_alert_request_access.button" = "Allow Access to Location";
-
 /* No comment provided by engineer. */
 "locationservices_alert_request_precise_location_once.button" = "Allow Once";
 

diff --git a/OBAKit/Strings/es.lproj/Localizable.strings b/OBAKit/Strings/es.lproj/Localizable.strings
diff --git a/OBAKit/Strings/it.lproj/Localizable.strings b/OBAKit/Strings/it.lproj/Localizable.strings
diff --git a/OBAKit/Strings/pl.lproj/Localizable.strings b/OBAKit/Strings/pl.lproj/Localizable.strings
diff --git a/OBAKit/Strings/zh-Hans.lproj/Localizable.strings b/OBAKit/Strings/zh-Hans.lproj/Localizable.strings