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

- 스토리보드 frame update 및 홈멤버 버튼 클래스 수

TaeHyun 8 лет назад
Родитель
Сommit
93c38ba7ef

+ 109 - 8
OneCable/Base.lproj/Common.storyboard

@@ -8,6 +8,102 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
+        <!--More Pop Over View Controller-->
+        <scene sceneID="lNp-uT-LKa">
+            <objects>
+                <viewController storyboardIdentifier="MorePopOverViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="bhZ-03-HmT" customClass="MorePopOverViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="fWl-6z-NUe"/>
+                        <viewControllerLayoutGuide type="bottom" id="4WK-WA-Nuy"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="JMP-iW-us5">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hlo-Jn-Px9">
+                                <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+                                <subviews>
+                                    <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Msb-lg-Hhd">
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="47"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bO9-PD-f6o" customClass="CustomButton">
+                                                <rect key="frame" x="0.0" y="0.0" width="80" height="47"/>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <state key="highlighted" image="img_bg_morepopup_icon_masterchange_press"/>
+                                                <connections>
+                                                    <action selector="btnAction:" destination="bhZ-03-HmT" eventType="touchUpInside" id="gR8-AF-O4L"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Ci-wC-hR9" customClass="CustomButton">
+                                                <rect key="frame" x="80" y="0.0" width="80" height="47"/>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <state key="highlighted" image="img_bg_morepopup_icon_add_press"/>
+                                                <connections>
+                                                    <action selector="btnAction:" destination="bhZ-03-HmT" eventType="touchUpInside" id="JQ6-ai-2mA"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jDL-F6-Yhx" customClass="CustomButton">
+                                                <rect key="frame" x="160" y="0.0" width="80" height="47"/>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <state key="highlighted" image="img_bg_morepopup_icon_delete_press"/>
+                                                <connections>
+                                                    <action selector="btnAction:" destination="bhZ-03-HmT" eventType="touchUpInside" id="sdB-vM-rGF"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" restorationIdentifier="MorePopVC" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ocQ-lF-sEP" customClass="CustomButton">
+                                                <rect key="frame" x="240" y="0.0" width="80" height="47"/>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <state key="highlighted" image="img_bg_morepopup_icon_refresh_press"/>
+                                                <connections>
+                                                    <action selector="btnAction:" destination="bhZ-03-HmT" eventType="touchUpInside" id="CKx-Eu-h9S"/>
+                                                </connections>
+                                            </button>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="47" id="4ZJ-aG-im7"/>
+                                        </constraints>
+                                    </stackView>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shadow_top" translatesAutoresizingMaskIntoConstraints="NO" id="Ftc-4j-nE4">
+                                        <rect key="frame" x="0.0" y="47" width="320" height="5"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="5" id="sWS-8h-s9S"/>
+                                        </constraints>
+                                    </imageView>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="Msb-lg-Hhd" secondAttribute="trailing" id="3pN-mj-peZ"/>
+                                    <constraint firstAttribute="trailing" secondItem="Ftc-4j-nE4" secondAttribute="trailing" id="5pM-zU-vv9"/>
+                                    <constraint firstItem="Ftc-4j-nE4" firstAttribute="leading" secondItem="hlo-Jn-Px9" secondAttribute="leading" id="8dZ-FT-Ktk"/>
+                                    <constraint firstItem="Msb-lg-Hhd" firstAttribute="leading" secondItem="hlo-Jn-Px9" secondAttribute="leading" id="Nll-11-HAV"/>
+                                    <constraint firstItem="Msb-lg-Hhd" firstAttribute="top" secondItem="hlo-Jn-Px9" secondAttribute="top" id="aE2-TQ-geP"/>
+                                    <constraint firstItem="Ftc-4j-nE4" firstAttribute="top" secondItem="Msb-lg-Hhd" secondAttribute="bottom" id="ub3-Ge-Roc"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="hlo-Jn-Px9" firstAttribute="top" secondItem="fWl-6z-NUe" secondAttribute="bottom" id="7w3-Ab-vQT"/>
+                            <constraint firstAttribute="trailing" secondItem="hlo-Jn-Px9" secondAttribute="trailing" id="AKH-aE-hf5"/>
+                            <constraint firstItem="4WK-WA-Nuy" firstAttribute="top" secondItem="hlo-Jn-Px9" secondAttribute="bottom" id="JQo-tM-CaU"/>
+                            <constraint firstItem="hlo-Jn-Px9" firstAttribute="leading" secondItem="JMP-iW-us5" secondAttribute="leading" id="rHP-MC-NeX"/>
+                        </constraints>
+                    </view>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="320" height="568"/>
+                    <connections>
+                        <outlet property="viewPopup" destination="Msb-lg-Hhd" id="mw5-4i-QCj"/>
+                        <outletCollection property="btnCollArray" destination="bO9-PD-f6o" id="puT-JS-kBP"/>
+                        <outletCollection property="btnCollArray" destination="0Ci-wC-hR9" id="bC0-m0-yF6"/>
+                        <outletCollection property="btnCollArray" destination="jDL-F6-Yhx" id="7S3-gH-g3P"/>
+                        <outletCollection property="btnCollArray" destination="ocQ-lF-sEP" id="1qL-iS-2kt"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="BIA-Sf-D3h" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="71.25" y="231.33802816901408"/>
+        </scene>
         <!--Option Pop Over View Controller-->
         <scene sceneID="HYo-0v-biN">
             <objects>
