From c43c951b92b10cf629a0088783f7c9bbf499e2f4 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 15 Apr 2024 11:00:36 -0400
Subject: [PATCH] Enable iPad multi-column navigation by default

---
 .../Keys/AppearanceKeys.swift                 |  6 +++++-
 .../Supporting Types/FeatureFlag.swift        |  1 -
 .../WidescreenNavigationPrefsView.swift       | 20 +++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Packages/TuskerPreferences/Sources/TuskerPreferences/Keys/AppearanceKeys.swift b/Packages/TuskerPreferences/Sources/TuskerPreferences/Keys/AppearanceKeys.swift
index c8ab1921..84782db7 100644
--- a/Packages/TuskerPreferences/Sources/TuskerPreferences/Keys/AppearanceKeys.swift
+++ b/Packages/TuskerPreferences/Sources/TuskerPreferences/Keys/AppearanceKeys.swift
@@ -29,7 +29,11 @@ struct TrailingSwipeActionsKey: MigratablePreferenceKey {
 }
 
 struct WidescreenNavigationModeKey: MigratablePreferenceKey {
-    static var defaultValue: WidescreenNavigationMode { .splitScreen }
+    static var defaultValue: WidescreenNavigationMode { .multiColumn }
+    
+    static func shouldMigrate(oldValue: WidescreenNavigationMode) -> Bool {
+        oldValue != .splitScreen
+    }
 }
 
 struct AttachmentBlurModeKey: MigratablePreferenceKey {
diff --git a/Packages/TuskerPreferences/Sources/TuskerPreferences/Supporting Types/FeatureFlag.swift b/Packages/TuskerPreferences/Sources/TuskerPreferences/Supporting Types/FeatureFlag.swift
index 9a060804..e8ed874e 100644
--- a/Packages/TuskerPreferences/Sources/TuskerPreferences/Supporting Types/FeatureFlag.swift	
+++ b/Packages/TuskerPreferences/Sources/TuskerPreferences/Supporting Types/FeatureFlag.swift	
@@ -8,6 +8,5 @@
 import Foundation
 
 public enum FeatureFlag: String, Codable {
-    case iPadMultiColumn = "ipad-multi-column"
     case iPadBrowserNavigation = "ipad-browser-navigation"
 }
diff --git a/Tusker/Screens/Preferences/Appearance/WidescreenNavigationPrefsView.swift b/Tusker/Screens/Preferences/Appearance/WidescreenNavigationPrefsView.swift
index 917910f0..e62628d0 100644
--- a/Tusker/Screens/Preferences/Appearance/WidescreenNavigationPrefsView.swift
+++ b/Tusker/Screens/Preferences/Appearance/WidescreenNavigationPrefsView.swift
@@ -42,17 +42,15 @@ struct WidescreenNavigationPrefsView: View {
                 Text("Split Screen")
             }
             
-            if preferences.hasFeatureFlag(.iPadMultiColumn) {
-                Spacer(minLength: 32)
-                
-                OptionView(
-                    content: MultiColumnNavigationPreview.self,
-                    value: .multiColumn,
-                    selection: $preferences.widescreenNavigationMode,
-                    startAnimation: startAnimationSignal
-                ) {
-                    Text("Multi-Column")
-                }
+            Spacer(minLength: 32)
+            
+            OptionView(
+                content: MultiColumnNavigationPreview.self,
+                value: .multiColumn,
+                selection: $preferences.widescreenNavigationMode,
+                startAnimation: startAnimationSignal
+            ) {
+                Text("Multi-Column")
             }
             
             Spacer()