- 장치리스트 디자인가이드 적용

OneCable/Assets.xcassets/images/common_button_bg_press.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "common_button_bg_press@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "common_button_bg_press@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

OneCable/Base.lproj/Things.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -31,17 +31,17 @@
                                         <rect key="frame" x="0.0" y="0.0" width="320" height="70"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="장치 전체" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dCL-Ql-eHd" customClass="CustomLabel">
-                                                <rect key="frame" x="15" y="20" width="260" height="50"/>
+                                                <rect key="frame" x="15" y="20" width="255" height="50"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bsD-dR-bxK" customClass="CustomButton">
-                                                <rect key="frame" x="275" y="25" width="45" height="45"/>
+                                                <rect key="frame" x="270" y="20" width="50" height="50"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="width" constant="45" id="3Qg-ZL-eny"/>
-                                                    <constraint firstAttribute="height" constant="45" id="b4Q-8v-Sdd"/>
+                                                    <constraint firstAttribute="width" constant="50" id="3Qg-ZL-eny"/>
+                                                    <constraint firstAttribute="height" constant="50" id="b4Q-8v-Sdd"/>
                                                 </constraints>
                                                 <state key="normal" image="common_head_btn_more"/>
                                                 <state key="highlighted" image="common_head_btn_more_press"/>
@@ -49,34 +49,6 @@
                                                     <action selector="btnOptionTouched:" destination="G75-Hx-lyG" eventType="touchUpInside" id="u8t-Iy-sS5"/>
                                                 </connections>
                                             </button>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bcl-NX-EmB" userLabel="View - EditMode">
-                                                <rect key="frame" x="320" y="20" width="55" height="50"/>
-                                                <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yWS-oA-rlP" customClass="CustomButton">
-                                                        <rect key="frame" x="0.0" y="0.0" width="55" height="50"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="width" constant="46" id="7np-iR-EV0">
-                                                                <variation key="heightClass=regular-widthClass=compact" constant="55"/>
-                                                            </constraint>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                        <state key="normal" image="common_head_btn_close"/>
-                                                        <state key="highlighted" image="common_head_btn_close_press"/>
-                                                    </button>
-                                                </subviews>
-                                                <constraints>
-                                                    <constraint firstAttribute="bottom" secondItem="yWS-oA-rlP" secondAttribute="bottom" constant="5" id="CkU-cC-8kc">
-                                                        <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                                                    </constraint>
-                                                    <constraint firstItem="yWS-oA-rlP" firstAttribute="top" secondItem="bcl-NX-EmB" secondAttribute="top" constant="5" id="luw-TE-MsS">
-                                                        <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                                                    </constraint>
-                                                    <constraint firstAttribute="trailing" secondItem="yWS-oA-rlP" secondAttribute="trailing" id="o47-gh-9kP"/>
-                                                    <constraint firstAttribute="width" constant="50" id="u7m-cR-h8a">
-                                                        <variation key="heightClass=regular-widthClass=compact" constant="55"/>
-                                                    </constraint>
-                                                </constraints>
-                                            </view>
                                             <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_bullet_alert" translatesAutoresizingMaskIntoConstraints="NO" id="NYo-u2-QsD">
                                                 <rect key="frame" x="18" y="36.5" width="17" height="17"/>
                                                 <constraints>
@@ -104,32 +76,79 @@
                                                 </constraints>
                                             </view>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Vs0-VT-7Jr" customClass="CustomButton">
-                                                <rect key="frame" x="275" y="25" width="45" height="45"/>
+                                                <rect key="frame" x="270" y="20" width="50" height="50"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="width" constant="45" id="cs4-l2-X4i"/>
-                                                    <constraint firstAttribute="height" constant="45" id="gbp-xH-7If"/>
+                                                    <constraint firstAttribute="width" constant="50" id="cs4-l2-X4i"/>
+                                                    <constraint firstAttribute="height" constant="50" id="gbp-xH-7If"/>
                                                 </constraints>
                                                 <state key="normal" backgroundImage="common_head_btn_close"/>
                                                 <state key="highlighted" backgroundImage="common_head_btn_close_press"/>
                                             </button>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fW2-6O-SuF" userLabel="View - EditMode">
