Merge pull request #4496 from crazyserver/MOBILE-4842

Mobile 4842 - Additional signals

Author: dpalou

local_moodleappbehat/tests/behat/behat_app.php

@@ -1179,15 +1179,16 @@ public function i_switch_offline_mode(string $offline) {
     public function i_switch_network_connection(string $mode) {
         switch ($mode) {
             case 'wifi':
-                $this->runtime_js("network.setForceConnectionMode('$mode');");
+                $this->runtime_js("network.setForceConnectionMode('wifi');");
                 break;
             case 'cellular':
-                $this->runtime_js("network.setForceConnectionMode('$mode');");
+                $this->runtime_js("network.setForceConnectionMode('cellular');");
                 break;
             case 'offline':
-                $this->runtime_js("network.setForceConnectionMode('none');");
+                $this->runtime_js("network.setForceConnectionMode('offline');");
                 break;
             default:
+                $this->runtime_js("network.setForceConnectionMode('unknown');");
                 break;
         }
     }

src/addons/blog/pages/index/index.ts

@@ -41,7 +41,6 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreTime } from '@singletons/time';
 import { CorePopovers } from '@services/overlays/popovers';
 import { CoreLoadings } from '@services/overlays/loadings';
-import { Subscription } from 'rxjs';
 import { CoreAlerts } from '@services/overlays/alerts';
 import { Translate } from '@singletons';
 import { CoreCommentsCommentsComponent } from '@features/comments/components/comments/comments';
