Skip to content

Commit 205f6b2

Browse files
jleyvajleyva
authored
Merge pull request #1114 from moodlehq/integration
Integration
2 parents d9cad42 + aa911b6 commit 205f6b2

File tree

946 files changed

+18388
-3373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

946 files changed

+18388
-3373
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ www/build
99
.sass-cache/
1010
www/lib
1111
e2e/build
12+
/desktop

‎AppXManifest.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Package
3+
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
4+
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
5+
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
6+
<Identity Name="3312ADB7.MoodleDesktop"
7+
ProcessorArchitecture="x64"
8+
Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
9+
Version="3.3.0.0" />
10+
<Properties>
11+
<DisplayName>Moodle Desktop</DisplayName>
12+
<PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>
13+
<Description>The official app for Moodle.</Description>
14+
<Logo>assets\StoreLogo.png</Logo>
15+
</Properties>
16+
<Resources>
17+
<Resource Language="en" />
18+
</Resources>
19+
<Dependencies>
20+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.14316.0" />
21+
</Dependencies>
22+
<Capabilities>
23+
<rescap:Capability Name="runFullTrust"/>
24+
</Capabilities>
25+
<Applications>
26+
<Application Id="com.moodle.moodlemobile" Executable="app\MoodleDesktop.exe" EntryPoint="Windows.FullTrustApplication">
27+
<uap:VisualElements
28+
BackgroundColor="#464646"
29+
DisplayName="Moodle Desktop"
30+
Square150x150Logo="assets\Square150x150Logo.png"
31+
Square44x44Logo="assets\Square44x44Logo.png"
32+
Description="Moodle Desktop: The official desktop app for Moodle.">
33+
<uap:DefaultTile Wide310x150Logo="assets\Wide310x150Logo.png" />
34+
</uap:VisualElements>
35+
<Extensions>
36+
<uap:Extension Category="windows.protocol">
37+
<uap:Protocol Name="moodlemobile">
38+
<uap:DisplayName>Moodle Mobile URI Scheme</uap:DisplayName>
39+
</uap:Protocol>
40+
</uap:Extension>
41+
</Extensions>
42+
</Application>
43+
</Applications>
44+
</Package>

‎config.xml‎

