Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit ff05827cbc5da2526f446255124aa8b77c596a71

Authored by Imanol-Mikel Barba Sabariego
1 parent d5590e27

Fixing compatibility with 4 inch

Inline Side-by-side
Showing 11 changed files with 104 additions and 41 deletions
BT Vendor/BT Vendor.xcodeproj/project.pbxproj
  View file @ff05827
... ... @@ -436,6 +436,11 @@
436 436 CLASSPREFIX = EM;
437 437 LastUpgradeCheck = 0510;
438 438 ORGANIZATIONNAME = Emmoco;
  439 + TargetAttributes = {
  440 + 3471865C18070D9300FA0FB2 = {
  441 + DevelopmentTeam = GWUFEH6P8F;
  442 + };
  443 + };
439 444 };
440 445 buildConfigurationList = 3471865818070D9300FA0FB2 /* Build configuration list for PBXProject "BT Vendor" */;
441 446 compatibilityVersion = "Xcode 3.2";
... ... @@ -776,8 +781,8 @@
776 781 CLANG_WARN_INT_CONVERSION = YES;
777 782 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
778 783 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
779   - CODE_SIGN_IDENTITY = "iPhone Developer";
780   - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  784 + CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)";
  785 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)";
781 786 COPY_PHASE_STRIP = NO;
782 787 GCC_C_LANGUAGE_STANDARD = gnu99;
783 788 GCC_DYNAMIC_NO_PIC = NO;
... ... @@ -793,11 +798,12 @@
793 798 GCC_WARN_UNINITIALIZED_AUTOS = YES;
794 799 GCC_WARN_UNUSED_FUNCTION = YES;
795 800 GCC_WARN_UNUSED_VARIABLE = YES;
796   - IPHONEOS_DEPLOYMENT_TARGET = 7.1;
  801 + IPHONEOS_DEPLOYMENT_TARGET = 7.0;
797 802 ONLY_ACTIVE_ARCH = YES;
798   - OTHER_CODE_SIGN_FLAGS = "-gta";
  803 + OTHER_CODE_SIGN_FLAGS = "--force --sign";
799 804 SDKROOT = iphoneos;
800 805 TARGETED_DEVICE_FAMILY = "1,2";
  806 + VALIDATE_PRODUCT = YES;
801 807 };
802 808 name = Debug;
803 809 };
... ... @@ -817,8 +823,8 @@
817 823 CLANG_WARN_INT_CONVERSION = YES;
818 824 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
819 825 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
820   - CODE_SIGN_IDENTITY = "iPhone Developer";
821   - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  826 + CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)";
  827 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)";
822 828 COPY_PHASE_STRIP = YES;
823 829 ENABLE_NS_ASSERTIONS = NO;
824 830 GCC_C_LANGUAGE_STANDARD = gnu99;
... ... @@ -828,8 +834,8 @@
828 834 GCC_WARN_UNINITIALIZED_AUTOS = YES;
829 835 GCC_WARN_UNUSED_FUNCTION = YES;
830 836 GCC_WARN_UNUSED_VARIABLE = YES;
831   - IPHONEOS_DEPLOYMENT_TARGET = 7.1;
832   - OTHER_CODE_SIGN_FLAGS = "-gta";
  837 + IPHONEOS_DEPLOYMENT_TARGET = 7.0;
  838 + OTHER_CODE_SIGN_FLAGS = "--force --sign";
833 839 SDKROOT = iphoneos;
834 840 TARGETED_DEVICE_FAMILY = "1,2";
835 841 VALIDATE_PRODUCT = YES;
... ... @@ -841,15 +847,20 @@
841 847 buildSettings = {
842 848 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
843 849 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
  850 + CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)";
844 851 GCC_PRECOMPILE_PREFIX_HEADER = YES;
845 852 GCC_PREFIX_HEADER = "FirstAppExample/BT Vendor-Prefix.pch";
846 853 INFOPLIST_FILE = "FirstAppExample/BT Vendor-Info.plist";
  854 + IPHONEOS_DEPLOYMENT_TARGET = 7.0;
