From bd3e74c6115aaf557865017a10129e37fde18ce3 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 17 Mar 2020 21:07:44 -0400 Subject: [PATCH] Remove unnecessary XIB --- Tusker.xcodeproj/project.pbxproj | 20 ++++------------ .../AttachmentViewController.swift | 2 +- .../GalleryViewController.swift | 0 .../Attachment/AttachmentViewController.xib | 24 ------------------- 4 files changed, 5 insertions(+), 41 deletions(-) rename Tusker/Screens/{Attachment => Attachment Gallery}/AttachmentViewController.swift (97%) rename Tusker/Screens/{Gallery => Attachment Gallery}/GalleryViewController.swift (100%) delete mode 100644 Tusker/Screens/Attachment/AttachmentViewController.xib diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index bcb5cd19..6ca4175d 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 0411610022B442870030A9B7 /* AttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041160FE22B442870030A9B7 /* AttachmentViewController.swift */; }; - 0411610122B442870030A9B7 /* AttachmentViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 041160FF22B442870030A9B7 /* AttachmentViewController.xib */; }; 0427033822B30F5F000D31B6 /* BehaviorPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427033722B30F5F000D31B6 /* BehaviorPrefsView.swift */; }; 0427033A22B31269000D31B6 /* AdvancedPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427033922B31269000D31B6 /* AdvancedPrefsView.swift */; }; 0427037C22B316B9000D31B6 /* SilentActionPrefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427037B22B316B9000D31B6 /* SilentActionPrefs.swift */; }; @@ -290,7 +289,6 @@ /* Begin PBXFileReference section */ 041160FE22B442870030A9B7 /* AttachmentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentViewController.swift; sourceTree = ""; }; - 041160FF22B442870030A9B7 /* AttachmentViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AttachmentViewController.xib; sourceTree = ""; }; 0427033722B30F5F000D31B6 /* BehaviorPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorPrefsView.swift; sourceTree = ""; }; 0427033922B31269000D31B6 /* AdvancedPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedPrefsView.swift; sourceTree = ""; }; 0427037B22B316B9000D31B6 /* SilentActionPrefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SilentActionPrefs.swift; sourceTree = ""; }; @@ -568,21 +566,13 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0411610422B4571E0030A9B7 /* Attachment */ = { - isa = PBXGroup; - children = ( - 041160FE22B442870030A9B7 /* AttachmentViewController.swift */, - 041160FF22B442870030A9B7 /* AttachmentViewController.xib */, - ); - path = Attachment; - sourceTree = ""; - }; - 0411610522B457290030A9B7 /* Gallery */ = { + 0411610522B457290030A9B7 /* Attachment Gallery */ = { isa = PBXGroup; children = ( 04D14BAE22B34A2800642648 /* GalleryViewController.swift */, + 041160FE22B442870030A9B7 /* AttachmentViewController.swift */, ); - path = Gallery; + path = "Attachment Gallery"; sourceTree = ""; }; D61099AC2144B0CC00432DC2 /* Pachyderm */ = { @@ -810,8 +800,7 @@ D6BC9DD8232D8BCA002CA326 /* Search */, D627944B23A9A02400D38C68 /* Lists */, D641C788213DD86D004B4513 /* Large Image */, - 0411610422B4571E0030A9B7 /* Attachment */, - 0411610522B457290030A9B7 /* Gallery */, + 0411610522B457290030A9B7 /* Attachment Gallery */, D6A3BC822321F69400FD64D5 /* Account List */, D6A3BC8C2321FF9B00FD64D5 /* Status Action Account List */, D627944823A6AD5100D38C68 /* Bookmarks */, @@ -1493,7 +1482,6 @@ D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */, D64BC19023C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib in Resources */, D67C57B221E28FAD00C3118B /* ComposeStatusReplyView.xib in Resources */, - 0411610122B442870030A9B7 /* AttachmentViewController.xib in Resources */, D63F9C6C241C50B9004C03CF /* ComposeAttachmentTableViewCell.xib in Resources */, D6A3BC812321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib in Resources */, D63F9C66241C4CC3004C03CF /* AddAttachmentTableViewCell.xib in Resources */, diff --git a/Tusker/Screens/Attachment/AttachmentViewController.swift b/Tusker/Screens/Attachment Gallery/AttachmentViewController.swift similarity index 97% rename from Tusker/Screens/Attachment/AttachmentViewController.swift rename to Tusker/Screens/Attachment Gallery/AttachmentViewController.swift index b356021c..807dd4db 100644 --- a/Tusker/Screens/Attachment/AttachmentViewController.swift +++ b/Tusker/Screens/Attachment Gallery/AttachmentViewController.swift @@ -38,7 +38,7 @@ class AttachmentViewController: UIViewController { init(attachment: Attachment) { self.attachment = attachment - super.init(nibName: "AttachmentViewController", bundle: nil) + super.init(nibName: nil, bundle: nil) } required init?(coder: NSCoder) { diff --git a/Tusker/Screens/Gallery/GalleryViewController.swift b/Tusker/Screens/Attachment Gallery/GalleryViewController.swift similarity index 100% rename from Tusker/Screens/Gallery/GalleryViewController.swift rename to Tusker/Screens/Attachment Gallery/GalleryViewController.swift diff --git a/Tusker/Screens/Attachment/AttachmentViewController.xib b/Tusker/Screens/Attachment/AttachmentViewController.xib deleted file mode 100644 index 2a90aae2..00000000 --- a/Tusker/Screens/Attachment/AttachmentViewController.xib +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -