Remove redundant NoteBlockHeaderTableViewCell.xib file

wordpress-mobile · May 16, 2024 · 1d6b5eb · 1d6b5eb
1 parent af5ba03
commit 1d6b5eb
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 51 deletions.
diff --git a/WordPress/Classes/ViewRelated/Likes/LikesListController.swift b/WordPress/Classes/ViewRelated/Likes/LikesListController.swift
@@ -357,7 +357,7 @@ extension LikesListController: UITableViewDataSource, UITableViewDelegate {
 private extension LikesListController {
 
     func headerCell() -> NoteBlockHeaderTableViewCell {
-        guard let cell = tableView.dequeueReusableCell(withIdentifier: NoteBlockHeaderTableViewCell.reuseIdentifier()) as? NoteBlockHeaderTableViewCell,
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: NoteBlockHeaderTableViewCell.defaultReuseID) as? NoteBlockHeaderTableViewCell,
               let group = notification?.headerAndBodyContentGroups[Constants.headerRowIndex] else {
             DDLogError("Error: couldn't get a header cell or FormattableContentGroup.")
             return NoteBlockHeaderTableViewCell()

diff --git a/...ess/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.swift b/...ess/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.swift
@@ -368,7 +368,6 @@ extension NotificationDetailsViewController {
 
     func setupTableViewCells() {
         let cellClassNames: [NoteBlockTableViewCell.Type] = [
-            NoteBlockHeaderTableViewCell.self,
             NoteBlockTextTableViewCell.self,
             NoteBlockActionsTableViewCell.self,
             NoteBlockCommentTableViewCell.self,
@@ -385,6 +384,8 @@ extension NotificationDetailsViewController {
 
         tableView.register(LikeUserTableViewCell.self,
                            forCellReuseIdentifier: LikeUserTableViewCell.defaultReuseID)
+        tableView.register(NoteBlockHeaderTableViewCell.self,
+                           forCellReuseIdentifier: NoteBlockHeaderTableViewCell.defaultReuseID)
         tableView.register(NoteBlockUserTableViewCell.self,
                            forCellReuseIdentifier: NoteBlockUserTableViewCell.defaultReuseID)
     }
@@ -557,7 +558,7 @@ private extension NotificationDetailsViewController {
     func reuseIdentifierForGroup(_ blockGroup: FormattableContentGroup) -> String {
         switch blockGroup.kind {
         case .header:
-            return NoteBlockHeaderTableViewCell.reuseIdentifier()
+            return NoteBlockHeaderTableViewCell.defaultReuseID
         case .footer:
             return NoteBlockTextTableViewCell.reuseIdentifier()
         case .subject:

diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift
@@ -7,22 +7,12 @@ import DesignSystem
 
 // MARK: - NoteBlockHeaderTableViewCell
 //
-class NoteBlockHeaderTableViewCell: NoteBlockTableViewCell {
+class NoteBlockHeaderTableViewCell: NoteBlockTableViewCell, Reusable {
     typealias Constants = ContentPreview.Constants
     typealias Avatar = ContentPreview.ImageConfiguration.Avatar
 
     private var controller: UIHostingController<HeaderView>?
 
-    init() {
-        super.init(style: .default, reuseIdentifier: NoteBlockHeaderTableViewCell.classNameWithoutNamespaces())
-        shouldSetSeparators = false
-    }
-
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        shouldSetSeparators = false
-    }
-
     func configure(post: String, action: @escaping () -> Void, parent: UIViewController) {
         let content = ContentPreview(text: post, action: action)
         host(HeaderView(preview: content), parent: parent)

diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.xib b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.xib
diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockTableViewCell.swift
@@ -41,8 +41,6 @@ class NoteBlockTableViewCell: WPTableViewCell {
         return view
     }()
 
-    @objc var shouldSetSeparators: Bool = true
-
     // MARK: - Overridden Methods
 
     override func layoutSubviews() {
@@ -52,10 +50,8 @@ class NoteBlockTableViewCell: WPTableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        if shouldSetSeparators {
-            backgroundView = separatorsView
-            backgroundColor = .listForeground
-        }
+        backgroundView = separatorsView
+        backgroundColor = .listForeground
     }
 
     // MARK: - Public API

diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -2957,7 +2957,6 @@
 		B5BEA5601C7CE6D700C8035B /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 292CECFF1027259000BD407D /* SFHFKeychainUtils.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		B5C0CF3D204DA41000DB0362 /* NotificationReplyStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C0CF3C204DA41000DB0362 /* NotificationReplyStore.swift */; };
 		B5C0CF3F204DB92F00DB0362 /* NotificationReplyStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C0CF3E204DB92F00DB0362 /* NotificationReplyStoreTests.swift */; };
-		B5C66B701ACF06CA00F68370 /* NoteBlockHeaderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5C66B6F1ACF06CA00F68370 /* NoteBlockHeaderTableViewCell.xib */; };
 		B5C66B721ACF071100F68370 /* NoteBlockTextTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5C66B711ACF071000F68370 /* NoteBlockTextTableViewCell.xib */; };
 		B5C66B741ACF071F00F68370 /* NoteBlockActionsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5C66B731ACF071F00F68370 /* NoteBlockActionsTableViewCell.xib */; };
 		B5C66B761ACF072C00F68370 /* NoteBlockCommentTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5C66B751ACF072C00F68370 /* NoteBlockCommentTableViewCell.xib */; };
@@ -4184,7 +4183,6 @@
 		FABB1FB32602FC2C00C8785C /* NoteBlockActionsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5C66B731ACF071F00F68370 /* NoteBlockActionsTableViewCell.xib */; };
 		FABB1FB42602FC2C00C8785C /* Pacifico-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F5A34D0B25DF2F7700C9654B /* Pacifico-Regular.ttf */; };
 		FABB1FB92602FC2C00C8785C /* RestoreStatusFailedView.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA1CEAD325CA9C40005E7038 /* RestoreStatusFailedView.xib */; };
-		FABB1FBA2602FC2C00C8785C /* NoteBlockHeaderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5C66B6F1ACF06CA00F68370 /* NoteBlockHeaderTableViewCell.xib */; };
 		FABB1FBB2602FC2C00C8785C /* CollapsableHeaderCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 469CE07024BCFB04003BDC8B /* CollapsableHeaderCollectionViewCell.xib */; };
 		FABB1FBF2602FC2C00C8785C /* WPTableViewActivityCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5D6C4AF51B603CA3005E3C43 /* WPTableViewActivityCell.xib */; };
 		FABB1FC12602FC2C00C8785C /* defaultPostTemplate.html in Resources */ = {isa = PBXBuildFile; fileRef = A01C55470E25E0D000D411F2 /* defaultPostTemplate.html */; };