847 855 LIBRARY_SEARCH_PATHS = (
848 856 "$(inherited)",
849 857 EmmocoMobileFramework/Framework,
850 858 );
  859 + OTHER_CODE_SIGN_FLAGS = "";
851 860 OTHER_LDFLAGS = "-all_load";
852 861 PRODUCT_NAME = "BT Vendor";
  862 + PROVISIONING_PROFILE = "c5dc5eb6-c9b6-4dd0-b872-572aba3a7cd7";
  863 + TARGETED_DEVICE_FAMILY = "1,2";
853 864 WRAPPER_EXTENSION = app;
854 865 };
855 866 name = Debug;
... ... @@ -859,15 +870,20 @@
859 870 buildSettings = {
860 871 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
861 872 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
  873 + CODE_SIGN_IDENTITY = "iPhone Developer: Josep Pegueroles (HLPT38SX8D)";
862 874 GCC_PRECOMPILE_PREFIX_HEADER = YES;
863 875 GCC_PREFIX_HEADER = "FirstAppExample/BT Vendor-Prefix.pch";
864 876 INFOPLIST_FILE = "FirstAppExample/BT Vendor-Info.plist";
  877 + IPHONEOS_DEPLOYMENT_TARGET = 7.0;
865 878 LIBRARY_SEARCH_PATHS = (
866 879 "$(inherited)",
867 880 EmmocoMobileFramework/Framework,
868 881 );
  882 + OTHER_CODE_SIGN_FLAGS = "";
869 883 OTHER_LDFLAGS = "-all_load";
870 884 PRODUCT_NAME = "BT Vendor";
  885 + PROVISIONING_PROFILE = "c5dc5eb6-c9b6-4dd0-b872-572aba3a7cd7";
  886 + TARGETED_DEVICE_FAMILY = "1,2";
871 887 WRAPPER_EXTENSION = app;
872 888 };
873 889 name = Release;
... ...
BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @ff05827
No preview for this file type
BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  View file @ff05827
... ... @@ -737,5 +737,53 @@
737 737 landmarkType = "5">
738 738 </BreakpointContent>
739 739 </BreakpointProxy>
  740 + <BreakpointProxy
  741 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  742 + <BreakpointContent
  743 + shouldBeEnabled = "No"
  744 + ignoreCount = "0"
  745 + continueAfterRunningActions = "No"
  746 + filePath = "MenuTableViewController.m"
  747 + timestampString = "437071840.751211"
  748 + startingColumnNumber = "9223372036854775807"
  749 + endingColumnNumber = "9223372036854775807"
  750 + startingLineNumber = "1039"
  751 + endingLineNumber = "1039"
  752 + landmarkName = "-tableView:didSelectRowAtIndexPath:"
  753 + landmarkType = "5">
  754 + </BreakpointContent>
  755 + </BreakpointProxy>
  756 + <BreakpointProxy
  757 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  758 + <BreakpointContent
  759 + shouldBeEnabled = "No"
  760 + ignoreCount = "0"
  761 + continueAfterRunningActions = "No"
  762 + filePath = "MenuTableViewController.m"
  763 + timestampString = "437071843.599188"
  764 + startingColumnNumber = "9223372036854775807"
  765 + endingColumnNumber = "9223372036854775807"
  766 + startingLineNumber = "1036"
  767 + endingLineNumber = "1036"
  768 + landmarkName = "-tableView:didSelectRowAtIndexPath:"
  769 + landmarkType = "5">
  770 + </BreakpointContent>
  771 + </BreakpointProxy>
  772 + <BreakpointProxy
  773 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  774 + <BreakpointContent
  775 + shouldBeEnabled = "No"
  776 + ignoreCount = "0"
  777 + continueAfterRunningActions = "No"
  778 + filePath = "MenuTableViewController.m"
  779 + timestampString = "437071844.006923"
  780 + startingColumnNumber = "9223372036854775807"
  781 + endingColumnNumber = "9223372036854775807"
  782 + startingLineNumber = "1035"
  783 + endingLineNumber = "1035"
  784 + landmarkName = "-tableView:didSelectRowAtIndexPath:"
  785 + landmarkType = "5">
  786 + </BreakpointContent>
  787 + </BreakpointProxy>
