From ad60d0e176bdee75456c00791040a9fa79110358 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 3 Dec 2015 00:38:39 -0500 Subject: device yeti --- .../ios/Stone Island.xcodeproj/project.pbxproj | 17 +- .../UserInterfaceState.xcuserstate | Bin 33821 -> 36052 bytes .../ios/Stone Island/Stone Island-Info.plist | 390 +++++++++++---------- StoneIsland/platforms/ios/www/js/lib/etc/geo.js | 1 + .../platforms/ios/www/js/lib/nav/NavView.js | 3 +- 5 files changed, 211 insertions(+), 200 deletions(-) diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.pbxproj b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.pbxproj index 4ba63df3..23f5a035 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.pbxproj +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.pbxproj @@ -374,6 +374,11 @@ TargetAttributes = { 1D6058900D05DD3D006BFB54 = { DevelopmentTeam = C6JQTPGJ97; + SystemCapabilities = { + com.apple.Push = { + enabled = 1; + }; + }; }; }; }; @@ -512,6 +517,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -520,7 +526,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "Stone Island/Stone Island-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; OTHER_LDFLAGS = ( "-weak_framework", CoreFoundation, @@ -534,7 +540,8 @@ "-ObjC", ); PRODUCT_NAME = "Stone Island"; - TARGETED_DEVICE_FAMILY = "1,2"; + PROVISIONING_PROFILE = ""; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -544,13 +551,14 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Stone Island/Stone Island-Prefix.pch"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "Stone Island/Stone Island-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; OTHER_LDFLAGS = ( "-weak_framework", CoreFoundation, @@ -564,7 +572,8 @@ "-ObjC", ); PRODUCT_NAME = "Stone Island"; - TARGETED_DEVICE_FAMILY = "1,2"; + PROVISIONING_PROFILE = ""; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate index 82cd0123..dc78d323 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 3926a624..85c02a7d 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -1,197 +1,199 @@ - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - icon.png - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - icon-40 - icon-small - icon-60 - icon.png - icon@2x - icon-72 - icon-72@2x - - UIPrerenderedIcon - - - - CFBundleIcons~ipad - - CFBundlePrimaryIcon - - CFBundleIconFiles - - icon-small - icon-40 - icon-50 - icon-76 - icon-60 - icon - icon@2x - icon-72 - icon-72@2x - - UIPrerenderedIcon - - - - CFBundleIdentifier - us.okfoc.stoneisland - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 0.1.0 - CFBundleShortVersionString - 0.1.0 - LSRequiresIPhoneOS - - NSMainNibFile - - NSMainNibFile~ipad - - UIRequiresFullScreen - - UILaunchImages - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default - UILaunchImageOrientation - Portrait - UILaunchImageSize - {320, 480} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default - UILaunchImageOrientation - Landscape - UILaunchImageSize - {320, 480} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-568h - UILaunchImageOrientation - Portrait - UILaunchImageSize - {320, 568} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-568h - UILaunchImageOrientation - Landscape - UILaunchImageSize - {320, 568} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-667h - UILaunchImageOrientation - Portrait - UILaunchImageSize - {375, 667} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-667h - UILaunchImageOrientation - Landscape - UILaunchImageSize - {375, 667} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-736h - UILaunchImageOrientation - Portrait - UILaunchImageSize - {414, 736} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-Landscape-736h - UILaunchImageOrientation - Landscape - UILaunchImageSize - {414, 736} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-Portrait - UILaunchImageOrientation - Portrait - UILaunchImageSize - {768, 1024} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-Landscape - UILaunchImageOrientation - Landscape - UILaunchImageSize - {768, 1024} - - - CFBundleURLTypes - - - CFBundleURLSchemes - - stoneisland - - - - NSLocationWhenInUseUsageDescription - - UIBackgroundModes - - remote-notification - - - \ No newline at end of file + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + icon.png + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + icon-40 + icon-small + icon-60 + icon.png + icon@2x + icon-72 + icon-72@2x + + UIPrerenderedIcon + + + + CFBundleIcons~ipad + + CFBundlePrimaryIcon + + CFBundleIconFiles + + icon-small + icon-40 + icon-50 + icon-76 + icon-60 + icon + icon@2x + icon-72 + icon-72@2x + + UIPrerenderedIcon + + + + CFBundleIdentifier + us.okfoc.stoneisland + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.1.0 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLSchemes + + stoneisland + + + + CFBundleVersion + 0.1.0 + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + NSLocationWhenInUseUsageDescription + + NSMainNibFile~ipad + + UIBackgroundModes + + remote-notification + + UILaunchImages + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default + UILaunchImageOrientation + Portrait + UILaunchImageSize + {320, 480} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default + UILaunchImageOrientation + Landscape + UILaunchImageSize + {320, 480} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-568h + UILaunchImageOrientation + Portrait + UILaunchImageSize + {320, 568} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-568h + UILaunchImageOrientation + Landscape + UILaunchImageSize + {320, 568} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-667h + UILaunchImageOrientation + Portrait + UILaunchImageSize + {375, 667} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-667h + UILaunchImageOrientation + Landscape + UILaunchImageSize + {375, 667} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-736h + UILaunchImageOrientation + Portrait + UILaunchImageSize + {414, 736} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-Landscape-736h + UILaunchImageOrientation + Landscape + UILaunchImageSize + {414, 736} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-Portrait + UILaunchImageOrientation + Portrait + UILaunchImageSize + {768, 1024} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-Landscape + UILaunchImageOrientation + Landscape + UILaunchImageSize + {768, 1024} + + + UIRequiresFullScreen + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + + diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js index 0270d681..ab1f8372 100644 --- a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js @@ -8,6 +8,7 @@ var geo = (function(){ geo.success = function(position){ var lat_str = as_degrees( position.coords.latitude ) var lng_str = as_degrees( position.coords.longitude ) + $(".latlng").html( lat_str + " " + lng_str ) } geo.error = function(error){ diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js index 1445a0d5..704aaa34 100644 --- a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js @@ -134,8 +134,7 @@ var NavView = View.extend({ app.router.go("page/terms") }, care: function(){ - this.hide() - app.router.go("page/care") + window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system') }, -- cgit v1.2.3-70-g09d2