public/cordova-plugin-splashscreen
public/cordova-plugin-splashscreen
8
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CB-10263 Fix splashscreen plugin filenames for Asset Catalog

Browse Source 
Github: close #69
This commit is contained in:
daserge 2015-12-26 19:43:58 +03:00
parent 1e67606c60
commit d7841c7ec9
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ios/CDVSplashScreen.h
View File

@ -23,6 +23,7 @@
typedef struct { typedef struct {
BOOL iPhone; BOOL iPhone;
BOOL iPad; BOOL iPad;
BOOL iPhone4;
BOOL iPhone5; BOOL iPhone5;
BOOL iPhone6; BOOL iPhone6;
BOOL iPhone6Plus; BOOL iPhone6Plus;

19
src/ios/CDVSplashScreen.m
View File

@ -156,6 +156,7 @@
device.iPad = (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad); device.iPad = (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad);
device.iPhone = (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone); device.iPhone = (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone);
device.retina = ([mainScreen scale] == 2.0); device.retina = ([mainScreen scale] == 2.0);
device.iPhone4 = (device.iPhone && limit == 480.0);
device.iPhone5 = (device.iPhone && limit == 568.0); device.iPhone5 = (device.iPhone && limit == 568.0);
// note these below is not a true device detect, for example if you are on an // note these below is not a true device detect, for example if you are on an
// iPhone 6/6+ but the app is scaled it will prob set iPhone5 as true, but // iPhone 6/6+ but the app is scaled it will prob set iPhone5 as true, but
@ -187,7 +188,23 @@
{ {
imageName = @"Default"; imageName = @"Default";
} }
// Add Asset Catalog specific prefixes
if ([imageName isEqualToString:@"LaunchImage"])
{
if (device.iPhone4 || device.iPhone5 || device.iPad) {
imageName = [imageName stringByAppendingString:@"-700"];
} else if(device.iPhone6) {
imageName = [imageName stringByAppendingString:@"-800"];
} else if(device.iPhone6Plus) {
imageName = [imageName stringByAppendingString:@"-800"];
if (currentOrientation == UIInterfaceOrientationPortrait || currentOrientation == UIInterfaceOrientationPortraitUpsideDown)
{
imageName = [imageName stringByAppendingString:@"-Portrait"];
}
}
}
if (device.iPhone5) if (device.iPhone5)
{ // does not support landscape { // does not support landscape
imageName = [imageName stringByAppendingString:@"-568h"]; imageName = [imageName stringByAppendingString:@"-568h"];