Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
Binary file modified Project6-CandySearch/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,27 @@
/* Begin PBXBuildFile section */
6E25AA702A41CA2A00001221 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E25AA6F2A41CA2A00001221 /* AppDelegate.swift */; };
6E25AA722A41CA2A00001221 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E25AA712A41CA2A00001221 /* SceneDelegate.swift */; };
6E25AA742A41CA2A00001221 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E25AA732A41CA2A00001221 /* ViewController.swift */; };
6E25AA742A41CA2A00001221 /* CandyListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E25AA732A41CA2A00001221 /* CandyListViewController.swift */; };
6E25AA772A41CA2A00001221 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6E25AA752A41CA2A00001221 /* Main.storyboard */; };
6E25AA792A41CA2B00001221 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6E25AA782A41CA2B00001221 /* Assets.xcassets */; };
6E25AA7C2A41CA2B00001221 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6E25AA7A2A41CA2B00001221 /* LaunchScreen.storyboard */; };
6E25AA842A435FBC00001221 /* Candy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E25AA832A435FBC00001221 /* Candy.swift */; };
6E25AA862A43626500001221 /* candies.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E25AA852A43626500001221 /* candies.json */; };
6EC57FDF2A4E1EEB009276CE /* CandyDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EC57FDE2A4E1EEB009276CE /* CandyDetailViewController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
6E25AA6C2A41CA2A00001221 /* Project6-CandySearch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Project6-CandySearch.app"; sourceTree = BUILT_PRODUCTS_DIR; };
6E25AA6F2A41CA2A00001221 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
6E25AA712A41CA2A00001221 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
6E25AA732A41CA2A00001221 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
6E25AA732A41CA2A00001221 /* CandyListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CandyListViewController.swift; sourceTree = "<group>"; };
6E25AA762A41CA2A00001221 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
6E25AA782A41CA2B00001221 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
6E25AA7B2A41CA2B00001221 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6E25AA7D2A41CA2B00001221 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6E25AA832A435FBC00001221 /* Candy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Candy.swift; sourceTree = "<group>"; };
6E25AA852A43626500001221 /* candies.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = candies.json; sourceTree = "<group>"; };
6EC57FDE2A4E1EEB009276CE /* CandyDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CandyDetailViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -56,17 +62,44 @@
6E25AA6E2A41CA2A00001221 /* Project6-CandySearch */ = {
isa = PBXGroup;
children = (
6E25AA8B2A4366F400001221 /* Controller */,
6E25AA8A2A4366E300001221 /* View */,
6E25AA892A4366DA00001221 /* Model */,
6E25AA852A43626500001221 /* candies.json */,
6E25AA6F2A41CA2A00001221 /* AppDelegate.swift */,
6E25AA712A41CA2A00001221 /* SceneDelegate.swift */,
6E25AA732A41CA2A00001221 /* ViewController.swift */,
6E25AA752A41CA2A00001221 /* Main.storyboard */,
6E25AA782A41CA2B00001221 /* Assets.xcassets */,
6E25AA7A2A41CA2B00001221 /* LaunchScreen.storyboard */,
6E25AA7D2A41CA2B00001221 /* Info.plist */,
);
path = "Project6-CandySearch";
sourceTree = "<group>";
};
6E25AA892A4366DA00001221 /* Model */ = {
isa = PBXGroup;
children = (
6E25AA832A435FBC00001221 /* Candy.swift */,
);
path = Model;
sourceTree = "<group>";
};
6E25AA8A2A4366E300001221 /* View */ = {
isa = PBXGroup;
children = (
6E25AA752A41CA2A00001221 /* Main.storyboard */,
);
path = View;
sourceTree = "<group>";
};
6E25AA8B2A4366F400001221 /* Controller */ = {
isa = PBXGroup;
children = (
6E25AA732A41CA2A00001221 /* CandyListViewController.swift */,
6EC57FDE2A4E1EEB009276CE /* CandyDetailViewController.swift */,
);
path = Controller;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -128,6 +161,7 @@
6E25AA7C2A41CA2B00001221 /* LaunchScreen.storyboard in Resources */,
6E25AA792A41CA2B00001221 /* Assets.xcassets in Resources */,
6E25AA772A41CA2A00001221 /* Main.storyboard in Resources */,
6E25AA862A43626500001221 /* candies.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -138,7 +172,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6E25AA742A41CA2A00001221 /* ViewController.swift in Sources */,
6E25AA742A41CA2A00001221 /* CandyListViewController.swift in Sources */,
6EC57FDF2A4E1EEB009276CE /* CandyDetailViewController.swift in Sources */,
6E25AA842A435FBC00001221 /* Candy.swift in Sources */,
6E25AA702A41CA2A00001221 /* AppDelegate.swift in Sources */,
6E25AA722A41CA2A00001221 /* SceneDelegate.swift in Sources */,
);
Expand Down Expand Up @@ -292,6 +328,7 @@
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleLightContent;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -319,6 +356,7 @@
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleLightContent;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>Project6-CandySearch.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,8 +1,88 @@
{
"images" : [
{
"idiom" : "universal",
"platform" : "ios",
"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" : "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"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Candy Cane.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Candy Cane@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Candy Cane@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Caramel.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Caramel@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Caramel@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Chocolate Bar.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Chocolate Bar@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Chocolate Bar@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Chocolate Chip.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Chocolate Chip@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Chocolate Chip@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Dark Chocolate.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Dark Chocolate@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Dark Chocolate@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Gummi Bear.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Gummi Bear@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Gummi Bear@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Inline-Logo.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "original"
}
}
Binary file not shown.
Loading