Tabbar fix + bump to iOS 18

Dimillian · Jul 9, 2024 · 3ec5c8c · 3ec5c8c
1 parent 1008008
commit 3ec5c8c
Show file tree

Hide file tree

Showing 23 changed files with 118 additions and 86 deletions.
diff --git a/IceCubesApp.xcodeproj/project.pbxproj b/IceCubesApp.xcodeproj/project.pbxproj
@@ -1187,7 +1187,7 @@
 				INFOPLIST_FILE = IceCubesNotifications/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = IceCubesNotifications;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1222,7 +1222,7 @@
 				INFOPLIST_FILE = IceCubesNotifications/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = IceCubesNotifications;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1261,7 +1261,7 @@
 				INFOPLIST_FILE = IceCubesAppWidgetsExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = IceCubesAppWidgetsExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1297,7 +1297,7 @@
 				INFOPLIST_FILE = IceCubesAppWidgetsExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = IceCubesAppWidgetsExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1330,7 +1330,7 @@
 				INFOPLIST_FILE = IceCubesShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ice Cubes";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1364,7 +1364,7 @@
 				INFOPLIST_FILE = IceCubesShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ice Cubes";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1548,7 +1548,7 @@
 				"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
@@ -1573,7 +1573,7 @@
 				SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
-				_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = YES;
+				_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = NO;
 			};
 			name = Debug;
 		};
@@ -1615,7 +1615,7 @@
 				"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
@@ -1640,7 +1640,7 @@
 				SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
-				_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = YES;
+				_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = NO;
 			};
 			name = Release;
 		};
@@ -1659,7 +1659,7 @@
 				INFOPLIST_FILE = IceCubesActionExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Open in Ice Cube";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1694,7 +1694,7 @@
 				INFOPLIST_FILE = IceCubesActionExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Open in Ice Cube";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/IceCubesApp/App/Main/AppView.swift b/IceCubesApp/App/Main/AppView.swift
