Преглед на файлове

Replace UICatalog launch images with launch xib

Tanner Bennett преди 7 години
родител
ревизия
f3a1587cf1
променени са 37 файла, в които са добавени 279 реда и са изтрити 166 реда
  1. 4 2
      Example/UICatalog.xcodeproj/project.pbxproj
  2. 45 0
      Example/UICatalog/Images.xcassets/AppIcon.appiconset/Contents.json
  3. 6 0
      Example/UICatalog/Images.xcassets/Contents.json
  4. 0 74
      Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Contents.json
  5. BIN
      Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Launch.png
  6. BIN
      Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Launch@2x.png
  7. BIN
      Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Launch@2x~568h.png
  8. BIN
      Example/UICatalog/Images.xcassets/LaunchImage.launchimage/iPhone6PlusLandscape.png
  9. BIN
      Example/UICatalog/Images.xcassets/LaunchImage.launchimage/iPhone6PlusPortrait.png
  10. BIN
      Example/UICatalog/Images.xcassets/LaunchImage.launchimage/iPhone6Portrait.png
  11. 8 4
      Example/UICatalog/Images.xcassets/bookmark_icon.imageset/Contents.json
  12. 8 4
      Example/UICatalog/Images.xcassets/bookmark_icon_highlighted.imageset/Contents.json
  13. 8 4
      Example/UICatalog/Images.xcassets/checkmark_icon.imageset/Contents.json
  14. 6 2
      Example/UICatalog/Images.xcassets/image_animal_1.imageset/Contents.json
  15. 6 2
      Example/UICatalog/Images.xcassets/image_animal_2.imageset/Contents.json
  16. 6 2
      Example/UICatalog/Images.xcassets/image_animal_3.imageset/Contents.json
  17. 6 2
      Example/UICatalog/Images.xcassets/image_animal_4.imageset/Contents.json
  18. 6 2
      Example/UICatalog/Images.xcassets/image_animal_5.imageset/Contents.json
  19. 8 4
      Example/UICatalog/Images.xcassets/search_bar_background.imageset/Contents.json
  20. 8 4
      Example/UICatalog/Images.xcassets/search_icon.imageset/Contents.json
  21. 8 4
      Example/UICatalog/Images.xcassets/slider_blue_track.imageset/Contents.json
  22. 8 4
      Example/UICatalog/Images.xcassets/slider_green_track.imageset/Contents.json
  23. 8 4
      Example/UICatalog/Images.xcassets/slider_thumb.imageset/Contents.json
  24. 8 4
      Example/UICatalog/Images.xcassets/stepper_and_segment_background.imageset/Contents.json
  25. 8 4
      Example/UICatalog/Images.xcassets/stepper_and_segment_background_disabled.imageset/Contents.json
  26. 8 4
      Example/UICatalog/Images.xcassets/stepper_and_segment_background_highlighted.imageset/Contents.json
  27. 8 4
      Example/UICatalog/Images.xcassets/stepper_and_segment_segment_divider.imageset/Contents.json
  28. 8 4
      Example/UICatalog/Images.xcassets/stepper_decrement.imageset/Contents.json
  29. 8 4
      Example/UICatalog/Images.xcassets/stepper_increment.imageset/Contents.json
  30. 8 4
      Example/UICatalog/Images.xcassets/text_field_background.imageset/Contents.json
  31. 8 4
      Example/UICatalog/Images.xcassets/text_field_purple_right_view.imageset/Contents.json
  32. 8 4
      Example/UICatalog/Images.xcassets/text_view_attachment.imageset/Contents.json
  33. 8 4
      Example/UICatalog/Images.xcassets/toolbar_background.imageset/Contents.json
  34. 8 4
      Example/UICatalog/Images.xcassets/tools_icon.imageset/Contents.json
  35. 8 4
      Example/UICatalog/Images.xcassets/x_icon.imageset/Contents.json
  36. 32 0
      Example/UICatalog/LaunchScreen.xib
  37. 2 0
      Example/UICatalog/UICatalog-Info.plist

