From 176e4feaf846e186f27e54f1e77139f26ab17a90 Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Sat, 30 Dec 2023 07:34:47 +0100 Subject: [PATCH] Move tabbar label settings --- IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift | 8 -------- .../App/Tabs/Settings/TabbarEntriesSettingsView.swift | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift index 039f65c8..4edbb8f4 100644 --- a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift +++ b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift @@ -241,14 +241,6 @@ struct DisplaySettingsView: View { @ViewBuilder private var platformsSection: some View { @Bindable var userPreferences = userPreferences - if UIDevice.current.userInterfaceIdiom == .phone { - Section("iPhone") { - Toggle("settings.display.show-tab-label", isOn: $userPreferences.showiPhoneTabLabel) - } - #if !os(visionOS) - .listRowBackground(theme.primaryBackgroundColor) - #endif - } if UIDevice.current.userInterfaceIdiom == .pad { Section("iPad") { diff --git a/IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift b/IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift index 8bfcac03..0f26ffba 100644 --- a/IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift +++ b/IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift @@ -10,6 +10,7 @@ struct TabbarEntriesSettingsView: View { @State private var tabs = iOSTabs.shared var body: some View { + @Bindable var userPreferences = userPreferences Form { Section { Picker("settings.tabs.first-tab", selection: $tabs.firstTab) { @@ -41,6 +42,13 @@ struct TabbarEntriesSettingsView: View { #if !os(visionOS) .listRowBackground(theme.primaryBackgroundColor) #endif + + Section { + Toggle("settings.display.show-tab-label", isOn: $userPreferences.showiPhoneTabLabel) + } + #if !os(visionOS) + .listRowBackground(theme.primaryBackgroundColor) + #endif } .navigationTitle("settings.general.tabbarEntries") #if !os(visionOS)