Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit e98eb05a06c4b0ca9655d83b2f9a0f3e329b2a73

Authored by Imanol-Mikel Barba Sabariego
1 parent 27e675a3

--no commit message

Inline Side-by-side
Showing 14 changed files with 235 additions and 132 deletions
DUREX Vendor Control/Base.lproj/DatePickerViewController.xib
  View file @e98eb05
... ... @@ -6,7 +6,6 @@
6 6 <objects>
7 7 <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DatePickerViewController">
8 8 <connections>
9   - <outlet property="datePicker" destination="6Ex-R5-AYV" id="50R-pL-vEb"/>
10 9 <outlet property="datePickerView" destination="o92-Jq-3Xo" id="IOi-YU-3Wz"/>
11 10 <outlet property="view" destination="7fx-e7-JEt" id="dL9-Ac-hWL"/>
12 11 </connections>
... ... @@ -16,15 +15,25 @@
16 15 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
17 16 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18 17 <subviews>
19   - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="o92-Jq-3Xo">
20   - <rect key="frame" x="6" y="105" width="308" height="282"/>
  18 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="o92-Jq-3Xo">
  19 + <rect key="frame" x="6" y="126" width="308" height="296"/>
21 20 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
22 21 <subviews>
23   - <datePicker contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="6Ex-R5-AYV">
24   - <rect key="frame" x="-6" y="62" width="320" height="162"/>
  22 + <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8vW-ig-tUA">
  23 + <rect key="frame" x="136" y="244" width="37" height="30"/>
  24 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  25 + <state key="normal" title="Done">
  26 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  27 + </state>
  28 + <connections>
  29 + <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="bgh-B7-4fN"/>
  30 + </connections>
  31 + </button>
  32 + <datePicker contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="SbL-OM-Pxu">
  33 + <rect key="frame" x="-6" y="20" width="320" height="162"/>
25 34 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
26   - <date key="date" timeIntervalSinceReferenceDate="431369786.91497999">
27   - <!--2014-09-02 16:56:26 +0000-->
  35 + <date key="date" timeIntervalSinceReferenceDate="431534074.16804099">
  36 + <!--2014-09-04 14:34:34 +0000-->
28 37 </date>
29 38 <timeZone key="timeZone" name="America/Los_Angeles">
30 39 <data key="data">
... ... @@ -48,26 +57,24 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
48 57 </data>
49 58 </timeZone>
50 59 </datePicker>
51   - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8vW-ig-tUA">
52   - <rect key="frame" x="131" y="232" width="46" height="30"/>
53   - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
54   - <state key="normal" title="Done">
55   - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
56   - </state>
57   - <connections>
58   - <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="bgh-B7-4fN"/>
59   - </connections>
60   - </button>
61 60 </subviews>
62 61 <color key="backgroundColor" white="1" alpha="0.95000000000000007" colorSpace="calibratedWhite"/>
63 62 <constraints>
64   - <constraint firstItem="8vW-ig-tUA" firstAttribute="top" secondItem="6Ex-R5-AYV" secondAttribute="bottom" constant="8" id="M7C-4g-jy1"/>
65   - <constraint firstItem="6Ex-R5-AYV" firstAttribute="centerX" secondItem="8vW-ig-tUA" secondAttribute="centerX" id="QvW-cT-g8h"/>
66   - <constraint firstAttribute="centerX" secondItem="8vW-ig-tUA" secondAttribute="centerX" id="t61-ZC-ePU"/>
  63 + <constraint firstAttribute="height" constant="296" id="6Mz-Uy-NbX"/>
  64 + <constraint firstAttribute="centerX" secondItem="SbL-OM-Pxu" secondAttribute="centerX" id="IpE-Uj-YXL"/>
  65 + <constraint firstItem="8vW-ig-tUA" firstAttribute="top" secondItem="SbL-OM-Pxu" secondAttribute="bottom" constant="8" id="K5g-WK-5Hc"/>
  66 + <constraint firstItem="SbL-OM-Pxu" firstAttribute="top" secondItem="o92-Jq-3Xo" secondAttribute="top" constant="20" id="XOm-Da-DXb"/>
  67 + <constraint firstAttribute="width" constant="308" id="Zfo-v2-Opc"/>
  68 + <constraint firstAttribute="width" constant="308" id="rg4-Lw-oTQ"/>
  69 + <constraint firstAttribute="centerX" secondItem="8vW-ig-tUA" secondAttribute="centerX" constant="-0.5" id="xJw-o2-RKF"/>
67 70 </constraints>
68 71 </view>
69 72 </subviews>
70 73 <color key="backgroundColor" red="0.023529414087533951" green="0.0039215688593685627" blue="0.0039215688593685627" alpha="0.5" colorSpace="deviceRGB"/>
  74 + <constraints>
  75 + <constraint firstItem="o92-Jq-3Xo" firstAttribute="top" secondItem="7fx-e7-JEt" secondAttribute="top" constant="126" id="7ki-Mk-J5B"/>
  76 + <constraint firstAttribute="centerX" secondItem="o92-Jq-3Xo" secondAttribute="centerX" id="fTS-XF-GoP"/>
  77 + </constraints>
71 78 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
72 79 <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
73 80 </view>
... ...
DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib
  View file @e98eb05
... ... @@ -16,13 +16,18 @@
16 16 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
17 17 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18 18 <subviews>
19   - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YoS-Cq-kfN">
20   - <rect key="frame" x="192" y="256" width="384" height="321"/>
  19 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YoS-Cq-kfN">
  20 + <rect key="frame" x="192" y="351" width="384" height="321"/>
21 21 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
22 22 <subviews>
23   - <datePicker contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="3XX-v6-qTY">
  23 + <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="3XX-v6-qTY">
24 24 <rect key="frame" x="-192" y="47" width="768" height="216"/>
25 25 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
  26 + <constraints>
  27 + <constraint firstAttribute="width" constant="768" id="Pgg-r9-HIP"/>
  28 + <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="768" id="ngh-5u-kgr"/>
  29 + <constraint firstAttribute="height" constant="216" id="scf-ur-ntV"/>
  30 + </constraints>