+ 4 - 2
Example/UICatalog.xcodeproj/project.pbxproj

@@ -48,6 +48,7 @@
 		9420A1AD1C1E84EE00B587DF /* FLEX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9420A1AC1C1E84EE00B587DF /* FLEX.framework */; };
 		9420A1AD1C1E84EE00B587DF /* FLEX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9420A1AC1C1E84EE00B587DF /* FLEX.framework */; };
 		943203FE1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 943203FD1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m */; };
 		943203FE1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 943203FD1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m */; };
 		94CB4D431A97183E0054A905 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 94CB4D421A97183E0054A905 /* libz.dylib */; };
 		94CB4D431A97183E0054A905 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 94CB4D421A97183E0054A905 /* libz.dylib */; };
+		C3EF50CD22610FE200B0BE49 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3EF50CC22610FE200B0BE49 /* LaunchScreen.xib */; };
 /* End PBXBuildFile section */
 /* End PBXBuildFile section */
 
 
 /* Begin PBXCopyFilesBuildPhase section */
 /* Begin PBXCopyFilesBuildPhase section */
@@ -136,6 +137,7 @@
 		943203FC1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AAPLCatalogTableTableViewController.h; sourceTree = "<group>"; };
 		943203FC1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AAPLCatalogTableTableViewController.h; sourceTree = "<group>"; };
 		943203FD1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AAPLCatalogTableTableViewController.m; sourceTree = "<group>"; };
 		943203FD1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AAPLCatalogTableTableViewController.m; sourceTree = "<group>"; };
 		94CB4D421A97183E0054A905 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		94CB4D421A97183E0054A905 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		C3EF50CC22610FE200B0BE49 /* LaunchScreen.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* End PBXFileReference section */
 
 
 /* Begin PBXFrameworksBuildPhase section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -216,6 +218,7 @@
 				5356824518F3656900BAAD62 /* UICatalog-Info.plist */,
 				5356824518F3656900BAAD62 /* UICatalog-Info.plist */,
 				5356824B18F3656900BAAD62 /* UICatalog-Prefix.pch */,
 				5356824B18F3656900BAAD62 /* UICatalog-Prefix.pch */,
 				53874F9718F36B1800510922 /* Localizable.strings */,
 				53874F9718F36B1800510922 /* Localizable.strings */,
+				C3EF50CC22610FE200B0BE49 /* LaunchScreen.xib */,
 			);
 			);
 			name = "Supporting Files";
 			name = "Supporting Files";
 			sourceTree = "<group>";
 			sourceTree = "<group>";
@@ -366,6 +369,7 @@
 				22679D5D1C741A7A002248FC /* dogs.realm in Resources */,
 				22679D5D1C741A7A002248FC /* dogs.realm in Resources */,
 				5356825418F3656900BAAD62 /* Main_iPad.storyboard in Resources */,
 				5356825418F3656900BAAD62 /* Main_iPad.storyboard in Resources */,
 				53874F9918F36B1800510922 /* Localizable.strings in Resources */,
 				53874F9918F36B1800510922 /* Localizable.strings in Resources */,
+				C3EF50CD22610FE200B0BE49 /* LaunchScreen.xib in Resources */,
 				5356825918F3656900BAAD62 /* Images.xcassets in Resources */,
 				5356825918F3656900BAAD62 /* Images.xcassets in Resources */,
 				3EC6487318FF8A5000024205 /* ReadMe.txt in Resources */,
 				3EC6487318FF8A5000024205 /* ReadMe.txt in Resources */,
 				5356825118F3656900BAAD62 /* Main_iPhone.storyboard in Resources */,
 				5356825118F3656900BAAD62 /* Main_iPhone.storyboard in Resources */,
