Mobile 3947: Pre Ionic 7 changes

.editorconfig

@@ -0,0 +1,19 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json]
+indent_size = 2
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

.gitignore

@@ -6,32 +6,70 @@
 .tmp
 *.tmp
 *.tmp.*
-*.sublime-project
-*.sublime-workspace
-.DS_Store
-Thumbs.db
 UserInterfaceState.xcuserstate
 $RECYCLE.BIN/
 
 *.log
 log.txt
-npm-debug.log*
 
-/.idea
-/.ionic
-/.sass-cache
 /.sourcemaps
 /.versions
 /coverage
-/dist
-/node_modules
+
+# Ionic
+/.ionic
+/www
 /platforms
 /plugins
-/www
-/src/assets/lib
 
-/moodle.config.*.json
-!/moodle.config.example.json
+# Compiled output
+/dist
+/tmp
+/out-tsc
+/bazel-out
 
+# Node
+/node_modules
+npm-debug.log
+yarn-error.log
+
+# IDEs and editors
+.idea/
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-project
+*.sublime-workspace
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+
+# Miscellaneous
+/.angular
+/.angular/cache
+.sass-cache/
+/connect.lock
+/coverage
+/libpeerconnection.log
+testem.log
+/typings
+
+# System files
+.DS_Store
+Thumbs.db
+
+# Moodle App
+/src/assets/lib
 /src/assets/lang/*
 /src/assets/env.json
+
+/moodle.config.*.json
+!/moodle.config.example.json

.vscode/extensions.json

@@ -1,5 +1,6 @@
 {
     "recommendations": [
+        "ionic.ionic",
         "dbaeumer.vscode-eslint",
         "angular.ng-template"
     ]

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="43001" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.3.0.1" version="4.3.0" versionCode="43001" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="44000" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.4.0.0" version="4.4.0" versionCode="44000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="[email protected]" href="http://moodle.com">Moodle Mobile team</author>
@@ -28,7 +28,7 @@
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
     <preference name="prerendered-icon" value="true" />
-    <preference name="AppendUserAgent" value="MoodleMobile 4.3.0 (43001)" />
+    <preference name="AppendUserAgent" value="MoodleMobile 4.4.0 (44000)" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="KeyboardDisplayRequiresUserAction" value="false" />
@@ -220,7 +220,7 @@
             <true />
         </edit-config>
         <edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString">
-            <string>4.3.0</string>
+            <string>4.4.0</string>
         </edit-config>
         <edit-config file="*-Info.plist" mode="overwrite" target="CFBundleLocalizations">
             <array>

moodle.config.json

@@ -1,8 +1,8 @@
 {
     "app_id": "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
-    "versioncode": 43001,
-    "versionname": "4.3.0",
+    "versioncode": 44000,
+    "versionname": "4.4.0",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",

src/addons/badges/pages/issued-badge/issued-badge.ts

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreSites } from '@services/sites';
@@ -130,7 +129,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshBadges(refresher?: IonRefresher): Promise<void> {
+    async refreshBadges(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(Promise.all([
             AddonBadges.invalidateUserBadges(this.courseId, this.userId),
         ]));

src/addons/badges/pages/user-badges/user-badges.html

@@ -19,7 +19,7 @@ <h1>{{ 'addon.badges.badges' | translate }}</h1>
 
             <ion-list *ngIf="!badges.empty" class="ion-no-margin">
                 <ion-item button class="ion-text-wrap" *ngFor="let badge of badges.items" [attr.aria-label]="badge.name"
-                    (click)="badges.select(badge)" [attr.aria-current]="badges.getItemAriaCurrent(badge)" detail="true">
+                    (click)="badges.select(badge)" [attr.aria-current]="badges.getItemAriaCurrent(badge)" [detail]="true">
                     <ion-avatar slot="start">
                         <img [src]="badge.badgeurl" [alt]="badge.name" core-external-content>
                     </ion-avatar>

src/addons/badges/pages/user-badges/user-badges.ts

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core';
-import { IonRefresher } from '@ionic/angular';
 import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -90,7 +89,7 @@ export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
      *
      * @param refresher Refresher.
      */
