Преглед на файлове

- 장치 메뉴에서 화살표 버튼 ImageView 로 수정

TaeHyun преди 8 години
родител
ревизия
0dadef3974
променени са 2 файла, в които са добавени 15 реда и са изтрити 17 реда
  1. 14 16
      OneCable/Base.lproj/Things.storyboard
  2. 1 1
      OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.h

+ 14 - 16
OneCable/Base.lproj/Things.storyboard

@@ -111,30 +111,28 @@
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_head_bg_count" translatesAutoresizingMaskIntoConstraints="NO" id="qhb-iw-6bm">
                                                         <rect key="frame" x="140" y="15" width="27" height="20"/>
                                                     </imageView>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Vbh-3u-xeQ" customClass="CustomButton">
+                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_icon_arrow" highlightedImage="common_icon_arrow_press" translatesAutoresizingMaskIntoConstraints="NO" id="dIR-Kz-eTp" customClass="CustomImageView">
                                                         <rect key="frame" x="123" y="21" width="9" height="9"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="width" constant="9" id="M9L-8B-j3i"/>
-                                                            <constraint firstAttribute="height" constant="9" id="uNA-wC-7Yq"/>
+                                                            <constraint firstAttribute="width" constant="9" id="Wf0-ck-tkh"/>
+                                                            <constraint firstAttribute="height" constant="9" id="gOA-Jg-D5c"/>
                                                         </constraints>
-                                                        <state key="normal" backgroundImage="common_icon_arrow"/>
-                                                        <state key="highlighted" backgroundImage="common_icon_arrow_press"/>
-                                                    </button>
+                                                    </imageView>
                                                 </subviews>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 <constraints>
                                                     <constraint firstAttribute="bottom" secondItem="dCL-Ql-eHd" secondAttribute="bottom" id="26t-NO-DJg"/>
+                                                    <constraint firstItem="dIR-Kz-eTp" firstAttribute="centerY" secondItem="dTZ-mF-DDM" secondAttribute="centerY" id="4fW-gU-JnC"/>
                                                     <constraint firstItem="qhb-iw-6bm" firstAttribute="leading" secondItem="dTZ-mF-DDM" secondAttribute="leading" id="9DK-KJ-Hrr"/>
                                                     <constraint firstAttribute="height" constant="50" id="Adb-cy-dg1"/>
-                                                    <constraint firstItem="Vbh-3u-xeQ" firstAttribute="leading" secondItem="dCL-Ql-eHd" secondAttribute="trailing" constant="8" id="Dc6-nU-WGG"/>
                                                     <constraint firstItem="qhb-iw-6bm" firstAttribute="trailing" secondItem="dTZ-mF-DDM" secondAttribute="trailing" id="GqI-sf-AUO"/>
-                                                    <constraint firstItem="Vbh-3u-xeQ" firstAttribute="centerY" secondItem="dCL-Ql-eHd" secondAttribute="centerY" id="S3y-GZ-PAa"/>
-                                                    <constraint firstItem="dTZ-mF-DDM" firstAttribute="leading" secondItem="Vbh-3u-xeQ" secondAttribute="trailing" constant="8" id="UGU-Vu-Ajt"/>
+                                                    <constraint firstItem="qhb-iw-6bm" firstAttribute="leading" secondItem="dIR-Kz-eTp" secondAttribute="trailing" constant="8" id="QZd-RY-zOR"/>
                                                     <constraint firstItem="dCL-Ql-eHd" firstAttribute="leading" secondItem="Vc6-XX-U5k" secondAttribute="leading" id="VmY-ZI-jTG"/>
+                                                    <constraint firstItem="dIR-Kz-eTp" firstAttribute="centerY" secondItem="dCL-Ql-eHd" secondAttribute="centerY" id="bjw-eG-isK"/>
                                                     <constraint firstItem="dCL-Ql-eHd" firstAttribute="top" secondItem="Vc6-XX-U5k" secondAttribute="top" id="f7d-kJ-LQG"/>
                                                     <constraint firstItem="qhb-iw-6bm" firstAttribute="bottom" secondItem="dTZ-mF-DDM" secondAttribute="bottom" id="l35-M7-ID9"/>