26 31 <date key="date" timeIntervalSinceReferenceDate="431372189.40412599">
27 32 <!--2014-09-02 17:36:29 +0000-->
28 33 </date>
... ... @@ -48,8 +53,8 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
48 53 </data>
49 54 </timeZone>
50 55 </datePicker>
51   - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RGE-Ye-qon">
52   - <rect key="frame" x="169" y="271" width="46" height="30"/>
  56 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RGE-Ye-qon">
  57 + <rect key="frame" x="174" y="271" width="37" height="30"/>
53 58 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
54 59 <state key="normal" title="Done">
55 60 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -62,14 +67,18 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
62 67 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
63 68 <constraints>
64 69 <constraint firstItem="RGE-Ye-qon" firstAttribute="top" secondItem="3XX-v6-qTY" secondAttribute="bottom" constant="8" id="6iZ-h3-wEL"/>
  70 + <constraint firstAttribute="width" constant="384" id="74N-1u-MlE"/>
65 71 <constraint firstItem="3XX-v6-qTY" firstAttribute="centerX" secondItem="RGE-Ye-qon" secondAttribute="centerX" id="8nT-zM-hgt"/>
  72 + <constraint firstItem="3XX-v6-qTY" firstAttribute="top" secondItem="YoS-Cq-kfN" secondAttribute="top" constant="47" id="KBE-yK-lRs"/>
  73 + <constraint firstItem="3XX-v6-qTY" firstAttribute="leading" secondItem="YoS-Cq-kfN" secondAttribute="leading" constant="-192" id="VCY-84-a0G"/>
66 74 <constraint firstAttribute="centerX" secondItem="RGE-Ye-qon" secondAttribute="centerX" id="oSf-yk-jJ4"/>
  75 + <constraint firstAttribute="height" constant="321" id="uhB-RO-pEr"/>
67 76 </constraints>
68 77 </view>
69 78 </subviews>
70 79 <color key="backgroundColor" red="0.023529414087533951" green="0.0039215688593685627" blue="0.0039215688593685627" alpha="0.5" colorSpace="deviceRGB"/>
71 80 <constraints>
72   - <constraint firstAttribute="centerY" secondItem="YoS-Cq-kfN" secondAttribute="centerY" constant="95.5" id="IRy-Yg-Vj5"/>
  81 + <constraint firstAttribute="centerY" secondItem="YoS-Cq-kfN" secondAttribute="centerY" constant="0.5" id="aML-4C-Hmp"/>
73 82 <constraint firstAttribute="centerX" secondItem="YoS-Cq-kfN" secondAttribute="centerX" id="d3A-NR-o0K"/>
74 83 </constraints>
75 84 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
... ...
DUREX Vendor Control/Base.lproj/NameChangerViewController.xib
  View file @e98eb05
... ... @@ -18,49 +18,58 @@
18 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   - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Yfy-pU-0Wn">
22   - <rect key="frame" x="7" y="118" width="307" height="181"/>
  21 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yfy-pU-0Wn">
  22 + <rect key="frame" x="7" y="170" width="307" height="181"/>
23 23 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
24 24 <subviews>
25   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vbt-3v-Jzm">
  25 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vbt-3v-Jzm">
26 26 <rect key="frame" x="190" y="20" width="97" height="30"/>
27 27 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  28 + <constraints>
  29 + <constraint firstAttribute="width" constant="97" id="V5R-sY-hSr"/>
  30 + </constraints>
28 31 <fontDescription key="fontDescription" type="system" pointSize="14"/>
29 32 <textInputTraits key="textInputTraits"/>
30 33 </textField>
31   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="UP5-iH-LdU">
  34 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="UP5-iH-LdU">
32 35 <rect key="frame" x="190" y="59" width="97" height="30"/>
33 36 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  37 + <constraints>
  38 + <constraint firstAttribute="width" constant="97" id="r0j-J6-UcW"/>
  39 + </constraints>
34 40 <fontDescription key="fontDescription" type="system" pointSize="14"/>
35 41 <textInputTraits key="textInputTraits"/>
36 42 </textField>
37   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jP9-NI-B16">
  43 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jP9-NI-B16">
38 44 <rect key="frame" x="190" y="97" width="97" height="30"/>
39 45 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  46 + <constraints>
  47 + <constraint firstAttribute="width" constant="97" id="4mr-ac-X5M"/>
  48 + </constraints>
40 49 <fontDescription key="fontDescription" type="system" pointSize="14"/>
41 50 <textInputTraits key="textInputTraits"/>
42 51 </textField>
43   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u0t-Gj-gKZ">
44   - <rect key="frame" x="20" y="24" width="66" height="21"/>
  52 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u0t-Gj-gKZ">
  53 + <rect key="frame" x="20" y="24" width="64" height="21"/>
45 54 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
46 55 <fontDescription key="fontDescription" type="system" pointSize="17"/>
47 56 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
48 57 <nil key="highlightedColor"/>
49 58 </label>
50   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zk3-Qc-MYf">
  59 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zk3-Qc-MYf">
51 60 <rect key="frame" x="20" y="63" width="107" height="21"/>
52 61 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
53 62 <fontDescription key="fontDescription" type="system" pointSize="17"/>
54 63 <nil key="highlightedColor"/>
55 64 </label>
56   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfh-RB-roO">
  65 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfh-RB-roO">
57 66 <rect key="frame" x="20" y="101" width="85" height="21"/>
58 67 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
59 68 <fontDescription key="fontDescription" type="system" pointSize="17"/>
60 69 <nil key="highlightedColor"/>
61 70 </label>
62   - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y9f-BL-5ZB">
63   - <rect key="frame" x="130" y="131" width="46" height="30"/>
  71 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y9f-BL-5ZB">
  72 + <rect key="frame" x="135" y="131" width="37" height="30"/>
64 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
65 74 <state key="normal" title="Done">
66 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -73,13 +82,19 @@
73 82 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
74 83 <constraints>
75 84 <constraint firstItem="Zfh-RB-roO" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="4Xl-Uy-ots"/>
  85 + <constraint firstItem="u0t-Gj-gKZ" firstAttribute="top" secondItem="Yfy-pU-0Wn" secondAttribute="top" constant="24" id="Bck-MA-vkx"/>