740 788 </Breakpoints>
741 789 </Bucket>
... ...
BT Vendor/Base.lproj/DatePickerViewController.xib
  View file @ff05827
... ... @@ -13,11 +13,11 @@
13 13 </placeholder>
14 14 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
15 15 <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="7fx-e7-JEt">
16   - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
  16 + <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
17 17 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18 18 <subviews>
19 19 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="o92-Jq-3Xo">
20   - <rect key="frame" x="6" y="92" width="308" height="296"/>
  20 + <rect key="frame" x="6" y="136" width="308" height="296"/>
21 21 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
22 22 <subviews>
23 23 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8vW-ig-tUA">
... ... @@ -78,7 +78,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
78 78 <constraint firstAttribute="centerX" secondItem="o92-Jq-3Xo" secondAttribute="centerX" id="fTS-XF-GoP"/>
79 79 </constraints>
80 80 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
81   - <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
  81 + <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
82 82 </view>
83 83 </objects>
84 84 </document>
... ...
BT Vendor/Base.lproj/DatePickerViewController_Landscape.xib
  View file @ff05827
... ... @@ -13,11 +13,11 @@
13 13 </placeholder>
14 14 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
15 15 <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="Gmb-MP-4KM">
16   - <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
  16 + <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
17 17 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18 18 <subviews>
19 19 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkY-m0-juR">
20   - <rect key="frame" x="86" y="12" width="308" height="296"/>
  20 + <rect key="frame" x="130" y="12" width="308" height="296"/>
21 21 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
22 22 <subviews>
23 23 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SLt-EA-xM9">
... ... @@ -31,13 +31,13 @@
31 31 </connections>
32 32 </button>
33 33 <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="nV6-bl-8Mn">
34   - <rect key="frame" x="-6" y="20" width="320" height="162"/>
  34 + <rect key="frame" x="-6" y="20" width="321" height="162"/>
35 35 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
36 36 <date key="date" timeIntervalSinceReferenceDate="431534074.16804099">
37 37 <!--2014-09-04 14:34:34 +0000-->
38 38 </date>
39 39 <timeZone key="timeZone" name="America/Los_Angeles">
40   - <mutableData key="data">
  40 + <data key="data">
41 41 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
42 42 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
43 43 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
... ... @@ -55,7 +55,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
55 55 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
56 56 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
57 57 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
58   -</mutableData>
  58 +</data>
59 59 </timeZone>
60 60 </datePicker>
61 61 </subviews>
... ... @@ -79,7 +79,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
79 79 </constraints>
80 80 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
81 81 <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
82   - <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
  82 + <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
83 83 </view>
84 84 </objects>
85 85 </document>
... ...
BT Vendor/Base.lproj/DateRangePickerViewController.xib
  View file @ff05827
1 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2   -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
3 3 <dependencies>
4 4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
5 5 </dependencies>
... ... @@ -20,11 +20,11 @@
20 20 </placeholder>
21 21 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
22 22 <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="kvr-be-fbh">
23   - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
  23 + <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
24 24 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
25 25 <subviews>
26 26 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fz9-NP-VLV">
27   - <rect key="frame" x="20" y="20" width="280" height="139"/>
  27 + <rect key="frame" x="20" y="20" width="280" height="227"/>
