Place PlatformsPocket back to XcodeListView

XcodesOrg · Mar 10, 2024 · 9a866ac · 9a866ac
1 parent 950045b
commit 9a866ac
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift b/Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift
@@ -26,7 +26,7 @@ struct NavigationSplitViewWrapper<Sidebar, Detail>: View where Sidebar: View, De
 
                 if #available(macOS 14, *) {
                     sidebar
-                        .navigationSplitViewColumnWidth(min: 300, ideal: 300)
+                        .navigationSplitViewColumnWidth(min: 290, ideal: 290)
                 } else {
                     sidebar
                 }

diff --git a/Xcodes/Frontend/XcodeList/MainToolbar.swift b/Xcodes/Frontend/XcodeList/MainToolbar.swift
@@ -5,7 +5,6 @@ struct MainToolbarModifier: ViewModifier {
     @Binding var category: XcodeListCategory
     @Binding var isInstalledOnly: Bool
     @Binding var isShowingInfoPane: Bool
-    @SwiftUI.Environment(\.openWindow) private var openWindow
 
     func body(content: Content) -> some View {
         content
@@ -69,13 +68,6 @@ struct MainToolbarModifier: ViewModifier {
                 }
             }
             .help("FilterInstalledDescription")
-
-            Button(action: {
-                openWindow(id: "platforms")
-            }) {
-                Label("Platforms", systemImage: "square.3.layers.3d")
-            }
-            .help("PlatformsDescription")
         }
     }
 }

diff --git a/Xcodes/Frontend/XcodeList/XcodeListView.swift b/Xcodes/Frontend/XcodeList/XcodeListView.swift
@@ -43,6 +43,35 @@ struct XcodeListView: View {
             XcodeListViewRow(xcode: xcode, selected: selectedXcodeID == xcode.id, appState: appState)
         }
         .listStyle(.sidebar)
+        .safeAreaInset(edge: .bottom, spacing: 0) {
+            PlatformsPocket()
+                .padding(.horizontal)
+                .padding(.vertical, 8)
+        }
+    }
+}
+
+struct PlatformsPocket: View {
+    @SwiftUI.Environment(\.openWindow) private var openWindow
+
+    var body: some View {
+        Button(action: {
+            openWindow(id: "platforms")
+        }
+        ) {
+            HStack(spacing: 5) {
+                Image(systemName: "square.3.layers.3d")
+                    .font(.title3.weight(.medium))
+                Text("PlatformsDescription")
+            }
+            .font(.body.weight(.medium))
+            .padding(.horizontal)
+            .padding(.vertical, 12)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .background(.quaternary.opacity(0.75))
+            .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
+        }
+        .buttonStyle(.plain)
     }
 }
 

diff --git a/Xcodes/Resources/Localizable.xcstrings b/Xcodes/Resources/Localizable.xcstrings
@@ -14467,7 +14467,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Installed platforms"
+            "value" : "Installed Platforms"
           }
         }
       }