76 86 <constraint firstItem="Zfh-RB-roO" firstAttribute="top" secondItem="zk3-Qc-MYf" secondAttribute="bottom" constant="17" id="DJs-b3-pqQ"/>
77 87 <constraint firstItem="u0t-Gj-gKZ" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="FDy-MQ-JZ8"/>
  88 + <constraint firstAttribute="width" constant="307" id="GQX-7o-a86"/>
  89 + <constraint firstItem="vbt-3v-Jzm" firstAttribute="top" secondItem="Yfy-pU-0Wn" secondAttribute="top" constant="20" id="HP9-VA-6kz"/>
  90 + <constraint firstItem="UP5-iH-LdU" firstAttribute="top" secondItem="vbt-3v-Jzm" secondAttribute="bottom" constant="9" id="KeN-pj-WkA"/>
78 91 <constraint firstAttribute="trailing" secondItem="jP9-NI-B16" secondAttribute="trailing" constant="20" id="S7F-ml-rti"/>
  92 + <constraint firstItem="jP9-NI-B16" firstAttribute="top" secondItem="UP5-iH-LdU" secondAttribute="bottom" constant="8" id="VFi-63-f5d"/>
79 93 <constraint firstAttribute="bottom" secondItem="Y9f-BL-5ZB" secondAttribute="bottom" constant="20" id="W0h-rh-xiC"/>
80 94 <constraint firstAttribute="trailing" secondItem="vbt-3v-Jzm" secondAttribute="trailing" constant="20" id="Xe6-t2-6JD"/>
81 95 <constraint firstItem="zk3-Qc-MYf" firstAttribute="top" secondItem="u0t-Gj-gKZ" secondAttribute="bottom" constant="18" id="c79-yI-89e"/>
82   - <constraint firstAttribute="centerX" secondItem="Y9f-BL-5ZB" secondAttribute="centerX" constant="0.5" id="cVt-eu-j0C"/>
  96 + <constraint firstAttribute="height" constant="181" id="fv5-UY-KsO"/>
  97 + <constraint firstAttribute="centerX" secondItem="Y9f-BL-5ZB" secondAttribute="centerX" constant="0.5" id="h5O-ib-n1S"/>
83 98 <constraint firstItem="zk3-Qc-MYf" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="hfD-fm-kDf"/>
84 99 <constraint firstAttribute="trailing" secondItem="UP5-iH-LdU" secondAttribute="trailing" constant="20" id="i9s-wf-CCF"/>
85 100 </constraints>
... ... @@ -87,8 +102,8 @@
87 102 </subviews>
88 103 <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
89 104 <constraints>
90   - <constraint firstAttribute="centerY" secondItem="Yfy-pU-0Wn" secondAttribute="centerY" constant="75" id="dMJ-8U-j28"/>
91   - <constraint firstAttribute="centerX" secondItem="Yfy-pU-0Wn" secondAttribute="centerX" constant="-0.5" id="qFe-Tn-pPX"/>
  105 + <constraint firstItem="Yfy-pU-0Wn" firstAttribute="top" secondItem="orJ-qi-Y62" secondAttribute="top" constant="170" id="Mv8-ll-5jP"/>
  106 + <constraint firstAttribute="centerX" secondItem="Yfy-pU-0Wn" secondAttribute="centerX" constant="-0.5" id="oiN-2m-voi"/>
92 107 </constraints>
93 108 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
94 109 <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
... ...
DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad.xib
  View file @e98eb05
... ... @@ -18,49 +18,49 @@
18 18 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
19 19 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20 20 <subviews>
21   - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LIm-mD-lnc">
22   - <rect key="frame" x="213" y="294" width="343" height="177"/>
  21 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LIm-mD-lnc">
  22 + <rect key="frame" x="213" y="423" width="343" height="177"/>
23 23 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
24 24 <subviews>
25   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Emm-7B-NhE">
  25 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Emm-7B-NhE">
26 26 <rect key="frame" x="226" y="17" width="97" height="30"/>
27 27 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  28 + <constraints>
  29 + <constraint firstAttribute="width" constant="97" id="yPR-D6-SZv"/>
  30 + </constraints>
28 31 <fontDescription key="fontDescription" type="system" pointSize="14"/>
29 32 <textInputTraits key="textInputTraits"/>
30 33 </textField>
31   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0sU-V8-QVn">
32   - <rect key="frame" x="226" y="56" width="97" height="30"/>
33   - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
34   - <fontDescription key="fontDescription" type="system" pointSize="14"/>
35   - <textInputTraits key="textInputTraits"/>
36   - </textField>
37   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Mqg-fy-qfX">
38   - <rect key="frame" x="226" y="95" width="97" height="30"/>
  34 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Mqg-fy-qfX">
  35 + <rect key="frame" x="226" y="94" width="97" height="30"/>
39 36 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  37 + <constraints>
  38 + <constraint firstAttribute="width" constant="97" id="dFt-hu-wOa"/>
  39 + </constraints>
40 40 <fontDescription key="fontDescription" type="system" pointSize="14"/>
41 41 <textInputTraits key="textInputTraits"/>
42 42 </textField>
43   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9PW-xp-3t9">
  43 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9PW-xp-3t9">
44 44 <rect key="frame" x="20" y="21" width="64" height="21"/>
45 45 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
46 46 <fontDescription key="fontDescription" type="system" pointSize="17"/>
47 47 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
48 48 <nil key="highlightedColor"/>
49 49 </label>
50   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RCD-6Z-45A">
  50 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RCD-6Z-45A">
51 51 <rect key="frame" x="20" y="60" width="107" height="21"/>
52 52 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
53 53 <fontDescription key="fontDescription" type="system" pointSize="17"/>
54 54 <nil key="highlightedColor"/>
55 55 </label>
56   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pLv-EG-y2m">
  56 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pLv-EG-y2m">
57 57 <rect key="frame" x="20" y="98" width="85" height="21"/>
58 58 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
59 59 <fontDescription key="fontDescription" type="system" pointSize="17"/>
60 60 <nil key="highlightedColor"/>
61 61 </label>
62   - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Md5-1l-LqY">
63   - <rect key="frame" x="148" y="127" width="46" height="30"/>
  62 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Md5-1l-LqY">
  63 + <rect key="frame" x="153" y="127" width="37" height="30"/>
64 64 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
65 65 <state key="normal" title="Done">
66 66 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -69,28 +69,41 @@
69 69 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="eeR-C7-bL8"/>
70 70 </connections>
71 71 </button>
  72 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0sU-V8-QVn">
  73 + <rect key="frame" x="226" y="56" width="97" height="30"/>
  74 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  75 + <constraints>
  76 + <constraint firstAttribute="width" constant="97" id="mcc-YJ-98f"/>
  77 + </constraints>
  78 + <fontDescription key="fontDescription" type="system" pointSize="14"/>
  79 + <textInputTraits key="textInputTraits"/>
  80 + </textField>
