diff --git a/MultiClock.xcodeproj/project.pbxproj b/MultiClock.xcodeproj/project.pbxproj index 3408547..54bf0e3 100644 --- a/MultiClock.xcodeproj/project.pbxproj +++ b/MultiClock.xcodeproj/project.pbxproj @@ -476,7 +476,7 @@ CLANG_ENABLE_MODULES = NO; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = 2Y9M69QJKZ; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -487,7 +487,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.1; PRODUCT_BUNDLE_IDENTIFIER = net.amiantos.MultiClock; PRODUCT_NAME = MultiClock; SWIFT_EMIT_LOC_STRINGS = YES; @@ -503,7 +503,7 @@ CLANG_ENABLE_MODULES = NO; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = 2Y9M69QJKZ; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -514,7 +514,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.1; PRODUCT_BUNDLE_IDENTIFIER = net.amiantos.MultiClock; PRODUCT_NAME = MultiClock; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/README.md b/README.md index 5ce00ee..430aefe 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ MultiClock is a screensaver for macOS that displays the current time using 24 cl ## Download -* [Download MultiClock v1.0 for macOS](https://amiantos.s3.amazonaws.com/multiclock-1.0.zip) +* [Download MultiClock v1.1 for macOS](https://amiantos.s3.amazonaws.com/multiclock-1.1.zip) ## FAQ *What about 24-hour time support?* -If you have macOS set to 24-hour time, the screensaver will automatically use 24-hour time as well. (Well, it's [supposed to, anyway](https://github.com/amiantos/multiclock/issues/2)...) +If you have macOS set to 24-hour time, the screensaver will automatically use 24-hour time as well. ## Development @@ -43,7 +43,7 @@ queue(animations: [ ]) ``` -Completed animations should go in `ClockController.swift`. Bump up the `Int.random()` call and add a new `case` to the `switch`. Then submit a PR if you think the animation is cool :) +Completed animations should go in `ClockController.swift`. Add another integer to `allAnimations` at the top, and add a new `case` to the `switch` down below. Then submit a PR if you think the animation is cool :) *Why are all the degree references in negative?* Because I'm too lazy to go back and make them positive after reworking the animation system. Submit a PR fixing it, if you want! diff --git a/Shared/Nodes/Assets.xcassets/Dials/ringIndicesDial.imageset/ringIndicesDial.pdf b/Shared/Nodes/Assets.xcassets/Dials/ringIndicesDial.imageset/ringIndicesDial.pdf index 48cddaa..dc7a8c1 100644 Binary files a/Shared/Nodes/Assets.xcassets/Dials/ringIndicesDial.imageset/ringIndicesDial.pdf and b/Shared/Nodes/Assets.xcassets/Dials/ringIndicesDial.imageset/ringIndicesDial.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Dials/ringThickDial.imageset/ringThickDial.pdf b/Shared/Nodes/Assets.xcassets/Dials/ringThickDial.imageset/ringThickDial.pdf index f3d1adc..dd9a972 100644 Binary files a/Shared/Nodes/Assets.xcassets/Dials/ringThickDial.imageset/ringThickDial.pdf and b/Shared/Nodes/Assets.xcassets/Dials/ringThickDial.imageset/ringThickDial.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchFilled/appleWatchFilledHourHand.imageset/appleWatchFilledHourHand.pdf b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchFilled/appleWatchFilledHourHand.imageset/appleWatchFilledHourHand.pdf index 5f5ff5c..4ca0997 100644 Binary files a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchFilled/appleWatchFilledHourHand.imageset/appleWatchFilledHourHand.pdf and b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchFilled/appleWatchFilledHourHand.imageset/appleWatchFilledHourHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchFilled/appleWatchFilledMinuteHand.imageset/appleWatchFilledMinuteHand.pdf b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchFilled/appleWatchFilledMinuteHand.imageset/appleWatchFilledMinuteHand.pdf index b624f97..d34f116 100644 Binary files a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchFilled/appleWatchFilledMinuteHand.imageset/appleWatchFilledMinuteHand.pdf and b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchFilled/appleWatchFilledMinuteHand.imageset/appleWatchFilledMinuteHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/Contents.json b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/Contents.json index 0cd2e16..6208c99 100644 --- a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/Contents.json +++ b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Hourhand-applewatch-filled.pdf", + "filename" : "appleWatchSolidHourHand.pdf", "idiom" : "universal" } ], diff --git a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/Hourhand-applewatch-filled.pdf b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/appleWatchSolidHourHand.pdf similarity index 65% rename from Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/Hourhand-applewatch-filled.pdf rename to Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/appleWatchSolidHourHand.pdf index d3f8449..395efdd 100644 Binary files a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/Hourhand-applewatch-filled.pdf and b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidHourHand.imageset/appleWatchSolidHourHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/Contents.json b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/Contents.json index 5c1f56c..16cd383 100644 --- a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/Contents.json +++ b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Minutehand-applewatch-filled.pdf", + "filename" : "appleWatchSolidMinuteHand.pdf", "idiom" : "universal" } ], diff --git a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/Minutehand-applewatch-filled.pdf b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/appleWatchSolidMinuteHand.pdf similarity index 64% rename from Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/Minutehand-applewatch-filled.pdf rename to Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/appleWatchSolidMinuteHand.pdf index b6fa47c..0dd8646 100644 Binary files a/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/Minutehand-applewatch-filled.pdf and b/Shared/Nodes/Assets.xcassets/Hands/AppleWatchSolid/appleWatchSolidMinuteHand.imageset/appleWatchSolidMinuteHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/LCD/Contents.json b/Shared/Nodes/Assets.xcassets/Hands/LCD/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Shared/Nodes/Assets.xcassets/Hands/LCD/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdHourHand.imageset/Contents.json b/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdHourHand.imageset/Contents.json new file mode 100644 index 0000000..f7d5627 --- /dev/null +++ b/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdHourHand.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "lcdHourHand.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdHourHand.imageset/lcdHourHand.pdf b/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdHourHand.imageset/lcdHourHand.pdf new file mode 100644 index 0000000..3aa96d2 Binary files /dev/null and b/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdHourHand.imageset/lcdHourHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdMinuteHand.imageset/Contents.json b/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdMinuteHand.imageset/Contents.json new file mode 100644 index 0000000..1cc726c --- /dev/null +++ b/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdMinuteHand.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "lcdMinuteHand.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdMinuteHand.imageset/lcdMinuteHand.pdf b/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdMinuteHand.imageset/lcdMinuteHand.pdf new file mode 100644 index 0000000..44c2706 Binary files /dev/null and b/Shared/Nodes/Assets.xcassets/Hands/LCD/lcdMinuteHand.imageset/lcdMinuteHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/Shout/shoutHourHand.imageset/shoutHourHand.pdf b/Shared/Nodes/Assets.xcassets/Hands/Shout/shoutHourHand.imageset/shoutHourHand.pdf index d16b5ca..af02685 100644 Binary files a/Shared/Nodes/Assets.xcassets/Hands/Shout/shoutHourHand.imageset/shoutHourHand.pdf and b/Shared/Nodes/Assets.xcassets/Hands/Shout/shoutHourHand.imageset/shoutHourHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/Shout/shoutMinuteHand.imageset/shoutMinuteHand.pdf b/Shared/Nodes/Assets.xcassets/Hands/Shout/shoutMinuteHand.imageset/shoutMinuteHand.pdf index 5d60cf7..a4c0938 100644 Binary files a/Shared/Nodes/Assets.xcassets/Hands/Shout/shoutMinuteHand.imageset/shoutMinuteHand.pdf and b/Shared/Nodes/Assets.xcassets/Hands/Shout/shoutMinuteHand.imageset/shoutMinuteHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/Traditional/Contents.json b/Shared/Nodes/Assets.xcassets/Hands/Traditional/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Shared/Nodes/Assets.xcassets/Hands/Traditional/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalHourHand.imageset/Contents.json b/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalHourHand.imageset/Contents.json new file mode 100644 index 0000000..855ba74 --- /dev/null +++ b/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalHourHand.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "traditionalHourHand.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalHourHand.imageset/traditionalHourHand.pdf b/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalHourHand.imageset/traditionalHourHand.pdf new file mode 100644 index 0000000..bcdfeea Binary files /dev/null and b/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalHourHand.imageset/traditionalHourHand.pdf differ diff --git a/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalMinuteHand.imageset/Contents.json b/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalMinuteHand.imageset/Contents.json new file mode 100644 index 0000000..9cb9aa1 --- /dev/null +++ b/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalMinuteHand.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "traditionalMinuteHand.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalMinuteHand.imageset/traditionalMinuteHand.pdf b/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalMinuteHand.imageset/traditionalMinuteHand.pdf new file mode 100644 index 0000000..cc3368f Binary files /dev/null and b/Shared/Nodes/Assets.xcassets/Hands/Traditional/traditionalMinuteHand.imageset/traditionalMinuteHand.pdf differ diff --git a/Shared/Nodes/Textures.swift b/Shared/Nodes/Textures.swift index fab82f2..9a46bf0 100644 --- a/Shared/Nodes/Textures.swift +++ b/Shared/Nodes/Textures.swift @@ -16,6 +16,8 @@ enum HandDesign: String { case appleWatchSolid = "appleWatchSolid" case appleWatchFilled = "appleWatchFilled" case shout = "shout" + case lcd = "lcd" + case traditional = "traditional" } enum DialDesign: String { @@ -51,7 +53,15 @@ let handTextures: [HandDesign: HandTextureSet] = [ .shout: HandTextureSet( hourHandTexture: FileGrabber.shared.getSKTexture(named: "shoutHourHand"), minuteHandTexture: FileGrabber.shared.getSKTexture(named: "shoutMinuteHand") - ) + ), + .lcd: HandTextureSet( + hourHandTexture: FileGrabber.shared.getSKTexture(named: "lcdHourHand"), + minuteHandTexture: FileGrabber.shared.getSKTexture(named: "lcdMinuteHand") + ), + .traditional: HandTextureSet( + hourHandTexture: FileGrabber.shared.getSKTexture(named: "traditionalHourHand"), + minuteHandTexture: FileGrabber.shared.getSKTexture(named: "traditionalMinuteHand") + ), ] let dialTextures: [DialDesign: SKTexture?] = [ diff --git a/macOS Screensaver/ConfigureSheet/ConfigureSheet.xib b/macOS Screensaver/ConfigureSheet/ConfigureSheet.xib index 0029872..07260a5 100644 --- a/macOS Screensaver/ConfigureSheet/ConfigureSheet.xib +++ b/macOS Screensaver/ConfigureSheet/ConfigureSheet.xib @@ -50,7 +50,7 @@ DQ