28 28 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
29 29 <subviews>
30 30 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bPF-XH-a36">
... ... @@ -162,7 +162,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
162 162 <constraint firstAttribute="bottom" secondItem="fz9-NP-VLV" secondAttribute="bottom" constant="321" id="qh2-6H-Nq5"/>
163 163 </constraints>
164 164 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
165   - <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
  165 + <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
166 166 </view>
167 167 </objects>
168 168 </document>
... ...
BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib
  View file @ff05827
1 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2   -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
3 3 <dependencies>
4 4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
5 5 </dependencies>
... ... @@ -20,15 +20,15 @@
20 20 </placeholder>
21 21 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
22 22 <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="4CX-TI-g0c">
23   - <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
  23 + <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
24 24 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
25 25 <subviews>
26 26 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LR9-4f-pyO">
27   - <rect key="frame" x="20" y="20" width="440" height="136"/>
  27 + <rect key="frame" x="20" y="20" width="528" height="136"/>
28 28 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
29 29 <subviews>
30 30 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YyP-Hs-KVd">
31   - <rect key="frame" x="0.0" y="0.0" width="440" height="602"/>
  31 + <rect key="frame" x="0.0" y="0.0" width="528" height="602"/>
32 32 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
33 33 <subviews>
34 34 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="cTb-x4-h2w">
... ... @@ -45,7 +45,7 @@
45 45 <nil key="highlightedColor"/>
46 46 </label>
47 47 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="84e-nH-INk">
48   - <rect key="frame" x="0.0" y="59" width="440" height="162"/>
  48 + <rect key="frame" x="0.0" y="59" width="528" height="162"/>
49 49 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
50 50 <date key="date" timeIntervalSinceReferenceDate="432266305.732934">
51 51 <!--2014-09-13 01:58:25 +0000-->
... ... @@ -86,7 +86,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
86 86 </connections>
87 87 </switch>
88 88 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="MAy-lw-s1B">
89   - <rect key="frame" x="0.0" y="98" width="440" height="162"/>
  89 + <rect key="frame" x="0.0" y="98" width="528" height="162"/>
90 90 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
91 91 <date key="date" timeIntervalSinceReferenceDate="432266362.26397198">
92 92 <!--2014-09-13 01:59:22 +0000-->
... ... @@ -114,7 +114,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
114 114 </timeZone>
115 115 </datePicker>
116 116 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nfK-Us-pVk">
117   - <rect key="frame" x="202" y="98" width="37" height="30"/>
  117 + <rect key="frame" x="246" y="98" width="37" height="30"/>
118 118 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
119 119 <state key="normal" title="Done">
120 120 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -127,7 +127,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
127 127 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
128 128 <constraints>
129 129 <constraint firstItem="cTb-x4-h2w" firstAttribute="top" secondItem="YyP-Hs-KVd" secondAttribute="top" constant="20" id="71v-O2-Kw2"/>
130   - <constraint firstAttribute="width" constant="440" id="8Cg-lC-KMO"/>
131 130 <constraint firstItem="WCO-rz-s5y" firstAttribute="top" secondItem="Ses-ng-Dli" secondAttribute="bottom" constant="18" id="A53-8Q-SjO"/>
132 131 <constraint firstItem="MAy-lw-s1B" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" id="BYM-Gd-Zd6"/>
133 132 <constraint firstAttribute="centerX" secondItem="nfK-Us-pVk" secondAttribute="centerX" constant="-0.5" id="HZk-hK-PfS"/>
... ... @@ -167,7 +166,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
167 166 </constraints>
168 167 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
169 168 <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
170   - <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
  169 + <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
171 170 </view>
172 171 </objects>
173 172 </document>
... ...
BT Vendor/Base.lproj/PriceChangerViewController.xib
  View file @ff05827
... ... @@ -15,7 +15,7 @@
15 15 </placeholder>
16 16 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
17 17 <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="Vhv-I1-cgL">
18   - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
  18 + <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
