From a093a75e3b7107f33a21398013fd085aa29e1bb0 Mon Sep 17 00:00:00 2001 From: fredrossperry Date: Tue, 15 Dec 2015 16:52:17 -0800 Subject: muPDF iOS app: properly support 4-inch iPhone. A new TestFlight build could not be uploaded without making sure that the default launch screen image was getting placed in the app package. --- platform/ios/MuPDF.xcodeproj/project.pbxproj | 4 ++ .../AppIcon.appiconset/Contents.json | 15 +++++ .../LaunchImage.launchimage/Contents.json | 72 +++++++++++----------- 3 files changed, 55 insertions(+), 36 deletions(-) diff --git a/platform/ios/MuPDF.xcodeproj/project.pbxproj b/platform/ios/MuPDF.xcodeproj/project.pbxproj index 5fe5d9ef..143557bb 100644 --- a/platform/ios/MuPDF.xcodeproj/project.pbxproj +++ b/platform/ios/MuPDF.xcodeproj/project.pbxproj @@ -56,6 +56,7 @@ DADF824D1905242800855662 /* ic_share.png in Resources */ = {isa = PBXBuildFile; fileRef = DADF824C1905241900855662 /* ic_share.png */; }; DAFF997B187C12430081C756 /* MuChoiceFieldController.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFF9979187C12430081C756 /* MuChoiceFieldController.m */; }; DAFF997C187C12430081C756 /* MuChoiceFieldController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAFF997A187C12430081C756 /* MuChoiceFieldController.xib */; }; + E845CC6E1C20C09B00474C19 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E845CC6D1C20C09B00474C19 /* Default-568h@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -141,6 +142,7 @@ DAFF9978187C12430081C756 /* MuChoiceFieldController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuChoiceFieldController.h; path = Classes/MuChoiceFieldController.h; sourceTree = ""; }; DAFF9979187C12430081C756 /* MuChoiceFieldController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuChoiceFieldController.m; path = Classes/MuChoiceFieldController.m; sourceTree = ""; }; DAFF997A187C12430081C756 /* MuChoiceFieldController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MuChoiceFieldController.xib; path = Classes/MuChoiceFieldController.xib; sourceTree = ""; }; + E845CC6D1C20C09B00474C19 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "MuPDF/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -164,6 +166,7 @@ 968E1E341779A54F0050CEA3 = { isa = PBXGroup; children = ( + E845CC6D1C20C09B00474C19 /* Default-568h@2x.png */, DA1C68C317E8969C0061F586 /* common.m */, DA1C68C217E8968C0061F586 /* common.h */, 96C8ED001779A88E00A30AF4 /* main.m */, @@ -350,6 +353,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E845CC6E1C20C09B00474C19 /* Default-568h@2x.png in Resources */, DA7AAA3B18E4683600A577E3 /* ic_annotation.png in Resources */, DA7AAA3C18E4683600A577E3 /* ic_print.png in Resources */, DA4C0623187B1EA200755D0D /* MuTextFieldController.xib in Resources */, diff --git a/platform/ios/MuPDF/Images.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/MuPDF/Images.xcassets/AppIcon.appiconset/Contents.json index 622ab4b2..c82a8a38 100644 --- a/platform/ios/MuPDF/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/platform/ios/MuPDF/Images.xcassets/AppIcon.appiconset/Contents.json @@ -10,11 +10,21 @@ "size" : "29x29", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "40x40", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, { "size" : "57x57", "idiom" : "iphone", @@ -91,6 +101,11 @@ "idiom" : "ipad", "filename" : "Icon-76@2x.png", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { diff --git a/platform/ios/MuPDF/Images.xcassets/LaunchImage.launchimage/Contents.json b/platform/ios/MuPDF/Images.xcassets/LaunchImage.launchimage/Contents.json index a2a7d966..5b841420 100644 --- a/platform/ios/MuPDF/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/platform/ios/MuPDF/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -2,36 +2,30 @@ "images" : [ { "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default.png", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", "scale" : "1x" }, { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x.png", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default-568h@2x.png", - "subtype" : "retina4", - "scale" : "2x" + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" }, { "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x.png", + "idiom" : "ipad", + "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "2x" }, { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default-568h@2x.png", + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", "minimum-system-version" : "7.0", - "subtype" : "retina4", "scale" : "2x" }, { @@ -41,16 +35,16 @@ "scale" : "1x" }, { - "orientation" : "portrait", + "orientation" : "landscape", "idiom" : "ipad", "extent" : "to-status-bar", - "scale" : "2x" + "scale" : "1x" }, { - "orientation" : "landscape", + "orientation" : "portrait", "idiom" : "ipad", "extent" : "to-status-bar", - "scale" : "1x" + "scale" : "2x" }, { "orientation" : "landscape", @@ -60,30 +54,36 @@ }, { "orientation" : "portrait", - "idiom" : "ipad", + "idiom" : "iphone", + "filename" : "Default@2x.png", "minimum-system-version" : "7.0", - "extent" : "full-screen", - "scale" : "1x" + "scale" : "2x" }, { "orientation" : "portrait", - "idiom" : "ipad", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", "minimum-system-version" : "7.0", - "extent" : "full-screen", + "subtype" : "retina4", "scale" : "2x" }, { - "orientation" : "landscape", - "idiom" : "ipad", - "minimum-system-version" : "7.0", - "extent" : "full-screen", + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default.png", "scale" : "1x" }, { - "orientation" : "landscape", - "idiom" : "ipad", - "minimum-system-version" : "7.0", - "extent" : "full-screen", + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "subtype" : "retina4", "scale" : "2x" } ], -- cgit v1.2.3