72 81 </subviews>
73 82 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
74 83 <constraints>
75 84 <constraint firstAttribute="trailing" secondItem="Mqg-fy-qfX" secondAttribute="trailing" constant="20" id="3dG-Y6-RcB"/>
76 85 <constraint firstItem="9PW-xp-3t9" firstAttribute="leading" secondItem="LIm-mD-lnc" secondAttribute="leading" constant="20" id="5cR-84-mkF"/>
77 86 <constraint firstItem="pLv-EG-y2m" firstAttribute="leading" secondItem="LIm-mD-lnc" secondAttribute="leading" constant="20" id="71g-b1-lP0"/>
  87 + <constraint firstAttribute="width" constant="343" id="7tD-XW-5vz"/>
78 88 <constraint firstAttribute="trailing" secondItem="Emm-7B-NhE" secondAttribute="trailing" constant="20" id="Djn-mi-3Ed"/>
  89 + <constraint firstItem="0sU-V8-QVn" firstAttribute="top" secondItem="Emm-7B-NhE" secondAttribute="bottom" constant="9" id="ISV-fp-0tI"/>
  90 + <constraint firstItem="9PW-xp-3t9" firstAttribute="top" secondItem="LIm-mD-lnc" secondAttribute="top" constant="21" id="Jur-BX-YJV"/>
  91 + <constraint firstItem="Mqg-fy-qfX" firstAttribute="top" secondItem="0sU-V8-QVn" secondAttribute="bottom" constant="8" id="Y4S-7h-1r0"/>
79 92 <constraint firstAttribute="centerX" secondItem="Md5-1l-LqY" secondAttribute="centerX" constant="0.5" id="Z6u-Gn-LXz"/>
80   - <constraint firstItem="Mqg-fy-qfX" firstAttribute="top" secondItem="0sU-V8-QVn" secondAttribute="bottom" constant="8" id="dYK-nL-LGw"/>
81 93 <constraint firstItem="RCD-6Z-45A" firstAttribute="leading" secondItem="LIm-mD-lnc" secondAttribute="leading" constant="20" id="eZd-4s-kd1"/>
  94 + <constraint firstAttribute="height" constant="177" id="fXH-ZY-iCb"/>
82 95 <constraint firstAttribute="bottom" secondItem="Md5-1l-LqY" secondAttribute="bottom" constant="20" id="hb1-WU-uJX"/>
83 96 <constraint firstItem="RCD-6Z-45A" firstAttribute="top" secondItem="9PW-xp-3t9" secondAttribute="bottom" constant="18" id="oCQ-J2-GWR"/>
84   - <constraint firstItem="0sU-V8-QVn" firstAttribute="top" secondItem="Emm-7B-NhE" secondAttribute="bottom" constant="8" id="rvz-Oc-hbC"/>
85 97 <constraint firstItem="pLv-EG-y2m" firstAttribute="top" secondItem="RCD-6Z-45A" secondAttribute="bottom" constant="17" id="vnW-bp-wrA"/>
86 98 <constraint firstAttribute="trailing" secondItem="0sU-V8-QVn" secondAttribute="trailing" constant="20" id="xxe-g4-xO5"/>
  99 + <constraint firstItem="Emm-7B-NhE" firstAttribute="top" secondItem="LIm-mD-lnc" secondAttribute="top" constant="17" id="zpe-cG-PUv"/>
87 100 </constraints>
88 101 </view>
89 102 </subviews>
90 103 <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
91 104 <constraints>
92   - <constraint firstAttribute="centerY" secondItem="LIm-mD-lnc" secondAttribute="centerY" constant="129" id="CKd-ne-r1F"/>
93 105 <constraint firstAttribute="centerX" secondItem="LIm-mD-lnc" secondAttribute="centerX" constant="-0.5" id="kDS-c0-LBA"/>
  106 + <constraint firstAttribute="centerY" secondItem="LIm-mD-lnc" secondAttribute="centerY" constant="0.5" id="ukF-8r-NKc"/>
94 107 </constraints>
95 108 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
96 109 </view>
... ...
DUREX Vendor Control/Base.lproj/PriceChangerViewController.xib
  View file @e98eb05
... ... @@ -18,49 +18,58 @@
18 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   - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6eG-rz-OsA">
22   - <rect key="frame" x="7" y="118" width="307" height="181"/>
  21 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6eG-rz-OsA">
  22 + <rect key="frame" x="7" y="170" width="307" height="181"/>
23 23 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
24 24 <subviews>
25   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yrc-dD-lC1">
  25 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yrc-dD-lC1">
26 26 <rect key="frame" x="190" y="20" width="97" height="30"/>
27 27 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  28 + <constraints>
  29 + <constraint firstAttribute="width" constant="97" id="mRm-Yc-9KJ"/>
  30 + </constraints>
28 31 <fontDescription key="fontDescription" type="system" pointSize="14"/>
29 32 <textInputTraits key="textInputTraits"/>
30 33 </textField>
31   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0IF-Ml-nmK">
  34 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0IF-Ml-nmK">
32 35 <rect key="frame" x="190" y="59" width="97" height="30"/>
33 36 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  37 + <constraints>
  38 + <constraint firstAttribute="width" constant="97" id="D0x-wp-xRk"/>
  39 + </constraints>
34 40 <fontDescription key="fontDescription" type="system" pointSize="14"/>
35 41 <textInputTraits key="textInputTraits"/>
36 42 </textField>
37   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0ap-q1-lJS">
  43 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0ap-q1-lJS">
38 44 <rect key="frame" x="190" y="97" width="97" height="30"/>
39 45 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  46 + <constraints>
  47 + <constraint firstAttribute="width" constant="97" id="8Z4-F8-M5m"/>
  48 + </constraints>
40 49 <fontDescription key="fontDescription" type="system" pointSize="14"/>
41 50 <textInputTraits key="textInputTraits"/>
42 51 </textField>
43   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VCq-As-NrV">
44   - <rect key="frame" x="20" y="24" width="66" height="21"/>
  52 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VCq-As-NrV">
  53 + <rect key="frame" x="20" y="24" width="64" height="21"/>
