Skip to content

fix: return default tab background color when the background color is not explicitely set through css #8240

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

Merged
vtrifonov merged 5 commits into from
Jan 14, 2020
Merged

fix: return default tab background color when the background color is not explicitely set through css #8240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa05c68
fix: return default tab background color
vtrifonov Jan 13, 2020
7621d3b
chore: update NativeScript.api.md
vtrifonov Jan 13, 2020
01991df
fix: do not cast return getTabBarBackgroundColor to ColorDrawable
vtrifonov Jan 13, 2020
83938e6
chore: added comment and method check
Jan 14, 2020
fd34575
Merge branch 'master' into trifonov/android-bn-backgroundColor-fix
Jan 14, 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
2 changes: 2 additions & 0 deletions api-reports/NativeScript.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2197,6 +2197,8 @@ export class TabContentItem extends ContentView {
export class TabNavigationBase extends View {
android: any /* android.view.View */;

getTabBarBackgroundArgbColor(): any

getTabBarBackgroundColor(): any

getTabBarColor(): any
Expand Down
4 changes: 1 addition & 3 deletions nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,9 +578,7 @@ export class BottomNavigation extends TabNavigationBase {

// BACKGROUND-COLOR
const backgroundColor = tabStripItem.style.backgroundColor;
if (backgroundColor) {
tabItemSpec.backgroundColor = backgroundColor.android;
}
tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor();

// COLOR
const color = titleLabel.style.color;
Expand Down
6 changes: 6 additions & 0 deletions nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ export class TabNavigationBase extends View {
*/
getTabBarBackgroundColor(): any

/**
* @private
* Method is intended to be overridden by inheritors and used as "protected"
*/
getTabBarBackgroundArgbColor(): any

/**
* @private
* Method is intended to be overridden by inheritors and used as "protected"
Expand Down
7 changes: 7 additions & 0 deletions nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ export class TabNavigationBase extends View implements TabNavigationBaseDefiniti
return null;
}

public getTabBarBackgroundArgbColor(): any {
// This method is implemented only for Android
const colorDrawable = this.getTabBarBackgroundColor();

return colorDrawable && colorDrawable.getColor && colorDrawable.getColor();
}

public setTabBarBackgroundColor(value: any): void {
// overridden by inheritors
}
Expand Down
4 changes: 1 addition & 3 deletions nativescript-core/ui/tabs/tabs.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,9 +653,7 @@ export class Tabs extends TabsBase {

// BACKGROUND-COLOR
const backgroundColor = tabStripItem.style.backgroundColor;
if (backgroundColor) {
tabItemSpec.backgroundColor = backgroundColor.android;
}
tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor();

// COLOR
const color = nestedLabel.style.color;
Expand Down