From 0cd5ed392809b343c2f8d85df81f59021129723a Mon Sep 17 00:00:00 2001
From: Rene Ae <aehtyb@gmail.com>
Date: Tue, 15 Dec 2015 17:11:58 -0600
Subject: stoppropagation

---
 StoneIsland/config.xml                             |   1 +
 .../2.2.1/taskArtifacts/cache.properties.lock      | Bin 17 -> 17 bytes
 .../.gradle/2.2.1/taskArtifacts/fileHashes.bin     | Bin 513439 -> 513607 bytes
 .../.gradle/2.2.1/taskArtifacts/fileSnapshots.bin  | Bin 3837158 -> 3910724 bytes
 .../2.2.1/taskArtifacts/outputFileStates.bin       | Bin 26372 -> 26372 bytes
 .../.gradle/2.2.1/taskArtifacts/taskArtifacts.bin  | Bin 144895 -> 144895 bytes
 StoneIsland/platforms/android/AndroidManifest.xml  |   2 +-
 .../build/intermediates/bundles/debug/classes.jar  | Bin 119119 -> 119119 bytes
 .../intermediates/bundles/release/classes.jar      | Bin 119042 -> 119042 bytes
 .../build/outputs/aar/CordovaLib-debug.aar         | Bin 109676 -> 109668 bytes
 .../build/outputs/aar/CordovaLib-release.aar       | Bin 109606 -> 109597 bytes
 .../android/assets/www/js/lib/nav/IntroView.js     |  24 +++++++++++++++++----
 StoneIsland/platforms/android/res/xml/config.xml   |   2 ++
 .../platforms/ios/www/js/lib/nav/IntroView.js      |  24 +++++++++++++++++----
 StoneIsland/www/js/lib/nav/IntroView.js            |  24 +++++++++++++++++----
 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
index d9ada3ee..ef0f1bfc 100755
Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ
diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
index 91121bcb..df09485f 100755
Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ
diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
index 72ac8d23..1e0a68c2 100755
Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
index 8e4a6a9f..bf947b14 100755
Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ
diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
index 4abe1593..b2581f89 100755
Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ
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
index 8b023c66..2e52b1df 100755
Binary files a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar and b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar differ
diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar
index d4045400..4cc8c303 100755
Binary files a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar and b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar differ
diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar
index 144f7312..c943da67 100755
Binary files a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar and b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar differ
diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar
index e17128b3..a77826ed 100755
Binary files a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar and b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar differ
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") 
+  },
 
 })
-- 
cgit v1.2.3-70-g09d2