Lines changed: 87 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,89 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<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">
3-
<name>Moodle Mobile</name>
4-
<description>Official Moodle Mobile app</description>
5-
<author href="http://moodle.com" email="[email protected]">Juan Leyva</author>
6-
<content src="index.html"/>
7-
<access origin="*"/>
8-
<allow-navigation href="cdvfile:*"/>
9-
<allow-navigation href="content:*"/>
10-
<allow-navigation href="data:*"/>
11-
<allow-navigation href="*"/>
12-
<allow-intent href="*"/>
13-
<preference name="webviewbounce" value="false"/>
14-
<preference name="UIWebViewBounce" value="false"/>
15-
<preference name="DisallowOverscroll" value="true"/>
16-
<preference name="BackupWebStorage" value="none"/>
17-
<preference name="SplashScreen" value="screen"/>
18-
<preference name="SplashScreenDelay" value="3000"/>
19-
<preference name="KeyboardDisplayRequiresUserAction" value="false"/>
20-
<preference name="android-minSdkVersion" value="14" />
21-
<preference name="android-targetSdkVersion" value="19" />
22-
<preference name="AppendUserAgent" value="MoodleMobile" />
23-
<feature name="StatusBar">
24-
<param name="ios-package" value="CDVStatusBar" onload="true"/>
25-
</feature>
26-
<platform name="android">
27-
<splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
28-
<splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
29-
<splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
30-
<splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
31-
<splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
32-
<splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
33-
<splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
34-
<splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
35-
<splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
36-
<splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
37-
<splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
38-
<splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
39-
<icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
40-
<icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
41-
<icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
42-
<icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
43-
<icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
44-
<icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
45-
</platform>
46-
<platform name="ios">
47-
<splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
48-
<splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
49-
<splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
50-
<splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
51-
<splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
52-
<splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
53-
<splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
54-
<splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
55-
<splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
56-
<splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
57-
<icon src="resources/ios/icon/icon.png" width="57" height="57"/>
58-
<icon src="resources/ios/icon/[email protected]" width="114" height="114"/>
59-
<icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
60-
<icon src="resources/ios/icon/[email protected]" width="80" height="80"/>
61-
<icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
62-
<icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
63-
<icon src="resources/ios/icon/[email protected]" width="100" height="100"/>
64-
<icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
65-
<icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
66-
<icon src="resources/ios/icon/[email protected]" width="180" height="180"/>
67-
<icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
68-
<icon src="resources/ios/icon/[email protected]" width="144" height="144"/>
69-
<icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
70-
<icon src="resources/ios/icon/[email protected]" width="152" height="152"/>
71-
<icon src="resources/ios/icon/[email protected]" width="167" height="167"/>
72-
<icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
73-
<icon src="resources/ios/icon/[email protected]" width="58" height="58"/>
74-
<icon src="resources/ios/icon/[email protected]" width="87" height="87"/>
75-
</platform>
76-
<icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
2+
<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">
3+
<name>Moodle Mobile</name>
4+
<description>
5+
Moodle Mobile official app
6+
</description>
7+
<author href="http://moodle.com" email="[email protected]">
8+
Moodle Mobile team
9+
</author>
10+
<content src="index.html"/>
11+
<access origin="*"/>
12+
<access origin="tel:*" launch-external="yes"/>
13+
<access origin="mailto:*" launch-external="yes"/>
14+
<access origin="geo:*" launch-external="yes"/>
15+
<allow-navigation href="cdvfile:*"/>
16+
<allow-navigation href="content:*"/>
17+
<allow-navigation href="data:*"/>
18+
<allow-navigation href="*"/>
19+
<allow-intent href="*"/>
20+
<preference name="orientation" value="default"/>
21+
<preference name="target-device" value="universal"/>
22+
<preference name="fullscreen" value="false"/>
23+
<preference name="webviewbounce" value="false"/>
24+
<preference name="AppendUserAgent" value="MoodleMobile"/>
25+
<preference name="android-minSdkVersion" value="14"/>
26+
<preference name="android-targetSdkVersion" value="19"/>
27+
<preference name="UIWebViewBounce" value="false"/>
28+
<preference name="DisallowOverscroll" value="true"/>
29+
<preference name="BackupWebStorage" value="none"/>
30+
<preference name="KeyboardDisplayRequiresUserAction" value="false"/>
31+
<preference name="AndroidPersistentFileLocation" value="Compatibility"/>
32+
<preference name="iosPersistentFileLocation" value="Compatibility"/>
33+
<preference name="SplashScreen" value="screen"/>
34+
<preference name="SplashScreenDelay" value="3000"/>
35+
<feature name="StatusBar">
36+
<param name="ios-package" value="CDVStatusBar" onload="true"/>
37+
</feature>
38+
<platform name="android">
39+
<splash src="resources/android/splash/drawable-land-ldpi-screen.png" qualifier="land-ldpi"/>
40+
<splash src="resources/android/splash/drawable-land-mdpi-screen.png" qualifier="land-mdpi"/>
41+
<splash src="resources/android/splash/drawable-land-hdpi-screen.png" qualifier="land-hdpi"/>
42+
<splash src="resources/android/splash/drawable-land-xhdpi-screen.png" qualifier="land-xhdpi"/>
43+
<splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" qualifier="land-xxhdpi"/>
44+
<splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" qualifier="land-xxxhdpi"/>
45+
<splash src="resources/android/splash/drawable-port-ldpi-screen.png" qualifier="port-ldpi"/>
46+
<splash src="resources/android/splash/drawable-port-mdpi-screen.png" qualifier="port-mdpi"/>
47+
<splash src="resources/android/splash/drawable-port-hdpi-screen.png" qualifier="port-hdpi"/>
48+
<splash src="resources/android/splash/drawable-port-xhdpi-screen.png" qualifier="port-xhdpi"/>
49+
<splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" qualifier="port-xxhdpi"/>
50+
<splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" qualifier="port-xxxhdpi"/>
51+
<icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
52+
<icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
53+
<icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
54+
<icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
55+
<icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
56+
<icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
57+
</platform>
58+
<platform name="ios">
59+
<splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
60+
<splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
61+
<splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
62+
<splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
63+
<splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
64+
<splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
65+
<splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
66+
<splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
67+
<splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
68+
<splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
69+
<icon src="resources/ios/icon/icon.png" width="57" height="57"/>
70+
<icon src="resources/ios/icon/[email protected]" width="114" height="114"/>
71+
<icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
72+
<icon src="resources/ios/icon/[email protected]" width="80" height="80"/>
73+
<icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
74+
<icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
75+
<icon src="resources/ios/icon/[email protected]" width="100" height="100"/>
76+
<icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
77+
<icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
78+
<icon src="resources/ios/icon/[email protected]" width="180" height="180"/>
79+
<icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
80+
<icon src="resources/ios/icon/[email protected]" width="144" height="144"/>
81+
<icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
82+
<icon src="resources/ios/icon/[email protected]" width="152" height="152"/>
83+
<icon src="resources/ios/icon/[email protected]" width="167" height="167"/>
84+
<icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
85+
<icon src="resources/ios/icon/[email protected]" width="58" height="58"/>
86+
<icon src="resources/ios/icon/[email protected]" width="87" height="87"/>
87+
</platform>
88+
<icon src="resources/ios/icon/[email protected]"/>
7789
</widget>

