Integration

.travis.yml

@@ -3,14 +3,14 @@ dist: xenial
 group: edge
 
 language: node_js
-node_js: stable
+node_js: 11
 
 before_cache:
   - rm -rf $HOME/.cache/electron-builder/wine
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
     - $HOME/.cache/electron
     - $HOME/.cache/electron-builder
 

Dockerfile

@@ -11,15 +11,15 @@ EXPOSE 35729
 # Port 53703 is the Chrome dev logger port.
 EXPOSE 53703
 
-# MoodleMobile uses Cordova, Ionic, and Gulp.
-RUN npm install -g cordova ionic gulp && rm -rf /root/.npm
+# MoodleMobile uses Ionic and Gulp.
+RUN npm i -g ionic gulp && rm -rf /root/.npm
 
 WORKDIR /app
 
 COPY . /app
 
-# The setup script will handle npm installation, cordova setup, and gulp setup.
-RUN npm run setup && rm -rf /root/.npm
+# Install npm libraries and run gulp to initialize the project.
+RUN npm install && gulp && rm -rf /root/.npm
 
 # Provide a Healthcheck command for easier use in CI.
 HEALTHCHECK --interval=10s --timeout=3s --start-period=30s CMD curl -f http://localhost:8100 || exit 1

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.moodle.moodlemobile" version="3.6.1" 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 id="com.moodle.moodlemobile" version="3.7.0" 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="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
@@ -37,6 +37,7 @@
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <preference name="LoadUrlTimeoutValue" value="60000" />
+    <preference name="CustomURLSchemePluginClearsAndroidIntent" value="true" />
     <feature name="StatusBar">
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
@@ -112,14 +113,14 @@
         <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
         <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
     </platform>
-    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="1.1.5" />
-    <plugin name="cordova-android-support-gradle-release" spec="2.0.1">
+    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="1.1.7" />
+    <plugin name="cordova-android-support-gradle-release" spec="3.0.0">
         <variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" />
     </plugin>
     <plugin name="cordova-clipboard" spec="1.2.1" />
     <plugin name="cordova-plugin-badge" spec="0.8.8" />
     <plugin name="cordova-plugin-camera" spec="4.0.3" />
-    <plugin name="cordova-plugin-customurlscheme" spec="4.3.0">
+    <plugin name="cordova-plugin-customurlscheme" spec="4.4.0">
         <variable name="URL_SCHEME" value="moodlemobile" />
     </plugin>
     <plugin name="cordova-plugin-device" spec="2.0.2" />
@@ -129,7 +130,7 @@
     <plugin name="cordova-plugin-globalization" spec="1.11.0" />
     <plugin name="cordova-plugin-inappbrowser" spec="3.0.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="2.1.3" />
-    <plugin name="cordova-plugin-local-notification" spec="0.9.0-beta.3" />
+    <plugin name="cordova-plugin-local-notification" spec="https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle" />
     <plugin name="cordova-plugin-media-capture" spec="3.0.2" />
     <plugin name="cordova-plugin-network-information" spec="2.0.1" />
     <plugin name="cordova-plugin-screen-orientation" spec="3.0.1" />
@@ -139,13 +140,19 @@
     <plugin name="cordova-plugin-zip" spec="3.1.0" />
     <plugin name="cordova-sqlite-storage" spec="2.6.0" />
     <plugin name="nl.kingsquare.cordova.background-audio" spec="1.0.1" />
-    <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v2">
+    <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3">
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
-        <variable name="FCM_VERSION" value="17.0.+" />
+        <variable name="FCM_VERSION" value="17.5.+" />
     </plugin>
     <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" android:debuggable="true" />
     </edit-config>
+    <config-file parent="/manifest/application" target="AndroidManifest.xml">
+        <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
+    </config-file>
+    <config-file parent="FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED" target="*-Info.plist">
+        <string>YES</string>
+    </config-file>
     <engine name="android" spec="7.1.2" />
     <engine name="ios" spec="4.5.5" />
 </widget>

