Make secondary column available on any size + add a toggle + faster macOS window resize

IceCubesApp/App/IceCubesApp.swift

@@ -133,8 +133,7 @@ struct IceCubesApp: App {
               }
             }
           }
-          if proxy.frame(in: .global).width > (.maxColumnWidth + .secondaryColumnWidth),
+          if appAccountsManager.currentClient.isAuth,
-             appAccountsManager.currentClient.isAuth,
              userPreferences.showiPadSecondaryColumn
           {
             Divider().edgesIgnoringSafeArea(.all)

IceCubesApp/App/Tabs/ExploreTab.swift

@@ -29,6 +29,9 @@ struct ExploreTab: View {
               AppAccountsSelectorView(routerPath: routerPath)
             }
           }
+          if UIDevice.current.userInterfaceIdiom == .pad && !preferences.showiPadSecondaryColumn {
+            SecondaryColumnToolbarItem()
+          }
         }
     }
     .withSafariRouter()

IceCubesApp/App/Tabs/NotificationTab.swift

@@ -38,6 +38,11 @@ struct NotificationsTab: View {
               }
             }
           }
+          if UIDevice.current.userInterfaceIdiom == .pad {
+            if (!isSecondaryColumn && !userPreferences.showiPadSecondaryColumn) || isSecondaryColumn {
+              SecondaryColumnToolbarItem()
+            }
+          }
         }
         .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
         .id(client.id)

IceCubesApp/App/Tabs/Settings/SettingsTab.swift

@@ -46,6 +46,9 @@ struct SettingsTabs: View {
             }
           }
         }
+        if UIDevice.current.userInterfaceIdiom == .pad && !preferences.showiPadSecondaryColumn {
+          SecondaryColumnToolbarItem()
+        }
       }
       .withAppRouter()
       .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)

IceCubesApp/App/Tabs/Timeline/TimelineTab.swift

@@ -178,6 +178,9 @@ struct TimelineTab: View {
       }
       statusEditorToolbarItem(routerPath: routerPath,
                               visibility: preferences.postVisibility)