@@ -21,10 +21,10 @@ struct AppView: View {
   @Environment(\.openWindow) var openWindow
   @Environment(\.horizontalSizeClass) private var horizontalSizeClass
 
-  @Binding var selectedTab: Tab
+  @Binding var selectedTab: AppTab
   @Binding var appRouterPath: RouterPath
 
-  @State var popToRootTab: Tab = .other
+  @State var popToRootTab: AppTab = .other
   @State var iosTabs = iOSTabs.shared
   @State var sidebarTabs = SidebarTabs.shared
 
@@ -40,14 +40,14 @@ struct AppView: View {
     #endif
   }
 
-  var availableTabs: [Tab] {
+  var availableTabs: [AppTab] {
     guard appAccountsManager.currentClient.isAuth else {
-      return Tab.loggedOutTab()
+      return AppTab.loggedOutTab()
     }
     if UIDevice.current.userInterfaceIdiom == .phone || horizontalSizeClass == .compact {
       return iosTabs.tabs
     } else if UIDevice.current.userInterfaceIdiom == .vision {
-      return Tab.visionOSTab()
+      return AppTab.visionOSTab()
     }
     return sidebarTabs.tabs.map { $0.tab }
   }
@@ -96,7 +96,7 @@ struct AppView: View {
     .withSheetDestinations(sheetDestinations: $appRouterPath.presentedSheet)
   }
 
-  private func badgeFor(tab: Tab) -> Int {
+  private func badgeFor(tab: AppTab) -> Int {
     if tab == .notifications, selectedTab != tab,
        let token = appAccountsManager.currentAccount.oauthToken
     {
@@ -114,14 +114,15 @@ struct AppView: View {
         HStack(spacing: 0) {
           TabView(selection: $selectedTab) {
             ForEach(availableTabs) { tab in
-              tab
-                .makeContentView(selectedTab: $selectedTab, popToRootTab: $popToRootTab)
-                .tabItem {
-                  tab.label
-                }
-                .tag(tab)
+              Tab(value: tab) {
+                tab.makeContentView(selectedTab: $selectedTab, popToRootTab: $popToRootTab)
+              } label: {
+                tab.label
+              }
+              .defaultVisibility(.hidden, for: .automatic)
             }
           }
+          .tabViewStyle(.tabBarOnly)
           .introspect(.tabView, on: .iOS(.v17, .v18)) { (tabview: UITabBarController) in
             tabview.tabBar.isHidden = horizontalSizeClass == .regular
             tabview.customizableViewControllers = []

diff --git a/IceCubesApp/App/Main/IceCubesApp.swift b/IceCubesApp/App/Main/IceCubesApp.swift
@@ -28,7 +28,7 @@ struct IceCubesApp: App {
   @State var quickLook = QuickLook.shared
   @State var theme = Theme.shared
 
-  @State var selectedTab: Tab = .timeline
+  @State var selectedTab: AppTab = .timeline
   @State var appRouterPath = RouterPath()
 
   @State var isSupporter: Bool = false

diff --git a/IceCubesApp/App/SideBarView.swift b/IceCubesApp/App/SideBarView.swift
@@ -18,14 +18,14 @@ struct SideBarView<Content: View>: View {
   @Environment(UserPreferences.self) private var userPreferences
   @Environment(RouterPath.self) private var routerPath
 
-  @Binding var selectedTab: Tab
-  @Binding var popToRootTab: Tab
-  var tabs: [Tab]
+  @Binding var selectedTab: AppTab
+  @Binding var popToRootTab: AppTab
+  var tabs: [AppTab]
   @ViewBuilder var content: () -> Content
 
   @State private var sidebarTabs = SidebarTabs.shared
 
-  private func badgeFor(tab: Tab) -> Int {
+  private func badgeFor(tab: AppTab) -> Int {
     if tab == .notifications, selectedTab != tab,
        let token = appAccounts.currentAccount.oauthToken
     {
@@ -34,7 +34,7 @@ struct SideBarView<Content: View>: View {
     return 0
   }
 
-  private func makeIconForTab(tab: Tab) -> some View {
+  private func makeIconForTab(tab: AppTab) -> some View {
     HStack {
       ZStack(alignment: .topTrailing) {
         SideBarIcon(systemIconName: tab.iconName,
@@ -83,7 +83,7 @@ struct SideBarView<Content: View>: View {
         .offset(x: 2, y: -2)
     }
     .buttonStyle(.borderedProminent)
-    .help(Tab.post.title)
+    .help(AppTab.post.title)
   }
 
   private func makeAccountButton(account: AppAccount, showBadge: Bool) -> some View {
@@ -133,7 +133,7 @@ struct SideBarView<Content: View>: View {
     if let accountName {
       "tab.profile-account-\(accountName)"
     } else {
-      Tab.profile.title
+      AppTab.profile.title
     }
   }
 

diff --git a/IceCubesApp/App/Tabs/ExploreTab.swift b/IceCubesApp/App/Tabs/ExploreTab.swift
@@ -14,7 +14,7 @@ struct ExploreTab: View {
   @Environment(Client.self) private var client
   @State private var routerPath = RouterPath()
   @State private var scrollToTopSignal: Int = 0
-  @Binding var popToRootTab: Tab
+  @Binding var popToRootTab: AppTab
 
   var body: some View {
     NavigationStack(path: $routerPath.path) {

diff --git a/IceCubesApp/App/Tabs/MessagesTab.swift b/IceCubesApp/App/Tabs/MessagesTab.swift
@@ -16,7 +16,7 @@ struct MessagesTab: View {
   @Environment(AppAccountsManager.self) private var appAccount
   @State private var routerPath = RouterPath()
   @State private var scrollToTopSignal: Int = 0
-  @Binding var popToRootTab: Tab
+  @Binding var popToRootTab: AppTab
 
   var body: some View {
     NavigationStack(path: $routerPath.path) {

diff --git a/IceCubesApp/App/Tabs/NotificationTab.swift b/IceCubesApp/App/Tabs/NotificationTab.swift
@@ -22,8 +22,8 @@ struct NotificationsTab: View {
   @State private var routerPath = RouterPath()
   @State private var scrollToTopSignal: Int = 0
 
-  @Binding var selectedTab: Tab
-  @Binding var popToRootTab: Tab
+  @Binding var selectedTab: AppTab
+  @Binding var popToRootTab: AppTab
 
   let lockedType: Models.Notification.NotificationType?
 

diff --git a/IceCubesApp/App/Tabs/ProfileTab.swift b/IceCubesApp/App/Tabs/ProfileTab.swift
@@ -15,7 +15,7 @@ struct ProfileTab: View {
   @Environment(CurrentAccount.self) private var currentAccount
   @State private var routerPath = RouterPath()
   @State private var scrollToTopSignal: Int = 0
-  @Binding var popToRootTab: Tab
+  @Binding var popToRootTab: AppTab
 
   var body: some View {
     NavigationStack(path: $routerPath.path) {

diff --git a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift
@@ -28,7 +28,7 @@ struct SettingsTabs: View {
   @State private var cachedRemoved = false
   @State private var timelineCache = TimelineCache()
 
-  @Binding var popToRootTab: Tab
+  @Binding var popToRootTab: AppTab
 
   let isModal: Bool
 

diff --git a/IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift b/IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift
@@ -14,27 +14,27 @@ struct TabbarEntriesSettingsView: View {
     Form {
       Section {
         Picker("settings.tabs.first-tab", selection: $tabs.firstTab) {
-          ForEach(Tab.allCases) { tab in
+          ForEach(AppTab.allCases) { tab in
             tab.label.tag(tab)
           }
         }
         Picker("settings.tabs.second-tab", selection: $tabs.secondTab) {
-          ForEach(Tab.allCases) { tab in
+          ForEach(AppTab.allCases) { tab in
             tab.label.tag(tab)
           }
         }
         Picker("settings.tabs.third-tab", selection: $tabs.thirdTab) {
-          ForEach(Tab.allCases) { tab in
+          ForEach(AppTab.allCases) { tab in
             tab.label.tag(tab)
           }
         }
         Picker("settings.tabs.fourth-tab", selection: $tabs.fourthTab) {
-          ForEach(Tab.allCases) { tab in
+          ForEach(AppTab.allCases) { tab in
             tab.label.tag(tab)
           }
         }
         Picker("settings.tabs.fifth-tab", selection: $tabs.fifthTab) {
-          ForEach(Tab.allCases) { tab in
+          ForEach(AppTab.allCases) { tab in
             tab.label.tag(tab)
           }
         }