@@ -108,13 +204,13 @@
                                                     <exclude reference="YnI-rH-wyb"/>
                                                 </mask>
                                                 <mask key="constraints">
-                                                    <exclude reference="UMD-4T-2lO"/>
-                                                    <exclude reference="vwO-gP-TxB"/>
+                                                    <exclude reference="HRe-AR-Ccg"/>
+                                                    <exclude reference="dqt-Qt-Lkl"/>
                                                     <exclude reference="RGu-7w-21m"/>
                                                     <exclude reference="Wll-hf-5Tz"/>
                                                     <exclude reference="y4l-Ic-3e2"/>
-                                                    <exclude reference="HRe-AR-Ccg"/>
-                                                    <exclude reference="dqt-Qt-Lkl"/>
+                                                    <exclude reference="UMD-4T-2lO"/>
+                                                    <exclude reference="vwO-gP-TxB"/>
                                                 </mask>
                                             </variation>
                                             <variation key="heightClass=regular-widthClass=compact">
@@ -124,13 +220,13 @@
                                                     <include reference="YnI-rH-wyb"/>
                                                 </mask>
                                                 <mask key="constraints">
-                                                    <include reference="UMD-4T-2lO"/>
-                                                    <include reference="vwO-gP-TxB"/>
+                                                    <include reference="HRe-AR-Ccg"/>
+                                                    <include reference="dqt-Qt-Lkl"/>
                                                     <include reference="RGu-7w-21m"/>
                                                     <include reference="Wll-hf-5Tz"/>
                                                     <include reference="y4l-Ic-3e2"/>
-                                                    <include reference="HRe-AR-Ccg"/>
-                                                    <include reference="dqt-Qt-Lkl"/>
+                                                    <include reference="UMD-4T-2lO"/>
+                                                    <include reference="vwO-gP-TxB"/>
                                                 </mask>
                                             </variation>
                                         </tableViewCellContentView>
@@ -508,6 +604,11 @@
         </scene>
     </scenes>
     <resources>
+        <image name="img_bg_morepopup_icon_add_press" width="23" height="23"/>
+        <image name="img_bg_morepopup_icon_delete_press" width="23" height="23"/>
+        <image name="img_bg_morepopup_icon_masterchange_press" width="23" height="23"/>
+        <image name="img_bg_morepopup_icon_refresh_press" width="23" height="23"/>
+        <image name="shadow_top" width="1" height="1"/>
         <image name="tp_01_img_control_camera_down" width="40" height="40"/>
         <image name="tp_01_img_control_camera_left" width="40" height="40"/>
         <image name="tp_01_img_control_camera_movebg" width="120" height="120"/>

Разница между файлами не показана из-за своего большого размера
+ 47 - 47
OneCable/Base.lproj/HomeHub.storyboard


+ 14 - 4
OneCable/Base.lproj/HomeMember.storyboard

@@ -27,7 +27,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="320" height="65"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="참여 / 대기" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BQC-jo-sr2" customClass="CustomLabel">
-                                                <rect key="frame" x="10" y="20" width="200" height="45"/>
+                                                <rect key="frame" x="12" y="20" width="200" height="45"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="200" id="grY-gr-1NS"/>
@@ -96,9 +96,17 @@
                                                     <constraint firstAttribute="height" constant="20" id="eJy-19-Ik2"/>
                                                 </constraints>
                                             </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="01f-4z-8gt">
+                                                <rect key="frame" x="0.0" y="20" width="12" height="45"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="12" id="vEt-G2-dN3"/>
+                                                </constraints>
+                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
+                                            <constraint firstAttribute="bottom" secondItem="01f-4z-8gt" secondAttribute="bottom" id="3xS-TV-aRa"/>
                                             <constraint firstItem="BQC-jo-sr2" firstAttribute="top" secondItem="kbC-Vg-3ar" secondAttribute="bottom" id="4PF-CK-Mgb"/>
                                             <constraint firstItem="kbC-Vg-3ar" firstAttribute="top" secondItem="l0a-wm-olW" secondAttribute="top" id="6Sh-8B-5Ct"/>
                                             <constraint firstAttribute="trailing" secondItem="JFO-nI-N8s" secondAttribute="trailing" constant="-110" id="8Ps-j5-gDq"/>
