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(android): setting tab properties before open event crashes as of 10.0.0 #12717

Merged
merged 2 commits into from
Apr 13, 2021
Merged

fix(android): setting tab properties before open event crashes as of 10.0.0 #12717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b2d88f
fix(android): setting tab properties before open event crashes
jquick-axway Apr 13, 2021
8aee9ce
fix(android): tab selection errors logged when they shouldn't
jquick-axway Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 17 additions & 12 deletions android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ public Object getActiveTab()
}
}

private TabProxy getActiveTabProxy()
{
Object activeTab = getActiveTab();
return (activeTab != null) ? parseTab(activeTab) : null;
}

@Kroll.setProperty
public void setActiveTab(Object tabOrIndex)
{
Expand Down Expand Up @@ -395,15 +401,12 @@ protected void handlePostOpen()
}
}

Object activeTab = getActiveTab();
if (activeTab != null) {
// If tabHost's selected tab is same as the active tab, we need
// to invoke onTabSelected so focus/blur event fire appropriately
TabProxy tab = parseTab(activeTab);
if (tab != null) {
tg.selectTab(tab);
selectedTab = tab;
}
// If TabGroup's selected tab is same as the active tab,
// then we need to invoke onTabSelected so focus/blur event fire appropriately
TabProxy tab = getActiveTabProxy();
if (tab != null) {
tg.selectTab(tab);
selectedTab = tab;
}

// Selected tab should have been focused by now.
Expand Down Expand Up @@ -462,9 +465,11 @@ public void onWindowFocusChange(boolean focused)
}
isFocused = focused;

TabProxy tab = parseTab(selectedTab);
// Fetch a proxy to the active tab. (Skip this if no tabs exists in group yet to avoid warnings in the log.)
TabProxy tab = (tabs.size() > 0) ? getActiveTabProxy() : null;

// If no tab is selected fall back to the default behavior.
if (tab == null) {
// If no tab is selected fall back to the default behavior.
super.onWindowFocusChange(focused);
return;
}
Expand All @@ -488,7 +493,7 @@ public void onTabSelected(int position)
*/
public void onTabSelected(TabProxy tabProxy)
{
TabProxy previousSelectedTab = parseTab(selectedTab);
TabProxy previousSelectedTab = getActiveTabProxy();
selectedTab = tabProxy;

// Focus event data which will be dispatched to the selected tab.
Expand Down
48 changes: 18 additions & 30 deletions android/modules/ui/src/java/ti/modules/titanium/ui/TabProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,6 @@ public void setTabGroup(TabGroupProxy tabGroupProxy)
}
}

/*@Kroll.getProperty
public String getTitle()
{
// Validate tabGroup proxy.
if (tabGroupProxy == null ) {
return null;
}
return ((TiUIAbstractTabGroup) tabGroupProxy.getOrCreateView()).getTabTitle(tabGroupProxy.getTabIndex(this));
}*/

public void setWindowId(int id)
{
windowId = id;
Expand Down Expand Up @@ -236,29 +226,27 @@ void onSelectionChanged(boolean selected)
public void onPropertyChanged(String name, Object value)
{
super.onPropertyChanged(name, value);
// Check if the Tab Group proxy has been released.
if (tabGroupProxy == null) {

// Fetch the TabGroup's view. If currently null, then we have to wait for TabGroup activity to be created.
TiUIView view = (this.tabGroupProxy != null) ? this.tabGroupProxy.peekView() : null;
if (!(view instanceof TiUIAbstractTabGroup)) {
return;
}
TiUIAbstractTabGroup tabGroupView = (TiUIAbstractTabGroup) view;

// Update tab.
if (name.equals(TiC.PROPERTY_BACKGROUND_COLOR) || name.equals(TiC.PROPERTY_BACKGROUND_FOCUSED_COLOR)) {
((TiUIAbstractTabGroup) tabGroupProxy.getOrCreateView())
.updateTabBackgroundDrawable(tabGroupProxy.getTabIndex(this));
}
if (name.equals(TiC.PROPERTY_TITLE)) {
((TiUIAbstractTabGroup) tabGroupProxy.getOrCreateView()).updateTabTitle(tabGroupProxy.getTabIndex(this));
}
if (name.equals(TiC.PROPERTY_TITLE_COLOR) || name.equals(TiC.PROPERTY_ACTIVE_TITLE_COLOR)) {
((TiUIAbstractTabGroup) tabGroupProxy.getOrCreateView())
.updateTabTitleColor(tabGroupProxy.getTabIndex(this));
}
if (name.equals(TiC.PROPERTY_ICON)) {
((TiUIAbstractTabGroup) tabGroupProxy.getOrCreateView()).updateTabIcon(tabGroupProxy.getTabIndex(this));
}
if (name.equals(TiC.PROPERTY_BADGE)) {
((TiUIAbstractTabGroup) tabGroupProxy.getOrCreateView()).updateBadge(tabGroupProxy.getTabIndex(this));
}
if (name.equals(TiC.PROPERTY_BADGE_COLOR)) {
((TiUIAbstractTabGroup) tabGroupProxy.getOrCreateView()).updateBadgeColor(tabGroupProxy.getTabIndex(this));
tabGroupView.updateTabBackgroundDrawable(this.tabGroupProxy.getTabIndex(this));
} else if (name.equals(TiC.PROPERTY_TITLE)) {
tabGroupView.updateTabTitle(this.tabGroupProxy.getTabIndex(this));
} else if (name.equals(TiC.PROPERTY_TITLE_COLOR) || name.equals(TiC.PROPERTY_ACTIVE_TITLE_COLOR)) {
tabGroupView.updateTabTitleColor(this.tabGroupProxy.getTabIndex(this));
} else if (name.equals(TiC.PROPERTY_ICON)) {
tabGroupView.updateTabIcon(this.tabGroupProxy.getTabIndex(this));
} else if (name.equals(TiC.PROPERTY_BADGE)) {
tabGroupView.updateBadge(this.tabGroupProxy.getTabIndex(this));
} else if (name.equals(TiC.PROPERTY_BADGE_COLOR)) {
tabGroupView.updateBadgeColor(this.tabGroupProxy.getTabIndex(this));
}
}

Expand Down
13 changes: 12 additions & 1 deletion tests/Resources/ti.ui.tabgroup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,18 @@ describe('Titanium.UI.TabGroup', function () {
should(tabGroup.tabs).eql([ tabA, tabB ]);
});

it.androidBroken('has no accessors', () => { // Windows are created during open
it('set properties before open event', () => {
const tab = Ti.UI.createTab({ window: Ti.UI.createWindow() });
tabGroup.tabs = [ tab ];
tabGroup.tabs[0].title = 'Tab 1';
tabGroup.tabs[0].badge = '5';
tabGroup.tabs[0].icon = '/SmallLogo.png';
should(tab.title).eql('Tab 1');
should(tab.badge).eql('5');
should(tab.icon.endsWith('/SmallLogo.png')).be.true();
});

it('has no accessors', () => {
should(tabGroup).not.have.accessors('barColor');
});

Expand Down