diff --git a/Mobile Application/GPS_Walking/config.xml b/Mobile Application/GPS_Walking/config.xml index 6fb5014..f0e3aed 100644 --- a/Mobile Application/GPS_Walking/config.xml +++ b/Mobile Application/GPS_Walking/config.xml @@ -92,7 +92,7 @@ + - diff --git a/Mobile Application/GPS_Walking/package-lock.json b/Mobile Application/GPS_Walking/package-lock.json index 3f24c11..c76b489 100644 --- a/Mobile Application/GPS_Walking/package-lock.json +++ b/Mobile Application/GPS_Walking/package-lock.json @@ -1250,7 +1250,7 @@ }, "util": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -1309,7 +1309,7 @@ }, "autoprefixer": { "version": "7.2.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz", + "resolved": "http://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz", "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==", "dev": true, "requires": { @@ -1352,7 +1352,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -1508,7 +1508,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true } @@ -1577,7 +1577,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -1614,7 +1614,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -1658,7 +1658,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -1727,7 +1727,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { @@ -2530,7 +2530,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -2543,7 +2543,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -2596,7 +2596,7 @@ }, "d": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { @@ -2726,7 +2726,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -2737,7 +2737,7 @@ }, "doctrine": { "version": "0.7.2", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", + "resolved": "http://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", "integrity": "sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=", "dev": true, "requires": { @@ -3194,7 +3194,7 @@ }, "finalhandler": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", "dev": true, "requires": { @@ -3797,7 +3797,7 @@ }, "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "dev": true }, @@ -3992,7 +3992,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { @@ -4418,7 +4418,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -4538,7 +4538,7 @@ }, "magic-string": { "version": "0.22.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", + "resolved": "http://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==", "dev": true, "requires": { @@ -4582,7 +4582,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, @@ -4607,7 +4607,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { @@ -4811,7 +4811,7 @@ }, "next-tick": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, @@ -4837,7 +4837,7 @@ "dependencies": { "semver": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true } @@ -4917,7 +4917,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -5111,13 +5111,13 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, "os-locale": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { @@ -5126,7 +5126,7 @@ }, "os-name": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz", + "resolved": "http://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz", "integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=", "dev": true, "requires": { @@ -5136,7 +5136,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, @@ -5321,7 +5321,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, @@ -6341,7 +6341,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { @@ -6435,7 +6435,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { @@ -6752,7 +6752,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { @@ -6770,7 +6770,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, @@ -6814,7 +6814,7 @@ }, "tar": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { @@ -7120,7 +7120,7 @@ }, "yargs": { "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { @@ -8304,7 +8304,7 @@ }, "load-json-file": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { @@ -8508,7 +8508,7 @@ }, "wrap-ansi": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { @@ -8545,7 +8545,7 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "dev": true }, 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 90dd630..ed1d046 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 74af827..c439f05 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 c153ba4..af138f4 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 763daa8..a8d5826 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 609fbb3..6773296 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 3f75ed3..1edcfca 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 6ef802f..e6763bb 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 763daa8..a8d5826 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 1c2fa09..8dc4fb8 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 0891783..1ce58b2 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 b4ed193..3fee223 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 13b51ba..7da29ae 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 9060cb6..b28daf8 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 b78d23a..8ee9adc 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 367993f..78ad233 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 d9790fa..5b05fd4 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 4e838de..d9462bb 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 a45b851..9555030 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 aa8c101..100f669 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 d0add19..53a4719 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 a8d253c..f41520c 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 082a474..8144b8a 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 223866b..713525b 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 35fe8da..9261a06 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 2996e97..9a1366f 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 b7783d1..f9c7a5f 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 9310fc9..2dcfa96 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 5a86fd3..e6d0ee7 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 9ea973a..51afd07 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 5dab6e3..e50f93b 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 d84cb62..99c65d2 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 832ca1f..b323053 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.ts b/Mobile Application/GPS_Walking/src/pages/home/home.ts index 8630fdf..9b8194f 100644 --- a/Mobile Application/GPS_Walking/src/pages/home/home.ts +++ b/Mobile Application/GPS_Walking/src/pages/home/home.ts @@ -27,12 +27,11 @@ export class HomePage { DB_URL: string = "determine me"; ID: number; - constructor(public navCtrl: NavController, public platform: Platform, private nativeStorage: NativeStorage) { - platform.ready().then(this.configureBackgroundGeolocation.bind(this)); + load_or_generate_unique_id(){ this.nativeStorage.getItem('ID').then( data => { this.ID = data; - console.log(this.ID); + console.log('UserID was already set to: ', this.ID); }, error => { console.log("ID not set. First time ran? Generating ID."); @@ -40,24 +39,28 @@ export class HomePage { this.ID = Math.floor(Math.random() * max); this.nativeStorage.setItem('ID', this.ID).then( - () => console.log('ID Set!'), - error => console.error('Could not set ID for some reason???', error) + () => console.log('ID Set to: ', this.nativeStorage.getItem('ID')), //NOTE(Jesse): If we fail here then something really off has happened. + error => console.error('Could not set ID for an unknown reason. Consult https://github.com/TheCocoaProject/cordova-plugin-nativestorage', error) ); } ); } + constructor(public navCtrl: NavController, public platform: Platform, private nativeStorage: NativeStorage) { + platform.ready().then(this.configureBackgroundGeolocation.bind(this)).then(this.load_or_generate_unique_id.bind(this)); + } + configureBackgroundGeolocation() { BackgroundGeolocation.addGeofence({ identifier: "UCONN Campus", radius: 500, - latitude: 41.807757, //LAT / LONG of UCONN Campus : 41.807757, -72.253990 from http://www.latitude-longitude.net - longitude: -72.253990, + latitude: 41.807757,//41.99550394,// //LAT / LONG of UCONN Campus : 41.807757, -72.253990 from http://www.latitude-longitude.net + longitude: -72.253990,//-72.27337069,//, notifyOnEntry: true, notifyOnExit: true, //extras: {route_id: 1234} }).then((success) => { - console.log('[addGeofence] success'); + console.log('[addGeofence] UCONN Campus Geofence added.'); }).catch((error) => { console.log('[addGeofence] FAILURE: ', error); }); @@ -65,32 +68,41 @@ export class HomePage { BackgroundGeolocation.onGeofence((event) => { console.log('[onGeofence] ', event); if (event.action == "ENTER") { - console.log("User has entered UCONN tracking radius"); - BackgroundGeolocation.startGeofences(); + console.log("User has entered UCONN tracking radius. Begin Location Tracking."); + BackgroundGeolocation.start(); } if (event.action == "EXIT") { - console.log("User has left UCONN tracking radius"); - BackgroundGeolocation.stop(); + console.log("User has left UCONN tracking radius. Disable Location Tracking."); + BackgroundGeolocation.startGeofences(); } }); BackgroundGeolocation.onLocation(location => { - console.log('[location] ', location); + console.log('[location] ', location.coords.latitude); + console.log('[location] ', location.coords.longitude); }, error => { console.log('[location] ERROR: ', error); }); - +/* + BackgroundGeolocation.sync((records) => { + console.log('[sync] success: ', records); + }).catch((error) => { + console.log('[sync] FAILURE: ', error); + }); +*/ BackgroundGeolocation.ready({ debug: true, - logLevel: BackgroundGeolocation.LOG_LEVEL_VERBOSE, + logLevel: BackgroundGeolocation.LOG_LEVEL_OFF,//LOG_LEVEL_VERBOSE, distanceFilter: 5, stopTimeout: 1, //stopOnTerminate: false, //startOnBoot: true, //foregroundService: true, - //url: , - autoSync: true, + //url: '192.168.0.212', + //autoSync: true, + //batchSync: true, + //autoSyncThreshold: 2, // HTTP requests drain battery far quicker than GPS tracking according to docs. //params: {} authentication with DB }, (state) => { console.log('- Configure success: ', state);