@@ -546,7 +550,6 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEVELOPMENT_TEAM = S6N2F22V2Z;
 				DEVELOPMENT_TEAM = S6N2F22V2Z;
 				EXCLUDED_SOURCE_FILE_NAMES = "";
 				EXCLUDED_SOURCE_FILE_NAMES = "";
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (
@@ -567,7 +570,6 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEVELOPMENT_TEAM = S6N2F22V2Z;
 				DEVELOPMENT_TEAM = S6N2F22V2Z;
 				EXCLUDED_SOURCE_FILE_NAMES = "FLEX*";
 				EXCLUDED_SOURCE_FILE_NAMES = "FLEX*";
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (

+ 45 - 0
Example/UICatalog/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,18 +1,53 @@
 {
 {
   "images" : [
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
     {
       "idiom" : "iphone",
       "idiom" : "iphone",
       "size" : "29x29",
       "size" : "29x29",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
     {
     {
       "idiom" : "iphone",
       "idiom" : "iphone",
       "size" : "40x40",
       "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
       "idiom" : "iphone",
       "idiom" : "iphone",
       "size" : "60x60",
       "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
@@ -44,6 +79,16 @@
       "idiom" : "ipad",
       "idiom" : "ipad",
       "size" : "76x76",
       "size" : "76x76",
       "scale" : "2x"
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 6 - 0
Example/UICatalog/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

+ 0 - 74
Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -1,74 +0,0 @@
-{
-  "images" : [
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "iPhone6PlusPortrait.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "iPhone6PlusLandscape.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "landscape",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "667h",
-      "filename" : "iPhone6Portrait.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "filename" : "Launch@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "retina4",
-      "filename" : "Launch@2x~568h.png",
-      "minimum-system-version" : "7.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "filename" : "Launch.png",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "filename" : "Launch@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "filename" : "Launch@2x~568h.png",
-      "subtype" : "retina4",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BIN
Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Launch.png


BIN
Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Launch@2x.png


BIN
Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Launch@2x~568h.png


BIN
Example/UICatalog/Images.xcassets/LaunchImage.launchimage/iPhone6PlusLandscape.png


BIN
Example/UICatalog/Images.xcassets/LaunchImage.launchimage/iPhone6PlusPortrait.png


BIN
Example/UICatalog/Images.xcassets/LaunchImage.launchimage/iPhone6Portrait.png


+ 8 - 4
Example/UICatalog/Images.xcassets/bookmark_icon.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "bookmark_icon_1x.png"
+      "filename" : "bookmark_icon_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "bookmark_icon_2x.png"
+      "filename" : "bookmark_icon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/bookmark_icon_highlighted.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "bookmark_icon_highlighted_1x.png"
+      "filename" : "bookmark_icon_highlighted_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "bookmark_icon_highlighted_2x.png"
+      "filename" : "bookmark_icon_highlighted_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/checkmark_icon.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "checkmark_icon_1x.png"
+      "filename" : "checkmark_icon_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "checkmark_icon_2x.png"
+      "filename" : "checkmark_icon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 6 - 2
Example/UICatalog/Images.xcassets/image_animal_1.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_5.png"
+      "filename" : "image_animal_5.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 6 - 2
Example/UICatalog/Images.xcassets/image_animal_2.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_2.png"
+      "filename" : "image_animal_2.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 6 - 2
Example/UICatalog/Images.xcassets/image_animal_3.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_3.png"
+      "filename" : "image_animal_3.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 6 - 2
Example/UICatalog/Images.xcassets/image_animal_4.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_4.png"
+      "filename" : "image_animal_4.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 6 - 2
Example/UICatalog/Images.xcassets/image_animal_5.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_1.png"
+      "filename" : "image_animal_1.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/search_bar_background.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "search_bar_bg_1x.png"
+      "filename" : "search_bar_bg_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "search_bar_bg_2x.png"
+      "filename" : "search_bar_bg_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/search_icon.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "search_icon_1x.png"
+      "filename" : "search_icon_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "search_icon_2x.png"
+      "filename" : "search_icon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/slider_blue_track.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "slider_blue_track_1x.png"
+      "filename" : "slider_blue_track_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "slider_blue_track_2x.png"
+      "filename" : "slider_blue_track_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/slider_green_track.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "slider_green_track_1x.png"
+      "filename" : "slider_green_track_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "slider_green_track_2x.png"
+      "filename" : "slider_green_track_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/slider_thumb.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "slider_thumb_1x.png"
+      "filename" : "slider_thumb_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "slider_thumb_2x.png"
+      "filename" : "slider_thumb_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/stepper_and_segment_background.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_and_segment_background_1x.png"
+      "filename" : "stepper_and_segment_background_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_and_segment_background_2x.png"
+      "filename" : "stepper_and_segment_background_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/stepper_and_segment_background_disabled.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_and_segment_background_disabled_1x.png"
+      "filename" : "stepper_and_segment_background_disabled_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_and_segment_background_disabled_2x.png"
+      "filename" : "stepper_and_segment_background_disabled_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/stepper_and_segment_background_highlighted.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_and_segment_background_highlighted_1x.png"
+      "filename" : "stepper_and_segment_background_highlighted_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_and_segment_background_highlighted_2x.png"
+      "filename" : "stepper_and_segment_background_highlighted_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/stepper_and_segment_segment_divider.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_and_segment_segment_divider_1x.png"
+      "filename" : "stepper_and_segment_segment_divider_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_and_segment_segment_divider_2x.png"
+      "filename" : "stepper_and_segment_segment_divider_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/stepper_decrement.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "decrement_1x.png"
+      "filename" : "decrement_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "decrement_2x.png"
+      "filename" : "decrement_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/stepper_increment.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_increment_1x.png"
+      "filename" : "stepper_increment_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_increment_2x.png"
+      "filename" : "stepper_increment_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/text_field_background.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "text_field_background_1x.png"
+      "filename" : "text_field_background_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "text_field_background_2x.png"
+      "filename" : "text_field_background_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/text_field_purple_right_view.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "text_field_purple_right_view_1x.png"
+      "filename" : "text_field_purple_right_view_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "text_field_purple_right_view_2x.png"
+      "filename" : "text_field_purple_right_view_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/text_view_attachment.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "text_view_attachment_1x.png"
+      "filename" : "text_view_attachment_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "text_view_attachment_2x.png"
+      "filename" : "text_view_attachment_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/toolbar_background.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "toolbar_background_1x.png"
+      "filename" : "toolbar_background_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "toolbar_background_2x.png"
+      "filename" : "toolbar_background_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/tools_icon.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "tools_icon_1x.png"
+      "filename" : "tools_icon_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "tools_icon_2x.png"
+      "filename" : "tools_icon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 8 - 4
Example/UICatalog/Images.xcassets/x_icon.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
   "images" : [
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "x_icon_1x.png"
+      "filename" : "x_icon_1x.png",
+      "scale" : "1x"
     },
     },
     {
     {
       "idiom" : "universal",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "x_icon_2x.png"
+      "filename" : "x_icon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
     }
   ],
   ],
   "info" : {
   "info" : {

+ 32 - 0
Example/UICatalog/LaunchScreen.xib

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_9" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FLEX" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vr9-JF-Ls4">
+                    <rect key="frame" x="130.66666666666666" y="275.66666666666669" width="114" height="60"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="50"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="Vr9-JF-Ls4" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="IUa-oU-7Gl"/>
+                <constraint firstItem="Vr9-JF-Ls4" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" multiplier="3:4" constant="1" id="tsn-lM-lhl"/>
+            </constraints>
+        </view>
+    </objects>
+</document>

+ 2 - 0
Example/UICatalog/UICatalog-Info.plist

@@ -29,6 +29,8 @@
 	<string>2.12</string>
 	<string>2.12</string>
 	<key>LSRequiresIPhoneOS</key>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<key>UIMainStoryboardFile</key>
 	<string>Main_iPhone</string>
 	<string>Main_iPhone</string>
 	<key>UIMainStoryboardFile~ipad</key>
 	<key>UIMainStoryboardFile~ipad</key>