Add reveal in finder to copyable (#669)

Sources/Secretive/Controllers/URLs.swift

@@ -9,4 +9,17 @@ extension URL {
     static var socketPath: String {
         URL.agentHomeURL.appendingPathComponent("socket.ssh").path()
     }
+
+}
+
+extension String {
+
+    var normalizedPathAndFolder: (String, String) {
+        // All foundation-based normalization methods replace this with the container directly.
+        let processedPath = replacingOccurrences(of: "~", with: "/Users/\(NSUserName())")
+        let url = URL(filePath: processedPath)
+        let folder = url.deletingLastPathComponent().path()
+        return (processedPath, folder)
+    }
+
 }

Sources/Secretive/Views/Configuration/ConfigurationItemView.swift

@@ -40,10 +40,7 @@ struct ConfigurationItemView<Content: View>: View {
                     .buttonStyle(.borderless)
                 case .revealInFinder(let rawPath):
                     Button(.revealInFinderButton, systemImage: "folder") {
-                        // All foundation-based normalization methods replace this with the container directly.
+                        let (processedPath, folder) = rawPath.normalizedPathAndFolder
-                        let processedPath = rawPath.replacingOccurrences(of: "~", with: "/Users/\(NSUserName())")
-                        let url = URL(filePath: processedPath)
-                        let folder = url.deletingLastPathComponent().path()
                         NSWorkspace.shared.selectFile(processedPath, inFileViewerRootedAtPath: folder)
                     }
                     .labelStyle(.iconOnly)

Sources/Secretive/Views/Secrets/SecretDetailView.swift

@@ -21,7 +21,7 @@ struct SecretDetailView<SecretType: Secret>: View {
                     CopyableView(title: .secretDetailPublicKeyLabel, image: Image(systemName: "key"), text: keyString)
                     Spacer()
                         .frame(height: 20)
-                    CopyableView(title: .secretDetailPublicKeyPathLabel, image: Image(systemName: "lock.doc"), text: publicKeyFileStoreController.publicKeyPath(for: secret))
+                    CopyableView(title: .secretDetailPublicKeyPathLabel, image: Image(systemName: "lock.doc"), text: publicKeyFileStoreController.publicKeyPath(for: secret), showRevealInFinder: true)
                     Spacer()
                 }
             }

Sources/Secretive/Views/Views/CopyableView.swift

@@ -6,6 +6,7 @@ struct CopyableView: View {
     var title: LocalizedStringResource
     var image: Image
     var text: String
+    var showRevealInFinder = false
 
     @State private var interactionState: InteractionState = .normal
     
@@ -21,9 +22,12 @@ struct CopyableView: View {
                     .foregroundColor(primaryTextColor)
                 Spacer()
                 if interactionState != .normal {
-                    hoverIcon
+                    HStack {
-                        .bold()
+                        if showRevealInFinder {
-                        .textCase(.uppercase)
+                            revealInFinderButton
+                        }
+                        copyButton
+                    }
                         .foregroundColor(secondaryTextColor)
                         .transition(.opacity)
                 }
@@ -72,11 +76,18 @@ struct CopyableView: View {
     }
 
     @ViewBuilder
-    var hoverIcon: some View {
+    var copyButton: some View {
         switch interactionState {
         case .hovering:
-            Image(systemName: "document.on.document")
+            Button(.copyableClickToCopyButton, systemImage: "document.on.document") {
-                .accessibilityLabel(String(localized: .copyableClickToCopyButton))
+                withAnimation {
+                    // Button will eat the click, so we set interaction state manually.
+                    interactionState = .clicking
+                }
+                copy()
+            }
+            .labelStyle(.iconOnly)
+            .buttonStyle(.borderless)
         case .clicking:
             Image(systemName: "checkmark.circle.fill")
                 .accessibilityLabel(String(localized: .copyableCopied))
@@ -85,6 +96,15 @@ struct CopyableView: View {
         }
     }
 
+    var revealInFinderButton: some View {
+        Button(.revealInFinderButton, systemImage: "folder") {
+            let (processedPath, folder) = text.normalizedPathAndFolder
+            NSWorkspace.shared.selectFile(processedPath, inFileViewerRootedAtPath: folder)
+        }
+        .labelStyle(.iconOnly)
+        .buttonStyle(.borderless)
+    }
+
     var primaryTextColor: Color {
         switch interactionState {
         case .normal, .hovering, .dragging: