Просмотр исходного кода

1.修改RedAnt Mobile CommonEditor Cell布局。

Pen Li 8 лет назад
Родитель
Сommit
be615ab1c4

BIN
RedAnt Mobile/RedAnt Mobile.xcodeproj/project.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
RedAnt Mobile/RedAnt Mobile/LoginSettingViewController.m

@@ -45,7 +45,7 @@
     vc.params = [NSMutableDictionary dictionary];
     NSString *path = @"/Users/macmini1/Documents/contact_test.json";
     NSData *data = [NSData dataWithContentsOfFile:path];
-    vc.content_data_download = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:nil];
+    vc.content_data_download = [[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:nil] mutableCopy];
     [self presentViewController:vc animated:YES completion:nil];
     return;
     

+ 64 - 29
RedAnt Mobile/RedAnt Mobile/Phone_Image_Cell.xib

@@ -36,43 +36,77 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView tag="1" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="add_180" translatesAutoresizingMaskIntoConstraints="NO" id="9tG-UP-a3Y" customClass="TouchImageView">
-                        <rect key="frame" x="334" y="109" width="100" height="100"/>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Mt-oa-Anz">
+                        <rect key="frame" x="0.0" y="96" width="256" height="143"/>
+                        <subviews>
+                            <imageView tag="2" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="add_180" translatesAutoresizingMaskIntoConstraints="NO" id="fRJ-VX-RHT" customClass="TouchImageView">
+                                <rect key="frame" x="78" y="21.5" width="100" height="100"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="100" id="JCB-aL-cEs"/>
+                                    <constraint firstAttribute="height" constant="100" id="t2E-1S-Idd"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
+                                        <integer key="value" value="2"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="layer.borderColor">
+                                        <color key="value" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </imageView>
+                        </subviews>
                         <constraints>
-                            <constraint firstAttribute="width" constant="100" id="d7M-jo-1BT"/>
-                            <constraint firstAttribute="height" constant="100" id="qeo-VF-hmD"/>
+                            <constraint firstItem="fRJ-VX-RHT" firstAttribute="centerY" secondItem="6Mt-oa-Anz" secondAttribute="centerY" id="LBk-ME-QwB"/>
+                            <constraint firstItem="fRJ-VX-RHT" firstAttribute="centerX" secondItem="6Mt-oa-Anz" secondAttribute="centerX" id="yC6-Oj-mYc"/>
                         </constraints>
