diff options
15 files changed, 64 insertions, 13 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index f75605ea..35708e80 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -31,6 +31,7 @@ <platform name="android"> <allow-intent href="market:*" /> + <preference name="AndroidLaunchMode" value="singleTop"/> <preference name="android-minSdkVersion" value="21" /> </platform> <platform name="ios"> <allow-intent href="itms:*" /> diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock Binary files differindex d9ada3ee..ef0f1bfc 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin Binary files differindex 91121bcb..df09485f 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary files differindex 72ac8d23..1e0a68c2 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary files differindex 8e4a6a9f..bf947b14 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary files differindex 4abe1593..b2581f89 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index 4d9aeba5..0feefa18 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -57,7 +57,7 @@ </intent-filter> </receiver> </application> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" /> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="22" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar Binary files differindex 8b023c66..2e52b1df 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar Binary files differindex d4045400..4cc8c303 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar Binary files differindex 144f7312..c943da67 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar +++ b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar Binary files differindex e17128b3..a77826ed 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar +++ b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js index 8797241f..5e5ea908 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js @@ -41,9 +41,25 @@ var IntroView = View.extend({ this.compass.style[transformProp] = "translateZ(0) translateX(-50%) translateY(-50%) rotate(" + heading + "deg)" }, - store: function(){ app.router.go("store") }, - hub: function(){ app.router.go("hub") }, - story: function(){ app.router.go("story") }, - archive: function(){ app.router.go("archive") }, + store: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("store") + }, + hub: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("hub") + }, + story: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("story") + }, + archive: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("archive") + }, }) diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index 5992bf0c..cdcf29d8 100755 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -38,6 +38,8 @@ <param name="android-package" value="org.apache.cordova.core.ParsePlugin" /> </feature> <allow-intent href="market:*" /> + <preference name="AndroidLaunchMode" value="singleTop" /> + <preference name="android-minSdkVersion" value="21" /> <name>Stone Island</name> <description> Stone Island diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js index 8797241f..5e5ea908 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js @@ -41,9 +41,25 @@ var IntroView = View.extend({ this.compass.style[transformProp] = "translateZ(0) translateX(-50%) translateY(-50%) rotate(" + heading + "deg)" }, - store: function(){ app.router.go("store") }, - hub: function(){ app.router.go("hub") }, - story: function(){ app.router.go("story") }, - archive: function(){ app.router.go("archive") }, + store: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("store") + }, + hub: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("hub") + }, + story: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("story") + }, + archive: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("archive") + }, }) diff --git a/StoneIsland/www/js/lib/nav/IntroView.js b/StoneIsland/www/js/lib/nav/IntroView.js index 8797241f..5e5ea908 100755 --- a/StoneIsland/www/js/lib/nav/IntroView.js +++ b/StoneIsland/www/js/lib/nav/IntroView.js @@ -41,9 +41,25 @@ var IntroView = View.extend({ this.compass.style[transformProp] = "translateZ(0) translateX(-50%) translateY(-50%) rotate(" + heading + "deg)" }, - store: function(){ app.router.go("store") }, - hub: function(){ app.router.go("hub") }, - story: function(){ app.router.go("story") }, - archive: function(){ app.router.go("archive") }, + store: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("store") + }, + hub: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("hub") + }, + story: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("story") + }, + archive: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("archive") + }, }) |