@@ -8377,7 +8375,6 @@
 		B5B68BD31C19AAED00EB59E0 /* InteractiveNotificationsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InteractiveNotificationsManager.swift; sourceTree = "<group>"; };
 		B5C0CF3C204DA41000DB0362 /* NotificationReplyStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationReplyStore.swift; sourceTree = "<group>"; };
 		B5C0CF3E204DB92F00DB0362 /* NotificationReplyStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationReplyStoreTests.swift; sourceTree = "<group>"; };
-		B5C66B6F1ACF06CA00F68370 /* NoteBlockHeaderTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NoteBlockHeaderTableViewCell.xib; sourceTree = "<group>"; };
 		B5C66B711ACF071000F68370 /* NoteBlockTextTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NoteBlockTextTableViewCell.xib; sourceTree = "<group>"; };
 		B5C66B731ACF071F00F68370 /* NoteBlockActionsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NoteBlockActionsTableViewCell.xib; sourceTree = "<group>"; };
 		B5C66B751ACF072C00F68370 /* NoteBlockCommentTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NoteBlockCommentTableViewCell.xib; sourceTree = "<group>"; };
@@ -16098,7 +16095,6 @@
 				B532D4E5199D4357006E4DF6 /* NoteBlockCommentTableViewCell.swift */,
 				B5C66B751ACF072C00F68370 /* NoteBlockCommentTableViewCell.xib */,
 				B532D4E6199D4357006E4DF6 /* NoteBlockHeaderTableViewCell.swift */,
-				B5C66B6F1ACF06CA00F68370 /* NoteBlockHeaderTableViewCell.xib */,
 				B532D4ED199D4418006E4DF6 /* NoteBlockImageTableViewCell.swift */,
 				B5C66B771ACF073900F68370 /* NoteBlockImageTableViewCell.xib */,
 				B532D4E7199D4357006E4DF6 /* NoteBlockTableViewCell.swift */,
@@ -19688,7 +19684,6 @@
 				F5A34D1125DF2F7F00C9654B /* Pacifico-Regular.ttf in Resources */,
 				FA1CEAD425CA9C40005E7038 /* RestoreStatusFailedView.xib in Resources */,
 				1761F17B26209AEE000815EF /* open-source-icon-app-60x60@2x.png in Resources */,
-				B5C66B701ACF06CA00F68370 /* NoteBlockHeaderTableViewCell.xib in Resources */,
 				1761F18126209AEE000815EF /* jetpack-green-icon-app-60x60@2x.png in Resources */,
 				801D9513291AB3CF0051993E /* JetpackStatsLogoAnimation_rtl.json in Resources */,
 				17222DA2261DDDF90047B163 /* pink-classic-icon-app-60x60@3x.png in Resources */,
@@ -20228,7 +20223,6 @@
 				FABB286C2603086900C8785C /* AppImages.xcassets in Resources */,
 				F46597C828E668B900D5F49A /* neumorphic-light-icon-app-60@3x.png in Resources */,
 				FABB1FB92602FC2C00C8785C /* RestoreStatusFailedView.xib in Resources */,
-				FABB1FBA2602FC2C00C8785C /* NoteBlockHeaderTableViewCell.xib in Resources */,
 				FABB1FBB2602FC2C00C8785C /* CollapsableHeaderCollectionViewCell.xib in Resources */,
 				FE43DAB226DFAD1C00CFF595 /* CommentContentTableViewCell.xib in Resources */,
 				C7234A452832C2BA0045C63F /* QRLoginScanningViewController.xib in Resources */,