Fixed placeholder button on mac

Rspoon3 · Oct 1, 2024 · f9f389e · f9f389e
1 parent ccd0acf
commit f9f389e
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 31 deletions.
diff --git a/Shotbot.xcodeproj/project.pbxproj b/Shotbot.xcodeproj/project.pbxproj
@@ -597,7 +597,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -661,7 +661,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

diff --git a/ShotbotCore/Sources/HomeFeature/HomeView/HomeView.swift b/ShotbotCore/Sources/HomeFeature/HomeView/HomeView.swift
@@ -30,28 +30,7 @@ public struct HomeView: View {
         VStack(spacing: 0) {
             picker
             mainContent
-
-            VStack(spacing: 16) {
-                if ProcessInfo.processInfo.isiOSAppOnMac {
-                    PrimaryButton(title: "Select From Files") {
-                        viewModel.attemptToImportFile()
-                    }
-                    Button("Select Photos") {
-                        viewModel.selectPhotos()
-                    }
-                    .font(.headline)
-                } else {
-                    PrimaryButton(title: "Select Photos") {
-                        viewModel.selectPhotos()
-                    }
-                    Button("Select From Files") {
-                        viewModel.attemptToImportFile()
-                    }
-                    .font(.headline)
-                }
-            }
-            .disabled(viewModel.isLoading)
-            .padding([.bottom, .horizontal])
+            selectionButtons
         }
 #if os(iOS)
         .navigationTitle("Shotbot")
@@ -220,19 +199,52 @@ public struct HomeView: View {
         }
     }
 
-    private var importFileButton: some View {
-        Button {
-            viewModel.isImportingFile = true
-        } label: {
-            Label("Select From Files", systemImage: "doc")
+    private var selectionButtons: some View {
+        VStack(spacing: 16) {
+            if ProcessInfo.processInfo.isiOSAppOnMac {
+                PrimaryButton(title: "Select From Files") {
+                    viewModel.attemptToImportFile()
+                }
+                Button("Select Photos") {
+                    viewModel.selectPhotos()
+                }
+                .font(.headline)
+            } else {
+                PrimaryButton(title: "Select Photos") {
+                    viewModel.selectPhotos()
+                }
+                Button("Select From Files") {
+                    viewModel.attemptToImportFile()
+                }
+                .font(.headline)
+            }
+        }
+        .disabled(viewModel.isLoading)
+        .padding([.bottom, .horizontal])
+    }
+
+    @ViewBuilder
+    private var placeholderContextButton: some View {
+        if ProcessInfo.processInfo.isiOSAppOnMac {
+            Button {
+                viewModel.selectPhotos()
+            } label: {
+                Label("Select Photos", systemImage: "photo")
+            }
+        } else {
+            Button {
+                viewModel.attemptToImportFile()
+            } label: {
+                Label("Select From Files", systemImage: "doc")
+            }
         }
     }
 
     private var placeholder: some View {
         Image(systemName: "photo")
             .resizable()
             .scaledToFit()
-            .contextMenu { importFileButton }
+            .contextMenu { placeholderContextButton }
             .frame(maxWidth: 200)
             .padding()
             .contentShape(
@@ -245,7 +257,13 @@ public struct HomeView: View {
             .hoverEffect()
             .foregroundColor(.secondary)
             .frame(maxHeight: .infinity)
-            .onTapGesture { viewModel.selectPhotos() }
+            .onTapGesture {
+                if ProcessInfo.processInfo.isiOSAppOnMac {
+                    viewModel.attemptToImportFile()
+                } else {
+                    viewModel.selectPhotos()
+                }
+            }
     }
 
     private func tabView(shareableImages: [ShareableImage]) -> some View {