-                    </imageView>
-                    <imageView tag="2" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="add_180" translatesAutoresizingMaskIntoConstraints="NO" id="fRJ-VX-RHT" customClass="TouchImageView">
-                        <rect key="frame" x="60" y="109" width="100" height="100"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
-                                <integer key="value" value="2"/>
-                            </userDefinedRuntimeAttribute>
-                            <userDefinedRuntimeAttribute type="color" keyPath="layer.borderColor">
-                                <color key="value" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </userDefinedRuntimeAttribute>
-                        </userDefinedRuntimeAttributes>
-                    </imageView>
-                    <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="add_180" translatesAutoresizingMaskIntoConstraints="NO" id="dZY-Of-Eu3" customClass="TouchImageView">
-                        <rect key="frame" x="608" y="109" width="100" height="100"/>
-                    </imageView>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aHk-Ue-pu2">
+                        <rect key="frame" x="256" y="96" width="256" height="143"/>
+                        <subviews>
+                            <imageView tag="1" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="add_180" translatesAutoresizingMaskIntoConstraints="NO" id="9tG-UP-a3Y" customClass="TouchImageView">
+                                <rect key="frame" x="78" y="21.5" width="100" height="100"/>
+                            </imageView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="9tG-UP-a3Y" firstAttribute="centerY" secondItem="aHk-Ue-pu2" secondAttribute="centerY" id="bln-Nq-Inf"/>
+                            <constraint firstItem="9tG-UP-a3Y" firstAttribute="centerX" secondItem="aHk-Ue-pu2" secondAttribute="centerX" id="cWJ-9n-gbg"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lSS-O2-yjR">
+                        <rect key="frame" x="512" y="96" width="256" height="143"/>
+                        <subviews>
+                            <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="add_180" translatesAutoresizingMaskIntoConstraints="NO" id="dZY-Of-Eu3" customClass="TouchImageView">
+                                <rect key="frame" x="78" y="21.5" width="100" height="100"/>
+                            </imageView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="dZY-Of-Eu3" firstAttribute="centerX" secondItem="lSS-O2-yjR" secondAttribute="centerX" id="8Bg-8s-tfe"/>
+                            <constraint firstItem="dZY-Of-Eu3" firstAttribute="centerY" secondItem="lSS-O2-yjR" secondAttribute="centerY" id="dH7-dm-AAX"/>
+                        </constraints>
+                    </view>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="dZY-Of-Eu3" firstAttribute="width" secondItem="9tG-UP-a3Y" secondAttribute="width" id="0hx-WB-SeE"/>
+                    <constraint firstItem="lSS-O2-yjR" firstAttribute="leading" secondItem="aHk-Ue-pu2" secondAttribute="trailing" id="9se-jP-QjC"/>
+                    <constraint firstAttribute="bottom" secondItem="6Mt-oa-Anz" secondAttribute="bottom" id="BId-5e-05F"/>
+                    <constraint firstItem="lSS-O2-yjR" firstAttribute="bottom" secondItem="6Mt-oa-Anz" secondAttribute="bottom" id="ELA-2Y-auz"/>
+                    <constraint firstItem="aHk-Ue-pu2" firstAttribute="width" secondItem="6Mt-oa-Anz" secondAttribute="width" id="EqM-I7-yfI"/>
                     <constraint firstItem="ywy-rN-UiU" firstAttribute="top" secondItem="D6G-bC-DGz" secondAttribute="top" constant="50" id="ErJ-dI-aQH"/>
-                    <constraint firstItem="9tG-UP-a3Y" firstAttribute="centerX" secondItem="D6G-bC-DGz" secondAttribute="centerX" id="H0c-vT-8AL"/>
-                    <constraint firstItem="fRJ-VX-RHT" firstAttribute="width" secondItem="9tG-UP-a3Y" secondAttribute="width" id="H4F-Ow-SQN"/>
+                    <constraint firstItem="9tG-UP-a3Y" firstAttribute="height" secondItem="fRJ-VX-RHT" secondAttribute="height" id="FcJ-8C-c0z"/>
+                    <constraint firstItem="6Mt-oa-Anz" firstAttribute="top" secondItem="Wgh-3R-FjX" secondAttribute="bottom" constant="10" id="HDb-5N-BzC"/>
                     <constraint firstItem="ywy-rN-UiU" firstAttribute="leading" secondItem="D6G-bC-DGz" secondAttribute="leading" constant="15" id="Njf-ab-rsr"/>
-                    <constraint firstItem="dZY-Of-Eu3" firstAttribute="height" secondItem="9tG-UP-a3Y" secondAttribute="height" id="QMs-Sd-Ctx"/>
+                    <constraint firstItem="dZY-Of-Eu3" firstAttribute="width" secondItem="fRJ-VX-RHT" secondAttribute="width" id="W9w-Ec-o26"/>
+                    <constraint firstItem="9tG-UP-a3Y" firstAttribute="width" secondItem="fRJ-VX-RHT" secondAttribute="width" id="Wal-R5-19V"/>
                     <constraint firstItem="Wgh-3R-FjX" firstAttribute="leading" secondItem="ywy-rN-UiU" secondAttribute="trailing" constant="20" id="XdS-nh-z0n"/>
-                    <constraint firstItem="fRJ-VX-RHT" firstAttribute="height" secondItem="9tG-UP-a3Y" secondAttribute="height" id="bDc-wb-sWS"/>
-                    <constraint firstItem="dZY-Of-Eu3" firstAttribute="top" secondItem="9tG-UP-a3Y" secondAttribute="top" id="nry-Ji-vQg"/>
-                    <constraint firstItem="fRJ-VX-RHT" firstAttribute="top" secondItem="9tG-UP-a3Y" secondAttribute="top" id="r5h-G7-g7a"/>
-                    <constraint firstItem="9tG-UP-a3Y" firstAttribute="top" secondItem="Wgh-3R-FjX" secondAttribute="bottom" constant="23" id="sGQ-Ol-G9i"/>
-                    <constraint firstAttribute="trailing" secondItem="dZY-Of-Eu3" secondAttribute="trailing" constant="60" id="tHK-Cw-f5a"/>
+                    <constraint firstItem="lSS-O2-yjR" firstAttribute="top" secondItem="6Mt-oa-Anz" secondAttribute="top" id="YHN-qP-8lf"/>
+                    <constraint firstItem="dZY-Of-Eu3" firstAttribute="height" secondItem="fRJ-VX-RHT" secondAttribute="height" id="YxP-Sq-hjA"/>
+                    <constraint firstItem="aHk-Ue-pu2" firstAttribute="leading" secondItem="6Mt-oa-Anz" secondAttribute="trailing" id="bfU-Hy-hDc"/>
+                    <constraint firstItem="aHk-Ue-pu2" firstAttribute="top" secondItem="6Mt-oa-Anz" secondAttribute="top" id="d4j-fJ-Y6O"/>
+                    <constraint firstItem="lSS-O2-yjR" firstAttribute="width" secondItem="6Mt-oa-Anz" secondAttribute="width" id="dAZ-aR-Ca4"/>
+                    <constraint firstItem="aHk-Ue-pu2" firstAttribute="leading" secondItem="6Mt-oa-Anz" secondAttribute="trailing" id="mQr-M4-Pxi"/>
+                    <constraint firstItem="aHk-Ue-pu2" firstAttribute="bottom" secondItem="6Mt-oa-Anz" secondAttribute="bottom" id="nWx-29-rHr"/>
+                    <constraint firstItem="6Mt-oa-Anz" firstAttribute="leading" secondItem="D6G-bC-DGz" secondAttribute="leading" id="p4o-Db-Smq"/>
                     <constraint firstItem="Wgh-3R-FjX" firstAttribute="top" secondItem="D6G-bC-DGz" secondAttribute="top" constant="19" id="uWG-yc-TyM"/>
-                    <constraint firstItem="fRJ-VX-RHT" firstAttribute="leading" secondItem="D6G-bC-DGz" secondAttribute="leading" constant="60" id="ud2-a5-hCn"/>
+                    <constraint firstAttribute="trailing" secondItem="lSS-O2-yjR" secondAttribute="trailing" id="vVG-Yi-JOQ"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
@@ -82,6 +116,7 @@
                 <outlet property="touchImageView1" destination="9tG-UP-a3Y" id="YvW-gG-9yV"/>
                 <outlet property="touchImageView2" destination="fRJ-VX-RHT" id="e0P-fr-TQr"/>
             </connections>
+            <point key="canvasLocation" x="-294" y="20"/>
         </tableViewCell>
     </objects>
     <resources>

+ 3 - 3
RedAnt Mobile/RedAnt Mobile/Phone_Label_Cell.xib

@@ -25,16 +25,16 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IFO-cL-5rq">
-                        <rect key="frame" x="8" y="50" width="752" height="21"/>
+                        <rect key="frame" x="10" y="50" width="748" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="trailing" secondItem="IFO-cL-5rq" secondAttribute="trailing" constant="8" id="79w-bf-qBl"/>
+                    <constraint firstAttribute="trailing" secondItem="IFO-cL-5rq" secondAttribute="trailing" constant="10" id="79w-bf-qBl"/>
                     <constraint firstItem="IFO-cL-5rq" firstAttribute="top" secondItem="Kvw-G1-uhU" secondAttribute="bottom" constant="18" id="COb-2q-bH5"/>
