[CB-4355] Splashscreen plugin handles options incorrectly (the settings key is specified with upper case chars)
This commit is contained in:
parent
c9b85f18f2
commit
33f353d2e9
@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
- (void)pageDidLoad
|
- (void)pageDidLoad
|
||||||
{
|
{
|
||||||
id autoHideSplashScreenValue = [self.commandDelegate.settings objectForKey:@"AutoHideSplashScreen"];
|
id autoHideSplashScreenValue = [self.commandDelegate.settings objectForKey:[@"AutoHideSplashScreen" lowercaseString]];
|
||||||
|
|
||||||
// if value is missing, default to yes
|
// if value is missing, default to yes
|
||||||
if ((autoHideSplashScreenValue == nil) || [autoHideSplashScreenValue boolValue]) {
|
if ((autoHideSplashScreenValue == nil) || [autoHideSplashScreenValue boolValue]) {
|
||||||
@ -65,7 +65,7 @@
|
|||||||
* gray = UIActivityIndicatorViewStyleGray
|
* gray = UIActivityIndicatorViewStyleGray
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
NSString* topActivityIndicator = [self.commandDelegate.settings objectForKey:@"TopActivityIndicator"];
|
NSString* topActivityIndicator = [self.commandDelegate.settings objectForKey:[@"TopActivityIndicator" lowercaseString]];
|
||||||
UIActivityIndicatorViewStyle topActivityIndicatorStyle = UIActivityIndicatorViewStyleGray;
|
UIActivityIndicatorViewStyle topActivityIndicatorStyle = UIActivityIndicatorViewStyleGray;
|
||||||
|
|
||||||
if ([topActivityIndicator isEqualToString:@"whiteLarge"]) {
|
if ([topActivityIndicator isEqualToString:@"whiteLarge"]) {
|
||||||
@ -88,7 +88,7 @@
|
|||||||
_imageView = [[UIImageView alloc] init];
|
_imageView = [[UIImageView alloc] init];
|
||||||
[parentView addSubview:_imageView];
|
[parentView addSubview:_imageView];
|
||||||
|
|
||||||
id showSplashScreenSpinnerValue = [self.commandDelegate.settings objectForKey:@"ShowSplashScreenSpinner"];
|
id showSplashScreenSpinnerValue = [self.commandDelegate.settings objectForKey:[@"ShowSplashScreenSpinner" lowercaseString]];
|
||||||
// backwards compatibility - if key is missing, default to true
|
// backwards compatibility - if key is missing, default to true
|
||||||
if ((showSplashScreenSpinnerValue == nil) || [showSplashScreenSpinnerValue boolValue]) {
|
if ((showSplashScreenSpinnerValue == nil) || [showSplashScreenSpinnerValue boolValue]) {
|
||||||
[parentView addSubview:_activityView];
|
[parentView addSubview:_activityView];
|
||||||
@ -196,8 +196,8 @@
|
|||||||
}
|
}
|
||||||
_visible = visible;
|
_visible = visible;
|
||||||
|
|
||||||
id fadeSplashScreenValue = [self.commandDelegate.settings objectForKey:@"FadeSplashScreen"];
|
id fadeSplashScreenValue = [self.commandDelegate.settings objectForKey:[@"FadeSplashScreen" lowercaseString]];
|
||||||
id fadeSplashScreenDuration = [self.commandDelegate.settings objectForKey:@"FadeSplashScreenDuration"];
|
id fadeSplashScreenDuration = [self.commandDelegate.settings objectForKey:[@"FadeSplashScreenDuration" lowercaseString]];
|
||||||
|
|
||||||
float fadeDuration = fadeSplashScreenDuration == nil ? kSplashScreenDurationDefault : [fadeSplashScreenDuration floatValue];
|
float fadeDuration = fadeSplashScreenDuration == nil ? kSplashScreenDurationDefault : [fadeSplashScreenDuration floatValue];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user