diff --git a/berkeley-mobile/Data/BMEventManager.swift b/berkeley-mobile/Data/BMEventManager.swift index 826acb78f..7e1c23a58 100644 --- a/berkeley-mobile/Data/BMEventManager.swift +++ b/berkeley-mobile/Data/BMEventManager.swift @@ -18,11 +18,7 @@ class BMEventManager { private(set) var doesEventsExistInCalendarDict: [String: Bool] = [:] func addEventToCalendar(calendarEvent: BMCalendarEvent) async throws { - if #available(iOS 17.0, *) { - try await eventStore.requestFullAccessToEvents() - } else { - try await eventStore.requestAccess(to: .event) - } + try await eventStore.requestAccess(to: .event) try await saveEvent(calendarEvent) @@ -110,11 +106,10 @@ class BMEventManager { do { try eventStore.save(event, span: .thisEvent) - if #available(iOS 17.0, *) { - let authStatus = EKEventStore.authorizationStatus(for: .event) - if authStatus == .writeOnly { - throw BMError.mayExistedInCalendarAlready - } + + let authStatus = EKEventStore.authorizationStatus(for: .event) + if authStatus == .writeOnly { + throw BMError.mayExistedInCalendarAlready } } catch { if let ekError = error as? EKError, ekError.errorCode == 1 { diff --git a/berkeley-mobile/Home/BMHomeSectionListView.swift b/berkeley-mobile/Home/BMHomeSectionListView.swift index f4c6b7fa4..931452c0a 100644 --- a/berkeley-mobile/Home/BMHomeSectionListView.swift +++ b/berkeley-mobile/Home/BMHomeSectionListView.swift @@ -27,14 +27,7 @@ struct BMHomeSectionListView: View { if #unavailable(iOS 26.0) { sectionHeaderView } - - if #available(iOS 17.0, *) { - listView - .contentMargins(.top, 0) - .contentMargins([.leading, .trailing], 5) - } else { - listView - } + listView } .padding() .background(Color(BMColor.cardBackground)) diff --git a/berkeley-mobile/Home/Map/MapUserLocationButton.swift b/berkeley-mobile/Home/Map/MapUserLocationButton.swift index 177058dbc..9b9489b3f 100644 --- a/berkeley-mobile/Home/Map/MapUserLocationButton.swift +++ b/berkeley-mobile/Home/Map/MapUserLocationButton.swift @@ -48,14 +48,7 @@ struct MapUserLocationButton: View { } } }) { - if #available(iOS 17.0, *) { - locationImage - .contentTransition ( - .symbolEffect(.replace) - ) - } else { - locationImage - } + locationImage } .buttonStyle(BMControlButtonStyle()) } diff --git a/berkeley-mobile/Safety/SafetyLogDetailView.swift b/berkeley-mobile/Safety/SafetyLogDetailView.swift index 14d20fc3d..3e5e04328 100644 --- a/berkeley-mobile/Safety/SafetyLogDetailView.swift +++ b/berkeley-mobile/Safety/SafetyLogDetailView.swift @@ -29,14 +29,8 @@ struct SafetyLogDetailView: View { if let selectedSafetyLog = selectedSafetyLog { let mapRegion = MKCoordinateRegion(center: selectedSafetyLog.coordinate, span: MKCoordinateSpan(latitudeDelta: 0.01, longitudeDelta: 0.01)) Group { - if #available(iOS 17.0, *) { - Map(bounds: MapCameraBounds(centerCoordinateBounds: mapRegion, minimumDistance: 2000)) { - SafetyMapMarker(safetyLog: selectedSafetyLog) - } - } else { - Map(coordinateRegion: .constant(mapRegion), annotationItems: [selectedSafetyLog]) { safetyLog in - MapPin(coordinate: safetyLog.coordinate) - } + Map(coordinateRegion: .constant(mapRegion), annotationItems: [selectedSafetyLog]) { safetyLog in + MapPin(coordinate: safetyLog.coordinate) } } .allowsHitTesting(false) diff --git a/berkeley-mobile/Safety/SafetyMapMarker.swift b/berkeley-mobile/Safety/SafetyMapMarker.swift index 6f1c95f4e..6c9b41afe 100644 --- a/berkeley-mobile/Safety/SafetyMapMarker.swift +++ b/berkeley-mobile/Safety/SafetyMapMarker.swift @@ -9,7 +9,6 @@ import MapKit import SwiftUI -@available(iOS 17.0, *) struct SafetyMapMarker: MapContent { @EnvironmentObject var safetyViewModel: SafetyViewModel @@ -25,10 +24,8 @@ struct SafetyMapMarker: MapContent { } #Preview { - if #available(iOS 17.0, *) { - Map { - SafetyMapMarker(safetyLog: SafetyViewModel.getSampleSafetyLog()) - } - .environmentObject(SafetyViewModel()) + Map { + SafetyMapMarker(safetyLog: SafetyViewModel.getSampleSafetyLog()) } + .environmentObject(SafetyViewModel()) } diff --git a/berkeley-mobile/Safety/SafetyMapView.swift b/berkeley-mobile/Safety/SafetyMapView.swift index 2f41298e8..8fca34231 100644 --- a/berkeley-mobile/Safety/SafetyMapView.swift +++ b/berkeley-mobile/Safety/SafetyMapView.swift @@ -18,16 +18,9 @@ struct SafetyMapView: View { var isPresentingDetailView: Bool var body: some View { - if #available(iOS 17.0, *) { - SafetyNewMapView(selectedSafetyLog: $selectedSafetyLog, - isShowingLegend: $isShowingLegend, - drawerViewState: $drawerViewState, - isPresentingDetailView: isPresentingDetailView) - } else { - oldMapView - } + oldMapView } - + private var oldMapView: some View { Map(coordinateRegion: .constant(BMConstants.mapBoundsRegion), showsUserLocation: true, annotationItems: safetyViewModel.filteredSafetyLogs) { safetyLog in MapPin(coordinate: safetyLog.coordinate) @@ -39,7 +32,6 @@ struct SafetyMapView: View { // MARK: - SafetyNewMapView -@available(iOS 17.0, *) struct SafetyNewMapView: View { @EnvironmentObject var safetyViewModel: SafetyViewModel @@ -110,17 +102,8 @@ struct SafetyNewMapView: View { HStack(alignment: .top, spacing: 10) { if #unavailable(iOS 26.0) { VStack { - if #available(iOS 17.0, *) { - mapLegendButton - .contentTransition( - .symbolEffect(.replace) - ) - } else { - mapLegendButton - } - + mapLegendButton mapZoomInButton - } .buttonStyle(BMControlButtonStyle()) } @@ -203,7 +186,6 @@ struct SafetyNewMapView: View { } } -@available(iOS 17.0, *) #Preview { @Previewable @State var drawerViewState = BMDrawerViewState.medium SafetyMapView(selectedSafetyLog: .constant(nil), drawerViewState: $drawerViewState, isPresentingDetailView: false) diff --git a/berkeley-mobile/Safety/SafetyViewFilterScrollView.swift b/berkeley-mobile/Safety/SafetyViewFilterScrollView.swift index 8e9c455ac..77e926209 100644 --- a/berkeley-mobile/Safety/SafetyViewFilterScrollView.swift +++ b/berkeley-mobile/Safety/SafetyViewFilterScrollView.swift @@ -52,11 +52,6 @@ struct SafetyViewFilterScrollView: View { } } } - .modify { - if #available(iOS 17.0, *) { - $0.scrollClipDisabled() - } - } .scrollIndicators(.hidden) } }