From 9522509f8fd486117ea51feffc467b9991f599a2 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Fri, 6 Sep 2019 17:45:49 -0400 Subject: [PATCH] Remove unnecessary XIBs --- Tusker.xcodeproj/project.pbxproj | 8 ------ .../AccountListTableViewController.swift | 4 +-- .../AccountListTableViewController.xib | 28 ------------------- ...ActionAccountListTableViewController.swift | 4 +-- ...usActionAccountListTableViewController.xib | 28 ------------------- 5 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 Tusker/Screens/Account List/AccountListTableViewController.xib delete mode 100644 Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.xib diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index c8cabdc1..4f578984 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -149,11 +149,9 @@ D6A3BC802321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7E2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift */; }; D6A3BC812321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC7F2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib */; }; D6A3BC852321F6C100FD64D5 /* AccountListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC832321F6C100FD64D5 /* AccountListTableViewController.swift */; }; - D6A3BC862321F6C100FD64D5 /* AccountListTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC842321F6C100FD64D5 /* AccountListTableViewController.xib */; }; D6A3BC8A2321F79B00FD64D5 /* AccountTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC882321F79B00FD64D5 /* AccountTableViewCell.swift */; }; D6A3BC8B2321F79B00FD64D5 /* AccountTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC892321F79B00FD64D5 /* AccountTableViewCell.xib */; }; D6A3BC8F2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC8D2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift */; }; - D6A3BC902321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC8E2321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib */; }; D6A5FAF1217B7E05003DB2D9 /* ComposeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */; }; D6A5FAFB217B86CE003DB2D9 /* OnboardingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A5FAFA217B86CE003DB2D9 /* OnboardingViewController.xib */; }; D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */; }; @@ -396,11 +394,9 @@ D6A3BC7E2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowNotificationGroupTableViewCell.swift; sourceTree = ""; }; D6A3BC7F2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FollowNotificationGroupTableViewCell.xib; sourceTree = ""; }; D6A3BC832321F6C100FD64D5 /* AccountListTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountListTableViewController.swift; sourceTree = ""; }; - D6A3BC842321F6C100FD64D5 /* AccountListTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountListTableViewController.xib; sourceTree = ""; }; D6A3BC882321F79B00FD64D5 /* AccountTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTableViewCell.swift; sourceTree = ""; }; D6A3BC892321F79B00FD64D5 /* AccountTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountTableViewCell.xib; sourceTree = ""; }; D6A3BC8D2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActionAccountListTableViewController.swift; sourceTree = ""; }; - D6A3BC8E2321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StatusActionAccountListTableViewController.xib; sourceTree = ""; }; D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ComposeViewController.xib; sourceTree = ""; }; D6A5FAFA217B86CE003DB2D9 /* OnboardingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardingViewController.xib; sourceTree = ""; }; D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIActivity+Types.swift"; sourceTree = ""; }; @@ -959,7 +955,6 @@ isa = PBXGroup; children = ( D6A3BC832321F6C100FD64D5 /* AccountListTableViewController.swift */, - D6A3BC842321F6C100FD64D5 /* AccountListTableViewController.xib */, ); path = "Account List"; sourceTree = ""; @@ -977,7 +972,6 @@ isa = PBXGroup; children = ( D6A3BC8D2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift */, - D6A3BC8E2321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib */, ); path = "Status Action Account List"; sourceTree = ""; @@ -1380,7 +1374,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - D6A3BC862321F6C100FD64D5 /* AccountListTableViewController.xib in Resources */, D6A3BC8B2321F79B00FD64D5 /* AccountTableViewCell.xib in Resources */, D627FF7D217E958900CC0648 /* DraftTableViewCell.xib in Resources */, D6A3BC7D232195C600FD64D5 /* ActionNotificationGroupTableViewCell.xib in Resources */, @@ -1394,7 +1387,6 @@ D627FF79217E950100CC0648 /* DraftsTableViewController.xib in Resources */, D67C57B221E28FAD00C3118B /* ComposeStatusReplyView.xib in Resources */, 0411610122B442870030A9B7 /* AttachmentViewController.xib in Resources */, - D6A3BC902321FFB900FD64D5 /* StatusActionAccountListTableViewController.xib in Resources */, D6A3BC812321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib in Resources */, D60C07E421E8176B0057FAA8 /* ComposeMediaView.xib in Resources */, D667E5E12134937B0057A976 /* StatusTableViewCell.xib in Resources */, diff --git a/Tusker/Screens/Account List/AccountListTableViewController.swift b/Tusker/Screens/Account List/AccountListTableViewController.swift index 9892fb38..8635a017 100644 --- a/Tusker/Screens/Account List/AccountListTableViewController.swift +++ b/Tusker/Screens/Account List/AccountListTableViewController.swift @@ -8,7 +8,7 @@ import UIKit -class AccountListTableViewController: UITableViewController { +class AccountListTableViewController: EnhancedTableViewController { private let accountCell = "accountCell" @@ -17,7 +17,7 @@ class AccountListTableViewController: UITableViewController { init(accountIDs: [String]) { self.accountIDs = accountIDs - super.init(nibName: "AccountListTableViewController", bundle: .main) + super.init(style: .grouped) } required init?(coder: NSCoder) { diff --git a/Tusker/Screens/Account List/AccountListTableViewController.xib b/Tusker/Screens/Account List/AccountListTableViewController.xib deleted file mode 100644 index 73ce32eb..00000000 --- a/Tusker/Screens/Account List/AccountListTableViewController.xib +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.swift b/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.swift index b01d305b..c916a331 100644 --- a/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.swift +++ b/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.swift @@ -8,7 +8,7 @@ import UIKit -class StatusActionAccountListTableViewController: UITableViewController { +class StatusActionAccountListTableViewController: EnhancedTableViewController { private let statusCell = "statusCell" private let accountCell = "accountCell" @@ -20,7 +20,7 @@ class StatusActionAccountListTableViewController: UITableViewController { self.statusID = statusID self.accountIDs = accountIDs - super.init(nibName: "StatusActionAccountListTableViewController", bundle: .main) + super.init(style: .grouped) } required init?(coder: NSCoder) { diff --git a/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.xib b/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.xib deleted file mode 100644 index 49e9972e..00000000 --- a/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.xib +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -