Skip to content

Commit

Permalink
fix(ios): flat action bar incorrect layout after navigation (#7077)
Browse files Browse the repository at this point in the history
* fix(action-bar): incorrect layout after navigation

* set extended layout for opaque bars earlier
  • Loading branch information
MartoYankov authored Mar 29, 2019
1 parent 325f727 commit 1dc3952
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 9 deletions.
11 changes: 8 additions & 3 deletions tns-core-modules/ui/core/view/view.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,14 @@ export namespace ios {
return controller;
}

public viewDidLoad(): void {
super.viewDidLoad();

// Unify translucent and opaque bars layout
// this.edgesForExtendedLayout = UIRectEdgeBottom;
this.extendedLayoutIncludesOpaqueBars = true;
}

public viewWillLayoutSubviews(): void {
super.viewWillLayoutSubviews();
const owner = this.owner.get();
Expand Down Expand Up @@ -959,9 +967,6 @@ export namespace ios {
return;
}

// Unify translucent and opaque bars layout
this.extendedLayoutIncludesOpaqueBars = true;

updateAutoAdjustScrollInsets(this, owner);

if (!owner.parent) {
Expand Down
11 changes: 8 additions & 3 deletions tns-core-modules/ui/page/page.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ class UIViewControllerImpl extends UIViewController {
return controller;
}

public viewDidLoad(): void {
super.viewDidLoad();

// Unify translucent and opaque bars layout
// this.edgesForExtendedLayout = UIRectEdgeBottom;
this.extendedLayoutIncludesOpaqueBars = true;
}

public viewWillAppear(animated: boolean): void {
super.viewWillAppear(animated);
const owner = this._owner.get();
Expand Down Expand Up @@ -100,9 +108,6 @@ class UIViewControllerImpl extends UIViewController {
frame._updateActionBar(owner);
}

// Unify translucent and opaque bars layout
this.extendedLayoutIncludesOpaqueBars = true;

// Set autoAdjustScrollInsets in will appear - as early as possible
iosView.updateAutoAdjustScrollInsets(this, owner);

Expand Down
11 changes: 8 additions & 3 deletions tns-core-modules/ui/tab-view/tab-view.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ class UITabBarControllerImpl extends UITabBarController {
return handler;
}

public viewDidLoad(): void {
super.viewDidLoad();

// Unify translucent and opaque bars layout
// this.edgesForExtendedLayout = UIRectEdgeBottom;
this.extendedLayoutIncludesOpaqueBars = true;
}

@profile
public viewWillAppear(animated: boolean): void {
super.viewWillAppear(animated);
Expand All @@ -36,9 +44,6 @@ class UITabBarControllerImpl extends UITabBarController {
return;
}

// Unify translucent and opaque bars layout
this.extendedLayoutIncludesOpaqueBars = true;

iosView.updateAutoAdjustScrollInsets(this, owner);

if (!owner.parent) {
Expand Down

0 comments on commit 1dc3952

Please sign in to comment.