Add expanded sidebar layout

This reverts commit e9a2d3e151.

IceCubesApp/App/SideBarView.swift

@@ -35,15 +35,23 @@ struct SideBarView<Content: View>: View {
   }
 
   private func makeIconForTab(tab: Tab) -> some View {
-    ZStack(alignment: .topTrailing) {
+    HStack {
-      SideBarIcon(systemIconName: tab.iconName,
+      ZStack(alignment: .topTrailing) {
-                  isSelected: tab == selectedTab)
+        SideBarIcon(systemIconName: tab.iconName,
-      let badge = badgeFor(tab: tab)
+                    isSelected: tab == selectedTab)
-      if badge > 0 {
+        let badge = badgeFor(tab: tab)
-        makeBadgeView(count: badge)
+        if badge > 0 {
+          makeBadgeView(count: badge)
+        }
+      }
+      if userPreferences.isSidebarExpanded {
+        Text(tab.title)
+          .font(.headline)
+          .foregroundColor(tab == selectedTab ? theme.tintColor : theme.labelColor)
+          .frame(maxWidth: .infinity, alignment: .leading)
       }
     }
-    .frame(width: .sidebarWidth - 24, height: 50)
+    .frame(width: (userPreferences.isSidebarExpanded ? .sidebarWidthExpanded : .sidebarWidth) - 24, height: 50)
     .background(tab == selectedTab ? theme.secondaryBackgroundColor : .clear,
                 in: RoundedRectangle(cornerRadius: 8))
   }
@@ -75,6 +83,7 @@ struct SideBarView<Content: View>: View {
         .offset(x: 2, y: -2)
     }
     .buttonStyle(.borderedProminent)
+    .help(Tab.post.title)
   }
 
   private func makeAccountButton(account: AppAccount, showBadge: Bool) -> some View {
@@ -91,8 +100,17 @@ struct SideBarView<Content: View>: View {
       }
     } label: {
       ZStack(alignment: .topTrailing) {
-        AppAccountView(viewModel: .init(appAccount: account, isCompact: true),
+        if userPreferences.isSidebarExpanded {
-                       isParentPresented: .constant(false))
+          AppAccountView(viewModel: .init(appAccount: account, 
+                                          isCompact: false,
+                                          isInSettings: false),
+                         isParentPresented: .constant(false))
+        } else {
+          AppAccountView(viewModel: .init(appAccount: account, 
+                                          isCompact: true,
+                                          isInSettings: false),
+                         isParentPresented: .constant(false))
+        }
         if showBadge,
            let token = account.oauthToken,
            let notificationsCount = userPreferences.notificationsCount[token],
@@ -101,13 +119,23 @@ struct SideBarView<Content: View>: View {
           makeBadgeView(count: notificationsCount)
         }
       }
+      .padding(.leading, userPreferences.isSidebarExpanded ? 16 : 0)
     }
-    .frame(width: .sidebarWidth, height: 50)
+    .help(accountButtonTitle(accountName: account.accountName))
+    .frame(width: userPreferences.isSidebarExpanded ? .sidebarWidthExpanded : .sidebarWidth, height: 50)
     .padding(.vertical, 8)
     .background(selectedTab == .profile && account.id == appAccounts.currentAccount.id ?
       theme.secondaryBackgroundColor : .clear)
   }
 
+  private func accountButtonTitle(accountName: String?) -> LocalizedStringKey {
+    if let accountName {
+      "tab.profile-account-\(accountName)"
+    } else {
+      Tab.profile.title
+    }
+  }
+
   private var tabsView: some View {
     ForEach(tabs) { tab in
       if tab != .profile && sidebarTabs.isEnabled(tab) {
@@ -132,6 +160,7 @@ struct SideBarView<Content: View>: View {
         } label: {
           makeIconForTab(tab: tab)
         }
+        .help(tab.title)
       }
     }
   }
@@ -155,15 +184,22 @@ struct SideBarView<Content: View>: View {
             }
           }
         }
-        .frame(width: .sidebarWidth)
+        .frame(width: userPreferences.isSidebarExpanded ? .sidebarWidthExpanded : .sidebarWidth)
         .scrollContentBackground(.hidden)
         .background(.thinMaterial)
         .safeAreaInset(edge: .bottom, content: {
-          HStack {
+          HStack(spacing: 16) {
             postButton
               .padding(.vertical, 24)
+              .padding(.leading, userPreferences.isSidebarExpanded ? 18 : 0)
+            if userPreferences.isSidebarExpanded {
+              Text("menu.new-post")
+                .font(.subheadline)
+                .foregroundColor(theme.labelColor)
+                .frame(maxWidth: .infinity, alignment: .leading)
+            }
           }
-          .frame(width: .sidebarWidth)
+          .frame(width: userPreferences.isSidebarExpanded ? .sidebarWidthExpanded : .sidebarWidth)
           .background(.thinMaterial)
         })
         Divider().edgesIgnoringSafeArea(.all)
@@ -196,6 +232,7 @@ private struct SideBarIcon: View {
           self.isHovered = isHovered
         }
       }
+      .frame(width: 50, height: 40)
   }
 }
 

IceCubesApp/App/Tabs/Tabs.swift

