Revert "UI Tweaks for toolbars and icons (#8)"

katie-propel · katie-propel · commit 37ca5925e92c · 2025-03-31T19:36:28.000-04:00
This reverts commit e81d69f.
diff --git a/README.md b/README.md
@@ -106,8 +106,6 @@ instance, or the system browser.
   - **bannertextcolor**: Set to a valid hext color string.
   - **bannertextsize**: Set to an integer.
   - **pagetitleheader**: Set to `yes` or `no` to diplay the current page title. If `yes`, a header with the current page title and close button is added. A reload button replaces the close button in the toolbar.
-  - **toolbarcolor**: set as a valid hex color string, for example: `#00ff00`, to change from the default color of the toolbar. Only applicable if toolbar is not disabled and effects all toolbars.
-  - **toolbartextcolor**: set to a valid hex color string and it will change the color of text on the toolbar from default.
 
   Android supports these additional options:
 
@@ -126,6 +124,7 @@ instance, or the system browser.
   - **hidenavigationbuttons**: set to `yes` to hide the navigation buttons on the location toolbar, only has effect if user has location set to `yes`. The default value is `no`.
   - **hideurlbar**: set to `yes` to hide the url bar on the location toolbar, only has effect if user has location set to `yes`. The default value is `no`.
   - **navigationbuttoncolor**: set to a valid hex color string, for example: `#00ff00`, and it will change the color of both navigation buttons from default. Only has effect if user has location set to `yes` and not hidenavigationbuttons set to `yes`.
+  - **toolbarcolor**: set to a valid hex color string, for example: `#00ff00`, and it will change the color the toolbar from default. Only has effect if user has location set to `yes`.
   - **lefttoright**: Set to `yes` to swap positions of the navigation buttons and the close button. Specifically, navigation buttons go to the right and close button to the left. Default value is `no`.
   - **zoom**: set to `yes` to show Android browser's zoom controls, set to `no` to hide them. Default value is `yes`.
   - **mediaPlaybackRequiresUserAction**: Set to `yes` to prevent HTML5 audio or video from autoplaying (defaults to `no`).
@@ -146,6 +145,7 @@ instance, or the system browser.
   - **hidenavigationbuttons**: set to `yes` or `no` to turn the toolbar navigation buttons on or off (defaults to `no`). Only applicable if toolbar is not disabled.
   - **navigationbuttoncolor**: set as a valid hex color string, for example: `#00ff00`, to change from the default color. Only applicable if navigation buttons are visible.
   - **toolbar**: set to `yes` or `no` to turn the toolbar on or off for the InAppBrowser (defaults to `yes`)
