diff --git a/.gitignore b/.gitignore index 43322df..6518120 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ .DS_Store .DS_Store +.DS_Store +grandfatherrock/.DS_Store +grandfatherrock/Assets.xcassets/.DS_Store +.DS_Store diff --git a/TapeDeck.xcodeproj/project.pbxproj b/TapeDeck.xcodeproj/project.pbxproj index 8b82083..ff77dec 100644 --- a/TapeDeck.xcodeproj/project.pbxproj +++ b/TapeDeck.xcodeproj/project.pbxproj @@ -657,7 +657,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.2; + MARKETING_VERSION = 1.3.3; PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock; PRODUCT_NAME = "AC Tape Deck"; SUPPORTS_MACCATALYST = YES; @@ -683,7 +683,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.2; + MARKETING_VERSION = 1.3.3; PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock; PRODUCT_NAME = "AC Tape Deck"; SUPPORTS_MACCATALYST = YES; diff --git a/TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate b/TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate index 07c9fd7..0156b8a 100644 Binary files a/TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate and b/TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist b/TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist index 92396fa..a49472b 100644 --- a/TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist @@ -49,12 +49,12 @@ grandfatherrock.xcscheme_^#shared#^_ orderHint - 0 + 1 hssceneExtension.xcscheme_^#shared#^_ orderHint - 1 + 0 hswidgetExtension.xcscheme_^#shared#^_ diff --git a/TapeDeck.xcodeproj/xcuserdata/penelopegomez.xcuserdatad/xcschemes/xcschememanagement.plist b/TapeDeck.xcodeproj/xcuserdata/penelopegomez.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..39b6d5a --- /dev/null +++ b/TapeDeck.xcodeproj/xcuserdata/penelopegomez.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,19 @@ + + + + + SchemeUserState + + grandfatherrock.xcscheme_^#shared#^_ + + orderHint + 0 + + hssceneExtension.xcscheme_^#shared#^_ + + orderHint + 1 + + + + diff --git a/TapeDeck.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TapeDeck.xcworkspace/xcshareddata/swiftpm/Package.resolved index deab0db..7ec233d 100644 --- a/TapeDeck.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/TapeDeck.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,16 +1,32 @@ { - "object": { - "pins": [ - { - "package": "SwiftyGif", - "repositoryURL": "https://github.com/kirualex/SwiftyGif.git", - "state": { - "branch": null, - "revision": "420d12cba8338b03993f73a72c1f6b70d5273cf2", - "version": "5.3.0" - } + "pins" : [ + { + "identity" : "swiftygif", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kirualex/SwiftyGif.git", + "state" : { + "revision" : "420d12cba8338b03993f73a72c1f6b70d5273cf2", + "version" : "5.3.0" } - ] - }, - "version": 1 + }, + { + "identity" : "swiftyjson", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SwiftyJSON/SwiftyJSON.git", + "state" : { + "revision" : "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07", + "version" : "5.0.1" + } + }, + { + "identity" : "zip", + "kind" : "remoteSourceControl", + "location" : "https://github.com/marmelroy/Zip.git", + "state" : { + "revision" : "67fa55813b9e7b3b9acee9c0ae501def28746d76", + "version" : "2.1.2" + } + } + ], + "version" : 2 } diff --git a/TapeDeck.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/UserInterfaceState.xcuserstate b/TapeDeck.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..2d60a2e Binary files /dev/null and b/TapeDeck.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TapeDeck.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/xcschemes/xcschememanagement.plist b/TapeDeck.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..28bbd42 --- /dev/null +++ b/TapeDeck.xcworkspace/xcuserdata/penelopegomez.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,30 @@ + + + + + SchemeUserState + + Playground (Playground) 1.xcscheme + + isShown + + orderHint + 3 + + Playground (Playground) 2.xcscheme + + isShown + + orderHint + 4 + + Playground (Playground).xcscheme + + isShown + + orderHint + 2 + + + + diff --git a/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092940.png b/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092940.png deleted file mode 100644 index fbf874b..0000000 Binary files a/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092940.png and /dev/null differ diff --git a/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092941.png b/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092941.png deleted file mode 100644 index fbf874b..0000000 Binary files a/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092941.png and /dev/null differ diff --git a/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092942.png b/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092942.png deleted file mode 100644 index fbf874b..0000000 Binary files a/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/coollogo_com-13092942.png and /dev/null differ diff --git a/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/Contents.json b/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/Contents.json similarity index 65% rename from grandfatherrock/Assets.xcassets/Micah Gomez.imageset/Contents.json rename to grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/Contents.json index 7d2bff1..8ccde57 100644 --- a/grandfatherrock/Assets.xcassets/Micah Gomez.imageset/Contents.json +++ b/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "coollogo_com-13092940.png", + "filename" : "PenelopeGomez.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "coollogo_com-13092941.png", + "filename" : "PenelopeGomez-1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "coollogo_com-13092942.png", + "filename" : "PenelopeGomez-2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-1.png b/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-1.png new file mode 100644 index 0000000..8886f3d Binary files /dev/null and b/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-1.png differ diff --git a/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-2.png b/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-2.png new file mode 100644 index 0000000..8886f3d Binary files /dev/null and b/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez-2.png differ diff --git a/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez.png b/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez.png new file mode 100644 index 0000000..8886f3d Binary files /dev/null and b/grandfatherrock/Assets.xcassets/Penelope Gomez.imageset/PenelopeGomez.png differ diff --git a/grandfatherrock/Base.lproj/LaunchScreen.storyboard b/grandfatherrock/Base.lproj/LaunchScreen.storyboard index 1977b90..cacdc99 100644 --- a/grandfatherrock/Base.lproj/LaunchScreen.storyboard +++ b/grandfatherrock/Base.lproj/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -23,7 +23,7 @@ - +