-                    <constraint firstItem="IFO-cL-5rq" firstAttribute="leading" secondItem="yAY-rd-KOV" secondAttribute="leading" constant="8" id="Vjp-hN-KBl"/>
+                    <constraint firstItem="IFO-cL-5rq" firstAttribute="leading" secondItem="yAY-rd-KOV" secondAttribute="leading" constant="10" id="Vjp-hN-KBl"/>
                     <constraint firstAttribute="bottom" secondItem="IFO-cL-5rq" secondAttribute="bottom" constant="8.5" id="WhZ-rT-G20"/>
                     <constraint firstItem="Kvw-G1-uhU" firstAttribute="top" secondItem="yAY-rd-KOV" secondAttribute="top" constant="11" id="bjK-ex-H7V"/>
                     <constraint firstItem="Kvw-G1-uhU" firstAttribute="leading" secondItem="yAY-rd-KOV" secondAttribute="leading" constant="10" id="c0q-Lp-Cnn"/>

+ 98 - 35
RedAnt Mobile/RedAnt Mobile/Phone_MAction_Cell.xib

@@ -12,45 +12,108 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellMAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellMAction" rowHeight="68" id="dX6-mk-Val" customClass="CommonEditorCellMAction">
-            <rect key="frame" x="0.0" y="0.0" width="785" height="68"/>
+            <rect key="frame" x="0.0" y="0.0" width="789" height="100"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dX6-mk-Val" id="WpF-tg-4Ex">
-                <rect key="frame" x="0.0" y="0.0" width="785" height="67.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="789" height="99.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iHd-Jz-srj" userLabel="action0">
-                        <rect key="frame" x="592" y="18" width="184" height="30"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <state key="normal" title="Button">
-                            <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </state>
-                    </button>
-                    <button opaque="NO" tag="3" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PaT-z4-zlx" userLabel="action3">
-                        <rect key="frame" x="10" y="18" width="184" height="30"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <state key="normal" title="Button">
-                            <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </state>
-                    </button>
-                    <button opaque="NO" tag="1" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sty-06-Qgn" userLabel="action1">
-                        <rect key="frame" x="398" y="18" width="184" height="30"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <state key="normal" title="Button">
-                            <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </state>
-                    </button>
-                    <button opaque="NO" tag="2" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AdQ-fi-ORK" userLabel="action2">
-                        <rect key="frame" x="204" y="18" width="184" height="30"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <state key="normal" title="Button">
-                            <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </state>
-                    </button>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ri4-ZU-57e">
+                        <rect key="frame" x="394.5" y="50" width="394.5" height="49.5"/>
+                        <subviews>
+                            <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PaT-z4-zlx" userLabel="action3">
+                                <rect key="frame" x="105.5" y="10" width="184" height="30"/>
+                                <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Button">
+                                    <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                            </button>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="PaT-z4-zlx" firstAttribute="centerY" secondItem="Ri4-ZU-57e" secondAttribute="centerY" id="7ZH-pu-p0K"/>
+                            <constraint firstAttribute="height" constant="50" id="9KZ-cH-WXp"/>
+                            <constraint firstItem="PaT-z4-zlx" firstAttribute="centerX" secondItem="Ri4-ZU-57e" secondAttribute="centerX" id="IrI-Ha-85p"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UcB-Yd-pbj">
+                        <rect key="frame" x="394.5" y="0.0" width="394.5" height="50"/>
+                        <subviews>
+                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sty-06-Qgn" userLabel="action1">
+                                <rect key="frame" x="105.5" y="10" width="184" height="30"/>
+                                <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Button">
+                                    <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                            </button>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="50" id="HzU-5Q-b2z"/>
+                            <constraint firstItem="sty-06-Qgn" firstAttribute="centerY" secondItem="UcB-Yd-pbj" secondAttribute="centerY" id="nKw-Yj-lre"/>
+                            <constraint firstItem="sty-06-Qgn" firstAttribute="centerX" secondItem="UcB-Yd-pbj" secondAttribute="centerX" id="xfY-sR-gKm"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sXV-up-NhM">
+                        <rect key="frame" x="0.0" y="0.0" width="394.5" height="50"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iHd-Jz-srj" userLabel="action0">
+                                <rect key="frame" x="106" y="10" width="184" height="30"/>
+                                <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="A6V-0D-ju7"/>
+                                    <constraint firstAttribute="width" priority="750" constant="184" id="EYM-CB-aet"/>
+                                </constraints>
+                                <state key="normal" title="Button">
+                                    <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                            </button>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="iHd-Jz-srj" firstAttribute="width" relation="lessThanOrEqual" secondItem="sXV-up-NhM" secondAttribute="width" constant="-10" id="2Gj-DZ-Qd6"/>
+                            <constraint firstItem="iHd-Jz-srj" firstAttribute="centerY" secondItem="sXV-up-NhM" secondAttribute="centerY" id="V6f-oR-e2g"/>
+                            <constraint firstItem="iHd-Jz-srj" firstAttribute="centerX" secondItem="sXV-up-NhM" secondAttribute="centerX" id="ukq-au-WdZ"/>
+                            <constraint firstAttribute="height" constant="50" id="zv9-sv-rtB"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EaR-Sd-NYv">
+                        <rect key="frame" x="0.0" y="50" width="394.5" height="49.5"/>
+                        <subviews>
+                            <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AdQ-fi-ORK" userLabel="action2">
+                                <rect key="frame" x="105.5" y="10" width="184" height="30"/>
+                                <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Button">
+                                    <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                            </button>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="50" id="3rO-xO-7S9"/>
+                            <constraint firstItem="AdQ-fi-ORK" firstAttribute="centerY" secondItem="EaR-Sd-NYv" secondAttribute="centerY" id="ZlW-GS-cKM"/>
+                            <constraint firstItem="AdQ-fi-ORK" firstAttribute="centerX" secondItem="EaR-Sd-NYv" secondAttribute="centerX" id="dCQ-gx-SVt"/>
+                        </constraints>
+                    </view>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="AdQ-fi-ORK" firstAttribute="height" secondItem="iHd-Jz-srj" secondAttribute="height" id="1LV-lk-yHD"/>
+                    <constraint firstItem="EaR-Sd-NYv" firstAttribute="top" secondItem="sXV-up-NhM" secondAttribute="bottom" id="4n7-d2-p21"/>
+                    <constraint firstAttribute="trailing" secondItem="UcB-Yd-pbj" secondAttribute="trailing" id="7Dt-NN-QyE"/>
+                    <constraint firstItem="sty-06-Qgn" firstAttribute="height" secondItem="iHd-Jz-srj" secondAttribute="height" id="8A5-yg-seo"/>
+                    <constraint firstItem="UcB-Yd-pbj" firstAttribute="width" secondItem="sXV-up-NhM" secondAttribute="width" id="8Yw-F3-iY5"/>
+                    <constraint firstItem="sty-06-Qgn" firstAttribute="width" secondItem="iHd-Jz-srj" secondAttribute="width" id="AXI-zg-lVd"/>
+                    <constraint firstItem="EaR-Sd-NYv" firstAttribute="leading" secondItem="WpF-tg-4Ex" secondAttribute="leading" id="Chy-zw-jZi"/>
+                    <constraint firstItem="PaT-z4-zlx" firstAttribute="height" secondItem="iHd-Jz-srj" secondAttribute="height" id="Fdi-02-ek9"/>
+                    <constraint firstItem="UcB-Yd-pbj" firstAttribute="leading" secondItem="sXV-up-NhM" secondAttribute="trailing" id="JB1-21-Vgb"/>
+                    <constraint firstItem="PaT-z4-zlx" firstAttribute="width" secondItem="iHd-Jz-srj" secondAttribute="width" id="KWY-om-Cgq"/>
+                    <constraint firstItem="sXV-up-NhM" firstAttribute="top" secondItem="WpF-tg-4Ex" secondAttribute="top" id="QHa-y0-h3B"/>
+                    <constraint firstAttribute="trailing" secondItem="Ri4-ZU-57e" secondAttribute="trailing" id="aUR-NX-heB"/>
+                    <constraint firstItem="UcB-Yd-pbj" firstAttribute="top" secondItem="WpF-tg-4Ex" secondAttribute="top" id="elL-2N-h3V"/>
+                    <constraint firstItem="Ri4-ZU-57e" firstAttribute="width" secondItem="sXV-up-NhM" secondAttribute="width" id="jic-Fe-4Qf"/>
+                    <constraint firstItem="AdQ-fi-ORK" firstAttribute="width" secondItem="iHd-Jz-srj" secondAttribute="width" id="mgg-Ws-0u7"/>
+                    <constraint firstItem="Ri4-ZU-57e" firstAttribute="leading" secondItem="EaR-Sd-NYv" secondAttribute="trailing" id="p45-7T-PCW"/>
+                    <constraint firstItem="Ri4-ZU-57e" firstAttribute="top" secondItem="UcB-Yd-pbj" secondAttribute="bottom" id="s5E-zm-NOG"/>
+                    <constraint firstItem="EaR-Sd-NYv" firstAttribute="width" secondItem="sXV-up-NhM" secondAttribute="width" id="sts-ic-ZWJ"/>
+                    <constraint firstItem="sXV-up-NhM" firstAttribute="leading" secondItem="WpF-tg-4Ex" secondAttribute="leading" id="wHr-iW-nfi"/>
+                    <constraint firstItem="Ri4-ZU-57e" firstAttribute="leading" secondItem="sXV-up-NhM" secondAttribute="trailing" id="xXm-lJ-feo"/>
+                </constraints>
             </tableViewCellContentView>
             <connections>
                 <outlet property="btn_action0" destination="iHd-Jz-srj" id="TiJ-EU-DIe"/>