45 54 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
46 55 <fontDescription key="fontDescription" type="system" pointSize="17"/>
47 56 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
48 57 <nil key="highlightedColor"/>
49 58 </label>
50   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2cF-of-r57">
  59 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2cF-of-r57">
51 60 <rect key="frame" x="20" y="63" width="107" height="21"/>
52 61 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
53 62 <fontDescription key="fontDescription" type="system" pointSize="17"/>
54 63 <nil key="highlightedColor"/>
55 64 </label>
56   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cbx-ha-NZx">
57   - <rect key="frame" x="20" y="101" width="82" height="21"/>
  65 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cbx-ha-NZx">
  66 + <rect key="frame" x="20" y="101" width="79" height="21"/>
58 67 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
59 68 <fontDescription key="fontDescription" type="system" pointSize="17"/>
60 69 <nil key="highlightedColor"/>
61 70 </label>
62   - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="slH-Zj-pps">
63   - <rect key="frame" x="130" y="131" width="46" height="30"/>
  71 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="slH-Zj-pps">
  72 + <rect key="frame" x="135" y="131" width="37" height="30"/>
64 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
65 74 <state key="normal" title="Done">
66 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -72,22 +81,28 @@
72 81 </subviews>
73 82 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
74 83 <constraints>
  84 + <constraint firstItem="VCq-As-NrV" firstAttribute="top" secondItem="6eG-rz-OsA" secondAttribute="top" constant="24" id="7Ei-6v-DJy"/>
75 85 <constraint firstAttribute="trailing" secondItem="0ap-q1-lJS" secondAttribute="trailing" constant="20" id="7GE-ll-lvy"/>
76 86 <constraint firstAttribute="centerX" secondItem="slH-Zj-pps" secondAttribute="centerX" constant="0.5" id="8wy-KG-YiS"/>
  87 + <constraint firstItem="0ap-q1-lJS" firstAttribute="top" secondItem="0IF-Ml-nmK" secondAttribute="bottom" constant="8" id="GEg-PI-O0h"/>
77 88 <constraint firstItem="Cbx-ha-NZx" firstAttribute="leading" secondItem="6eG-rz-OsA" secondAttribute="leading" constant="20" id="KKA-RW-IHT"/>
  89 + <constraint firstItem="0IF-Ml-nmK" firstAttribute="top" secondItem="Yrc-dD-lC1" secondAttribute="bottom" constant="9" id="NSa-6w-ZoW"/>
78 90 <constraint firstItem="Cbx-ha-NZx" firstAttribute="top" secondItem="2cF-of-r57" secondAttribute="bottom" constant="17" id="NdB-eX-528"/>
79 91 <constraint firstAttribute="trailing" secondItem="Yrc-dD-lC1" secondAttribute="trailing" constant="20" id="QHF-7B-Ic6"/>
  92 + <constraint firstItem="Yrc-dD-lC1" firstAttribute="top" secondItem="6eG-rz-OsA" secondAttribute="top" constant="20" id="Um6-gq-dBm"/>
80 93 <constraint firstAttribute="trailing" secondItem="0IF-Ml-nmK" secondAttribute="trailing" constant="20" id="XV4-Tn-CS3"/>
81 94 <constraint firstItem="2cF-of-r57" firstAttribute="top" secondItem="VCq-As-NrV" secondAttribute="bottom" constant="18" id="Zyz-on-i4t"/>
82 95 <constraint firstItem="2cF-of-r57" firstAttribute="leading" secondItem="6eG-rz-OsA" secondAttribute="leading" constant="20" id="bxk-cG-hJO"/>
83 96 <constraint firstAttribute="bottom" secondItem="slH-Zj-pps" secondAttribute="bottom" constant="20" id="fiT-k5-kVx"/>
  97 + <constraint firstAttribute="height" constant="181" id="hT5-6S-IYo"/>
84 98 <constraint firstItem="VCq-As-NrV" firstAttribute="leading" secondItem="6eG-rz-OsA" secondAttribute="leading" constant="20" id="i5D-Xb-H4X"/>
  99 + <constraint firstAttribute="width" constant="307" id="yFZ-8Q-WDt"/>
85 100 </constraints>
86 101 </view>
87 102 </subviews>
88 103 <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
89 104 <constraints>
90   - <constraint firstAttribute="centerY" secondItem="6eG-rz-OsA" secondAttribute="centerY" constant="75" id="Nqt-Ai-WrO"/>
  105 + <constraint firstItem="6eG-rz-OsA" firstAttribute="top" secondItem="Vhv-I1-cgL" secondAttribute="top" constant="170" id="JVE-no-tdA"/>
91 106 <constraint firstAttribute="centerX" secondItem="6eG-rz-OsA" secondAttribute="centerX" constant="-0.5" id="ShJ-gZ-P8L"/>
92 107 </constraints>
93 108 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
... ...
DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad.xib
  View file @e98eb05
... ... @@ -18,49 +18,58 @@
18 18 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
19 19 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20 20 <subviews>
21   - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5MK-ZF-rTd">
22   - <rect key="frame" x="213" y="294" width="343" height="177"/>
  21 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5MK-ZF-rTd">
  22 + <rect key="frame" x="213" y="423" width="343" height="177"/>
23 23 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
24 24 <subviews>
25   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ERH-UB-KNz">
  25 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ERH-UB-KNz">
26 26 <rect key="frame" x="226" y="17" width="97" height="30"/>
27 27 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  28 + <constraints>
  29 + <constraint firstAttribute="width" constant="97" id="LcC-bv-dfw"/>
  30 + </constraints>
28 31 <fontDescription key="fontDescription" type="system" pointSize="14"/>
29 32 <textInputTraits key="textInputTraits"/>
30 33 </textField>
31   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hmJ-zn-ogZ">
  34 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hmJ-zn-ogZ">
32 35 <rect key="frame" x="226" y="56" width="97" height="30"/>
33 36 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  37 + <constraints>
  38 + <constraint firstAttribute="width" constant="97" id="XQw-vd-dgs"/>
  39 + </constraints>
34 40 <fontDescription key="fontDescription" type="system" pointSize="14"/>
35 41 <textInputTraits key="textInputTraits"/>
36 42 </textField>
37   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="suL-QX-iE6">
38   - <rect key="frame" x="226" y="95" width="97" height="30"/>
  43 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="suL-QX-iE6">
  44 + <rect key="frame" x="226" y="94" width="97" height="30"/>
