From ff05827cbc5da2526f446255124aa8b77c596a71 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Fri, 7 Nov 2014 17:09:15 +0000 Subject: [PATCH] Fixing compatibility with 4 inch --- BT Vendor/BT Vendor.xcodeproj/project.pbxproj | 32 ++++++++++++++++++++++++-------- BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 218780 -> 0 bytes BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ BT Vendor/Base.lproj/DatePickerViewController.xib | 6 +++--- BT Vendor/Base.lproj/DatePickerViewController_Landscape.xib | 12 ++++++------ BT Vendor/Base.lproj/DateRangePickerViewController.xib | 8 ++++---- BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib | 17 ++++++++--------- BT Vendor/Base.lproj/PriceChangerViewController.xib | 4 ++-- BT Vendor/Base.lproj/PriceChangerViewController_Landscape.xib | 6 +++--- BT Vendor/FirstAppExample/EMDevicePickerViewController.m | 4 ++-- BT Vendor/MenuTableViewController.m | 8 ++++---- 11 files changed, 104 insertions(+), 41 deletions(-) diff --git a/BT Vendor/BT Vendor.xcodeproj/project.pbxproj b/BT Vendor/BT Vendor.xcodeproj/project.pbxproj index 9984519..42167f5 100644 --- a/BT Vendor/BT Vendor.xcodeproj/project.pbxproj +++ b/BT Vendor/BT Vendor.xcodeproj/project.pbxproj @@ -436,6 +436,11 @@ CLASSPREFIX = EM; LastUpgradeCheck = 0510; ORGANIZATIONNAME = Emmoco; + TargetAttributes = { + 3471865C18070D9300FA0FB2 = { + DevelopmentTeam = GWUFEH6P8F; + }; + }; }; buildConfigurationList = 3471865818070D9300FA0FB2 /* Build configuration list for PBXProject "BT Vendor" */; compatibilityVersion = "Xcode 3.2"; @@ -776,8 +781,8 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -793,11 +798,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = YES; - OTHER_CODE_SIGN_FLAGS = "-gta"; + OTHER_CODE_SIGN_FLAGS = "--force --sign"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; }; name = Debug; }; @@ -817,8 +823,8 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -828,8 +834,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; - OTHER_CODE_SIGN_FLAGS = "-gta"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + OTHER_CODE_SIGN_FLAGS = "--force --sign"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -841,15 +847,20 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "FirstAppExample/BT Vendor-Prefix.pch"; INFOPLIST_FILE = "FirstAppExample/BT Vendor-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", EmmocoMobileFramework/Framework, ); + OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = "-all_load"; PRODUCT_NAME = "BT Vendor"; + PROVISIONING_PROFILE = "c5dc5eb6-c9b6-4dd0-b872-572aba3a7cd7"; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -859,15 +870,20 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "FirstAppExample/BT Vendor-Prefix.pch"; INFOPLIST_FILE = "FirstAppExample/BT Vendor-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", EmmocoMobileFramework/Framework, ); + OTHER_CODE_SIGN_FLAGS = ""; OTHER_LDFLAGS = "-all_load"; PRODUCT_NAME = "BT Vendor"; + PROVISIONING_PROFILE = "c5dc5eb6-c9b6-4dd0-b872-572aba3a7cd7"; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index c280f15..559a558 100644 Binary files a/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate and b/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 375307f..fcd7691 100644 --- a/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -737,5 +737,53 @@ landmarkType = "5"> + + + + + + + + + + + + diff --git a/BT Vendor/Base.lproj/DatePickerViewController.xib b/BT Vendor/Base.lproj/DatePickerViewController.xib index 2d2118c..18c0eef 100644 --- a/BT Vendor/Base.lproj/DatePickerViewController.xib +++ b/BT Vendor/Base.lproj/DatePickerViewController.xib @@ -13,11 +13,11 @@ - + - + - + - + VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g @@ -55,7 +55,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + @@ -79,7 +79,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController.xib b/BT Vendor/Base.lproj/DateRangePickerViewController.xib index 2b0c9b8..f74f87f 100644 --- a/BT Vendor/Base.lproj/DateRangePickerViewController.xib +++ b/BT Vendor/Base.lproj/DateRangePickerViewController.xib @@ -1,5 +1,5 @@ - + @@ -20,11 +20,11 @@ - + - + @@ -162,7 +162,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib index b506f05..4eaae1a 100644 --- a/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib +++ b/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib @@ -1,5 +1,5 @@ - + @@ -20,15 +20,15 @@ - + - + - + @@ -45,7 +45,7 @@