Integration

.gitignore

@@ -9,3 +9,4 @@ www/build
 .sass-cache/
 www/lib
 e2e/build
+/desktop

AppXManifest.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
+  <Identity Name="3312ADB7.MoodleDesktop"
+    ProcessorArchitecture="x64"
+    Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
+    Version="3.3.0.0" />
+  <Properties>
+    <DisplayName>Moodle Desktop</DisplayName>
+    <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>
+    <Description>The official app for Moodle.</Description>
+    <Logo>assets\StoreLogo.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="en" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.14316.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust"/>
+  </Capabilities>
+  <Applications>
+    <Application Id="com.moodle.moodlemobile" Executable="app\MoodleDesktop.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+       BackgroundColor="#464646"
+       DisplayName="Moodle Desktop"
+       Square150x150Logo="assets\Square150x150Logo.png"
+       Square44x44Logo="assets\Square44x44Logo.png"
+       Description="Moodle Desktop: The official desktop app for Moodle.">
+        <uap:DefaultTile Wide310x150Logo="assets\Wide310x150Logo.png" />
+      </uap:VisualElements>
+      <Extensions>
+        <uap:Extension Category="windows.protocol">
+          <uap:Protocol Name="moodlemobile">
+            <uap:DisplayName>Moodle Mobile URI Scheme</uap:DisplayName>
+          </uap:Protocol>
+        </uap:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+</Package>

config.xml

@@ -1,77 +1,89 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.moodle.moodlemobile" version="3.3.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <name>Moodle Mobile</name>
-  <description>Official Moodle Mobile app</description>
-  <author href="http://moodle.com" email="juan@moodle.com">Juan Leyva</author>
-  <content src="index.html"/>
-  <access origin="*"/>
-  <allow-navigation href="cdvfile:*"/>
-  <allow-navigation href="content:*"/>
-  <allow-navigation href="data:*"/>
-  <allow-navigation href="*"/>
-  <allow-intent href="*"/>
-  <preference name="webviewbounce" value="false"/>
-  <preference name="UIWebViewBounce" value="false"/>
-  <preference name="DisallowOverscroll" value="true"/>
-  <preference name="BackupWebStorage" value="none"/>
-  <preference name="SplashScreen" value="screen"/>
-  <preference name="SplashScreenDelay" value="3000"/>
-  <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
-  <preference name="android-minSdkVersion" value="14" />
-  <preference name="android-targetSdkVersion" value="19" />
-  <preference name="AppendUserAgent" value="MoodleMobile" />
-  <feature name="StatusBar">
-    <param name="ios-package" value="CDVStatusBar" onload="true"/>
-  </feature>
-  <platform name="android">
-    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
-    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
-    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
-    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
-    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
-    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
-    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
-    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
-    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
-    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
-    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
-    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
-    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
-  </platform>
-  <platform name="ios">
-    <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
-    <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
-    <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
-    <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
-    <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
-    <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
-    <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
-    <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
-    <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
-    <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
-    <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
-    <icon src="resources/ios/icon/icon@2x.png" width="114" height="114"/>
-    <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
-    <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
-    <icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/>
-    <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
-    <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
-    <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
-    <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
-    <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
-    <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
-    <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
-    <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
-    <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
-    <icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/>
-    <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
-    <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
-    <icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/>
-  </platform>
-  <icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.moodle.moodlemobile" version="3.3.1">
+    <name>Moodle Mobile</name>
+    <description>
+        Moodle Mobile official app
+    </description>
+    <author href="http://moodle.com" email="mobile@moodle.com">
+        Moodle Mobile team
+    </author>
+    <content src="index.html"/>
+    <access origin="*"/>
+    <access origin="tel:*" launch-external="yes"/>
+    <access origin="mailto:*" launch-external="yes"/>
+    <access origin="geo:*" launch-external="yes"/>
+    <allow-navigation href="cdvfile:*"/>
+    <allow-navigation href="content:*"/>
+    <allow-navigation href="data:*"/>
+    <allow-navigation href="*"/>
+    <allow-intent href="*"/>
+    <preference name="orientation" value="default"/>
+    <preference name="target-device" value="universal"/>
+    <preference name="fullscreen" value="false"/>
+    <preference name="webviewbounce" value="false"/>
+    <preference name="AppendUserAgent" value="MoodleMobile"/>
+    <preference name="android-minSdkVersion" value="14"/>
+    <preference name="android-targetSdkVersion" value="19"/>
+    <preference name="UIWebViewBounce" value="false"/>
+    <preference name="DisallowOverscroll" value="true"/>
+    <preference name="BackupWebStorage" value="none"/>
+    <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
+    <preference name="AndroidPersistentFileLocation" value="Compatibility"/>
+    <preference name="iosPersistentFileLocation" value="Compatibility"/>
+    <preference name="SplashScreen" value="screen"/>
+    <preference name="SplashScreenDelay" value="3000"/>
+    <feature name="StatusBar">
+        <param name="ios-package" value="CDVStatusBar" onload="true"/>
+    </feature>
+    <platform name="android">
+        <splash src="resources/android/splash/drawable-land-ldpi-screen.png" qualifier="land-ldpi"/>
+        <splash src="resources/android/splash/drawable-land-mdpi-screen.png" qualifier="land-mdpi"/>
+        <splash src="resources/android/splash/drawable-land-hdpi-screen.png" qualifier="land-hdpi"/>
+        <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" qualifier="land-xhdpi"/>
+        <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" qualifier="land-xxhdpi"/>
+        <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" qualifier="land-xxxhdpi"/>
+        <splash src="resources/android/splash/drawable-port-ldpi-screen.png" qualifier="port-ldpi"/>
+        <splash src="resources/android/splash/drawable-port-mdpi-screen.png" qualifier="port-mdpi"/>
+        <splash src="resources/android/splash/drawable-port-hdpi-screen.png" qualifier="port-hdpi"/>
+        <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" qualifier="port-xhdpi"/>
+        <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" qualifier="port-xxhdpi"/>
+        <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" qualifier="port-xxxhdpi"/>
+        <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
+        <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
+        <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
+        <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
+        <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
+        <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
+    </platform>
+    <platform name="ios">
+        <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
+        <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
+        <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
+        <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
+        <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
+        <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
+        <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
+        <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
+        <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
+        <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
+        <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
+        <icon src="resources/ios/icon/icon@2x.png" width="114" height="114"/>
+        <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
+        <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
+        <icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/>
+        <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
+        <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
+        <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
+        <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
+        <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
+        <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
+        <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
+        <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
+        <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
+        <icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/>
+        <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
+        <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
+        <icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/>
+    </platform>
+    <icon src="resources/ios/icon/icon-small@3x.png"/>
 </widget>

