From 1ce1a76d911acfd78b3c33e94706171d09fb0676 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 20 Jan 2016 17:30:17 +0100 Subject: [PATCH] launchscreen: readd xib file to fix iPhone6+ screen dimensions If we dont use a launchsceen file, iOS seems to upscale iPhone6 resolution to match iPhone6+ resolution, overridding constraints and all. So even if launchscreen file is bad (no localization..), we have to use it. --- Classes/LaunchScreen.xib | 80 ++++++++++++++++++++++++++++++ linphone-Info.plist | 2 + linphone.xcodeproj/project.pbxproj | 4 ++ 3 files changed, 86 insertions(+) create mode 100644 Classes/LaunchScreen.xib diff --git a/Classes/LaunchScreen.xib b/Classes/LaunchScreen.xib new file mode 100644 index 000000000..a5c5107e4 --- /dev/null +++ b/Classes/LaunchScreen.xib @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linphone-Info.plist b/linphone-Info.plist index 7c7b869a2..bd82a20e2 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -66,6 +66,8 @@ UILaunchImageFile~iphone linphone_splashscreen + UILaunchStoryboardName + LaunchScreen UIMainStoryboardFile MainStoryboard UIRequiredDeviceCapabilities diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index ffb4c3cf2..1d85cb2d3 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -547,6 +547,7 @@ 63E279E71C4F9A2500D332AE /* test_failed.png in Resources */ = {isa = PBXBuildFile; fileRef = 63E279E41C4F9A2500D332AE /* test_failed.png */; }; 63E279E81C4F9A2500D332AE /* test_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = 63E279E51C4F9A2500D332AE /* test_inprogress.png */; }; 63E279E91C4F9A2500D332AE /* test_passed.png in Resources */ = {isa = PBXBuildFile; fileRef = 63E279E61C4F9A2500D332AE /* test_passed.png */; }; + 63E27A321C4FECD000D332AE /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63E27A311C4FECD000D332AE /* LaunchScreen.xib */; }; 63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */; }; 63EEE3FF1BBA9AC00087D3AF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A9B7E18C0D9C900C4D7FE /* libcunit.a */; }; 63EEE4001BBA9AC00087D3AF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0BB8C0F193623F200974404 /* liblinphonetester.a */; }; @@ -1363,6 +1364,7 @@ 63E279E41C4F9A2500D332AE /* test_failed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_failed.png; path = LiblinphoneTester/test_failed.png; sourceTree = SOURCE_ROOT; }; 63E279E51C4F9A2500D332AE /* test_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_inprogress.png; path = LiblinphoneTester/test_inprogress.png; sourceTree = SOURCE_ROOT; }; 63E279E61C4F9A2500D332AE /* test_passed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_passed.png; path = LiblinphoneTester/test_passed.png; sourceTree = SOURCE_ROOT; }; + 63E27A311C4FECD000D332AE /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = ""; }; 63E59A3D1ADE6ECB00646FB3 /* InAppProductsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InAppProductsManager.h; sourceTree = ""; }; 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InAppProductsManager.m; sourceTree = ""; }; 63EA4C941B50189D00922857 /* libmswebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmswebrtc.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmswebrtc.a"; sourceTree = ""; }; @@ -1729,6 +1731,7 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + 63E27A311C4FECD000D332AE /* LaunchScreen.xib */, 22E0A81D111C44E100B04932 /* AboutView.h */, 22E0A81C111C44E100B04932 /* AboutView.m */, 636316D31A1DEBCB0009B839 /* AboutView.xib */, @@ -3046,6 +3049,7 @@ 63AADC011B6A0FF200AA16FD /* assistant_linphone_existing.rc in Resources */, 636B98171C298401003BA37C /* call_quality_indicator_2@2x.png in Resources */, 636B98021C298401003BA37C /* call_audio_start_disabled.png in Resources */, + 63E27A321C4FECD000D332AE /* LaunchScreen.xib in Resources */, 636B985D1C298401003BA37C /* color_C.png in Resources */, 636316D41A1DEC650009B839 /* SettingsView.xib in Resources */, 636B98131C298401003BA37C /* call_quality_indicator_0@2x.png in Resources */,