Skip to content

Commit 6745476

Browse files
authored
Merge pull request #18377 from wordpress-mobile/task/17087-reaction_moderation_bar_spacing
Comment Details: add more space between reaction and moderation bars
2 parents b7ea99a + 98b49c4 commit 6745476

2 files changed

Lines changed: 21 additions & 6 deletions

File tree

WordPress/Classes/ViewRelated/Comments/CommentContentTableViewCell.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ class CommentContentTableViewCell: UITableViewCell, NibReusable {
118118

119119
// This is public so its delegate can be set directly.
120120
@IBOutlet private(set) weak var moderationBar: CommentModerationBar!
121+
@IBOutlet private weak var moderationBarView: UIView!
121122

122123
@IBOutlet private weak var highlightBarView: UIView!
123124

@@ -389,7 +390,7 @@ private extension CommentContentTableViewCell {
389390
}
390391

391392
func updateModerationBarVisibility() {
392-
moderationBar.isHidden = !isModerationEnabled || hidesModerationBar
393+
moderationBarView.isHidden = !isModerationEnabled || hidesModerationBar
393394
}
394395

395396
func updateContainerLeadingConstraint() {

WordPress/Classes/ViewRelated/Comments/CommentContentTableViewCell.xib

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
77
<capability name="Image references" minToolsVersion="12.0"/>
88
<capability name="Named colors" minToolsVersion="9.0"/>
99
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -166,11 +166,24 @@
166166
</view>
167167
</subviews>
168168
</stackView>
169-
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T1Z-LV-01Y" customClass="CommentModerationBar" customModule="WordPress" customModuleProvider="target">
170-
<rect key="frame" x="0.0" y="353" width="288" height="83"/>
169+
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LK0-LA-c0R" userLabel="Moderation Bar View">
170+
<rect key="frame" x="0.0" y="353" width="288" height="93"/>
171+
<subviews>
172+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T1Z-LV-01Y" customClass="CommentModerationBar" customModule="WordPress" customModuleProvider="target">
173+
<rect key="frame" x="0.0" y="10" width="288" height="83"/>
174+
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
175+
<constraints>
176+
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="83" id="qRm-Qi-IXu"/>
177+
</constraints>
178+
</view>
179+
</subviews>
171180
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
172181
<constraints>
173-
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="83" id="qRm-Qi-IXu"/>
182+
<constraint firstAttribute="trailing" secondItem="T1Z-LV-01Y" secondAttribute="trailing" id="5pw-Ri-Jfp"/>
183+
<constraint firstItem="T1Z-LV-01Y" firstAttribute="top" secondItem="LK0-LA-c0R" secondAttribute="top" constant="10" id="YQw-pq-YQg"/>
184+
<constraint firstItem="T1Z-LV-01Y" firstAttribute="leading" secondItem="LK0-LA-c0R" secondAttribute="leading" id="h1E-6A-mIn"/>
185+
<constraint firstAttribute="bottom" secondItem="T1Z-LV-01Y" secondAttribute="bottom" id="vnN-EZ-EwQ"/>
186+
<constraint firstAttribute="height" constant="93" placeholder="YES" id="wqW-2g-tUS"/>
174187
</constraints>
175188
</view>
176189
</subviews>
@@ -201,6 +214,7 @@
201214
<outlet property="highlightBarView" destination="mNJ-fg-sKO" id="fjf-gA-HoE"/>
202215
<outlet property="likeButton" destination="X2J-8b-R5F" id="6w2-io-GXb"/>
203216
<outlet property="moderationBar" destination="T1Z-LV-01Y" id="YUL-ft-QkO"/>
217+
<outlet property="moderationBarView" destination="LK0-LA-c0R" id="5mo-la-sEw"/>
204218
<outlet property="nameLabel" destination="HpE-B7-6wr" id="MLa-k9-IlC"/>
205219
<outlet property="replyButton" destination="VoI-YI-Qgc" id="Z9J-Tp-bur"/>
206220
</connections>

0 commit comments

Comments
 (0)