+                                                <rect key="frame" x="170" y="20" width="150" height="50"/>
+                                                <subviews>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oNP-Md-pS7" customClass="CustomButton">
+                                                        <rect key="frame" x="100" y="0.0" width="50" height="50"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="50" id="4b3-wg-mCh"/>
+                                                        </constraints>
+                                                        <state key="normal" backgroundImage="common_head_btn_close">
+                                                            <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                        </state>
+                                                        <state key="highlighted" backgroundImage="common_head_btn_close_press"/>
+                                                    </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wjr-YQ-CK1" customClass="CustomButton">
+                                                        <rect key="frame" x="50" y="0.0" width="50" height="50"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="50" id="NMN-Vt-h90"/>
+                                                        </constraints>
+                                                        <state key="normal" backgroundImage="common_head_btn_save">
+                                                            <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                        </state>
+                                                        <state key="highlighted" backgroundImage="common_head_btn_save_press"/>
+                                                    </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RRy-5K-Lvr" customClass="CustomButton">
+                                                        <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="50" id="wgz-9a-keI"/>
+                                                        </constraints>
+                                                        <state key="normal" backgroundImage="common_head_btn_refresh">
+                                                            <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                        </state>
+                                                        <state key="highlighted" backgroundImage="common_head_btn_refresh_press"/>
+                                                    </button>
+                                                </subviews>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstItem="wjr-YQ-CK1" firstAttribute="leading" secondItem="RRy-5K-Lvr" secondAttribute="trailing" id="12d-f3-Qpb"/>
+                                                    <constraint firstAttribute="bottom" secondItem="RRy-5K-Lvr" secondAttribute="bottom" id="3In-jX-EGK"/>
+                                                    <constraint firstItem="RRy-5K-Lvr" firstAttribute="top" secondItem="fW2-6O-SuF" secondAttribute="top" id="6Z3-su-wJF"/>
+                                                    <constraint firstItem="oNP-Md-pS7" firstAttribute="top" secondItem="fW2-6O-SuF" secondAttribute="top" id="9LW-nH-iEZ"/>
+                                                    <constraint firstItem="wjr-YQ-CK1" firstAttribute="top" secondItem="fW2-6O-SuF" secondAttribute="top" id="FNE-gz-XZc"/>
+                                                    <constraint firstAttribute="width" constant="150" id="ILM-F4-9KB"/>
+                                                    <constraint firstAttribute="height" constant="50" id="L4Z-Be-bFb"/>
+                                                    <constraint firstAttribute="bottom" secondItem="wjr-YQ-CK1" secondAttribute="bottom" id="f6f-FE-2Xk"/>
+                                                    <constraint firstAttribute="bottom" secondItem="oNP-Md-pS7" secondAttribute="bottom" id="o1T-Iy-3WJ"/>
+                                                    <constraint firstItem="oNP-Md-pS7" firstAttribute="leading" secondItem="wjr-YQ-CK1" secondAttribute="trailing" id="ofj-dt-cFE"/>
+                                                    <constraint firstAttribute="trailing" secondItem="oNP-Md-pS7" secondAttribute="trailing" id="zmw-T1-6Cp"/>
+                                                </constraints>
+                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstItem="u0O-AJ-zyI" firstAttribute="bottom" secondItem="dCL-Ql-eHd" secondAttribute="bottom" id="0gt-bP-1Zh"/>
-                                            <constraint firstAttribute="trailing" secondItem="bcl-NX-EmB" secondAttribute="trailing" constant="-55" id="5xl-BA-KZH"/>
                                             <constraint firstItem="dCL-Ql-eHd" firstAttribute="leading" secondItem="u0O-AJ-zyI" secondAttribute="trailing" id="5y1-dU-YSi"/>