@@ -58,7 +121,7 @@
                 <outlet property="btn_action2" destination="AdQ-fi-ORK" id="vtK-8y-vcw"/>
                 <outlet property="btn_action3" destination="PaT-z4-zlx" id="aEq-Yw-yzf"/>
             </connections>
-            <point key="canvasLocation" x="50.5" y="36"/>
+            <point key="canvasLocation" x="63.5" y="31"/>
         </tableViewCell>
     </objects>
 </document>

+ 1 - 0
RedAnt Mobile/RedAnt Mobile/Phone_Switch_Cell.xib

@@ -36,6 +36,7 @@
                 </subviews>
                 <constraints>
                     <constraint firstItem="evX-qc-gHA" firstAttribute="top" secondItem="Ppl-ym-uvS" secondAttribute="top" constant="-5" id="1pR-Y4-tUN"/>
+                    <constraint firstItem="Ppl-ym-uvS" firstAttribute="width" relation="lessThanOrEqual" secondItem="mc4-dx-gg3" secondAttribute="width" constant="-30" id="5dF-ff-GOk"/>
                     <constraint firstItem="evX-qc-gHA" firstAttribute="leading" secondItem="Ppl-ym-uvS" secondAttribute="trailing" id="Kqn-oq-g9K"/>
                     <constraint firstItem="Ppl-ym-uvS" firstAttribute="leading" secondItem="mc4-dx-gg3" secondAttribute="leading" constant="15" id="iqz-55-ATf"/>
                     <constraint firstItem="Ppl-ym-uvS" firstAttribute="top" secondItem="mc4-dx-gg3" secondAttribute="top" constant="11" id="jm9-eF-e4x"/>