diff options
Diffstat (limited to 'StoneIsland/platforms/android')
17 files changed, 35 insertions, 10 deletions
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 2ebf59ce..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 459093b8..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 af1606df..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 4ad9ac52..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 0345b619..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 a210e5a7..0feefa18 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<manifest android:hardwareAccelerated="true" android:versionCode="306" android:versionName="0.3.6" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android"> +<manifest android:hardwareAccelerated="true" android:versionCode="401" android:versionName="0.4.1" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android"> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> @@ -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 ca36fcb7..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 35c41ca7..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 66e76651..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 9a41f6e6..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/blogs/PageView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js index c399a2a9..f5f8ab2e 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js @@ -1,7 +1,7 @@ var PageView = ScrollableView.extend({ events: { - "touchstart a": "follow_link" + "click a": "follow_link" }, initialize: function(opt){ @@ -31,8 +31,11 @@ var PageView = ScrollableView.extend({ }, follow_link: function(e){ + e.stopPropagation() + e.preventDefault() var href = $(e.currentTarget).attr("href") - window.open(row.link, '_system') + console.log(href) + window.open(href, '_system') }, })
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/js/lib/etc/deeplink.js b/StoneIsland/platforms/android/assets/www/js/lib/etc/deeplink.js index 0522fbc5..7667cfcd 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/etc/deeplink.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/etc/deeplink.js @@ -1,4 +1,5 @@ function handleOpenURL (url) { console.log("DEEP LINKING DETECTED", url) - this.parseRoute( url ) + url = url.replace("stoneisland:/", "") + app.router.parseRoute( url ) }
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js index 74b249e6..8641668f 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js @@ -10,6 +10,7 @@ var FooterView = View.extend({ initialize: function(){ this.$ok = this.$(".ok") this.$cancel = this.$(".cancel") + this.hide() }, show: function(ok, cancel){ 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/assets/www/js/lib/products/Selector.js b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js index 17278a06..4e23ba1f 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js @@ -44,6 +44,8 @@ var Selector = View.extend({ }, pick: function(e){ + e.preventDefault() + e.stopPropagation() var $option = $(e.currentTarget) var id = String($option.data("id")) var selection = this.lookup[id] diff --git a/StoneIsland/platforms/android/assets/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js b/StoneIsland/platforms/android/assets/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js index e732f80d..e732f80d 100644..100755 --- a/StoneIsland/platforms/android/assets/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js +++ b/StoneIsland/platforms/android/assets/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index 0f3242dc..cdcf29d8 100755 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.3.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.4.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <preference name="loglevel" value="DEBUG" /> <feature name="Keyboard"> <param name="android-package" value="com.ionic.keyboard.IonicKeyboard" /> @@ -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 |