Showing
2 changed files
with
29 additions
and
19 deletions
| @@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
| 3 | <dependencies> | 3 | <dependencies> |
| 4 | <deployment identifier="iOS"/> | 4 | <deployment identifier="iOS"/> |
| 5 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/> | 5 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/> |
| 6 | + <capability name="Constraints to layout margins" minToolsVersion="6.0"/> | ||
| 6 | </dependencies> | 7 | </dependencies> |
| 7 | <scenes> | 8 | <scenes> |
| 8 | <!--PNChart--> | 9 | <!--PNChart--> |
| @@ -26,58 +27,67 @@ | @@ -26,58 +27,67 @@ | ||
| 26 | <action selector="changeValue:" destination="Tha-Wr-sPW" eventType="touchUpInside" id="zeG-Cp-Wjs"/> | 27 | <action selector="changeValue:" destination="Tha-Wr-sPW" eventType="touchUpInside" id="zeG-Cp-Wjs"/> |
| 27 | </connections> | 28 | </connections> |
| 28 | </button> | 29 | </button> |
| 29 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FUU-vZ-jMd"> | 30 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FUU-vZ-jMd"> |
| 30 | - <rect key="frame" x="53" y="81" width="215" height="30"/> | 31 | + <rect key="frame" x="132" y="81" width="57" height="32"/> |
| 31 | <fontDescription key="fontDescription" name="Avenir-Medium" family="Avenir" pointSize="23"/> | 32 | <fontDescription key="fontDescription" name="Avenir-Medium" family="Avenir" pointSize="23"/> |
| 32 | <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> | 33 | <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> |
| 33 | <nil key="highlightedColor"/> | 34 | <nil key="highlightedColor"/> |
| 34 | </label> | 35 | </label> |
| 35 | - <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ORA-mb-hJl"> | 36 | + <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qR7-40-7ir"> |
| 36 | - <rect key="frame" x="16" y="489" width="51" height="31"/> | 37 | + <rect key="frame" x="261" y="502" width="51" height="31"/> |
| 37 | - <connections> | ||
| 38 | - <action selector="leftSwitchChanged:" destination="Tha-Wr-sPW" eventType="valueChanged" id="q9T-QK-Sas"/> | ||
| 39 | - </connections> | ||
| 40 | - </switch> | ||
| 41 | - <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qR7-40-7ir"> | ||
| 42 | - <rect key="frame" x="261" y="489" width="51" height="31"/> | ||
| 43 | <connections> | 38 | <connections> |
| 44 | <action selector="rightSwitchChanged:" destination="Tha-Wr-sPW" eventType="valueChanged" id="n6V-lL-r8Q"/> | 39 | <action selector="rightSwitchChanged:" destination="Tha-Wr-sPW" eventType="valueChanged" id="n6V-lL-r8Q"/> |
| 45 | </connections> | 40 | </connections> |
| 46 | </switch> | 41 | </switch> |
| 47 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Percentage" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IKu-qh-ksi"> | 42 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Percentage" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IKu-qh-ksi"> |
| 48 | - <rect key="frame" x="16" y="528" width="121" height="21"/> | 43 | + <rect key="frame" x="16" y="541" width="88" height="21"/> |
| 49 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 44 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 50 | <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> | 45 | <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> |
| 51 | <nil key="highlightedColor"/> | 46 | <nil key="highlightedColor"/> |
| 52 | </label> | 47 | </label> |
| 53 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Show Labels" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ifm-a9-Wkq"> | 48 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Show Labels" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ifm-a9-Wkq"> |
| 54 | - <rect key="frame" x="192" y="527" width="118" height="21"/> | 49 | + <rect key="frame" x="211" y="540" width="99" height="21"/> |
| 55 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 50 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 56 | <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> | 51 | <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> |
| 57 | <nil key="highlightedColor"/> | 52 | <nil key="highlightedColor"/> |
| 58 | </label> | 53 | </label> |
| 59 | - <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="kav-3r-blI"> | 54 | + <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="kav-3r-blI"> |
| 60 | - <rect key="frame" x="142" y="461" width="51" height="31"/> | 55 | + <rect key="frame" x="136" y="461" width="51" height="31"/> |
| 61 | <connections> | 56 | <connections> |
| 62 | <action selector="centerSwitchChanged:" destination="Tha-Wr-sPW" eventType="valueChanged" id="ETI-hb-d8F"/> | 57 | <action selector="centerSwitchChanged:" destination="Tha-Wr-sPW" eventType="valueChanged" id="ETI-hb-d8F"/> |
| 63 | <action selector="rightSwitchChanged:" destination="Tha-Wr-sPW" eventType="valueChanged" id="2Rs-PH-2WM"/> | 58 | <action selector="rightSwitchChanged:" destination="Tha-Wr-sPW" eventType="valueChanged" id="2Rs-PH-2WM"/> |
| 64 | </connections> | 59 | </connections> |
| 65 | </switch> | 60 | </switch> |
| 66 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Multiple Selection" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sMF-o9-dZX"> | 61 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Multiple Selection" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sMF-o9-dZX"> |
| 67 | - <rect key="frame" x="73" y="499" width="137" height="21"/> | 62 | + <rect key="frame" x="92" y="498" width="137" height="21"/> |
| 68 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 63 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 69 | <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> | 64 | <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> |
| 70 | <nil key="highlightedColor"/> | 65 | <nil key="highlightedColor"/> |
| 71 | </label> | 66 | </label> |
| 67 | + <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ORA-mb-hJl"> | ||
| 68 | + <rect key="frame" x="16" y="502" width="51" height="31"/> | ||
| 69 | + <connections> | ||
| 70 | + <action selector="leftSwitchChanged:" destination="Tha-Wr-sPW" eventType="valueChanged" id="q9T-QK-Sas"/> | ||
| 71 | + </connections> | ||
| 72 | + </switch> | ||
| 72 | </subviews> | 73 | </subviews> |
| 73 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> | 74 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> |
| 74 | <constraints> | 75 | <constraints> |
| 75 | <constraint firstItem="qR7-40-7ir" firstAttribute="top" secondItem="kav-3r-blI" secondAttribute="bottom" constant="10" id="4Qo-Xx-bbF"/> | 76 | <constraint firstItem="qR7-40-7ir" firstAttribute="top" secondItem="kav-3r-blI" secondAttribute="bottom" constant="10" id="4Qo-Xx-bbF"/> |
| 77 | + <constraint firstItem="ORA-mb-hJl" firstAttribute="centerY" secondItem="qR7-40-7ir" secondAttribute="centerY" id="7c9-My-TTD"/> | ||
| 78 | + <constraint firstItem="IKu-qh-ksi" firstAttribute="top" secondItem="ORA-mb-hJl" secondAttribute="bottom" constant="8" id="7vb-uB-f1x"/> | ||
| 79 | + <constraint firstItem="Ifm-a9-Wkq" firstAttribute="top" secondItem="qR7-40-7ir" secondAttribute="bottom" constant="7" id="9ET-Wq-Yen"/> | ||
| 76 | <constraint firstItem="FUU-vZ-jMd" firstAttribute="top" secondItem="znr-YO-4a4" secondAttribute="bottom" constant="17" id="DLv-qJ-h7R"/> | 80 | <constraint firstItem="FUU-vZ-jMd" firstAttribute="top" secondItem="znr-YO-4a4" secondAttribute="bottom" constant="17" id="DLv-qJ-h7R"/> |
| 81 | + <constraint firstItem="sMF-o9-dZX" firstAttribute="top" secondItem="kav-3r-blI" secondAttribute="bottom" constant="6" id="Fy1-r9-rOd"/> | ||
| 82 | + <constraint firstAttribute="trailingMargin" secondItem="qR7-40-7ir" secondAttribute="trailing" constant="-6" id="UdE-fM-LAZ"/> | ||
| 77 | <constraint firstAttribute="centerX" secondItem="FUU-vZ-jMd" secondAttribute="centerX" id="YGT-a5-Zka"/> | 83 | <constraint firstAttribute="centerX" secondItem="FUU-vZ-jMd" secondAttribute="centerX" id="YGT-a5-Zka"/> |
| 78 | <constraint firstItem="kav-3r-blI" firstAttribute="centerX" secondItem="sMF-o9-dZX" secondAttribute="centerX" id="aUL-sS-9ZE"/> | 84 | <constraint firstItem="kav-3r-blI" firstAttribute="centerX" secondItem="sMF-o9-dZX" secondAttribute="centerX" id="aUL-sS-9ZE"/> |
| 79 | <constraint firstAttribute="centerX" secondItem="kav-3r-blI" secondAttribute="centerX" id="aap-Gv-rtz"/> | 85 | <constraint firstAttribute="centerX" secondItem="kav-3r-blI" secondAttribute="centerX" id="aap-Gv-rtz"/> |
| 86 | + <constraint firstAttribute="trailingMargin" secondItem="Ifm-a9-Wkq" secondAttribute="trailing" constant="-6" id="byo-2X-TrB"/> | ||
| 87 | + <constraint firstItem="kav-3r-blI" firstAttribute="top" secondItem="L3F-13-Wf5" secondAttribute="bottom" constant="67" id="eO9-bU-rZY"/> | ||
| 80 | <constraint firstItem="L3F-13-Wf5" firstAttribute="top" secondItem="znr-YO-4a4" secondAttribute="bottom" constant="300" id="ewm-kv-p8k"/> | 88 | <constraint firstItem="L3F-13-Wf5" firstAttribute="top" secondItem="znr-YO-4a4" secondAttribute="bottom" constant="300" id="ewm-kv-p8k"/> |
| 89 | + <constraint firstItem="IKu-qh-ksi" firstAttribute="leading" secondItem="PPb-b8-nBo" secondAttribute="leadingMargin" id="m9a-Ug-SfK"/> | ||
| 90 | + <constraint firstItem="ORA-mb-hJl" firstAttribute="leading" secondItem="PPb-b8-nBo" secondAttribute="leadingMargin" id="oZO-il-Fd5"/> | ||
| 81 | <constraint firstAttribute="centerX" secondItem="L3F-13-Wf5" secondAttribute="centerX" id="zXw-WV-mro"/> | 91 | <constraint firstAttribute="centerX" secondItem="L3F-13-Wf5" secondAttribute="centerX" id="zXw-WV-mro"/> |
| 82 | </constraints> | 92 | </constraints> |
| 83 | </view> | 93 | </view> |
| @@ -10,4 +10,4 @@ SPEC CHECKSUMS: | @@ -10,4 +10,4 @@ SPEC CHECKSUMS: | ||
| 10 | Expecta: 54e8a3530add08f4f0208c111355eda7cde74a53 | 10 | Expecta: 54e8a3530add08f4f0208c111355eda7cde74a53 |
| 11 | UICountingLabel: 1db4e7d023e1762171eb226d6dff47a7a84f27aa | 11 | UICountingLabel: 1db4e7d023e1762171eb226d6dff47a7a84f27aa |
| 12 | 12 | ||
| 13 | -COCOAPODS: 0.35.0 | 13 | +COCOAPODS: 0.38.2 |
-
Please register or login to post a comment