package.json

@@ -1,7 +1,11 @@
 {
-  "name": "mm2",
-  "version": "1.0.0",
-  "description": "Moodle Mobile 2: The official mobile app for Moodle.",
+  "name": "com.moodle.moodlemobile",
+  "version": "3.3.0",
+  "description": "The official app for Moodle.",
+  "author": {
+    "name": "Moodle Pty Ltd.",
+    "email": "mobile@moodle.com"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/moodlehq/moodlemobile2.git"
@@ -14,22 +18,25 @@
     }
   ],
   "dependencies": {
+    "electron-windows-notifications": "^1.1.13",
+    "electron-builder-squirrel-windows": "^19.3.0"
   },
   "devDependencies": {
     "appium": "^1.6.0",
     "bower": "^1.3.3",
+    "electron-rebuild": "^1.5.11",
     "gulp": "^3.9.1",
-    "gulp-clean-css": "^3.0.3",
-    "gulp-concat": "^2.6.0",
-    "gulp-rename": "^1.2.0",
-    "gulp-sass": "^2.3.2",
     "gulp-clean": "^0.3.2",
+    "gulp-clean-css": "^3.0.3",
     "gulp-clip-empty-files": "^0.1.1",
+    "gulp-concat": "^2.6.0",
     "gulp-concat-util": "^0.5.2",
     "gulp-file": "^0.3.0",
     "gulp-insert": "^0.5.0",
     "gulp-ng-annotate": "^2.0.0",
     "gulp-remove-empty-lines": "0.0.8",
+    "gulp-rename": "^1.2.0",
+    "gulp-sass": "^2.3.2",
     "gulp-slash": "^1.1.3",
     "gulp-strip-comments": "^2.4.3",
     "gulp-tap": "^0.1.3",
@@ -121,6 +128,45 @@
     "android": "ionic run android",
     "serve.e2e": "ionic serve -b -a",
     "serve.dev": "ionic serve",
-    "e2e": "protractor e2e/build/protractor.conf.js"
+    "e2e": "protractor e2e/build/protractor.conf.js",
+    "desktop.pack": "build --dir",
+    "desktop.dist": "build",
+    "windows.store": "electron-windows-store --input-directory .\\desktop\\dist\\win-unpacked --output-directory .\\desktop\\store --flatten true -a .\\resources\\desktop -m .\\AppXManifest.xml --package-version 0.0.0.0 --package-name MoodleDesktop"
+  },
+  "main": "www/electron.js",
+  "build": {
+    "appId": "com.moodle.moodlemobile",
+    "productName": "MoodleDesktop",
+    "files": [
+      "!desktop",
+      "!**/e2e",
+      "!hooks",
+      "!platforms",
+      "!plugins",
+      "!resources",
+      "!**/*.scss"
+    ],
+    "directories": {
+      "output": "desktop/dist"
+    },
+    "protocols": [
+      {
+        "name": "Moodle Mobile URL",
+        "schemes": [
+          "moodlemobile"
+        ],
+        "role": "Viewer"
+      }
+    ],
+    "compression": "maximum",
+    "electronVersion": "1.6.11",
+    "mac": {
+      "category": "public.app-category.education",
+      "icon": "resources/desktop/icon.icns"
+    },
+    "win": {
+      "target": "appx",
+      "icon": "resources/desktop/icon.ico"
+    }
   }
 }