+                                            <constraint firstAttribute="trailing" secondItem="Vs0-VT-7Jr" secondAttribute="trailing" id="6uQ-3X-d73"/>
                                             <constraint firstItem="dCL-Ql-eHd" firstAttribute="top" secondItem="qAY-8c-k5A" secondAttribute="top" constant="43" id="8zZ-Ab-drp">
                                                 <variation key="heightClass=regular-widthClass=compact" constant="20"/>
                                             </constraint>
                                             <constraint firstItem="NYo-u2-QsD" firstAttribute="centerY" secondItem="dCL-Ql-eHd" secondAttribute="centerY" id="F1H-Jo-1Om"/>
+                                            <constraint firstAttribute="bottom" secondItem="fW2-6O-SuF" secondAttribute="bottom" id="FqU-hH-eGr"/>
                                             <constraint firstAttribute="trailing" secondItem="bsD-dR-bxK" secondAttribute="trailing" constant="8" id="Lix-dJ-aRk">
                                                 <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
                                             </constraint>
-                                            <constraint firstItem="bcl-NX-EmB" firstAttribute="top" secondItem="qAY-8c-k5A" secondAttribute="top" constant="20" id="N4X-4p-843"/>
-                                            <constraint firstItem="bcl-NX-EmB" firstAttribute="leading" secondItem="Vs0-VT-7Jr" secondAttribute="trailing" id="O0v-fo-B2i"/>
                                             <constraint firstAttribute="bottom" secondItem="Vs0-VT-7Jr" secondAttribute="bottom" id="VGp-bo-ra8"/>
                                             <constraint firstItem="u0O-AJ-zyI" firstAttribute="top" secondItem="dCL-Ql-eHd" secondAttribute="top" id="VLS-oc-Qe2"/>
-                                            <constraint firstAttribute="bottom" secondItem="bcl-NX-EmB" secondAttribute="bottom" id="b1B-eR-gOp"/>
                                             <constraint firstItem="NYo-u2-QsD" firstAttribute="leading" secondItem="qAY-8c-k5A" secondAttribute="leading" constant="18" id="kE8-F3-cDR"/>
                                             <constraint firstAttribute="bottom" secondItem="bsD-dR-bxK" secondAttribute="bottom" constant="20" id="kiP-a2-DJw">
                                                 <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
@@ -141,6 +160,7 @@
                                                 <variation key="heightClass=regular-widthClass=compact" constant="70"/>
                                             </constraint>
                                             <constraint firstItem="u0O-AJ-zyI" firstAttribute="leading" secondItem="qAY-8c-k5A" secondAttribute="leading" id="rzm-JG-kKp"/>
+                                            <constraint firstAttribute="trailing" secondItem="fW2-6O-SuF" secondAttribute="trailing" id="x4Q-iI-lWu"/>
                                             <constraint firstItem="bsD-dR-bxK" firstAttribute="leading" secondItem="dCL-Ql-eHd" secondAttribute="trailing" id="xE2-EP-b5Z"/>
                                         </constraints>
                                         <variation key="default">
@@ -309,7 +329,7 @@
                                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="pSf-xV-CbI">
                                             <size key="itemSize" width="145" height="168"/>
                                             <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                            <size key="footerReferenceSize" width="50" height="70"/>
                                             <inset key="sectionInset" minX="0.0" minY="10" maxX="0.0" maxY="0.0"/>
                                         </collectionViewFlowLayout>
                                         <cells>
@@ -619,7 +639,7 @@
                                                                                     </constraints>
                                                                                 </view>
                                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MAu-Rm-vJD" customClass="CustomButton">
-                                                                                    <rect key="frame" x="35.5" y="62" width="44" height="44"/>
+                                                                                    <rect key="frame" x="36" y="62" width="44" height="44"/>
                                                                                     <constraints>
                                                                                         <constraint firstAttribute="width" constant="44" id="GLO-Gt-7db"/>
                                                                                         <constraint firstAttribute="height" constant="44" id="Zhb-wb-9hY"/>
@@ -732,6 +752,10 @@
                                                 </connections>
                                             </collectionViewCell>
                                         </cells>
+                                        <collectionReusableView key="sectionFooterView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="IIK-Zy-XcN">
+                                            <rect key="frame" x="0.0" y="178" width="300" height="70"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </collectionReusableView>
                                     </collectionView>
                                 </subviews>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -807,10 +831,11 @@
                     <connections>
                         <outlet property="addHubContainerView" destination="4XN-6C-LGr" id="HU8-lm-6z1"/>
                         <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="constraintEditModeRight" destination="5xl-BA-KZH" id="wBY-es-qvu"/>
-                        <outlet property="editModeView" destination="bcl-NX-EmB" id="epA-Mi-ezK"/>
                         <outlet property="imgvConnectHub" destination="4EA-vh-2Ou" id="5pa-Ra-Hd5"/>
                         <outlet property="imgvHubAlert" destination="NYo-u2-QsD" id="F8X-Vg-Bmv"/>
                         <outlet property="lblConnectHub" destination="auZ-9c-1Rz" id="psm-yc-0k6"/>
@@ -818,11 +843,12 @@
                         <outlet property="lblSimpleMemberInfo" destination="HCt-ss-vgc" id="UHv-ED-qzH"/>
                         <outlet property="lblTitle" destination="dCL-Ql-eHd" id="em7-9X-zLw"/>
                         <outlet property="mainView" destination="Z09-xT-S74" id="ZYa-A6-bFn"/>
+                        <outlet property="viewEditMode" destination="fW2-6O-SuF" id="0gJ-qR-Syt"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="nXD-gT-24v" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-324" y="-24"/>
+            <point key="canvasLocation" x="-324.375" y="-24.295774647887324"/>
         </scene>
         <!--Things Detail View Controller-->
         <scene sceneID="YJM-Jl-675">
@@ -1573,7 +1599,7 @@
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="150" id="zoz-XO-eF4"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
+                                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1607,13 +1633,13 @@
                                         </variation>
                                     </view>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shadow_top" translatesAutoresizingMaskIntoConstraints="NO" id="avf-PF-fZs">
-                                        <rect key="frame" x="0.0" y="65" width="320" height="5"/>
+                                        <rect key="frame" x="0.0" y="65" width="320" height="6"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="5" id="7ET-vZ-4gu"/>
+                                            <constraint firstAttribute="height" constant="6" id="7ET-vZ-4gu"/>
                                         </constraints>
                                     </imageView>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="LpA-PE-kzt" customClass="CustomTableView">
-                                        <rect key="frame" x="0.0" y="70" width="320" height="453"/>
+                                        <rect key="frame" x="0.0" y="65" width="320" height="458"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <prototypes>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AddCellIdentifier" rowHeight="135" id="eAC-dN-TM9" customClass="ThingsAddTableViewCell">
@@ -1855,7 +1881,6 @@
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstItem="LpA-PE-kzt" firstAttribute="leading" secondItem="lvW-sC-EWC" secondAttribute="leading" id="4FP-dt-eg8"/>
-                                    <constraint firstItem="LpA-PE-kzt" firstAttribute="top" secondItem="avf-PF-fZs" secondAttribute="bottom" id="7e5-33-E0n"/>
                                     <constraint firstAttribute="trailing" secondItem="LpA-PE-kzt" secondAttribute="trailing" id="Cr9-FT-odf"/>
                                     <constraint firstItem="avf-PF-fZs" firstAttribute="leading" secondItem="lvW-sC-EWC" secondAttribute="leading" id="D56-QK-cuM"/>
                                     <constraint firstAttribute="trailing" secondItem="HcJ-pH-9NK" secondAttribute="trailing" id="MBJ-9O-Zc1"/>
@@ -1864,6 +1889,7 @@
                                     <constraint firstItem="Avq-ax-xEm" firstAttribute="top" secondItem="lvW-sC-EWC" secondAttribute="top" id="eKd-Cb-WJe"/>
                                     <constraint firstItem="avf-PF-fZs" firstAttribute="top" secondItem="Avq-ax-xEm" secondAttribute="bottom" id="eXP-5t-FQN"/>
                                     <constraint firstItem="HcJ-pH-9NK" firstAttribute="top" secondItem="LpA-PE-kzt" secondAttribute="bottom" id="kc7-qQ-2FF"/>
