Skip to content

Commit 46134bb

Browse files
hellchellc
committed
Podspec update. Card UI fixes
1 parent c4c41da commit 46134bb

3 files changed

Lines changed: 46 additions & 43 deletions

File tree

‎Framework/SoftUI/Controls/Cards/SoftCard.xib‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,40 +29,40 @@
2929
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
3030
</userDefinedRuntimeAttributes>
3131
<connections>
32-
<outlet property="pageControl" destination="tEc-0p-Shp" id="J1V-Sk-r7S"/>
33-
<outlet property="scrollView" destination="tV1-Fp-za6" id="15a-Jn-ay2"/>
32+
<outlet property="pageControl" destination="o0L-Wx-SQW" id="4iG-M1-uAT"/>
33+
<outlet property="scrollView" destination="cfe-NM-yK0" id="gka-3d-6Xf"/>
3434
</connections>
3535
</placeholder>
3636
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
37-
<view contentMode="scaleToFill" id="iN0-l3-epB">
37+
<view contentMode="scaleToFill" id="SLm-Ad-Ozf">
3838
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
3939
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
4040
<subviews>
41-
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceHorizontal="YES" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tV1-Fp-za6">
41+
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceHorizontal="YES" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cfe-NM-yK0">
4242
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
4343
<connections>
44-
<outlet property="delegate" destination="-1" id="Y6K-wE-kp4"/>
44+
<outlet property="delegate" destination="-1" id="6Wd-Dn-MXI"/>
4545
</connections>
4646
</scrollView>
47-
<pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="tEc-0p-Shp">
47+
<pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="o0L-Wx-SQW">
4848
<rect key="frame" x="130.5" y="263" width="39" height="37"/>
49-
<color key="pageIndicatorTintColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
50-
<color key="currentPageIndicatorTintColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
49+
<color key="pageIndicatorTintColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
50+
<color key="currentPageIndicatorTintColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
5151
</pageControl>
5252
</subviews>
53-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
53+
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
5454
<constraints>
55-
<constraint firstAttribute="bottom" secondItem="tV1-Fp-za6" secondAttribute="bottom" id="FSb-m4-wsU"/>
56-
<constraint firstItem="tV1-Fp-za6" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="I3g-MG-BeZ"/>
57-
<constraint firstItem="tV1-Fp-za6" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Lad-Mr-u3g"/>
58-
<constraint firstItem="MGl-aQ-rbD" firstAttribute="bottom" secondItem="tEc-0p-Shp" secondAttribute="bottom" id="fF9-Bv-FD9"/>
59-
<constraint firstItem="tEc-0p-Shp" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="gsI-cX-soL"/>
60-
<constraint firstAttribute="trailing" secondItem="tV1-Fp-za6" secondAttribute="trailing" id="mBh-ux-H7D"/>
55+
<constraint firstItem="o0L-Wx-SQW" firstAttribute="centerX" secondItem="SLm-Ad-Ozf" secondAttribute="centerX" id="03H-Mx-8kp"/>
56+
<constraint firstItem="cfe-NM-yK0" firstAttribute="leading" secondItem="SLm-Ad-Ozf" secondAttribute="leading" id="0oL-kX-eSO"/>
57+
<constraint firstItem="FAS-h3-Suk" firstAttribute="bottom" secondItem="o0L-Wx-SQW" secondAttribute="bottom" id="2Is-eB-BW6"/>
58+
<constraint firstAttribute="bottom" secondItem="cfe-NM-yK0" secondAttribute="bottom" id="6d1-Z7-nDa"/>
59+
<constraint firstItem="cfe-NM-yK0" firstAttribute="top" secondItem="SLm-Ad-Ozf" secondAttribute="top" id="6dY-h2-XId"/>
60+
<constraint firstAttribute="trailing" secondItem="cfe-NM-yK0" secondAttribute="trailing" id="kdQ-fh-sbc"/>
6161
</constraints>
6262
<nil key="simulatedTopBarMetrics"/>
6363
<nil key="simulatedBottomBarMetrics"/>
6464
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
65-
<viewLayoutGuide key="safeArea" id="MGl-aQ-rbD"/>
65+
<viewLayoutGuide key="safeArea" id="FAS-h3-Suk"/>
6666
<point key="canvasLocation" x="137.68115942028987" y="133.92857142857142"/>
6767
</view>
6868
</objects>