@@ -106,10 +114,12 @@
                                             <constraint firstAttribute="height" constant="65" id="Als-Mn-bZC"/>
                                             <constraint firstAttribute="trailing" secondItem="EJS-zY-9Mn" secondAttribute="trailing" id="Ap2-pP-n4L"/>
                                             <constraint firstItem="EJS-zY-9Mn" firstAttribute="top" secondItem="kbC-Vg-3ar" secondAttribute="bottom" id="QZj-JC-beK"/>
+                                            <constraint firstItem="01f-4z-8gt" firstAttribute="leading" secondItem="l0a-wm-olW" secondAttribute="leading" id="VRD-p4-LHD"/>
                                             <constraint firstAttribute="bottom" secondItem="EJS-zY-9Mn" secondAttribute="bottom" id="b0Q-zv-ftG"/>
+                                            <constraint firstItem="01f-4z-8gt" firstAttribute="top" secondItem="kbC-Vg-3ar" secondAttribute="bottom" id="c2o-2I-mNP"/>
                                             <constraint firstItem="kbC-Vg-3ar" firstAttribute="leading" secondItem="l0a-wm-olW" secondAttribute="leading" id="cik-kk-vaD"/>
-                                            <constraint firstItem="BQC-jo-sr2" firstAttribute="leading" secondItem="l0a-wm-olW" secondAttribute="leading" constant="10" id="dUs-G2-CGC"/>
                                             <constraint firstAttribute="bottom" secondItem="BQC-jo-sr2" secondAttribute="bottom" id="nij-DS-7AU"/>
+                                            <constraint firstItem="BQC-jo-sr2" firstAttribute="leading" secondItem="01f-4z-8gt" secondAttribute="trailing" id="oU7-Cp-zC9"/>
                                             <constraint firstItem="JFO-nI-N8s" firstAttribute="top" secondItem="l0a-wm-olW" secondAttribute="top" constant="20" id="rrB-kh-VXy"/>
                                             <constraint firstAttribute="bottom" secondItem="JFO-nI-N8s" secondAttribute="bottom" constant="-10" id="vxI-xh-7AZ"/>
                                         </constraints>
@@ -443,7 +453,7 @@
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rPe-eM-rB6" userLabel="View - Container">
                                                             <rect key="frame" x="0.0" y="0.0" width="145" height="168"/>
                                                             <subviews>
-                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PxQ-Df-kgL">
+                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PxQ-Df-kgL" customClass="CustomLabelButton">
                                                                     <rect key="frame" x="15" y="0.0" width="115" height="167"/>
                                                                     <subviews>
                                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PJW-3U-S2V">
@@ -604,7 +614,7 @@
                                                 <view contentMode="scaleToFill" placeholderIntrinsicWidth="320" placeholderIntrinsicHeight="160" translatesAutoresizingMaskIntoConstraints="NO" id="ikh-Ij-LRr">
                                                     <rect key="frame" x="0.0" y="0.0" width="320" height="168"/>
                                                     <subviews>
-                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CYK-lY-JKj">
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CYK-lY-JKj" customClass="CustomLabelButton">
                                                             <rect key="frame" x="15" y="0.0" width="290" height="168"/>
                                                             <subviews>
                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DhT-uE-wM1" customClass="CustomButton">

+ 3 - 3
OneCable/Base.lproj/Main.storyboard

@@ -5419,7 +5419,7 @@
         <image name="common_bullet_alert_bgpointer" width="30" height="30"/>
         <image name="common_bullet_circle_red" width="10" height="10"/>
         <image name="common_checkbox_checked" width="27" height="27"/>
-        <image name="common_checkbox_default" width="27" height="27"/>
+        <image name="common_checkbox_default" width="35" height="35"/>
         <image name="common_fullpopup_btn_close" width="32" height="32"/>
         <image name="common_fullpopup_btn_close_press" width="32" height="32"/>
         <image name="common_fullpopup_btn_setting" width="32" height="32"/>
@@ -5427,8 +5427,8 @@
         <image name="common_icon_clock" width="15" height="15"/>
         <image name="common_list_btn_big_add" width="44" height="44"/>
         <image name="common_list_btn_big_add_press" width="50" height="50"/>
-        <image name="common_list_btn_delete" width="27" height="27"/>
-        <image name="common_list_btn_delete_press" width="27" height="27"/>
+        <image name="common_list_btn_delete" width="35" height="35"/>
+        <image name="common_list_btn_delete_press" width="35" height="35"/>
         <image name="common_mask_circle_bgfill_w" width="65" height="65"/>
         <image name="common_menu_fullpopup_alphabg" width="320" height="568"/>
         <image name="common_menu_fullpopup_left_btn_gateway" width="30" height="30"/>

Разница между файлами не показана из-за своего большого размера
+ 277 - 265
OneCable/Base.lproj/Rules.storyboard


Разница между файлами не показана из-за своего большого размера
+ 172 - 173
OneCable/Base.lproj/SignUp.storyboard


Разница между файлами не показана из-за своего большого размера
+ 147 - 156
OneCable/Base.lproj/Things.storyboard