diff --git a/Mobile Application/.DS_Store b/Mobile Application/.DS_Store index f023e89..b37d223 100644 Binary files a/Mobile Application/.DS_Store and b/Mobile Application/.DS_Store differ diff --git a/Mobile Application/GPS_Walking/config.xml b/Mobile Application/GPS_Walking/config.xml index cf177df..53c1950 100644 --- a/Mobile Application/GPS_Walking/config.xml +++ b/Mobile Application/GPS_Walking/config.xml @@ -82,7 +82,16 @@ - - + + + + + + + + + + + diff --git a/Mobile Application/GPS_Walking/package-lock.json b/Mobile Application/GPS_Walking/package-lock.json index 28bb1f9..2a7453e 100644 --- a/Mobile Application/GPS_Walking/package-lock.json +++ b/Mobile Application/GPS_Walking/package-lock.json @@ -1069,10 +1069,554 @@ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, + "cordova-android": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz", + "integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==", + "requires": { + "abbrev": "*", + "android-versions": "1.4.0", + "ansi": "*", + "balanced-match": "*", + "base64-js": "1.2.0", + "big-integer": "1.6.32", + "bplist-parser": "*", + "brace-expansion": "*", + "concat-map": "*", + "cordova-common": "2.2.5", + "cordova-registry-mapper": "*", + "elementtree": "0.1.6", + "glob": "5.0.15", + "inflight": "*", + "inherits": "*", + "minimatch": "*", + "nopt": "3.0.1", + "once": "*", + "path-is-absolute": "1.0.1", + "plist": "2.1.0", + "properties-parser": "0.2.3", + "q": "1.4.1", + "sax": "0.3.5", + "semver": "5.5.0", + "shelljs": "0.5.3", + "underscore": "*", + "unorm": "*", + "wrappy": "*", + "xmlbuilder": "8.2.2", + "xmldom": "*" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "android-versions": { + "version": "1.4.0", + "bundled": true, + "requires": { + "semver": "^5.4.1" + } + }, + "ansi": { + "version": "0.3.1", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "base64-js": { + "version": "1.2.0", + "bundled": true + }, + "big-integer": { + "version": "1.6.32", + "bundled": true + }, + "bplist-parser": { + "version": "0.1.1", + "bundled": true, + "requires": { + "big-integer": "^1.6.7" + } + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "cordova-common": { + "version": "2.2.5", + "bundled": true, + "requires": { + "ansi": "^0.3.1", + "bplist-parser": "^0.1.0", + "cordova-registry-mapper": "^1.1.8", + "elementtree": "0.1.6", + "glob": "^5.0.13", + "minimatch": "^3.0.0", + "plist": "^2.1.0", + "q": "^1.4.1", + "shelljs": "^0.5.3", + "underscore": "^1.8.3", + "unorm": "^1.3.3" + } + }, + "cordova-registry-mapper": { + "version": "1.1.15", + "bundled": true + }, + "elementtree": { + "version": "0.1.6", + "bundled": true, + "requires": { + "sax": "0.3.5" + } + }, + "glob": { + "version": "5.0.15", + "bundled": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "nopt": { + "version": "3.0.1", + "bundled": true, + "requires": { + "abbrev": "1" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "plist": { + "version": "2.1.0", + "bundled": true, + "requires": { + "base64-js": "1.2.0", + "xmlbuilder": "8.2.2", + "xmldom": "0.1.x" + } + }, + "properties-parser": { + "version": "0.2.3", + "bundled": true + }, + "q": { + "version": "1.4.1", + "bundled": true + }, + "sax": { + "version": "0.3.5", + "bundled": true + }, + "semver": { + "version": "5.5.0", + "bundled": true + }, + "shelljs": { + "version": "0.5.3", + "bundled": true + }, + "underscore": { + "version": "1.9.1", + "bundled": true + }, + "unorm": { + "version": "1.4.1", + "bundled": true + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + }, + "xmlbuilder": { + "version": "8.2.2", + "bundled": true + }, + "xmldom": { + "version": "0.1.27", + "bundled": true + } + } + }, "cordova-background-geolocation": { - "version": "git+https://github.com/transistorsoft/cordova-background-geolocation.git#10b1f62c46c3823219233356fab59e124fe82419", + "version": "git+https://github.com/transistorsoft/cordova-background-geolocation.git#0c0e4ee46eb3a7c3e81720cfda91ec411e434bc4", "from": "git+https://github.com/transistorsoft/cordova-background-geolocation.git" }, + "cordova-ios": { + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.5.tgz", + "integrity": "sha512-3+30m2dZ2yii7kg+H7cgpdpkXpMj54zoX5imjGGG4Z7dPXKmalTLc/9rLq+Iaa+Q1BqyOrUFaHopWOODRU6vCg==", + "requires": { + "abbrev": "*", + "ansi": "*", + "balanced-match": "*", + "base64-js": "1.2.0", + "big-integer": "*", + "bplist-creator": "*", + "bplist-parser": "*", + "brace-expansion": "*", + "concat-map": "*", + "cordova-common": "2.2.5", + "cordova-registry-mapper": "*", + "elementtree": "0.1.6", + "glob": "5.0.15", + "inflight": "*", + "inherits": "*", + "ios-sim": "6.1.3", + "minimatch": "*", + "nopt": "3.0.6", + "once": "*", + "path-is-absolute": "*", + "plist": "2.1.0", + "q": "1.5.1", + "sax": "0.3.5", + "shelljs": "0.5.3", + "simctl": "*", + "simple-plist": "0.2.1", + "stream-buffers": "2.2.0", + "tail": "0.4.0", + "underscore": "*", + "unorm": "*", + "uuid": "3.0.1", + "wrappy": "*", + "xcode": "0.9.3", + "xml-escape": "1.1.0", + "xmlbuilder": "8.2.2", + "xmldom": "*" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "ansi": { + "version": "0.3.1", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "base64-js": { + "version": "1.2.0", + "bundled": true + }, + "big-integer": { + "version": "1.6.32", + "bundled": true + }, + "bplist-creator": { + "version": "0.0.7", + "bundled": true, + "requires": { + "stream-buffers": "~2.2.0" + } + }, + "bplist-parser": { + "version": "0.1.1", + "bundled": true, + "requires": { + "big-integer": "^1.6.7" + } + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "cordova-common": { + "version": "2.2.5", + "bundled": true, + "requires": { + "ansi": "^0.3.1", + "bplist-parser": "^0.1.0", + "cordova-registry-mapper": "^1.1.8", + "elementtree": "0.1.6", + "glob": "^5.0.13", + "minimatch": "^3.0.0", + "plist": "^2.1.0", + "q": "^1.4.1", + "shelljs": "^0.5.3", + "underscore": "^1.8.3", + "unorm": "^1.3.3" + } + }, + "cordova-registry-mapper": { + "version": "1.1.15", + "bundled": true + }, + "elementtree": { + "version": "0.1.6", + "bundled": true, + "requires": { + "sax": "0.3.5" + } + }, + "glob": { + "version": "5.0.15", + "bundled": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ios-sim": { + "version": "6.1.3", + "bundled": true, + "requires": { + "bplist-parser": "^0.0.6", + "nopt": "1.0.9", + "plist": "^2.1.0", + "simctl": "^1.1.1" + }, + "dependencies": { + "bplist-parser": { + "version": "0.0.6", + "bundled": true + }, + "nopt": { + "version": "1.0.9", + "bundled": true, + "requires": { + "abbrev": "1" + } + } + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "nopt": { + "version": "3.0.6", + "bundled": true, + "requires": { + "abbrev": "1" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "plist": { + "version": "2.1.0", + "bundled": true, + "requires": { + "base64-js": "1.2.0", + "xmlbuilder": "8.2.2", + "xmldom": "0.1.x" + } + }, + "q": { + "version": "1.5.1", + "bundled": true + }, + "sax": { + "version": "0.3.5", + "bundled": true + }, + "shelljs": { + "version": "0.5.3", + "bundled": true + }, + "simctl": { + "version": "1.1.1", + "bundled": true, + "requires": { + "shelljs": "^0.2.6", + "tail": "^0.4.0" + }, + "dependencies": { + "shelljs": { + "version": "0.2.6", + "bundled": true + } + } + }, + "simple-plist": { + "version": "0.2.1", + "bundled": true, + "requires": { + "bplist-creator": "0.0.7", + "bplist-parser": "0.1.1", + "plist": "2.0.1" + }, + "dependencies": { + "base64-js": { + "version": "1.1.2", + "bundled": true + }, + "plist": { + "version": "2.0.1", + "bundled": true, + "requires": { + "base64-js": "1.1.2", + "xmlbuilder": "8.2.2", + "xmldom": "0.1.x" + } + } + } + }, + "stream-buffers": { + "version": "2.2.0", + "bundled": true + }, + "tail": { + "version": "0.4.0", + "bundled": true + }, + "underscore": { + "version": "1.9.1", + "bundled": true + }, + "unorm": { + "version": "1.4.1", + "bundled": true + }, + "uuid": { + "version": "3.0.1", + "bundled": true + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + }, + "xcode": { + "version": "0.9.3", + "bundled": true, + "requires": { + "pegjs": "^0.10.0", + "simple-plist": "^0.2.1", + "uuid": "3.0.1" + } + }, + "xml-escape": { + "version": "1.1.0", + "bundled": true + }, + "xmlbuilder": { + "version": "8.2.2", + "bundled": true + }, + "xmldom": { + "version": "0.1.27", + "bundled": true + } + } + }, + "cordova-plugin-background-fetch": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/cordova-plugin-background-fetch/-/cordova-plugin-background-fetch-5.4.1.tgz", + "integrity": "sha512-kI5JqRoVh7F4RVslGnTWuJ3OVx66xgGFqiQAeUnWS4L6ipJKghSxaCJAufMLbZDxfUDEArCFKp2+RbB0/Ntecg==" + }, + "cordova-plugin-cocoalumberjack": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/cordova-plugin-cocoalumberjack/-/cordova-plugin-cocoalumberjack-0.0.4.tgz", + "integrity": "sha1-U/czZ6kkct7i0tsFxXXpY5IZkCs=" + }, + "cordova-plugin-device": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.2.tgz", + "integrity": "sha1-/Ajzci5n7ve2xnv8mag99q3Quro=" + }, + "cordova-plugin-ionic-keyboard": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.1.3.tgz", + "integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ==" + }, + "cordova-plugin-ionic-webview": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-2.2.5.tgz", + "integrity": "sha512-Eq1ano906pIpK2/0ZGlT99txq9+SlwPiNJNc6YxJUysIS8Nzfv6yB6Rref1ktRHi5szaVoQ5X8HCqf9Vd5Zmgg==" + }, + "cordova-plugin-splashscreen": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.2.tgz", + "integrity": "sha1-dH509W4gHNWFvGLRS8oZ9oZ/8e0=" + }, + "cordova-plugin-statusbar": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.2.tgz", + "integrity": "sha1-/B+9wNjXAzp+jh8ff/FnrJvU+vY=" + }, + "cordova-plugin-whitelist": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz", + "integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -3870,6 +4414,11 @@ "sha.js": "^2.4.8" } }, + "pegjs": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz", + "integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0=" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", diff --git a/Mobile Application/GPS_Walking/package.json b/Mobile Application/GPS_Walking/package.json index e32c671..0cd0773 100644 --- a/Mobile Application/GPS_Walking/package.json +++ b/Mobile Application/GPS_Walking/package.json @@ -25,7 +25,17 @@ "@ionic-native/status-bar": "~4.17.0", "@ionic/pro": "2.0.3", "@ionic/storage": "2.2.0", + "cordova-android": "7.1.4", "cordova-background-geolocation": "git+https://github.com/transistorsoft/cordova-background-geolocation.git", + "cordova-ios": "4.5.5", + "cordova-plugin-background-fetch": "5.4.1", + "cordova-plugin-cocoalumberjack": "0.0.4", + "cordova-plugin-device": "^2.0.2", + "cordova-plugin-ionic-keyboard": "^2.1.3", + "cordova-plugin-ionic-webview": "^2.2.5", + "cordova-plugin-splashscreen": "^5.0.2", + "cordova-plugin-statusbar": "^2.4.2", + "cordova-plugin-whitelist": "^1.3.3", "ionic-angular": "3.9.2", "ionicons": "3.0.0", "rxjs": "5.5.11", @@ -39,7 +49,28 @@ "description": "An Ionic project", "cordova": { "plugins": { - "cordova-background-geolocation": {} - } + "cordova-plugin-whitelist": {}, + "cordova-plugin-statusbar": {}, + "cordova-plugin-device": {}, + "cordova-plugin-splashscreen": {}, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" + }, + "cordova-plugin-ionic-keyboard": {}, + "cordova-background-geolocation": { + "LICENSE": "17948417ca43977cf2f6f458b61523b26492c7c11f3a67f92a8398643f665e1a", + "GOOGLE_API_VERSION": "16.0.0", + "APPCOMPAT_VERSION": "27.1.1", + "BACKGROUND_MODE_LOCATION": "location", + "LOCATION_ALWAYS_AND_WHEN_IN_USE_USAGE_DESCRIPTION": "Always use is required for constant background location-tracking", + "LOCATION_ALWAYS_USAGE_DESCRIPTION": "Background location-tracking is required", + "LOCATION_WHEN_IN_USE_USAGE_DESCRIPTION": "Background location-tracking is required", + "MOTION_USAGE_DESCRIPTION": "Using the accelerometer increases battery-efficiency by intelligently toggling location-tracking only when the device is detected to be moving" + } + }, + "platforms": [ + "android", + "ios" + ] } } \ No newline at end of file diff --git a/Mobile Application/GPS_Walking/resources/android/icon/drawable-hdpi-icon.png b/Mobile Application/GPS_Walking/resources/android/icon/drawable-hdpi-icon.png index 4574775..eccc297 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/icon/drawable-hdpi-icon.png and b/Mobile Application/GPS_Walking/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/icon/drawable-ldpi-icon.png b/Mobile Application/GPS_Walking/resources/android/icon/drawable-ldpi-icon.png index 8eb549a..1e66b05 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/icon/drawable-ldpi-icon.png and b/Mobile Application/GPS_Walking/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/icon/drawable-mdpi-icon.png b/Mobile Application/GPS_Walking/resources/android/icon/drawable-mdpi-icon.png index edfd17e..e95879f 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/icon/drawable-mdpi-icon.png and b/Mobile Application/GPS_Walking/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/icon/drawable-xhdpi-icon.png b/Mobile Application/GPS_Walking/resources/android/icon/drawable-xhdpi-icon.png index 1e90d36..1b2b7e4 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/icon/drawable-xhdpi-icon.png and b/Mobile Application/GPS_Walking/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/icon/drawable-xxhdpi-icon.png b/Mobile Application/GPS_Walking/resources/android/icon/drawable-xxhdpi-icon.png index b0738cb..c9a4e63 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/icon/drawable-xxhdpi-icon.png and b/Mobile Application/GPS_Walking/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/icon/drawable-xxxhdpi-icon.png b/Mobile Application/GPS_Walking/resources/android/icon/drawable-xxxhdpi-icon.png index 6869b00..61f8763 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/icon/drawable-xxxhdpi-icon.png and b/Mobile Application/GPS_Walking/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-hdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-hdpi-screen.png index 697ed26..4c8cdd0 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-hdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-ldpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-ldpi-screen.png index 40ec378..7f9d71f 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-ldpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-mdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-mdpi-screen.png index afb0690..84cd3b6 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-mdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xhdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xhdpi-screen.png index e4df1c5..8cf7cf9 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xhdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xxhdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xxhdpi-screen.png index 693f714..f53f5bf 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xxhdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xxxhdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xxxhdpi-screen.png index 3834b44..fdbb313 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-hdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-hdpi-screen.png index 66618e6..d6bbbf4 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-hdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-ldpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-ldpi-screen.png index ab8e244..bbf933d 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-ldpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-mdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-mdpi-screen.png index 0d995eb..1be8570 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-mdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xhdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xhdpi-screen.png index 6335702..1b3b66a 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xhdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xxhdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xxhdpi-screen.png index 64105cf..0e50461 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xxhdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xxxhdpi-screen.png b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xxxhdpi-screen.png index fa48264..eda003e 100644 Binary files a/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/Mobile Application/GPS_Walking/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-1024.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-1024.png index b0bc253..90dd630 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-1024.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-1024.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-40.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-40.png index 5038de4..74af827 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-40.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-40.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-40@2x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-40@2x.png index 14f6c6a..c153ba4 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-40@2x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-40@2x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-40@3x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-40@3x.png index 9d08f47..763daa8 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-40@3x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-40@3x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-50.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-50.png index 323f8cc..609fbb3 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-50.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-50.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-50@2x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-50@2x.png index d724b22..3f75ed3 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-50@2x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-50@2x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-60.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-60.png index fc13cb0..6ef802f 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-60.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-60.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-60@2x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-60@2x.png index 9d08f47..763daa8 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-60@2x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-60@2x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-60@3x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-60@3x.png index 1cf452d..1c2fa09 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-60@3x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-60@3x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-72.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-72.png index 31b477e..0891783 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-72.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-72.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-72@2x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-72@2x.png index f788c99..b4ed193 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-72@2x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-72@2x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-76.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-76.png index c7b2b87..13b51ba 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-76.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-76.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-76@2x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-76@2x.png index b7fa559..9060cb6 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-76@2x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-76@2x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-83.5@2x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-83.5@2x.png index 80a0eb5..b78d23a 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-83.5@2x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-83.5@2x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-small.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-small.png index 0a1a1b4..367993f 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-small.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-small.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-small@2x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-small@2x.png index 34bc47f..d9790fa 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-small@2x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-small@2x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon-small@3x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon-small@3x.png index 66a073b..4e838de 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon-small@3x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon-small@3x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon.png index 09d9b28..a45b851 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/icon/icon@2x.png b/Mobile Application/GPS_Walking/resources/ios/icon/icon@2x.png index d5d979d..aa8c101 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/icon/icon@2x.png and b/Mobile Application/GPS_Walking/resources/ios/icon/icon@2x.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-568h@2x~iphone.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-568h@2x~iphone.png index 5e97841..d0add19 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-568h@2x~iphone.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-667h.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-667h.png index 256475c..a8d253c 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-667h.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-667h.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-736h.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-736h.png index 599d23f..082a474 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-736h.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-736h.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape-736h.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape-736h.png index d71beb3..223866b 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape-736h.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape@2x~ipad.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape@2x~ipad.png index e0afcbd..35fe8da 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape@2x~ipad.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape@~ipadpro.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape@~ipadpro.png index 09bcd0b..2996e97 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape@~ipadpro.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape@~ipadpro.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape~ipad.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape~ipad.png index 4709003..b7783d1 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape~ipad.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait@2x~ipad.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait@2x~ipad.png index 18ef284..9310fc9 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait@2x~ipad.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait@~ipadpro.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait@~ipadpro.png index 4513d33..5a86fd3 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait@~ipadpro.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait@~ipadpro.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait~ipad.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait~ipad.png index 4be5690..9ea973a 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait~ipad.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default@2x~iphone.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default@2x~iphone.png index 8f20942..5dab6e3 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default@2x~iphone.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default@2x~iphone.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default@2x~universal~anyany.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default@2x~universal~anyany.png index 523edbf..d84cb62 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default@2x~universal~anyany.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default@2x~universal~anyany.png differ diff --git a/Mobile Application/GPS_Walking/resources/ios/splash/Default~iphone.png b/Mobile Application/GPS_Walking/resources/ios/splash/Default~iphone.png index c9d23b3..832ca1f 100644 Binary files a/Mobile Application/GPS_Walking/resources/ios/splash/Default~iphone.png and b/Mobile Application/GPS_Walking/resources/ios/splash/Default~iphone.png differ diff --git a/Mobile Application/GPS_Walking/src/pages/home/home.html b/Mobile Application/GPS_Walking/src/pages/home/home.html index 26e3222..a771c1d 100644 --- a/Mobile Application/GPS_Walking/src/pages/home/home.html +++ b/Mobile Application/GPS_Walking/src/pages/home/home.html @@ -1,11 +1,16 @@ - + GPS Tracking on Campus Walking - + + +








