diff --git a/BeautyGallery.xcodeproj/project.pbxproj b/BeautyGallery.xcodeproj/project.pbxproj index b63f3cf..9283ab8 100644 --- a/BeautyGallery.xcodeproj/project.pbxproj +++ b/BeautyGallery.xcodeproj/project.pbxproj @@ -10,10 +10,10 @@ 236CE13419B0B0FA00B1E85A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236CE13319B0B0FA00B1E85A /* AppDelegate.swift */; }; 236CE13619B0B0FA00B1E85A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236CE13519B0B0FA00B1E85A /* ViewController.swift */; }; 236CE13919B0B0FA00B1E85A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 236CE13719B0B0FA00B1E85A /* Main.storyboard */; }; - 236CE13B19B0B0FA00B1E85A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 236CE13A19B0B0FA00B1E85A /* Images.xcassets */; }; 236CE14719B0B0FA00B1E85A /* BeautyGalleryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236CE14619B0B0FA00B1E85A /* BeautyGalleryTests.swift */; }; 236CE15119B0B31900B1E85A /* GalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236CE15019B0B31900B1E85A /* GalleryViewController.swift */; }; 236CE15319B0B50900B1E85A /* ViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236CE15219B0B50900B1E85A /* ViewControllerExtension.swift */; }; + 236E400619B5B15A00A4233B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 236E400519B5B15A00A4233B /* Images.xcassets */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -32,12 +32,12 @@ 236CE13319B0B0FA00B1E85A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 236CE13519B0B0FA00B1E85A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 236CE13819B0B0FA00B1E85A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 236CE13A19B0B0FA00B1E85A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 236CE14019B0B0FA00B1E85A /* BeautyGalleryTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BeautyGalleryTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 236CE14519B0B0FA00B1E85A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 236CE14619B0B0FA00B1E85A /* BeautyGalleryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BeautyGalleryTests.swift; sourceTree = ""; }; 236CE15019B0B31900B1E85A /* GalleryViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryViewController.swift; sourceTree = ""; }; 236CE15219B0B50900B1E85A /* ViewControllerExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewControllerExtension.swift; sourceTree = ""; }; + 236E400519B5B15A00A4233B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -84,7 +84,7 @@ 236CE15219B0B50900B1E85A /* ViewControllerExtension.swift */, 236CE15019B0B31900B1E85A /* GalleryViewController.swift */, 236CE13719B0B0FA00B1E85A /* Main.storyboard */, - 236CE13A19B0B0FA00B1E85A /* Images.xcassets */, + 236E400519B5B15A00A4233B /* Images.xcassets */, 236CE13119B0B0FA00B1E85A /* Supporting Files */, ); path = BeautyGallery; @@ -196,7 +196,7 @@ buildActionMask = 2147483647; files = ( 236CE13919B0B0FA00B1E85A /* Main.storyboard in Resources */, - 236CE13B19B0B0FA00B1E85A /* Images.xcassets in Resources */, + 236E400619B5B15A00A4233B /* Images.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -403,6 +403,7 @@ 236CE14C19B0B0FA00B1E85A /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 236CE14D19B0B0FA00B1E85A /* Build configuration list for PBXNativeTarget "BeautyGalleryTests" */ = { isa = XCConfigurationList; @@ -411,6 +412,7 @@ 236CE14F19B0B0FA00B1E85A /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/BeautyGallery/Base.lproj/Main.storyboard b/BeautyGallery/Base.lproj/Main.storyboard index 92ed528..f6c5357 100644 --- a/BeautyGallery/Base.lproj/Main.storyboard +++ b/BeautyGallery/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -43,7 +43,7 @@ - + @@ -84,12 +84,13 @@ - + - + + @@ -97,16 +98,83 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BeautyGallery/Images.xcassets/geisha.imageset/Contents.json b/BeautyGallery/Images.xcassets/geisha.imageset/Contents.json new file mode 100644 index 0000000..989a363 --- /dev/null +++ b/BeautyGallery/Images.xcassets/geisha.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "geisha.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "geisha@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/BeautyGallery/Images.xcassets/geisha.imageset/geisha.png b/BeautyGallery/Images.xcassets/geisha.imageset/geisha.png new file mode 100644 index 0000000..14e977c Binary files /dev/null and b/BeautyGallery/Images.xcassets/geisha.imageset/geisha.png differ diff --git a/BeautyGallery/Images.xcassets/geisha.imageset/geisha@2x.png b/BeautyGallery/Images.xcassets/geisha.imageset/geisha@2x.png new file mode 100644 index 0000000..f53e5c0 Binary files /dev/null and b/BeautyGallery/Images.xcassets/geisha.imageset/geisha@2x.png differ diff --git a/BeautyGallery/Images.xcassets/great_wall.imageset/Contents.json b/BeautyGallery/Images.xcassets/great_wall.imageset/Contents.json new file mode 100644 index 0000000..a4118f4 --- /dev/null +++ b/BeautyGallery/Images.xcassets/great_wall.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "great_wall.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "great_wall@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/BeautyGallery/Images.xcassets/great_wall.imageset/great_wall.png b/BeautyGallery/Images.xcassets/great_wall.imageset/great_wall.png new file mode 100644 index 0000000..e6830c0 Binary files /dev/null and b/BeautyGallery/Images.xcassets/great_wall.imageset/great_wall.png differ diff --git a/BeautyGallery/Images.xcassets/great_wall.imageset/great_wall@2x.png b/BeautyGallery/Images.xcassets/great_wall.imageset/great_wall@2x.png new file mode 100644 index 0000000..743137a Binary files /dev/null and b/BeautyGallery/Images.xcassets/great_wall.imageset/great_wall@2x.png differ diff --git a/BeautyGallery/Images.xcassets/japanese.imageset/Contents.json b/BeautyGallery/Images.xcassets/japanese.imageset/Contents.json new file mode 100644 index 0000000..21132af --- /dev/null +++ b/BeautyGallery/Images.xcassets/japanese.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "japanese.jpg" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "japanese@2x.jpg" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/BeautyGallery/Images.xcassets/japanese.imageset/japanese.jpg b/BeautyGallery/Images.xcassets/japanese.imageset/japanese.jpg new file mode 100644 index 0000000..ad6f8b3 Binary files /dev/null and b/BeautyGallery/Images.xcassets/japanese.imageset/japanese.jpg differ diff --git a/BeautyGallery/Images.xcassets/japanese.imageset/japanese@2x.jpg b/BeautyGallery/Images.xcassets/japanese.imageset/japanese@2x.jpg new file mode 100644 index 0000000..4d30d27 Binary files /dev/null and b/BeautyGallery/Images.xcassets/japanese.imageset/japanese@2x.jpg differ diff --git a/BeautyGallery/Images.xcassets/korean.imageset/Contents.json b/BeautyGallery/Images.xcassets/korean.imageset/Contents.json new file mode 100644 index 0000000..008d348 --- /dev/null +++ b/BeautyGallery/Images.xcassets/korean.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "korean.jpg" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "korean@2x.jpg" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/BeautyGallery/Images.xcassets/korean.imageset/korean.jpg b/BeautyGallery/Images.xcassets/korean.imageset/korean.jpg new file mode 100644 index 0000000..addbd12 Binary files /dev/null and b/BeautyGallery/Images.xcassets/korean.imageset/korean.jpg differ diff --git a/BeautyGallery/Images.xcassets/korean.imageset/korean@2x.jpg b/BeautyGallery/Images.xcassets/korean.imageset/korean@2x.jpg new file mode 100644 index 0000000..853c60f Binary files /dev/null and b/BeautyGallery/Images.xcassets/korean.imageset/korean@2x.jpg differ diff --git a/BeautyGallery/Images.xcassets/origami.imageset/Contents.json b/BeautyGallery/Images.xcassets/origami.imageset/Contents.json new file mode 100644 index 0000000..92aa203 --- /dev/null +++ b/BeautyGallery/Images.xcassets/origami.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "origami.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "origami@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/BeautyGallery/Images.xcassets/origami.imageset/origami.png b/BeautyGallery/Images.xcassets/origami.imageset/origami.png new file mode 100644 index 0000000..b7683eb Binary files /dev/null and b/BeautyGallery/Images.xcassets/origami.imageset/origami.png differ diff --git a/BeautyGallery/Images.xcassets/origami.imageset/origami@2x.png b/BeautyGallery/Images.xcassets/origami.imageset/origami@2x.png new file mode 100644 index 0000000..6bc7e26 Binary files /dev/null and b/BeautyGallery/Images.xcassets/origami.imageset/origami@2x.png differ diff --git a/BeautyGallery/Images.xcassets/torii.imageset/Contents.json b/BeautyGallery/Images.xcassets/torii.imageset/Contents.json new file mode 100644 index 0000000..bc12c97 --- /dev/null +++ b/BeautyGallery/Images.xcassets/torii.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "torii.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "torii@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/BeautyGallery/Images.xcassets/torii.imageset/torii.png b/BeautyGallery/Images.xcassets/torii.imageset/torii.png new file mode 100644 index 0000000..bb16182 Binary files /dev/null and b/BeautyGallery/Images.xcassets/torii.imageset/torii.png differ diff --git a/BeautyGallery/Images.xcassets/torii.imageset/torii@2x.png b/BeautyGallery/Images.xcassets/torii.imageset/torii@2x.png new file mode 100644 index 0000000..dab671d Binary files /dev/null and b/BeautyGallery/Images.xcassets/torii.imageset/torii@2x.png differ