Release v1.0.0

vpeschenkov · May 16, 2019 · 9e6c361 · 9e6c361
1 parent d1dccbd
commit 9e6c361
Show file tree

Hide file tree

Showing 76 changed files with 241 additions and 136 deletions.
diff --git a/PredatorClock.xcodeproj/project.pbxproj → Predator.xcodeproj/project.pbxproj b/PredatorClock.xcodeproj/project.pbxproj → Predator.xcodeproj/project.pbxproj
diff --git a/Predator.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Predator.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Predator.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Predator.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/PredatorClock/Assets.xcassets/Contents.json → Predator/Assets.xcassets/Contents.json b/PredatorClock/Assets.xcassets/Contents.json → Predator/Assets.xcassets/Contents.json
diff --git a/...ts.xcassets/GitHub.imageset/Contents.json → ...ts.xcassets/GitHub.imageset/Contents.json b/...ts.xcassets/GitHub.imageset/Contents.json → ...ts.xcassets/GitHub.imageset/Contents.json
diff --git a/...cassets/GitHub.imageset/github_dark-1.png → ...cassets/GitHub.imageset/github_dark-1.png b/...cassets/GitHub.imageset/github_dark-1.png → ...cassets/GitHub.imageset/github_dark-1.png
diff --git a/....xcassets/GitHub.imageset/github_dark.png → ....xcassets/GitHub.imageset/github_dark.png b/....xcassets/GitHub.imageset/github_dark.png → ....xcassets/GitHub.imageset/github_dark.png
diff --git a/...assets/GitHub.imageset/github_light-1.png → ...assets/GitHub.imageset/github_light-1.png b/...assets/GitHub.imageset/github_light-1.png → ...assets/GitHub.imageset/github_light-1.png
diff --git a/...xcassets/GitHub.imageset/github_light.png → ...xcassets/GitHub.imageset/github_light.png b/...xcassets/GitHub.imageset/github_light.png → ...xcassets/GitHub.imageset/github_light.png
diff --git a/...s.xcassets/Twitter.imageset/Contents.json → ...s.xcassets/Twitter.imageset/Contents.json b/...s.xcassets/Twitter.imageset/Contents.json → ...s.xcassets/Twitter.imageset/Contents.json
diff --git a/...ssets/Twitter.imageset/twitter_dark-1.png → ...ssets/Twitter.imageset/twitter_dark-1.png b/...ssets/Twitter.imageset/twitter_dark-1.png → ...ssets/Twitter.imageset/twitter_dark-1.png
diff --git a/...cassets/Twitter.imageset/twitter_dark.png → ...cassets/Twitter.imageset/twitter_dark.png b/...cassets/Twitter.imageset/twitter_dark.png → ...cassets/Twitter.imageset/twitter_dark.png
diff --git a/...sets/Twitter.imageset/twitter_light-1.png → ...sets/Twitter.imageset/twitter_light-1.png b/...sets/Twitter.imageset/twitter_light-1.png → ...sets/Twitter.imageset/twitter_light-1.png
diff --git a/...assets/Twitter.imageset/twitter_light.png → ...assets/Twitter.imageset/twitter_light.png b/...assets/Twitter.imageset/twitter_light.png → ...assets/Twitter.imageset/twitter_light.png
diff --git a/PredatorClock/Info.plist → Predator/Info.plist b/PredatorClock/Info.plist → Predator/Info.plist
@@ -21,6 +21,6 @@
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2019 Victor Peschenkov. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
-	<string>PredatorClock.PredatorClockView</string>
+	<string>Predator.PredatorView</string>
 </dict>
 </plist>
diff --git a/PredatorClock/PredatorClockPreviewView.swift → Predator/PredatorPreviewView.swift b/PredatorClock/PredatorClockPreviewView.swift → Predator/PredatorPreviewView.swift
@@ -1,14 +1,14 @@
 //
-//  PredatorClockPreviewView.swift
-//  PredatorClock
+//  PredatorPreviewView.swift
+//  Predator
 //
 //  Created by Victor Peschenkov on 5/11/19.
 //  Copyright © 2019 Victor Peschenkov. All rights reserved.
 //
 
 import Cocoa
 