desktop/assets/windows/AppXManifest.xml

@@ -6,7 +6,7 @@
   <Identity Name="3312ADB7.MoodleDesktop"
     ProcessorArchitecture="x64"
     Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
-    Version="3.6.1.0" />
+    Version="3.7.0.0" />
   <Properties>
     <DisplayName>Moodle Desktop</DisplayName>
     <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

desktop/electron.js

@@ -6,6 +6,7 @@ const url = require('url');
 const fs = require('fs');
 const os = require('os');
 const userAgent = 'MoodleMobile';
+const isMac = os.platform().indexOf('darwin') != -1;
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -68,14 +69,22 @@ function createWindow() {
 
     // Append some text to the user agent.
     mainWindow.webContents.setUserAgent(mainWindow.webContents.getUserAgent() + ' ' + userAgent);
+
+    // Add shortcut to open dev tools: Cmd + Option + I in MacOS, Ctrl + Shift + I in Windows/Linux.
+    mainWindow.webContents.on('before-input-event', function(e, input) {
+        if (input.type == 'keyDown' && !input.isAutoRepeat && input.code == 'KeyI' &&
+                ((isMac && input.alt && input.meta) || (!isMac && input.shift && input.control))) {
+            mainWindow.webContents.toggleDevTools();
+        }
+    }, true)
 }
 
 // Make sure that only a single instance of the app is running.
 // For some reason, gotTheLock is always false in signed Mac apps so we should ingore it.
 // See https://github.com/electron/electron/issues/15958
 var gotTheLock = app.requestSingleInstanceLock();
 
