From 64a8f6d733bd9cc15a052c4f5701ab4be63c1147 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 15 Mar 2020 11:43:41 -0400 Subject: [PATCH] Reorganize code --- Tusker.xcodeproj/project.pbxproj | 58 ++++++++++++------- .../CompositionAttachment.swift | 0 .../CompositionAttachmentData.swift | 0 .../Compose => Models}/CompositionState.swift | 0 .../Compose => Models}/StatusFormat.swift | 0 .../AlbumAssetCollectionViewController.swift | 0 .../AssetCollectionViewController.swift | 0 .../AssetCollectionsListViewController.swift | 0 ...etPickerSheetContainerViewController.swift | 0 .../AssetPickerViewController.swift | 0 .../AssetPreviewViewController.swift | 0 .../ComposeAttachmentsViewController.swift | 0 .../Drafts/DraftsTableViewController.swift | 0 .../Drafts/DraftsTableViewController.xib | 0 .../AddAttachmentTableViewCell.swift | 0 .../AddAttachmentTableViewCell.xib | 0 .../ComposeAttachmentTableViewCell.swift | 0 .../ComposeAttachmentTableViewCell.xib | 0 .../Draft Cell}/DraftTableViewCell.swift | 0 .../Draft Cell}/DraftTableViewCell.xib | 0 20 files changed, 37 insertions(+), 21 deletions(-) rename Tusker/{Screens/Compose/Attachments => Models}/CompositionAttachment.swift (100%) rename Tusker/{Screens/Compose/Attachments => Models}/CompositionAttachmentData.swift (100%) rename Tusker/{Screens/Compose => Models}/CompositionState.swift (100%) rename Tusker/{Screens/Compose => Models}/StatusFormat.swift (100%) rename Tusker/Screens/{Compose => }/Asset Picker/AlbumAssetCollectionViewController.swift (100%) rename Tusker/Screens/{Compose => }/Asset Picker/AssetCollectionViewController.swift (100%) rename Tusker/Screens/{Compose => }/Asset Picker/AssetCollectionsListViewController.swift (100%) rename Tusker/Screens/{Compose => }/Asset Picker/AssetPickerSheetContainerViewController.swift (100%) rename Tusker/Screens/{Compose => }/Asset Picker/AssetPickerViewController.swift (100%) rename Tusker/Screens/{Compose => }/Asset Picker/AssetPreviewViewController.swift (100%) rename Tusker/Screens/Compose/{Attachments => }/ComposeAttachmentsViewController.swift (100%) rename Tusker/Screens/{Compose => }/Drafts/DraftsTableViewController.swift (100%) rename Tusker/Screens/{Compose => }/Drafts/DraftsTableViewController.xib (100%) rename Tusker/{Screens/Compose/Attachments => Views/Attachment Cells}/AddAttachmentTableViewCell.swift (100%) rename Tusker/{Screens/Compose/Attachments => Views/Attachment Cells}/AddAttachmentTableViewCell.xib (100%) rename Tusker/{Screens/Compose/Attachments => Views/Attachment Cells}/ComposeAttachmentTableViewCell.swift (100%) rename Tusker/{Screens/Compose/Attachments => Views/Attachment Cells}/ComposeAttachmentTableViewCell.xib (100%) rename Tusker/{Screens/Compose/Drafts => Views/Draft Cell}/DraftTableViewCell.swift (100%) rename Tusker/{Screens/Compose/Drafts => Views/Draft Cell}/DraftTableViewCell.xib (100%) diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index c05714ae60..82d225585b 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -694,6 +694,37 @@ path = "Hashtag Cell"; sourceTree = ""; }; + D61959D0241E842400A37B8E /* Draft Cell */ = { + isa = PBXGroup; + children = ( + D627FF7C217E958900CC0648 /* DraftTableViewCell.xib */, + D627FF7E217E95E000CC0648 /* DraftTableViewCell.swift */, + ); + path = "Draft Cell"; + sourceTree = ""; + }; + D61959D1241E844900A37B8E /* Attachment Cells */ = { + isa = PBXGroup; + children = ( + D63F9C67241C4F79004C03CF /* AddAttachmentTableViewCell.swift */, + D63F9C65241C4CC3004C03CF /* AddAttachmentTableViewCell.xib */, + D63F9C69241C50B9004C03CF /* ComposeAttachmentTableViewCell.swift */, + D63F9C6A241C50B9004C03CF /* ComposeAttachmentTableViewCell.xib */, + ); + path = "Attachment Cells"; + sourceTree = ""; + }; + D61959D2241E846D00A37B8E /* Models */ = { + isa = PBXGroup; + children = ( + D6285B5221EA708700FE4B39 /* StatusFormat.swift */, + D620483123D2A6A3008A63EF /* CompositionState.swift */, + D63F9C6D241D2D85004C03CF /* CompositionAttachment.swift */, + D626493423BD94CE00612E6E /* CompositionAttachmentData.swift */, + ); + path = Models; + sourceTree = ""; + }; D61AC1DA232EA43100C54D2D /* Instance Cell */ = { isa = PBXGroup; children = ( @@ -761,8 +792,6 @@ children = ( D627FF78217E950100CC0648 /* DraftsTableViewController.xib */, D627FF7A217E951500CC0648 /* DraftsTableViewController.swift */, - D627FF7C217E958900CC0648 /* DraftTableViewCell.xib */, - D627FF7E217E95E000CC0648 /* DraftTableViewCell.swift */, ); path = Drafts; sourceTree = ""; @@ -778,20 +807,6 @@ path = Shortcuts; sourceTree = ""; }; - D63F9C64241C4CAA004C03CF /* Attachments */ = { - isa = PBXGroup; - children = ( - D63F9C6D241D2D85004C03CF /* CompositionAttachment.swift */, - D626493423BD94CE00612E6E /* CompositionAttachmentData.swift */, - D60309B42419D4F100A465FF /* ComposeAttachmentsViewController.swift */, - D63F9C67241C4F79004C03CF /* AddAttachmentTableViewCell.swift */, - D63F9C65241C4CC3004C03CF /* AddAttachmentTableViewCell.xib */, - D63F9C69241C50B9004C03CF /* ComposeAttachmentTableViewCell.swift */, - D63F9C6A241C50B9004C03CF /* ComposeAttachmentTableViewCell.xib */, - ); - path = Attachments; - sourceTree = ""; - }; D641C780213DD7C4004B4513 /* Screens */ = { isa = PBXGroup; children = ( @@ -803,6 +818,8 @@ D641C785213DD83B004B4513 /* Conversation */, D641C786213DD852004B4513 /* Notifications */, D641C787213DD862004B4513 /* Compose */, + D6B053A023BD2BED00A066FA /* Asset Picker */, + D627FF77217E94F200CC0648 /* Drafts */, D627943C23A5635D00D38C68 /* Explore */, D6BC9DD8232D8BCA002CA326 /* Search */, D627944B23A9A02400D38C68 /* Lists */, @@ -874,13 +891,9 @@ D641C787213DD862004B4513 /* Compose */ = { isa = PBXGroup; children = ( - D6B053A023BD2BED00A066FA /* Asset Picker */, - D63F9C64241C4CAA004C03CF /* Attachments */, - D627FF77217E94F200CC0648 /* Drafts */, D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */, D66362702136338600C9CBA2 /* ComposeViewController.swift */, - D6285B5221EA708700FE4B39 /* StatusFormat.swift */, - D620483123D2A6A3008A63EF /* CompositionState.swift */, + D60309B42419D4F100A465FF /* ComposeAttachmentsViewController.swift */, ); path = Compose; sourceTree = ""; @@ -1143,6 +1156,8 @@ D67C57A721E2649B00C3118B /* Account Detail */, D67C57B021E28F9400C3118B /* Compose Status Reply */, D626494023C122C800612E6E /* Asset Picker */, + D61959D1241E844900A37B8E /* Attachment Cells */, + D61959D0241E842400A37B8E /* Draft Cell */, D641C78A213DD926004B4513 /* Status */, D6C7D27B22B6EBE200071952 /* Attachments */, D641C78B213DD92F004B4513 /* Profile Header */, @@ -1223,6 +1238,7 @@ D663626021360A9600C9CBA2 /* Preferences */, D6AEBB3F2321640F00E5038B /* Activities */, D667E5F62135C2ED0057A976 /* Extensions */, + D61959D2241E846D00A37B8E /* Models */, D6F953F121251A2F00CF0F2B /* Controllers */, D641C780213DD7C4004B4513 /* Screens */, D6BED1722126661300F02DA0 /* Views */, diff --git a/Tusker/Screens/Compose/Attachments/CompositionAttachment.swift b/Tusker/Models/CompositionAttachment.swift similarity index 100% rename from Tusker/Screens/Compose/Attachments/CompositionAttachment.swift rename to Tusker/Models/CompositionAttachment.swift diff --git a/Tusker/Screens/Compose/Attachments/CompositionAttachmentData.swift b/Tusker/Models/CompositionAttachmentData.swift similarity index 100% rename from Tusker/Screens/Compose/Attachments/CompositionAttachmentData.swift rename to Tusker/Models/CompositionAttachmentData.swift diff --git a/Tusker/Screens/Compose/CompositionState.swift b/Tusker/Models/CompositionState.swift similarity index 100% rename from Tusker/Screens/Compose/CompositionState.swift rename to Tusker/Models/CompositionState.swift diff --git a/Tusker/Screens/Compose/StatusFormat.swift b/Tusker/Models/StatusFormat.swift similarity index 100% rename from Tusker/Screens/Compose/StatusFormat.swift rename to Tusker/Models/StatusFormat.swift diff --git a/Tusker/Screens/Compose/Asset Picker/AlbumAssetCollectionViewController.swift b/Tusker/Screens/Asset Picker/AlbumAssetCollectionViewController.swift similarity index 100% rename from Tusker/Screens/Compose/Asset Picker/AlbumAssetCollectionViewController.swift rename to Tusker/Screens/Asset Picker/AlbumAssetCollectionViewController.swift diff --git a/Tusker/Screens/Compose/Asset Picker/AssetCollectionViewController.swift b/Tusker/Screens/Asset Picker/AssetCollectionViewController.swift similarity index 100% rename from Tusker/Screens/Compose/Asset Picker/AssetCollectionViewController.swift rename to Tusker/Screens/Asset Picker/AssetCollectionViewController.swift diff --git a/Tusker/Screens/Compose/Asset Picker/AssetCollectionsListViewController.swift b/Tusker/Screens/Asset Picker/AssetCollectionsListViewController.swift similarity index 100% rename from Tusker/Screens/Compose/Asset Picker/AssetCollectionsListViewController.swift rename to Tusker/Screens/Asset Picker/AssetCollectionsListViewController.swift diff --git a/Tusker/Screens/Compose/Asset Picker/AssetPickerSheetContainerViewController.swift b/Tusker/Screens/Asset Picker/AssetPickerSheetContainerViewController.swift similarity index 100% rename from Tusker/Screens/Compose/Asset Picker/AssetPickerSheetContainerViewController.swift rename to Tusker/Screens/Asset Picker/AssetPickerSheetContainerViewController.swift diff --git a/Tusker/Screens/Compose/Asset Picker/AssetPickerViewController.swift b/Tusker/Screens/Asset Picker/AssetPickerViewController.swift similarity index 100% rename from Tusker/Screens/Compose/Asset Picker/AssetPickerViewController.swift rename to Tusker/Screens/Asset Picker/AssetPickerViewController.swift diff --git a/Tusker/Screens/Compose/Asset Picker/AssetPreviewViewController.swift b/Tusker/Screens/Asset Picker/AssetPreviewViewController.swift similarity index 100% rename from Tusker/Screens/Compose/Asset Picker/AssetPreviewViewController.swift rename to Tusker/Screens/Asset Picker/AssetPreviewViewController.swift diff --git a/Tusker/Screens/Compose/Attachments/ComposeAttachmentsViewController.swift b/Tusker/Screens/Compose/ComposeAttachmentsViewController.swift similarity index 100% rename from Tusker/Screens/Compose/Attachments/ComposeAttachmentsViewController.swift rename to Tusker/Screens/Compose/ComposeAttachmentsViewController.swift diff --git a/Tusker/Screens/Compose/Drafts/DraftsTableViewController.swift b/Tusker/Screens/Drafts/DraftsTableViewController.swift similarity index 100% rename from Tusker/Screens/Compose/Drafts/DraftsTableViewController.swift rename to Tusker/Screens/Drafts/DraftsTableViewController.swift diff --git a/Tusker/Screens/Compose/Drafts/DraftsTableViewController.xib b/Tusker/Screens/Drafts/DraftsTableViewController.xib similarity index 100% rename from Tusker/Screens/Compose/Drafts/DraftsTableViewController.xib rename to Tusker/Screens/Drafts/DraftsTableViewController.xib diff --git a/Tusker/Screens/Compose/Attachments/AddAttachmentTableViewCell.swift b/Tusker/Views/Attachment Cells/AddAttachmentTableViewCell.swift similarity index 100% rename from Tusker/Screens/Compose/Attachments/AddAttachmentTableViewCell.swift rename to Tusker/Views/Attachment Cells/AddAttachmentTableViewCell.swift diff --git a/Tusker/Screens/Compose/Attachments/AddAttachmentTableViewCell.xib b/Tusker/Views/Attachment Cells/AddAttachmentTableViewCell.xib similarity index 100% rename from Tusker/Screens/Compose/Attachments/AddAttachmentTableViewCell.xib rename to Tusker/Views/Attachment Cells/AddAttachmentTableViewCell.xib diff --git a/Tusker/Screens/Compose/Attachments/ComposeAttachmentTableViewCell.swift b/Tusker/Views/Attachment Cells/ComposeAttachmentTableViewCell.swift similarity index 100% rename from Tusker/Screens/Compose/Attachments/ComposeAttachmentTableViewCell.swift rename to Tusker/Views/Attachment Cells/ComposeAttachmentTableViewCell.swift diff --git a/Tusker/Screens/Compose/Attachments/ComposeAttachmentTableViewCell.xib b/Tusker/Views/Attachment Cells/ComposeAttachmentTableViewCell.xib similarity index 100% rename from Tusker/Screens/Compose/Attachments/ComposeAttachmentTableViewCell.xib rename to Tusker/Views/Attachment Cells/ComposeAttachmentTableViewCell.xib diff --git a/Tusker/Screens/Compose/Drafts/DraftTableViewCell.swift b/Tusker/Views/Draft Cell/DraftTableViewCell.swift similarity index 100% rename from Tusker/Screens/Compose/Drafts/DraftTableViewCell.swift rename to Tusker/Views/Draft Cell/DraftTableViewCell.swift diff --git a/Tusker/Screens/Compose/Drafts/DraftTableViewCell.xib b/Tusker/Views/Draft Cell/DraftTableViewCell.xib similarity index 100% rename from Tusker/Screens/Compose/Drafts/DraftTableViewCell.xib rename to Tusker/Views/Draft Cell/DraftTableViewCell.xib