Reconcile with 6.1.6-ios branch.

This commit is contained in:
Brent Simmons
2025-01-03 13:16:49 -08:00
parent 62ad4d6e3b
commit ed3cf35dbf
23 changed files with 303 additions and 439 deletions

View File

@@ -9,7 +9,7 @@
import UIKit
protocol MainFeedTableViewSectionHeaderDelegate {
func feedTableViewSectionHeaderDisclosureDidToggle(_ sender: MainFeedTableViewSectionHeader)
func mainFeedTableViewSectionHeaderDisclosureDidToggle(_ sender: MainFeedTableViewSectionHeader)
}
class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
@@ -135,7 +135,7 @@ class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
private extension MainFeedTableViewSectionHeader {
@objc func toggleDisclosure() {
delegate?.feedTableViewSectionHeaderDisclosureDidToggle(self)
delegate?.mainFeedTableViewSectionHeaderDisclosureDidToggle(self)
}
func commonInit() {
@@ -191,10 +191,15 @@ private extension MainFeedTableViewSectionHeader {
titleView.setFrameIfNotEqual(layout.titleRect)
unreadCountView.setFrameIfNotEqual(layout.unreadCountRect)
disclosureButton.setFrameIfNotEqual(layout.disclosureButtonRect)
let top = CGRect(x: safeAreaInsets.left, y: 0, width: frame.width - safeAreaInsets.right - safeAreaInsets.left, height: 0.33)
let x = -safeAreaInsets.left
let width = safeAreaInsets.left + safeAreaInsets.right + frame.width
let height = 0.33
let top = CGRect(x: x, y: 0, width: width, height: height)
topSeparatorView.setFrameIfNotEqual(top)
let bottom = CGRect(x: safeAreaInsets.left, y: frame.height - 0.33, width: frame.width - safeAreaInsets.right - safeAreaInsets.left, height: 0.33)
let bottom = CGRect(x: x, y: frame.height - height, width: width, height: height)
bottomSeparatorView.setFrameIfNotEqual(bottom)
}