+                                    <constraint firstItem="LpA-PE-kzt" firstAttribute="top" secondItem="Avq-ax-xEm" secondAttribute="bottom" id="l8N-9n-B55"/>
                                     <constraint firstItem="HcJ-pH-9NK" firstAttribute="leading" secondItem="lvW-sC-EWC" secondAttribute="leading" id="ojd-vz-Nuj"/>
                                     <constraint firstAttribute="trailing" secondItem="avf-PF-fZs" secondAttribute="trailing" id="vO0-5L-sxM"/>
                                     <constraint firstItem="Avq-ax-xEm" firstAttribute="leading" secondItem="lvW-sC-EWC" secondAttribute="leading" id="x5P-17-2oV"/>
@@ -5776,6 +5802,10 @@
         <image name="common_head_btn_close_press" width="50" height="50"/>
         <image name="common_head_btn_more" width="50" height="50"/>
         <image name="common_head_btn_more_press" width="50" height="50"/>
+        <image name="common_head_btn_refresh" width="50" height="50"/>
+        <image name="common_head_btn_refresh_press" width="50" height="50"/>
+        <image name="common_head_btn_save" width="50" height="50"/>
+        <image name="common_head_btn_save_press" width="50" height="50"/>
         <image name="common_list_btn_big_add" width="44" height="44"/>
         <image name="common_list_btn_big_add_press" width="44" height="44"/>
         <image name="common_list_btn_changeorder" width="40" height="40"/>

OneCable/Classes/CustomUI/CustomTextField.m

@@ -456,7 +456,7 @@ CGRect gKeyboardRect;
 // placeholder position
 - (CGRect)textRectForBounds:(CGRect)bounds {
     //    CGFloat y = IOS_VERSION < 7.0f ? 6 : 0;
-    CGFloat margin = 15;
+    CGFloat margin = 16;
     CGRect inset = CGRectMake(bounds.origin.x + margin, bounds.origin.y, bounds.size.width, bounds.size.height);
     return inset;
 }
@@ -464,7 +464,7 @@ CGRect gKeyboardRect;
 // text position
 - (CGRect)editingRectForBounds:(CGRect)bounds {
     //    CGFloat y = IOS_VERSION < 7.0f ? 6 : 0;
-    CGFloat margin = 15;
+    CGFloat margin = 16;
     CGRect inset = CGRectMake(bounds.origin.x + margin, bounds.origin.y, bounds.size.width, bounds.size.height);
     return inset;
 }

OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.h

@@ -22,8 +22,11 @@
 @property (weak, nonatomic) IBOutlet UIImageView *imgvHubAlert;
 @property (weak, nonatomic) IBOutlet CustomButton *btnOption;
 @property (weak, nonatomic) IBOutlet CustomButton *btnClose;
+@property (weak, nonatomic) IBOutlet UIView *viewEditMode;
+@property (weak, nonatomic) IBOutlet CustomButton *btnEditClose;
+@property (weak, nonatomic) IBOutlet CustomButton *btnEditSave;
+@property (weak, nonatomic) IBOutlet CustomButton *btnEditRefresh;
 
-@property (weak, nonatomic) IBOutlet UIView *editModeView;
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintEditModeRight;
 

OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.m

@@ -37,7 +37,7 @@
 #define kiCellInset 10
 #define kiCellItem 2
 #define kiCellRatio 46
-
+#define kiCellDivision 3
 
 /**
  
@@ -140,6 +140,7 @@
     
     [_btnClose setHidden:YES];
     [_btnOption setHidden:NO];
+    [_viewEditMode setHidden:YES];
     
     [self setThingsPopoverOptions];
     
@@ -578,6 +579,11 @@
 //    return CGSizeMake(IPHONE_WIDTH, 160.0f);
 //}
 
+-(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section
+{
+    return CGSizeMake(ViewWidth(_collectionView), (((ViewWidth(_collectionView)-kiCellInset)+kiCellRatio) / kiCellItem) / kiCellDivision+(kiCellItem*kiCellItem));
+}
+
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
     
         return CGSizeMake((ViewWidth(_collectionView)-kiCellInset) / kiCellItem, ((ViewWidth(_collectionView)-kiCellInset)+kiCellRatio) / kiCellItem);