Skip to content

Commit 109249e

Browse files
authored
Merge pull request #4968 from woocommerce/issue/4333-ambiguous-constraint
[Mobile Payments] [Several Readers Found] Add top and bottom constraints to cells
2 parents 6966ca1 + 9fea606 commit 109249e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

WooCommerce/Classes/ViewRelated/ReusableViews/ActivitySpinnerAndLabelTableViewCell.xib

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</constraints>
2323
</activityIndicatorView>
2424
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RCi-ON-QWU">
25-
<rect key="frame" x="52" y="15" width="346" height="14.5"/>
25+
<rect key="frame" x="52" y="15" width="346" height="14"/>
2626
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
2727
<nil key="textColor"/>
2828
<nil key="highlightedColor"/>
@@ -31,7 +31,9 @@
3131
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3232
<constraints>
3333
<constraint firstItem="zyy-o9-EPH" firstAttribute="leading" secondItem="Qaq-rR-9Pm" secondAttribute="leading" constant="16" id="ALB-ix-29j"/>
34+
<constraint firstAttribute="bottom" secondItem="RCi-ON-QWU" secondAttribute="bottom" constant="15" id="G5b-pm-fUa"/>
3435
<constraint firstItem="zyy-o9-EPH" firstAttribute="centerY" secondItem="Qaq-rR-9Pm" secondAttribute="centerY" id="YIm-45-WDs"/>
36+
<constraint firstItem="RCi-ON-QWU" firstAttribute="top" secondItem="Qaq-rR-9Pm" secondAttribute="top" constant="15" id="Zup-29-caz"/>
3537
<constraint firstItem="RCi-ON-QWU" firstAttribute="leading" secondItem="zyy-o9-EPH" secondAttribute="trailing" constant="16" id="cce-a7-oH8"/>
3638
<constraint firstItem="RCi-ON-QWU" firstAttribute="centerY" secondItem="Qaq-rR-9Pm" secondAttribute="centerY" id="hZI-6i-3kM"/>
3739
<constraint firstAttribute="trailing" secondItem="RCi-ON-QWU" secondAttribute="trailing" constant="16" id="vXP-RA-5EA"/>

WooCommerce/Classes/ViewRelated/ReusableViews/LabelAndButtonTableViewCell.xib

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<autoresizingMask key="autoresizingMask"/>
1818
<subviews>
1919
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OhL-hX-qBu">
20-
<rect key="frame" x="16" y="15" width="31" height="14.5"/>
20+
<rect key="frame" x="16" y="15" width="31" height="14"/>
2121
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
2222
<nil key="textColor"/>
2323
<nil key="highlightedColor"/>
@@ -32,7 +32,9 @@
3232
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3333
<constraints>
3434
<constraint firstItem="OhL-hX-qBu" firstAttribute="leading" secondItem="nm8-P2-HxZ" secondAttribute="leading" constant="16" id="32z-8n-hEN"/>
35+
<constraint firstItem="OhL-hX-qBu" firstAttribute="top" secondItem="nm8-P2-HxZ" secondAttribute="top" constant="15" id="DLB-5E-lIY"/>
3536
<constraint firstAttribute="trailing" secondItem="NUH-Od-3Cg" secondAttribute="trailing" constant="16" id="Iby-g6-rYk"/>
37+
<constraint firstAttribute="bottom" secondItem="OhL-hX-qBu" secondAttribute="bottom" constant="15" id="NGj-xH-YOe"/>
3638
<constraint firstItem="NUH-Od-3Cg" firstAttribute="centerY" secondItem="nm8-P2-HxZ" secondAttribute="centerY" id="pX6-Nb-5k7"/>
3739
<constraint firstItem="OhL-hX-qBu" firstAttribute="centerY" secondItem="nm8-P2-HxZ" secondAttribute="centerY" id="xxB-it-osD"/>
3840
</constraints>

0 commit comments

Comments
 (0)