-if (!gotTheLock && os.platform().indexOf('darwin') == -1) {
+if (!gotTheLock && !isMac) {
     // It's not the main instance of the app, kill it.
     app.exit();
     return;
@@ -221,22 +230,18 @@ function setAppMenu() {
             submenu: [
                 {
                     label: 'Cut',
-                    accelerator: 'CmdOrCtrl+X',
                     role: 'cut'
                 },
                 {
                     label: 'Copy',
-                    accelerator: 'CmdOrCtrl+C',
                     role: 'copy'
                 },
                 {
                     label: 'Paste',
-                    accelerator: 'CmdOrCtrl+V',
                     role: 'paste'
                 },
                 {
                     label: 'Select All',
-                    accelerator: 'CmdOrCtrl+A',
                     role: 'selectall'
                 }
             ]

gulpfile.js

@@ -8,6 +8,8 @@ var gulp = require('gulp'),
     gutil = require('gulp-util'),
     flatten = require('gulp-flatten'),
     npmPath = require('path'),
+    concat = require('gulp-concat'),
+    bufferFrom = require('buffer-from')
     File = gutil.File,
     exec = require('child_process').exec,
     license = '' +
@@ -113,7 +115,7 @@ function treatMergedData(data) {
         mergedOrdered[k] = merged[k];
     });
 
-    return new Buffer(JSON.stringify(mergedOrdered, null, 4));
+    return bufferFrom(JSON.stringify(mergedOrdered, null, 4));
 }
 
 /**
@@ -257,7 +259,7 @@ gulp.task('config', function(done) {
 
                 contents += '}\n';
 
-                file.contents = new Buffer(contents);
+                file.contents = bufferFrom(contents);
                 this.emit('data', file);
             }))
             .pipe(rename('configconstants.ts'))
@@ -296,3 +298,129 @@ gulp.task('copy-component-templates', function(done) {
         .on('end', done);
 });
 
+/**
+ * Finds the file and returns its content.
+ *
+ * @param  {string} capture     Import file path.
+ * @param  {string} baseDir     Directory where the file was found.
+ * @param  {string} paths       Alternative paths where to find the imports.
+ * @param  {Array} parsedFiles  Yet parsed files to reduce size of the result.
+ * @return {string}             Partially combined scss.
+ */
+function getReplace(capture, baseDir, paths, parsedFiles) {
+    var parse   = path.parse(path.resolve(baseDir, capture + '.scss'));
+    var file    = parse.dir + '/' + parse.name;
+
+
+    if (!fs.existsSync(file + '.scss')) {
+        // File not found, might be a partial file.
+        file    = parse.dir + '/_' + parse.name;
+    }
+
+    // If file still not found, try to find the file in the alternative paths.
+    var x = 0;
+    while (!fs.existsSync(file + '.scss') && paths.length > x) {
+        parse   = path.parse(path.resolve(paths[x], capture + '.scss'));
+        file    = parse.dir + '/' + parse.name;
+
+        x++;
+    }
+
+    file    = file + '.scss';
+
+    if (!fs.existsSync(file)) {
+        // File not found. Leave the import there.
+        console.log('File "' + capture + '" not found');
+        return '@import "' + capture + '";';
+    }
+
+    if (parsedFiles.indexOf(file) >= 0) {
+        console.log('File "' + capture + '" already parsed');
+        // File was already parsed, leave the import commented.
+        return '// @import "' + capture + '";';
+    }
+
+    parsedFiles.push(file);
+    var text = fs.readFileSync(file);
+
+    // Recursive call.
+    return scssCombine(text, parse.dir, paths, parsedFiles);
+}
+
+/**
+ * Combine scss files with its imports
+ *
+ * @param  {string} content     Scss string to read.
+ * @param  {string} baseDir     Directory where the file was found.
+ * @param  {string} paths       Alternative paths where to find the imports.
+ * @param  {Array} parsedFiles  Yet parsed files to reduce size of the result.
+ * @return {string}             Scss string with the replaces done.
+ */
+function scssCombine(content, baseDir, paths, parsedFiles) {
+
+    // Content is a Buffer, convert to string.
+    if (typeof content != "string") {
+        content = content.toString();
+    }
+
+    // Search of single imports.
+    var regex = /@import[ ]*['"](.*)['"][ ]*;/g;
+
+    if (regex.test(content)) {
+        return content.replace(regex, function(m, capture) {
+            if (capture == "bmma") {
+                return m;
+            }
+
+            return getReplace(capture, baseDir, paths, parsedFiles);
+        });
+    }
+
+    // Search of multiple imports.
+    regex = /@import(?:[ \n]+['"](.*)['"][,]?[ \n]*)+;/gm;
+    if (regex.test(content)) {
+        return content.replace(regex, function(m, capture) {
+            var text = "";
+
+            // Divide the import into multiple files.
+            regex = /['"]([^'"]*)['"]/g;
+            var captures = m.match(regex);
+            for (var x in captures) {
+                text += getReplace(captures[x].replace(/['"]+/g, ''), baseDir, paths, parsedFiles) + "\n";
+            }
+
+            return text;
+        });
+    }
+
+    return content;
+}
+
+gulp.task('combine-scss', function(done) {
+    var paths = [
+        'node_modules/ionic-angular/themes/',
+        'node_modules/font-awesome/scss/',
+        'node_modules/ionicons/dist/scss/'
+    ];
+
+    var parsedFiles = [];
+
+    gulp.src([
+            './src/theme/variables.scss',
+            './node_modules/ionic-angular/themes/ionic.globals.*.scss',
+            './node_modules/ionic-angular/themes/ionic.components.scss',
+            './src/**/*.scss'])  // define a source files
+        .pipe(through(function(file, encoding, callback) {
+            if (file.isNull()) {
+                return;
+            }
+
+            parsedFiles.push(file);
+            file.contents = bufferFrom(scssCombine(file.contents, path.dirname(file.path), paths, parsedFiles));
+
+            this.emit('data', file);
+        }))   // combine them based on @import and save it to stream
+        .pipe(concat('combined.scss')) // concat the stream output in single file
+        .pipe(gulp.dest('.'))  // save file to destination.
+        .on('end', done);
+});