Merge pull request #1659 from dpalou/MOBILE-2777

Mobile 2777
main
Juan Leyva 2018-12-14 12:35:50 +01:00 committed by GitHub
commit d76022e721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 747 additions and 557 deletions

View File

@ -94,46 +94,39 @@
<icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" /> <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" /> <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
</platform> </platform>
<plugin name="cordova-plugin-file" spec="^6.0.1" /> <plugin name="com-darryncampbell-cordova-plugin-intent" spec="1.1.1" />
<plugin name="cordova-plugin-file-transfer" spec="^1.7.1" /> <plugin name="cordova-android-support-gradle-release" spec="2.0.1">
<plugin name="cordova-plugin-camera" spec="^4.0.3"> <variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" />
<variable name="CAMERA_USAGE_DESCRIPTION" value="We need camera access to take pictures so you can attach them as part of your submissions." />
<variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="We need photo library access to get pictures from there so you can attach them as part of your submissions." />
</plugin> </plugin>
<plugin name="cordova-plugin-media-capture" spec="^3.0.2"> <plugin name="cordova-clipboard" spec="1.2.1" />
<variable name="CAMERA_USAGE_DESCRIPTION" value="We need camera access to take pictures so you can attach them as part of your submissions." /> <plugin name="cordova-plugin-badge" spec="0.8.8" />
<variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="We need photo library access to get pictures from there so you can attach them as part of your submissions." /> <plugin name="cordova-plugin-camera" spec="4.0.3" />
<variable name="MICROPHONE_USAGE_DESCRIPTION" value="We need microphone access to record sounds so you can attach them as part of your submissions." /> <plugin name="cordova-plugin-customurlscheme" spec="4.3.0">
</plugin>
<plugin name="cordova-plugin-device" spec="^2.0.2" />
<plugin name="cordova-plugin-globalization" spec="^1.11.0" />
<plugin name="cordova-plugin-inappbrowser" spec="^3.0.0" />
<plugin name="cordova-plugin-network-information" spec="^2.0.1" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
<plugin name="cordova-clipboard" spec="^1.2.1" />
<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">
<variable name="SENDER_ID" value="694767596569" />
</plugin>
<plugin name="cordova-plugin-customurlscheme" spec="^4.3.0">
<variable name="URL_SCHEME" value="moodlemobile" /> <variable name="URL_SCHEME" value="moodlemobile" />
</plugin> </plugin>
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" /> <plugin name="cordova-plugin-device" spec="2.0.2" />
<plugin name="cordova-plugin-zip" spec="^3.1.0" /> <plugin name="cordova-plugin-file" spec="6.0.1" />
<plugin name="cordova-plugin-local-notifications-mm" spec="^1.0.13" /> <plugin name="cordova-plugin-file-opener2" spec="2.0.19" />
<plugin name="cordova-plugin-file-opener2" spec="^2.0.19" /> <plugin name="cordova-plugin-file-transfer" spec="1.7.1" />
<plugin name="cordova-plugin-badge" spec="^0.8.7" /> <plugin name="cordova-plugin-globalization" spec="1.11.0" />
<plugin name="cordova-android-support-gradle-release" spec="^1.4.4"> <plugin name="cordova-plugin-inappbrowser" spec="3.0.0" />
<variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" /> <plugin name="cordova-plugin-ionic-keyboard" spec="2.1.3" />
<plugin name="cordova-plugin-local-notifications-mm" spec="1.0.13" />
<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" />
<plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
<plugin name="cordova-plugin-statusbar" spec="2.4.2" />
<plugin name="cordova-plugin-whitelist" spec="1.3.3" />
<plugin name="cordova-plugin-zip" spec="3.1.0" />
<plugin name="cordova-sqlite-evcore-extbuild-free" spec="0.9.9" />
<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">
<variable name="SENDER_ID" value="694767596569" />
</plugin> </plugin>
<edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']"> <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" /> <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" android:debuggable="true" />
</edit-config> </edit-config>
<plugin name="cordova-plugin-screen-orientation" spec="^3.0.1" /> <engine name="android" spec="7.1.2" />
<plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.1" /> <engine name="ios" spec="4.5.5" />
<plugin name="cordova-sqlite-evcore-extbuild-free" spec="^0.9.9" />
<engine name="android" spec="7.0.0" />
<engine name="ios" spec="4.5.4" />
</widget> </widget>

