Skip to content

feat(view): expose method for android back override #5537

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
MartoYankov merged 1 commit into from
Mar 14, 2018
Merged

feat(view): expose method for android back override #5537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tns-core-modules/ui/core/view/view-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
return false;
}

public _onBackPressed(): boolean {
public onBackPressed(): boolean {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion tns-core-modules/ui/core/view/view.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function initializeDialogFragment() {
};
view.notify(args);

if (!args.cancel && !view._onBackPressed()) {
if (!args.cancel && !view.onBackPressed()) {
super.onBackPressed();
}
}
Expand Down
5 changes: 3 additions & 2 deletions tns-core-modules/ui/core/view/view.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,10 +678,11 @@ export abstract class View extends ViewBase {
* @private
*/
_onLivesync(): boolean;

/**
* @private
* Derived classes can override this method to handle Android back button press.
*/
_onBackPressed(): boolean;
onBackPressed(): boolean;
/**
* @private
*/
Expand Down
4 changes: 2 additions & 2 deletions tns-core-modules/ui/frame/frame.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export class Frame extends FrameBase {
}
}

public _onBackPressed(): boolean {
public onBackPressed(): boolean {
if (this.canGoBack()) {
this.goBack();
return true;
Expand Down Expand Up @@ -884,7 +884,7 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
};
view.notify(viewArgs);

if (!viewArgs.cancel && !view._onBackPressed()) {
if (!viewArgs.cancel && !view.onBackPressed()) {
callSuper = true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions tns-core-modules/ui/tab-view/tab-view.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,10 @@ export class TabView extends TabViewBase {
super.disposeNativeView();
}

public _onBackPressed(): boolean {
public onBackPressed(): boolean {
const currentView = this._selectedView;
if (currentView) {
return currentView._onBackPressed();
return currentView.onBackPressed();
}

return false;
Expand Down