-    async refreshBadges(refresher?: IonRefresher): Promise<void> {
+    async refreshBadges(refresher?: HTMLIonRefresherElement): Promise<void> {
         await CoreUtils.ignoreErrors(
             AddonBadges.invalidateUserBadges(
                 this.badges.getSource().COURSE_ID,

src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html

@@ -1,10 +1,10 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded">
-    <ion-item class="ion-text-wrap" *ngFor="let entry of entries" detail="true" button (click)="gotoCoureListModType(entry)">
+    <ion-item class="ion-text-wrap" *ngFor="let entry of entries" [detail]="true" button (click)="gotoCoureListModType(entry)">
         <core-mod-icon slot="start" [modicon]="entry.icon" [modname]="entry.iconModName" [showAlt]="false">
         </core-mod-icon>
         <ion-label>{{ entry.name }}</ion-label>

src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html

@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_myoverview.pluginname' | translate }}</h2>
     </ion-label>
@@ -88,11 +88,11 @@ <h2>{{ 'addon.block_myoverview.pluginname' | translate }}</h2>
             </core-combobox>
         </ion-col>
         <ion-col size="auto" *ngIf="isLayoutSwitcherAvailable">
-            <ion-button *ngIf="layout == 'card'" fill="outline" (click)="toggleLayout('list')"
+            <ion-button *ngIf="layout === 'card'" fill="outline" (click)="toggleLayout('list')"
                 [attr.aria-label]="'addon.block_myoverview.aria:list' | translate">
                 <ion-icon slot="icon-only" name="fas-list" aria-hidden="true"></ion-icon>
             </ion-button>
-            <ion-button *ngIf="layout == 'list'" fill="outline" (click)="toggleLayout('card')"
+            <ion-button *ngIf="layout === 'list'" fill="outline" (click)="toggleLayout('card')"
                 [attr.aria-label]="'addon.block_myoverview.aria:card' | translate">
                 <ion-icon slot="icon-only" name="fas-table-cells-large" aria-hidden="true"></ion-icon>
             </ion-button>
@@ -123,7 +123,7 @@ <h2>{{ 'addon.block_myoverview.pluginname' | translate }}</h2>
 
     <!-- List of courses. -->
     <div class="safe-area-padding" *ngIf="hasCourses">
-        <ion-grid class="ion-no-padding" [class.core-no-grid]="layout != 'card'" [class.list-item-limited-width]="layout != 'card'">
+        <ion-grid class="ion-no-padding" [class.core-no-grid]="layout !== 'card'" [class.list-item-limited-width]="layout !== 'card'">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
                     size-xl="3">

src/addons/block/myoverview/components/myoverview/myoverview.ts

@@ -31,7 +31,7 @@ import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
-import { IonRefresher, IonSearchbar } from '@ionic/angular';
+import { IonSearchbar } from '@ionic/angular';
 import { CoreNavigator } from '@services/navigator';
 import { PageLoadWatcher } from '@classes/page-load-watcher';
 import { PageLoadsManager } from '@classes/page-loads-manager';
@@ -191,7 +191,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @param done Function to call when done.
      * @returns Promise resolved when done.
      */
-    async doRefresh(refresher?: IonRefresher, done?: () => void): Promise<void> {
+    async doRefresh(refresher?: HTMLIonRefresherElement, done?: () => void): Promise<void> {
         if (this.loaded) {
             return this.refreshContent().finally(() => {
                 refresher?.complete();

src/addons/block/onlineusers/components/onlineusers/onlineusers.scss

@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 :host {
     --core-avatar-size: 30px;
 

src/addons/block/recentactivity/components/recentactivity/recentactivity.scss

@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host .core-block-content ::ng-deep {
     .activitydate, .activityhead {

src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html

@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}</h2>
     </ion-label>

src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html

@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
     </ion-label>
@@ -14,7 +14,7 @@ <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
             <div class="safe-area-pseudo-padding-start"></div>
             <div *ngFor="let item of items" class="core-horizontal-scroll-item">
                 <ion-card>
-                    <ion-item class="core-course-module-handler ion-text-wrap" detail="false" (click)="action($event, item)" button>
+                    <ion-item class="core-course-module-handler ion-text-wrap" [detail]="false" (click)="action($event, item)" button>
                         <core-mod-icon slot="start" *ngIf="item.iconUrl" [modicon]="item.iconUrl" [modname]="item.modname"
                             [componentId]="item.cmid" [showAlt]="false" [purpose]="item.purpose">
                         </core-mod-icon>

src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss

@@ -1,4 +1,4 @@
-@import "~theme/globals";
+@use "theme/globals" as *;
 
 :host {
     .core-horizontal-scroll div.core-horizontal-scroll-item {

src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html

@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
     </ion-label>

src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html

@@ -1,4 +1,4 @@
-<ion-item-divider sticky="true">
+<ion-item-divider [sticky]="true">
     <ion-label>
         <h2>{{ 'addon.block_starredcourses.pluginname' | translate }}</h2>
     </ion-label>

src/addons/block/timeline/classes/section.ts

@@ -44,7 +44,7 @@ export class AddonBlockTimelineSection {
         this.overdue = overdue;
         this.dateRange = dateRange;
         this.course = course;
-        this.dataSubject$ = new BehaviorSubject({
+        this.dataSubject$ = new BehaviorSubject<AddonBlockTimelineSectionData>({
             events: [],
             lastEventId: canLoadMore,
             canLoadMore: typeof canLoadMore !== 'undefined',

src/addons/block/timeline/components/events/addon-block-timeline-events.html

@@ -14,7 +14,7 @@ <h4 [class.core-bold]="!course">{{ dayEvents.dayTimestamp * 1000 | coreFormatDat
         </ion-label>
     </ion-item>
     <ng-container *ngFor="let event of dayEvents.events">
-        <ion-item class="addon-block-timeline-activity" detail="false" (click)="action($event, event.url)" [attr.aria-label]="event.name"
+        <ion-item class="addon-block-timeline-activity" [detail]="false" (click)="action($event, event.url)" [attr.aria-label]="event.name"
             button lines="full">
             <ion-label>
                 <ion-row class="ion-justify-content-between ion-align-items-center ion-no-padding">