v0.2

ehrishirajsharma · Jul 13, 2018 · dc317b2 · dc317b2
1 parent 5ca174c
commit dc317b2
Show file tree

Hide file tree

Showing 87 changed files with 2,802 additions and 994 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Swiftness v0.1
+# swiftness-private-beta
 
-![swiftness](https://media.giphy.com/media/26DN65NTQsapJWWrK/giphy.gif)
+![Alt Text](https://media.giphy.com/media/3o7WIB0KBZfmGpVV6w/giphy.gif)
 
 
 **Download:** https://github.com/ehrishirajsharma/Swiftness/releases/download/v0.1/Swiftness-v0.1.app.zip
@@ -14,13 +14,6 @@ For other operating systems, please follow this poll: https://swiftness-app.type
 (I will start working on other platforms as soon as macOS version gets stable)
 
 
-**Formatting**
-
-Formatting shortcuts are supported, e.g.
-
-- ⌘ + B --> Bold
-- ⌘ + I --> Italic
-
 # **Sharing templates file:**
 
 
@@ -48,8 +41,6 @@ A file will be available named reports.xyz - copy and share it to others.
 - [ ] Notes for different targets
 - [ ] Templates for specific environment profiles (e.g. bug-hunters can maintain multiple versions of vulnerability-template according to the platforms: HackerOne, Bugcrowd, Synack, etc.)
 - [ ] Easiest way to share templates, checklist and notes to other users
-- [ ] Password protection
-- [ ] Lables/tags for templates
 
 
 

diff --git a/Swiftness.xcodeproj/project.pbxproj b/Swiftness.xcodeproj/project.pbxproj
diff --git a/Swiftness.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Swiftness.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Swiftness.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Swiftness.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Swiftness/AppDelegate.swift b/Swiftness/AppDelegate.swift
@@ -4,7 +4,7 @@ import Cocoa
 class AppDelegate: NSObject, NSApplicationDelegate {
 
     // MARK: - Properties
-    let templateManager = TemplateManager()
+    let dataManager = DataManager()
 
     private lazy var statusItem: NSStatusItem = {
         let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
@@ -14,8 +14,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     private lazy var popover: NSPopover = {
         let popover = NSPopover()
-        let statusBarViewController = NSStoryboard.statusBarViewController()
-        statusBarViewController?.delegate = self
+        let statusBarViewController = NSStoryboard.statusBarViewController
+        statusBarViewController.delegate = self
+        statusBarViewController.dataManager = dataManager
         popover.contentViewController = statusBarViewController
         popover.behavior = .transient
         return popover
@@ -32,10 +33,33 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         return eventMonitor
     }()
 
+    var mainWindowController: WindowController {
+        return NSApplication.shared.mainWindow?.windowController as! WindowController
+    }
+
+    @IBAction func export(_ sender: Any) {
+        let windowController = NSStoryboard.exportWindowController
+        let viewController = windowController.contentViewController as! ExportViewController
+        viewController.dataManager = dataManager
+        NSApplication.shared.mainWindow?.beginSheet(windowController.window!)
+    }
+
+    @IBAction func `import`(_ sender: Any) {
+        let openPanel = NSOpenPanel()
+        openPanel.allowedFileTypes = [DataManager.fileExtension]
+        openPanel.allowsOtherFileTypes = false
+        openPanel.begin { result in 
+            guard result == .OK else { return }
+            self.dataManager.load(url: openPanel.url!)
+            self.mainWindowController.dataManager = self.dataManager
+        }
+    }
+
     // MARK: - Overrides
     func applicationDidFinishLaunching(_ aNotification: Notification) {
+        mainWindowController.dataManager = dataManager
         hideMainWindow()
-        statusItem.button?.image = NSImage(named: NSImage.Name(rawValue: "link"))
+        statusItem.button?.image = NSImage.statusBar
     }
 
 }
@@ -44,7 +68,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 extension AppDelegate: MainWindowDelegate {
 
     func hideMainWindow() {
-        NSApp.hide(nil)
         NSApp.setActivationPolicy(.accessory)
     }
 
@@ -53,7 +76,17 @@ extension AppDelegate: MainWindowDelegate {
             NSApp.setActivationPolicy(.regular)
         }
         closePopover()
-        NSApp.activate(ignoringOtherApps: true)
+        dirtyHackToUnfreezeMenu()
+    }
+
+    func dirtyHackToUnfreezeMenu() {
+        if (NSRunningApplication.runningApplications(withBundleIdentifier: "com.apple.dock").first?.activate(options: []))! {
+            let deadlineTime = DispatchTime.now() + .milliseconds(200)
+            DispatchQueue.main.asyncAfter(deadline: deadlineTime) {
+                NSApp.setActivationPolicy(.regular)
+                NSApp.activate(ignoringOtherApps: true)
+            }
+        }
     }
 
 }
@@ -78,8 +111,6 @@ private extension AppDelegate {
     func showPopover() {
         guard let statusItemButton = statusItem.button else { return }
 
-        (popover.contentViewController as? StatusBarViewController)?.templateManager = templateManager
-
         if !NSApp.isHidden {
             NSApp.activate(ignoringOtherApps: true)
         }