‎Framework/SoftUI/Controls/Cards/Templates/SoftCardItem.xib‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,78 +10,81 @@
1010
<objects>
1111
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SoftCardItem" customModule="SoftUI" customModuleProvider="target">
1212
<connections>
13-
<outlet property="actionButton" destination="5hB-cc-11p" id="Llk-s6-ygJ"/>
14-
<outlet property="descLabel" destination="cgo-Ar-Ae7" id="WXU-Ay-SpO"/>
15-
<outlet property="imageView" destination="tKj-RJ-f0v" id="jPn-rI-Ovc"/>
16-
<outlet property="titleLabel" destination="bSN-Lp-dtM" id="DRB-MI-gO4"/>
13+
<outlet property="actionButton" destination="jtF-gd-lsh" id="puN-PF-5Dg"/>
14+
<outlet property="descLabel" destination="OiS-l6-cC6" id="rjl-WR-BRS"/>
15+
<outlet property="imageView" destination="eZl-JY-f62" id="fiz-wM-Xih"/>
16+
<outlet property="titleLabel" destination="Tkc-mS-tr4" id="ywA-Rh-TPN"/>
1717
</connections>
1818
</placeholder>
1919
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
20-
<view contentMode="scaleToFill" id="ufq-dr-bV7">
20+
<view contentMode="scaleToFill" id="7ki-yg-9en">
2121
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
2222
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2323
<subviews>
24-
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="DMT-HA-Duj">
24+
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="AZO-8D-AUc">
2525
<rect key="frame" x="20" y="20" width="260" height="260"/>
2626
<subviews>
27-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tKj-RJ-f0v">
28-
<rect key="frame" x="105" y="0.0" width="50" height="100"/>
27+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eZl-JY-f62">
28+
<rect key="frame" x="105" y="0.0" width="50" height="130"/>
2929
<constraints>
30-
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="1EO-KC-mRd"/>
30+
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="130" id="MtM-zN-Puo"/>
31+
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="TOi-oo-Yls"/>
3132
</constraints>
3233
</imageView>
33-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bSN-Lp-dtM">
34-
<rect key="frame" x="110" y="120" width="40.5" height="24"/>
34+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tkc-mS-tr4">
35+
<rect key="frame" x="110" y="140" width="40.5" height="24"/>
3536
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
3637
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3738
<nil key="highlightedColor"/>
3839
</label>
39-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cgo-Ar-Ae7">
40-
<rect key="frame" x="1.5" y="164" width="257" height="44"/>
40+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OiS-l6-cC6">
41+
<rect key="frame" x="1.5" y="174" width="257" height="44"/>
4142
<string key="text">DescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescriptionDescription</string>
4243
<fontDescription key="fontDescription" type="system" pointSize="15"/>
4344
<color key="textColor" white="0.0" alpha="0.5" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
4445
<nil key="highlightedColor"/>
4546
</label>
46-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5hB-cc-11p">
47+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jtF-gd-lsh">
4748
<rect key="frame" x="70" y="228" width="120" height="32"/>
4849
<color key="backgroundColor" red="0.1058823529" green="0.45882352939999999" blue="0.73333333329999995" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
4950
<constraints>
50-
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="AKR-hn-H3L"/>
51-
<constraint firstAttribute="height" constant="32" id="vRg-td-aM7"/>
51+
<constraint firstAttribute="height" constant="32" id="QMw-y2-9k0"/>
52+
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="kyk-DE-Sid"/>
5253
</constraints>
5354
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
5455
<inset key="contentEdgeInsets" minX="20" minY="0.0" maxX="20" maxY="0.0"/>
5556
<state key="normal" title="Button">
5657
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
5758
</state>
5859
<userDefinedRuntimeAttributes>
60+
<userDefinedRuntimeAttribute type="boolean" keyPath="useSoftUI" value="YES"/>
5961
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
6062
<real key="value" value="8"/>
6163
</userDefinedRuntimeAttribute>
62-
<userDefinedRuntimeAttribute type="boolean" keyPath="useSoftUI" value="YES"/>
64+
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
6365
</userDefinedRuntimeAttributes>
6466
<connections>
65-
<action selector="onActionButtonTap:" destination="-1" eventType="touchUpInside" id="Jlu-Dn-oVv"/>
67+
<action selector="onActionButtonTap:" destination="-1" eventType="touchUpInside" id="Pyi-C4-nkv"/>
6668
</connections>
6769
</button>
6870
</subviews>
71+
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
6972
<constraints>
70-
<constraint firstItem="cgo-Ar-Ae7" firstAttribute="top" secondItem="bSN-Lp-dtM" secondAttribute="bottom" constant="20" id="GhI-KW-Zvy"/>
71-
<constraint firstItem="5hB-cc-11p" firstAttribute="top" secondItem="cgo-Ar-Ae7" secondAttribute="bottom" constant="20" id="Q2D-e5-fGx"/>
72-
<constraint firstItem="bSN-Lp-dtM" firstAttribute="top" secondItem="tKj-RJ-f0v" secondAttribute="bottom" constant="20" id="TZb-N1-pPK"/>
73+
<constraint firstItem="jtF-gd-lsh" firstAttribute="top" secondItem="OiS-l6-cC6" secondAttribute="bottom" constant="10" id="K9q-NU-LXe"/>
74+
<constraint firstItem="OiS-l6-cC6" firstAttribute="top" secondItem="Tkc-mS-tr4" secondAttribute="bottom" constant="10" id="Tm9-9Z-UVe"/>
75+
<constraint firstItem="Tkc-mS-tr4" firstAttribute="top" secondItem="eZl-JY-f62" secondAttribute="bottom" constant="10" id="zwE-Jb-Tpu"/>
7376
</constraints>
7477
</stackView>
7578
</subviews>
7679
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
7780
<constraints>
78-
<constraint firstItem="DMT-HA-Duj" firstAttribute="leading" secondItem="ufq-dr-bV7" secondAttribute="leading" constant="20" id="MYc-tl-tZh"/>
79-
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="DMT-HA-Duj" secondAttribute="bottom" constant="20" id="Z3d-ai-WCg"/>
80-
<constraint firstItem="DMT-HA-Duj" firstAttribute="top" secondItem="ufq-dr-bV7" secondAttribute="top" constant="20" id="egb-NE-MOs"/>
81-
<constraint firstAttribute="trailing" secondItem="DMT-HA-Duj" secondAttribute="trailing" constant="20" id="irt-oH-5dQ"/>
81+
<constraint firstAttribute="trailing" secondItem="AZO-8D-AUc" secondAttribute="trailing" constant="20" id="lLc-LQ-A2b"/>
82+
<constraint firstItem="AZO-8D-AUc" firstAttribute="leading" secondItem="7ki-yg-9en" secondAttribute="leading" constant="20" id="ogs-I8-0RZ"/>
83+
<constraint firstItem="AZO-8D-AUc" firstAttribute="top" secondItem="7ki-yg-9en" secondAttribute="top" constant="20" id="t3v-MA-xuT"/>
84+
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="AZO-8D-AUc" secondAttribute="bottom" constant="20" id="xy1-iR-dzG"/>
8285
</constraints>
8386
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
84-
<viewLayoutGuide key="safeArea" id="0Xl-bQ-Qth"/>
87+
<viewLayoutGuide key="safeArea" id="hzm-hp-GJb"/>
8588
<point key="canvasLocation" x="139" y="141"/>
8689
</view>
8790
</objects>

‎SoftUI.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.swift_versions = '5.0'
44
s.name = 'SoftUI'
5-
s.version = '0.0.4'
5+
s.version = '0.0.5'
66
s.summary = 'Neumorphism design pattern implementation for macOS/iOS/watchOS/tvOS'
77
s.homepage = 'https://github.com/hellc/SoftUI'
88
s.license = 'MIT'

0 commit comments

Comments
 (0)