‎package.json‎

Lines changed: 54 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
2-
"name": "mm2",
3-
"version": "1.0.0",
4-
"description": "Moodle Mobile 2: The official mobile app for Moodle.",
2+
"name": "com.moodle.moodlemobile",
3+
"version": "3.3.0",
4+
"description": "The official app for Moodle.",
5+
"author": {
6+
"name": "Moodle Pty Ltd.",
7+
"email": "[email protected]"
8+
},
59
"repository": {
610
"type": "git",
711
"url": "https://github.com/moodlehq/moodlemobile2.git"
@@ -14,22 +18,25 @@
1418
}
1519
],
1620
"dependencies": {
21+
"electron-windows-notifications": "^1.1.13",
22+
"electron-builder-squirrel-windows": "^19.3.0"
1723
},
1824
"devDependencies": {
1925
"appium": "^1.6.0",
2026
"bower": "^1.3.3",
27+
"electron-rebuild": "^1.5.11",
2128
"gulp": "^3.9.1",
22-
"gulp-clean-css": "^3.0.3",
23-
"gulp-concat": "^2.6.0",
24-
"gulp-rename": "^1.2.0",
25-
"gulp-sass": "^2.3.2",
2629
"gulp-clean": "^0.3.2",
30+
"gulp-clean-css": "^3.0.3",
2731
"gulp-clip-empty-files": "^0.1.1",
32+
"gulp-concat": "^2.6.0",
2833
"gulp-concat-util": "^0.5.2",
2934
"gulp-file": "^0.3.0",
3035
"gulp-insert": "^0.5.0",
3136
"gulp-ng-annotate": "^2.0.0",
3237
"gulp-remove-empty-lines": "0.0.8",
38+
"gulp-rename": "^1.2.0",
39+
"gulp-sass": "^2.3.2",
3340
"gulp-slash": "^1.1.3",
3441
"gulp-strip-comments": "^2.4.3",
3542
"gulp-tap": "^0.1.3",
@@ -121,6 +128,45 @@
121128
"android": "ionic run android",
122129
"serve.e2e": "ionic serve -b -a",
123130
"serve.dev": "ionic serve",
124-
"e2e": "protractor e2e/build/protractor.conf.js"
131+
"e2e": "protractor e2e/build/protractor.conf.js",
132+
"desktop.pack": "build --dir",
133+
"desktop.dist": "build",
134+
"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"
135+
},
136+
"main": "www/electron.js",
137+
"build": {
138+
"appId": "com.moodle.moodlemobile",
139+
"productName": "MoodleDesktop",
140+
"files": [
141+
"!desktop",
142+
"!**/e2e",
143+
"!hooks",
144+
"!platforms",
145+
"!plugins",
146+
"!resources",
147+
"!**/*.scss"
148+
],
149+
"directories": {
150+
"output": "desktop/dist"
151+
},
152+
"protocols": [
153+
{
154+
"name": "Moodle Mobile URL",
155+
"schemes": [
156+
"moodlemobile"
157+
],
158+
"role": "Viewer"
159+
}
160+
],
161+
"compression": "maximum",
162+
"electronVersion": "1.6.11",
163+
"mac": {
164+
"category": "public.app-category.education",
165+
"icon": "resources/desktop/icon.icns"
166+
},
167+
"win": {
168+
"target": "appx",
169+
"icon": "resources/desktop/icon.ico"
170+
}
125171
}
126172
}

‎resources/android/icon.png‎

100644100755
-19.5 KB
Loading

‎resources/android/icon/drawable-hdpi-icon.png‎

-1.71 KB
Loading

‎resources/android/icon/drawable-ldpi-icon.png‎

-460 Bytes
Loading

‎resources/android/icon/drawable-mdpi-icon.png‎

-882 Bytes
Loading

‎resources/android/icon/drawable-xhdpi-icon.png‎

-2.54 KB
Loading

‎resources/android/icon/drawable-xxhdpi-icon.png‎

-4.82 KB
Loading

0 commit comments

Comments
 (0)