MOBILE-4166 core: Move some CoreApp functions to CorePlatform

Author: dpalou

src/addons/filter/mediaplugin/classes/videojs-ogvjs.ts

@@ -123,7 +123,7 @@ export class VideoJSOgvJS extends Tech {
         this.playerId = options.playerId;
 
         this.on('loadedmetadata', () => {
-            if (CoreApp.isIPhone()) {
+            if (CorePlatform.isIPhone()) {
                 // iPhoneOS add some inline styles to the canvas, we need to remove it.
                 const canvas = this.el_.getElementsByTagName('canvas')[0];
 
@@ -186,7 +186,7 @@ export class VideoJSOgvJS extends Tech {
      * @returns True if volume can be controlled.
      */
     static canControlVolume(): boolean {
-        if (CoreApp.isIPhone()) {
+        if (CorePlatform.isIPhone()) {
             return false;
         }
 
@@ -393,7 +393,7 @@ export class VideoJSOgvJS extends Tech {
      */
     setVolume(percentAsDecimal: number): void {
         // eslint-disable-next-line no-prototype-builtins
-        if (!CoreApp.isIPhone() && this.el_.hasOwnProperty('volume')) {
+        if (!CorePlatform.isIPhone() && this.el_.hasOwnProperty('volume')) {
             this.el_.volume = percentAsDecimal;
         }
     }

src/addons/mod/data/fields/latlong/component/latlong.ts

@@ -18,8 +18,8 @@ import { Component } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { SafeUrl } from '@angular/platform-browser';
 import { CoreAnyError } from '@classes/errors/error';
-import { CoreApp } from '@services/app';
 import { CoreGeolocation, CoreGeolocationError, CoreGeolocationErrorReason } from '@services/geolocation';
+import { CorePlatform } from '@services/platform';
 import { CoreDomUtils } from '@services/utils/dom';
 import { DomSanitizer } from '@singletons';
 
@@ -73,7 +73,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginBa
             const northFixed = north ? north.toFixed(4) : '0.0000';
             const eastFixed = east ? east.toFixed(4) : '0.0000';
 
-            if (CoreApp.isIOS()) {
+            if (CorePlatform.isIOS()) {
                 url = 'http://maps.apple.com/?ll=' + northFixed + ',' + eastFixed + '&near=' + northFixed + ',' + eastFixed;
             } else {
                 url = 'geo:' + northFixed + ',' + eastFixed;

src/addons/mod/resource/components/index/index.ts

@@ -19,7 +19,6 @@ import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
-import { CoreApp } from '@services/app';
 import { CoreNetwork } from '@services/network';
 import { CoreFileHelper } from '@services/file-helper';
 import { CoreSites } from '@services/sites';
@@ -35,6 +34,7 @@ import {
     AddonModResourceProvider,
 } from '../../services/resource';
 import { AddonModResourceHelper } from '../../services/resource-helper';
+import { CorePlatform } from '@services/platform';
 
 /**
  * Component that displays a resource.
@@ -79,7 +79,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
     async ngOnInit(): Promise<void> {
         super.ngOnInit();
 
-        this.isIOS = CoreApp.isIOS();
+        this.isIOS = CorePlatform.isIOS();
         this.isOnline = CoreNetwork.isOnline();
 
         // Refresh online status when changes.

src/core/components/file/file.ts

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, Input, Output, OnInit, OnDestroy, EventEmitter } from '@angular/core';
-import { CoreApp } from '@services/app';
 import { CoreNetwork } from '@services/network';
 import { CoreFilepool } from '@services/filepool';
 import { CoreFileHelper } from '@services/file-helper';
@@ -27,6 +26,7 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreConstants } from '@/core/constants';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
 import { CoreWSFile } from '@services/ws';
+import { CorePlatform } from '@services/platform';
 
 /**
  * Component to handle a remote file. Shows the file name, icon (depending on mimetype) and a button
@@ -87,7 +87,7 @@ export class CoreFileComponent implements OnInit, OnDestroy {
         this.fileSize = this.file.filesize;
         this.fileName = this.file.filename || '';
 
-        this.isIOS = CoreApp.isIOS();
+        this.isIOS = CorePlatform.isIOS();
         this.defaultIsOpenWithPicker = CoreFileHelper.defaultIsOpenWithPicker();
         this.openButtonIcon = this.defaultIsOpenWithPicker ? 'fas-file' : 'fas-share-square';
         this.openButtonLabel = this.defaultIsOpenWithPicker ? 'core.openfile' : 'core.openwith';

src/core/components/loading/loading.ts

@@ -21,7 +21,7 @@ import { Translate } from '@singletons';
 import { CoreDirectivesRegistry } from '@singletons/directives-registry';
 import { CorePromisedValue } from '@classes/promised-value';
 import { AsyncDirective } from '@classes/async-directive';
-import { CoreApp } from '@services/app';
+import { CorePlatform } from '@services/platform';
 
 /**
  * Component to show a loading spinner and message while data is being loaded.
@@ -146,7 +146,7 @@ export class CoreLoadingComponent implements OnInit, OnChanges, AfterViewInit, A
         if (loaded) {
             this.onReadyPromise.resolve();
             this.restoreScrollPosition();
-            if (CoreApp.isIOS()) {
+            if (CorePlatform.isIOS()) {
                 this.mutationObserver.observe(this.element, { childList: true });
             }
         } else {

src/core/components/local-file/local-file.ts

@@ -25,8 +25,8 @@ import { CoreTextUtils } from '@services/utils/text';
 import { CoreTimeUtils } from '@services/utils/time';
 import { CoreUtils, CoreUtilsOpenFileOptions, OpenFileAction } from '@services/utils/utils';
 import { CoreForms } from '@singletons/form';
-import { CoreApp } from '@services/app';
 import { CorePath } from '@singletons/path';
+import { CorePlatform } from '@services/platform';
 
 /**
  * Component to handle a local file. Only files inside the app folder can be managed.
@@ -83,7 +83,7 @@ export class CoreLocalFileComponent implements OnInit {
 
         this.timemodified = CoreTimeUtils.userDate(metadata.modificationTime.getTime(), 'core.strftimedatetimeshort');
 
-        this.isIOS = CoreApp.isIOS();
+        this.isIOS = CorePlatform.isIOS();
         this.defaultIsOpenWithPicker = CoreFileHelper.defaultIsOpenWithPicker();
         this.openButtonIcon = this.defaultIsOpenWithPicker ? 'fas-file' : 'fas-share-square';
         this.openButtonLabel = this.defaultIsOpenWithPicker ? 'core.openfile' : 'core.openwith';

src/core/components/show-password/show-password.ts

@@ -15,7 +15,7 @@
 import { Component, OnInit, AfterViewInit, Input, ElementRef, ContentChild } from '@angular/core';
 import { IonInput } from '@ionic/angular';
 
-import { CoreApp } from '@services/app';
+import { CorePlatform } from '@services/platform';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 
@@ -121,7 +121,7 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
 
         this.setData(this.input);
         // In Android, the keyboard is closed when the input type changes. Focus it again.
-        if (isFocused && CoreApp.isAndroid()) {
+        if (isFocused && CorePlatform.isAndroid()) {
             CoreDomUtils.focusElement(this.input);
         }
     }

src/core/directives/external-content.ts

@@ -23,7 +23,6 @@ import {
     EventEmitter,
     OnDestroy,
 } from '@angular/core';
-import { CoreApp } from '@services/app';
 import { CoreFile } from '@services/file';
 import { CoreFilepool, CoreFilepoolFileActions, CoreFilepoolFileEventData } from '@services/filepool';
 import { CoreSites } from '@services/sites';
@@ -39,6 +38,7 @@ import { Translate } from '@singletons';
 import { AsyncDirective } from '@classes/async-directive';
 import { CoreDirectivesRegistry } from '@singletons/directives-registry';
 import { CorePromisedValue } from '@classes/promised-value';
+import { CorePlatform } from '@services/platform';
 
 /**
  * Directive to handle external content.
@@ -117,7 +117,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges, O
         newSource.setAttribute('src', url);
 
         if (type) {
-            if (CoreApp.isAndroid() && type == 'video/quicktime') {
+            if (CorePlatform.isAndroid() && type == 'video/quicktime') {
                 // Fix for VideoJS/Chrome bug https://github.com/videojs/video.js/issues/423 .
                 newSource.setAttribute('type', 'video/mp4');
             } else {

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

@@ -19,7 +19,6 @@ import { ChooserResult } from '@ionic-native/chooser/ngx';
 import { FileEntry, IFile } from '@ionic-native/file/ngx';
 import { MediaFile } from '@ionic-native/media-capture/ngx';
 
-import { CoreApp } from '@services/app';
 import { CoreNetwork } from '@services/network';
 import { CoreFile, CoreFileProvider, CoreFileProgressEvent } from '@services/file';
 import { CoreDomUtils } from '@services/utils/dom';
@@ -652,7 +651,7 @@ export class CoreFileUploaderHelperProvider {
                 options.mediaType = Camera.MediaType.PICTURE;
             } else if (!imageSupported && videoSupported) {
                 options.mediaType = Camera.MediaType.VIDEO;
-            } else if (CoreApp.isIOS()) {
+            } else if (CorePlatform.isIOS()) {
                 // Only get all media in iOS because in Android using this option allows uploading any kind of file.
                 options.mediaType = Camera.MediaType.ALLMEDIA;
             }

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

@@ -18,7 +18,6 @@ import { FileEntry } from '@ionic-native/file/ngx';
 import { MediaFile, CaptureError, CaptureAudioOptions, CaptureVideoOptions } from '@ionic-native/media-capture/ngx';
 import { Subject } from 'rxjs';
 
-import { CoreApp } from '@services/app';
 import { CoreFile, CoreFileProvider } from '@services/file';
 import { CoreFilepool } from '@services/filepool';
 import { CoreSites } from '@services/sites';
@@ -33,6 +32,7 @@ import { CoreError } from '@classes/errors/error';
 import { CoreSite } from '@classes/site';
 import { CoreFileEntry, CoreFileHelper } from '@services/file-helper';
 import { CorePath } from '@singletons/path';
+import { CorePlatform } from '@services/platform';
 
 /**
  * File upload options.
@@ -236,7 +236,7 @@ export class CoreFileUploaderProvider {
     getCameraUploadOptions(uri: string, isFromAlbum?: boolean): CoreFileUploaderOptions {
         const extension = CoreMimetypeUtils.guessExtensionFromUrl(uri);
         const mimetype = CoreMimetypeUtils.getMimeType(extension);
-        const isIOS = CoreApp.isIOS();
+        const isIOS = CorePlatform.isIOS();
         const options: CoreFileUploaderOptions = {
             deleteAfterUpload: !isFromAlbum,
             mimeType: mimetype,
@@ -259,7 +259,7 @@ export class CoreFileUploaderProvider {
             // If the file was picked from the album, delete it only if it was copied to the app's folder.
             options.deleteAfterUpload = CoreFile.isFileInAppFolder(uri);
 
-            if (CoreApp.isAndroid()) {
+            if (CorePlatform.isAndroid()) {
                 // Picking an image from album in Android adds a timestamp at the end of the file. Delete it.
                 options.fileName = options.fileName.replace(/(\.[^.]*)\?[^.]*$/, '$1');
             }