Support merging icon background color (#7625)

lib/android/app/src/main/java/com/reactnativenavigation/options/TopBarOptions.java

@@ -50,6 +50,8 @@ public static TopBarOptions parse(Context context, TypefaceLoader typefaceLoader
         options.leftButtonColor = ThemeColour.parse(context, json.optJSONObject("leftButtonColor"));
         options.leftButtonDisabledColor = ThemeColour.parse(context, json.optJSONObject("leftButtonDisabledColor"));
         options.rightButtonDisabledColor = ThemeColour.parse(context, json.optJSONObject("rightButtonDisabledColor"));
+        options.leftButtonBackgroundColor = ThemeColour.parse(context, json.optJSONObject("leftButtonBackgroundColor"));
+        options.rightButtonBackgroundColor = ThemeColour.parse(context, json.optJSONObject("rightButtonBackgroundColor"));
 
         options.validate();
         return options;
@@ -76,6 +78,8 @@ public static TopBarOptions parse(Context context, TypefaceLoader typefaceLoader
     public ThemeColour leftButtonColor = new NullThemeColour();
     public ThemeColour rightButtonDisabledColor = new NullThemeColour();
     public ThemeColour leftButtonDisabledColor = new NullThemeColour();
+    public ThemeColour rightButtonBackgroundColor = new NullThemeColour();
+    public ThemeColour leftButtonBackgroundColor = new NullThemeColour();
 
     public TopBarOptions copy() {
         TopBarOptions result = new TopBarOptions();
@@ -94,6 +98,8 @@ void mergeWith(final TopBarOptions other) {
         if (other.leftButtonColor.hasValue()) leftButtonColor = other.leftButtonColor;
         if (other.rightButtonDisabledColor.hasValue()) rightButtonDisabledColor = other.rightButtonDisabledColor;
         if (other.leftButtonDisabledColor.hasValue()) leftButtonDisabledColor = other.leftButtonDisabledColor;
+        if (other.rightButtonBackgroundColor.hasValue()) rightButtonBackgroundColor = other.rightButtonBackgroundColor;
+        if (other.leftButtonBackgroundColor.hasValue()) rightButtonBackgroundColor = other.rightButtonBackgroundColor;
 
         if (other.testId.hasValue()) testId = other.testId;
         if (other.visible.hasValue()) visible = other.visible;
@@ -122,6 +128,8 @@ public TopBarOptions mergeWithDefault(TopBarOptions defaultOptions) {
         if (!leftButtonColor.hasValue()) leftButtonColor = defaultOptions.leftButtonColor;
         if (!rightButtonDisabledColor.hasValue()) rightButtonDisabledColor = defaultOptions.rightButtonDisabledColor;
         if (!leftButtonDisabledColor.hasValue()) leftButtonDisabledColor = defaultOptions.leftButtonDisabledColor;
+        if (!rightButtonBackgroundColor.hasValue()) rightButtonBackgroundColor = defaultOptions.rightButtonBackgroundColor;
+        if (!leftButtonBackgroundColor.hasValue()) rightButtonBackgroundColor = defaultOptions.rightButtonBackgroundColor;
 
         if (!visible.hasValue()) visible = defaultOptions.visible;
         if (!animate.hasValue()) animate = defaultOptions.animate;

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackPresenter.java

@@ -458,12 +458,12 @@ private void mergeOrientation(OrientationOptions orientationOptions) {
     private void mergeButtons(TopBarOptions options, TopBarOptions optionsToMerge, View child, StackController stack) {
         mergeRightButtons(options, optionsToMerge.buttons, child);
         mergeLeftButton(options, optionsToMerge.buttons, child);
-        mergeLeftButtonsColor(child, optionsToMerge.leftButtonColor, optionsToMerge.leftButtonDisabledColor);
-        mergeRightButtonsColor(child, optionsToMerge.rightButtonColor, optionsToMerge.rightButtonDisabledColor);
+        mergeLeftButtonsColor(child, optionsToMerge.leftButtonColor, optionsToMerge.leftButtonDisabledColor, optionsToMerge.leftButtonBackgroundColor);
+        mergeRightButtonsColor(child, optionsToMerge.rightButtonColor, optionsToMerge.rightButtonDisabledColor, optionsToMerge.rightButtonBackgroundColor);
         mergeBackButton(optionsToMerge.buttons, stack);
     }
 
-    private void mergeLeftButtonsColor(View child, ThemeColour color, ThemeColour disabledColor) {
+    private void mergeLeftButtonsColor(View child, ThemeColour color, ThemeColour disabledColor, ThemeColour backgroundColor) {
         if (color.hasValue() || disabledColor.hasValue()) {
             Map<String, ButtonController> stringButtonControllerMap = componentLeftButtons.get(child);
             if (stringButtonControllerMap != null) {
@@ -474,12 +474,15 @@ private void mergeLeftButtonsColor(View child, ThemeColour color, ThemeColour di
                     if (disabledColor.hasValue()) {
                         btnController.applyDisabledColor(topBarController.getView().getLeftButtonBar(), disabledColor);
                     }
+                    if (backgroundColor.hasValue()) {
+                        btnController.applyBackgroundColor(topBarController.getView().getLeftButtonBar(), backgroundColor);
+                    }
                 });
             }
         }
     }
 
-    private void mergeRightButtonsColor(View child, ThemeColour color, ThemeColour disabledColor) {
+    private void mergeRightButtonsColor(View child, ThemeColour color, ThemeColour disabledColor, ThemeColour backgroundColor) {
         if (color.hasValue() || disabledColor.hasValue()) {
             Map<String, ButtonController> stringButtonControllerMap = componentRightButtons.get(child);
             if (stringButtonControllerMap != null) {
@@ -490,6 +493,9 @@ private void mergeRightButtonsColor(View child, ThemeColour color, ThemeColour d
                     if (disabledColor.hasValue()) {
                         btnController.applyDisabledColor(topBarController.getView().getRightButtonBar(), disabledColor);
                     }
+                    if (backgroundColor.hasValue()) {
+                        btnController.applyBackgroundColor(topBarController.getView().getRightButtonBar(), backgroundColor);
+                    }
                 });
             }
         }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonController.kt

@@ -81,6 +81,8 @@ open class ButtonController(activity: Activity,
 
     open fun applyDisabledColor(toolbar: Toolbar, disabledColour: ThemeColour) = this.menuItem?.let { presenter.applyDisabledColor(toolbar, it, disabledColour) }
 
+    open fun applyBackgroundColor(toolbar: Toolbar, color: ThemeColour) = this.menuItem?.let { presenter.applyBackgroundColor(toolbar, it, color) }
+
     fun addToMenu(buttonBar: ButtonBar, order: Int) {
         if (button.component.hasValue() && buttonBar.containsButton(menuItem, order)) return
         buttonBar.menu.removeItem(button.intId)

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt

@@ -71,6 +71,11 @@ open class ButtonPresenter(private val context: Context, private val button: But
         }
     }
 
+    fun applyBackgroundColor(toolbar: Toolbar, menuItem: MenuItem, color: ThemeColour) {
+        button.iconBackground.color = color
+        applyIcon(menuItem)
+    }
+
     private fun applyAccessibilityLabel(menuItem: MenuItem) {
         if (button.accessibilityLabel.hasValue()) {
             if (button.component.hasValue()) {

lib/android/app/src/test/java/com/reactnativenavigation/utils/ButtonPresenterTest.java

@@ -117,6 +117,25 @@ public void applyColor_shouldChangeColor() {
         assertThat(findButtonView().getCurrentTextColor()).isEqualTo(Color.RED);
     }
 
+    @Test
+    public void applyBackgroundColor_shouldChangeBackgroundColor() {
+        IconBackgroundDrawable mockD = mock(IconBackgroundDrawable.class);
+        initUUt(ImageLoaderMock.mock(mockD));
+        button.enabled = new Bool(true);
+        button.icon = new Text("icon");
+        button.color = new ThemeColour(new Colour(Color.RED), new Colour(Color.RED));
+        IconBackgroundOptions iconBackground = new IconBackgroundOptions();
+        iconBackground.color = new ThemeColour(new Colour(Color.GREEN),new Colour(Color.GREEN));
+        button.iconBackground = iconBackground;
+        MenuItem menuItem = spy(addMenuButton());
+        uut.applyOptions(titleBar, menuItem, buttonController::getView);
+
+        assertThat(((IconBackgroundDrawable)menuItem.getIcon()).getBackgroundColor()).isEqualTo(Color.GREEN);
+
+        uut.applyBackgroundColor(titleBar, menuItem, new ThemeColour(new Colour(Color.BLACK),new Colour(Color.BLACK)));
+        assertThat(((IconBackgroundDrawable)menuItem.getIcon()).getBackgroundColor()).isEqualTo(Color.BLACK);
+    }
+
     @Test
     public void applyOptions_shouldChangeIconColorTint() {
         IconBackgroundDrawable mockD = mock(IconBackgroundDrawable.class);

lib/ios/RNNButtonOptions.h

@@ -25,12 +25,14 @@
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions;
 
-- (UIColor *)resolveColor;
+- (Color *)resolveColor;
 
 - (RNNButtonOptions *)withDefaultColor:(Color *)color disabledColor:(Color *)disabledColor;
 
 - (BOOL)shouldCreateCustomView;
 
 - (BOOL)isEnabled;
 
+- (UIControlState)state;
+
 @end

lib/ios/RNNButtonOptions.m

@@ -93,11 +93,11 @@ - (BOOL)isEnabled {
     return [self.enabled withDefault:YES];
 }
 
-- (UIColor *)resolveColor {
+- (Color *)resolveColor {
     if (![_enabled withDefault:YES] && _disabledColor.hasValue)
-        return _disabledColor.get;
+        return _disabledColor;
     else
-        return [_color withDefault:nil];
+        return _color;
 }
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions {
@@ -116,4 +116,8 @@ - (RNNButtonOptions *)withDefaultColor:(Color *)color disabledColor:(Color *)dis
     return self;
 }
 
+- (UIControlState)state {
+    return self.isEnabled ? UIControlStateNormal : UIControlStateDisabled;
+}
+
 @end

lib/ios/RNNButtonsPresenter.h

@@ -20,9 +20,13 @@
      defaultDisabledColor:(Color *)defaultDisabledColor
                  animated:(BOOL)animated;
 
-- (void)applyLeftButtonsColor:(UIColor *)color;
+- (void)applyLeftButtonsColor:(Color *)color;
 
-- (void)applyRightButtonsColor:(UIColor *)color;
+- (void)applyRightButtonsColor:(Color *)color;
+
+- (void)applyLeftButtonsBackgroundColor:(Color *)color;
+
+- (void)applyRightButtonsBackgroundColor:(Color *)color;
 
 - (void)componentWillAppear;
 

lib/ios/RNNButtonsPresenter.m

@@ -47,15 +47,27 @@ - (void)applyRightButtons:(NSArray<RNNButtonOptions *> *)rightButtons
         defaultDisabledColor:defaultDisabledColor];
 }
 
-- (void)applyLeftButtonsColor:(UIColor *)color {
+- (void)applyLeftButtonsColor:(Color *)color {
     for (RNNUIBarButtonItem *button in self.viewController.navigationItem.leftBarButtonItems) {
-        [button applyColor:color];
+        [button mergeColor:color];
     }
 }
 
-- (void)applyRightButtonsColor:(UIColor *)color {
+- (void)applyRightButtonsColor:(Color *)color {
     for (RNNUIBarButtonItem *button in self.viewController.navigationItem.rightBarButtonItems) {
-        [button applyColor:color];
+        [button mergeColor:color];
+    }
+}
+
+- (void)applyRightButtonsBackgroundColor:(Color *)color {
+    for (RNNUIBarButtonItem *button in self.viewController.navigationItem.rightBarButtonItems) {
+        [button mergeBackgroundColor:color];
+    }
+}
+
+- (void)applyLeftButtonsBackgroundColor:(Color *)color {
+    for (RNNUIBarButtonItem *button in self.viewController.navigationItem.leftBarButtonItems) {
+        [button mergeBackgroundColor:color];
     }
 }
 

lib/ios/RNNComponentPresenter.m

@@ -209,11 +209,19 @@ - (void)mergeOptions:(RNNNavigationOptions *)mergeOptions
     }
 
     if (mergeOptions.topBar.leftButtonColor.hasValue) {
-        [_buttonsPresenter applyLeftButtonsColor:mergeOptions.topBar.leftButtonColor.get];
+        [_buttonsPresenter applyLeftButtonsColor:mergeOptions.topBar.leftButtonColor];
     }
 
     if (mergeOptions.topBar.rightButtonColor.hasValue) {
-        [_buttonsPresenter applyRightButtonsColor:mergeOptions.topBar.rightButtonColor.get];
+        [_buttonsPresenter applyRightButtonsColor:mergeOptions.topBar.rightButtonColor];
+    }
+
+    if (mergeOptions.topBar.rightButtonBackgroundColor.hasValue) {
+        [_buttonsPresenter applyRightButtonsBackgroundColor:mergeOptions.topBar.rightButtonBackgroundColor];
+    }
+
+    if (mergeOptions.topBar.leftButtonBackgroundColor.hasValue) {
+        [_buttonsPresenter applyLeftButtonsBackgroundColor:mergeOptions.topBar.leftButtonBackgroundColor];
     }
 
     if (mergeOptions.overlay.interceptTouchOutside.hasValue) {

lib/ios/RNNIconDrawer.m

@@ -29,7 +29,7 @@ - (UIImage *)draw:(UIImage *)image
     UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
 
-    return [newImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    return newImage;
 }
 
 @end

lib/ios/RNNTitleViewHelper.h

@@ -8,6 +8,10 @@
 
 @property(nonatomic, strong) UILabel *subtitleLabel;
 
+- (void)setTitleColor:(UIColor *)color;
+
+- (void)setSubtitleColor:(UIColor *)color;
+
 @end
 
 @interface RNNTitleViewHelper : NSObject
@@ -21,4 +25,8 @@
 
 - (void)setup;
 
+- (void)setTitleColor:(UIColor *)color;
+
+- (void)setSubtitleColor:(UIColor *)color;
+
 @end

lib/ios/RNNTitleViewHelper.m

@@ -16,6 +16,14 @@ - (void)layoutSubviews {
                                         self.frame.size.width, _subtitleLabel.frame.size.height)];
 }
 
+- (void)setTitleColor:(UIColor *)color {
+    _titleLabel.textColor = color;
+}
+
+- (void)setSubtitleColor:(UIColor *)color {
+    _subtitleLabel.textColor = color;
+}
+
 @end
 
 @interface RNNTitleViewHelper ()
@@ -170,4 +178,12 @@ - (UILabel *)setupTitle {
     return titleLabel;
 }
 
+- (void)setTitleColor:(UIColor *)color {
+    [_titleView setTitleColor:color];
+}
+
+- (void)setSubtitleColor:(UIColor *)color {
+    [_titleView setSubtitleColor:color];
+}
+
 @end

lib/ios/RNNTopBarOptions.h

@@ -20,6 +20,8 @@
 @property(nonatomic, strong) Color *rightButtonColor;
 @property(nonatomic, strong) Color *leftButtonDisabledColor;
 @property(nonatomic, strong) Color *rightButtonDisabledColor;
+@property(nonatomic, strong) Color *leftButtonBackgroundColor;
+@property(nonatomic, strong) Color *rightButtonBackgroundColor;
 @property(nonatomic, strong) Bool *drawBehind;
 @property(nonatomic, strong) Bool *noBorder;
 @property(nonatomic, strong) Color *borderColor;

lib/ios/RNNTopBarOptions.m

@@ -14,6 +14,8 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
     self.rightButtonColor = [ColorParser parse:dict key:@"rightButtonColor"];
     self.leftButtonDisabledColor = [ColorParser parse:dict key:@"leftButtonDisabledColor"];
     self.rightButtonDisabledColor = [ColorParser parse:dict key:@"rightButtonDisabledColor"];
+    self.leftButtonBackgroundColor = [ColorParser parse:dict key:@"leftButtonBackgroundColor"];
+    self.rightButtonBackgroundColor = [ColorParser parse:dict key:@"rightButtonBackgroundColor"];
     self.drawBehind = [BoolParser parse:dict key:@"drawBehind"];
     self.noBorder = [BoolParser parse:dict key:@"noBorder"];
     self.borderColor = [ColorParser parse:dict key:@"borderColor"];
@@ -63,6 +65,10 @@ - (void)mergeOptions:(RNNTopBarOptions *)options {
         self.leftButtonDisabledColor = options.leftButtonDisabledColor;
     if (options.rightButtonDisabledColor.hasValue)
         self.rightButtonDisabledColor = options.rightButtonDisabledColor;
+    if (options.leftButtonBackgroundColor.hasValue)
+        self.leftButtonBackgroundColor = options.leftButtonBackgroundColor;
+    if (options.rightButtonBackgroundColor.hasValue)
+        self.rightButtonBackgroundColor = options.rightButtonBackgroundColor;
     if (options.drawBehind.hasValue)
         self.drawBehind = options.drawBehind;
     if (options.noBorder.hasValue)

lib/ios/RNNUIBarButtonItem.h

@@ -26,7 +26,8 @@ typedef void (^RNNButtonPressCallback)(NSString *buttonId);
 - (instancetype)initWithSystemItem:(RNNButtonOptions *)buttonOptions
                            onPress:(RNNButtonPressCallback)onPress;
 
-- (void)applyColor:(UIColor *)color;
+- (void)mergeColor:(Color *)color;
+- (void)mergeBackgroundColor:(Color *)color;
 
 - (void)notifyWillAppear;
 - (void)notifyDidAppear;