@@ -80,41 +80,47 @@ enum Tab: Int, Identifiable, Hashable, CaseIterable, Codable {
 
   @ViewBuilder
   var label: some View {
+    if self != .other {
+      Label(title, systemImage: iconName)
+    }
+  }
+
+  var title: LocalizedStringKey {
     switch self {
     case .timeline:
-      Label("tab.timeline", systemImage: iconName)
+      "tab.timeline"
     case .trending:
-      Label("tab.trending", systemImage: iconName)
+      "tab.trending"
     case .local:
-      Label("tab.local", systemImage: iconName)
+      "tab.local"
     case .federated:
-      Label("tab.federated", systemImage: iconName)
+      "tab.federated"
     case .notifications:
-      Label("tab.notifications", systemImage: iconName)
+      "tab.notifications"
     case .mentions:
-      Label("tab.mentions", systemImage: iconName)
+      "tab.mentions"
     case .explore:
-      Label("tab.explore", systemImage: iconName)
+      "tab.explore"
     case .messages:
-      Label("tab.messages", systemImage: iconName)
+      "tab.messages"
     case .settings:
-      Label("tab.settings", systemImage: iconName)
+      "tab.settings"
     case .profile:
-      Label("tab.profile", systemImage: iconName)
+      "tab.profile"
     case .bookmarks:
-      Label("accessibility.tabs.profile.picker.bookmarks", systemImage: iconName)
+      "accessibility.tabs.profile.picker.bookmarks"
     case .favorites:
-      Label("accessibility.tabs.profile.picker.favorites", systemImage: iconName)
+      "accessibility.tabs.profile.picker.favorites"
     case .post:
-      Label("menu.new-post", systemImage: iconName)
+      "menu.new-post"
     case .followedTags:
-      Label("timeline.filter.tags", systemImage: iconName)
+      "timeline.filter.tags"
     case .lists:
-      Label("timeline.filter.lists", systemImage: iconName)
+      "timeline.filter.lists"
     case .links:
-      Label("explore.section.trending.links", systemImage: iconName)
+      "explore.section.trending.links"
     case .other:
-      EmptyView()
+      ""
     }
   }
 

IceCubesApp/App/Tabs/ToolbarTab.swift

@@ -14,6 +14,21 @@ struct ToolbarTab: ToolbarContent {
 
   var body: some ToolbarContent {
     if !isSecondaryColumn {
+      ToolbarItem(placement: .topBarLeading) {
+        if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
+          Button {
+            withAnimation {
+              userPreferences.isSidebarExpanded.toggle()
+            }
+          } label: {
+            if userPreferences.isSidebarExpanded {
+              Image(systemName: "sidebar.squares.left")
+            } else {
+              Image(systemName: "sidebar.left")
+            }
+          }
+        }
+      }
       statusEditorToolbarItem(routerPath: routerPath,
                               visibility: userPreferences.postVisibility)
       if UIDevice.current.userInterfaceIdiom != .pad ||

Packages/Account/Sources/Account/AccountsList/AccountsListView.swift

@@ -124,16 +124,23 @@ public struct AccountsListView: View {
         }
       }
       Section {
-        ForEach(accounts) { account in
+        if accounts.isEmpty {
-          if let relationship = relationships.first(where: { $0.id == account.id }) {
+          PlaceholderView(iconName: "person.icloud",
-            AccountsListRow(viewModel: .init(account: account,
+                          title: "No accounts found",
-                                             relationShip: relationship))
+                          message: "This list of accounts is empty")
-            #if !os(visionOS)
+          .listRowSeparator(.hidden)
-              .listRowBackground(theme.primaryBackgroundColor)
+        } else {
-            #endif
+          ForEach(accounts) { account in
+            if let relationship = relationships.first(where: { $0.id == account.id }) {
+              AccountsListRow(viewModel: .init(account: account,
+                                               relationShip: relationship))
+            }
           }
         }
       }
+      #if !os(visionOS)
+        .listRowBackground(theme.primaryBackgroundColor)
+      #endif
 
       switch nextPageState {
       case .hasNextPage:

Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift

@@ -9,5 +9,6 @@ public extension CGFloat {
   static let statusComponentSpacing: CGFloat = 6
   static let secondaryColumnWidth: CGFloat = 400
   static let sidebarWidth: CGFloat = 90
+  static let sidebarWidthExpanded: CGFloat = 220
   static let pollBarHeight: CGFloat = 30
 }

Packages/Env/Sources/Env/UserPreferences.swift

@@ -60,6 +60,8 @@ import SwiftUI
     @AppStorage("show_reply_indentation") public var showReplyIndentation: Bool = true
 
     @AppStorage("show_account_popover") public var showAccountPopover: Bool = true
+    
+    @AppStorage("sidebar_expanded") public var isSidebarExpanded: Bool = false
 
     init() {}
   }
@@ -326,6 +328,12 @@ import SwiftUI
       storage.showAccountPopover = showAccountPopover
     }
   }
+  
+  public var isSidebarExpanded: Bool {
+    didSet {
+      storage.isSidebarExpanded = isSidebarExpanded
+    }
+  }
 
   public func getRealMaxIndent() -> UInt {
     showReplyIndentation ? maxReplyIndentation : 0
@@ -501,6 +509,7 @@ import SwiftUI
     showReplyIndentation = storage.showReplyIndentation
     showAccountPopover = storage.showAccountPopover
     muteVideo = storage.muteVideo
+    isSidebarExpanded = storage.isSidebarExpanded
   }
 }
 

Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContextMenu.swift

@@ -31,7 +31,7 @@ struct StatusRowContextMenu: View {
     }
 
     if statusDataController.isReblogged {
-      return Label("status.action.unboost", image: "Rocket.fill")
+      return Label("status.action.unboost", image: "Rocket.Fill")
     }
     return Label("status.action.boost", image: "Rocket")
   }

Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift

@@ -288,6 +288,7 @@ struct AltTextButton: View {
           isPresented: $isDisplayingAlert
         ) {
           Button("alert.button.ok", action: {})
+          Button("status.action.copy-text", action: { UIPasteboard.general.string = text })
         } message: {
           Text(text)
         }