Skip to content

fix: dont create an actionbar if not necessary #8402

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 4 commits into from
Mar 19, 2020
Merged

fix: dont create an actionbar if not necessary #8402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c966d1d
fix: dont create an actionbar if not necessary
farfromrefug Mar 2, 2020
7da312c
rollback. we now try an make sure the actionbar is created only if n…
farfromrefug Mar 6, 2020
686b102
actually we should check for false
farfromrefug Mar 6, 2020
5e1d438
Merge branch 'master' into actionbar_create_if_necessary
farfromrefug Mar 18, 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: 1 addition & 1 deletion nativescript-core/ui/page/page-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export class PageBase extends ContentView implements PageDefinition {

public eachChildView(callback: (child: View) => boolean) {
super.eachChildView(callback);
if (this.actionBar) {
if (this.hasActionBar) {
callback(this.actionBar);
}
}
Expand Down
19 changes: 16 additions & 3 deletions nativescript-core/ui/page/page.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,30 @@ export class Page extends PageBase {
@profile
public onLoaded() {
super.onLoaded();
if (this.actionBarHidden !== undefined) {
if (!this.hasActionBar && this.actionBarHidden !== true) {
// ensure actionBar is created
// but we only need to do that if the actionBarHidden is not hidden
this.actionBar = new ActionBar();
}
if (this.hasActionBar) {
this.updateActionBar();
}
}

private updateActionBar() {
this.actionBar.update();
// the test is actually to ensure the actionBar is created
// it will be created if not
if (this.actionBar) {
this.actionBar.update();
}
}

[actionBarHiddenProperty.setNative](value: boolean) {
this.updateActionBar();
// in case the actionBar is not created and actionBarHidden is changed to true
// the actionBar will be created by updateActionBar
if (!value || this.hasActionBar) {
this.updateActionBar();
}
}

[statusBarStyleProperty.getDefault](): { color: number, systemUiVisibility: number } {
Expand Down