fix: separator line display issue. resolve #123

Mastodon/Scene/Notification/NotificationViewController.swift

@@ -28,14 +28,14 @@ final class NotificationViewController: UIViewController, NeedsDependency {
 
     let tableView: UITableView = {
         let tableView = ControlContainableTableView()
-        tableView.rowHeight = UITableView.automaticDimension
-        tableView.separatorStyle = .singleLine
         tableView.separatorInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
         tableView.register(NotificationTableViewCell.self, forCellReuseIdentifier: String(describing: NotificationTableViewCell.self))
         tableView.register(NotificationStatusTableViewCell.self, forCellReuseIdentifier: String(describing: NotificationStatusTableViewCell.self))
         tableView.register(TimelineBottomLoaderTableViewCell.self, forCellReuseIdentifier: String(describing: TimelineBottomLoaderTableViewCell.self))
-        tableView.tableFooterView = UIView()
+        tableView.rowHeight = UITableView.automaticDimension
         tableView.estimatedRowHeight = UITableView.automaticDimension
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView()
         tableView.backgroundColor = .clear
         return tableView
     }()

Mastodon/Scene/Notification/TableViewCell/NotificationStatusTableViewCell.swift

@@ -76,6 +76,14 @@ final class NotificationStatusTableViewCell: UITableViewCell, StatusCell {
     
     let statusView = StatusView()
     
+    let separatorLine = UIView.separatorLine
+        
+    var separatorLineToEdgeLeadingLayoutConstraint: NSLayoutConstraint!
+    var separatorLineToEdgeTrailingLayoutConstraint: NSLayoutConstraint!
+    
+    var separatorLineToMarginLeadingLayoutConstraint: NSLayoutConstraint!
+    var separatorLineToMarginTrailingLayoutConstraint: NSLayoutConstraint!
+    
     override func prepareForReuse() {
         super.prepareForReuse()
         avatatImageView.af.cancelImageRequest()
@@ -197,6 +205,18 @@ extension NotificationStatusTableViewCell {
 
         containerStackView.addArrangedSubview(statusStackView)
         
+        separatorLine.translatesAutoresizingMaskIntoConstraints = false
+        contentView.addSubview(separatorLine)
+        separatorLineToEdgeLeadingLayoutConstraint = separatorLine.leadingAnchor.constraint(equalTo: contentView.leadingAnchor)
+        separatorLineToEdgeTrailingLayoutConstraint = separatorLine.trailingAnchor.constraint(equalTo: contentView.trailingAnchor)
+        separatorLineToMarginLeadingLayoutConstraint = separatorLine.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor)
+        separatorLineToMarginTrailingLayoutConstraint = separatorLine.trailingAnchor.constraint(equalTo: contentView.readableContentGuide.trailingAnchor)
+        NSLayoutConstraint.activate([
+            separatorLine.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
+            separatorLine.heightAnchor.constraint(equalToConstant: UIView.separatorLineHeight(of: contentView)),
+        ])
+        resetSeparatorLineLayout()
+        
         // remove item don't display
         statusView.actionToolbarContainer.removeFromStackView()
         // it affect stackView's height,need remove
@@ -206,6 +226,8 @@ extension NotificationStatusTableViewCell {
 
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
+        
+        resetSeparatorLineLayout()
         statusBorder.layer.borderColor = Asset.Colors.Border.notification.color.cgColor
         actionImageBackground.layer.borderColor = Asset.Colors.Background.systemBackground.color.cgColor
     }
@@ -258,5 +280,37 @@ extension NotificationStatusTableViewCell: StatusViewDelegate {
         // do nothing
     }
     
+}
+
+extension NotificationStatusTableViewCell {
+    
+    private func resetSeparatorLineLayout() {
+        separatorLineToEdgeLeadingLayoutConstraint.isActive = false
+        separatorLineToEdgeTrailingLayoutConstraint.isActive = false
+        separatorLineToMarginLeadingLayoutConstraint.isActive = false
+        separatorLineToMarginTrailingLayoutConstraint.isActive = false
+        
+        if traitCollection.userInterfaceIdiom == .phone {
+            // to edge
+            NSLayoutConstraint.activate([
+                separatorLineToEdgeLeadingLayoutConstraint,
+                separatorLineToEdgeTrailingLayoutConstraint,
+            ])
+        } else {
+            if traitCollection.horizontalSizeClass == .compact {
+                // to edge
+                NSLayoutConstraint.activate([
+                    separatorLineToEdgeLeadingLayoutConstraint,
+                    separatorLineToEdgeTrailingLayoutConstraint,
+                ])
+            } else {
+                // to margin
+                NSLayoutConstraint.activate([
+                    separatorLineToMarginLeadingLayoutConstraint,
+                    separatorLineToMarginTrailingLayoutConstraint,
+                ])
+            }
+        }
+    }
     
 }

Mastodon/Scene/Notification/TableViewCell/NotificationTableViewCell.swift

@@ -98,6 +98,14 @@ final class NotificationTableViewCell: UITableViewCell {
     
     let buttonStackView = UIStackView()
     
+    let separatorLine = UIView.separatorLine
+    
+    var separatorLineToEdgeLeadingLayoutConstraint: NSLayoutConstraint!
+    var separatorLineToEdgeTrailingLayoutConstraint: NSLayoutConstraint!
+    
+    var separatorLineToMarginLeadingLayoutConstraint: NSLayoutConstraint!
+    var separatorLineToMarginTrailingLayoutConstraint: NSLayoutConstraint!
+    
     override func prepareForReuse() {
         super.prepareForReuse()
         avatatImageView.af.cancelImageRequest()
@@ -187,10 +195,57 @@ extension NotificationTableViewCell {
         buttonStackView.addArrangedSubview(acceptButton)
         buttonStackView.addArrangedSubview(rejectButton)
         containerStackView.addArrangedSubview(buttonStackView)
+        
+        separatorLine.translatesAutoresizingMaskIntoConstraints = false
+        contentView.addSubview(separatorLine)
+        separatorLineToEdgeLeadingLayoutConstraint = separatorLine.leadingAnchor.constraint(equalTo: contentView.leadingAnchor)
+        separatorLineToEdgeTrailingLayoutConstraint = separatorLine.trailingAnchor.constraint(equalTo: contentView.trailingAnchor)
+        separatorLineToMarginLeadingLayoutConstraint = separatorLine.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor)
+        separatorLineToMarginTrailingLayoutConstraint = separatorLine.trailingAnchor.constraint(equalTo: contentView.readableContentGuide.trailingAnchor)
+        NSLayoutConstraint.activate([
+            separatorLine.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
+            separatorLine.heightAnchor.constraint(equalToConstant: UIView.separatorLineHeight(of: contentView)),
+        ])
+        resetSeparatorLineLayout()
     }
     
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
+        
         actionImageBackground.layer.borderColor = Asset.Colors.Background.systemBackground.color.cgColor
+        resetSeparatorLineLayout()
     }
 }
+
+extension NotificationTableViewCell {
+    
+    private func resetSeparatorLineLayout() {
+        separatorLineToEdgeLeadingLayoutConstraint.isActive = false
+        separatorLineToEdgeTrailingLayoutConstraint.isActive = false
+        separatorLineToMarginLeadingLayoutConstraint.isActive = false
+        separatorLineToMarginTrailingLayoutConstraint.isActive = false
+        
+        if traitCollection.userInterfaceIdiom == .phone {
+            // to edge
+            NSLayoutConstraint.activate([
+                separatorLineToEdgeLeadingLayoutConstraint,
+                separatorLineToEdgeTrailingLayoutConstraint,
+            ])
+        } else {
+            if traitCollection.horizontalSizeClass == .compact {
+                // to edge
+                NSLayoutConstraint.activate([
+                    separatorLineToEdgeLeadingLayoutConstraint,
+                    separatorLineToEdgeTrailingLayoutConstraint,
+                ])
+            } else {
+                // to margin
+                NSLayoutConstraint.activate([
+                    separatorLineToMarginLeadingLayoutConstraint,
+                    separatorLineToMarginTrailingLayoutConstraint,
+                ])
+            }
+        }
+    }
+    
+}