+      if UIDevice.current.userInterfaceIdiom == .pad && !preferences.showiPadSecondaryColumn {
+        SecondaryColumnToolbarItem()
+      }
     } else {
       ToolbarItem(placement: .navigationBarTrailing) {
         addAccountButton

Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift

@@ -124,22 +124,38 @@ struct ConversationMessageView: View {
     }
   }
 
+  private func makeImageRequest(for url: URL, size: CGSize) -> ImageRequest {
+    ImageRequest(url: url, processors: [.resize(size: size)])
+  }
+  
+  private func mediaWidth(proxy: GeometryProxy) -> CGFloat {
+    var width = proxy.frame(in: .local).width
+    if UIDevice.current.userInterfaceIdiom == .pad {
+      width = width * 0.60
+    }
+    return width
+  }
+  
   private func makeMediaView(_ attachement: MediaAttachment) -> some View {
     GeometryReader { proxy in
-      LazyImage(url: attachement.url) { state in
+      let width = mediaWidth(proxy: proxy)
-        if let image = state.image {
+      if let url = attachement.url {
-          image
+        LazyImage(request: makeImageRequest(for: url,
-            .resizable()
+                                            size: .init(width: width, height: 200))) { state in
-            .aspectRatio(contentMode: .fill)
+          if let image = state.image {
-            .frame(height: 200)
+            image
-            .frame(maxWidth: proxy.frame(in: .local).width)
+              .resizable()
-            .clipped()
+              .aspectRatio(contentMode: .fill)
-            .cornerRadius(8)
+              .frame(height: 200)
-            .padding(8)
+              .frame(maxWidth: width)
-        } else if state.isLoading {
+              .clipped()
-          RoundedRectangle(cornerRadius: 8)
+              .cornerRadius(8)
-            .fill(Color.gray)
+              .padding(8)
-            .frame(height: 200)
+          } else if state.isLoading {
+            RoundedRectangle(cornerRadius: 8)
+              .fill(Color.gray)
+              .frame(height: 200)
+          }
         }
       }
     }

Packages/Conversations/Sources/Conversations/List/ConversationsListView.swift

@@ -6,6 +6,7 @@ import Shimmer
 import SwiftUI
 
 public struct ConversationsListView: View {
+  @EnvironmentObject private var preferences: UserPreferences
   @EnvironmentObject private var routerPath: RouterPath
   @EnvironmentObject private var watcher: StreamWatcher
   @EnvironmentObject private var client: Client
@@ -76,6 +77,9 @@ public struct ConversationsListView: View {
     .navigationBarTitleDisplayMode(.inline)
     .toolbar {
       StatusEditorToolbarItem(visibility: .direct)
+      if UIDevice.current.userInterfaceIdiom == .pad && !preferences.showiPadSecondaryColumn {
+        SecondaryColumnToolbarItem()
+      }
     }
     .onChange(of: watcher.latestEvent?.id) { _ in
       if let latestEvent = watcher.latestEvent {

Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift

@@ -4,8 +4,7 @@ public extension CGFloat {
   static var layoutPadding: CGFloat = 20
   static let dividerPadding: CGFloat = 2
   static let statusColumnsSpacing: CGFloat = 8
-  static let maxColumnWidth: CGFloat = 650
+  static let secondaryColumnWidth: CGFloat = 400
-  static let secondaryColumnWidth: CGFloat = 360
   static let sidebarWidth: CGFloat = 80
   static let pollBarHeight: CGFloat = 30
 }

Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift

@@ -36,3 +36,22 @@ public struct StatusEditorToolbarItem: ToolbarContent {
     }
   }
 }
+
+public struct SecondaryColumnToolbarItem: ToolbarContent {
+  @Environment(\.isSecondaryColumn) private var isSecondaryColumn
+  @EnvironmentObject private var preferences: UserPreferences
+
+  public init() {}
+  
+  public var body: some ToolbarContent {
+    ToolbarItem(placement: isSecondaryColumn ? .navigationBarLeading : .navigationBarTrailing) {
+      Button {
+        withAnimation {
+          preferences.showiPadSecondaryColumn.toggle()
+        }
+      } label: {
+        Image(systemName: "sidebar.right")
+      }
+    }
+  }
+}

Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift

@@ -67,7 +67,6 @@ public struct StatusRowCardView: View {
         RoundedRectangle(cornerRadius: 16)
           .stroke(.gray.opacity(0.35), lineWidth: 1)
       )
-      .frame(maxWidth: .maxColumnWidth)
       .onTapGesture {
         openURL(url)
       }

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

@@ -27,8 +27,9 @@ public struct StatusRowMediaPreviewView: View {
   @State private var isHidingMedia: Bool = false
 
   var availableWidth: CGFloat {
-    if sceneDelegate.windowWidth > .maxColumnWidth {
+    if UIDevice.current.userInterfaceIdiom == .phone &&
-      return .maxColumnWidth
+        (UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight) {
+      return sceneDelegate.windowWidth * 0.80
     }
     return sceneDelegate.windowWidth
   }
@@ -36,10 +37,16 @@ public struct StatusRowMediaPreviewView: View {
   var appLayoutWidth: CGFloat {
     let avatarColumnWidth = theme.avatarPosition == .leading ? AvatarView.Size.status.size.width + .statusColumnsSpacing : 0
     var sidebarWidth: CGFloat = 0
-    if UIDevice.current.userInterfaceIdiom == .pad && sceneDelegate.windowWidth < (.maxColumnWidth + .sidebarWidth) {
+    var secondaryColumnWidth: CGFloat = 0
+    var layoutPading: CGFloat = .layoutPadding * 2
+    if UIDevice.current.userInterfaceIdiom == .pad  {
       sidebarWidth = .sidebarWidth
+      if preferences.showiPadSecondaryColumn {
+        secondaryColumnWidth = .secondaryColumnWidth
+        layoutPading = 0
+      }
     }
-    return (.layoutPadding * 2) + avatarColumnWidth + sidebarWidth + extraLeadingInset
+    return layoutPading + avatarColumnWidth + sidebarWidth + extraLeadingInset + secondaryColumnWidth
   }
 
   private var imageMaxHeight: CGFloat {