diff --git a/IceCubesApp/App/IceCubesApp.swift b/IceCubesApp/App/IceCubesApp.swift index 74dfe447..bc37af5b 100644 --- a/IceCubesApp/App/IceCubesApp.swift +++ b/IceCubesApp/App/IceCubesApp.swift @@ -146,7 +146,13 @@ struct IceCubesApp: App { ForEach(availableTabs) { tab in tab.makeContentView(popToRootTab: $popToRootTab) .tabItem { - tab.label + if userPreferences.showiPhoneTabLabel { + tab.label + .labelStyle(TitleAndIconLabelStyle()) + } else { + tab.label + .labelStyle(IconOnlyLabelStyle()) + } } .tag(tab) .badge(badgeFor(tab: tab)) diff --git a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift index 1e67af7e..3052cd6a 100644 --- a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift +++ b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift @@ -98,7 +98,14 @@ struct DisplaySettingsView: View { Toggle("settings.display.translate-button", isOn: $userPreferences.showTranslateButton) } .listRowBackground(theme.primaryBackgroundColor) - + + if UIDevice.current.userInterfaceIdiom == .phone { + Section("settings.display.section.phone") { + Toggle("settings.display.show-tab-label", isOn: $userPreferences.showiPhoneTabLabel) + } + .listRowBackground(theme.primaryBackgroundColor) + } + if UIDevice.current.userInterfaceIdiom == .pad { Section("settings.display.section.ipad") { Toggle("settings.display.show-ipad-column", isOn: $userPreferences.showiPadSecondaryColumn) diff --git a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings index 9d9e4645..50268854 100644 --- a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Enable secondary column"; diff --git a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings index 761c010a..0ff496c6 100644 --- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings @@ -154,6 +154,9 @@ "settings.haptic.tab-selection" = "Tabauswahl"; "settings.haptic.buttons" = "Knopfdruck"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Zweite Spalte aktivieren"; diff --git a/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings index 69dff178..27281ed9 100644 --- a/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings @@ -160,6 +160,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Enable secondary column"; diff --git a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings index b718a1b0..6e84af04 100644 --- a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings @@ -158,6 +158,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Enable secondary column"; diff --git a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings index 3a9cb1b2..c8fa3222 100644 --- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings @@ -154,6 +154,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Enable secondary column"; diff --git a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings index 4818d853..828c411a 100644 --- a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "Sélection d'onglet"; "settings.haptic.buttons" = "Appui bouton"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Activer la colonne secondaire"; diff --git a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings index 8ec2533a..ad4094ca 100644 --- a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "Selezione Tab"; "settings.haptic.buttons" = "Pressione dei bottoni"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Attiva la seconda colonna"; diff --git a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings index 4a8e69fb..e826554d 100644 --- a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "タブセレクト"; "settings.haptic.buttons" = "ボタン操作時"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "タブ名を表示"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "セカンドカラムを有効にする"; diff --git a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings index cd608b60..073fe802 100644 --- a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "하단 탭 바를 누를 때"; "settings.haptic.buttons" = "버튼을 누를 때"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Enable secondary column"; diff --git a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings index 4d52581d..9365da4f 100644 --- a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Enable secondary column"; diff --git a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings index 6c7af6d1..b51d09a9 100644 --- a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings @@ -154,6 +154,9 @@ "settings.haptic.tab-selection" = "Tabselectie"; "settings.haptic.buttons" = "Knoppen"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Toon tweede kolom"; diff --git a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings index bbc8acbd..28418e89 100644 --- a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "Wybór zakładki"; "settings.haptic.buttons" = "Naciśnięcie przycisku"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Włącz dodatkową kolumnę"; diff --git a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings index 8a26ac8e..656791aa 100644 --- a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Enable secondary column"; diff --git a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings index f32e3358..cb472ad8 100644 --- a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab name"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "Enable secondary column"; diff --git a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings index 7552702a..4f57430b 100644 --- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.display.font.custom" = "自定义"; "settings.display.font.scaling-%@" = "字体缩放:%@"; +"settings.display.section.phone" = "iPhone"; +"settings.display.show-tab-label" = "Show tab label"; + "settings.display.section.ipad" = "iPad"; "settings.display.show-ipad-column" = "启用边栏"; diff --git a/Packages/Env/Sources/Env/UserPreferences.swift b/Packages/Env/Sources/Env/UserPreferences.swift index 02917869..1f5f2fca 100644 --- a/Packages/Env/Sources/Env/UserPreferences.swift +++ b/Packages/Env/Sources/Env/UserPreferences.swift @@ -36,6 +36,8 @@ public class UserPreferences: ObservableObject { @AppStorage("haptic_timeline") public var hapticTimelineEnabled = true @AppStorage("haptic_button_press") public var hapticButtonPressEnabled = true + @AppStorage("show_tab_label_iphone") public var showiPhoneTabLabel = true + @AppStorage("show_second_column_ipad") public var showiPadSecondaryColumn = true public var postVisibility: Models.Visibility {