39 45 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  46 + <constraints>
  47 + <constraint firstAttribute="width" constant="97" id="hg5-e3-F6K"/>
  48 + </constraints>
40 49 <fontDescription key="fontDescription" type="system" pointSize="14"/>
41 50 <textInputTraits key="textInputTraits"/>
42 51 </textField>
43   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6M6-Rz-v0B">
  52 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6M6-Rz-v0B">
44 53 <rect key="frame" x="20" y="21" width="64" height="21"/>
45 54 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
46 55 <fontDescription key="fontDescription" type="system" pointSize="17"/>
47 56 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
48 57 <nil key="highlightedColor"/>
49 58 </label>
50   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y0J-fk-3XQ">
  59 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y0J-fk-3XQ">
51 60 <rect key="frame" x="20" y="60" width="107" height="21"/>
52 61 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
53 62 <fontDescription key="fontDescription" type="system" pointSize="17"/>
54 63 <nil key="highlightedColor"/>
55 64 </label>
56   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CRj-D6-8bV">
  65 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CRj-D6-8bV">
57 66 <rect key="frame" x="20" y="98" width="79" height="21"/>
58 67 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
59 68 <fontDescription key="fontDescription" type="system" pointSize="17"/>
60 69 <nil key="highlightedColor"/>
61 70 </label>
62   - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BsH-aP-YXx">
63   - <rect key="frame" x="148" y="127" width="46" height="30"/>
  71 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BsH-aP-YXx">
  72 + <rect key="frame" x="153" y="127" width="37" height="30"/>
64 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
65 74 <state key="normal" title="Done">
66 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -72,14 +81,18 @@
72 81 </subviews>
73 82 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
74 83 <constraints>
  84 + <constraint firstItem="ERH-UB-KNz" firstAttribute="top" secondItem="5MK-ZF-rTd" secondAttribute="top" constant="17" id="1AX-c3-CDm"/>
  85 + <constraint firstItem="suL-QX-iE6" firstAttribute="top" secondItem="hmJ-zn-ogZ" secondAttribute="bottom" constant="8" id="JgS-D8-cIr"/>
  86 + <constraint firstItem="6M6-Rz-v0B" firstAttribute="top" secondItem="5MK-ZF-rTd" secondAttribute="top" constant="21" id="Jq8-3l-kYc"/>
75 87 <constraint firstItem="y0J-fk-3XQ" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="LSk-KG-aOB"/>
76 88 <constraint firstItem="y0J-fk-3XQ" firstAttribute="top" secondItem="6M6-Rz-v0B" secondAttribute="bottom" constant="18" id="M4d-Ez-pHf"/>
77 89 <constraint firstItem="CRj-D6-8bV" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="Oza-iy-MaH"/>
78 90 <constraint firstItem="6M6-Rz-v0B" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="Sma-ZL-ALv"/>
  91 + <constraint firstAttribute="height" constant="177" id="bNq-pw-RTB"/>
79 92 <constraint firstItem="CRj-D6-8bV" firstAttribute="top" secondItem="y0J-fk-3XQ" secondAttribute="bottom" constant="17" id="duF-LR-Sda"/>
80 93 <constraint firstAttribute="trailing" secondItem="suL-QX-iE6" secondAttribute="trailing" constant="20" id="jtP-QM-5L3"/>
81   - <constraint firstItem="suL-QX-iE6" firstAttribute="top" secondItem="hmJ-zn-ogZ" secondAttribute="bottom" constant="8" id="kcG-tJ-Cyy"/>
82   - <constraint firstItem="hmJ-zn-ogZ" firstAttribute="top" secondItem="ERH-UB-KNz" secondAttribute="bottom" constant="8" id="pNy-vJ-e91"/>
  94 + <constraint firstItem="hmJ-zn-ogZ" firstAttribute="top" secondItem="ERH-UB-KNz" secondAttribute="bottom" constant="9" id="mYf-Tf-3yJ"/>
  95 + <constraint firstAttribute="width" constant="343" id="mon-Sh-DKk"/>
83 96 <constraint firstAttribute="centerX" secondItem="BsH-aP-YXx" secondAttribute="centerX" constant="0.5" id="sN6-ce-scm"/>
84 97 <constraint firstAttribute="bottom" secondItem="BsH-aP-YXx" secondAttribute="bottom" constant="20" id="tse-ri-BEr"/>
85 98 <constraint firstAttribute="trailing" secondItem="ERH-UB-KNz" secondAttribute="trailing" constant="20" id="uN1-od-vVE"/>
... ... @@ -89,8 +102,8 @@
89 102 </subviews>
90 103 <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
91 104 <constraints>
  105 + <constraint firstAttribute="centerY" secondItem="5MK-ZF-rTd" secondAttribute="centerY" constant="0.5" id="I13-zq-tsN"/>
92 106 <constraint firstAttribute="centerX" secondItem="5MK-ZF-rTd" secondAttribute="centerX" constant="-0.5" id="Lzg-nt-yLC"/>
93   - <constraint firstAttribute="centerY" secondItem="5MK-ZF-rTd" secondAttribute="centerY" constant="129" id="iRc-aE-qBX"/>
94 107 </constraints>
95 108 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
96 109 </view>
... ...
DUREX Vendor Control/CommunicationProtocol.m
  View file @e98eb05
