diff --git a/IceCubesApp/App/IceCubesApp.swift b/IceCubesApp/App/IceCubesApp.swift index 3223d4ce..74dfe447 100644 --- a/IceCubesApp/App/IceCubesApp.swift +++ b/IceCubesApp/App/IceCubesApp.swift @@ -114,7 +114,8 @@ struct IceCubesApp: App { } } if proxy.frame(in: .global).width > (.maxColumnWidth + .secondaryColumnWidth), - appAccountsManager.currentClient.isAuth + appAccountsManager.currentClient.isAuth, + userPreferences.showiPadSecondaryColumn { Divider().edgesIgnoringSafeArea(.all) NotificationsTab(popToRootTab: $popToRootTab, lockedType: nil) diff --git a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift index d70fde6d..4c9f6bdf 100644 --- a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift +++ b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift @@ -85,9 +85,18 @@ struct DisplaySettingsView: View { Text("settings.display.font.scaling-\(String(format: "%.1f", userPreferences.fontSizeScale))") .font(.scaledBody) } + .alignmentGuide(.listRowSeparatorLeading) { d in + d[.leading] + } Toggle("settings.display.translate-button", isOn: $userPreferences.showTranslateButton) } .listRowBackground(theme.primaryBackgroundColor) + + if UIDevice.current.userInterfaceIdiom == .pad { + Section("settings.display.section.ipad") { + Toggle("settings.display.show-ipad-column", isOn: $userPreferences.showiPadSecondaryColumn) + } + } Section { Button { diff --git a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings index 49453a2e..f18146ac 100644 --- a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings @@ -155,6 +155,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Exploreu"; "tab.federated" = "Federat"; diff --git a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings index be7c0008..9c232fa2 100644 --- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings @@ -153,6 +153,9 @@ "settings.haptic.tab-selection" = "Tabauswahl"; "settings.haptic.buttons" = "Knopfdruck"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + "enum.expand-media.show" = "Alle zeigen"; "enum.expand-media.hide" = "Alle ausblenden"; "enum.expand-media.hide-sensitive" = "Sensible ausblenden"; diff --git a/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings index acbe86fc..1cd286a9 100644 --- a/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Explore"; "tab.federated" = "Federated"; diff --git a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings index 038869d6..bfb4965b 100644 --- a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings @@ -157,6 +157,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Explore"; "tab.federated" = "Federated"; diff --git a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings index c8ce06b4..03ca6031 100644 --- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings @@ -153,6 +153,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + "enum.expand-media.show" = "Siempre"; "enum.expand-media.hide" = "Nunca"; "enum.expand-media.hide-sensitive" = "Ocultar contenido sensible"; diff --git a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings index cae85b87..c99d5acf 100644 --- a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "Sélection d'onglet"; "settings.haptic.buttons" = "Appui bouton"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Explorer"; "tab.federated" = "Fédéré"; diff --git a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings index 851d6924..f4f01f58 100644 --- a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "Selezione Tab"; "settings.haptic.buttons" = "Pressione dei bottoni"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Esplora"; "tab.federated" = "Federazione"; diff --git a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings index aeb93d0b..d9a1a311 100644 --- a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "タブセレクト"; "settings.haptic.buttons" = "ボタン操作時"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "エクスプローラー"; "tab.federated" = "連合"; diff --git a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings index 8cb1dfb4..2d3c7ca9 100644 --- a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "하단 탭 바를 누를 때"; "settings.haptic.buttons" = "버튼을 누를 때"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "둘러보기"; "tab.federated" = "연합"; diff --git a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings index 3a88b9af..839b61e2 100644 --- a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Utforsk"; "tab.federated" = "Federert"; diff --git a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings index e17ecdf7..76daee36 100644 --- a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings @@ -153,6 +153,9 @@ "settings.haptic.tab-selection" = "Tabselectie"; "settings.haptic.buttons" = "Knoppen"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Ontdekken"; "tab.federated" = "Gefedereerd"; diff --git a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings index 3d38798e..e99a87fb 100644 --- a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "Wybór zakładki"; "settings.haptic.buttons" = "Naciśnięcie przycisku"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Odkrywaj"; "tab.federated" = "Globalny"; diff --git a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings index dfc0a21b..b927852e 100644 --- a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Explorar"; "tab.federated" = "Linha global"; diff --git a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings index ad7f581f..7ba26f08 100644 --- a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.haptic.tab-selection" = "Tab Selection"; "settings.haptic.buttons" = "Button Press"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "Keşfet"; "tab.federated" = "Birleştirilmiş"; diff --git a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings index 3fc81dbd..266c15be 100644 --- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings @@ -156,6 +156,9 @@ "settings.display.font.custom" = "自定义"; "settings.display.font.scaling-%@" = "字体缩放:%@"; +"settings.display.section.ipad" = "iPad"; +"settings.display.show-ipad-column" = "Enable secondary column"; + // MARK: Tabs "tab.explore" = "探索"; "tab.federated" = "跨站"; diff --git a/Packages/Env/Sources/Env/UserPreferences.swift b/Packages/Env/Sources/Env/UserPreferences.swift index 3a25b0cb..02917869 100644 --- a/Packages/Env/Sources/Env/UserPreferences.swift +++ b/Packages/Env/Sources/Env/UserPreferences.swift @@ -35,6 +35,8 @@ public class UserPreferences: ObservableObject { @AppStorage("haptic_tab") public var hapticTabSelectionEnabled = true @AppStorage("haptic_timeline") public var hapticTimelineEnabled = true @AppStorage("haptic_button_press") public var hapticButtonPressEnabled = true + + @AppStorage("show_second_column_ipad") public var showiPadSecondaryColumn = true public var postVisibility: Models.Visibility { if useInstanceContentSettings {