+                                                    <constraint firstItem="dIR-Kz-eTp" firstAttribute="leading" secondItem="dCL-Ql-eHd" secondAttribute="trailing" constant="8" id="l3j-6g-une"/>
                                                     <constraint firstItem="qhb-iw-6bm" firstAttribute="top" secondItem="dTZ-mF-DDM" secondAttribute="top" id="lVZ-Of-qia"/>
-                                                    <constraint firstItem="dTZ-mF-DDM" firstAttribute="centerY" secondItem="Vbh-3u-xeQ" secondAttribute="centerY" id="vqp-6a-hSF"/>
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fW2-6O-SuF" userLabel="View - EditMode">
@@ -926,13 +924,13 @@
                     <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
                     <connections>
                         <outlet property="addHubContainerView" destination="4XN-6C-LGr" id="HU8-lm-6z1"/>
-                        <outlet property="btnArrow" destination="Vbh-3u-xeQ" id="DOV-Fv-fgm"/>
                         <outlet property="btnClose" destination="Vs0-VT-7Jr" id="7dz-Wz-Efu"/>
                         <outlet property="btnEditClose" destination="oNP-Md-pS7" id="PsM-Nd-pwC"/>
                         <outlet property="btnEditRefresh" destination="RRy-5K-Lvr" id="Uds-qp-GYy"/>
                         <outlet property="btnEditSave" destination="wjr-YQ-CK1" id="0vB-0Q-PDb"/>
                         <outlet property="btnOption" destination="bsD-dR-bxK" id="ViH-iU-5r2"/>
                         <outlet property="collectionView" destination="Xfm-Om-Wkr" id="Wk3-RF-8Xd"/>
+                        <outlet property="imgvArrow" destination="dIR-Kz-eTp" id="F6z-Z6-6s8"/>
                         <outlet property="imgvConnectHub" destination="4EA-vh-2Ou" id="5pa-Ra-Hd5"/>
                         <outlet property="imgvHubAlert" destination="NYo-u2-QsD" id="EKy-FQ-nD8"/>
                         <outlet property="imgvLogo" destination="jj4-yY-OvT" id="pTN-wy-o2T"/>
@@ -1100,7 +1098,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="320" height="68"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8am-9B-OVU" id="3z1-RY-sUu">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="67"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q6u-Ql-uvI">
@@ -1337,7 +1335,7 @@
                                                 <rect key="frame" x="0.0" y="96" width="320" height="322"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="h1h-oK-SGQ" id="PcJ-j1-AEV">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="322"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="321"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bu5-Tt-H5r">
@@ -1443,7 +1441,7 @@
                                                 <rect key="frame" x="0.0" y="418" width="320" height="63"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4Vp-TW-mCg" id="Gxj-Z0-xe2">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="63"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="62"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SpF-Bb-9qN" userLabel="View - container">
@@ -1556,7 +1554,7 @@
                                                 <rect key="frame" x="0.0" y="481" width="320" height="89"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="O2N-bm-Hvc" id="k2Z-gW-HLc">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="88.5"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k8h-3L-ehd">
@@ -1899,7 +1897,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="320" height="154"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eAC-dN-TM9" id="wmw-7q-Ee8">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="154"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="153"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="afL-97-7bS">

+ 1 - 1
OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.h

@@ -17,7 +17,7 @@
 
 #pragma mark - Properties
 @property (weak, nonatomic) IBOutlet CustomLabel *lblTitle;
-@property (weak, nonatomic) IBOutlet CustomButton *btnArrow; // 화살표 아이콘
+@property (weak, nonatomic) IBOutlet CustomImageView *imgvArrow; // 화살표 아이콘
 @property (weak, nonatomic) IBOutlet CustomLabel *lblCount; // 홈허브 개수
 @property (weak, nonatomic) IBOutlet UIView *viewTitle; // Head Title View
 @property (weak, nonatomic) IBOutlet CustomLabel *lblEditMode; // 순서 편집모드 텍스트