fix(ios): set tintcolor of UIBarButtonItem (#12278)

Fixes TIMOB-28211
tidev · Nov 20, 2020 · 66e8d37 · 66e8d37
1 parent 83bbfef
commit 66e8d37
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 0 deletions.
diff --git a/iphone/Classes/TiUINavBarButton.m b/iphone/Classes/TiUINavBarButton.m
@@ -119,6 +119,7 @@ - (id)initWithProxy:(TiUIButtonProxy *)proxy_
       self = [super initWithImage:theimage style:[self style:proxy_] target:self action:@selector(clicked:)];
     } else {
       self = [super initWithTitle:[self title:proxy_] style:[self style:proxy_] target:self action:@selector(clicked:)];
+      self.tintColor = [proxy_ valueForKey:@"color"] ? [TiUtils colorValue:[proxy_ valueForKey:@"color"]].color : [TiUtils colorValue:[proxy_ valueForKey:@"tintColor"]].color;
     }
   }
   proxy = proxy_; // Don't retain

diff --git a/...urces/ios/snapshots/navButton_left_defaultColor_right_greenColor_2x_400x400.png b/...urces/ios/snapshots/navButton_left_defaultColor_right_greenColor_2x_400x400.png
diff --git a/...urces/ios/snapshots/navButton_left_defaultColor_right_greenColor_3x_400x400.png b/...urces/ios/snapshots/navButton_left_defaultColor_right_greenColor_3x_400x400.png
diff --git a/...Resources/ios/snapshots/navButton_left_redColor_right_greenColor_2x_400x400.png b/...Resources/ios/snapshots/navButton_left_redColor_right_greenColor_2x_400x400.png
diff --git a/...Resources/ios/snapshots/navButton_left_redColor_right_greenColor_3x_400x400.png b/...Resources/ios/snapshots/navButton_left_redColor_right_greenColor_3x_400x400.png
diff --git a/tests/Resources/ti.ui.window.test.js b/tests/Resources/ti.ui.window.test.js
@@ -96,6 +96,147 @@ describe('Titanium.UI.Window', function () {
 		});
 	});
 
+	it.ios('.leftNavButtons and .rightNavButtons', finish => {
+		const rightButton1 = Ti.UI.createButton({
+			title: 'Right1',
+			color: 'green',
+		});
+
+		const rightButton2 = Ti.UI.createButton({
+			title: 'Right2',
+			color: 'green',
+		});
+
+		const leftButton = Ti.UI.createButton({
+			title: 'Left',
+			color: 'blue'
+		});
+
+		const rootWindow = Ti.UI.createWindow({
+			backgroundColor: 'white',
+			leftNavButtons: [ leftButton ],
+			rightNavButtons: [ rightButton1, rightButton2 ],
+		});
+
+		win = Ti.UI.createNavigationWindow({
+			window: rootWindow
+		});
+
+		win.open();
+
+		rootWindow.addEventListener('focus', function focus() {
+			rootWindow.removeEventListener('focus', focus);
+			try {
+				should(rootWindow.rightNavButtons).be.an.Array();
+				should(rootWindow.rightNavButtons.length).be.eql(2);
+				rootWindow.rightNavButtons = [ rightButton1 ];
+				should(rootWindow.rightNavButtons.length).be.eql(1);
+
+				should(rootWindow.leftNavButtons).be.an.Array();
+				should(rootWindow.leftNavButtons.length).be.eql(1);
+			} catch (e) {
+				return finish(e);
+			}
+			finish();
+		});
+	});
+
+	it.ios('.leftNavButton with default color (no color value) and .rightNavButton with tintColor', finish => {
+		// TO DO: Snapshots for different iPads are different. Can not test with static image.
+		// Probably try with snapshot comparision (with and without color) at run time
+		if (utilities.isMacOS() || utilities.isIPad()) {
+			return finish(); // how to skip for iPad?
+		}
+
+		const density = Ti.Platform.displayCaps.logicalDensityFactor;
+
+		const rightButton = Ti.UI.createButton({
+			title: 'Right',
+			tintColor: 'green',
+		});
+
+		const leftButton = Ti.UI.createButton({
+			title: 'Left',
+		});
+
+		const rootWindow = Ti.UI.createWindow({
+			backgroundColor: 'white',
+			leftNavButton: leftButton,
+			rightNavButton: rightButton,
+		});
+
+		win = Ti.UI.createNavigationWindow({
+			height: '400px',
+			width: '400px',
+			window: rootWindow
+		});
+
+		win.open();
+
+		rootWindow.addEventListener('postlayout', function postlayout() {
+			rootWindow.removeEventListener('postlayout', postlayout);
+			setTimeout(function () {
+				try {
+					should(rootWindow.leftNavButton).be.an.Object();
+					should(rootWindow.rightNavButton).be.an.Object();
+					should(win).matchImage(`snapshots/navButton_left_defaultColor_right_greenColor_${density}x.png`);
+				} catch (e) {
+					return finish(e);
+				}
+				finish();
+			}, 10);
+		});
+	});
+
+	it.ios('.leftNavButton and .rightNavButton  with color and tintColor', finish => {
+		// TO DO: Snapshots for different iPads are different. Can not test with static image.
+		// Probably try with snapshot comparision (with and without color) at run time
+		if (utilities.isMacOS() || utilities.isIPad()) {
+			return finish(); // how to skip for iPad?
+		}
+
+		const density = Ti.Platform.displayCaps.logicalDensityFactor;
+
+		const rightButton = Ti.UI.createButton({
+			title: 'Right',
+			tintColor: 'red',
+			color: 'green', // should have preference
+		});
+
+		const leftButton = Ti.UI.createButton({
+			title: 'Left',
+			tintColor: 'red'
+		});
+
+		const rootWindow = Ti.UI.createWindow({
+			backgroundColor: 'white',
+			leftNavButton: leftButton,
+			rightNavButton: rightButton,
+		});
+
+		win = Ti.UI.createNavigationWindow({
+			height: '400px',
+			width: '400px',
+			window: rootWindow
+		});
+
+		win.open();
+
+		rootWindow.addEventListener('postlayout', function postlayout() {
+			rootWindow.removeEventListener('postlayout', postlayout);
+			setTimeout(function () {
+				try {
+					should(rootWindow.leftNavButton).be.an.Object();
+					should(rootWindow.rightNavButton).be.an.Object();
+					should(win).matchImage(`snapshots/navButton_left_redColor_right_greenColor_${density}x.png`);
+				} catch (e) {
+					return finish(e);
+				}
+				finish();
+			}, 10);
+		});
+	});
+
 	// FIXME Move these rect/size tests into Ti.UI.View!
 	it.windowsBroken('.size is read-only', finish => {
 		win = Ti.UI.createWindow({