Skip to content

Commit 59f1655

Browse files
committed
Expanded wwwImage to toolbar on iOS.
1 parent 5043d4a commit 59f1655

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

src/ios/CDVThemeableBrowser.m

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,9 +653,19 @@ - (void)createViews
653653
self.toolbar.userInteractionEnabled = YES;
654654
self.toolbar.backgroundColor = [CDVThemeableBrowserViewController colorFromRGBA:[self getStringFromDict:toolbarProps withKey:kThemeableBrowserPropColor withDefault:@"#ffffffff"]];
655655

656-
if (toolbarProps[kThemeableBrowserPropImage]) {
657-
UIImage *image = [UIImage imageNamed:toolbarProps[kThemeableBrowserPropImage]];
658-
self.toolbar.backgroundColor = [UIColor colorWithPatternImage:image];
656+
if (toolbarProps[kThemeableBrowserPropImage] || toolbarProps[kThemeableBrowserPropWwwImage]) {
657+
UIImage *image = [self getImage:toolbarProps[kThemeableBrowserPropImage]
658+
altPath:toolbarProps[kThemeableBrowserPropWwwImage]
659+
altDensity:[toolbarProps[kThemeableBrowserPropWwwImageDensity] doubleValue]];
660+
661+
if (image) {
662+
self.toolbar.backgroundColor = [UIColor colorWithPatternImage:image];
663+
} else {
664+
[self.navigationDelegate emitError:kThemeableBrowserEmitCodeLoadFail
665+
withMessage:[NSString stringWithFormat:@"Image for toolbar, %@, failed to load.",
666+
toolbarProps[kThemeableBrowserPropImage]
667+
? toolbarProps[kThemeableBrowserPropImage] : toolbarProps[kThemeableBrowserPropWwwImage]]];
668+
}
659669
}
660670

661671
CGFloat labelInset = 5.0;

0 commit comments

Comments
 (0)