Skip to content

Commit 334ea95

Browse files
authored
Merge pull request #25 from tkgka/main
2 parents 7504a51 + 9f7503f commit 334ea95

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

Sources/Views/SettingPicker.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ struct SettingPickerChoicesView: View {
233233

234234
var body: some View {
235235
SettingPageView(title: title, navigationTitleDisplayMode: choicesConfiguration.pageNavigationTitleDisplayMode) {
236-
SettingGroupView(
236+
let settingGroupView = SettingGroupView(
237237
header: choicesConfiguration.groupHeader,
238238
footer: choicesConfiguration.groupFooter,
239239
horizontalPadding: choicesConfiguration.groupHorizontalPadding,
@@ -262,6 +262,14 @@ struct SettingPickerChoicesView: View {
262262
.buttonStyle(.row)
263263
}
264264
}
265+
#if os(iOS)
266+
if #available(iOS 16.0, *) {
267+
settingGroupView.toolbar(.hidden, for: .tabBar)
268+
} else {
269+
settingGroupView
270+
}
271+
#endif
272+
settingGroupView
265273
}
266274
}
267275
}

Sources/Views/SettingView.swift

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,22 @@ public struct SettingView: View {
5454
.buttonStyle(.row)
5555
.background {
5656
NavigationLink(isActive: $isActive) {
57-
SettingView(setting: page, isPagePreview: false)
57+
#if os(iOS)
58+
if #available(iOS 16.0, *) {
59+
SettingView(setting: page, isPagePreview: false)
60+
.toolbar(.hidden, for: .tabBar)
61+
} else {
62+
SettingView(setting: page, isPagePreview: false)
63+
}
64+
#else
65+
SettingView(setting: page, isPagePreview: false)
66+
#endif
5867
} label: {
5968
EmptyView()
6069
}
6170
.opacity(0)
6271
}
63-
72+
6473
} else {
6574
SettingPageView(
6675
title: page.title,

0 commit comments

Comments
 (0)