MOBILE-3833 settings: Don't reload whole app when change language

main
Dani Palou 2022-04-11 09:05:19 +02:00
parent 7a03ec48be
commit 0413aa87bf
5 changed files with 85 additions and 1 deletions

View File

@ -41,6 +41,10 @@ const appRoutes: Routes = [
canActivate: [CoreMainMenuAuthGuard],
canLoad: [CoreMainMenuAuthGuard],
},
{
path: 'reload',
loadChildren: () => import('./pages/reload/reload.module').then( m => m.CoreMainMenuReloadPageModule),
},
];
@NgModule({

View File

@ -0,0 +1,3 @@
<ion-content>
<core-loading></core-loading>
</ion-content>

View File

@ -0,0 +1,37 @@
// (C) Copyright 2015 Moodle Pty Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { CoreSharedModule } from '@/core/shared.module';
import { CoreMainMenuReloadPage } from './reload';
const routes: Routes = [
{
path: '',
component: CoreMainMenuReloadPage,
},
];
@NgModule({
imports: [
RouterModule.forChild(routes),
CoreSharedModule,
],
declarations: [
CoreMainMenuReloadPage,
],
exports: [RouterModule],
})
export class CoreMainMenuReloadPageModule {}

View File

@ -0,0 +1,36 @@
// (C) Copyright 2015 Moodle Pty Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import { Component, OnInit } from '@angular/core';
import { CoreNavigator } from '@services/navigator';
/**
* Page that displays a loading and then opens the main menu again.
*/
@Component({
selector: 'page-core-mainmenu-reload',
templateUrl: 'reload.html',
})
export class CoreMainMenuReloadPage implements OnInit {
/**
* @inheritdoc
*/
ngOnInit(): void {
CoreNavigator.navigate('/main', {
reset: true,
});
}
}

View File

@ -26,6 +26,7 @@ import { Diagnostic, Translate } from '@singletons';
import { CoreSites } from '@services/sites';
import { CoreUtils } from '@services/utils/utils';
import { AlertButton } from '@ionic/angular';
import { CoreNavigator } from '@services/navigator';
/**
* Page that displays the general settings.
@ -168,7 +169,10 @@ export class CoreSettingsGeneralPage {
await CoreUtils.ignoreErrors(Promise.all(sites.map((site) => site.invalidateWsCache())));
CoreEvents.trigger(CoreEvents.LANGUAGE_CHANGED, this.selectedLanguage);
window.location.reload();
CoreNavigator.navigate('/reload', {
reset: true,
});
}
/**