From d4b9f71fd3ab9c81c7ec99e09df40342dd3638b6 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Wed, 14 Dec 2022 20:54:41 -0500 Subject: [PATCH] Remove old, unused code --- Tusker.xcodeproj/project.pbxproj | 64 ------------------- .../Account Activities/AccountActivity.swift | 33 ---------- .../FollowAccountActivity.swift | 43 ------------- .../SendMesasgeActivity.swift | 36 ----------- .../UnfollowAccountActivity.swift | 43 ------------- Tusker/Activities/MastodonActivity.swift | 16 ----- .../BookmarkStatusActivity.swift | 41 ------------ .../MuteConversationActivity.swift | 40 ------------ .../Status Activities/PinStatusActivity.swift | 39 ----------- .../Status Activities/StatusActivity.swift | 33 ---------- .../UnbookmarkStatusActivity.swift | 41 ------------ .../UnmuteConversationActivity.swift | 40 ------------ .../UnpinStatusActivity.swift | 39 ----------- Tusker/Activities/UIActivity+Types.swift | 13 ---- 14 files changed, 521 deletions(-) delete mode 100644 Tusker/Activities/Account Activities/AccountActivity.swift delete mode 100644 Tusker/Activities/Account Activities/FollowAccountActivity.swift delete mode 100644 Tusker/Activities/Account Activities/SendMesasgeActivity.swift delete mode 100644 Tusker/Activities/Account Activities/UnfollowAccountActivity.swift delete mode 100644 Tusker/Activities/MastodonActivity.swift delete mode 100644 Tusker/Activities/Status Activities/BookmarkStatusActivity.swift delete mode 100644 Tusker/Activities/Status Activities/MuteConversationActivity.swift delete mode 100644 Tusker/Activities/Status Activities/PinStatusActivity.swift delete mode 100644 Tusker/Activities/Status Activities/StatusActivity.swift delete mode 100644 Tusker/Activities/Status Activities/UnbookmarkStatusActivity.swift delete mode 100644 Tusker/Activities/Status Activities/UnmuteConversationActivity.swift delete mode 100644 Tusker/Activities/Status Activities/UnpinStatusActivity.swift diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index c468ee00..5eb37fe5 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -91,9 +91,6 @@ D626493D23C1000300612E6E /* AlbumTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D626493B23C1000300612E6E /* AlbumTableViewCell.xib */; }; D626493F23C101C500612E6E /* AlbumAssetCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D626493E23C101C500612E6E /* AlbumAssetCollectionViewController.swift */; }; D627943223A5466600D38C68 /* SelectableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943123A5466600D38C68 /* SelectableTableViewCell.swift */; }; - D627943523A5525100D38C68 /* StatusActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943423A5525100D38C68 /* StatusActivity.swift */; }; - D627943723A552C200D38C68 /* BookmarkStatusActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943623A552C200D38C68 /* BookmarkStatusActivity.swift */; }; - D627943923A553B600D38C68 /* UnbookmarkStatusActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943823A553B600D38C68 /* UnbookmarkStatusActivity.swift */; }; D627943B23A55BA600D38C68 /* NavigableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */; }; D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */; }; D627944A23A6AD6100D38C68 /* BookmarksTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944923A6AD6100D38C68 /* BookmarksTableViewController.swift */; }; @@ -135,11 +132,8 @@ D64AAE9526C88C5000FC57FB /* ToastableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64AAE9426C88C5000FC57FB /* ToastableViewController.swift */; }; D64AAE9726C88DC400FC57FB /* ToastConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64AAE9626C88DC400FC57FB /* ToastConfiguration.swift */; }; D64BC18623C1253A000D0238 /* AssetPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18523C1253A000D0238 /* AssetPreviewViewController.swift */; }; - D64BC18823C1640A000D0238 /* PinStatusActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18723C1640A000D0238 /* PinStatusActivity.swift */; }; - D64BC18A23C16487000D0238 /* UnpinStatusActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18923C16487000D0238 /* UnpinStatusActivity.swift */; }; D64BC18F23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18D23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift */; }; D64BC19023C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D64BC18E23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib */; }; - D64BC19223C271D9000D0238 /* MastodonActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC19123C271D9000D0238 /* MastodonActivity.swift */; }; D64D0AAD2128D88B005A6F37 /* LocalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D0AAC2128D88B005A6F37 /* LocalData.swift */; }; D64D0AB12128D9AE005A6F37 /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D0AB02128D9AE005A6F37 /* OnboardingViewController.swift */; }; D64D8CA92463B494006B0BAA /* MultiThreadDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */; }; @@ -185,8 +179,6 @@ D68015402401A6BA00D6103B /* ComposingPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D680153F2401A6BA00D6103B /* ComposingPrefsView.swift */; }; D68015422401A74600D6103B /* MediaPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68015412401A74600D6103B /* MediaPrefsView.swift */; }; D681A29A249AD62D0085E54E /* LargeImageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D681A299249AD62D0085E54E /* LargeImageContentView.swift */; }; - D681E4D3246E2AFF0053414F /* MuteConversationActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D681E4D2246E2AFF0053414F /* MuteConversationActivity.swift */; }; - D681E4D5246E2BC30053414F /* UnmuteConversationActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D681E4D4246E2BC30053414F /* UnmuteConversationActivity.swift */; }; D681E4D7246E32290053414F /* StatusActivityItemSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D681E4D6246E32290053414F /* StatusActivityItemSource.swift */; }; D681E4D9246E346E0053414F /* AccountActivityItemSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D681E4D8246E346E0053414F /* AccountActivityItemSource.swift */; }; D68232F72464F4FD00325FB8 /* ComposeDrawingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68232F62464F4FD00325FB8 /* ComposeDrawingViewController.swift */; }; @@ -243,11 +235,7 @@ D6ADB6EE28EA74E8009924AB /* UIView+Configure.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6ADB6ED28EA74E8009924AB /* UIView+Configure.swift */; }; D6ADB6F028ED1F25009924AB /* CachedImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6ADB6EF28ED1F25009924AB /* CachedImageView.swift */; }; D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */; }; - D6AEBB412321642700E5038B /* SendMesasgeActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */; }; D6AEBB432321685E00E5038B /* OpenInSafariActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */; }; - D6AEBB4523216AF800E5038B /* FollowAccountActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB4423216AF800E5038B /* FollowAccountActivity.swift */; }; - D6AEBB4823216B1D00E5038B /* AccountActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB4723216B1D00E5038B /* AccountActivity.swift */; }; - D6AEBB4A23216F0400E5038B /* UnfollowAccountActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB4923216F0400E5038B /* UnfollowAccountActivity.swift */; }; D6B053A223BD2C0600A066FA /* AssetPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B053A123BD2C0600A066FA /* AssetPickerViewController.swift */; }; D6B053A423BD2C8100A066FA /* AssetCollectionsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B053A323BD2C8100A066FA /* AssetCollectionsListViewController.swift */; }; D6B053A623BD2D0C00A066FA /* AssetCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B053A523BD2D0C00A066FA /* AssetCollectionViewController.swift */; }; @@ -475,9 +463,6 @@ D626493B23C1000300612E6E /* AlbumTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AlbumTableViewCell.xib; sourceTree = ""; }; D626493E23C101C500612E6E /* AlbumAssetCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumAssetCollectionViewController.swift; sourceTree = ""; }; D627943123A5466600D38C68 /* SelectableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableTableViewCell.swift; sourceTree = ""; }; - D627943423A5525100D38C68 /* StatusActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActivity.swift; sourceTree = ""; }; - D627943623A552C200D38C68 /* BookmarkStatusActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkStatusActivity.swift; sourceTree = ""; }; - D627943823A553B600D38C68 /* UnbookmarkStatusActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnbookmarkStatusActivity.swift; sourceTree = ""; }; D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigableTableViewCell.swift; sourceTree = ""; }; D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BasicTableViewCell.xib; sourceTree = ""; }; D627944923A6AD6100D38C68 /* BookmarksTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksTableViewController.swift; sourceTree = ""; }; @@ -519,11 +504,8 @@ D64AAE9426C88C5000FC57FB /* ToastableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastableViewController.swift; sourceTree = ""; }; D64AAE9626C88DC400FC57FB /* ToastConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastConfiguration.swift; sourceTree = ""; }; D64BC18523C1253A000D0238 /* AssetPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetPreviewViewController.swift; sourceTree = ""; }; - D64BC18723C1640A000D0238 /* PinStatusActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinStatusActivity.swift; sourceTree = ""; }; - D64BC18923C16487000D0238 /* UnpinStatusActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnpinStatusActivity.swift; sourceTree = ""; }; D64BC18D23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowRequestNotificationTableViewCell.swift; sourceTree = ""; }; D64BC18E23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FollowRequestNotificationTableViewCell.xib; sourceTree = ""; }; - D64BC19123C271D9000D0238 /* MastodonActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonActivity.swift; sourceTree = ""; }; D64D0AAC2128D88B005A6F37 /* LocalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalData.swift; sourceTree = ""; }; D64D0AB02128D9AE005A6F37 /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = ""; }; D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiThreadDictionary.swift; sourceTree = ""; }; @@ -571,8 +553,6 @@ D680153F2401A6BA00D6103B /* ComposingPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposingPrefsView.swift; sourceTree = ""; }; D68015412401A74600D6103B /* MediaPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPrefsView.swift; sourceTree = ""; }; D681A299249AD62D0085E54E /* LargeImageContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageContentView.swift; sourceTree = ""; }; - D681E4D2246E2AFF0053414F /* MuteConversationActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MuteConversationActivity.swift; sourceTree = ""; }; - D681E4D4246E2BC30053414F /* UnmuteConversationActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnmuteConversationActivity.swift; sourceTree = ""; }; D681E4D6246E32290053414F /* StatusActivityItemSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActivityItemSource.swift; sourceTree = ""; }; D681E4D8246E346E0053414F /* AccountActivityItemSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountActivityItemSource.swift; sourceTree = ""; }; D68232F62464F4FD00325FB8 /* ComposeDrawingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeDrawingViewController.swift; sourceTree = ""; }; @@ -629,11 +609,7 @@ D6ADB6ED28EA74E8009924AB /* UIView+Configure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Configure.swift"; sourceTree = ""; }; D6ADB6EF28ED1F25009924AB /* CachedImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachedImageView.swift; sourceTree = ""; }; D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIActivity+Types.swift"; sourceTree = ""; }; - D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMesasgeActivity.swift; sourceTree = ""; }; D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenInSafariActivity.swift; sourceTree = ""; }; - D6AEBB4423216AF800E5038B /* FollowAccountActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowAccountActivity.swift; sourceTree = ""; }; - D6AEBB4723216B1D00E5038B /* AccountActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountActivity.swift; sourceTree = ""; }; - D6AEBB4923216F0400E5038B /* UnfollowAccountActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnfollowAccountActivity.swift; sourceTree = ""; }; D6B053A123BD2C0600A066FA /* AssetPickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetPickerViewController.swift; sourceTree = ""; }; D6B053A323BD2C8100A066FA /* AssetCollectionsListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetCollectionsListViewController.swift; sourceTree = ""; }; D6B053A523BD2D0C00A066FA /* AssetCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetCollectionViewController.swift; sourceTree = ""; }; @@ -858,20 +834,6 @@ path = "Asset Picker"; sourceTree = ""; }; - D627943323A5523800D38C68 /* Status Activities */ = { - isa = PBXGroup; - children = ( - D627943423A5525100D38C68 /* StatusActivity.swift */, - D627943623A552C200D38C68 /* BookmarkStatusActivity.swift */, - D627943823A553B600D38C68 /* UnbookmarkStatusActivity.swift */, - D64BC18723C1640A000D0238 /* PinStatusActivity.swift */, - D64BC18923C16487000D0238 /* UnpinStatusActivity.swift */, - D681E4D2246E2AFF0053414F /* MuteConversationActivity.swift */, - D681E4D4246E2BC30053414F /* UnmuteConversationActivity.swift */, - ); - path = "Status Activities"; - sourceTree = ""; - }; D627943C23A5635D00D38C68 /* Explore */ = { isa = PBXGroup; children = ( @@ -1296,24 +1258,10 @@ D681E4D8246E346E0053414F /* AccountActivityItemSource.swift */, D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */, D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */, - D64BC19123C271D9000D0238 /* MastodonActivity.swift */, - D6AEBB4623216B0C00E5038B /* Account Activities */, - D627943323A5523800D38C68 /* Status Activities */, ); path = Activities; sourceTree = ""; }; - D6AEBB4623216B0C00E5038B /* Account Activities */ = { - isa = PBXGroup; - children = ( - D6AEBB4723216B1D00E5038B /* AccountActivity.swift */, - D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */, - D6AEBB4423216AF800E5038B /* FollowAccountActivity.swift */, - D6AEBB4923216F0400E5038B /* UnfollowAccountActivity.swift */, - ); - path = "Account Activities"; - sourceTree = ""; - }; D6B053A023BD2BED00A066FA /* Asset Picker */ = { isa = PBXGroup; children = ( @@ -1871,7 +1819,6 @@ D68E525D24A3E8F00054355A /* SearchViewController.swift in Sources */, D61F75BB293C183100C0B37F /* HTMLConverter.swift in Sources */, D61F75A5293ABD6F00C0B37F /* EditFilterView.swift in Sources */, - D6AEBB412321642700E5038B /* SendMesasgeActivity.swift in Sources */, D6BC9DB1232C61BC002CA326 /* NotificationsPageViewController.swift in Sources */, D6ADB6EC28EA73CB009924AB /* StatusContentContainer.swift in Sources */, D6969E9E240C81B9002843CE /* NSTextAttachment+Emoji.swift in Sources */, @@ -1903,7 +1850,6 @@ D611C2CF232DC61100C86A49 /* HashtagTableViewCell.swift in Sources */, D627944F23A9C99800D38C68 /* EditListAccountsViewController.swift in Sources */, D6945C3423AC6431005C403C /* AddSavedHashtagViewController.swift in Sources */, - D627943723A552C200D38C68 /* BookmarkStatusActivity.swift in Sources */, D6F6A552291F098700F496A8 /* RenameListService.swift in Sources */, D68ACE5D279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift in Sources */, D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */, @@ -1940,11 +1886,9 @@ D6A6C10F25B62D2400298D0F /* DiskCache.swift in Sources */, D6B81F3C2560365300F6E31D /* RefreshableViewController.swift in Sources */, D646C958213B367000269FB5 /* LargeImageShrinkAnimationController.swift in Sources */, - D64BC18823C1640A000D0238 /* PinStatusActivity.swift in Sources */, D6674AEA23341F7600E8DF94 /* AppShortcutItems.swift in Sources */, D646C956213B365700269FB5 /* LargeImageExpandAnimationController.swift in Sources */, D667E5F82135C3040057A976 /* Mastodon+Equatable.swift in Sources */, - D681E4D5246E2BC30053414F /* UnmuteConversationActivity.swift in Sources */, D6B4A4FF2506B81A000C81C1 /* AccountDisplayNameLabel.swift in Sources */, D63D8DF42850FE7A008D95E1 /* ViewTags.swift in Sources */, D61DC84B28F4FD2000B82C6E /* ProfileHeaderCollectionViewCell.swift in Sources */, @@ -1959,7 +1903,6 @@ D6531DEE246B81C9000F9538 /* GifvAttachmentView.swift in Sources */, D673ACCE2919E74200D6F8B0 /* MenuPicker.swift in Sources */, D6370B9C24421FF30092A7FF /* Tusker.xcdatamodeld in Sources */, - D6AEBB4823216B1D00E5038B /* AccountActivity.swift in Sources */, 04ED00B121481ED800567C53 /* SteppedProgressView.swift in Sources */, D677284C24ECBE9100C732D3 /* ComposeAvatarImageView.swift in Sources */, D6A6C11B25B63CEE00298D0F /* MemoryCache.swift in Sources */, @@ -1974,7 +1917,6 @@ D623A5412635FB3C0095BD04 /* PollOptionView.swift in Sources */, D61F75B1293BD85300C0B37F /* CreateFilterService.swift in Sources */, D65C6BF525478A9C00A6E89C /* BackgroundableViewController.swift in Sources */, - D6AEBB4A23216F0400E5038B /* UnfollowAccountActivity.swift in Sources */, D61DC84D28F500D200B82C6E /* ProfileViewController.swift in Sources */, D663626421360D2300C9CBA2 /* AvatarStyle.swift in Sources */, D693A72A25CF8C1E003A14E2 /* ProfileDirectoryViewController.swift in Sources */, @@ -1992,11 +1934,9 @@ D627944A23A6AD6100D38C68 /* BookmarksTableViewController.swift in Sources */, D63CC7102911F1E4000E19DE /* UIScrollView+Top.swift in Sources */, D6F6A557291F4F1600F496A8 /* MuteAccountView.swift in Sources */, - D64BC19223C271D9000D0238 /* MastodonActivity.swift in Sources */, D6945C3A23AC75E2005C403C /* FindInstanceViewController.swift in Sources */, D68E6F59253C9969001A1B4C /* MultiSourceEmojiLabel.swift in Sources */, D63F9C6E241D2D85004C03CF /* CompositionAttachment.swift in Sources */, - D6AEBB4523216AF800E5038B /* FollowAccountActivity.swift in Sources */, D6EBF01523C55C0900AE061B /* UIApplication+Scenes.swift in Sources */, D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */, D6F0B17524A3A1AA001E48C3 /* MainSidebarViewController.swift in Sources */, @@ -2015,7 +1955,6 @@ D6DD2A45273D6C5700386A6C /* GIFImageView.swift in Sources */, D61F759029353B4300C0B37F /* FileManager+Size.swift in Sources */, 0427033822B30F5F000D31B6 /* BehaviorPrefsView.swift in Sources */, - D627943923A553B600D38C68 /* UnbookmarkStatusActivity.swift in Sources */, D64D0AAD2128D88B005A6F37 /* LocalData.swift in Sources */, D6945C2F23AC47C3005C403C /* SavedDataManager.swift in Sources */, D6C94D892139E6EC00CB5196 /* AttachmentView.swift in Sources */, @@ -2024,7 +1963,6 @@ D6B053AB23BD2F1400A066FA /* AssetCollectionViewCell.swift in Sources */, D622757A24EE21D900B82A16 /* ComposeAttachmentRow.swift in Sources */, D6E4269D2532A3E100C02E1C /* FuzzyMatcher.swift in Sources */, - D681E4D3246E2AFF0053414F /* MuteConversationActivity.swift in Sources */, D6969EA0240C8384002843CE /* EmojiLabel.swift in Sources */, D64BC18623C1253A000D0238 /* AssetPreviewViewController.swift in Sources */, D6F6A550291F058600F496A8 /* CreateListService.swift in Sources */, @@ -2044,7 +1982,6 @@ D6D12B58292D5B2C00D528E1 /* StatusActionAccountListViewController.swift in Sources */, D6412B0D24B0D4CF00F5412E /* ProfileHeaderView.swift in Sources */, D641C77F213DC78A004B4513 /* InlineTextAttachment.swift in Sources */, - D627943523A5525100D38C68 /* StatusActivity.swift in Sources */, D61A45E628DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift in Sources */, D663626C21361C6700C9CBA2 /* Account+Preferences.swift in Sources */, D67895C0246870DE00D4CD9E /* LocalAccountAvatarView.swift in Sources */, @@ -2110,7 +2047,6 @@ D6BEA247291A0F2D002F4D01 /* Duckable+Root.swift in Sources */, 04D14BB022B34A2800642648 /* GalleryViewController.swift in Sources */, D6C1B2082545D1EC00DAAA66 /* StatusCardView.swift in Sources */, - D64BC18A23C16487000D0238 /* UnpinStatusActivity.swift in Sources */, D64D8CA92463B494006B0BAA /* MultiThreadDictionary.swift in Sources */, D6F6A554291F0D9600F496A8 /* DeleteListService.swift in Sources */, D68E6F5F253C9B2D001A1B4C /* BaseEmojiLabel.swift in Sources */, diff --git a/Tusker/Activities/Account Activities/AccountActivity.swift b/Tusker/Activities/Account Activities/AccountActivity.swift deleted file mode 100644 index cdbd41d1..00000000 --- a/Tusker/Activities/Account Activities/AccountActivity.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// AccountActivity.swift -// Tusker -// -// Created by Shadowfacts on 9/5/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit - -class AccountActivity: MastodonActivity { - - override class var activityCategory: UIActivity.Category { - return .action - } - - var account: AccountMO? - - override func canPerform(withActivityItems activityItems: [Any]) -> Bool { - for case is AccountMO in activityItems { - return true - } - return false - } - - override func prepare(withActivityItems activityItems: [Any]) { - for case let account as AccountMO in activityItems { - self.account = account - return - } - } - -} diff --git a/Tusker/Activities/Account Activities/FollowAccountActivity.swift b/Tusker/Activities/Account Activities/FollowAccountActivity.swift deleted file mode 100644 index dde2773b..00000000 --- a/Tusker/Activities/Account Activities/FollowAccountActivity.swift +++ /dev/null @@ -1,43 +0,0 @@ -// -// FollowAccountActivity.swift -// Tusker -// -// Created by Shadowfacts on 9/5/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class FollowAccountActivity: AccountActivity { - - override var activityType: UIActivity.ActivityType? { - return .followAccount - } - - override var activityTitle: String? { - return NSLocalizedString("Follow", comment: "follow account activity title") - } - override var activityImage: UIImage? { - return UIImage(systemName: "person.badge.plus") - } - - override func perform() { - guard let account = account else { return } - - UIImpactFeedbackGenerator(style: .medium).impactOccurred() - - let request = Account.follow(account.id) - mastodonController.run(request) { (response) in - switch response { - case .failure(_): - // todo: display error message - UINotificationFeedbackGenerator().notificationOccurred(.error) - fatalError() - case let .success(relationship, _): - self.mastodonController.persistentContainer.addOrUpdate(relationship: relationship) - } - } - } - -} diff --git a/Tusker/Activities/Account Activities/SendMesasgeActivity.swift b/Tusker/Activities/Account Activities/SendMesasgeActivity.swift deleted file mode 100644 index da34dd12..00000000 --- a/Tusker/Activities/Account Activities/SendMesasgeActivity.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// SendMesasgeActivity.swift -// Tusker -// -// Created by Shadowfacts on 9/5/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit - -class SendMessageActivity: AccountActivity { - - override var activityType: UIActivity.ActivityType? { - return .sendMessageMentioningAccount - } - - override var activityTitle: String? { - return NSLocalizedString("Send Message", comment: "send message activity title") - } - override var activityImage: UIImage? { - return UIImage(systemName: "square.and.pencil") - } - - override func perform() { - activityDidFinish(true) - } - - override var activityViewController: UIViewController? { - guard let account = account else { return nil } - - let draft = mastodonController.createDraft(mentioningAcct: account.acct) - let compose = ComposeHostingController(draft: draft, mastodonController: mastodonController) - return UINavigationController(rootViewController: compose) - } - -} diff --git a/Tusker/Activities/Account Activities/UnfollowAccountActivity.swift b/Tusker/Activities/Account Activities/UnfollowAccountActivity.swift deleted file mode 100644 index 87155ad6..00000000 --- a/Tusker/Activities/Account Activities/UnfollowAccountActivity.swift +++ /dev/null @@ -1,43 +0,0 @@ -// -// UnfollowActivity.swift -// Tusker -// -// Created by Shadowfacts on 9/5/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class UnfollowAccountActivity: AccountActivity { - - override var activityType: UIActivity.ActivityType? { - return .unfollowAccount - } - - override var activityTitle: String? { - return NSLocalizedString("Unfollow", comment: "unfollow account activity title") - } - override var activityImage: UIImage? { - return UIImage(systemName: "person.badge.minus") - } - - override func perform() { - guard let account = account else { return } - - UIImpactFeedbackGenerator(style: .medium).impactOccurred() - - let request = Account.unfollow(account.id) - mastodonController.run(request) { (response) in - switch response { - case .failure(_): - // todo: display error message - UINotificationFeedbackGenerator().notificationOccurred(.error) - fatalError() - case let .success(relationship, _): - self.mastodonController.persistentContainer.addOrUpdate(relationship: relationship) - } - } - } - -} diff --git a/Tusker/Activities/MastodonActivity.swift b/Tusker/Activities/MastodonActivity.swift deleted file mode 100644 index 25fd5cc7..00000000 --- a/Tusker/Activities/MastodonActivity.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// MastodonActivity.swift -// Tusker -// -// Created by Shadowfacts on 1/5/20. -// Copyright © 2020 Shadowfacts. All rights reserved. -// - -import UIKit - -class MastodonActivity: UIActivity { - var mastodonController: MastodonController { - let scene = UIApplication.shared.activeOrBackgroundScene! - return scene.session.mastodonController! - } -} diff --git a/Tusker/Activities/Status Activities/BookmarkStatusActivity.swift b/Tusker/Activities/Status Activities/BookmarkStatusActivity.swift deleted file mode 100644 index 1d16043a..00000000 --- a/Tusker/Activities/Status Activities/BookmarkStatusActivity.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// BookmarkStatusActivity.swift -// Tusker -// -// Created by Shadowfacts on 12/14/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class BookmarkStatusActivity: StatusActivity { - - override var activityType: UIActivity.ActivityType? { - return .bookmarkStatus - } - - override var activityTitle: String? { - return NSLocalizedString("Bookmark", comment: "bookmark status activity title") - } - - override var activityImage: UIImage? { - return UIImage(systemName: "bookmark") - } - - override func perform() { - guard let status = status else { return } - - let request = Status.bookmark(status.id) - mastodonController.run(request) { (response) in - if case let .success(status, _) = response { - self.mastodonController.persistentContainer.addOrUpdate(status: status) - } else { - // todo: display error message - UINotificationFeedbackGenerator().notificationOccurred(.error) - fatalError() - } - } - } - -} diff --git a/Tusker/Activities/Status Activities/MuteConversationActivity.swift b/Tusker/Activities/Status Activities/MuteConversationActivity.swift deleted file mode 100644 index f9eecdfa..00000000 --- a/Tusker/Activities/Status Activities/MuteConversationActivity.swift +++ /dev/null @@ -1,40 +0,0 @@ -// -// MuteConversationActivity.swift -// Tusker -// -// Created by Shadowfacts on 5/14/20. -// Copyright © 2020 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class MuteConversationActivity: StatusActivity { - override var activityType: UIActivity.ActivityType? { - return .muteConversation - } - - override var activityTitle: String? { - return NSLocalizedString("Mute Conversation", comment: "mute conversation activity title") - } - - override var activityImage: UIImage? { - return UIImage(systemName: "speaker.slash") - } - - override func perform() { - guard let status = status else { return } - - let request = Status.muteConversation(status.id) - mastodonController.run(request) { (response) in - if case let .success(status, _) = response { - self.mastodonController.persistentContainer.addOrUpdate(status: status) - } else { - // todo: display error message - UINotificationFeedbackGenerator().notificationOccurred(.error) - fatalError() - } - } - } - -} diff --git a/Tusker/Activities/Status Activities/PinStatusActivity.swift b/Tusker/Activities/Status Activities/PinStatusActivity.swift deleted file mode 100644 index af939b30..00000000 --- a/Tusker/Activities/Status Activities/PinStatusActivity.swift +++ /dev/null @@ -1,39 +0,0 @@ -// -// PinStatusActivity.swift -// Tusker -// -// Created by Shadowfacts on 1/4/20. -// Copyright © 2020 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class PinStatusActivity: StatusActivity { - override var activityType: UIActivity.ActivityType? { - return .pinStatus - } - - override var activityTitle: String? { - return NSLocalizedString("Pin", comment: "pin status activity title") - } - - override var activityImage: UIImage? { - return UIImage(systemName: "pin") - } - - override func perform() { - guard let status = status else { return } - - let request = Status.pin(status.id) - mastodonController.run(request) { (response) in - if case let .success(status, _) = response { - self.mastodonController.persistentContainer.addOrUpdate(status: status) - } else { - // todo: display error message - UINotificationFeedbackGenerator().notificationOccurred(.error) - fatalError() - } - } - } -} diff --git a/Tusker/Activities/Status Activities/StatusActivity.swift b/Tusker/Activities/Status Activities/StatusActivity.swift deleted file mode 100644 index cddaf959..00000000 --- a/Tusker/Activities/Status Activities/StatusActivity.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// StatusActivity.swift -// Tusker -// -// Created by Shadowfacts on 12/14/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit - -class StatusActivity: MastodonActivity { - - override class var activityCategory: UIActivity.Category { - return .action - } - - var status: StatusMO? - - override func canPerform(withActivityItems activityItems: [Any]) -> Bool { - for case is StatusMO in activityItems { - return true - } - return false - } - - override func prepare(withActivityItems activityItems: [Any]) { - for case let status as StatusMO in activityItems { - self.status = status - return - } - } - -} diff --git a/Tusker/Activities/Status Activities/UnbookmarkStatusActivity.swift b/Tusker/Activities/Status Activities/UnbookmarkStatusActivity.swift deleted file mode 100644 index 661aaab2..00000000 --- a/Tusker/Activities/Status Activities/UnbookmarkStatusActivity.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// UnbookmarkStatusActivity.swift -// Tusker -// -// Created by Shadowfacts on 12/14/19. -// Copyright © 2019 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class UnbookmarkStatusActivity: StatusActivity { - - override var activityType: UIActivity.ActivityType? { - return .unbookmarkStatus - } - - override var activityTitle: String? { - return NSLocalizedString("Unbookmark", comment: "unbookmark status activity title") - } - - override var activityImage: UIImage? { - return UIImage(systemName: "bookmark.fill") - } - - override func perform() { - guard let status = status else { return } - - let request = Status.unbookmark(status.id) - mastodonController.run(request) { (response) in - if case let .success(status, _) = response { - self.mastodonController.persistentContainer.addOrUpdate(status: status) - } else { - // todo: display error message - UINotificationFeedbackGenerator().notificationOccurred(.error) - fatalError() - } - } - } - -} diff --git a/Tusker/Activities/Status Activities/UnmuteConversationActivity.swift b/Tusker/Activities/Status Activities/UnmuteConversationActivity.swift deleted file mode 100644 index 7b417f00..00000000 --- a/Tusker/Activities/Status Activities/UnmuteConversationActivity.swift +++ /dev/null @@ -1,40 +0,0 @@ -// -// UnmuteConversationActivity.swift -// Tusker -// -// Created by Shadowfacts on 5/14/20. -// Copyright © 2020 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class UnmuteConversationActivity: StatusActivity { - override var activityType: UIActivity.ActivityType? { - return .unmuteConversation - } - - override var activityTitle: String? { - return NSLocalizedString("Unmute Conversation", comment: "unmute conversation activity title") - } - - override var activityImage: UIImage? { - return UIImage(systemName: "speaker") - } - - override func perform() { - guard let status = status else { return } - - let request = Status.unmuteConversation(status.id) - mastodonController.run(request) { (response) in - if case let .success(status, _) = response { - self.mastodonController.persistentContainer.addOrUpdate(status: status) - } else { - // todo: display error message - UINotificationFeedbackGenerator().notificationOccurred(.error) - fatalError() - } - } - } - -} diff --git a/Tusker/Activities/Status Activities/UnpinStatusActivity.swift b/Tusker/Activities/Status Activities/UnpinStatusActivity.swift deleted file mode 100644 index fb3bf24b..00000000 --- a/Tusker/Activities/Status Activities/UnpinStatusActivity.swift +++ /dev/null @@ -1,39 +0,0 @@ -// -// UnpinStatusActivity.swift -// Tusker -// -// Created by Shadowfacts on 1/4/20. -// Copyright © 2020 Shadowfacts. All rights reserved. -// - -import UIKit -import Pachyderm - -class UnpinStatusActivity: StatusActivity { - override var activityType: UIActivity.ActivityType? { - return .unpinStatus - } - - override var activityTitle: String? { - return NSLocalizedString("Unpin", comment: "unpin status activity title") - } - - override var activityImage: UIImage? { - return UIImage(systemName: "pin.slash") - } - - override func perform() { - guard let status = status else { return } - - let request = Status.unpin(status.id) - mastodonController.run(request) { (response) in - if case let .success(status, _) = response { - self.mastodonController.persistentContainer.addOrUpdate(status: status) - } else { - // todo: display error message - UINotificationFeedbackGenerator().notificationOccurred(.error) - fatalError() - } - } - } -} diff --git a/Tusker/Activities/UIActivity+Types.swift b/Tusker/Activities/UIActivity+Types.swift index 70d9e319..fae4b8d6 100644 --- a/Tusker/Activities/UIActivity+Types.swift +++ b/Tusker/Activities/UIActivity+Types.swift @@ -12,17 +12,4 @@ extension UIActivity.ActivityType { static let openInSafari = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).open_in_safari") - // Account - static let sendMessageMentioningAccount = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).send_message_mentioning_account") - static let followAccount = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).follow_account") - static let unfollowAccount = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).unfollow_account") - - // Status - static let bookmarkStatus = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).bookmark_status") - static let unbookmarkStatus = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).unbookmark_status") - static let pinStatus = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).pin_status") - static let unpinStatus = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).unpin_status") - static let muteConversation = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).mute_conversation") - static let unmuteConversation = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).unmute_conversation") - }