... ... @@ -202,7 +202,7 @@
202 202 [[EMConnectionManager sharedManager] writeValue:[NSNumber numberWithUnsignedChar:(unsigned char)([message length]/MAX_STRING_LENGTH)+1] toResource:@"numPackets" onSuccess:^
203 203 {
204 204 status = TRUE;
205   - NSLog(@"[CommunicationProtocol.m]: numPackets set to %d",([message length]/MAX_STRING_LENGTH) + 1);
  205 + NSLog(@"[CommunicationProtocol.m]: numPackets set to %u",([message length]/MAX_STRING_LENGTH) + 1);
206 206 }
207 207 onFail:^(NSError *error)
208 208 {
... ... @@ -315,8 +315,8 @@
315 315 NSMutableString *command = [NSMutableString stringWithFormat: @"A5"];
316 316 NSInteger year = [date year];
317 317 year = year - (year/100)*100;
318   - [command appendString:[NSString stringWithFormat:@"%02d",year]];
319   - [command appendString:[NSString stringWithFormat:@"%02d%02d%02d%02d%02d",[date month],[date day],[date hour],[date minute],[date second]]];
  318 + [command appendString:[NSString stringWithFormat:@"%02ld",(long)year]];
  319 + [command appendString:[NSString stringWithFormat:@"%02ld%02ld%02ld%02ld%02ld",(long)[date month],(long)[date day],(long)[date hour],(long)[date minute],(long)[date second]]];
320 320 [self writeMessage:command];
321 321 NSString *answer = [self readMessage];
322 322 if([answer isEqualToString:@"P51"])
... ...
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
  View file @e98eb05
... ... @@ -162,7 +162,7 @@
162 162 3471865418070D9300FA0FB2 = {
163 163 isa = PBXGroup;
164 164 children = (
165   - 3471866618070D9300FA0FB2 /* FirstApp */,
  165 + 3471866618070D9300FA0FB2 /* DUREX Vendor Control */,
166 166 3471865F18070D9300FA0FB2 /* Frameworks */,
167 167 3471865E18070D9300FA0FB2 /* Products */,
168 168 );
... ... @@ -189,53 +189,36 @@
189 189 name = Frameworks;
190 190 sourceTree = "<group>";
191 191 };
192   - 3471866618070D9300FA0FB2 /* FirstApp */ = {
  192 + 3471866618070D9300FA0FB2 /* DUREX Vendor Control */ = {
193 193 isa = PBXGroup;
194 194 children = (
195   - F961D814199A5FA000E9282C /* Localizable.strings */,
196   - F961D806199A5F1000E9282C /* MainStoryboard.storyboard */,
197   - 34AAB876189804FF0019860D /* DUREXAppDelegate.h */,
  195 + 3471868F18070E4300FA0FB2 /* Framework */,
  196 + 347186A718070F7F00FA0FB2 /* Device Picker */,
  197 + 347186B91807290E00FA0FB2 /* Schemas */,
  198 + 3471866718070D9300FA0FB2 /* Supporting Files */,
  199 + F9ED745419B89E4600C7298D /* Views */,
  200 + F9ED745519B89E7700C7298D /* Headers */,
198 201 34AAB877189804FF0019860D /* DUREXAppDelegate.m */,
199   - F98356D4192E835F00EA6821 /* InitialViewController.h */,
200 202 F98356D5192E835F00EA6821 /* InitialViewController.m */,
201   - F98356DF192EC84700EA6821 /* MenuTableViewController.h */,
202 203 F98356E0192EC84700EA6821 /* MenuTableViewController.m */,
203   - F98356D9192EAFD400EA6821 /* CommunicationProtocol.h */,
204 204 F98356DA192EAFD400EA6821 /* CommunicationProtocol.m */,
205   - F9A8EF7A192FE201009E7532 /* Stack.h */,
206 205 F9A8EF7B192FE201009E7532 /* Stack.m */,
207   - F933F80119B6819400521B90 /* DatePickerViewController.h */,
208 206 F933F80219B6819400521B90 /* DatePickerViewController.m */,
209   - F9015D9219B73052006C7882 /* DatePickerViewController.xib */,
210   - F9015D9919B7305E006C7882 /* DatePickerViewController_iPad.xib */,
211   - F92F567619B75F5E00A1EACA /* PriceChangerViewController.h */,
212 207 F92F567719B75F5E00A1EACA /* PriceChangerViewController.m */,
213   - F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */,
214   - F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */,
215   - F92F568D19B763FD00A1EACA /* NameChangerViewController.h */,
216 208 F92F568E19B763FD00A1EACA /* NameChangerViewController.m */,
217   - F92F569419B7665F00A1EACA /* NameChangerViewController.xib */,
218   - F92F569D19B76A5D00A1EACA /* NameChangerViewController_iPad.xib */,
219   - 34AAB88C189805300019860D /* Images.xcassets */,
220   - 347186B91807290E00FA0FB2 /* Schemas */,
221   - 347186A718070F7F00FA0FB2 /* Device Picker */,
222   - 3471868F18070E4300FA0FB2 /* Framework */,
223   - 3471866718070D9300FA0FB2 /* Supporting Files */,
  209 + 34AAB880189804FF0019860D /* main.m */,
224 210 );
225   - name = FirstApp;
  211 + name = "DUREX Vendor Control";
226 212 path = TestAppExample;
227 213 sourceTree = "<group>";
228 214 };
229 215 3471866718070D9300FA0FB2 /* Supporting Files */ = {
230 216 isa = PBXGroup;
231 217 children = (
232   - F97B90C919B859F500DDA9EF /* icon_checkmark.png */,
233   - F97B90CA19B859F500DDA9EF /* icon_delete.png */,
234   - F961D80E199A5F2D00E9282C /* back_arrow.png */,
235   - F98356D7192E906600EA6821 /* bluetooth.png */,
  218 + F9ED745719B89EF000C7298D /* Images */,
  219 + F961D814199A5FA000E9282C /* Localizable.strings */,
236 220 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */,
237 221 34AAB87F189804FF0019860D /* DUREX Vendor Control-Prefix.pch */,
238   - 34AAB880189804FF0019860D /* main.m */,
239 222 );
240 223 name = "Supporting Files";
241 224 sourceTree = "<group>";
... ... @@ -289,6 +272,48 @@
289 272 name = Schemas;
290 273 sourceTree = "<group>";
291 274 };
  275 + F9ED745419B89E4600C7298D /* Views */ = {
  276 + isa = PBXGroup;
  277 + children = (
  278 + F961D806199A5F1000E9282C /* MainStoryboard.storyboard */,
  279 + F9015D9219B73052006C7882 /* DatePickerViewController.xib */,
  280 + F9015D9919B7305E006C7882 /* DatePickerViewController_iPad.xib */,
  281 + F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */,
  282 + F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */,
  283 + F92F569419B7665F00A1EACA /* NameChangerViewController.xib */,
  284 + F92F569D19B76A5D00A1EACA /* NameChangerViewController_iPad.xib */,
  285 + );
  286 + name = Views;
  287 + path = ..;
  288 + sourceTree = "<group>";
  289 + };
  290 + F9ED745519B89E7700C7298D /* Headers */ = {
  291 + isa = PBXGroup;
  292 + children = (
  293 + 34AAB876189804FF0019860D /* DUREXAppDelegate.h */,
  294 + F98356D4192E835F00EA6821 /* InitialViewController.h */,
  295 + F98356DF192EC84700EA6821 /* MenuTableViewController.h */,
  296 + F98356D9192EAFD400EA6821 /* CommunicationProtocol.h */,
  297 + F9A8EF7A192FE201009E7532 /* Stack.h */,
  298 + F933F80119B6819400521B90 /* DatePickerViewController.h */,
  299 + F92F567619B75F5E00A1EACA /* PriceChangerViewController.h */,
  300 + F92F568D19B763FD00A1EACA /* NameChangerViewController.h */,
  301 + );
  302 + name = Headers;
  303 + sourceTree = "<group>";
  304 + };
  305 + F9ED745719B89EF000C7298D /* Images */ = {
  306 + isa = PBXGroup;
  307 + children = (
  308 + 34AAB88C189805300019860D /* Images.xcassets */,
  309 + F97B90C919B859F500DDA9EF /* icon_checkmark.png */,
  310 + F97B90CA19B859F500DDA9EF /* icon_delete.png */,
  311 + F961D80E199A5F2D00E9282C /* back_arrow.png */,
  312 + F98356D7192E906600EA6821 /* bluetooth.png */,
  313 + );
  314 + name = Images;
  315 + sourceTree = "<group>";
  316 + };
292 317 /* End PBXGroup section */
293 318  
294 319 /* Begin PBXNativeTarget section */
... ...
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @e98eb05
No preview for this file type
DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard
  View file @e98eb05
... ... @@ -197,8 +197,8 @@
197 197 <action selector="connectPressed:" destination="fM1-5w-fRr" eventType="touchDown" id="yhT-cP-LLA"/>
198 198 </connections>
199 199 </button>
200   - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Connect to Device" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oyW-sA-Lfb">
201   - <rect key="frame" x="86" y="356" width="149" height="21"/>
  200 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connect to Device" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oyW-sA-Lfb">
  201 + <rect key="frame" x="89" y="356" width="142" height="21"/>
202 202 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
203 203 <fontDescription key="fontDescription" type="system" pointSize="17"/>
204 204 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
... ... @@ -207,9 +207,9 @@
207 207 </subviews>
208 208 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
209 209 <constraints>
210   - <constraint firstItem="oyW-sA-Lfb" firstAttribute="centerX" secondItem="bXZ-vt-REt" secondAttribute="centerX" constant="0.5" id="DNg-dX-pwk"/>
211 210 <constraint firstAttribute="centerY" secondItem="bXZ-vt-REt" secondAttribute="centerY" id="UT9-cH-z3k"/>
212   - <constraint firstItem="oyW-sA-Lfb" firstAttribute="top" secondItem="bXZ-vt-REt" secondAttribute="bottom" constant="8" id="i8M-sg-3Wz"/>
  211 + <constraint firstItem="oyW-sA-Lfb" firstAttribute="top" secondItem="bXZ-vt-REt" secondAttribute="bottom" constant="8" id="fWB-WV-kqG"/>
  212 + <constraint firstItem="bXZ-vt-REt" firstAttribute="centerX" secondItem="oyW-sA-Lfb" secondAttribute="centerX" constant="-0.5" id="gph-e5-nsJ"/>
213 213 <constraint firstAttribute="centerX" secondItem="bXZ-vt-REt" secondAttribute="centerX" id="mHc-1L-4hG"/>
214 214 </constraints>
215 215 </view>
... ...
DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m
  View file @e98eb05
... ... @@ -100,7 +100,7 @@
100 100  
101 101 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
102 102 {
103   - //[self performSegueWithIdentifier:@"ConnectionSegue" sender:self];
  103 + [self performSegueWithIdentifier:@"ConnectionSegue" sender:self];
104 104 if(![[[[tableView cellForRowAtIndexPath:indexPath] textLabel] text] isEqualToString:NSLocalizedString(@"Searching for devices...",nil)])
105 105 {
106 106 [self _showConnectingView];
... ...
DUREX Vendor Control/FirstAppExample/es.lproj/MainStoryboard.strings
  View file @e98eb05
... ... @@ -15,7 +15,7 @@
15 15 "W3U-nk-SlV.text" = "Title";
16 16  
17 17 /* Class = "IBUINavigationItem"; title = "Select device"; ObjectID = "exc-MP-jDa"; */
18   -"exc-MP-jDa.title" = "Seleccione el dispsitivo";
  18 +"exc-MP-jDa.title" = "Seleccione el dispositivo";
19 19  
20 20 /* Class = "IBUILabel"; text = "Title"; ObjectID = "iCG-eW-H8x"; */
21 21 "iCG-eW-H8x.text" = "Title";
... ...
DUREX Vendor Control/MenuTableViewController.m
  View file @e98eb05
... ... @@ -172,7 +172,7 @@
172 172  
173 173 - (void) backButtonPressed: (id) sender
174 174 {
175   - NSLog(@"[MenuTableViewController.m]: Navigation Stack has %d remaining levels",[[self parentLayout] count]);
  175 + NSLog(@"[MenuTableViewController.m]: Navigation Stack has %ld remaining levels",(long)[[self parentLayout] count]);
176 176 if([[self parentLayout] count] > 0)
177 177 {
178 178 NSLog(@"[MenuTableViewController.m]: Falling to previous navigation level");
... ...
  1 +BUGS:
1 2 - messageAvailable checks and status checks NOT working (long operations)
2   -- pop to previous view on connect error NOT working
3 3 - On date change, response is overwritten by previous query, trimming needed according to numBytes
4 4  
5   -
6   -- Incident class
  5 +TODO:
  6 +- A4 command
7 7 - Sale class
8 8 - Sale parser
9   -- Incident parser
10   -- Popup view
11 9 - A2 command
  10 +- Implement sensor status logging and sending to remote server
  11 +- Lewis infrastructure for data viewing (SQL, Webpage, CSV parser)
  12 +- Incident class
  13 +- Incident parser
12 14 - A3 command
13   -- Redefine A4 command
14   -- A4 command
  15 +- Batch command files, definition, parsing and pushing them to the app
  16 +- Implement user auth. Server authenticates the app ONCE on install and allows to control ONE machine (key gets validated on server and then stored on app)
  17 +- Implement master key.
  18 +
  19 +CHECK:
  20 +- Layouts on another iPhone
... ...