diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj index 06ce5e7..2306030 100644 --- a/Persephone.xcodeproj/project.pbxproj +++ b/Persephone.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ E40786232110CE70006887B1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E40786212110CE70006887B1 /* Main.storyboard */; }; E407862F2110CE70006887B1 /* PersephoneTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E407862E2110CE70006887B1 /* PersephoneTests.swift */; }; E407863A2110CE70006887B1 /* PersephoneUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E40786392110CE70006887B1 /* PersephoneUITests.swift */; }; + E465049A21E94DF500A70F4C /* WindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E465049921E94DF500A70F4C /* WindowController.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -46,6 +47,7 @@ E40786352110CE70006887B1 /* PersephoneUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PersephoneUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E40786392110CE70006887B1 /* PersephoneUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersephoneUITests.swift; sourceTree = ""; }; E407863B2110CE70006887B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E465049921E94DF500A70F4C /* WindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -100,6 +102,7 @@ E407861D2110CE6E006887B1 /* ViewController.swift */, E407861F2110CE70006887B1 /* Assets.xcassets */, E40786212110CE70006887B1 /* Main.storyboard */, + E465049921E94DF500A70F4C /* WindowController.swift */, E40786242110CE70006887B1 /* Info.plist */, E40786252110CE70006887B1 /* Persephone.entitlements */, ); @@ -255,6 +258,7 @@ buildActionMask = 2147483647; files = ( E407861E2110CE6E006887B1 /* ViewController.swift in Sources */, + E465049A21E94DF500A70F4C /* WindowController.swift in Sources */, E407861C2110CE6E006887B1 /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Persephone.xcodeproj/xcuserdata/danbarber.xcuserdatad/xcschemes/xcschememanagement.plist b/Persephone.xcodeproj/xcuserdata/danbarber.xcuserdatad/xcschemes/xcschememanagement.plist index f8c8c47..2122692 100644 --- a/Persephone.xcodeproj/xcuserdata/danbarber.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Persephone.xcodeproj/xcuserdata/danbarber.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ orderHint 0 + Persephone.xcscheme_^#shared#^_ + + orderHint + 0 + diff --git a/Persephone/Assets.xcassets/nextTrackButton.imageset/Contents.json b/Persephone/Assets.xcassets/nextTrackButton.imageset/Contents.json new file mode 100644 index 0000000..f1049bc --- /dev/null +++ b/Persephone/Assets.xcassets/nextTrackButton.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "nextTrackButton.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "nextTrackButton@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton.png b/Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton.png new file mode 100644 index 0000000..ee7df6a Binary files /dev/null and b/Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton.png differ diff --git a/Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton@2x.png b/Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton@2x.png new file mode 100644 index 0000000..bd1fa2d Binary files /dev/null and b/Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton@2x.png differ diff --git a/Persephone/Assets.xcassets/pauseButton.imageset/Contents.json b/Persephone/Assets.xcassets/pauseButton.imageset/Contents.json new file mode 100644 index 0000000..8e78dbf --- /dev/null +++ b/Persephone/Assets.xcassets/pauseButton.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "pauseButton.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "pauseButton@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Persephone/Assets.xcassets/pauseButton.imageset/pauseButton.png b/Persephone/Assets.xcassets/pauseButton.imageset/pauseButton.png new file mode 100644 index 0000000..ebaa46f Binary files /dev/null and b/Persephone/Assets.xcassets/pauseButton.imageset/pauseButton.png differ diff --git a/Persephone/Assets.xcassets/pauseButton.imageset/pauseButton@2x.png b/Persephone/Assets.xcassets/pauseButton.imageset/pauseButton@2x.png new file mode 100644 index 0000000..41cfdd9 Binary files /dev/null and b/Persephone/Assets.xcassets/pauseButton.imageset/pauseButton@2x.png differ diff --git a/Persephone/Assets.xcassets/playButton.imageset/Contents.json b/Persephone/Assets.xcassets/playButton.imageset/Contents.json new file mode 100644 index 0000000..cbf4b21 --- /dev/null +++ b/Persephone/Assets.xcassets/playButton.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "playButton.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "playButton@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Persephone/Assets.xcassets/playButton.imageset/playButton.png b/Persephone/Assets.xcassets/playButton.imageset/playButton.png new file mode 100644 index 0000000..7bcca13 Binary files /dev/null and b/Persephone/Assets.xcassets/playButton.imageset/playButton.png differ diff --git a/Persephone/Assets.xcassets/playButton.imageset/playButton@2x.png b/Persephone/Assets.xcassets/playButton.imageset/playButton@2x.png new file mode 100644 index 0000000..0908d6a Binary files /dev/null and b/Persephone/Assets.xcassets/playButton.imageset/playButton@2x.png differ diff --git a/Persephone/Assets.xcassets/prevTrackButton.imageset/Contents.json b/Persephone/Assets.xcassets/prevTrackButton.imageset/Contents.json new file mode 100644 index 0000000..29dd3b2 --- /dev/null +++ b/Persephone/Assets.xcassets/prevTrackButton.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "prevTrackButton.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "prevTrackButton@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton.png b/Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton.png new file mode 100644 index 0000000..71d91b0 Binary files /dev/null and b/Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton.png differ diff --git a/Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton@2x.png b/Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton@2x.png new file mode 100644 index 0000000..400edae Binary files /dev/null and b/Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton@2x.png differ diff --git a/Persephone/Assets.xcassets/stopButton.imageset/Contents.json b/Persephone/Assets.xcassets/stopButton.imageset/Contents.json new file mode 100644 index 0000000..a95b48c --- /dev/null +++ b/Persephone/Assets.xcassets/stopButton.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "stopButton.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "stopButton@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Persephone/Assets.xcassets/stopButton.imageset/stopButton.png b/Persephone/Assets.xcassets/stopButton.imageset/stopButton.png new file mode 100644 index 0000000..8df829b Binary files /dev/null and b/Persephone/Assets.xcassets/stopButton.imageset/stopButton.png differ diff --git a/Persephone/Assets.xcassets/stopButton.imageset/stopButton@2x.png b/Persephone/Assets.xcassets/stopButton.imageset/stopButton@2x.png new file mode 100644 index 0000000..7b9b606 Binary files /dev/null and b/Persephone/Assets.xcassets/stopButton.imageset/stopButton@2x.png differ diff --git a/Persephone/Base.lproj/Main.storyboard b/Persephone/Base.lproj/Main.storyboard index 6bc1534..fc5ff26 100644 --- a/Persephone/Base.lproj/Main.storyboard +++ b/Persephone/Base.lproj/Main.storyboard @@ -1,7 +1,9 @@ - - + + - + + + @@ -673,7 +675,7 @@ - + @@ -682,36 +684,246 @@ - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Persephone/WindowController.swift b/Persephone/WindowController.swift new file mode 100644 index 0000000..fb9ab65 --- /dev/null +++ b/Persephone/WindowController.swift @@ -0,0 +1,16 @@ +// +// WindowController.swift +// Persephone +// +// Created by Daniel Barber on 2019/1/11. +// Copyright © 2019 Dan Barber. All rights reserved. +// + +import Cocoa + +class WindowController: NSWindowController { + override func windowDidLoad() { + super.windowDidLoad() + window?.titleVisibility = .hidden + } +} diff --git a/Resources/export/nextTrackButton.png b/Resources/export/nextTrackButton.png new file mode 100644 index 0000000..ee7df6a Binary files /dev/null and b/Resources/export/nextTrackButton.png differ diff --git a/Resources/export/nextTrackButton@2x.png b/Resources/export/nextTrackButton@2x.png new file mode 100644 index 0000000..bd1fa2d Binary files /dev/null and b/Resources/export/nextTrackButton@2x.png differ diff --git a/Resources/export/pauseButton.png b/Resources/export/pauseButton.png new file mode 100644 index 0000000..ebaa46f Binary files /dev/null and b/Resources/export/pauseButton.png differ diff --git a/Resources/export/pauseButton@2x.png b/Resources/export/pauseButton@2x.png new file mode 100644 index 0000000..41cfdd9 Binary files /dev/null and b/Resources/export/pauseButton@2x.png differ diff --git a/Resources/export/playButton.png b/Resources/export/playButton.png new file mode 100644 index 0000000..7bcca13 Binary files /dev/null and b/Resources/export/playButton.png differ diff --git a/Resources/export/playButton@2x.png b/Resources/export/playButton@2x.png new file mode 100644 index 0000000..0908d6a Binary files /dev/null and b/Resources/export/playButton@2x.png differ diff --git a/Resources/export/prevTrackButton.png b/Resources/export/prevTrackButton.png new file mode 100644 index 0000000..71d91b0 Binary files /dev/null and b/Resources/export/prevTrackButton.png differ diff --git a/Resources/export/prevTrackButton@2x.png b/Resources/export/prevTrackButton@2x.png new file mode 100644 index 0000000..400edae Binary files /dev/null and b/Resources/export/prevTrackButton@2x.png differ diff --git a/Resources/export/stopButton.png b/Resources/export/stopButton.png new file mode 100644 index 0000000..8df829b Binary files /dev/null and b/Resources/export/stopButton.png differ diff --git a/Resources/export/stopButton@2x.png b/Resources/export/stopButton@2x.png new file mode 100644 index 0000000..7b9b606 Binary files /dev/null and b/Resources/export/stopButton@2x.png differ diff --git a/Resources/icons.sketch b/Resources/icons.sketch new file mode 100644 index 0000000..71a5e76 Binary files /dev/null and b/Resources/icons.sketch differ