scss/app.scss

@@ -50,27 +50,46 @@ $mm-color:          $orange;
 $mm-color-light:    lighten($mm-color, 10%);
 $mm-color-dark:     darken($mm-color, 10%);
 
+$mm-color-init-screen:          #ff5c00;
+$mm-color-init-screen-alt:      #ff7600;
+$mm-init-screen-spinner-color:  $white;
+$mm-init-screen-logo-width:     60%;
+$mm-init-screen-logo-max-width: 300px;
+
+$mm-fixed-url:                  false;
+
 $mm-buttons-color: $positive;
 
 // Change Ionic default elements colors.
 $base-color: $black !default;
 $base-background-color: $gray-light !default;
 
 $item-default-text: $black;
-$sheet-options-text-color: $positive;
+$sheet-options-text-color: $mm-buttons-color;
+
+$item-default-bg: $white;
+$item-divider-bg: $gray-lighter;
+$item-disabled-color: $gray-dark !default;
+
+$button-light-border: $gray;
 
 // Header.
 $bar-content-bg: $mm-color !default;
 $bar-content-border: transparent !default;
 $bar-content-text: $white !default;
 
-$item-default-bg: $white;
-$item-divider-bg: $gray-lighter;
-$item-disabled-color: $gray-dark !default;
+$bar-side-menu-height: 80px !default;
+$bar-side-menu-color: $bar-content-bg !default;
+$bar-side-menu-border-color: $bar-content-border !default;
+$bar-side-menu-text-color: $bar-content-text !default;
 
-$button-light-border: $gray;
+$bar-side-menu-item-border-color: $button-light-border;
+$bar-side-menu-item-divider-color: $item-divider-bg;
+$bar-side-menu-item-background-color: $item-default-bg;
+$bar-side-menu-item-text-color: $item-default-text;
+$bar-side-menu-item-icon-color: $gray-darker;
 
-$toggle-on-default-bg: $blue;
+$toggle-on-default-bg: $mm-buttons-color;
 
 $tabs-off-opacity:                0.6;
 $tabs-striped-off-opacity:        $tabs-off-opacity;
@@ -82,6 +101,11 @@ $button-default-border: $mm-buttons-color !default;
 $button-default-active-bg: $mm-buttons-color !default;
 $button-default-active-border: $mm-buttons-color !default;
 
+$button-positive-bg:              $mm-buttons-color !default;
+$button-positive-border:          darken($mm-buttons-color, 10%) !default;
+$button-positive-active-bg:       darken($mm-buttons-color, 10%) !default;
+$button-positive-active-border:   darken($mm-buttons-color, 10%) !default;
+
 // The path to the font icons.
 $ionicons-font-path: "../lib/ionic/release/fonts" !default;
 
@@ -92,7 +116,7 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   color: $gray-darker;
 
   &.positive {
-    color: $positive;
+    color: $mm-buttons-color;
   }
   &.assertive {
     color: $assertive;
@@ -112,7 +136,7 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   &.activated,
   &.active .icon,
   &.activated .icon {
-    color: $positive;
+    color: $mm-buttons-color;
 
     &.assertive {
       color: $assertive;
@@ -144,7 +168,7 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   color: $assertive;
 }
 
-// Setting the default button to button-outline positive.
+// Setting the default button to button-outline $mm-buttons-color.
 .button {
   &.button-light,
   &.button-stable,