+ + + diff --git a/Mobile Application/GPS_Walking/src/pages/home/home.ts b/Mobile Application/GPS_Walking/src/pages/home/home.ts index 26e85bc..e45383f 100644 --- a/Mobile Application/GPS_Walking/src/pages/home/home.ts +++ b/Mobile Application/GPS_Walking/src/pages/home/home.ts @@ -1,21 +1,64 @@ import { Component } from '@angular/core'; -import { NavController } from 'ionic-angular'; +import { NavController, Platform } from 'ionic-angular'; + +import BackgroundGeolocation, { + Location, + MotionChangeEvent, + MotionActivityEvent, + GeofenceEvent, + Geofence, + HttpEvent, + ConnectivityChangeEvent +} from "cordova-background-geolocation"; @Component({ selector: 'page-home', templateUrl: 'home.html' }) + export class HomePage { + Tracking_UI_Text: string = "Begin Tracking"; isTracking: boolean = false; - Tracking: string = "Begin Tracking" + Upload_Over_Celluar : boolean = false; + Transfer_As_Stream : boolean = false; + DB_URL : string = "determine me"; + + constructor(public navCtrl: NavController, public platform: Platform) { + platform.ready().then(this.configureBackgroundGeolocation.bind(this)); + } + + configureBackgroundGeolocation() { + BackgroundGeolocation.onLocation(this.onLocation.bind(this)); - constructor(public navCtrl: NavController) { + BackgroundGeolocation.ready({ + debug: true, + logLevel: BackgroundGeolocation.LOG_LEVEL_VERBOSE, + distanceFilter: 5, + stopTimeout: 1, + //stopOnTerminate: false, + //startOnBoot: true, + //foregroundService: true, + //url: , + autoSync: true, + //params: {} authentication with DB + }, (state) => { + console.log('- Configure success: ', state); + }); + } + onLocation(location:Location) { + console.log('[location] -', location); } - track() { + toggle_tracking() { this.isTracking = !this.isTracking; - this.isTracking ? this.Tracking = "Stop Tracking" : this.Tracking = "Begin Tracking" + this.isTracking ? this.Tracking_UI_Text = "Stop Tracking" : this.Tracking_UI_Text = "Start Tracking"; + if (this.isTracking){ + BackgroundGeolocation.start(); + } + else { + BackgroundGeolocation.stop(); + } } -} +} \ No newline at end of file