1110
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -58,58 +58,80 @@
"@ionic-native/file-transfer": "4.17.0", "@ionic-native/file-transfer": "4.17.0",
"@ionic-native/globalization": "4.17.0", "@ionic-native/globalization": "4.17.0",
"@ionic-native/in-app-browser": "4.17.0", "@ionic-native/in-app-browser": "4.17.0",
"@ionic-native/keyboard": "4.14.0", "@ionic-native/keyboard": "4.17.0",
"@ionic-native/local-notifications": "4.5.2", "@ionic-native/local-notifications": "4.5.2",
"@ionic-native/media-capture": "4.17.0", "@ionic-native/media-capture": "4.17.0",
"@ionic-native/network": "4.17.0", "@ionic-native/network": "4.17.0",
"@ionic-native/push": "4.17.0", "@ionic-native/push": "4.17.0",
"@ionic-native/screen-orientation": "^4.17.0", "@ionic-native/screen-orientation": "4.17.0",
"@ionic-native/splash-screen": "^4.17.0", "@ionic-native/splash-screen": "4.17.0",
"@ionic-native/sqlite": "4.17.0", "@ionic-native/sqlite": "4.17.0",
"@ionic-native/status-bar": "^4.17.0", "@ionic-native/status-bar": "4.17.0",
"@ionic-native/web-intent": "4.17.0", "@ionic-native/web-intent": "4.17.0",
"@ionic-native/zip": "4.17.0", "@ionic-native/zip": "4.17.0",
"@ngx-translate/core": "^8.0.0", "@ngx-translate/core": "8.0.0",
"@ngx-translate/http-loader": "^2.0.0", "@ngx-translate/http-loader": "2.0.1",
"@types/cordova": "0.0.34", "@types/cordova": "0.0.34",
"@types/cordova-plugin-file-transfer": "0.0.3", "@types/cordova-plugin-file-transfer": "0.0.3",
"@types/cordova-plugin-globalization": "0.0.3", "@types/cordova-plugin-globalization": "0.0.3",
"@types/cordova-plugin-network-information": "0.0.3", "@types/cordova-plugin-network-information": "0.0.3",
"@types/node": "^8.0.47", "@types/node": "8.10.19",
"@types/promise.prototype.finally": "^2.0.2", "@types/promise.prototype.finally": "2.0.2",
"chart.js": "^2.7.2", "chart.js": "2.7.2",
"com-darryncampbell-cordova-plugin-intent": "^1.1.1", "com-darryncampbell-cordova-plugin-intent": "1.1.1",
"cordova-android": "7.0.0", "cordova-android": "7.1.2",
"cordova-ios": "4.5.4", "cordova-android-support-gradle-release": "2.0.1",
"cordova-plugin-screen-orientation": "^3.0.1", "cordova-clipboard": "1.2.1",
"cordova-sqlite-evcore-extbuild-free": "^0.9.9", "cordova-ios": "4.5.5",
"es6-promise-plugin": "^4.2.2", "cordova-plugin-app-event": "1.2.1",
"cordova-plugin-badge": "0.8.8",
"cordova-plugin-camera": "4.0.3",
"cordova-plugin-customurlscheme": "4.3.0",
"cordova-plugin-device": "2.0.2",
"cordova-plugin-file": "6.0.1",
"cordova-plugin-file-opener2": "2.0.19",
"cordova-plugin-file-transfer": "1.7.1",
"cordova-plugin-globalization": "1.11.0",
"cordova-plugin-inappbrowser": "3.0.0",
"cordova-plugin-ionic-keyboard": "2.1.3",
"cordova-plugin-local-notifications-mm": "1.0.13",
"cordova-plugin-media-capture": "3.0.2",
"cordova-plugin-network-information": "2.0.1",
"cordova-plugin-screen-orientation": "3.0.1",
"cordova-plugin-splashscreen": "5.0.2",
"cordova-plugin-statusbar": "2.4.2",
"cordova-plugin-whitelist": "1.3.3",
"cordova-plugin-zip": "3.1.0",
"cordova-sqlite-evcore-extbuild-free": "0.9.9",
"es6-promise-plugin": "4.2.2",
"font-awesome": "4.7.0", "font-awesome": "4.7.0",
"ionic-angular": "^3.9.2", "ionic-angular": "3.9.2",
"ionicons": "3.0.0", "ionicons": "3.0.0",
"jszip": "^3.1.4", "jszip": "3.1.5",
"moment": "^2.19.1", "moment": "2.22.2",
"promise.prototype.finally": "^3.0.1", "nl.kingsquare.cordova.background-audio": "1.0.1",
"phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle",
"promise.prototype.finally": "3.1.0",
"rxjs": "5.5.11", "rxjs": "5.5.11",
"sw-toolbox": "3.6.0", "sw-toolbox": "3.6.0",
"ts-md5": "^1.2.2", "ts-md5": "1.2.4",
"web-animations-js": "^2.3.1", "web-animations-js": "2.3.1",
"zone.js": "0.8.26" "zone.js": "0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@ionic/app-scripts": "3.1.9", "@ionic/app-scripts": "3.1.9",
"electron-rebuild": "^1.8.1", "electron-rebuild": "1.8.1",
"electron-builder-lib": "^20.23.1", "electron-builder-lib": "20.23.1",
"gulp": "^4.0.0", "gulp": "4.0.0",
"gulp-clip-empty-files": "^0.1.2", "gulp-clip-empty-files": "0.1.2",
"gulp-flatten": "^0.4.0", "gulp-flatten": "0.4.0",
"gulp-rename": "^1.2.2", "gulp-rename": "1.3.0",
"gulp-slash": "^1.1.3", "gulp-slash": "1.1.3",
"gulp-util": "^3.0.8", "gulp-util": "3.0.8",
"node-loader": "^0.6.0", "node-loader": "0.6.0",
"through": "^2.3.8", "through": "2.3.8",
"typescript": "~2.6.2", "typescript": "2.6.2",
"webpack-merge": "^4.1.2" "webpack-merge": "4.1.2"
}, },
"browser": { "browser": {
"electron": false "electron": false
@ -120,9 +142,36 @@
"ios" "ios"
], ],
"plugins": { "plugins": {
"cordova-plugin-screen-orientation": {},
"com-darryncampbell-cordova-plugin-intent": {}, "com-darryncampbell-cordova-plugin-intent": {},
"cordova-sqlite-evcore-extbuild-free": {} "cordova-android-support-gradle-release": {
"ANDROID_SUPPORT_VERSION": "27.1.0"
},
"cordova-clipboard": {},
"cordova-plugin-badge": {},
"cordova-plugin-camera": {},
"cordova-plugin-customurlscheme": {
"URL_SCHEME": "moodlemobile"
},
"cordova-plugin-device": {},
"cordova-plugin-file": {},
"cordova-plugin-file-opener2": {},
"cordova-plugin-file-transfer": {},
"cordova-plugin-globalization": {},
"cordova-plugin-inappbrowser": {},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-local-notifications-mm": {},
"cordova-plugin-media-capture": {},
"cordova-plugin-network-information": {},
"cordova-plugin-screen-orientation": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-whitelist": {},
"cordova-plugin-zip": {},
"cordova-sqlite-evcore-extbuild-free": {},
"nl.kingsquare.cordova.background-audio": {},
"phonegap-plugin-push": {
"SENDER_ID": "694767596569"
}
} }
}, },
"main": "desktop/electron.js", "main": "desktop/electron.js",

