diff --git a/Mac/Assets.xcassets/AppIcon.appiconset/Contents.json b/Mac/Assets.xcassets/AppIcon.appiconset/Contents.json index d23d983e..8075bfd4 100644 --- a/Mac/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Mac/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -2,63 +2,63 @@ "images" : [ { "idiom" : "mac", - "size" : "16x16", - "scale" : "1x" + "scale" : "1x", + "size" : "16x16" }, { "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" + "scale" : "2x", + "size" : "16x16" }, { "idiom" : "mac", - "size" : "32x32", - "scale" : "1x" + "scale" : "1x", + "size" : "32x32" }, { "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" + "scale" : "2x", + "size" : "32x32" }, { - "size" : "128x128", - "idiom" : "mac", "filename" : "appIcon128.png", - "scale" : "1x" + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" }, { - "size" : "128x128", - "idiom" : "mac", "filename" : "appIcon128@2x.png", - "scale" : "2x" + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" }, { - "size" : "256x256", - "idiom" : "mac", "filename" : "appIcon256.png", - "scale" : "1x" + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" }, { - "size" : "256x256", - "idiom" : "mac", "filename" : "appIcon256@2x.png", - "scale" : "2x" + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" }, { - "size" : "512x512", - "idiom" : "mac", "filename" : "appIcon512.png", - "scale" : "1x" + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" }, { - "size" : "512x512", - "idiom" : "mac", "filename" : "appIcon512@2x.png", - "scale" : "2x" + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128.png index 89aa282f..a8cd5d55 100644 Binary files a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128.png and b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128.png differ diff --git a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128@2x.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128@2x.png index efbf9863..820b2d26 100644 Binary files a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128@2x.png and b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128@2x.png differ diff --git a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256.png index efbf9863..820b2d26 100644 Binary files a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256.png and b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256.png differ diff --git a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256@2x.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256@2x.png index 93a7b8c1..f8a2dace 100644 Binary files a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256@2x.png and b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256@2x.png differ diff --git a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512.png index 93a7b8c1..f8a2dace 100644 Binary files a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512.png and b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512.png differ diff --git a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512@2x.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512@2x.png index 4795a4dc..6112168a 100644 Binary files a/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512@2x.png and b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512@2x.png differ diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj index aecf4c38..1e430df8 100644 --- a/Persephone.xcodeproj/project.pbxproj +++ b/Persephone.xcodeproj/project.pbxproj @@ -720,6 +720,7 @@ E42A8F3A22176D6400A13ED9 /* README.md */, E411C268241C02B2008B9682 /* Shared */, E48054592426D4D900362CF3 /* Frameworks */, + E478E5C225D967E70046CE14 /* Recovered References */, ); sourceTree = ""; }; @@ -979,6 +980,17 @@ path = VolumeControl; sourceTree = ""; }; + E478E5C225D967E70046CE14 /* Recovered References */ = { + isa = PBXGroup; + children = ( + E4207C772576F7590089D21B /* NowPlayingViewController.swift */, + E403E63C246F4C3900200F58 /* NowPlayingBarViewController.swift */, + E4207C782576F75A0089D21B /* NowPlayingViewController.xib */, + E403E63D246F4C3900200F58 /* NowPlayingBarViewController.xib */, + ); + name = "Recovered References"; + sourceTree = ""; + }; E480510D2423BD6700362CF3 /* Lib */ = { isa = PBXGroup; children = ( @@ -2103,7 +2115,7 @@ "$(PROJECT_DIR)/Shared/libmpdclient/output", ); MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = "0.17.3-alpha"; + MARKETING_VERSION = "0.18-alpha"; PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2139,7 +2151,7 @@ "$(PROJECT_DIR)/Shared/libmpdclient/output", ); MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = "0.17.3-alpha"; + MARKETING_VERSION = "0.18-alpha"; PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Persephone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Persephone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 466c082b..00000000 --- a/Persephone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,79 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "CryptoSwift", - "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift", - "state": { - "branch": null, - "revision": "a44caef0550c346e0ab9172f7c9a3852c1833599", - "version": "1.3.0" - } - }, - { - "package": "Differ", - "repositoryURL": "https://github.com/tonyarnold/Differ", - "state": { - "branch": null, - "revision": "dd5d4bfb1c27012d4790e877b29847d2ab9d989b", - "version": "1.4.4" - } - }, - { - "package": "PMKFoundation", - "repositoryURL": "https://github.com/PromiseKit/Foundation", - "state": { - "branch": null, - "revision": "1a276e598dac59489ed904887e0740fa75e571e0", - "version": "3.3.4" - } - }, - { - "package": "Kingfisher", - "repositoryURL": "https://github.com/onevcat/Kingfisher.git", - "state": { - "branch": null, - "revision": "44bfa76787a0f07e4d5ae3304e9d4f631fd519bd", - "version": "5.13.0" - } - }, - { - "package": "MediaKeyTap", - "repositoryURL": "https://github.com/danbee/MediaKeyTap", - "state": { - "branch": "add-package-swift", - "revision": "b6b83b1a3e78d25ad9c86a55babce4f60caf6fa4", - "version": null - } - }, - { - "package": "PromiseKit", - "repositoryURL": "https://github.com/mxcl/PromiseKit", - "state": { - "branch": null, - "revision": "f14f16cc2602afec1030e4f492100d6d43dca544", - "version": "6.13.1" - } - }, - { - "package": "ReSwift", - "repositoryURL": "https://github.com/ReSwift/ReSwift", - "state": { - "branch": null, - "revision": "b92762b5aa85c5e94053d942fbd37124ee939e5b", - "version": "5.0.0" - } - }, - { - "package": "SwiftyJSON", - "repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON", - "state": { - "branch": null, - "revision": "2b6054efa051565954e1d2b9da831680026cd768", - "version": "5.0.0" - } - } - ] - }, - "version": 1 -} diff --git a/Resources/export/appIcon128.png b/Resources/export/appIcon128.png index 89aa282f..a8cd5d55 100644 Binary files a/Resources/export/appIcon128.png and b/Resources/export/appIcon128.png differ diff --git a/Resources/export/appIcon128@2x.png b/Resources/export/appIcon128@2x.png index efbf9863..820b2d26 100644 Binary files a/Resources/export/appIcon128@2x.png and b/Resources/export/appIcon128@2x.png differ diff --git a/Resources/export/appIcon256.png b/Resources/export/appIcon256.png index efbf9863..820b2d26 100644 Binary files a/Resources/export/appIcon256.png and b/Resources/export/appIcon256.png differ diff --git a/Resources/export/appIcon256@2x.png b/Resources/export/appIcon256@2x.png index 93a7b8c1..f8a2dace 100644 Binary files a/Resources/export/appIcon256@2x.png and b/Resources/export/appIcon256@2x.png differ diff --git a/Resources/export/appIcon512.png b/Resources/export/appIcon512.png index 93a7b8c1..f8a2dace 100644 Binary files a/Resources/export/appIcon512.png and b/Resources/export/appIcon512.png differ diff --git a/Resources/export/appIcon512@2x.png b/Resources/export/appIcon512@2x.png index 4795a4dc..6112168a 100644 Binary files a/Resources/export/appIcon512@2x.png and b/Resources/export/appIcon512@2x.png differ diff --git a/Resources/icons.sketch b/Resources/icons.sketch index 3ac177be..7ebd0d88 100644 Binary files a/Resources/icons.sketch and b/Resources/icons.sketch differ