From 0b0eef0696d5aed0ca55d7ae86bdb2373a28b158 Mon Sep 17 00:00:00 2001
From: Stuar Breckenridge <stuart.breckenridge@icloud.com>
Date: Sun, 22 Jun 2025 13:37:40 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=92=84=20Modernise=20Sidebar"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unwind previous commit

This reverts commit 14384e6ad5cd805041f3edf8e27f64a9f54ba556.
---
 .../Cell/MainFeedTableViewSectionHeader.swift | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift b/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift
index eefff6f09..d113dc0b8 100644
--- a/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift
+++ b/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift
@@ -95,6 +95,17 @@ class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 		return button
 	}()
 
+	private let topSeparatorView: UIView = {
+		let view = UIView()
+		view.backgroundColor = UIColor.separator
+		return view
+	}()
+	
+	private let bottomSeparatorView: UIView = {
+		let view = UIView()
+		view.backgroundColor = UIColor.separator
+		return view
+	}()
 	
 	override init(reuseIdentifier: String?) {
 		super.init(reuseIdentifier: reuseIdentifier)
@@ -134,9 +145,15 @@ private extension MainFeedTableViewSectionHeader {
 		addSubviewAtInit(titleView)
 		addSubviewAtInit(disclosureButton)
 		updateExpandedState(animate: false)
+		addBackgroundView()
+		addSubviewAtInit(topSeparatorView)
+		addSubviewAtInit(bottomSeparatorView)
 	}
 	
 	func updateExpandedState(animate: Bool) {
+		if !isLastSection && self.disclosureExpanded {
+			self.bottomSeparatorView.isHidden = false
+		}
 		
 		let duration = animate ? 0.3 : 0.0
 		
@@ -149,6 +166,9 @@ private extension MainFeedTableViewSectionHeader {
 					self.disclosureButton.transform = CGAffineTransform(rotationAngle: 0)
 				}
 			}, completion: { _ in
+				if !self.isLastSection && !self.disclosureExpanded {
+					self.bottomSeparatorView.isHidden = true
+				}
 			})
 	}
 	
@@ -173,6 +193,21 @@ private extension MainFeedTableViewSectionHeader {
 		titleView.setFrameIfNotEqual(layout.titleRect)
 		unreadCountView.setFrameIfNotEqual(layout.unreadCountRect)
 		disclosureButton.setFrameIfNotEqual(layout.disclosureButtonRect)
+
+		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: x, y: frame.height - height, width: width, height: height)
+		bottomSeparatorView.setFrameIfNotEqual(bottom)
+	}
+	
+	func addBackgroundView() {
+		self.backgroundView = UIView(frame: self.bounds)
+		self.backgroundView?.backgroundColor = AppAssets.sectionHeaderColor
 	}
 	
 }