CB-7041 ios: Fix image filename logic when setting the iPad splash screen
When running Cordova apps without orientation lock on iPads, the Splash Screen plugin didn't work properly. It would skip the iPad- specific splash screen logic, and just select the image named @"Default.png" (without adding the orientation suffix), and print the following messages in the console: WARNING: The splashscreen image named Default was not found Now, for iPads, the splash screen image is set by first looking at the position of the orientation lock, and if that is not set, it uses the calculated view orientation. close #19
This commit is contained in:
parent
6f23d8e828
commit
cd61952efc
@ -138,18 +138,22 @@
|
||||
|
||||
if (CDV_IsIPhone5()) {
|
||||
imageName = [imageName stringByAppendingString:@"-568h"];
|
||||
} else if (CDV_IsIPad() && isOrientationLocked) {
|
||||
switch (orientation) {
|
||||
case UIInterfaceOrientationLandscapeLeft:
|
||||
case UIInterfaceOrientationLandscapeRight:
|
||||
imageName = [imageName stringByAppendingString:@"-Landscape"];
|
||||
break;
|
||||
} else if (CDV_IsIPad()) {
|
||||
if (isOrientationLocked) {
|
||||
imageName = [imageName stringByAppendingString:(supportsLandscape ? @"-Landscape" : @"-Portrait")];
|
||||
} else {
|
||||
switch (orientation) {
|
||||
case UIInterfaceOrientationLandscapeLeft:
|
||||
case UIInterfaceOrientationLandscapeRight:
|
||||
imageName = [imageName stringByAppendingString:@"-Landscape"];
|
||||
break;
|
||||
|
||||
case UIInterfaceOrientationPortrait:
|
||||
case UIInterfaceOrientationPortraitUpsideDown:
|
||||
default:
|
||||
imageName = [imageName stringByAppendingString:@"-Portrait"];
|
||||
break;
|
||||
case UIInterfaceOrientationPortrait:
|
||||
case UIInterfaceOrientationPortraitUpsideDown:
|
||||
default:
|
||||
imageName = [imageName stringByAppendingString:@"-Portrait"];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user