Fix bugs in macOS app

IceCubesApp/App/IceCubesApp.swift

@@ -84,14 +84,12 @@ struct IceCubesApp: App {
   private var sidebarView: some View {
     SideBarView(selectedTab: $selectedTab,
                 popToRootTab: $popToRootTab,
-                tabs: availableTabs) { selectedTab in
+                tabs: availableTabs) {
       ZStack {
+        if let account = currentAccount.account, selectedTab == .profile {
+          AccountDetailView(account: account)
+        }
         ForEach(availableTabs) { tab in
-          if let account = currentAccount.account {
-            AccountDetailView(account: account)
-              .opacity(selectedTab == .profile ? 1 : 0)
-              .id(account.id)
-          }
           if tab == selectedTab || sideBarLoadedTabs.contains(tab) {
             tab
               .makeContentView(popToRootTab: $popToRootTab)

IceCubesApp/App/SideBarView.swift

@@ -2,6 +2,7 @@ import SwiftUI
 import Env
 import Account
 import DesignSystem
+import AppAccount
 
 struct SideBarView<Content: View>: View {
   @EnvironmentObject private var currentAccount: CurrentAccount
@@ -10,18 +11,19 @@ struct SideBarView<Content: View>: View {
   @Binding var selectedTab: Tab
   @Binding var popToRootTab: Tab
   var tabs: [Tab]
-  @ViewBuilder var content: (Tab) -> Content
+  @ViewBuilder var content: () -> Content
   
   var body: some View {
     HStack(spacing: 0) {
       VStack(alignment: .center) {
         if let account = currentAccount.account {
-          AvatarView(url: account.avatar)
+          Button {
-            .frame(width: 70, height: 50)
+            selectedTab = .profile
-            .background(selectedTab == .profile ? theme.secondaryBackgroundColor : .clear)
+          } label: {
-            .onTapGesture {
+            AvatarView(url: account.avatar, size: .status)
-              selectedTab = .profile
+          }
-            }
+          .frame(width: 70, height: 50)
+          .background(selectedTab == .profile ? theme.secondaryBackgroundColor : .clear)
         }
         ForEach(tabs) { tab in
           Button {
@@ -48,7 +50,7 @@ struct SideBarView<Content: View>: View {
       .background(.clear)
       Divider()
         .edgesIgnoringSafeArea(.top)
-      content(selectedTab)
+      content()
     }
     .background(.thinMaterial)
   }

IceCubesApp/App/Tabs/ExploreTab.swift

@@ -22,8 +22,10 @@ struct ExploreTab: View {
         .toolbar {
           statusEditorToolbarItem(routeurPath: routeurPath,
                                   visibility: preferences.serverPreferences?.postVisibility ?? .pub)
-          ToolbarItem(placement: .navigationBarLeading) {
+          if !ProcessInfo.processInfo.isiOSAppOnMac {
-            AppAccountsSelectorView(routeurPath: routeurPath)
+            ToolbarItem(placement: .navigationBarLeading) {
+              AppAccountsSelectorView(routeurPath: routeurPath)
+            }
           }
         }
     }

IceCubesApp/App/Tabs/MessagesTab.swift

@@ -21,8 +21,10 @@ struct MessagesTab: View {
         .withAppRouteur()
         .withSheetDestinations(sheetDestinations: $routeurPath.presentedSheet)
         .toolbar {
-          ToolbarItem(placement: .navigationBarLeading) {
+          if !ProcessInfo.processInfo.isiOSAppOnMac {
-            AppAccountsSelectorView(routeurPath: routeurPath)
+            ToolbarItem(placement: .navigationBarLeading) {
+              AppAccountsSelectorView(routeurPath: routeurPath)
+            }
           }
         }
         .id(currentAccount.account?.id)

IceCubesApp/App/Tabs/NotificationTab.swift

@@ -21,8 +21,10 @@ struct NotificationsTab: View {
         .toolbar {
           statusEditorToolbarItem(routeurPath: routeurPath,
                                   visibility: userPreferences.serverPreferences?.postVisibility ?? .pub)
-          ToolbarItem(placement: .navigationBarLeading) {
+          if !ProcessInfo.processInfo.isiOSAppOnMac {
-            AppAccountsSelectorView(routeurPath: routeurPath)
+            ToolbarItem(placement: .navigationBarLeading) {
+              AppAccountsSelectorView(routeurPath: routeurPath)
+            }
           }
         }
         .id(currentAccount.account?.id)

IceCubesApp/App/Tabs/Timeline/TimelineTab.swift

@@ -138,8 +138,10 @@ struct TimelineTab: View {
       }
     }
     if client.isAuth {
-      ToolbarItem(placement: .navigationBarLeading) {
+      if !ProcessInfo.processInfo.isiOSAppOnMac {
-        AppAccountsSelectorView(routeurPath: routeurPath)
+        ToolbarItem(placement: .navigationBarLeading) {
+          AppAccountsSelectorView(routeurPath: routeurPath)
+        }
       }
       statusEditorToolbarItem(routeurPath: routeurPath,
                               visibility: preferences.serverPreferences?.postVisibility ?? .pub)

Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift

@@ -23,39 +23,9 @@ public struct AppAccountsSelectorView: View {
   
   public var body: some View {
     Menu {
-      ForEach(accountsViewModel, id: \.appAccount.id) { viewModel in
+      menuView
-        Section(viewModel.acct) {
-          Button {
-            if let account = currentAccount.account,
-                viewModel.account?.id == account.id {
-              routeurPath.navigate(to: .accountDetailWithAccount(account: account))
-            } else {
-              appAccounts.currentAccount = viewModel.appAccount
-            }
-          } label: {
-            HStack {
-              if viewModel.account?.id == currentAccount.account?.id {
-                Image(systemName: "checkmark.circle.fill")
-              }
-              Text("\(viewModel.account?.displayName ?? "")")
-            }
-          }
-        }
-      }
-      if accountCreationEnabled {
-        Divider()
-        Button {
-          routeurPath.presentedSheet = .addAccount
-        } label: {
-          Label("Add Account", systemImage: "person.badge.plus")
-        }
-      }
     } label: {
-      if let avatar = currentAccount.account?.avatar {
+      labelView
-        AvatarView(url: avatar, size: avatarSize)
-      } else {
-        EmptyView()
-      }
     }
     .onAppear {
       refreshAccounts()
@@ -65,6 +35,46 @@ public struct AppAccountsSelectorView: View {
     }
   }
   
+  @ViewBuilder
+  private var labelView: some View {
+    if let avatar = currentAccount.account?.avatar {
+      AvatarView(url: avatar, size: avatarSize)
+    } else {
+      EmptyView()
+    }
+  }
+  
+  @ViewBuilder
+  private var menuView: some View {
+    ForEach(accountsViewModel, id: \.appAccount.id) { viewModel in
+      Section(viewModel.acct) {
+        Button {
+          if let account = currentAccount.account,
+              viewModel.account?.id == account.id {
+            routeurPath.navigate(to: .accountDetailWithAccount(account: account))
+          } else {
+            appAccounts.currentAccount = viewModel.appAccount
+          }
+        } label: {
+          HStack {
+            if viewModel.account?.id == currentAccount.account?.id {
+              Image(systemName: "checkmark.circle.fill")
+            }
+            Text("\(viewModel.account?.displayName ?? "")")
+          }
+        }
+      }
+    }
+    if accountCreationEnabled {
+      Divider()
+      Button {
+        routeurPath.presentedSheet = .addAccount
+      } label: {
+        Label("Add Account", systemImage: "person.badge.plus")
+      }
+    }
+  }
+  
   private func refreshAccounts() {
     if accountsViewModel.isEmpty || appAccounts.availableAccounts.count != accountsViewModel.count {
       accountsViewModel = []
@@ -77,4 +87,5 @@ public struct AppAccountsSelectorView: View {
       }
     }
   }
+  
 }