WIP

Sources/Packages/Localizable.xcstrings

@@ -1,6 +1,9 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    ".zshrc" : {
+
+    },
     "Add Automatically" : {
 
     },
@@ -1163,6 +1166,9 @@
           }
         }
       }
+    },
+    "Configure" : {
+
     },
     "copyable_click_to_copy_button" : {
       "extractionState" : "manual",
@@ -1500,7 +1506,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "This shows at the end of your public key."
+            "value" : "This shows at the end of your public key. It’s usually an email address."
           }
         }
       }
@@ -2483,6 +2489,9 @@
           }
         }
       }
+    },
+    "Done" : {
+
     },
     "edit_cancel_button" : {
       "extractionState" : "manual",
@@ -5195,6 +5204,9 @@
           }
         }
       }
+    },
+    "TfileDialogMessageest" : {
+
     },
     "unnamed_secret" : {
       "extractionState" : "manual",

Sources/Secretive/Views/ConfigurationView.swift

@@ -11,7 +11,11 @@ struct ConfigurationView: View {
 
     var body: some View {
         VStack(spacing: 0) {
-            NewStepView(title: "setup_agent_title", description: "setup_agent_description") {
+            NewStepView(
+                title: "setup_agent_title",
+                description: "setup_agent_description",
+                systemImage: "network.badge.shield.half.filled",
+            ) {
                 OnboardingButton("setup_agent_install_button", running) {
                     Task {
                         _ = await LaunchAgentController().forceLaunch()
@@ -22,7 +26,11 @@ struct ConfigurationView: View {
             }
             Divider()
             Divider()
-            NewStepView(title: "setup_ssh_title", description: "setup_ssh_description") {
+            NewStepView(
+                title: "setup_ssh_title",
+                description: "setup_ssh_description",
+                systemImage: "network.badge.shield.half.filled",
+            ) {
                 HStack {
                     OnboardingButton("setup_ssh_added_manually_button", false) {
                         sshConfig = true

Sources/Secretive/Views/ContentView.swift

@@ -94,7 +94,7 @@ extension ContentView {
                     .foregroundColor(.white)
             })
             .buttonStyle(ToolbarButtonStyle(color: color))
-            .popover(item: $selectedUpdate, attachmentAnchor: attachmentAnchor, arrowEdge: .bottom) { update in
+            .sheet(item: $selectedUpdate) { update in
                 UpdateDetailView(update: update)
             }
         }

Sources/Secretive/Views/CreateSecretView.swift

@@ -103,6 +103,7 @@ struct CreateSecretView<StoreType: SecretStoreModifiable>: View {
                     showing = false
                 }
                 Button(.createSecretCreateButton, action: save)
+                    .keyboardShortcut(.return)
                     .primary()
                     .disabled(name.isEmpty)
             }

Sources/Secretive/Views/EditSecretView.swift

@@ -38,13 +38,14 @@ struct EditSecretView<StoreType: SecretStoreModifiable>: View {
                 }
             }
             HStack {
-                Button(.editSaveButton, action: rename)
-                    .disabled(name.isEmpty)
-                    .keyboardShortcut(.return)
                 Button(.editCancelButton) {
                     dismissalBlock(false)
                 }
                 .keyboardShortcut(.cancelAction)
+                Button(.editSaveButton, action: rename)
+                    .disabled(name.isEmpty)
+                    .keyboardShortcut(.return)
+                    .primary()
             }
             .padding()
         }

Sources/Secretive/Views/SetupView.swift

@@ -10,8 +10,13 @@ struct SetupView: View {
     @State var sshConfig = false
 
     var body: some View {
+        VStack {
             VStack(spacing: 0) {
-            NewStepView(title: "setup_agent_title", description: "setup_agent_description") {
+                NewStepView(
+                    title: "setup_agent_title",
+                    description: "setup_agent_description",
+                    systemImage: "lock.laptopcomputer",
+                ) {
                     OnboardingButton("setup_agent_install_button", installed) {
                         Task {
                             await LaunchAgentController().install()
@@ -20,7 +25,11 @@ struct SetupView: View {
                     }
                 }
                 Divider()
-            NewStepView(title: "setup_updates_title", description: "setup_updates_description") {
+                NewStepView(
+                    title: "setup_updates_title",
+                    description: "setup_updates_description",
+                    systemImage: "network.badge.shield.half.filled",
+                ) {
                     OnboardingButton("setup_updates_ok", false) {
                         Task {
                             updates = true
@@ -28,26 +37,46 @@ struct SetupView: View {
                     }
                 }
                 Divider()
-            NewStepView(title: "setup_ssh_title", description: "setup_ssh_description") {
+                NewStepView(
+                    title: "setup_ssh_title",
+                    description: "setup_ssh_description",
+                    systemImage: "network.badge.shield.half.filled",
+                ) {
                     HStack {
                         OnboardingButton("setup_ssh_added_manually_button", false) {
                             sshConfig = true
                         }
                         OnboardingButton("Add Automatically", false) {
-//                        let controller = ShellConfigurationController()
+                            //                        let controller = ShellConfigurationController()
-//                        if controller.addToShell(shellInstructions: selectedShellInstruction) {
+                            //                        if controller.addToShell(shellInstructions: selectedShellInstruction) {
-//                        }
+                            //                        }
                             sshConfig = true
                         }
+                        .fileImporter(isPresented: $sshConfig, allowedContentTypes: [.utf8PlainText, .symbolicLink, .data]) { result in
+                            print(result)
+                        }
+                        // FIXME:
+                        .fileDialogDefaultDirectory(URL(fileURLWithPath: "/Users/max/"))
+                        .fileDialogBrowserOptions([.displayFileExtensions, .includeHiddenFiles])
+                        .fileExporterFilenameLabel(Text(".zshrc"))
+                        .fileDialogMessage("TfileDialogMessageest")
+                        .fileDialogConfirmationLabel("Configure")
+                        .fileDialogURLEnabled(#Predicate {
+                            return $0.lastPathComponent == ".zshrc" || $0.hasDirectoryPath
+                        })
                     }
                 }
             }
             .background(.white.opacity(0.1), in: RoundedRectangle(cornerRadius: 10))
-            .frame(minWidth: 500, idealWidth: 500, minHeight: 500, idealHeight: 500)
+            .frame(minWidth: 700, maxWidth: .infinity)
-            .padding()
+            HStack {
-
+                Spacer()
+                Button("Done") {}
+                    .styled
+            }
+        }
+        .padding()
     }
-    
 }
 
 struct OnboardingButton: View {
@@ -94,23 +123,28 @@ extension View {
 struct NewStepView<Content: View>: View {
     
     let title: LocalizedStringResource
+    let icon: Image
     let description: LocalizedStringResource
     let actions: Content
     
-    init(title: LocalizedStringResource, description: LocalizedStringResource, actions: () -> Content) {
+    init(title: LocalizedStringResource, description: LocalizedStringResource, systemImage: String, actions: () -> Content) {
         self.title = title
+        self.icon = Image(systemName: systemImage)
         self.description = description
         self.actions = actions()
     }
     
     var body: some View {
-        HStack {
+        HStack(spacing: 20) {
+            icon
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: 24)
             VStack(alignment: .leading, spacing: 6) {
                 Text(title)
                     .bold()
                 Text(description)
             }
-            Spacer(minLength: 20)
             actions
         }
         .padding(20)

Sources/Secretive/Views/UpdateView.swift

@@ -12,7 +12,7 @@ struct UpdateDetailView: View {
             Text(.updateVersionName(updateName: update.name)).font(.title)
             GroupBox(label: Text(.updateReleaseNotesTitle)) {
                 ScrollView {
-                    attributedBody
+                    Text(attributedBody)
                 }
             }
             HStack {
@@ -35,29 +35,62 @@ struct UpdateDetailView: View {
         .frame(maxWidth: 500)
     }
 
-    var attributedBody: Text {
+    var attributedBody: AttributedString {
-        var text = Text(verbatim: "")
+        do {
+            var text = try AttributedString(
+                markdown: update.body,
+                options: .init(
+                    allowsExtendedAttributes: true,
+                    interpretedSyntax: .full,
+                ),
+                baseURL: URL(string: "https://github.com/maxgoedjen/secretive")!
+            )
+            .transformingAttributes(AttributeScopes.FoundationAttributes.PresentationIntentAttribute.self) { key in
+                let font: Font? = switch key.value?.components.first?.kind {
+                case .header(level: 1):
+                    Font.title
+                case .header(level: 2):
+                    Font.title2
+                case .header(level: 3):
+                    Font.title3
+                default:
+                    nil
+                }
+                if let font {
+                    key.replace(with: AttributeScopes.SwiftUIAttributes.FontAttribute.self, value: font)
+                }
+            }
+            let lineBreak = AttributedString("\n\n")
+            for run in text.runs.reversed() {
+                text.insert(lineBreak, at: run.range.lowerBound)
+            }
+            return text
+        } catch {
+            var text = AttributedString()
             for line in update.body.split(whereSeparator: \.isNewline) {
-            let attributed: Text
+                let attributed: AttributedString
                 let split = line.split(separator: " ")
                 let unprefixed = split.dropFirst().joined(separator: " ")
                 if let prefix = split.first {
+                    var container = AttributeContainer()
                     switch prefix {
                     case "#":
-                    attributed = Text(unprefixed).font(.title) + Text(verbatim: "\n")
+                        container.font = .title
                     case "##":
-                    attributed = Text(unprefixed).font(.title2) + Text(verbatim: "\n")
+                        container.font = .title2
                     case "###":
-                    attributed = Text(unprefixed).font(.title3) + Text(verbatim: "\n")
+                        container.font = .title3
                     default:
-                    attributed = Text(line) + Text(verbatim: "\n\n")
+                        continue
                     }
+                    attributed = AttributedString(unprefixed, attributes: container)
                 } else {
-                attributed = Text(line) + Text(verbatim: "\n\n")
+                    attributed = AttributedString(line + "\n\n")
                 }
                 text = text + attributed
             }
             return text
         }
+    }
 
 }