+  - **toolbarcolor**: set as a valid hex color string, for example: `#00ff00`, to change from the default color of the toolbar. Only applicable if toolbar is not disabled.
   - **toolbartranslucent**: set to `yes` or `no` to make the toolbar translucent(semi-transparent) (defaults to `yes`). Only applicable if toolbar is not disabled.
   - **lefttoright**: Set to `yes` to swap positions of the navigation buttons and the close button. Specifically, close button goes to the right and navigation buttons to the left.
   - **enableViewportScale**: Set to `yes` or `no` to prevent viewport scaling through a meta tag (defaults to `no`).
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
@@ -112,7 +112,6 @@ public class InAppBrowser extends CordovaPlugin {
     private static final Boolean DEFAULT_HARDWARE_BACK = true;
     private static final String USER_WIDE_VIEW_PORT = "useWideViewPort";
     private static final String TOOLBAR_COLOR = "toolbarcolor";
-    private static final String TOOLBAR_TEXT_COLOR = "toolbartextcolor";
     private static final String CLOSE_BUTTON_CAPTION = "closebuttoncaption";
     private static final String CLOSE_BUTTON_COLOR = "closebuttoncolor";
     private static final String LEFT_TO_RIGHT = "lefttoright";
@@ -137,7 +136,6 @@ public class InAppBrowser extends CordovaPlugin {
     private static final List customizableOptions = Arrays.asList(
         CLOSE_BUTTON_CAPTION,
         TOOLBAR_COLOR,
-        TOOLBAR_TEXT_COLOR,
         NAVIGATION_COLOR,
         CLOSE_BUTTON_COLOR,
         FOOTER_COLOR,
@@ -166,7 +164,6 @@ public class InAppBrowser extends CordovaPlugin {
     private String closeButtonColor = "";
     private boolean leftToRight = false;
     private int toolbarColor = android.graphics.Color.LTGRAY;
-    private int toolbarTextColor = android.graphics.Color.LTGRAY;
     private boolean hideNavigationButtons = false;
     private String navigationButtonColor = "";
     private boolean hideUrlBar = false;
@@ -757,10 +754,6 @@ public String showWebPage(final String url, HashMap<String, String> features) {
             if (toolbarColorSet != null) {
                 toolbarColor = android.graphics.Color.parseColor(toolbarColorSet);
             }
-            String toolbarTextColorSet = features.get(TOOLBAR_TEXT_COLOR);
-            if (toolbarTextColorSet != null) {
-                toolbarTextColor = android.graphics.Color.parseColor(toolbarTextColorSet);
-            }
             String navigationButtonColorSet = features.get(NAVIGATION_COLOR);
             if (navigationButtonColorSet != null) {
                 navigationButtonColor = navigationButtonColorSet;
@@ -1012,7 +1005,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                 // Page title header layout
                 GradientDrawable pageTitleHeaderBorderBackground = new GradientDrawable();
                 pageTitleHeaderBorderBackground.setColor(toolbarColor);
-                pageTitleHeaderBorderBackground.setStroke(1, darkerColorForColor(toolbarColor));
+                pageTitleHeaderBorderBackground.setStroke(1, android.graphics.Color.parseColor("#E9E6E1"));
                 RelativeLayout pageTitleHeader = new RelativeLayout(cordova.getActivity());
                 if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
                     pageTitleHeader.setBackgroundDrawable(pageTitleHeaderBorderBackground);
@@ -1030,11 +1023,10 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                 pageTitleTextView.setLayoutParams(pageTitleTextViewLayoutParams);
                 pageTitleTextView.setText("Loading...");
                 pageTitleTextView.setTextSize(bannerTextSize);
-                pageTitleTextView.setTextColor(toolbarTextColor);
+                if (navigationButtonColor != "") pageTitleTextView.setTextColor(android.graphics.Color.parseColor(navigationButtonColor));
                 pageTitleTextView.setTypeface(null, Typeface.BOLD);
                 int lockResId = activityRes.getIdentifier("lock", "drawable", cordova.getActivity().getPackageName());
                 Drawable lockIcon = activityRes.getDrawable(lockResId);
-                lockIcon.setTint(toolbarTextColor);
                 pageTitleTextView.setCompoundDrawablesWithIntrinsicBounds(lockIcon, null, null, null);
                 pageTitleTextView.setCompoundDrawablePadding(this.dpToPixels(8));
                 pageTitleTextView.setGravity(Gravity.CENTER_VERTICAL);
@@ -1052,9 +1044,8 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                     _footerColor = android.graphics.Color.LTGRAY;
                 }
                 GradientDrawable footerBorderBackground = new GradientDrawable();
-                int footerBorderBackgroundColor = getShowPageTitleHeader() ? toolbarColor : _footerColor;
-                footerBorderBackground.setColor(footerBorderBackgroundColor);
-                footerBorderBackground.setStroke(1, darkerColorForColor(footerBorderBackgroundColor));
+                footerBorderBackground.setColor(getShowPageTitleHeader() ? toolbarColor : _footerColor);
+                footerBorderBackground.setStroke(1, android.graphics.Color.parseColor("#E9E6E1"));
                 RelativeLayout footer = new RelativeLayout(cordova.getActivity());
                 if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
                     footer.setBackgroundDrawable(footerBorderBackground);
@@ -1303,14 +1294,6 @@ private boolean sendBannerTappedEvent() {
         return false;
     }
 
-    private static int darkerColorForColor(int color) {
-        int a = Color.alpha(color);
-        return Color.argb(a,
-                Math.max(Color.red(color) - 51, 0),
-                Math.max(Color.green(color) - 51, 0),
-                Math.max(Color.blue(color) - 51, 0));
-    }
-
     /**
      * Receive File Data from File Chooser
      *
diff --git a/src/ios/CDVInAppBrowserOptions.h b/src/ios/CDVInAppBrowserOptions.h
@@ -28,7 +28,6 @@
 @property (nonatomic, assign) BOOL lefttoright;
 @property (nonatomic, copy) NSString* toolbarposition;
 @property (nonatomic, copy) NSString* toolbarcolor;
-@property (nonatomic, copy) NSString* toolbartextcolor;
 @property (nonatomic, assign) BOOL toolbartranslucent;
 @property (nonatomic, assign) BOOL hidenavigationbuttons;
 @property (nonatomic, copy) NSString* navigationbuttoncolor;
diff --git a/src/ios/CDVInAppBrowserOptions.m b/src/ios/CDVInAppBrowserOptions.m
@@ -43,7 +43,6 @@ - (id)init
         self.closebuttoncolor = nil;
         self.lefttoright = false;
         self.toolbarcolor = nil;
-        self.toolbartextcolor = nil;
         self.toolbartranslucent = YES;
         self.beforeload = @"";
 
diff --git a/src/ios/CDVWKInAppBrowser.m b/src/ios/CDVWKInAppBrowser.m
@@ -814,7 +814,7 @@ - (void)createViews
     self.bannerTextView.opaque = YES;
     self.bannerTextView.scrollEnabled = NO;
     self.bannerTextView.textAlignment = NSTextAlignmentLeft;
-    self.bannerTextView.textColor = _browserOptions.bannertextcolor != nil ? [self colorFromHexString:_browserOptions.bannertextcolor] : [UIColor labelColor];
+    self.bannerTextView.textColor = _browserOptions.bannertextcolor != nil ? [self colorFromHexString:_browserOptions.bannertextcolor] : [self colorFromHexString:@"#000000"];
     // NOTE: Edge format is top, left, bottom, right.
     self.bannerTextView.textContainerInset = UIEdgeInsetsMake(8, 5, 8, 5);
     self.bannerTextView.userInteractionEnabled = YES;
@@ -887,14 +887,17 @@ - (void)createViews
 
     self.pageTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.navigationItem.titleView.frame.origin.x, self.navigationItem.titleView.frame.origin.y, self.navigationItem.titleView.frame.size.width, self.navigationItem.titleView.frame.size.height)];
 
-    UIButton *backUIButton = [self createNavButton:@"chevron.backward" fallbackImageName:@"back" titleFallback:@"◄" action:@selector(goBack:) withDescription:@"back button"];
-    self.backButton = [[UIBarButtonItem alloc] initWithCustomView:backUIButton];
-
-    UIButton *forwardUIButton = [self createNavButton:@"chevron.forward" fallbackImageName:@"forward" titleFallback:@"►" action:@selector(goForward:) withDescription:@"forward button"];
+    UIButton *forwardUIButton = [self createButton:@"forward" titleFallback:@"►" action:@selector(goForward:) withDescription:@"forward button"];
     self.forwardButton = [[UIBarButtonItem alloc] initWithCustomView:forwardUIButton];
+    self.forwardButton.imageInsets = UIEdgeInsetsZero;
+
+    UIButton *backUIButton = [self createButton:@"back" titleFallback:@"◄" action:@selector(goBack:) withDescription:@"back button"];
+    self.backButton = [[UIBarButtonItem alloc] initWithCustomView:backUIButton];
+    self.backButton.imageInsets = UIEdgeInsetsZero;
 
-    UIButton *reloadUIButton = [self createNavButton:@"arrow.clockwise" fallbackImageName:@"reload" titleFallback:@"↻" action:@selector(doReload:) withDescription:@"reload button"];
+    UIButton *reloadUIButton = [self createButton:@"reload" titleFallback:@"↻" action:@selector(doReload:) withDescription:@"reload button"];
     self.reloadButton = [[UIBarButtonItem alloc] initWithCustomView:reloadUIButton];
+    self.reloadButton.imageInsets = UIEdgeInsetsZero;
 
     if (_browserOptions.pagetitleheader) {
         if (_browserOptions.hidenavigationbuttons) {
@@ -903,7 +906,7 @@ - (void)createViews
             [self.toolbar setItems:@[self.backButton, fixedSpaceButton, self.forwardButton, flexibleSpaceButton, self.reloadButton]];
         }
         UIView *lineView = [[UIView alloc] initWithFrame:CGRectMake(0, [_browserOptions.toolbarposition isEqualToString:kInAppBrowserToolbarBarPositionTop] ? self.toolbar.frame.size.height - 1 : 0, self.view.bounds.size.width, 1)];
-        lineView.backgroundColor = [self darkerColorForColor:self.toolbar.barTintColor];
+        lineView.backgroundColor = [self colorFromHexString:@"#E9E6E1"];
         [self.toolbar addSubview:lineView];
     } else {
         // Filter out Navigation Buttons if user requests so
@@ -990,11 +993,7 @@ - (void)showPageTitleHeader:(BOOL)show
 
         // Style the navigation bar
         UINavigationBarAppearance *appearance = [UINavigationBarAppearance new];
-        if (_browserOptions.toolbarcolor != nil) { // Set toolbar color if user sets it in options
-            appearance.backgroundColor = [self colorFromHexString:_browserOptions.toolbarcolor];
-        } else {
-            [appearance configureWithOpaqueBackground];
-        }
+        [appearance configureWithOpaqueBackground];
         navBar.standardAppearance = appearance;
         navBar.scrollEdgeAppearance = appearance;
 
@@ -1003,13 +1002,12 @@ - (void)showPageTitleHeader:(BOOL)show
         customTitleView.axis = UILayoutConstraintAxisHorizontal;
         customTitleView.distribution = UIStackViewDistributionEqualSpacing;
         customTitleView.alignment = UIStackViewAlignmentCenter;
-        UIColor *toolbarTextColorOrDefault = _browserOptions.toolbartextcolor != nil ? [self colorFromHexString:_browserOptions.toolbartextcolor] : [UIColor labelColor];
-        UIImageView *lockIconView = [[UIImageView alloc] initWithImage:[self createSystemSymbolImage:@"lock.fill" fallbackImageName:@"lock" pointSize:12 withTintColor:toolbarTextColorOrDefault]];
+        customTitleView.spacing = 8;
+        UIImageView *lockIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"lock"]];
         self.pageTitleLabel.text = NSLocalizedString(@"Loading...", nil);
         [self.pageTitleLabel setFont:[UIFont boldSystemFontOfSize:16]];
         [self.pageTitleLabel sizeToFit];
         self.pageTitleLabel.textAlignment = NSTextAlignmentLeft;
-        self.pageTitleLabel.textColor = toolbarTextColorOrDefault;
         [customTitleView addArrangedSubview:lockIconView];
         [customTitleView addArrangedSubview:self.pageTitleLabel];
         self.navigationItem.titleView = customTitleView;
@@ -1242,18 +1240,6 @@ - (UIColor *)colorFromHexString:(NSString *)hexString {
     return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16)/255.0 green:((rgbValue & 0xFF00) >> 8)/255.0 blue:(rgbValue & 0xFF)/255.0 alpha:1.0];
 }
 
-// Helper function to return a slightly darker version of UIColor
-- (UIColor *)darkerColorForColor:(UIColor *)c
-{
-    CGFloat r, g, b, a;
-    if ([c getRed:&r green:&g blue:&b alpha:&a])
-        return [UIColor colorWithRed:MAX(r - 0.2, 0.0)
-                               green:MAX(g - 0.2, 0.0)
-                                blue:MAX(b - 0.2, 0.0)
-                               alpha:a];
-    return nil;
-}
-
 #pragma mark WKNavigationDelegate
 
 - (void)webView:(WKWebView *)theWebView didStartProvisionalNavigation:(WKNavigation *)navigation{
@@ -1372,49 +1358,34 @@ - (void)presentationControllerWillDismiss:(UIPresentationController *)presentati
     isExiting = TRUE;
 }
 
-- (UIImage*) createSystemSymbolImage:(NSString*)systemSymbolName fallbackImageName:(NSString*)fallbackImageName pointSize:(CGFloat)pointSize
-{
-    return [self createSystemSymbolImage:systemSymbolName fallbackImageName:fallbackImageName pointSize:pointSize withTintColor:[UIColor labelColor]];
-}
-
-// See https://developer.apple.com/design/human-interface-guidelines/sf-symbols#app-top
-- (UIImage*) createSystemSymbolImage:(NSString*)systemSymbolName fallbackImageName:(NSString*)fallbackImageName pointSize:(CGFloat)pointSize withTintColor:(UIColor*)color
-{
-    if (@available(iOS 13.0, *)) {
-        // At least iOS 13.0 which means we can use system symbol
-        UIImageSymbolConfiguration * configuration = [UIImageSymbolConfiguration configurationWithPointSize:pointSize];
-        return [[UIImage systemImageNamed:systemSymbolName withConfiguration:configuration] imageWithTintColor:color renderingMode:UIImageRenderingModeAlwaysOriginal];
-    } else {
-        // Use the fallback image for older versions of iOS
-        UIImage* buttonImage = [UIImage imageNamed:fallbackImageName];
-        if (!buttonImage) {
-            NSLog([@"createSystemSymbolImage - failed to load image" stringByAppendingString:fallbackImageName]);
-        }
-        return buttonImage;
-    }
-}
-
-- (UIButton*) createNavButton:(NSString*)systemSymbolName fallbackImageName:(NSString*)fallbackImageName titleFallback:(NSString*)titleFallback action:(SEL)action withDescription:(NSString*)description
+- (UIButton*) createButton:(NSString*)name titleFallback:(NSString*)titleFallback action:(SEL)action withDescription:(NSString*)description
 {
     UIButton* result = [UIButton buttonWithType:UIButtonTypeCustom];
     result.bounds = CGRectMake(0, 0, 30, 30);
 
-    // At least iOS 13.0 which means we can use system symbol
-    UIColor *color = _browserOptions.navigationbuttoncolor != nil ? [self colorFromHexString:_browserOptions.navigationbuttoncolor] : [UIColor labelColor];
-    UIImage *buttonImage = [self createSystemSymbolImage:systemSymbolName fallbackImageName:fallbackImageName pointSize:24 withTintColor:color];
+    UIImage *buttonImage = [UIImage imageNamed:name];
+    if (!buttonImage) {
+        NSLog([@"createButton - failed to load iamge" stringByAppendingString:name]);
+    }
 
-    NSString *fallbackImageNamePressed = [fallbackImageName stringByAppendingString:@"_light"];
-    UIImage *buttonImagePressed = [self createSystemSymbolImage:systemSymbolName fallbackImageName:fallbackImageNamePressed pointSize:24 withTintColor:[color colorWithAlphaComponent:0.9]];
+    NSString *pressedName = [name stringByAppendingString:@"_light"];
+    UIImage *buttonImagePressed = [UIImage imageNamed:pressedName];
+    if (!buttonImagePressed) {
+        NSLog([@"createButton - failed to load image" stringByAppendingString:pressedName]);
+    }
 
     if ((buttonImage) && (buttonImagePressed)) {
-        [result setImage:buttonImage forState:UIControlStateNormal];
         [result setImage:buttonImagePressed forState:UIControlStateHighlighted];
         result.adjustsImageWhenHighlighted = NO;
+
+        [result setImage:buttonImage forState:UIControlStateNormal];
     } else {
         [result setTitle:titleFallback forState:UIControlStateNormal];
         [result setTitle:titleFallback forState:UIControlStateHighlighted];
-        [result setTitleColor:color forState:UIControlStateNormal];
-        [result setTitleColor:color forState:UIControlStateHighlighted];
+        if (_browserOptions.navigationbuttoncolor != nil) {
+            [result setTitleColor:[self colorFromHexString:_browserOptions.navigationbuttoncolor] forState:UIControlStateNormal];
+            [result setTitleColor:[self colorFromHexString:_browserOptions.navigationbuttoncolor] forState:UIControlStateHighlighted];
+        }
     }
     [result addTarget:self action:action forControlEvents:UIControlEventTouchUpInside];
 