@@ -89,10 +88,9 @@ export default class AddonBlogIndexPage implements OnInit, OnDestroy {
     contextInstanceId = 0;
     entryUpdateObserver: CoreEventObserver;
     syncObserver: CoreEventObserver;
-    onlineObserver: Subscription;
     optionsAvailable = false;
     readonly hasOfflineDataToSync = signal(false);
-    readonly isOnline = signal(false);
+    readonly isOnline = CoreNetwork.onlineSignal();
     siteId: string;
     syncIcon = CoreConstants.ICON_SYNC;
     readonly syncHidden = computed(() => !this.loaded() || !this.isOnline() || !this.hasOfflineDataToSync());
@@ -101,7 +99,6 @@ export default class AddonBlogIndexPage implements OnInit, OnDestroy {
         this.currentUserId = CoreSites.getCurrentSiteUserId();
         this.siteHomeId = CoreSites.getCurrentSiteHomeId();
         this.siteId = CoreSites.getCurrentSiteId();
-        this.isOnline.set(CoreNetwork.isOnline());
 
         this.logView = CoreTime.once(async () => {
             await CorePromiseUtils.ignoreErrors(AddonBlog.logView(this.filter));
@@ -137,11 +134,6 @@ export default class AddonBlogIndexPage implements OnInit, OnDestroy {
             await CorePromiseUtils.ignoreErrors(this.refresh(false));
             this.loaded.set(true);
         });
-
-        // Refresh online status when changes.
-        this.onlineObserver = CoreNetwork.onChange().subscribe(async () => {
-            this.isOnline.set(CoreNetwork.isOnline());
-        });
     }
 
     /**
@@ -516,7 +508,6 @@ export default class AddonBlogIndexPage implements OnInit, OnDestroy {
     ngOnDestroy(): void {
         this.entryUpdateObserver.off();
         this.syncObserver.off();
-        this.onlineObserver.unsubscribe();
     }
 
 }

src/addons/mod/page/tests/behat/basic_usage.feature

@@ -24,7 +24,7 @@ Feature: Test basic usage of page activity in app
       | name                                 | activity | activityname    | course   |
       | \mod_page\event\course_module_viewed | page     | Test page title | Course 1 |
 
-  Scenario: Prefecth page
+  Scenario: Prefetch page
     Given I entered the course "Course 1" as "student1" in the app
     When I press "Course downloads" in the app
     And I press "Download" within "Test page title" "ion-item" in the app

src/core/classes/sites/authenticated-site.ts

@@ -1592,7 +1592,7 @@ export class CoreAuthenticatedSite extends CoreUnauthenticatedSite {
         let expirationDelay = CoreAuthenticatedSite.UPDATE_FREQUENCIES[updateFrequency] ||
         CoreAuthenticatedSite.UPDATE_FREQUENCIES[CoreCacheUpdateFrequency.USUALLY];
 
-        if (CoreNetwork.isNetworkAccessLimited()) {
+        if (CoreNetwork.isCellular()) {
             // Not WiFi, increase the expiration delay a 50% to decrease the data usage in this case.
             expirationDelay *= 1.5;
         }

src/core/directives/external-content.ts

@@ -518,7 +518,8 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
             clickableEl.addEventListener(eventName, () => {
                 // User played media or opened a downloadable link.
                 // Download the file if in wifi and it hasn't been downloaded already (for big files).
-                if (state !== DownloadStatus.DOWNLOADED && state !== DownloadStatus.DOWNLOADING && CoreNetwork.isWifi()) {
+                if (state !== DownloadStatus.DOWNLOADED && state !== DownloadStatus.DOWNLOADING &&
+                    CoreNetwork.isWifi()) {
                     // We aren't using the result, so it doesn't matter which of the 2 functions we call.
                     CoreFilepool.getUrlByUrl(site.getId(), url, this.component, this.componentId, 0, false);
                 }

src/core/features/comments/pages/viewer/viewer.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnDestroy, OnInit, ViewChild, AfterViewInit, inject } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewChild, AfterViewInit, effect, inject } from '@angular/core';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { ActivatedRoute } from '@angular/router';
 import { CoreSites } from '@services/sites';
@@ -49,6 +49,7 @@ import { CoreDom } from '@singletons/dom';
 import { CoreSharedModule } from '@/core/shared.module';
 import { ADDON_MOD_ASSIGN_COMMENTS_COMPONENT_NAME } from '@addons/mod/assign/submission/comments/constants';
 import { CoreCourses } from '@features/courses/services/courses';
+import { CoreKeyboard } from '@singletons/keyboard';
 
 /**
  * Page that displays comments.
@@ -93,7 +94,6 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
     protected addDeleteCommentsAvailable = false;
     protected syncObserver?: CoreEventObserver;
     protected onlineObserver: Subscription;
-    protected keyboardObserver: CoreEventObserver;
     protected viewDestroyed = false;
     protected scrollBottom = true;
     protected scrollElement?: HTMLElement;
@@ -128,9 +128,11 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
             });
         });
 
-        this.keyboardObserver = CoreEvents.on(CoreEvents.KEYBOARD_CHANGE, (keyboardHeight: number) => {
-            // Force when opening.
-            this.scrollToBottom(keyboardHeight > 0);
+        effect(() => {
+            const shown = CoreKeyboard.getKeyboardShownSignal();
+
+            /// Force when opening.
+            this.scrollToBottom(shown());
         });
     }
 
@@ -700,7 +702,6 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
         this.syncObserver?.off();
         this.onlineObserver.unsubscribe();
         this.viewDestroyed = true;
-        this.keyboardObserver.off();
     }
 
 }

src/core/features/course/components/module/core-course-module.html

@@ -30,9 +30,9 @@
                                 @if (module.visible === 0 || module.uservisible === false) {
                                     <ion-icon name="fas-lock" [attr.aria-label]="'core.restricted' | translate" />
                                 }
-                                @if (prefetchStatusIcon$ | async; as prefetchStatusIcon) {
-                                    <ion-icon [name]="prefetchStatusIcon" color="success"
-                                        [attr.aria-label]="((prefetchStatusText$ | async) || '') | translate" />
+                                @if (prefetchStatusIcon()) {
+                                    <ion-icon [name]="prefetchStatusIcon()" color="success"
+                                        [attr.aria-label]="(prefetchStatusText() || '') | translate" />
                                 }
                             </p>
 

src/core/features/course/components/module/module.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, Output, EventEmitter, OnInit, OnDestroy, HostBinding } from '@angular/core';
+import { Component, Input, Output, EventEmitter, OnInit, OnDestroy, HostBinding, signal } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
 import {
@@ -29,7 +29,6 @@ import {
 } from '@features/course/services/module-prefetch-delegate';
 import { CoreConstants, DownloadStatus } from '@/core/constants';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { BehaviorSubject } from 'rxjs';
 import { toBoolean } from '@/core/transforms/boolean';
 import { CoreRemindersDateComponent } from '../../../reminders/components/date/date';
 import { CoreCourseModuleCompletionComponent } from '../module-completion/module-completion';
@@ -74,9 +73,9 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     modNameTranslated = '';
     hasCompletion = false; // Whether activity has completion to be shown.
     showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled.
-    prefetchStatusIcon$ = new BehaviorSubject<string>(''); // Module prefetch status icon.
-    prefetchStatusText$ = new BehaviorSubject<string>(''); // Module prefetch status text.
     moduleHasView = true;
+    readonly prefetchStatusIcon = signal<string>(''); // Module prefetch status icon.
+    readonly prefetchStatusText = signal<string>(''); // Module prefetch status text.
 
     protected prefetchHandler?: CoreCourseModulePrefetchHandler;
 
@@ -152,16 +151,16 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
 
         switch (prefetchStatus) {
             case DownloadStatus.OUTDATED:
-                this.prefetchStatusIcon$.next(CoreConstants.ICON_OUTDATED);
-                this.prefetchStatusText$.next('core.outdated');
+                this.prefetchStatusIcon.set(CoreConstants.ICON_OUTDATED);
+                this.prefetchStatusText.set('core.outdated');
                 break;
             case DownloadStatus.DOWNLOADED:
-                this.prefetchStatusIcon$.next(CoreConstants.ICON_DOWNLOADED);
-                this.prefetchStatusText$.next('core.downloaded');
+                this.prefetchStatusIcon.set(CoreConstants.ICON_DOWNLOADED);
+                this.prefetchStatusText.set('core.downloaded');
                 break;
             default:
-                this.prefetchStatusIcon$.next('');
-                this.prefetchStatusText$.next('');
+                this.prefetchStatusIcon.set('');
+                this.prefetchStatusText.set('');
                 break;
         }
 

src/core/features/editor/components/rich-text-editor/rich-text-editor.ts

@@ -25,6 +25,7 @@ import {
     Output,
     EventEmitter,
     inject,
+    effect,
 } from '@angular/core';
 import { IonContent } from '@ionic/angular';
 import { CoreSharedModule } from '@/core/shared.module';
@@ -50,6 +51,7 @@ import { CoreLoadingComponent } from '@components/loading/loading';
 import { CoreToasts } from '@services/overlays/toasts';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { convertTextToHTMLElement } from '@/core/utils/create-html-element';
+import { CoreKeyboard } from '@singletons/keyboard';
 
 /**
  * Component that displays a rich text editor.
@@ -85,7 +87,6 @@ export class CoreEditorRichTextEditorComponent implements AfterViewInit, OnDestr
 
     @ViewChild(CoreDynamicComponent) dynamicComponent!: CoreDynamicComponent<CoreEditorBaseComponent>;
 
-    protected keyboardObserver?: CoreEventObserver;
     protected resizeListener?: CoreEventObserver;
     protected editorComponentClass?: Type<CoreEditorBaseComponent>;
     protected editorComponentData: Record<string, unknown> = {};
@@ -107,6 +108,15 @@ export class CoreEditorRichTextEditorComponent implements AfterViewInit, OnDestr
     constructor() {
          // Generate a "unique" ID based on timestamp.
         this.pageInstance = `app_${Date.now()}`;
+
+        effect(() => {
+            // Signal will be triggered when the keyboard is shown or hidden.
+            CoreKeyboard.getKeyboardShownSignal();
+
+            // Opening or closing the keyboard also calls the resize function, but sometimes the resize is called too soon.
+            // Check the height again, now the window height should have been updated.
+            this.maximizeEditorSize();
+        });
     }
 
     /**
@@ -188,20 +198,13 @@ export class CoreEditorRichTextEditorComponent implements AfterViewInit, OnDestr
         this.controlSubscription = this.control?.valueChanges.subscribe((newValue) => {
             this.onControlValueChange(newValue);
         });
-
-        // Opening or closing the keyboard also calls the resize function, but sometimes the resize is called too soon.
-        // Check the height again, now the window height should have been updated.
-        this.keyboardObserver = CoreEvents.on(CoreEvents.KEYBOARD_CHANGE, () => {
-            this.maximizeEditorSize();
-        });
     }
 
     /**
      * @inheritdoc
      */
     ngOnDestroy(): void {
         this.resizeListener?.off();
-        this.keyboardObserver?.off();
         this.controlSubscription?.unsubscribe();
         this.resetObserver?.off();
         this.labelObserver?.disconnect();

src/core/features/fileuploader/services/fileuploader-helper.ts

@@ -140,7 +140,7 @@ export class CoreFileUploaderHelperProvider {
 
         if (size < 0) {
             return CoreAlerts.confirm(Translate.instant('core.fileuploader.confirmuploadunknownsize'));
-        } else if (size >= wifiThreshold || (CoreNetwork.isNetworkAccessLimited() && size >= limitedThreshold)) {
+        } else if (size >= wifiThreshold || (CoreNetwork.isCellular() && size >= limitedThreshold)) {
             const readableSize = CoreText.bytesToSize(size, 2);
 
             return CoreAlerts.confirm(Translate.instant('core.fileuploader.confirmuploadfile', { size: readableSize }));