From 791d75d65e004d9f91333dbc73a7a7ec27ba57ae Mon Sep 17 00:00:00 2001 From: Robert Vance Date: Wed, 22 Apr 2020 19:57:13 -0600 Subject: [PATCH 1/2] Project Completed --- Contained/Contained.xcodeproj/project.pbxproj | 395 ++++++++++++++++++ Contained/Contained/AppDelegate.swift | 37 ++ .../AppIcon.appiconset/Contents.json | 98 +++++ .../Contained/Assets.xcassets/Contents.json | 6 + .../game_controller.imageset/Contents.json | 23 + .../game_controller.png | Bin .../game_controller@2x.png | Bin .../game_controller@3x.png | Bin .../Assets.xcassets/game_controller.png | Bin 0 -> 360 bytes .../Assets.xcassets/game_controller@2x.png | Bin 0 -> 654 bytes .../Assets.xcassets/game_controller@3x.png | Bin 0 -> 971 bytes .../info.imageset/Contents.json | 23 + .../Assets.xcassets/info.imageset}/info.png | Bin .../info.imageset}/info@2x.png | Bin .../info.imageset}/info@3x.png | Bin Contained/Contained/Assets.xcassets/info.png | Bin 0 -> 304 bytes .../Contained/Assets.xcassets/info@2x.png | Bin 0 -> 520 bytes .../Contained/Assets.xcassets/info@3x.png | Bin 0 -> 884 bytes .../settings-1.imageset/Contents.json | 23 + .../settings-1.imageset}/settings.png | Bin .../settings-1.imageset}/settings@2x.png | Bin .../settings-1.imageset}/settings@3x.png | Bin .../settings.imageset/Contents.json | 20 + .../Contained/Assets.xcassets/settings.png | Bin 0 -> 418 bytes .../Contained/Assets.xcassets/settings@2x.png | Bin 0 -> 841 bytes .../Contained/Assets.xcassets/settings@3x.png | Bin 0 -> 1406 bytes .../Base.lproj/LaunchScreen.storyboard | 25 ++ .../Contained/Crab.xcassets}/Contents.json | 0 .../HappyCrab.spriteatlas/Contents.json | 0 .../happycrab000.imageset/Contents.json | 0 .../happycrab000.imageset/happycrab000.png | Bin .../happycrab001.imageset/Contents.json | 0 .../happycrab001.imageset/happycrab001.png | Bin .../happycrab002.imageset/Contents.json | 0 .../happycrab002.imageset/happycrab002.png | Bin .../happycrab003.imageset/Contents.json | 0 .../happycrab003.imageset/happycrab003.png | Bin .../happycrab004.imageset/Contents.json | 0 .../happycrab004.imageset/happycrab004.png | Bin .../happycrab005.imageset/Contents.json | 0 .../happycrab005.imageset/happycrab005.png | Bin .../happycrab006.imageset/Contents.json | 0 .../happycrab006.imageset/happycrab006.png | Bin .../happycrab007.imageset/Contents.json | 0 .../happycrab007.imageset/happycrab007.png | Bin .../happycrab008.imageset/Contents.json | 0 .../happycrab008.imageset/happycrab008.png | Bin .../happycrab009.imageset/Contents.json | 0 .../happycrab009.imageset/happycrab009.png | Bin .../happycrab010.imageset/Contents.json | 0 .../happycrab010.imageset/happycrab010.png | Bin .../happycrab011.imageset/Contents.json | 0 .../happycrab011.imageset/happycrab011.png | Bin .../happycrab012.imageset/Contents.json | 0 .../happycrab012.imageset/happycrab012.png | Bin .../happycrab013.imageset/Contents.json | 0 .../happycrab013.imageset/happycrab013.png | Bin .../happycrab014.imageset/Contents.json | 0 .../happycrab014.imageset/happycrab014.png | Bin .../happycrab015.imageset/Contents.json | 0 .../happycrab015.imageset/happycrab015.png | Bin .../happycrab016.imageset/Contents.json | 0 .../happycrab016.imageset/happycrab016.png | Bin .../happycrab017.imageset/Contents.json | 0 .../happycrab017.imageset/happycrab017.png | Bin .../happycrab018.imageset/Contents.json | 0 .../happycrab018.imageset/happycrab018.png | Bin .../happycrab019.imageset/Contents.json | 0 .../happycrab019.imageset/happycrab019.png | Bin .../happycrab020.imageset/Contents.json | 0 .../happycrab020.imageset/happycrab020.png | Bin .../happycrab021.imageset/Contents.json | 0 .../happycrab021.imageset/happycrab021.png | Bin .../happycrab022.imageset/Contents.json | 0 .../happycrab022.imageset/happycrab022.png | Bin .../happycrab023.imageset/Contents.json | 0 .../happycrab023.imageset/happycrab023.png | Bin .../WaitingCrab.spriteatlas/Contents.json | 0 .../waitingcrab000.imageset/Contents.json | 0 .../waitingcrab000.png | Bin .../waitingcrab001.imageset/Contents.json | 0 .../waitingcrab001.png | Bin .../waitingcrab002.imageset/Contents.json | 0 .../waitingcrab002.png | Bin .../waitingcrab003.imageset/Contents.json | 0 .../waitingcrab003.png | Bin .../waitingcrab004.imageset/Contents.json | 0 .../waitingcrab004.png | Bin .../waitingcrab005.imageset/Contents.json | 0 .../waitingcrab005.png | Bin .../waitingcrab006.imageset/Contents.json | 0 .../waitingcrab006.png | Bin .../waitingcrab007.imageset/Contents.json | 0 .../waitingcrab007.png | Bin .../waitingcrab008.imageset/Contents.json | 0 .../waitingcrab008.png | Bin .../waitingcrab009.imageset/Contents.json | 0 .../waitingcrab009.png | Bin .../waitingcrab010.imageset/Contents.json | 0 .../waitingcrab010.png | Bin .../waitingcrab011.imageset/Contents.json | 0 .../waitingcrab011.png | Bin .../waitingcrab012.imageset/Contents.json | 0 .../waitingcrab012.png | Bin .../waitingcrab013.imageset/Contents.json | 0 .../waitingcrab013.png | Bin .../waitingcrab014.imageset/Contents.json | 0 .../waitingcrab014.png | Bin .../waitingcrab015.imageset/Contents.json | 0 .../waitingcrab015.png | Bin .../waitingcrab016.imageset/Contents.json | 0 .../waitingcrab016.png | Bin .../waitingcrab017.imageset/Contents.json | 0 .../waitingcrab017.png | Bin .../waitingcrab018.imageset/Contents.json | 0 .../waitingcrab018.png | Bin .../waitingcrab019.imageset/Contents.json | 0 .../waitingcrab019.png | Bin .../waitingcrab020.imageset/Contents.json | 0 .../waitingcrab020.png | Bin .../waitingcrab021.imageset/Contents.json | 0 .../waitingcrab021.png | Bin .../Contained/Images}/demo.gif | Bin .../Contained/Images}/info-layout.png | Bin .../Contained/Images}/main-layout.png | Bin Contained/Contained/Info.plist | 62 +++ Contained/Contained/Model/CustomScene.swift | 54 +++ Contained/Contained/Model/Settings.swift | 17 + README.md => Contained/Contained/README.md | 0 .../Contained/SKSpriteNode+Utility.swift | 0 Contained/Contained/SceneDelegate.swift | 53 +++ .../View Controllers/GameViewController.swift | 29 ++ .../View Controllers/InfoViewController.swift | 24 ++ .../SettingsViewController.swift | 26 ++ .../Views/Base.lproj/Main.storyboard | 135 ++++++ Contained/Contained/Views/info.storyboard | 140 +++++++ 136 files changed, 1190 insertions(+) create mode 100644 Contained/Contained.xcodeproj/project.pbxproj create mode 100644 Contained/Contained/AppDelegate.swift create mode 100644 Contained/Contained/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 Contained/Contained/Assets.xcassets/Contents.json create mode 100644 Contained/Contained/Assets.xcassets/game_controller.imageset/Contents.json rename {Art => Contained/Contained/Assets.xcassets/game_controller.imageset}/game_controller.png (100%) rename {Art => Contained/Contained/Assets.xcassets/game_controller.imageset}/game_controller@2x.png (100%) rename {Art => Contained/Contained/Assets.xcassets/game_controller.imageset}/game_controller@3x.png (100%) create mode 100644 Contained/Contained/Assets.xcassets/game_controller.png create mode 100644 Contained/Contained/Assets.xcassets/game_controller@2x.png create mode 100644 Contained/Contained/Assets.xcassets/game_controller@3x.png create mode 100644 Contained/Contained/Assets.xcassets/info.imageset/Contents.json rename {Art => Contained/Contained/Assets.xcassets/info.imageset}/info.png (100%) rename {Art => Contained/Contained/Assets.xcassets/info.imageset}/info@2x.png (100%) rename {Art => Contained/Contained/Assets.xcassets/info.imageset}/info@3x.png (100%) create mode 100644 Contained/Contained/Assets.xcassets/info.png create mode 100644 Contained/Contained/Assets.xcassets/info@2x.png create mode 100644 Contained/Contained/Assets.xcassets/info@3x.png create mode 100644 Contained/Contained/Assets.xcassets/settings-1.imageset/Contents.json rename {Art => Contained/Contained/Assets.xcassets/settings-1.imageset}/settings.png (100%) rename {Art => Contained/Contained/Assets.xcassets/settings-1.imageset}/settings@2x.png (100%) rename {Art => Contained/Contained/Assets.xcassets/settings-1.imageset}/settings@3x.png (100%) create mode 100644 Contained/Contained/Assets.xcassets/settings.imageset/Contents.json create mode 100644 Contained/Contained/Assets.xcassets/settings.png create mode 100644 Contained/Contained/Assets.xcassets/settings@2x.png create mode 100644 Contained/Contained/Assets.xcassets/settings@3x.png create mode 100644 Contained/Contained/Base.lproj/LaunchScreen.storyboard rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab000.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab000.imageset/happycrab000.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab001.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab001.imageset/happycrab001.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab002.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab002.imageset/happycrab002.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab003.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab003.imageset/happycrab003.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab004.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab004.imageset/happycrab004.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab005.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab005.imageset/happycrab005.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab006.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab006.imageset/happycrab006.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab007.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab007.imageset/happycrab007.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab008.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab008.imageset/happycrab008.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab009.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab009.imageset/happycrab009.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab010.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab010.imageset/happycrab010.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab011.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab011.imageset/happycrab011.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab012.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab012.imageset/happycrab012.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab013.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab013.imageset/happycrab013.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab014.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab014.imageset/happycrab014.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab015.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab015.imageset/happycrab015.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab016.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab016.imageset/happycrab016.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab017.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab017.imageset/happycrab017.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab018.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab018.imageset/happycrab018.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab019.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab019.imageset/happycrab019.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab020.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab020.imageset/happycrab020.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab021.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab021.imageset/happycrab021.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab022.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab022.imageset/happycrab022.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab023.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/HappyCrab.spriteatlas/happycrab023.imageset/happycrab023.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab000.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab000.imageset/waitingcrab000.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab001.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab001.imageset/waitingcrab001.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab002.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab002.imageset/waitingcrab002.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab003.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab003.imageset/waitingcrab003.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab004.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab004.imageset/waitingcrab004.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab005.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab005.imageset/waitingcrab005.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab006.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab006.imageset/waitingcrab006.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab007.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab007.imageset/waitingcrab007.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab008.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab008.imageset/waitingcrab008.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab009.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab009.imageset/waitingcrab009.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab010.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab010.imageset/waitingcrab010.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab011.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab011.imageset/waitingcrab011.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab012.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab012.imageset/waitingcrab012.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab013.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab013.imageset/waitingcrab013.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab014.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab014.imageset/waitingcrab014.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab015.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab015.imageset/waitingcrab015.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab016.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab016.imageset/waitingcrab016.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab017.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab017.imageset/waitingcrab017.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab018.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab018.imageset/waitingcrab018.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab019.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab019.imageset/waitingcrab019.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab020.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab020.imageset/waitingcrab020.png (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab021.imageset/Contents.json (100%) rename {Crab.xcassets => Contained/Contained/Crab.xcassets}/WaitingCrab.spriteatlas/waitingcrab021.imageset/waitingcrab021.png (100%) rename {Images => Contained/Contained/Images}/demo.gif (100%) rename {Images => Contained/Contained/Images}/info-layout.png (100%) rename {Images => Contained/Contained/Images}/main-layout.png (100%) create mode 100644 Contained/Contained/Info.plist create mode 100644 Contained/Contained/Model/CustomScene.swift create mode 100644 Contained/Contained/Model/Settings.swift rename README.md => Contained/Contained/README.md (100%) rename SKSpriteNode+Utility.swift => Contained/Contained/SKSpriteNode+Utility.swift (100%) create mode 100644 Contained/Contained/SceneDelegate.swift create mode 100644 Contained/Contained/View Controllers/GameViewController.swift create mode 100644 Contained/Contained/View Controllers/InfoViewController.swift create mode 100644 Contained/Contained/View Controllers/SettingsViewController.swift create mode 100644 Contained/Contained/Views/Base.lproj/Main.storyboard create mode 100644 Contained/Contained/Views/info.storyboard diff --git a/Contained/Contained.xcodeproj/project.pbxproj b/Contained/Contained.xcodeproj/project.pbxproj new file mode 100644 index 00000000..e2cad5f6 --- /dev/null +++ b/Contained/Contained.xcodeproj/project.pbxproj @@ -0,0 +1,395 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + E40A023C244FF67A00E40FF5 /* info.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E40A023B244FF67A00E40FF5 /* info.storyboard */; }; + E40A023E244FF69900E40FF5 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = E40A023D244FF69900E40FF5 /* Settings.swift */; }; + E40A0243244FF78B00E40FF5 /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E40A0242244FF78B00E40FF5 /* GameViewController.swift */; }; + E40A0245244FF79900E40FF5 /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E40A0244244FF79900E40FF5 /* InfoViewController.swift */; }; + E40A0247244FF7A600E40FF5 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E40A0246244FF7A600E40FF5 /* SettingsViewController.swift */; }; + E40A0249245126D100E40FF5 /* CustomScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = E40A0248245126D100E40FF5 /* CustomScene.swift */; }; + E40A024B245129AA00E40FF5 /* SKSpriteNode+Utility.swift in Sources */ = {isa = PBXBuildFile; fileRef = E40A024A245129AA00E40FF5 /* SKSpriteNode+Utility.swift */; }; + E40A024D24512C9F00E40FF5 /* Crab.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E40A024C24512C9F00E40FF5 /* Crab.xcassets */; }; + E4752BBC244FF3F7000D3179 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4752BBB244FF3F7000D3179 /* AppDelegate.swift */; }; + E4752BBE244FF3F7000D3179 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4752BBD244FF3F7000D3179 /* SceneDelegate.swift */; }; + E4752BC3244FF3F7000D3179 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E4752BC1244FF3F7000D3179 /* Main.storyboard */; }; + E4752BC5244FF3F9000D3179 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E4752BC4244FF3F9000D3179 /* Assets.xcassets */; }; + E4752BC8244FF3F9000D3179 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E4752BC6244FF3F9000D3179 /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + E40A023B244FF67A00E40FF5 /* info.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = info.storyboard; sourceTree = ""; }; + E40A023D244FF69900E40FF5 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = ""; }; + E40A0242244FF78B00E40FF5 /* GameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = ""; }; + E40A0244244FF79900E40FF5 /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = ""; }; + E40A0246244FF7A600E40FF5 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; + E40A0248245126D100E40FF5 /* CustomScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomScene.swift; sourceTree = ""; }; + E40A024A245129AA00E40FF5 /* SKSpriteNode+Utility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SKSpriteNode+Utility.swift"; sourceTree = ""; }; + E40A024C24512C9F00E40FF5 /* Crab.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Crab.xcassets; sourceTree = ""; }; + E4752BB8244FF3F7000D3179 /* Contained.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Contained.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E4752BBB244FF3F7000D3179 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + E4752BBD244FF3F7000D3179 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + E4752BC2244FF3F7000D3179 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + E4752BC4244FF3F9000D3179 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + E4752BC7244FF3F9000D3179 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + E4752BC9244FF3F9000D3179 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + E4752BB5244FF3F7000D3179 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + E40A023F244FF6A200E40FF5 /* Model */ = { + isa = PBXGroup; + children = ( + E40A023D244FF69900E40FF5 /* Settings.swift */, + E40A0248245126D100E40FF5 /* CustomScene.swift */, + ); + path = Model; + sourceTree = ""; + }; + E40A0240244FF6B300E40FF5 /* Views */ = { + isa = PBXGroup; + children = ( + E40A023B244FF67A00E40FF5 /* info.storyboard */, + E4752BC1244FF3F7000D3179 /* Main.storyboard */, + ); + path = Views; + sourceTree = ""; + }; + E40A0241244FF76B00E40FF5 /* View Controllers */ = { + isa = PBXGroup; + children = ( + E40A0242244FF78B00E40FF5 /* GameViewController.swift */, + E40A0244244FF79900E40FF5 /* InfoViewController.swift */, + E40A0246244FF7A600E40FF5 /* SettingsViewController.swift */, + ); + path = "View Controllers"; + sourceTree = ""; + }; + E4752BAF244FF3F7000D3179 = { + isa = PBXGroup; + children = ( + E4752BBA244FF3F7000D3179 /* Contained */, + E4752BB9244FF3F7000D3179 /* Products */, + ); + sourceTree = ""; + }; + E4752BB9244FF3F7000D3179 /* Products */ = { + isa = PBXGroup; + children = ( + E4752BB8244FF3F7000D3179 /* Contained.app */, + ); + name = Products; + sourceTree = ""; + }; + E4752BBA244FF3F7000D3179 /* Contained */ = { + isa = PBXGroup; + children = ( + E40A0241244FF76B00E40FF5 /* View Controllers */, + E4752BBB244FF3F7000D3179 /* AppDelegate.swift */, + E40A0240244FF6B300E40FF5 /* Views */, + E4752BBD244FF3F7000D3179 /* SceneDelegate.swift */, + E40A023F244FF6A200E40FF5 /* Model */, + E4752BC4244FF3F9000D3179 /* Assets.xcassets */, + E4752BC6244FF3F9000D3179 /* LaunchScreen.storyboard */, + E4752BC9244FF3F9000D3179 /* Info.plist */, + E40A024A245129AA00E40FF5 /* SKSpriteNode+Utility.swift */, + E40A024C24512C9F00E40FF5 /* Crab.xcassets */, + ); + path = Contained; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + E4752BB7244FF3F7000D3179 /* Contained */ = { + isa = PBXNativeTarget; + buildConfigurationList = E4752BCC244FF3F9000D3179 /* Build configuration list for PBXNativeTarget "Contained" */; + buildPhases = ( + E4752BB4244FF3F7000D3179 /* Sources */, + E4752BB5244FF3F7000D3179 /* Frameworks */, + E4752BB6244FF3F7000D3179 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Contained; + productName = Contained; + productReference = E4752BB8244FF3F7000D3179 /* Contained.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + E4752BB0244FF3F7000D3179 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1140; + LastUpgradeCheck = 1140; + ORGANIZATIONNAME = "Robs Creations"; + TargetAttributes = { + E4752BB7244FF3F7000D3179 = { + CreatedOnToolsVersion = 11.4.1; + }; + }; + }; + buildConfigurationList = E4752BB3244FF3F7000D3179 /* Build configuration list for PBXProject "Contained" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = E4752BAF244FF3F7000D3179; + productRefGroup = E4752BB9244FF3F7000D3179 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + E4752BB7244FF3F7000D3179 /* Contained */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + E4752BB6244FF3F7000D3179 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E4752BC8244FF3F9000D3179 /* LaunchScreen.storyboard in Resources */, + E4752BC5244FF3F9000D3179 /* Assets.xcassets in Resources */, + E40A023C244FF67A00E40FF5 /* info.storyboard in Resources */, + E4752BC3244FF3F7000D3179 /* Main.storyboard in Resources */, + E40A024D24512C9F00E40FF5 /* Crab.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + E4752BB4244FF3F7000D3179 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E40A0243244FF78B00E40FF5 /* GameViewController.swift in Sources */, + E40A023E244FF69900E40FF5 /* Settings.swift in Sources */, + E4752BBC244FF3F7000D3179 /* AppDelegate.swift in Sources */, + E4752BBE244FF3F7000D3179 /* SceneDelegate.swift in Sources */, + E40A0249245126D100E40FF5 /* CustomScene.swift in Sources */, + E40A0245244FF79900E40FF5 /* InfoViewController.swift in Sources */, + E40A0247244FF7A600E40FF5 /* SettingsViewController.swift in Sources */, + E40A024B245129AA00E40FF5 /* SKSpriteNode+Utility.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + E4752BC1244FF3F7000D3179 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + E4752BC2244FF3F7000D3179 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + E4752BC6244FF3F9000D3179 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + E4752BC7244FF3F9000D3179 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + E4752BCA244FF3F9000D3179 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + E4752BCB244FF3F9000D3179 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + E4752BCD244FF3F9000D3179 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = 4487ZJU795; + INFOPLIST_FILE = Contained/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.robvance.Contained; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + E4752BCE244FF3F9000D3179 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = 4487ZJU795; + INFOPLIST_FILE = Contained/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.robvance.Contained; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + E4752BB3244FF3F7000D3179 /* Build configuration list for PBXProject "Contained" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E4752BCA244FF3F9000D3179 /* Debug */, + E4752BCB244FF3F9000D3179 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + E4752BCC244FF3F9000D3179 /* Build configuration list for PBXNativeTarget "Contained" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E4752BCD244FF3F9000D3179 /* Debug */, + E4752BCE244FF3F9000D3179 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = E4752BB0244FF3F7000D3179 /* Project object */; +} diff --git a/Contained/Contained/AppDelegate.swift b/Contained/Contained/AppDelegate.swift new file mode 100644 index 00000000..b15be9b7 --- /dev/null +++ b/Contained/Contained/AppDelegate.swift @@ -0,0 +1,37 @@ +// +// AppDelegate.swift +// Contained +// +// Created by Rob Vance on 4/21/20. +// Copyright © 2020 Robs Creations. All rights reserved. +// + +import UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + // MARK: UISceneSession Lifecycle + + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + // Called when a new scene session is being created. + // Use this method to select a configuration to create the new scene with. + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + // Called when the user discards a scene session. + // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. + // Use this method to release any resources that were specific to the discarded scenes, as they will not return. + } + + +} + diff --git a/Contained/Contained/Assets.xcassets/AppIcon.appiconset/Contents.json b/Contained/Contained/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..9221b9bb --- /dev/null +++ b/Contained/Contained/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Contained/Contained/Assets.xcassets/Contents.json b/Contained/Contained/Assets.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/Contained/Contained/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Contained/Contained/Assets.xcassets/game_controller.imageset/Contents.json b/Contained/Contained/Assets.xcassets/game_controller.imageset/Contents.json new file mode 100644 index 00000000..3749084c --- /dev/null +++ b/Contained/Contained/Assets.xcassets/game_controller.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "game_controller.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "game_controller@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "game_controller@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Art/game_controller.png b/Contained/Contained/Assets.xcassets/game_controller.imageset/game_controller.png similarity index 100% rename from Art/game_controller.png rename to Contained/Contained/Assets.xcassets/game_controller.imageset/game_controller.png diff --git a/Art/game_controller@2x.png b/Contained/Contained/Assets.xcassets/game_controller.imageset/game_controller@2x.png similarity index 100% rename from Art/game_controller@2x.png rename to Contained/Contained/Assets.xcassets/game_controller.imageset/game_controller@2x.png diff --git a/Art/game_controller@3x.png b/Contained/Contained/Assets.xcassets/game_controller.imageset/game_controller@3x.png similarity index 100% rename from Art/game_controller@3x.png rename to Contained/Contained/Assets.xcassets/game_controller.imageset/game_controller@3x.png diff --git a/Contained/Contained/Assets.xcassets/game_controller.png b/Contained/Contained/Assets.xcassets/game_controller.png new file mode 100644 index 0000000000000000000000000000000000000000..df0891d50a57cd2afb5874ad0f7916e39de8f438 GIT binary patch literal 360 zcmV-u0hj)XP)np)db4V1*t^4gE2SiO}~kOZBdf%bj(LGpBgUwF@#0D0000ENo2MkOM*nkb#fDPDy4cLGU zxG5Q5V-h0r00aPh(eoHGeo;>K31BO~V*ooDZvn*2ysK?%mCFMWouL9z55W74H)$<@ zL@c^x=2-nSGZ(4=t^k|>a7*16u7*awv9kZ&KE{x&4a;(d8!IavW zd6|oq?5x)^mu3L-T$h%^KxI&cP`GCvW&n#K;HbsGu6aKy%ELj0*qCMgZhbCxC@H&C zT3(cxE+u6bHOzA95dD=f>v}lpG4SM~^FT!303Le^d|>9MG;ps!*kWe-cWG&c4MGOj zE*+*zi>zzTxnX8%LIG@Q+P2Pe>1B-xzZ%Ztp{(I5%e?EMONn^QdOLV+mD2aPP1rY;HMREbkZPUg^@TM%9YfJ^ZveWMeMJ+`bMD7c`Ypme)YU$+ oFX9c@fDPDy4cLGU*nk_7Uq9BL|H>-OzW@LL07*qoM6N<$f;NF6j{pDw literal 0 HcmV?d00001 diff --git a/Contained/Contained/Assets.xcassets/game_controller@3x.png b/Contained/Contained/Assets.xcassets/game_controller@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..3b8ac924c7ab8329e2c3ddac51b32426588e423d GIT binary patch literal 971 zcmV;+12p`JP)bKoEuB7-~bAn0XH6Y6pxx1Vt*V22y0Fq#ExgS^ax1=np3M#$Mh=8C8nj&a| zCTNPF37R5kf+lE+pb45HXo4nailC22U#1#ZL<#@}fEj?&eO$WtZ?7)`5Bm?m+P!YK zUa#HzMpc_h=9_XWOGK(Ikj0i=O}xN10GcgZ187xsl{IJw^bKN_3Cy7vVfA()OfG<` z2Af-@cK}`h=!w{ioAWG+Sp?*{^LKip)&iI(1r1iqWkJY$b>Z09q<13n0^mEj?$vKqy|e<&8}zzUWEt!_MC2z?dKGMg zee@+!_NuS|{ev8PRa$^9$#FQN-e4#qEmOPxd|Fj!(JR{Zj0xEzpLVRGT?gHUk^4vq z`Vqjjv&W19S)FIumuz=6l4`^?TWZ5&rL;QboV~kucx@!b3|j3uR+S-W%kylySoXP& zsO_i&TR-az-9~G8tg9#=?Ne3;!f!JKeZS|kyA-AP*@BsJ91^` zmR&?=BSBe5Upbj5YUh+)v;zWS;q9a0zvE5U;kh$@X!7@=K_&ulIZ-ey1A}4cdESSB z9t2>Z-ygjUkH{{9zvb4Y_h$p0q9@aYfYuWMount@m33H@-Xc<_F6lGub#%`4EK%ug z+C%s(y^cAY)2Gvi2^GT@6N}bbA`M$-)F=5E<002ovPDHLkV1h8mxV-=X literal 0 HcmV?d00001 diff --git a/Contained/Contained/Assets.xcassets/info.imageset/Contents.json b/Contained/Contained/Assets.xcassets/info.imageset/Contents.json new file mode 100644 index 00000000..0a927f68 --- /dev/null +++ b/Contained/Contained/Assets.xcassets/info.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "info.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "info@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "info@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Art/info.png b/Contained/Contained/Assets.xcassets/info.imageset/info.png similarity index 100% rename from Art/info.png rename to Contained/Contained/Assets.xcassets/info.imageset/info.png diff --git a/Art/info@2x.png b/Contained/Contained/Assets.xcassets/info.imageset/info@2x.png similarity index 100% rename from Art/info@2x.png rename to Contained/Contained/Assets.xcassets/info.imageset/info@2x.png diff --git a/Art/info@3x.png b/Contained/Contained/Assets.xcassets/info.imageset/info@3x.png similarity index 100% rename from Art/info@3x.png rename to Contained/Contained/Assets.xcassets/info.imageset/info@3x.png diff --git a/Contained/Contained/Assets.xcassets/info.png b/Contained/Contained/Assets.xcassets/info.png new file mode 100644 index 0000000000000000000000000000000000000000..64c0cb1e8fcd6f3b4c43af1943ebdf7fb0b76ebc GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3oCO|{#S9GGLLkg|>2BR0px`4< z7sn8f<8P;56l_u8aVgI|BDRjjYk`UP0v7KLB5xj8o%mZ|EYl~EVDZPm__yk0^@$rM zDm4ijCI;M*_qjBwM8($A^T}c3)oR@yVGKMB{0>t-F`P-g$NeIR!DnkoBjXOX7vbwT z?(7J@dhYzbm1+;IJvLv4SIFhakXag+PYI` zZ>V^bmGTHCevZ{u>Jhem7s7SVdeb+Viq{&yx&OiTho?+Z@tEQ$d@t>&trrSy;s%+svuQM=sy85}Sb4q9e0Ou!o An%OBKeVnp2UxQoFC5^Y7&sX4t0Fe^OWc~8Y-QV2Y;D;@=kc=Tj{(OzeYgF&piMy zz>kr??gkuzx5+%+%#sfG+8VHlMh)zf&pRRD!oA8e8AqU46lkCVnv5XdM*~zT7>pXD zJr38v@65BWPoNw#es4yETzaaNJ7oMG&wkJISqwc?*i1(?ix{2Rg4cVY%o_AUAddoD zkQ2dHOimQDhk#rz81j9TljhN$C!Z7aDyFs@u#3sFWAo^G1(5MMMs)x;5#C%)P>kGw zKR#}$iyEJEx`M?UM5%ihRR)W2)3*^dmsGCGDC0RM0qyD(uo%`8+V)P+# zY&;Ki&5(8&busjG?pg1&d3F|~WgUkJCbb*rnrXedV|Y9k&rNoq<)qu^&|1B z36va>99ufcOizcJ83Aq>K+;E&nGcE)<|>(a&$GRndd;-3xdE?cwi{hnTC&Cq(~n-e zP`9M#Q_WXDrm!N=-+1~S{XB>)yYx;b&;l*cGJzIonLrElLhT>nUfJc#3-eU~0000< KMNUMnLSTYkWtI~F literal 0 HcmV?d00001 diff --git a/Contained/Contained/Assets.xcassets/settings-1.imageset/Contents.json b/Contained/Contained/Assets.xcassets/settings-1.imageset/Contents.json new file mode 100644 index 00000000..e30c46c5 --- /dev/null +++ b/Contained/Contained/Assets.xcassets/settings-1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "settings.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "settings@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "settings@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Art/settings.png b/Contained/Contained/Assets.xcassets/settings-1.imageset/settings.png similarity index 100% rename from Art/settings.png rename to Contained/Contained/Assets.xcassets/settings-1.imageset/settings.png diff --git a/Art/settings@2x.png b/Contained/Contained/Assets.xcassets/settings-1.imageset/settings@2x.png similarity index 100% rename from Art/settings@2x.png rename to Contained/Contained/Assets.xcassets/settings-1.imageset/settings@2x.png diff --git a/Art/settings@3x.png b/Contained/Contained/Assets.xcassets/settings-1.imageset/settings@3x.png similarity index 100% rename from Art/settings@3x.png rename to Contained/Contained/Assets.xcassets/settings-1.imageset/settings@3x.png diff --git a/Contained/Contained/Assets.xcassets/settings.imageset/Contents.json b/Contained/Contained/Assets.xcassets/settings.imageset/Contents.json new file mode 100644 index 00000000..f8f827e4 --- /dev/null +++ b/Contained/Contained/Assets.xcassets/settings.imageset/Contents.json @@ -0,0 +1,20 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Contained/Contained/Assets.xcassets/settings.png b/Contained/Contained/Assets.xcassets/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..8f712b18c2139cb1ff24e2041cdaac6e3de94e2b GIT binary patch literal 418 zcmV;T0bTxyP)8=4)lNrMjH=+ zS|9A&Xqdie&qCsPMU?Av$(|B&E;CtULk}##snCe;KnvW={;I0J$ket_AJp3r$Ma5S zRNw`;nk6u0t@**}N6uwtjwzTTYaB2I@J-ga?9{WVSugH4p4?<2V7=Dco_&zmPV8d} zH}gv-3PQ>~;9`o$B=}xUmmm&_7?W|F0^9szb8qWI1#ovFa{qYP5O)QkHbjWK6fXB) z+Q_Egjp?t5sFt1To4U4h9Uo4$FOcJ}%%hV;EG@c3TKo`^Zbw>ld(z^s7Xp8)^f{u~ zE4?yjQ*u#N0nV$rvwgc5W-hAJOP??z;?^d+74xdv$1o2e{x@%@Pug!Kwh8el`2YX_ M07*qoM6N<$f}UQspa1{> literal 0 HcmV?d00001 diff --git a/Contained/Contained/Assets.xcassets/settings@2x.png b/Contained/Contained/Assets.xcassets/settings@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5ed4658a4858cc94a72fafdc82def04509dbbe7f GIT binary patch literal 841 zcmV-P1GfB$P)ym}u;v&5PZ4{|cuKr$r_dL{{yPpjtYCjL z+da(EkOJ-^qqcV9{>7Yt%L|8F0KZbDFgUN8Anj7Jr}tXoK>r*L77VruTs`ls@)p4F z(cCK$?IM#A&9)yp_c(~=3IIJ3S&aE41i-rhKd0n-IAAw@0)wYS2i8mc$&el<+<_(~Lm{FQfPykC7ydO;%#NxdoRRqPc8TUm?nKL)e&a+Ln$@qbE%d*h)V&-HkUjxJx@Y%ah|7QPo5v{- T#eW+l00000NkvXXu0mjffUtMC literal 0 HcmV?d00001 diff --git a/Contained/Contained/Assets.xcassets/settings@3x.png b/Contained/Contained/Assets.xcassets/settings@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..674bea76318a3b8df628dd1a44c78736cf55507d GIT binary patch literal 1406 zcmV-^1%djBP)xbr9w~ z56tuB0q%gVAan(x3&`v}+-gRnBSDZ@fZ!RJ!PsMy;_k=Q;@cmP#LUPe{P-zDkb%xX z=aGTVKxd#gGKgqTM23i1rXiyJX5`-ry(1z6;OXwq&&*t8pzXk&02}}`%-lH~KPV_O zlf$_O00n>^fMMo7y28vHbqcs00KS=}!#O-M4-@B>cgJ^A=LFGv1)!U`fDM4jm(8^B$r~v#j za{LQ3AAfWoeYRL06uLX4e>L8&kJ>ox)}EO@rSpL-ix6u9>x-c_>33%>`r{;7=ySb zjY7##crS>GiK1S~XExVWf8oMhT0-x+v)4*MX-0e(CFKgmn_qj%a!D~V)biCArPM;l z%q4&a0MDzhKZ+JTm%{zOB=zYbU%9}&bxEa37X%|MfZr#4<30e`$AN$(N&-qt__-kO z4p?1k#U=QT zgEzgKDD}Hcqd*U*0)Dpl#-4fB{IM6GC9bzrNW8?HBV zSdnG}j5j@Vu&iSuR^0>-SSG&W-rYbG$tkl^7nL^?3Rwkj7M^#O;_1+MlIF?b0@|e~;>D*T!ORz_Y>d_T{v)EEh-zuc)#BB?<+^@-A%Q9> z7X^Rmx)$`Bi=<-#V|L}m$)btqKt$z?=9f;vx(t9X4u|dl7)8tOW?Zv$zV1ZQWog8u zRgU^A;eL?s7?CZg3KfcuJt3Vux*wr;rUa@3pCBbUm93^s~qHw0Q2@ z#&CWf+hJw{`s4|=#`tGTAPZ*mTn97v%v{Jmz6Sum0(eynYFx(08J7RR%;Y-({N{Mg zSHa|ZU3=SD4pi}7t`*YQY1 z`=$8~BC0Un8Tu;Vsxuo&Ry{gm5Im`59FIGBC~M2!RRQ;MpOi5O&Z8FtEgdUk|c@mnqzE)k3(cQw!|a3vckP5xkp9nMyUk3*5Vx z&SL0sa||~83a2f-{q25FjdjmRa)y%MIh!py1D!_(Is=`7&LhhB3WE+|etK?AQvd(} M07*qoM6N<$f=*|ahX4Qo literal 0 HcmV?d00001 diff --git a/Contained/Contained/Base.lproj/LaunchScreen.storyboard b/Contained/Contained/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..865e9329 --- /dev/null +++ b/Contained/Contained/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Crab.xcassets/Contents.json b/Contained/Contained/Crab.xcassets/Contents.json similarity index 100% rename from Crab.xcassets/Contents.json rename to Contained/Contained/Crab.xcassets/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab000.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab000.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab000.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab000.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab000.imageset/happycrab000.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab000.imageset/happycrab000.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab000.imageset/happycrab000.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab000.imageset/happycrab000.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab001.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab001.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab001.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab001.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab001.imageset/happycrab001.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab001.imageset/happycrab001.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab001.imageset/happycrab001.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab001.imageset/happycrab001.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab002.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab002.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab002.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab002.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab002.imageset/happycrab002.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab002.imageset/happycrab002.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab002.imageset/happycrab002.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab002.imageset/happycrab002.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab003.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab003.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab003.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab003.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab003.imageset/happycrab003.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab003.imageset/happycrab003.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab003.imageset/happycrab003.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab003.imageset/happycrab003.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab004.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab004.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab004.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab004.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab004.imageset/happycrab004.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab004.imageset/happycrab004.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab004.imageset/happycrab004.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab004.imageset/happycrab004.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab005.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab005.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab005.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab005.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab005.imageset/happycrab005.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab005.imageset/happycrab005.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab005.imageset/happycrab005.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab005.imageset/happycrab005.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab006.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab006.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab006.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab006.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab006.imageset/happycrab006.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab006.imageset/happycrab006.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab006.imageset/happycrab006.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab006.imageset/happycrab006.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab007.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab007.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab007.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab007.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab007.imageset/happycrab007.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab007.imageset/happycrab007.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab007.imageset/happycrab007.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab007.imageset/happycrab007.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab008.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab008.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab008.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab008.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab008.imageset/happycrab008.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab008.imageset/happycrab008.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab008.imageset/happycrab008.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab008.imageset/happycrab008.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab009.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab009.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab009.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab009.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab009.imageset/happycrab009.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab009.imageset/happycrab009.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab009.imageset/happycrab009.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab009.imageset/happycrab009.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab010.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab010.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab010.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab010.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab010.imageset/happycrab010.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab010.imageset/happycrab010.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab010.imageset/happycrab010.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab010.imageset/happycrab010.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab011.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab011.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab011.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab011.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab011.imageset/happycrab011.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab011.imageset/happycrab011.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab011.imageset/happycrab011.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab011.imageset/happycrab011.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab012.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab012.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab012.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab012.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab012.imageset/happycrab012.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab012.imageset/happycrab012.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab012.imageset/happycrab012.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab012.imageset/happycrab012.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab013.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab013.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab013.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab013.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab013.imageset/happycrab013.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab013.imageset/happycrab013.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab013.imageset/happycrab013.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab013.imageset/happycrab013.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab014.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab014.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab014.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab014.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab014.imageset/happycrab014.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab014.imageset/happycrab014.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab014.imageset/happycrab014.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab014.imageset/happycrab014.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab015.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab015.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab015.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab015.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab015.imageset/happycrab015.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab015.imageset/happycrab015.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab015.imageset/happycrab015.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab015.imageset/happycrab015.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab016.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab016.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab016.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab016.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab016.imageset/happycrab016.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab016.imageset/happycrab016.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab016.imageset/happycrab016.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab016.imageset/happycrab016.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab017.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab017.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab017.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab017.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab017.imageset/happycrab017.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab017.imageset/happycrab017.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab017.imageset/happycrab017.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab017.imageset/happycrab017.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab018.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab018.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab018.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab018.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab018.imageset/happycrab018.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab018.imageset/happycrab018.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab018.imageset/happycrab018.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab018.imageset/happycrab018.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab019.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab019.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab019.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab019.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab019.imageset/happycrab019.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab019.imageset/happycrab019.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab019.imageset/happycrab019.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab019.imageset/happycrab019.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab020.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab020.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab020.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab020.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab020.imageset/happycrab020.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab020.imageset/happycrab020.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab020.imageset/happycrab020.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab020.imageset/happycrab020.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab021.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab021.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab021.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab021.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab021.imageset/happycrab021.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab021.imageset/happycrab021.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab021.imageset/happycrab021.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab021.imageset/happycrab021.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab022.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab022.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab022.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab022.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab022.imageset/happycrab022.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab022.imageset/happycrab022.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab022.imageset/happycrab022.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab022.imageset/happycrab022.png diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab023.imageset/Contents.json b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab023.imageset/Contents.json similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab023.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab023.imageset/Contents.json diff --git a/Crab.xcassets/HappyCrab.spriteatlas/happycrab023.imageset/happycrab023.png b/Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab023.imageset/happycrab023.png similarity index 100% rename from Crab.xcassets/HappyCrab.spriteatlas/happycrab023.imageset/happycrab023.png rename to Contained/Contained/Crab.xcassets/HappyCrab.spriteatlas/happycrab023.imageset/happycrab023.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab000.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab000.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab000.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab000.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab000.imageset/waitingcrab000.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab000.imageset/waitingcrab000.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab000.imageset/waitingcrab000.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab000.imageset/waitingcrab000.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab001.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab001.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab001.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab001.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab001.imageset/waitingcrab001.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab001.imageset/waitingcrab001.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab001.imageset/waitingcrab001.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab001.imageset/waitingcrab001.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab002.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab002.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab002.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab002.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab002.imageset/waitingcrab002.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab002.imageset/waitingcrab002.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab002.imageset/waitingcrab002.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab002.imageset/waitingcrab002.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab003.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab003.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab003.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab003.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab003.imageset/waitingcrab003.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab003.imageset/waitingcrab003.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab003.imageset/waitingcrab003.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab003.imageset/waitingcrab003.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab004.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab004.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab004.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab004.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab004.imageset/waitingcrab004.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab004.imageset/waitingcrab004.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab004.imageset/waitingcrab004.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab004.imageset/waitingcrab004.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab005.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab005.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab005.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab005.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab005.imageset/waitingcrab005.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab005.imageset/waitingcrab005.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab005.imageset/waitingcrab005.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab005.imageset/waitingcrab005.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab006.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab006.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab006.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab006.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab006.imageset/waitingcrab006.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab006.imageset/waitingcrab006.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab006.imageset/waitingcrab006.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab006.imageset/waitingcrab006.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab007.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab007.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab007.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab007.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab007.imageset/waitingcrab007.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab007.imageset/waitingcrab007.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab007.imageset/waitingcrab007.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab007.imageset/waitingcrab007.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab008.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab008.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab008.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab008.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab008.imageset/waitingcrab008.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab008.imageset/waitingcrab008.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab008.imageset/waitingcrab008.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab008.imageset/waitingcrab008.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab009.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab009.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab009.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab009.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab009.imageset/waitingcrab009.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab009.imageset/waitingcrab009.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab009.imageset/waitingcrab009.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab009.imageset/waitingcrab009.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab010.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab010.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab010.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab010.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab010.imageset/waitingcrab010.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab010.imageset/waitingcrab010.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab010.imageset/waitingcrab010.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab010.imageset/waitingcrab010.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab011.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab011.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab011.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab011.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab011.imageset/waitingcrab011.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab011.imageset/waitingcrab011.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab011.imageset/waitingcrab011.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab011.imageset/waitingcrab011.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab012.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab012.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab012.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab012.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab012.imageset/waitingcrab012.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab012.imageset/waitingcrab012.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab012.imageset/waitingcrab012.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab012.imageset/waitingcrab012.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab013.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab013.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab013.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab013.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab013.imageset/waitingcrab013.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab013.imageset/waitingcrab013.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab013.imageset/waitingcrab013.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab013.imageset/waitingcrab013.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab014.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab014.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab014.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab014.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab014.imageset/waitingcrab014.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab014.imageset/waitingcrab014.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab014.imageset/waitingcrab014.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab014.imageset/waitingcrab014.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab015.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab015.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab015.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab015.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab015.imageset/waitingcrab015.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab015.imageset/waitingcrab015.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab015.imageset/waitingcrab015.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab015.imageset/waitingcrab015.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab016.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab016.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab016.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab016.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab016.imageset/waitingcrab016.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab016.imageset/waitingcrab016.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab016.imageset/waitingcrab016.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab016.imageset/waitingcrab016.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab017.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab017.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab017.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab017.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab017.imageset/waitingcrab017.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab017.imageset/waitingcrab017.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab017.imageset/waitingcrab017.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab017.imageset/waitingcrab017.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab018.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab018.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab018.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab018.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab018.imageset/waitingcrab018.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab018.imageset/waitingcrab018.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab018.imageset/waitingcrab018.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab018.imageset/waitingcrab018.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab019.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab019.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab019.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab019.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab019.imageset/waitingcrab019.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab019.imageset/waitingcrab019.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab019.imageset/waitingcrab019.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab019.imageset/waitingcrab019.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab020.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab020.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab020.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab020.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab020.imageset/waitingcrab020.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab020.imageset/waitingcrab020.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab020.imageset/waitingcrab020.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab020.imageset/waitingcrab020.png diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab021.imageset/Contents.json b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab021.imageset/Contents.json similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab021.imageset/Contents.json rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab021.imageset/Contents.json diff --git a/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab021.imageset/waitingcrab021.png b/Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab021.imageset/waitingcrab021.png similarity index 100% rename from Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab021.imageset/waitingcrab021.png rename to Contained/Contained/Crab.xcassets/WaitingCrab.spriteatlas/waitingcrab021.imageset/waitingcrab021.png diff --git a/Images/demo.gif b/Contained/Contained/Images/demo.gif similarity index 100% rename from Images/demo.gif rename to Contained/Contained/Images/demo.gif diff --git a/Images/info-layout.png b/Contained/Contained/Images/info-layout.png similarity index 100% rename from Images/info-layout.png rename to Contained/Contained/Images/info-layout.png diff --git a/Images/main-layout.png b/Contained/Contained/Images/main-layout.png similarity index 100% rename from Images/main-layout.png rename to Contained/Contained/Images/main-layout.png diff --git a/Contained/Contained/Info.plist b/Contained/Contained/Info.plist new file mode 100644 index 00000000..b5f9c079 --- /dev/null +++ b/Contained/Contained/Info.plist @@ -0,0 +1,62 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/Contained/Contained/Model/CustomScene.swift b/Contained/Contained/Model/CustomScene.swift new file mode 100644 index 00000000..29d2302d --- /dev/null +++ b/Contained/Contained/Model/CustomScene.swift @@ -0,0 +1,54 @@ +// +// CustomScene.swift +// Contained +// +// Created by Rob Vance on 4/22/20. +// Copyright © 2020 Robs Creations. All rights reserved. +// + +import Foundation +import SpriteKit + +class CustomScene: SKScene { + let crab = SKSpriteNode() + + // Add and center child, initializing animation sequence + override func sceneDidLoad() { + addChild(crab) + crab.loadTextures(named: "HappyCrab", forKey: SKSpriteNode.textureKey) + crab.position = CGPoint(x: frame.midX, y: frame.midY) + } + // Move to touch + + public override func touchesBegan(_ touches: Set, with event: UIEvent?) { + // Fetch a touch or leave + + guard !touches.isEmpty, let touch = touches.first else {return} + //Retrieve position + + let position = touch.location(in: self) + + // Create move action + + let actionDuration = 1.0 + let moveAction = SKAction.move(to: position, duration: actionDuration) + + let rollAction = SKAction.rotate(byAngle: CGFloat.pi * 2, duration: actionDuration) + let zoomAction = SKAction.scale(by: 1.3, duration: 0.3) + let unzoomAction = SKAction.scale(to: 1.0, duration: 0.1) + + switch Settings.shared.shouldZoom { + case false: + crab.run(moveAction) + case true: + let sequenceAction = SKAction.sequence([zoomAction,moveAction, unzoomAction]) + crab.run(sequenceAction) + } + if Settings.shared.shouldRoll { + crab.run(rollAction) + } + } + + +} + diff --git a/Contained/Contained/Model/Settings.swift b/Contained/Contained/Model/Settings.swift new file mode 100644 index 00000000..91982ab7 --- /dev/null +++ b/Contained/Contained/Model/Settings.swift @@ -0,0 +1,17 @@ +// +// Settings.swift +// Contained +// +// Created by Rob Vance on 4/21/20. +// Copyright © 2020 Robs Creations. All rights reserved. +// + +import Foundation + +class Settings { + static let shared = Settings() + private init() {} + + var shouldRoll = false + var shouldZoom = false +} diff --git a/README.md b/Contained/Contained/README.md similarity index 100% rename from README.md rename to Contained/Contained/README.md diff --git a/SKSpriteNode+Utility.swift b/Contained/Contained/SKSpriteNode+Utility.swift similarity index 100% rename from SKSpriteNode+Utility.swift rename to Contained/Contained/SKSpriteNode+Utility.swift diff --git a/Contained/Contained/SceneDelegate.swift b/Contained/Contained/SceneDelegate.swift new file mode 100644 index 00000000..636a97dc --- /dev/null +++ b/Contained/Contained/SceneDelegate.swift @@ -0,0 +1,53 @@ +// +// SceneDelegate.swift +// Contained +// +// Created by Rob Vance on 4/21/20. +// Copyright © 2020 Robs Creations. All rights reserved. +// + +import UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + // Called as the scene is being released by the system. + // This occurs shortly after the scene enters the background, or when its session is discarded. + // Release any resources associated with this scene that can be re-created the next time the scene connects. + // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). + } + + func sceneDidBecomeActive(_ scene: UIScene) { + // Called when the scene has moved from an inactive state to an active state. + // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. + } + + func sceneWillResignActive(_ scene: UIScene) { + // Called when the scene will move from an active state to an inactive state. + // This may occur due to temporary interruptions (ex. an incoming phone call). + } + + func sceneWillEnterForeground(_ scene: UIScene) { + // Called as the scene transitions from the background to the foreground. + // Use this method to undo the changes made on entering the background. + } + + func sceneDidEnterBackground(_ scene: UIScene) { + // Called as the scene transitions from the foreground to the background. + // Use this method to save data, release shared resources, and store enough scene-specific state information + // to restore the scene back to its current state. + } + + +} + diff --git a/Contained/Contained/View Controllers/GameViewController.swift b/Contained/Contained/View Controllers/GameViewController.swift new file mode 100644 index 00000000..b8865544 --- /dev/null +++ b/Contained/Contained/View Controllers/GameViewController.swift @@ -0,0 +1,29 @@ +// +// GameViewController.swift +// Contained +// +// Created by Rob Vance on 4/21/20. +// Copyright © 2020 Robs Creations. All rights reserved. +// + +import UIKit +import SpriteKit + +class GameViewController: UIViewController { + +// Mark: IBOutlets + @IBOutlet weak var skView: SKView! + var skscene: CustomScene? = nil + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + skscene = CustomScene(size: view.bounds.size) + skView.presentScene(skscene) + } + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + +} diff --git a/Contained/Contained/View Controllers/InfoViewController.swift b/Contained/Contained/View Controllers/InfoViewController.swift new file mode 100644 index 00000000..08172a6c --- /dev/null +++ b/Contained/Contained/View Controllers/InfoViewController.swift @@ -0,0 +1,24 @@ +// +// InfoViewController.swift +// Contained +// +// Created by Rob Vance on 4/21/20. +// Copyright © 2020 Robs Creations. All rights reserved. +// + +import UIKit + +class InfoViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } +// Mark: IBAction + @IBAction func doneButtonTapped(_ sender: Any) { + navigationController?.popToRootViewController(animated: true) + } + + +} diff --git a/Contained/Contained/View Controllers/SettingsViewController.swift b/Contained/Contained/View Controllers/SettingsViewController.swift new file mode 100644 index 00000000..01a24807 --- /dev/null +++ b/Contained/Contained/View Controllers/SettingsViewController.swift @@ -0,0 +1,26 @@ +// +// SettingsViewController.swift +// Contained +// +// Created by Rob Vance on 4/21/20. +// Copyright © 2020 Robs Creations. All rights reserved. +// + +import UIKit + +class SettingsViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + } + let settings = Settings.shared +// Mark: IBAction + @IBAction func toggleRoll(_ sender: UISwitch) { + settings.shouldRoll = sender.isOn + } + @IBAction func toggleZoom(_ sender: UISwitch) { + settings.shouldZoom = sender.isOn + } + + +} diff --git a/Contained/Contained/Views/Base.lproj/Main.storyboard b/Contained/Contained/Views/Base.lproj/Main.storyboard new file mode 100644 index 00000000..73ee5743 --- /dev/null +++ b/Contained/Contained/Views/Base.lproj/Main.storyboard @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Contained/Contained/Views/info.storyboard b/Contained/Contained/Views/info.storyboard new file mode 100644 index 00000000..a1c24f88 --- /dev/null +++ b/Contained/Contained/Views/info.storyboard @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d87ae0b07a4fa0aa451a57b0008ffa4bdb63ce41 Mon Sep 17 00:00:00 2001 From: Robert Vance Date: Wed, 22 Apr 2020 20:07:10 -0600 Subject: [PATCH 2/2] Fix switch on storyboard to be off at start --- Contained/Contained/Views/Base.lproj/Main.storyboard | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Contained/Contained/Views/Base.lproj/Main.storyboard b/Contained/Contained/Views/Base.lproj/Main.storyboard index 73ee5743..df6e220d 100644 --- a/Contained/Contained/Views/Base.lproj/Main.storyboard +++ b/Contained/Contained/Views/Base.lproj/Main.storyboard @@ -67,10 +67,10 @@ - + - + @@ -84,10 +84,10 @@ - + - +