Sidebar is now backed by TabView + restore slideover tabbar transition

IceCubesApp/App/Main/AppView.swift

@@ -18,13 +18,14 @@ struct AppView: View {
   @Environment(Theme.self) private var theme
   @Environment(StreamWatcher.self) private var watcher
   
+  @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+  
 
   @Binding var selectedTab: Tab
   @Binding var sidebarRouterPath: RouterPath
   
   @State var popToRootTab: Tab = .other
   @State var iosTabs = iOSTabs.shared
-  @State var sideBarLoadedTabs: Set<Tab> = Set()
   
   var body: some View {
     if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
@@ -90,34 +91,29 @@ struct AppView: View {
                 tabs: availableTabs)
     {
       HStack(spacing: 0) {
-        ZStack {
+        TabView(selection: $selectedTab) {
-          if selectedTab == .profile {
-            ProfileTab(popToRootTab: $popToRootTab)
-          }
           ForEach(availableTabs) { tab in
-            if tab == selectedTab || sideBarLoadedTabs.contains(tab) {
             tab
               .makeContentView(selectedTab: $selectedTab, popToRootTab: $popToRootTab)
-                .opacity(tab == selectedTab ? 1 : 0)
+              .tabItem {
-                .transition(.opacity)
+                tab.label
-                .id("\(tab)\(appAccountsManager.currentAccount.id)")
-                .onAppear {
-                  sideBarLoadedTabs.insert(tab)
               }
-            } else {
+              .tag(tab)
-              EmptyView()
           }
         }
+        .introspect(.tabView, on: .iOS(.v17)) { (tabview: UITabBarController) in
+          tabview.tabBar.isHidden = horizontalSizeClass == .regular
+          tabview.customizableViewControllers = []
+          tabview.moreNavigationController.isNavigationBarHidden = true
         }
-        if appAccountsManager.currentClient.isAuth,
+        if horizontalSizeClass == .regular,
+           appAccountsManager.currentClient.isAuth,
            userPreferences.showiPadSecondaryColumn
         {
           Divider().edgesIgnoringSafeArea(.all)
           notificationsSecondaryColumn
         }
       }
-    }.onChange(of: appAccountsManager.currentAccount.id) {
-      sideBarLoadedTabs.removeAll()
     }
     .environment(sidebarRouterPath)
   }
@@ -130,4 +126,3 @@ struct AppView: View {
       .id(appAccountsManager.currentAccount.id)
   }
 }
-

IceCubesApp/App/SideBarView.swift

@@ -4,10 +4,12 @@ import DesignSystem
 import Env
 import Models
 import SwiftUI
+import SwiftUIIntrospect
 
 @MainActor
 struct SideBarView<Content: View>: View {
   @Environment(\.openWindow) private var openWindow
+  @Environment(\.horizontalSizeClass) private var horizontalSizeClass
 
   @Environment(AppAccountsManager.self) private var appAccounts
   @Environment(CurrentAccount.self) private var currentAccount
@@ -131,6 +133,7 @@ struct SideBarView<Content: View>: View {
   var body: some View {
     @Bindable var routerPath = routerPath
     HStack(spacing: 0) {
+      if horizontalSizeClass == .regular {
         ScrollView {
           VStack(alignment: .center) {
             if appAccounts.availableAccounts.isEmpty {
@@ -152,8 +155,8 @@ struct SideBarView<Content: View>: View {
         .frame(width: .sidebarWidth)
         .scrollContentBackground(.hidden)
         .background(.thinMaterial)
-      Divider()
+          Divider().edgesIgnoringSafeArea(.all)
-        .edgesIgnoringSafeArea(.top)
+      }
       content()
     }
     .background(.thinMaterial)