MOBILE-3320 android: Fix back button navigation
parent
f199d1a2d1
commit
3adf95a348
|
@ -14,6 +14,7 @@
|
||||||
|
|
||||||
import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
|
import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
|
||||||
import { IonRouterOutlet } from '@ionic/angular';
|
import { IonRouterOutlet } from '@ionic/angular';
|
||||||
|
import { BackButtonEvent } from '@ionic/core';
|
||||||
|
|
||||||
import { CoreLang } from '@services/lang';
|
import { CoreLang } from '@services/lang';
|
||||||
import { CoreLoginHelper } from '@features/login/services/login-helper';
|
import { CoreLoginHelper } from '@features/login/services/login-helper';
|
||||||
|
@ -214,7 +215,28 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||||
|
|
||||||
this.onPlatformReady();
|
this.onPlatformReady();
|
||||||
|
|
||||||
// @todo: Quit app with back button. How to tell if we're at root level?
|
// Quit app with back button.
|
||||||
|
document.addEventListener('ionBackButton', (event: BackButtonEvent) => {
|
||||||
|
// This callback should have the lowest priority in the app.
|
||||||
|
event.detail.register(-100, async () => {
|
||||||
|
// This callback can be called at the same time as Ionic's back navigation callback.
|
||||||
|
// Check if the path changes due to the back navigation handler, to know if we're at root level.
|
||||||
|
// Ionic doc recommends IonRouterOutlet.canGoBack, but there's no easy way to get the current outlet from here.
|
||||||
|
const initialPath = CoreNavigator.getCurrentPath();
|
||||||
|
|
||||||
|
// The path seems to change immediately (0 ms timeout), but use 50ms just in case.
|
||||||
|
await CoreUtils.wait(50);
|
||||||
|
|
||||||
|
if (CoreNavigator.getCurrentPath() != initialPath) {
|
||||||
|
// Ionic has navigated back, nothing else to do.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Quit the app.
|
||||||
|
const nav = <any> window.navigator; // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||||
|
nav.app?.exitApp();
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -223,7 +223,22 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
|
||||||
* @param event Event.
|
* @param event Event.
|
||||||
*/
|
*/
|
||||||
protected backButtonClicked(event: BackButtonEvent): void {
|
protected backButtonClicked(event: BackButtonEvent): void {
|
||||||
event.detail.register(20, (processNextHandler: () => void) => {
|
// Use a priority lower than 0 (navigation).
|
||||||
|
event.detail.register(-10, async (processNextHandler: () => void) => {
|
||||||
|
// This callback can be called at the same time as Ionic's back navigation callback.
|
||||||
|
// Check if the path changes due to the back navigation handler, to know if we're at root level of the tab.
|
||||||
|
// Ionic doc recommends IonRouterOutlet.canGoBack, but there's no easy way to get the current outlet from here.
|
||||||
|
const initialPath = CoreNavigator.getCurrentPath();
|
||||||
|
|
||||||
|
// The path seems to change immediately (0 ms timeout), but use 50ms just in case.
|
||||||
|
await CoreUtils.wait(50);
|
||||||
|
|
||||||
|
if (CoreNavigator.getCurrentPath() != initialPath) {
|
||||||
|
// Ionic has navigated back, nothing else to do.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// No back navigation, already at root level. Check if we should change tab.
|
||||||
if (this.selectHistory.length > 1) {
|
if (this.selectHistory.length > 1) {
|
||||||
// The previous page in history is not the last one, we need the previous one.
|
// The previous page in history is not the last one, we need the previous one.
|
||||||
const previousTab = this.selectHistory[this.selectHistory.length - 2];
|
const previousTab = this.selectHistory[this.selectHistory.length - 2];
|
||||||
|
|
Loading…
Reference in New Issue