Mac Support done

Author: kimbtech

core/Utilities.php

@@ -4,7 +4,7 @@
  */
 class Utilities {
 
-	const VERSION = 'v0.6.0 alpha';
+	const VERSION = 'v0.7.0 alpha';
 
 	/**
 	 * OS Consts

core/platform/MacDialog.php

@@ -2,19 +2,37 @@
 
 class MacDialog extends Dialog {
 
+	const MAC_DIALOG = __DIR__ . '/macos/TaskTimeTerminate.app/Contents/MacOS/TaskTimeTerminate';
+	
 	public function open() : void {
+		$cmd = array(
+			self::MAC_DIALOG,
+			'-cats',
+			'"'. implode(',', $this->categories) .'"'
+		);
+		exec(implode(' ', $cmd), $stdout, $return);
 
-		/**
-		 * ToDo
-		 */
+		if( $return === 0 && !empty($stdout) ){
+			$stdout = json_decode($stdout[0], true);
 
-		$d = new InTerminalDialog();
-		$d->setCategories($this->categories);
-		$d->open();
-		$this->chCategory = $d->getChosenCategory();	
-		$this->chName = $d->getChosenName();
-		$this->chTime = $d->getChosenTime();
+			if( $stdout['pause'] ){
+				$this->shortBreak = true;
+			}
+			else{
+				$this->chCategory = in_array($stdout['cat'], $this->categories) ? array_search($stdout['cat'], $this->categories) : null; // category id
+				$this->chName = InputParser::checkNameInput($stdout['name']) ? $stdout['name'] : null;
+				$this->chTime = InputParser::checkTimeInput($stdout['time']) ? $stdout['time'] : null;
 
+				if( is_null($this->chCategory) || is_null( $this->chTime ) || is_null($this->chName)){
+					$this->open();
+					return;
+				}
+			}
+		}
+		else { // error
+			$this->open();
+			return;
+		}
 	}
 
 	public static function checkOSPackages() : void {

core/platform/macos/TaskTimeTerminate.app/Contents/MacOS/TaskTimeTerminate

@@ -6,19 +6,19 @@
 	<dict>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		ZN1eRSyZEALXwXo1ku1sRx63Q1k=
+		DiSUbmXvQvqY7x2/oE96H2NEtUw=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		aY9MJm+N6l6+8b5jLh3D59MNenc=
+		IQsFH80gY6fBchH0ef9VMMLdZUk=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		ddoJfBk/YT/X8jNv6qgAwgyjzCk=
+		f+UKI1tIL0DBtbFgZJg1asfp4pY=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
-		fqWkLyq0DlMIoyA82qD9i5+QQ9o=
+		RQhhd8f6VNGPeZ//rXqtwUIL+Jo=
 		</data>
 		<key>Resources/en.lproj/Main.strings</key>
 		<dict>
@@ -36,28 +36,28 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			RBg2dr2qv70fgwq1nEaDO0JxcQuvoAlBvu2zzxhTeco=
+			fdTh9cwTl5YcU1c3bL4sqi1dUzrpHagjFZzlRzmAv7s=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			9WbD7MPxnz+d/D19b9AQCcHCJLzf7S0ED1VLRiAjDZY=
+			2sHlhd/y5zaoN304U/77mvq4CKxgomuu3ZmquXYFMZ8=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			OMrsn7FvGRRh0Iyl3Kf/gXHBTdCoxwj06y9AcZUO+9g=
+			w2aeIh12aIFgj58/49oNDNHmnQLt1r4ysmnx8sQ8dJI=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			yYx+hgxKr5pv8BzjutQ9SfbZqc8DDLGRR3AzB+422jM=
+			6QebTVxtaLwhGPCIsNq8mM2tb4VwOe0KFKestIphND0=
 			</data>
 		</dict>
 		<key>Resources/en.lproj/Main.strings</key>

core/platform/macos/TaskTimeTerminate.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist

@@ -16,8 +16,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationWillTerminate(_ aNotification: Notification) {
     }
-
+    
     private func tapplicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
         return true;
     }
+    
+    func windowShouldClose(_ sender: Any) {
+        NSApplication.shared.terminate(self)
+    }
 }

core/platform/macos/TaskTimeTerminate.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib

@@ -8,6 +8,12 @@
 
 import Cocoa
 
+extension FileHandle : TextOutputStream {
+    public func write(_ string: String) {
+        self.write(string.data(using: .utf8) ?? Data());
+    }
+}
+
 class ViewController: NSViewController {
 
     @IBOutlet weak var categoryDropdown: NSPopUpButtonCell!
@@ -18,19 +24,22 @@ class ViewController: NSViewController {
 
 
     @IBAction func startClicked(_ sender: NSButton) {
-        var output = "{ pause : false, ";
-        output += " cat: \"" + (categoryDropdown.titleOfSelectedItem ?? "").replacingOccurrences(of: "\"", with: "") + "\", ";
-        output += " name: \"" + nameInput.stringValue.replacingOccurrences(of: "\"", with: "") + "\", ";
-        output += " time: \"" + timeInput.stringValue.replacingOccurrences(of: "\"", with: "") + "\" ";
+        var output = "{ \"pause\" : false, ";
+        output += " \"cat\": \"" + (categoryDropdown.titleOfSelectedItem ?? "").replacingOccurrences(of: "\"", with: "") + "\", ";
+        output += " \"name\": \"" + nameInput.stringValue.replacingOccurrences(of: "\"", with: "") + "\", ";
+        output += " \"time\": \"" + timeInput.stringValue.replacingOccurrences(of: "\"", with: "") + "\" ";
         output += "}";
 
-        print(output);
+        var stdOut = FileHandle.standardOutput;
+        print(output, to:&stdOut);
 
         NSApplication.shared.terminate(self);
     }
 
     @IBAction func pauseClicked(_ sender: NSButton) {
-        print("{ pause : true, cat: \"\", name: \"\", time: \"\" }");
+        var stdOut = FileHandle.standardOutput;
+        print("{ \"pause\" : true, \"cat\": \"\", \"name\": \"\", \"time\": \"\" }", to:&stdOut);
+        
         NSApplication.shared.terminate(self);
     }
 
@@ -45,6 +54,11 @@ class ViewController: NSViewController {
         categoryDropdown.removeAllItems();
         categoryDropdown.addItems(withTitles: catList);
     }
+    
+    override func viewWillAppear() {
+        NSApplication.shared.activate(ignoringOtherApps: true);
+        view.window?.level = .floating;
+    }
 
     override var representedObject: Any? {
         didSet {}