Skip to content

Commit 2da9316

Browse files
committed
Adjust XIB
1 parent 9b3d2ea commit 2da9316

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

WooCommerce/Classes/ViewRelated/BottomSheet/ListSelector/BottomSheetListSelectorSectionHeaderView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private extension BottomSheetListSelectorSectionHeaderView {
2626
}
2727

2828
func configureTitle() {
29-
title.applyTitleStyle()
29+
title.applyHeadlineStyle()
3030
title.textColor = .systemColor(.label)
3131
}
3232

WooCommerce/Classes/ViewRelated/BottomSheet/ListSelector/BottomSheetListSelectorSectionHeaderView.xib

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1717
<subviews>
1818
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yNN-dG-kuA">
19-
<rect key="frame" x="16" y="23" width="42" height="21"/>
19+
<rect key="frame" x="16" y="27" width="382" height="21"/>
2020
<fontDescription key="fontDescription" type="system" pointSize="17"/>
2121
<nil key="textColor"/>
2222
<nil key="highlightedColor"/>
@@ -34,14 +34,15 @@
3434
<constraint firstItem="MUy-0K-UzK" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="GnY-De-657"/>
3535
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="MUy-0K-UzK" secondAttribute="trailing" priority="999" constant="16" id="MnQ-Ob-Wp4"/>
3636
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="MUy-0K-UzK" secondAttribute="bottom" constant="12" id="WDE-us-ZdJ"/>
37-
<constraint firstItem="MUy-0K-UzK" firstAttribute="top" secondItem="yNN-dG-kuA" secondAttribute="bottom" constant="16" id="nHE-te-rHP"/>
37+
<constraint firstItem="MUy-0K-UzK" firstAttribute="top" secondItem="yNN-dG-kuA" secondAttribute="bottom" constant="12" id="nHE-te-rHP"/>
3838
<constraint firstItem="MUy-0K-UzK" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="12" id="nmY-jt-bfb"/>
39+
<constraint firstItem="yNN-dG-kuA" firstAttribute="trailing" secondItem="MUy-0K-UzK" secondAttribute="trailing" id="o6t-QX-No4"/>
3940
<constraint firstItem="yNN-dG-kuA" firstAttribute="leading" secondItem="MUy-0K-UzK" secondAttribute="leading" id="wb7-Ze-GOP"/>
4041
</constraints>
4142
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
4243
<connections>
43-
<outlet property="subtitle" destination="yNN-dG-kuA" id="ztZ-PR-aGH"/>
44-
<outlet property="title" destination="MUy-0K-UzK" id="Par-ou-0ia"/>
44+
<outlet property="subtitle" destination="MUy-0K-UzK" id="L6u-fg-l9X"/>
45+
<outlet property="title" destination="yNN-dG-kuA" id="hOy-NU-gAA"/>
4546
</connections>
4647
<point key="canvasLocation" x="139" y="109"/>
4748
</view>

WooCommerce/Classes/ViewRelated/BottomSheet/ListSelector/BottomSheetListSelectorViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ UIViewController, UITableViewDataSource, UITableViewDelegate where Command.Model
8686
}
8787

8888
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
89-
guard viewProperties.title != nil else {
89+
guard viewProperties.title != nil || viewProperties.subtitle != nil else {
9090
return nil
9191
}
9292
guard let header = tableView.dequeueReusableHeaderFooterView(withIdentifier: BottomSheetListSelectorSectionHeaderView.reuseIdentifier)
@@ -111,7 +111,7 @@ private extension BottomSheetListSelectorViewController {
111111
tableView.dataSource = self
112112

113113
tableView.rowHeight = UITableView.automaticDimension
114-
tableView.estimatedSectionHeaderHeight = viewProperties.title != nil ? estimatedSectionHeight : .zero
114+
tableView.estimatedSectionHeaderHeight = (viewProperties.title != nil || viewProperties.subtitle != nil) ? estimatedSectionHeight : .zero
115115
tableView.sectionHeaderHeight = UITableView.automaticDimension
116116

117117
tableView.backgroundColor = .listForeground

0 commit comments

Comments
 (0)