-final class PredatorClockPreviewView: NSView {
+final class PredatorPreviewView: NSView {
     private let predator = PredatorClock()
 
     override func draw(_ dirtyRect: NSRect) {

diff --git a/PredatorClock/PredatorClockView.swift → Predator/PredatorView.swift b/PredatorClock/PredatorClockView.swift → Predator/PredatorView.swift
@@ -1,14 +1,14 @@
 //
-//  PredatorClockView.swift
-//  PredatorClock
+//  PredatorView.swift
+//  Predator
 //
 //  Created by Victor Peschenkov on 5/7/19.
 //  Copyright © 2019 Victor Peschenkov. All rights reserved.
 //
 
 import ScreenSaver
 
-final class PredatorClockView: ScreenSaverView {
+final class PredatorView: ScreenSaverView {
     fileprivate var timer: Timer?
     fileprivate lazy var predator = PredatorClock()
     fileprivate lazy var preferences = PreferencesWindowController(windowNibName: Preferences.preferencesIdentifier)
@@ -40,7 +40,7 @@ final class PredatorClockView: ScreenSaverView {
 
 // MARK: - Configure Sheet
 
-extension PredatorClockView {
+extension PredatorView {
     override var hasConfigureSheet: Bool {
         return true
     }
@@ -52,7 +52,7 @@ extension PredatorClockView {
 
 // MARK: - Animation
 
-extension PredatorClockView {
+extension PredatorView {
     override var isAnimating: Bool {
         return true
     }
@@ -77,7 +77,7 @@ extension PredatorClockView {
 
 // MARK: - Timer
 
-extension PredatorClockView {
+extension PredatorView {
     @objc func animationLoopEventHandler() {
         self.setNeedsDisplay(self.bounds)
     }

diff --git a/PredatorClock/Preferences/Preferences.swift → Predator/Preferences/Preferences.swift b/PredatorClock/Preferences/Preferences.swift → Predator/Preferences/Preferences.swift
diff --git a/...erences/PreferencesWindowController.swift → ...erences/PreferencesWindowController.swift b/...erences/PreferencesWindowController.swift → ...erences/PreferencesWindowController.swift
diff --git a/...eferences/PreferencesWindowController.xib → ...eferences/PreferencesWindowController.xib b/...eferences/PreferencesWindowController.xib → ...eferences/PreferencesWindowController.xib
@@ -6,7 +6,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="PreferencesWindowController" customModule="PredatorClock" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="PreferencesWindowController" customModule="Predator" customModuleProvider="target">
             <connections>
                 <outlet property="colorPicker" destination="PFI-UJ-nv7" id="9cy-56-h37"/>
                 <outlet property="previewView" destination="TPH-Cu-qkW" id="RIv-nX-syw"/>
@@ -20,14 +20,14 @@
         <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="377" height="598"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+            <rect key="contentRect" x="196" y="240" width="500" height="1200"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="377" height="222"/>
+                <rect key="frame" x="0.0" y="0.0" width="500" height="322"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <colorWell translatesAutoresizingMaskIntoConstraints="NO" id="PFI-UJ-nv7">
-                        <rect key="frame" x="117" y="186" width="44" height="20"/>
+                        <rect key="frame" x="105" y="286" width="44" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="7ko-Uq-JXd"/>
                             <constraint firstAttribute="width" constant="44" id="qf0-Wf-dUc"/>
@@ -38,7 +38,7 @@
                         </connections>
                     </colorWell>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vnv-3I-Nmy">
-                        <rect key="frame" x="14" y="154" width="107" height="18"/>
+                        <rect key="frame" x="14" y="254" width="107" height="18"/>
                         <buttonCell key="cell" type="check" title="Reverse filling" bezelStyle="regularSquare" imagePosition="left" inset="2" id="8af-fe-00T">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
@@ -78,24 +78,24 @@
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="udT-lF-zKm">
-                        <rect key="frame" x="14" y="186" width="89" height="20"/>
+                        <rect key="frame" x="14" y="286" width="77" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="mVJ-P2-jtj"/>
                         </constraints>
-                        <textFieldCell key="cell" lineBreakMode="clipping" title="Primary color:" id="9CI-hk-4rQ">
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Clock color:" id="9CI-hk-4rQ">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="TPH-Cu-qkW" userLabel="Preview" customClass="PredatorClockPreviewView" customModule="PredatorClock" customModuleProvider="target">
-                        <rect key="frame" x="183" y="106" width="178" height="100"/>
+                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="TPH-Cu-qkW" userLabel="Preview" customClass="PredatorPreviewView" customModule="Predator" customModuleProvider="target">
+                        <rect key="frame" x="183" y="106" width="301" height="200"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="100" id="BHn-tW-WT2"/>
+                            <constraint firstAttribute="height" constant="200" id="BHn-tW-WT2"/>
                         </constraints>
                     </customView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eY6-hS-6X6">
-                        <rect key="frame" x="295" y="9" width="72" height="32"/>
+                        <rect key="frame" x="418" y="9" width="72" height="32"/>
                         <buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="NWC-RO-pmp">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -108,21 +108,21 @@ DQ
                         </connections>
                     </button>
                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="jmh-nA-HxL">
-                        <rect key="frame" x="16" y="95" width="345" height="5"/>
+                        <rect key="frame" x="16" y="95" width="468" height="5"/>
                     </box>
                     <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="eqs-uH-pgW">
-                        <rect key="frame" x="172" y="98" width="5" height="108"/>
+                        <rect key="frame" x="172" y="98" width="5" height="208"/>
                     </box>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QPA-Ty-yka">
-                        <rect key="frame" x="14" y="72" width="349" height="17"/>
+                        <rect key="frame" x="14" y="72" width="472" height="17"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Want to keep updated?" id="3ad-ri-H5Y">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wdp-Vx-SFy">
-                        <rect key="frame" x="14" y="124" width="106" height="18"/>
+                        <rect key="frame" x="14" y="224" width="106" height="18"/>
                         <buttonCell key="cell" type="check" title="12-hour clock" bezelStyle="regularSquare" imagePosition="left" inset="2" id="4uY-7Z-MEs">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
@@ -166,7 +166,7 @@ DQ
         </window>
     </objects>
     <resources>
-        <image name="GitHub" width="429" height="256"/>
-        <image name="Twitter" width="429" height="256"/>
+        <image name="GitHub" width="858" height="512"/>
+        <image name="Twitter" width="858" height="512"/>
     </resources>
 </document>
diff --git a/Predator/thumbnail.png b/Predator/thumbnail.png
diff --git a/Predator/[email protected] b/Predator/[email protected]
diff --git a/PredatorClock.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/PredatorClock.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/PredatorClockCore/Info.plist → PredatorCore/Info.plist b/PredatorClockCore/Info.plist → PredatorCore/Info.plist
diff --git a/PredatorClockCore/PredatorClock.swift → PredatorCore/PredatorClock.swift b/PredatorClockCore/PredatorClock.swift → PredatorCore/PredatorClock.swift
@@ -27,6 +27,7 @@ final public class PredatorClock {
         // Converts time to 12-hour clock format
         if preferences.isTwelveFourClockFormat {
             hours = hours > 12 ? hours - 12 : hours
+            hours = hours == 0 ? 12 : hours
         }
 
         // Width

diff --git a/PredatorClockCore/PredatorClockCore.h → PredatorCore/PredatorCore.h b/PredatorClockCore/PredatorClockCore.h → PredatorCore/PredatorCore.h
@@ -1,6 +1,6 @@
 //
-//  PredatorClockCore.h
-//  PredatorClockCore
+//  PredatorCore.h
+//  PredatorCore
 //
 //  Created by Victor Peschenkov on 5/7/19.
 //  Copyright © 2019 Victor Peschenkov. All rights reserved.
@@ -9,10 +9,10 @@
 #import <Cocoa/Cocoa.h>
 
 //! Project version number for PredatorClockCore.
-FOUNDATION_EXPORT double PredatorClockCoreVersionNumber;
+FOUNDATION_EXPORT double PredatorCoreVersionNumber;
 
 //! Project version string for PredatorClockCore.
-FOUNDATION_EXPORT const unsigned char PredatorClockCoreVersionString[];
+FOUNDATION_EXPORT const unsigned char PredatorCoreVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <PredatorClockCore/PublicHeader.h>
 

diff --git a/PredatorClockSandbox/AppDelegate.swift → PredatorSandbox/AppDelegate.swift b/PredatorClockSandbox/AppDelegate.swift → PredatorSandbox/AppDelegate.swift
@@ -1,6 +1,6 @@
 //
 //  AppDelegate.swift
-//  PredatorClockSandbox
+//  PredatorSandbox
 //
 //  Created by Victor Peschenkov on 5/7/19.
 //  Copyright © 2019 Victor Peschenkov. All rights reserved.

diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...lockSandbox/Assets.xcassets/Contents.json → ...atorSandbox/Assets.xcassets/Contents.json b/...lockSandbox/Assets.xcassets/Contents.json → ...atorSandbox/Assets.xcassets/Contents.json
diff --git a/PredatorClockSandbox/Base.lproj/MainMenu.xib → PredatorSandbox/Base.lproj/MainMenu.xib b/PredatorClockSandbox/Base.lproj/MainMenu.xib → PredatorSandbox/Base.lproj/MainMenu.xib
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
+        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,20 +12,20 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
-        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PredatorClockSandbox" customModuleProvider="target">
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Predator" customModuleProvider="target">
             <connections>
                 <outlet property="window" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
         <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
             <items>
-                <menuItem title="PredatorClockSandbox" id="1Xt-HY-uBw">
+                <menuItem title="PredatorSandbox" id="1Xt-HY-uBw">
                     <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="PredatorClockSandbox" systemMenu="apple" id="uQy-DD-JDr">
+                    <menu key="submenu" title="PredatorSandbox" systemMenu="apple" id="uQy-DD-JDr">
                         <items>
-                            <menuItem title="About PredatorClockSandbox" id="5kV-Vb-QxS">
+                            <menuItem title="About PredatorSandbox" id="5kV-Vb-QxS">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
@@ -38,7 +39,7 @@
                                 <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                            <menuItem title="Hide PredatorClockSandbox" keyEquivalent="h" id="Olw-nP-bQN">
+                            <menuItem title="Hide PredatorSandbox" keyEquivalent="h" id="Olw-nP-bQN">
                                 <connections>
                                     <action selector="hide:" target="-1" id="PnN-Uc-m68"/>
                                 </connections>
@@ -56,7 +57,7 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                            <menuItem title="Quit PredatorClockSandbox" keyEquivalent="q" id="4sb-4s-VLi">
+                            <menuItem title="Quit PredatorSandbox" keyEquivalent="q" id="4sb-4s-VLi">
                                 <connections>
                                     <action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
                                 </connections>
@@ -669,7 +670,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
                         <items>
-                            <menuItem title="PredatorClockSandbox Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                            <menuItem title="PredatorSandbox Help" keyEquivalent="?" id="FKE-Sm-Kum">
                                 <connections>
                                     <action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
                                 </connections>
@@ -683,8 +684,8 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
-            <view key="contentView" id="EiT-Mj-1SZ" customClass="PredatorClockView" customModule="PredatorClock">
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
+            <view key="contentView" id="EiT-Mj-1SZ" customClass="PredatorView" customModule="Predator" customModuleProvider="target">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
             </view>

diff --git a/PredatorClockSandbox/Info.plist → PredatorSandbox/Info.plist b/PredatorClockSandbox/Info.plist → PredatorSandbox/Info.plist
diff --git a/...Sandbox/PredatorClockSandbox.entitlements → PredatorSandbox/PredatorSandbox.entitlements b/...Sandbox/PredatorClockSandbox.entitlements → PredatorSandbox/PredatorSandbox.entitlements
diff --git a/PredatorClockSandbox/PredatorClockView.swift → PredatorSandbox/PredatorView.swift b/PredatorClockSandbox/PredatorClockView.swift → PredatorSandbox/PredatorView.swift
@@ -1,15 +1,15 @@
 //
 //  PredatorClockView.swift
-//  PredatorClockSandbox
+//  PredatorSandbox
 //
 //  Created by Victor Peschenkov on 5/7/19.
 //  Copyright © 2019 Victor Peschenkov. All rights reserved.
 //
 
 import Cocoa
-import PredatorClockCore
+import PredatorCore
 
-class PredatorClockView: NSView {
+class PredatorView: NSView {
     private var timer: Timer?
     private let predator = PredatorClock()