diff --git a/BlocksForAll.xcodeproj/project.pbxproj b/BlocksForAll.xcodeproj/project.pbxproj index 126c24a..85b0fa3 100644 --- a/BlocksForAll.xcodeproj/project.pbxproj +++ b/BlocksForAll.xcodeproj/project.pbxproj @@ -47,7 +47,7 @@ 8DDC31A32CA1D11600337B39 /* BackgroundImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DDC31A22CA1D11600337B39 /* BackgroundImage.swift */; }; 8DE37B012C1A3C39006DB159 /* ProjectCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE37B002C1A3C39006DB159 /* ProjectCollectionViewCell.swift */; }; 8DE37B032C1A3D68006DB159 /* Project.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE37B022C1A3D68006DB159 /* Project.swift */; }; - 8DE37B052C1A3F12006DB159 /* ProjectGalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE37B042C1A3F12006DB159 /* ProjectGalleryViewController.swift */; }; + 8DE37B052C1A3F12006DB159 /* ProjectGalleryCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE37B042C1A3F12006DB159 /* ProjectGalleryCollectionView.swift */; }; 8DE76F832A3100BE002E11C2 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE76F822A3100BE002E11C2 /* SettingsViewController.swift */; }; 8DE83BA82CA0B34B005DF819 /* SelectBackgroundModifierViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE83BA72CA0B34B005DF819 /* SelectBackgroundModifierViewController.swift */; }; 8DE97FD52C29CFE4008661BB /* AddProjectCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DE97FD42C29CFE4008661BB /* AddProjectCollectionViewCell.swift */; }; @@ -63,6 +63,7 @@ 8DEF21BF2C40362400E5E21F /* horse.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8DEF21B52C40362400E5E21F /* horse.mp3 */; }; 8DEF21C12C40371000E5E21F /* bounceOffWall.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8DEF21C02C40371000E5E21F /* bounceOffWall.mp3 */; }; 8DEF21C52C4037B300E5E21F /* Movement4BeatLoop.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8DEF21C42C4037B300E5E21F /* Movement4BeatLoop.mp3 */; }; + 8DF2EC1B2F14123D007E6CB9 /* StartScreenGallery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF2EC1A2F141239007E6CB9 /* StartScreenGallery.swift */; }; 8DFEBAC02C2B40AC00491CAD /* FullScreenFreeplayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFEBABF2C2B40AC00491CAD /* FullScreenFreeplayViewController.swift */; }; 8DFEBAC22C2C6F8900491CAD /* SelectLocationModifierViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFEBAC12C2C6F8900491CAD /* SelectLocationModifierViewController.swift */; }; 8DFEBAC62C2C973500491CAD /* SpeedModViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFEBAC52C2C973500491CAD /* SpeedModViewController.swift */; }; @@ -151,7 +152,7 @@ 8DDC31A22CA1D11600337B39 /* BackgroundImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundImage.swift; sourceTree = ""; }; 8DE37B002C1A3C39006DB159 /* ProjectCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectCollectionViewCell.swift; sourceTree = ""; }; 8DE37B022C1A3D68006DB159 /* Project.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Project.swift; sourceTree = ""; }; - 8DE37B042C1A3F12006DB159 /* ProjectGalleryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectGalleryViewController.swift; sourceTree = ""; }; + 8DE37B042C1A3F12006DB159 /* ProjectGalleryCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectGalleryCollectionView.swift; sourceTree = ""; }; 8DE76F822A3100BE002E11C2 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; 8DE83BA72CA0B34B005DF819 /* SelectBackgroundModifierViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectBackgroundModifierViewController.swift; sourceTree = ""; }; 8DE97FD42C29CFE4008661BB /* AddProjectCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddProjectCollectionViewCell.swift; sourceTree = ""; }; @@ -167,6 +168,7 @@ 8DEF21B52C40362400E5E21F /* horse.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = horse.mp3; path = "BlocksForAll/Audio Files/Sound Blocks/horse.mp3"; sourceTree = SOURCE_ROOT; }; 8DEF21C02C40371000E5E21F /* bounceOffWall.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = bounceOffWall.mp3; path = "BlocksForAll/Audio Files/bounceOffWall.mp3"; sourceTree = SOURCE_ROOT; }; 8DEF21C42C4037B300E5E21F /* Movement4BeatLoop.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Movement4BeatLoop.mp3; path = "BlocksForAll/Audio Files/Movement4BeatLoop.mp3"; sourceTree = SOURCE_ROOT; }; + 8DF2EC1A2F141239007E6CB9 /* StartScreenGallery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartScreenGallery.swift; sourceTree = ""; }; 8DFEBABF2C2B40AC00491CAD /* FullScreenFreeplayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullScreenFreeplayViewController.swift; sourceTree = ""; }; 8DFEBAC12C2C6F8900491CAD /* SelectLocationModifierViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectLocationModifierViewController.swift; sourceTree = ""; }; 8DFEBAC52C2C973500491CAD /* SpeedModViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeedModViewController.swift; sourceTree = ""; }; @@ -285,9 +287,10 @@ 8DE37AFF2C1A3C24006DB159 /* GalleryViewControllers */ = { isa = PBXGroup; children = ( + 8DF2EC1A2F141239007E6CB9 /* StartScreenGallery.swift */, 8DE37B002C1A3C39006DB159 /* ProjectCollectionViewCell.swift */, 8DE37B022C1A3D68006DB159 /* Project.swift */, - 8DE37B042C1A3F12006DB159 /* ProjectGalleryViewController.swift */, + 8DE37B042C1A3F12006DB159 /* ProjectGalleryCollectionView.swift */, 8DE97FD42C29CFE4008661BB /* AddProjectCollectionViewCell.swift */, ); path = GalleryViewControllers; @@ -617,7 +620,7 @@ F10F71691E65BFF50049F3AA /* Block.swift in Sources */, 8DD0F84A2BFE7DD0005021EB /* Robot.swift in Sources */, F18FFFB31E65B0FB0090C4B6 /* AppDelegate.swift in Sources */, - 8DE37B052C1A3F12006DB159 /* ProjectGalleryViewController.swift in Sources */, + 8DE37B052C1A3F12006DB159 /* ProjectGalleryCollectionView.swift in Sources */, 8D822CDA2C137B3300A8A20D /* FreePlayWorkspaceViewController.swift in Sources */, 8D92E0DB2CAB83B800F74DC7 /* UserData.swift in Sources */, F73D31762A5DFA0F00008126 /* AddRobotViewController.swift in Sources */, @@ -639,6 +642,7 @@ 701A43871EC26EFD00314599 /* BlocksViewController.swift in Sources */, FD3A59562A3B639E00122BEF /* InstructionsViewController.swift in Sources */, 844EAEF722E60CBB00BB1A62 /* FunctionTableViewCell.swift in Sources */, + 8DF2EC1B2F14123D007E6CB9 /* StartScreenGallery.swift in Sources */, 8DE37B032C1A3D68006DB159 /* Project.swift in Sources */, F13A0AE91E6B2C3E00DB4C86 /* BlocksTypeTableViewController.swift in Sources */, 8DFEBAC62C2C973500491CAD /* SpeedModViewController.swift in Sources */, diff --git a/BlocksForAll/Assets.xcassets/Colors/dark_blue.colorset/Contents.json b/BlocksForAll/Assets.xcassets/Colors/dark_blue.colorset/Contents.json new file mode 100644 index 0000000..9afc595 --- /dev/null +++ b/BlocksForAll/Assets.xcassets/Colors/dark_blue.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.600", + "green" : "0.290", + "red" : "0.031" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "0.843", + "red" : "0.565" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BlocksForAll/Assets.xcassets/Colors/dark_orange.colorset/Contents.json b/BlocksForAll/Assets.xcassets/Colors/dark_orange.colorset/Contents.json new file mode 100644 index 0000000..de81655 --- /dev/null +++ b/BlocksForAll/Assets.xcassets/Colors/dark_orange.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.000", + "green" : "0.157", + "red" : "0.643" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.298", + "green" : "0.612", + "red" : "1.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Contents.json b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Contents.json new file mode 100644 index 0000000..709ce8f --- /dev/null +++ b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "Freeplay Tab - Dark.svg", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "Freeplay Tab.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Freeplay Tab - Dark.svg b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Freeplay Tab - Dark.svg new file mode 100644 index 0000000..12fa018 --- /dev/null +++ b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Freeplay Tab - Dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Freeplay Tab.svg b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Freeplay Tab.svg new file mode 100644 index 0000000..354a0c0 --- /dev/null +++ b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Freeplay Tab.imageset/Freeplay Tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Contents.json b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Contents.json new file mode 100644 index 0000000..15553bd --- /dev/null +++ b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "Robot Tab.svg", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "Robot Tab - Dark.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Robot Tab - Dark.svg b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Robot Tab - Dark.svg new file mode 100644 index 0000000..1be0f05 --- /dev/null +++ b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Robot Tab - Dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Robot Tab.svg b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Robot Tab.svg new file mode 100644 index 0000000..70ec81c --- /dev/null +++ b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Gallery Images/Robot Tab.imageset/Robot Tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Main Menu/Blocks4All.imageset/Blocks4All.png b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Main Menu/Blocks4All.imageset/Blocks4All.png new file mode 100644 index 0000000..282c33e Binary files /dev/null and b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Main Menu/Blocks4All.imageset/Blocks4All.png differ diff --git a/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Main Menu/Blocks4All.imageset/Contents.json b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Main Menu/Blocks4All.imageset/Contents.json new file mode 100644 index 0000000..588b358 --- /dev/null +++ b/BlocksForAll/Assets.xcassets/block_images/reduced_size_images/Main Menu/Blocks4All.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Blocks4All.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BlocksForAll/Base.lproj/Main.storyboard b/BlocksForAll/Base.lproj/Main.storyboard index f777fd8..a5e1d81 100644 --- a/BlocksForAll/Base.lproj/Main.storyboard +++ b/BlocksForAll/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -321,6 +321,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -902,7 +1143,6 @@ - @@ -910,6 +1150,7 @@ + @@ -1201,7 +1442,7 @@ - + @@ -1291,7 +1532,7 @@ - +