Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deprecation: init(destination:isActive:label:)' was deprecated in iOS 16.0 #776

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Fix deprecation: init(destination:isActive:label:)' was deprecated in iOS 16.0 #776

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d22b2d
Update RegionPickerView.swift
manu-r12 Dec 3, 2024
8fcf198
remove extra whitespace
manu-r12 Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 73 additions & 58 deletions OBAKit/Onboarding/RegionPicker/RegionPickerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,74 +59,89 @@ public struct RegionPickerView<Provider: RegionProvider>: View, OnboardingView {
@State var isShowingCustomRegionSheet: Bool = false

public var body: some View {
List {
Toggle("Automatically select region", isOn: $regionProvider.automaticallySelectRegion)
Picker("", selection: $selectedRegion) {
ForEach(filteredRegions, id: \.self) { region in
cell(for: region)
.tag(Optional(region)) // The tag type must match the selection type (an *optional* Region)
NavigationStack {
List {
Toggle(
"Automatically select region",
isOn: $regionProvider.automaticallySelectRegion)
Picker("", selection: $selectedRegion) {
ForEach(filteredRegions, id: \.self) { region in
cell(for: region)
.tag(Optional(region)) // The tag type must match the selection type (an *optional* Region)
}
}
.disabled(regionProvider.automaticallySelectRegion)
.pickerStyle(.inline)
.labelsHidden() // Hide picker header (title)
}
.disabled(regionProvider.automaticallySelectRegion)
.pickerStyle(.inline)
.labelsHidden() // Hide picker header (title)
}
// List modifiers
.listSectionSeparator(.hidden)
.listStyle(.plain)
.refreshable(action: doRefreshRegions)
.disabled(disableInteractions)

// Lifecycle-related modifiers
.onAppear(perform: setCurrentRegionIfPresent)
.onChange(of: regionProvider.currentRegion, initial: false) { _, newRegion in
// When the user selects to automatically select a region, update
// selectedRegion with the new current region.
if regionProvider.automaticallySelectRegion {
self.selectedRegion = newRegion
// List modifiers
.listSectionSeparator(.hidden)
.listStyle(.plain)
.refreshable(action: doRefreshRegions)
.disabled(disableInteractions)
.navigationDestination(isPresented: $isShowingCustomRegionSheet) {
RegionCustomForm(
regionProvider: regionProvider,
editingRegion: $editingRegion
)
}
}

// Presentation-related modifiers
.errorAlert(error: $taskError)
.background {
// TODO: I hate this. iOS 16 has NavigationStack, so use it when we drop iOS 15.
NavigationLink(destination: RegionCustomForm(regionProvider: regionProvider, editingRegion: $editingRegion), isActive: $isShowingCustomRegionSheet) {
EmptyView()
// Lifecycle-related modifiers
.onAppear(perform: setCurrentRegionIfPresent)
.onChange(of: regionProvider.currentRegion) { [regionProvider] _ in
// When the user selects to automatically select a region, update
// selectedRegion with the new current region.
if regionProvider.automaticallySelectRegion {
self.selectedRegion = regionProvider.currentRegion
}
}
.accessibilityHidden(true)
}

// Supplementary views
.safeAreaInset(edge: .top) {
OnboardingHeaderView(imageSystemName: "globe", headerText: OBALoc("region_picker.title", value: "Choose Region", comment: "Title of the Region Picker Item, which lets the user choose a new region from the map."))
}
.safeAreaInset(edge: .bottom) {
VStack(spacing: 14) {
RegionPickerMap(mapRect: Binding(get: {
selectedRegion?.serviceRect
}, set: { _ in }), mapHeight: 200)
.zIndex(-1) // Make the Map moving transition occur below the [Continue] button.

TaskButton(action: doSetCurrentRegion) {
Text(Strings.continue)
.font(.headline)
.frame(maxWidth: .infinity, minHeight: 32)
}
.disabled(selectedRegion == nil || disableInteractions)
.buttonStyle(.borderedProminent)
// Presentation-related modifiers
.errorAlert(error: $taskError)
.background(.background)

regionOptions
// Supplementary views
.safeAreaInset(edge: .top) {
OnboardingHeaderView(
imageSystemName: "globe",
headerText: OBALoc(
"region_picker.title", value: "Choose Region",
comment:
"Title of the Region Picker Item, which lets the user choose a new region from the map."
))
}
.safeAreaInset(edge: .bottom) {
VStack(spacing: 14) {
RegionPickerMap(
mapRect: Binding(
get: {
selectedRegion?.serviceRect
}, set: { _ in }), mapHeight: 200
)
.zIndex(-1) // Make the Map moving transition occur below the [Continue] button.

TaskButton(action: doSetCurrentRegion) {
Text(Strings.continue)
.font(.headline)
.frame(maxWidth: .infinity, minHeight: 32)
}
.disabled(selectedRegion == nil || disableInteractions)
.buttonStyle(.borderedProminent)

regionOptions
}
.background(.background)
}
.background(.background)
}

// Global
.interactiveDismissDisabled(selectedRegion == nil || disableInteractions)
.navigationBarHidden(true)
.padding()
// Global
.interactiveDismissDisabled(
selectedRegion == nil || disableInteractions
)
.navigationBarHidden(true)
.padding()
}
}

manu-r12 marked this conversation as resolved.
Show resolved Hide resolved
@ViewBuilder
func cell(for region: Region) -> some View {
Label {
Expand Down
Loading