Merge pull request #3957 from crazyserver/MOBILE-3947

Mobile 3947

Author: dpalou

package-lock.json

@@ -73,7 +73,7 @@
     "@awesome-cordova-plugins/sqlite": "^6.6.0",
     "@awesome-cordova-plugins/status-bar": "^6.6.0",
     "@awesome-cordova-plugins/web-intent": "^6.6.0",
-    "@ionic/angular": "^7.6.5",
+    "@ionic/angular": "^7.7.4",
     "@ionic/cordova-builders": "^10.1.1",
     "@moodlehq/cordova-plugin-advanced-http": "3.3.1-moodle.1",
     "@moodlehq/cordova-plugin-file-opener": "4.0.0-moodle.1",

package.json

@@ -23,11 +23,19 @@ import { AddonBadgesUserHandler } from './services/handlers/user';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 import { AddonBadgesPushClickHandler } from './services/handlers/push-click';
-import { AddonBadgesProvider } from './services/badges';
 
-export const ADDON_BADGES_SERVICES: Type<unknown>[] = [
-    AddonBadgesProvider,
-];
+/**
+ * Get badges services.
+ *
+ * @returns Returns badges services.
+ */
+export async function getBadgesServices(): Promise<Type<unknown>[]> {
+    const { AddonBadgesProvider } = await import('@addons/badges/services/badges');
+
+    return [
+        AddonBadgesProvider,
+    ];
+}
 
 const mainMenuRoutes: Routes = [
     {

src/addons/badges/badges.module.ts

@@ -13,18 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockActivityModulesHandler } from './services/block-handler';
-import { AddonBlockActivityModulesComponentsModule } from './components/components.module';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        AddonBlockActivityModulesComponentsModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/activitymodules/activitymodules.module.ts

@@ -25,8 +25,5 @@ import { AddonBlockActivityModulesComponent } from './activitymodules/activitymo
     imports: [
         CoreSharedModule,
     ],
-    exports: [
-        AddonBlockActivityModulesComponent,
-    ],
 })
 export class AddonBlockActivityModulesComponentsModule {}

src/addons/block/activitymodules/components/components.module.ts

@@ -13,18 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockActivityResultsHandler } from './services/block-handler';
-import { AddonBlockActivityResultsComponentsModule } from './components/components.module';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        AddonBlockActivityResultsComponentsModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/activityresults/activityresults.module.ts

@@ -24,8 +24,5 @@ import { AddonBlockActivityResultsComponent } from './activityresults/activityre
     imports: [
         CoreSharedModule,
     ],
-    exports: [
-        AddonBlockActivityResultsComponent,
-    ],
 })
 export class AddonBlockActivityResultsComponentsModule {}

src/addons/block/activityresults/components/components.module.ts

@@ -13,18 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockBadgesHandler } from './services/block-handler';
-import { AddonBlockBadgesComponentsModule } from './components/components.module';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        AddonBlockBadgesComponentsModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/badges/badges.module.ts

@@ -24,8 +24,5 @@ import { AddonBlockBadgesComponent } from './badges/badges';
     imports: [
         CoreSharedModule,
     ],
-    exports: [
-        AddonBlockBadgesComponent,
-    ],
 })
 export class AddonBlockBadgesComponentsModule {}

src/addons/block/badges/components/components.module.ts

@@ -13,18 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockBlogMenuHandler } from './services/block-handler';
-import { AddonBlockBlogMenuComponentsModule } from './components/components.module';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        AddonBlockBlogMenuComponentsModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/blogmenu/blogmenu.module.ts

@@ -24,8 +24,5 @@ import { AddonBlockBlogMenuComponent } from './blogmenu/blogmenu';
     imports: [
         CoreSharedModule,
     ],
-    exports: [
-        AddonBlockBlogMenuComponent,
-    ],
 })
 export class AddonBlockBlogMenuComponentsModule {}

src/addons/block/blogmenu/components/components.module.ts

@@ -13,18 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockBlogRecentHandler } from './services/block-handler';
-import { AddonBlockBlogRecentComponentsModule } from './components/components.module';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        AddonBlockBlogRecentComponentsModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/blogrecent/blogrecent.module.ts

@@ -24,8 +24,5 @@ import { AddonBlockBlogRecentComponent } from './blogrecent/blogrecent';
     imports: [
         CoreSharedModule,
     ],
-    exports: [
-        AddonBlockBlogRecentComponent,
-    ],
 })
 export class AddonBlockBlogRecentComponentsModule {}

src/addons/block/blogrecent/components/components.module.ts

@@ -13,18 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockBlogTagsHandler } from './services/block-handler';
-import { AddonBlockBlogTagsComponentsModule } from './components/components.module';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        AddonBlockBlogTagsComponentsModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/blogtags/blogtags.module.ts

@@ -24,8 +24,5 @@ import { AddonBlockBlogTagsComponent } from './blogtags/blogtags';
     imports: [
         CoreSharedModule,
     ],
-    exports: [
-        AddonBlockBlogTagsComponent,
-    ],
 })
 export class AddonBlockBlogTagsComponentsModule {}

src/addons/block/blogtags/components/components.module.ts

@@ -13,16 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockCalendarMonthHandler } from './services/block-handler';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/calendarmonth/calendarmonth.module.ts

@@ -13,16 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockCalendarUpcomingHandler } from './services/block-handler';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/calendarupcoming/calendarupcoming.module.ts

@@ -13,16 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockCommentsHandler } from './services/block-handler';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/comments/comments.module.ts

@@ -13,16 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockCompletionStatusHandler } from './services/block-handler';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/completionstatus/completionstatus.module.ts

@@ -13,16 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockCourseListHandler } from './services/block-handler';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/courselist/courselist.module.ts

@@ -13,18 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockGlobalSearchHandler } from './services/block-handler';
-import { CoreBlockComponentsModule } from '@features/block/components/components.module';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        CoreBlockComponentsModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/globalsearch/globalsearch.module.ts

@@ -13,16 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockGlossaryRandomHandler } from './services/block-handler';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,

src/addons/block/glossaryrandom/glossaryrandom.module.ts

@@ -13,18 +13,10 @@
 // limitations under the License.
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreBlockDelegate } from '@features/block/services/block-delegate';
 import { AddonBlockLearningPlansHandler } from './services/block-handler';
-import { CoreBlockComponentsModule } from '@features/block/components/components.module';
 
 @NgModule({
-    imports: [
-        IonicModule,
-        CoreBlockComponentsModule,
-        TranslateModule.forChild(),
-    ],
     providers: [
         {
             provide: APP_INITIALIZER,