View File

@ -35,9 +35,9 @@ export class MoodleMobileApp implements OnInit {
protected lastUrls = {}; protected lastUrls = {};
constructor(private platform: Platform, statusBar: StatusBar, logger: CoreLoggerProvider, keyboard: Keyboard, constructor(private platform: Platform, statusBar: StatusBar, logger: CoreLoggerProvider, keyboard: Keyboard,
private eventsProvider: CoreEventsProvider, private loginHelper: CoreLoginHelperProvider, private zone: NgZone, private eventsProvider: CoreEventsProvider, private loginHelper: CoreLoginHelperProvider, private zone: NgZone,
private appProvider: CoreAppProvider, private langProvider: CoreLangProvider, private sitesProvider: CoreSitesProvider, private appProvider: CoreAppProvider, private langProvider: CoreLangProvider, private sitesProvider: CoreSitesProvider,
private screenOrientation: ScreenOrientation) { private screenOrientation: ScreenOrientation) {
this.logger = logger.getInstance('AppComponent'); this.logger = logger.getInstance('AppComponent');
platform.ready().then(() => { platform.ready().then(() => {
@ -49,7 +49,7 @@ export class MoodleMobileApp implements OnInit {
statusBar.styleDefault(); statusBar.styleDefault();
} }
keyboard.hideKeyboardAccessoryBar(false); keyboard.hideFormAccessoryBar(false);
}); });
} }

View File

@ -123,7 +123,7 @@ export class CoreAppProvider {
*/ */
closeKeyboard(): void { closeKeyboard(): void {
if (this.isMobile()) { if (this.isMobile()) {
this.keyboard.close(); this.keyboard.hide();
} }
} }