Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ios): set tintcolor of UIBarButtonItem #12245

Merged
merged 12 commits into from
Nov 20, 2020
Merged

fix(ios): set tintcolor of UIBarButtonItem #12245

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
868757b
fix(ios): set tintcolor of UIBarButtonItem
vijaysingh-axway Nov 3, 2020
f7e0986
test(ios): added unit test
vijaysingh-axway Nov 4, 2020
2e60eaf
fix(ios): use tintColor property also
vijaysingh-axway Nov 5, 2020
25771c5
Merge branch 'master' into TIMOB-28211
vijaysingh-axway Nov 5, 2020
784f780
test(ios): updated unit test
vijaysingh-axway Nov 5, 2020
09c7464
Merge branch 'master' into TIMOB-28211
vijaysingh-axway Nov 5, 2020
c6fe0c8
test(ios): updated unit test
vijaysingh-axway Nov 17, 2020
ef6a8e1
Merge branch 'master' into TIMOB-28211
Nov 19, 2020
bb367e9
Merge branch 'master' into TIMOB-28211
vijaysingh-axway Nov 19, 2020
6abc282
test(ios): updated image names
vijaysingh-axway Nov 20, 2020
67fcca0
test: skip test for mac and ipad
vijaysingh-axway Nov 20, 2020
a2d718c
Merge branch 'master' into TIMOB-28211
sgtcoolguy Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iphone/Classes/TiUINavBarButton.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [TiUtils colorValue:[proxy_ valueForKey:@"color"]].color;
vijaysingh-axway marked this conversation as resolved.
Show resolved Hide resolved
}
}
proxy = proxy_; // Don't retain
Expand Down
80 changes: 80 additions & 0 deletions tests/Resources/ti.ui.window.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,86 @@ describe('Titanium.UI.Window', function () {
});
});

it.ios('#leftNavButtons and #rightNavButtons', finish => {
vijaysingh-axway marked this conversation as resolved.
Show resolved Hide resolved
var rightButton1 = Ti.UI.createButton({
vijaysingh-axway marked this conversation as resolved.
Show resolved Hide resolved
title: 'Right1',
color: 'green',
});

var rightButton2 = Ti.UI.createButton({
vijaysingh-axway marked this conversation as resolved.
Show resolved Hide resolved
title: 'Right2',
color: 'green',
});

var leftButton = Ti.UI.createButton({
vijaysingh-axway marked this conversation as resolved.
Show resolved Hide resolved
title: 'Left',
color: 'blue'
});

var rootWindow = Ti.UI.createWindow({
vijaysingh-axway marked this conversation as resolved.
Show resolved Hide resolved
backgroundColor: 'white',
leftNavButtons: [ leftButton ],
rightNavButtons: [ rightButton1, rightButton2 ],
});

win = Ti.UI.createNavigationWindow({
window: rootWindow
});

win.open();

rootWindow.addEventListener('focus', function () {
vijaysingh-axway marked this conversation as resolved.
Show resolved Hide resolved
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 and #rightNavButton', finish => {
var rightButton = Ti.UI.createButton({
title: 'Right',
color: 'green',
});

var leftButton = Ti.UI.createButton({
title: 'Left',
color: 'blue'
});

var rootWindow = Ti.UI.createWindow({
backgroundColor: 'white',
leftNavButton: leftButton,
rightNavButton: rightButton,
});

win = Ti.UI.createNavigationWindow({
window: rootWindow
});

win.open();

rootWindow.addEventListener('postlayout', function postlayout() {
rootWindow.removeEventListener('postlayout', postlayout);
try {
should(rootWindow.leftNavButton).be.an.Object();
vijaysingh-axway marked this conversation as resolved.
Show resolved Hide resolved
should(rootWindow.rightNavButton).be.an.Object();
// Can we match different simulators window snapshot
} catch (e) {
return finish(e);
}
finish();
});
});

// FIXME Move these rect/size tests into Ti.UI.View!
it.windowsBroken('.size is read-only', finish => {
win = Ti.UI.createWindow({
Expand Down