19 19 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20 20 <subviews>
21 21 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6eG-rz-OsA">
... ... @@ -106,7 +106,7 @@
106 106 <constraint firstAttribute="centerX" secondItem="6eG-rz-OsA" secondAttribute="centerX" constant="-0.5" id="ShJ-gZ-P8L"/>
107 107 </constraints>
108 108 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
109   - <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
  109 + <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
110 110 </view>
111 111 </objects>
112 112 </document>
... ...
BT Vendor/Base.lproj/PriceChangerViewController_Landscape.xib
  View file @ff05827
... ... @@ -15,11 +15,11 @@
15 15 </placeholder>
16 16 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
17 17 <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="UBs-dW-l8n">
18   - <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
  18 + <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
19 19 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20 20 <subviews>
21 21 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KpQ-d0-bwT">
22   - <rect key="frame" x="87" y="70" width="307" height="181"/>
  22 + <rect key="frame" x="131" y="70" width="307" height="181"/>
23 23 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
24 24 <subviews>
25 25 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DEB-yT-L0p">
... ... @@ -107,7 +107,7 @@
107 107 </constraints>
108 108 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
109 109 <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
110   - <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
  110 + <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
111 111 </view>
112 112 </objects>
113 113 </document>
... ...
BT Vendor/FirstAppExample/EMDevicePickerViewController.m
  View file @ff05827
... ... @@ -55,11 +55,11 @@
55 55 {
56 56 if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation]))
57 57 {
58   - [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView" owner:self options:nil];
  58 + [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView_Landscape" owner:self options:nil];
59 59 }
60 60 else
61 61 {
62   - [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView_Landscape" owner:self options:nil];
  62 + [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView" owner:self options:nil];
63 63 }
64 64 }
65 65 [[[self popoverView] layer] setCornerRadius:10.0f];
... ...
BT Vendor/MenuTableViewController.m
  View file @ff05827
... ... @@ -1055,7 +1055,7 @@
1055 1055 {
1056 1056 if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation]))
1057 1057 {
1058   - self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController" bundle:nil];
  1058 + self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController_Landscape" bundle:nil];
1059 1059 self.datePickerViewController.delegate = self;
1060 1060 self.datePickerViewController.childDelegate = self;
1061 1061 [self.childViewControllers insertObject:self.datePickerViewController atIndex:self.childViewControllers.count];
... ... @@ -1063,7 +1063,7 @@
1063 1063 }
1064 1064 else
1065 1065 {
1066   - self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController_Landscape" bundle:nil];
  1066 + self.datePickerViewController = [[DatePickerViewController alloc] initWithNibName:@"DatePickerViewController" bundle:nil];
1067 1067 self.datePickerViewController.delegate = self;
1068 1068 self.datePickerViewController.childDelegate = self;
1069 1069 [self.childViewControllers insertObject:self.datePickerViewController atIndex:self.childViewControllers.count];
... ... @@ -1100,7 +1100,7 @@
1100 1100 {
1101 1101 if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation]))
1102 1102 {
1103   - self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController" bundle:nil];
  1103 + self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController_Landscape" bundle:nil];
1104 1104 self.priceChangerViewController.delegate = self;
1105 1105 self.priceChangerViewController.childDelegate = self;
1106 1106 [self.childViewControllers insertObject:self.priceChangerViewController atIndex:self.childViewControllers.count];
... ... @@ -1108,7 +1108,7 @@
1108 1108 }
1109 1109 else
1110 1110 {
1111   - self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController_Landscape" bundle:nil];
  1111 + self.priceChangerViewController = [[PriceChangerViewController alloc] initWithNibName:@"PriceChangerViewController" bundle:nil];
1112 1112 self.priceChangerViewController.delegate = self;
1113 1113 self.priceChangerViewController.childDelegate = self;
1114 1114 [self.childViewControllers insertObject:self.priceChangerViewController atIndex:self.childViewControllers.count];
... ...