From ff8fd63e50cafe010c15f485c494fb736086654f Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Thu, 28 Jan 2021 22:50:58 -0800 Subject: [PATCH] Organize views --- Metatext.xcodeproj/project.pbxproj | 230 +++++++++++------- Views/{ => SwiftUI}/AboutView.swift | 0 Views/{ => SwiftUI}/AcknowledgmentsView.swift | 0 Views/{ => SwiftUI}/DomainBlocksView.swift | 0 Views/{ => SwiftUI}/EditFilterView.swift | 0 Views/{ => SwiftUI}/FiltersView.swift | 0 Views/{ => SwiftUI}/ListsView.swift | 0 .../NotificationTypesPreferencesView.swift | 0 Views/{ => SwiftUI}/PreferencesView.swift | 3 +- Views/{ => SwiftUI}/RegistrationView.swift | 0 Views/{ => SwiftUI}/ReportView.swift | 0 Views/{ => SwiftUI}/RootView.swift | 0 .../SecondaryNavigationView.swift | 0 .../AddIdentityView.swift | 0 .../EditAttachmentView.swift | 0 .../IdentitiesView.swift | 0 .../MainNavigationView.swift | 0 .../SafariView.swift | 0 .../TableView.swift | 0 .../ReportStatusView.swift | 0 Views/{ => UIKit}/AccountFieldView.swift | 0 Views/{ => UIKit}/AccountHeaderView.swift | 0 Views/{ => UIKit}/AttachmentUploadView.swift | 0 Views/{ => UIKit}/AttachmentView.swift | 0 Views/{ => UIKit}/AttachmentsView.swift | 0 Views/{Status => UIKit}/CardView.swift | 0 .../EmojiCollectionViewCell.swift | 0 .../CompositionInputAccessoryView.swift | 0 .../CompositionPollOptionView.swift | 0 Views/{ => UIKit}/CompositionPollView.swift | 0 Views/{ => UIKit}/CompositionView.swift | 0 .../AccountContentConfiguration.swift | 0 .../ConversationContentConfiguration.swift | 0 .../EmojiContentConfiguration.swift | 0 .../Content Configurations}/EmojiView.swift | 0 .../IdentityContentConfiguration.swift | 0 .../LoadMoreContentConfiguration.swift | 0 .../NotificationContentConfiguration.swift | 0 .../StatusContentConfiguration.swift | 0 .../TagContentConfiguration.swift | 0 .../Content Views}/AccountView.swift | 0 .../Content Views}/ConversationView.swift | 0 .../Content Views}/IdentityView.swift | 0 .../Content Views}/LoadMoreView.swift | 0 .../Content Views}/NotificationView.swift | 0 .../Content Views}/StatusView.swift | 0 Views/{ => UIKit/Content Views}/TagView.swift | 0 .../{ => UIKit}/ConversationAvatarsView.swift | 0 Views/{ => UIKit}/EditThumbnailView.swift | 0 .../{ => UIKit}/EmojiCategoryHeaderView.swift | 0 Views/{ => UIKit}/LineChartView.swift | 0 .../{ => UIKit}/LoadingTableFooterView.swift | 0 .../MarkAttachmentsSensitiveView.swift | 0 Views/{ => UIKit}/NewStatusButtonView.swift | 0 Views/{ => UIKit}/PlayerView.swift | 0 Views/{ => UIKit}/PollOptionButton.swift | 0 Views/{ => UIKit}/PollResultView.swift | 0 Views/{ => UIKit}/PollView.swift | 0 .../SecondaryNavigationButton.swift | 0 .../SecondaryNavigationTitleView.swift | 0 Views/{Status => UIKit}/StatusBodyView.swift | 0 .../AccountTableViewCell.swift | 0 .../ConversationTableViewCell.swift | 0 .../IdentityTableViewCell.swift | 0 .../LoadMoreTableViewCell.swift | 0 .../NotificationTableViewCell.swift | 0 .../StatusTableViewCell.swift | 0 .../Table View Cells}/TagTableViewCell.swift | 0 .../TouchFallthroughTextView.swift | 0 .../{ => UIKit}/WebfingerIndicatorView.swift | 0 Views/VisualEffectBlur.swift | 107 -------- 71 files changed, 143 insertions(+), 197 deletions(-) rename Views/{ => SwiftUI}/AboutView.swift (100%) rename Views/{ => SwiftUI}/AcknowledgmentsView.swift (100%) rename Views/{ => SwiftUI}/DomainBlocksView.swift (100%) rename Views/{ => SwiftUI}/EditFilterView.swift (100%) rename Views/{ => SwiftUI}/FiltersView.swift (100%) rename Views/{ => SwiftUI}/ListsView.swift (100%) rename Views/{ => SwiftUI}/NotificationTypesPreferencesView.swift (100%) rename Views/{ => SwiftUI}/PreferencesView.swift (98%) rename Views/{ => SwiftUI}/RegistrationView.swift (100%) rename Views/{ => SwiftUI}/ReportView.swift (100%) rename Views/{ => SwiftUI}/RootView.swift (100%) rename Views/{ => SwiftUI}/SecondaryNavigationView.swift (100%) rename Views/{ => SwiftUI/View Controller Representables}/AddIdentityView.swift (100%) rename Views/{ => SwiftUI/View Controller Representables}/EditAttachmentView.swift (100%) rename Views/{ => SwiftUI/View Controller Representables}/IdentitiesView.swift (100%) rename Views/{ => SwiftUI/View Controller Representables}/MainNavigationView.swift (100%) rename Views/{ => SwiftUI/View Controller Representables}/SafariView.swift (100%) rename Views/{ => SwiftUI/View Controller Representables}/TableView.swift (100%) rename Views/{Status => SwiftUI/View Repesentables}/ReportStatusView.swift (100%) rename Views/{ => UIKit}/AccountFieldView.swift (100%) rename Views/{ => UIKit}/AccountHeaderView.swift (100%) rename Views/{ => UIKit}/AttachmentUploadView.swift (100%) rename Views/{ => UIKit}/AttachmentView.swift (100%) rename Views/{ => UIKit}/AttachmentsView.swift (100%) rename Views/{Status => UIKit}/CardView.swift (100%) rename Views/{ => UIKit/Collection View Cells}/EmojiCollectionViewCell.swift (100%) rename Views/{ => UIKit}/CompositionInputAccessoryView.swift (100%) rename Views/{ => UIKit}/CompositionPollOptionView.swift (100%) rename Views/{ => UIKit}/CompositionPollView.swift (100%) rename Views/{ => UIKit}/CompositionView.swift (100%) rename Views/{ => UIKit/Content Configurations}/AccountContentConfiguration.swift (100%) rename Views/{ => UIKit/Content Configurations}/ConversationContentConfiguration.swift (100%) rename Views/{ => UIKit/Content Configurations}/EmojiContentConfiguration.swift (100%) rename Views/{ => UIKit/Content Configurations}/EmojiView.swift (100%) rename Views/{ => UIKit/Content Configurations}/IdentityContentConfiguration.swift (100%) rename Views/{ => UIKit/Content Configurations}/LoadMoreContentConfiguration.swift (100%) rename Views/{ => UIKit/Content Configurations}/NotificationContentConfiguration.swift (100%) rename Views/{Status => UIKit/Content Configurations}/StatusContentConfiguration.swift (100%) rename Views/{ => UIKit/Content Configurations}/TagContentConfiguration.swift (100%) rename Views/{ => UIKit/Content Views}/AccountView.swift (100%) rename Views/{ => UIKit/Content Views}/ConversationView.swift (100%) rename Views/{ => UIKit/Content Views}/IdentityView.swift (100%) rename Views/{ => UIKit/Content Views}/LoadMoreView.swift (100%) rename Views/{ => UIKit/Content Views}/NotificationView.swift (100%) rename Views/{Status => UIKit/Content Views}/StatusView.swift (100%) rename Views/{ => UIKit/Content Views}/TagView.swift (100%) rename Views/{ => UIKit}/ConversationAvatarsView.swift (100%) rename Views/{ => UIKit}/EditThumbnailView.swift (100%) rename Views/{ => UIKit}/EmojiCategoryHeaderView.swift (100%) rename Views/{ => UIKit}/LineChartView.swift (100%) rename Views/{ => UIKit}/LoadingTableFooterView.swift (100%) rename Views/{ => UIKit}/MarkAttachmentsSensitiveView.swift (100%) rename Views/{ => UIKit}/NewStatusButtonView.swift (100%) rename Views/{ => UIKit}/PlayerView.swift (100%) rename Views/{ => UIKit}/PollOptionButton.swift (100%) rename Views/{ => UIKit}/PollResultView.swift (100%) rename Views/{ => UIKit}/PollView.swift (100%) rename Views/{ => UIKit}/SecondaryNavigationButton.swift (100%) rename Views/{ => UIKit}/SecondaryNavigationTitleView.swift (100%) rename Views/{Status => UIKit}/StatusBodyView.swift (100%) rename Views/{ => UIKit/Table View Cells}/AccountTableViewCell.swift (100%) rename Views/{ => UIKit/Table View Cells}/ConversationTableViewCell.swift (100%) rename Views/{ => UIKit/Table View Cells}/IdentityTableViewCell.swift (100%) rename Views/{ => UIKit/Table View Cells}/LoadMoreTableViewCell.swift (100%) rename Views/{ => UIKit/Table View Cells}/NotificationTableViewCell.swift (100%) rename Views/{Status => UIKit/Table View Cells}/StatusTableViewCell.swift (100%) rename Views/{ => UIKit/Table View Cells}/TagTableViewCell.swift (100%) rename Views/{ => UIKit}/TouchFallthroughTextView.swift (100%) rename Views/{ => UIKit}/WebfingerIndicatorView.swift (100%) delete mode 100644 Views/VisualEffectBlur.swift diff --git a/Metatext.xcodeproj/project.pbxproj b/Metatext.xcodeproj/project.pbxproj index f64ff90..b061dd2 100644 --- a/Metatext.xcodeproj/project.pbxproj +++ b/Metatext.xcodeproj/project.pbxproj @@ -16,7 +16,6 @@ D00CB2ED2533ACC00080096B /* StatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00CB2EC2533ACC00080096B /* StatusView.swift */; }; D015B13525A812DD006D88A8 /* AttachmentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01F41E224F8889700D55A2D /* AttachmentsView.swift */; }; D015B13A25A812E6006D88A8 /* AttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEB1F224F8EE8C001B0F04 /* AttachmentView.swift */; }; - D015B13F25A812EC006D88A8 /* PlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FE1C8E253686F9003EF1EB /* PlayerView.swift */; }; D015B14425A812F6006D88A8 /* PlayerCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FE1C9725368A9D003EF1EB /* PlayerCache.swift */; }; D01EF22425182B1F00650C6B /* AccountHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01EF22325182B1F00650C6B /* AccountHeaderView.swift */; }; D01F41D924F880C400D55A2D /* TouchFallthroughTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01F41D624F880C400D55A2D /* TouchFallthroughTextView.swift */; }; @@ -28,6 +27,10 @@ D021A61A25C36C1A008A0C0D /* IdentityContentConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D021A61925C36C1A008A0C0D /* IdentityContentConfiguration.swift */; }; D021A62C25C38570008A0C0D /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D021A62B25C38570008A0C0D /* AboutView.swift */; }; D021A63625C38ADB008A0C0D /* AcknowledgmentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D021A63525C38ADB008A0C0D /* AcknowledgmentsView.swift */; }; + D021A67B25C3E32A008A0C0D /* PlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FE1C8E253686F9003EF1EB /* PlayerView.swift */; }; + D021A69025C3E4B8008A0C0D /* EmojiContentConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7E225B13DD3006DF726 /* EmojiContentConfiguration.swift */; }; + D021A69525C3E4C1008A0C0D /* EmojiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7F125B13E57006DF726 /* EmojiView.swift */; }; + D021A6A625C3E584008A0C0D /* EditAttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05936E825AA3F3D00754FDF /* EditAttachmentView.swift */; }; D02E1F95250B13210071AD56 /* SafariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D02E1F94250B13210071AD56 /* SafariView.swift */; }; D035F86925B7F2ED00DC75ED /* MainNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035F86825B7F2ED00DC75ED /* MainNavigationViewController.swift */; }; D035F86F25B7F30E00DC75ED /* MainNavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035F86E25B7F30E00DC75ED /* MainNavigationView.swift */; }; @@ -51,7 +54,6 @@ D05936DE25A937EC00754FDF /* EditThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05936DD25A937EC00754FDF /* EditThumbnailView.swift */; }; D05936DF25A937EC00754FDF /* EditThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05936DD25A937EC00754FDF /* EditThumbnailView.swift */; }; D05936E925AA3F3D00754FDF /* EditAttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05936E825AA3F3D00754FDF /* EditAttachmentView.swift */; }; - D05936EA25AA3F3D00754FDF /* EditAttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05936E825AA3F3D00754FDF /* EditAttachmentView.swift */; }; D05936F425AA66A600754FDF /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05936F325AA66A600754FDF /* UIView+Extensions.swift */; }; D05936F525AA66A600754FDF /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05936F325AA66A600754FDF /* UIView+Extensions.swift */; }; D05936FF25AA94EA00754FDF /* MarkAttachmentsSensitiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05936FE25AA94EA00754FDF /* MarkAttachmentsSensitiveView.swift */; }; @@ -70,9 +72,7 @@ D07EC7DC25B13DBB006DF726 /* EmojiCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7DB25B13DBB006DF726 /* EmojiCollectionViewCell.swift */; }; D07EC7DD25B13DBB006DF726 /* EmojiCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7DB25B13DBB006DF726 /* EmojiCollectionViewCell.swift */; }; D07EC7E325B13DD3006DF726 /* EmojiContentConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7E225B13DD3006DF726 /* EmojiContentConfiguration.swift */; }; - D07EC7E425B13DD3006DF726 /* EmojiContentConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7E225B13DD3006DF726 /* EmojiContentConfiguration.swift */; }; D07EC7F225B13E57006DF726 /* EmojiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7F125B13E57006DF726 /* EmojiView.swift */; }; - D07EC7F325B13E57006DF726 /* EmojiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7F125B13E57006DF726 /* EmojiView.swift */; }; D07EC7FD25B16994006DF726 /* EmojiCategoryHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7FC25B16994006DF726 /* EmojiCategoryHeaderView.swift */; }; D07EC7FE25B16994006DF726 /* EmojiCategoryHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC7FC25B16994006DF726 /* EmojiCategoryHeaderView.swift */; }; D07EC81125B232C2006DF726 /* SystemEmoji+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07EC81025B232C2006DF726 /* SystemEmoji+Extensions.swift */; }; @@ -157,7 +157,6 @@ D0F0B126251A90F400942152 /* AccountTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F0B125251A90F400942152 /* AccountTableViewCell.swift */; }; D0F0B12E251A97E400942152 /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F0B12D251A97E400942152 /* TableViewController.swift */; }; D0F0B136251AA12700942152 /* CollectionItem+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F0B135251AA12700942152 /* CollectionItem+Extensions.swift */; }; - D0F2D54B2581CF7D00986197 /* VisualEffectBlur.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F2D54A2581CF7D00986197 /* VisualEffectBlur.swift */; }; D0F4362D25C10B9600E4F896 /* AddIdentityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F4362C25C10B9600E4F896 /* AddIdentityViewController.swift */; }; D0F5880525A7E4C500E3A49C /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = D0F5880425A7E4C500E3A49C /* Kingfisher */; }; D0F5880F25A7E6CC00E3A49C /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = D0F5880E25A7E6CC00E3A49C /* Kingfisher */; }; @@ -344,7 +343,6 @@ D0F0B125251A90F400942152 /* AccountTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTableViewCell.swift; sourceTree = ""; }; D0F0B12D251A97E400942152 /* TableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = ""; }; D0F0B135251AA12700942152 /* CollectionItem+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CollectionItem+Extensions.swift"; sourceTree = ""; }; - D0F2D54A2581CF7D00986197 /* VisualEffectBlur.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisualEffectBlur.swift; sourceTree = ""; }; D0F4362C25C10B9600E4F896 /* AddIdentityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddIdentityViewController.swift; sourceTree = ""; }; D0FCC104259C4E61000B67DF /* NewStatusViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewStatusViewController.swift; sourceTree = ""; }; D0FE1C8E253686F9003EF1EB /* PlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerView.swift; sourceTree = ""; }; @@ -390,6 +388,137 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + D021A66325C3E167008A0C0D /* UIKit */ = { + isa = PBXGroup; + children = ( + D0070251255921B100F38136 /* AccountFieldView.swift */, + D01EF22325182B1F00650C6B /* AccountHeaderView.swift */, + D01F41E224F8889700D55A2D /* AttachmentsView.swift */, + D0CE9F86258B076900E3A6B6 /* AttachmentUploadView.swift */, + D0BEB1F224F8EE8C001B0F04 /* AttachmentView.swift */, + D0EA593F2522AC8700804347 /* CardView.swift */, + D021A66F25C3E1F9008A0C0D /* Collection View Cells */, + D0E9F9A9258450B300EF503D /* CompositionInputAccessoryView.swift */, + D059373D25AB8D5200754FDF /* CompositionPollOptionView.swift */, + D059373225AAEA7000754FDF /* CompositionPollView.swift */, + D08E52ED257D757100FA2C5F /* CompositionView.swift */, + D021A67025C3E204008A0C0D /* Content Configurations */, + D021A67125C3E232008A0C0D /* Content Views */, + D007023D25562A2800F38136 /* ConversationAvatarsView.swift */, + D05936DD25A937EC00754FDF /* EditThumbnailView.swift */, + D07EC7FC25B16994006DF726 /* EmojiCategoryHeaderView.swift */, + D0D2AC6625BD0484003D5DF2 /* LineChartView.swift */, + D0BEB1F624F9A84B001B0F04 /* LoadingTableFooterView.swift */, + D05936FE25AA94EA00754FDF /* MarkAttachmentsSensitiveView.swift */, + D035F8A825B9155900DC75ED /* NewStatusButtonView.swift */, + D0FE1C8E253686F9003EF1EB /* PlayerView.swift */, + D08B8D812544D80000B1EBEF /* PollOptionButton.swift */, + D08B8D8C2544E6EC00B1EBEF /* PollResultView.swift */, + D08B8D71254246E200B1EBEF /* PollView.swift */, + D035F8C625B96A4000DC75ED /* SecondaryNavigationButton.swift */, + D03D87F325C23C44004DCBB2 /* SecondaryNavigationTitleView.swift */, + D036AA16254CA823009094DF /* StatusBodyView.swift */, + D021A66E25C3E1E4008A0C0D /* Table View Cells */, + D01F41D624F880C400D55A2D /* TouchFallthroughTextView.swift */, + D0E1F582251F13EC00D45315 /* WebfingerIndicatorView.swift */, + ); + path = UIKit; + sourceTree = ""; + }; + D021A66425C3E170008A0C0D /* SwiftUI */ = { + isa = PBXGroup; + children = ( + D021A62B25C38570008A0C0D /* AboutView.swift */, + D021A63525C38ADB008A0C0D /* AcknowledgmentsView.swift */, + D08E52602579D2E100FA2C5F /* DomainBlocksView.swift */, + D0BEB21024FA2A90001B0F04 /* EditFilterView.swift */, + D0BEB20424FA1107001B0F04 /* FiltersView.swift */, + D0BEB1FE24F9E5BB001B0F04 /* ListsView.swift */, + D0C7D42D24F76169001EBDBB /* NotificationTypesPreferencesView.swift */, + D0C7D42624F76169001EBDBB /* PreferencesView.swift */, + D0B32F4F250B373600311912 /* RegistrationView.swift */, + D0DD50CA256B1F24004A04F7 /* ReportView.swift */, + D0C7D42724F76169001EBDBB /* RootView.swift */, + D0C7D42924F76169001EBDBB /* SecondaryNavigationView.swift */, + D021A66925C3E19D008A0C0D /* View Controller Representables */, + D021A67225C3E2C8008A0C0D /* View Repesentables */, + ); + path = SwiftUI; + sourceTree = ""; + }; + D021A66925C3E19D008A0C0D /* View Controller Representables */ = { + isa = PBXGroup; + children = ( + D0C7D42424F76169001EBDBB /* AddIdentityView.swift */, + D05936E825AA3F3D00754FDF /* EditAttachmentView.swift */, + D0C7D42224F76169001EBDBB /* IdentitiesView.swift */, + D035F86E25B7F30E00DC75ED /* MainNavigationView.swift */, + D02E1F94250B13210071AD56 /* SafariView.swift */, + D0C7D42524F76169001EBDBB /* TableView.swift */, + ); + path = "View Controller Representables"; + sourceTree = ""; + }; + D021A66E25C3E1E4008A0C0D /* Table View Cells */ = { + isa = PBXGroup; + children = ( + D0F0B125251A90F400942152 /* AccountTableViewCell.swift */, + D00702282555E51200F38136 /* ConversationTableViewCell.swift */, + D021A60925C36B32008A0C0D /* IdentityTableViewCell.swift */, + D0B8510B25259E56004E0744 /* LoadMoreTableViewCell.swift */, + D036AA01254B6101009094DF /* NotificationTableViewCell.swift */, + D0625E58250F092900502611 /* StatusTableViewCell.swift */, + D0D2AC4C25BCD2A9003D5DF2 /* TagTableViewCell.swift */, + ); + path = "Table View Cells"; + sourceTree = ""; + }; + D021A66F25C3E1F9008A0C0D /* Collection View Cells */ = { + isa = PBXGroup; + children = ( + D07EC7DB25B13DBB006DF726 /* EmojiCollectionViewCell.swift */, + ); + path = "Collection View Cells"; + sourceTree = ""; + }; + D021A67025C3E204008A0C0D /* Content Configurations */ = { + isa = PBXGroup; + children = ( + D0F0B112251A86A000942152 /* AccountContentConfiguration.swift */, + D00702352555F4C500F38136 /* ConversationContentConfiguration.swift */, + D07EC7E225B13DD3006DF726 /* EmojiContentConfiguration.swift */, + D07EC7F125B13E57006DF726 /* EmojiView.swift */, + D021A61925C36C1A008A0C0D /* IdentityContentConfiguration.swift */, + D0E569DF252931B100FA1D72 /* LoadMoreContentConfiguration.swift */, + D036AA0B254B612B009094DF /* NotificationContentConfiguration.swift */, + D0625E5C250F0B5C00502611 /* StatusContentConfiguration.swift */, + D0D2AC5225BCD2BA003D5DF2 /* TagContentConfiguration.swift */, + ); + path = "Content Configurations"; + sourceTree = ""; + }; + D021A67125C3E232008A0C0D /* Content Views */ = { + isa = PBXGroup; + children = ( + D0F0B10D251A868200942152 /* AccountView.swift */, + D00702302555F4AE00F38136 /* ConversationView.swift */, + D021A61325C36BFB008A0C0D /* IdentityView.swift */, + D0E569DA2529319100FA1D72 /* LoadMoreView.swift */, + D036AA06254B6118009094DF /* NotificationView.swift */, + D00CB2EC2533ACC00080096B /* StatusView.swift */, + D0D2AC4625BCD289003D5DF2 /* TagView.swift */, + ); + path = "Content Views"; + sourceTree = ""; + }; + D021A67225C3E2C8008A0C0D /* View Repesentables */ = { + isa = PBXGroup; + children = ( + D0A7AC7225748BFF00E4E8AB /* ReportStatusView.swift */, + ); + path = "View Repesentables"; + sourceTree = ""; + }; D047FA7F24C3E21000AF17C5 = { isa = PBXGroup; children = ( @@ -432,19 +561,6 @@ name = Products; sourceTree = ""; }; - D0625E55250F086B00502611 /* Status */ = { - isa = PBXGroup; - children = ( - D0EA593F2522AC8700804347 /* CardView.swift */, - D036AA16254CA823009094DF /* StatusBodyView.swift */, - D0625E5C250F0B5C00502611 /* StatusContentConfiguration.swift */, - D0625E58250F092900502611 /* StatusTableViewCell.swift */, - D00CB2EC2533ACC00080096B /* StatusView.swift */, - D0A7AC7225748BFF00E4E8AB /* ReportStatusView.swift */, - ); - path = Status; - sourceTree = ""; - }; D0666A2224C677B400F3F04B /* Tests */ = { isa = PBXGroup; children = ( @@ -504,72 +620,9 @@ D0C7D42024F76169001EBDBB /* Views */ = { isa = PBXGroup; children = ( - D021A62B25C38570008A0C0D /* AboutView.swift */, - D0F0B112251A86A000942152 /* AccountContentConfiguration.swift */, - D0070251255921B100F38136 /* AccountFieldView.swift */, - D01EF22325182B1F00650C6B /* AccountHeaderView.swift */, - D0F0B125251A90F400942152 /* AccountTableViewCell.swift */, - D0F0B10D251A868200942152 /* AccountView.swift */, - D021A63525C38ADB008A0C0D /* AcknowledgmentsView.swift */, - D0C7D42424F76169001EBDBB /* AddIdentityView.swift */, - D01F41E224F8889700D55A2D /* AttachmentsView.swift */, - D0CE9F86258B076900E3A6B6 /* AttachmentUploadView.swift */, - D0BEB1F224F8EE8C001B0F04 /* AttachmentView.swift */, - D0E9F9A9258450B300EF503D /* CompositionInputAccessoryView.swift */, - D059373D25AB8D5200754FDF /* CompositionPollOptionView.swift */, - D059373225AAEA7000754FDF /* CompositionPollView.swift */, - D08E52ED257D757100FA2C5F /* CompositionView.swift */, - D007023D25562A2800F38136 /* ConversationAvatarsView.swift */, - D00702352555F4C500F38136 /* ConversationContentConfiguration.swift */, - D00702282555E51200F38136 /* ConversationTableViewCell.swift */, - D00702302555F4AE00F38136 /* ConversationView.swift */, - D08E52602579D2E100FA2C5F /* DomainBlocksView.swift */, - D05936E825AA3F3D00754FDF /* EditAttachmentView.swift */, - D0BEB21024FA2A90001B0F04 /* EditFilterView.swift */, - D05936DD25A937EC00754FDF /* EditThumbnailView.swift */, - D07EC7FC25B16994006DF726 /* EmojiCategoryHeaderView.swift */, - D07EC7DB25B13DBB006DF726 /* EmojiCollectionViewCell.swift */, - D07EC7E225B13DD3006DF726 /* EmojiContentConfiguration.swift */, - D07EC7F125B13E57006DF726 /* EmojiView.swift */, - D0BEB20424FA1107001B0F04 /* FiltersView.swift */, - D0C7D42224F76169001EBDBB /* IdentitiesView.swift */, - D021A61925C36C1A008A0C0D /* IdentityContentConfiguration.swift */, - D021A60925C36B32008A0C0D /* IdentityTableViewCell.swift */, - D021A61325C36BFB008A0C0D /* IdentityView.swift */, - D0D2AC6625BD0484003D5DF2 /* LineChartView.swift */, - D0BEB1FE24F9E5BB001B0F04 /* ListsView.swift */, - D0BEB1F624F9A84B001B0F04 /* LoadingTableFooterView.swift */, - D0B8510B25259E56004E0744 /* LoadMoreTableViewCell.swift */, - D0E569DF252931B100FA1D72 /* LoadMoreContentConfiguration.swift */, - D0E569DA2529319100FA1D72 /* LoadMoreView.swift */, - D035F86E25B7F30E00DC75ED /* MainNavigationView.swift */, - D05936FE25AA94EA00754FDF /* MarkAttachmentsSensitiveView.swift */, - D035F8A825B9155900DC75ED /* NewStatusButtonView.swift */, - D036AA0B254B612B009094DF /* NotificationContentConfiguration.swift */, - D036AA01254B6101009094DF /* NotificationTableViewCell.swift */, - D0C7D42D24F76169001EBDBB /* NotificationTypesPreferencesView.swift */, - D036AA06254B6118009094DF /* NotificationView.swift */, - D0FE1C8E253686F9003EF1EB /* PlayerView.swift */, - D08B8D812544D80000B1EBEF /* PollOptionButton.swift */, - D08B8D8C2544E6EC00B1EBEF /* PollResultView.swift */, - D08B8D71254246E200B1EBEF /* PollView.swift */, - D0C7D42624F76169001EBDBB /* PreferencesView.swift */, - D0B32F4F250B373600311912 /* RegistrationView.swift */, - D0DD50CA256B1F24004A04F7 /* ReportView.swift */, - D0C7D42724F76169001EBDBB /* RootView.swift */, - D02E1F94250B13210071AD56 /* SafariView.swift */, - D035F8C625B96A4000DC75ED /* SecondaryNavigationButton.swift */, - D03D87F325C23C44004DCBB2 /* SecondaryNavigationTitleView.swift */, - D0C7D42924F76169001EBDBB /* SecondaryNavigationView.swift */, - D0625E55250F086B00502611 /* Status */, - D0C7D42524F76169001EBDBB /* TableView.swift */, - D0D2AC5225BCD2BA003D5DF2 /* TagContentConfiguration.swift */, - D0D2AC4C25BCD2A9003D5DF2 /* TagTableViewCell.swift */, - D0D2AC4625BCD289003D5DF2 /* TagView.swift */, - D01F41D624F880C400D55A2D /* TouchFallthroughTextView.swift */, + D021A66425C3E170008A0C0D /* SwiftUI */, + D021A66325C3E167008A0C0D /* UIKit */, D0EA59472522B8B600804347 /* ViewConstants.swift */, - D0F2D54A2581CF7D00986197 /* VisualEffectBlur.swift */, - D0E1F582251F13EC00D45315 /* WebfingerIndicatorView.swift */, ); path = Views; sourceTree = ""; @@ -958,7 +1011,6 @@ D0C7D4C424F7616A001EBDBB /* AppDelegate.swift in Sources */, D0C7D49924F7616A001EBDBB /* AddIdentityView.swift in Sources */, D0FCC105259C4E61000B67DF /* NewStatusViewController.swift in Sources */, - D0F2D54B2581CF7D00986197 /* VisualEffectBlur.swift in Sources */, D087671625BAA8C0001FDD43 /* ExploreViewController.swift in Sources */, D0D2AC6725BD0484003D5DF2 /* LineChartView.swift in Sources */, D0A7AC7325748BFF00E4E8AB /* ReportStatusView.swift in Sources */, @@ -989,33 +1041,33 @@ D036EBC7259FE2B700EC1CFC /* KingfisherOptionsInfo+Extensions.swift in Sources */, D08E52A6257C61C000FA2C5F /* ShareExtensionNavigationViewController.swift in Sources */, D059373425AAEA7000754FDF /* CompositionPollView.swift in Sources */, + D021A67B25C3E32A008A0C0D /* PlayerView.swift in Sources */, + D021A69025C3E4B8008A0C0D /* EmojiContentConfiguration.swift in Sources */, D08E52D2257C811200FA2C5F /* ShareExtensionError+Extensions.swift in Sources */, D0E9F9AB258450B300EF503D /* CompositionInputAccessoryView.swift in Sources */, D05936D025A8D79800754FDF /* EditAttachmentViewController.swift in Sources */, D08E52EF257D757100FA2C5F /* CompositionView.swift in Sources */, D07EC7FE25B16994006DF726 /* EmojiCategoryHeaderView.swift in Sources */, - D07EC7E425B13DD3006DF726 /* EmojiContentConfiguration.swift in Sources */, D0CE9F88258B076900E3A6B6 /* AttachmentUploadView.swift in Sources */, D07EC81225B232C2006DF726 /* SystemEmoji+Extensions.swift in Sources */, D08E52C7257C7AEE00FA2C5F /* ShareErrorViewController.swift in Sources */, D059370025AA94EA00754FDF /* MarkAttachmentsSensitiveView.swift in Sources */, D015B14425A812F6006D88A8 /* PlayerCache.swift in Sources */, D05936F525AA66A600754FDF /* UIView+Extensions.swift in Sources */, - D015B13F25A812EC006D88A8 /* PlayerView.swift in Sources */, D059373F25AB8D5200754FDF /* CompositionPollOptionView.swift in Sources */, D015B13A25A812E6006D88A8 /* AttachmentView.swift in Sources */, D08E52F8257D78BE00FA2C5F /* ViewConstants.swift in Sources */, D036EBC2259FE2AD00EC1CFC /* UIVIewController+Extensions.swift in Sources */, D015B13525A812DD006D88A8 /* AttachmentsView.swift in Sources */, D07EC7DD25B13DBB006DF726 /* EmojiCollectionViewCell.swift in Sources */, - D05936EA25AA3F3D00754FDF /* EditAttachmentView.swift in Sources */, D07EC7D025B13921006DF726 /* PickerEmoji+Extensions.swift in Sources */, D0FCC106259C4E62000B67DF /* NewStatusViewController.swift in Sources */, D036EBB3259FE28800EC1CFC /* UIColor+Extensions.swift in Sources */, D088406E25AFBBE200BB749B /* EmojiPickerViewController.swift in Sources */, D036EBB8259FE29800EC1CFC /* Status+Extensions.swift in Sources */, + D021A6A625C3E584008A0C0D /* EditAttachmentView.swift in Sources */, D05936DF25A937EC00754FDF /* EditThumbnailView.swift in Sources */, - D07EC7F325B13E57006DF726 /* EmojiView.swift in Sources */, + D021A69525C3E4C1008A0C0D /* EmojiView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Views/AboutView.swift b/Views/SwiftUI/AboutView.swift similarity index 100% rename from Views/AboutView.swift rename to Views/SwiftUI/AboutView.swift diff --git a/Views/AcknowledgmentsView.swift b/Views/SwiftUI/AcknowledgmentsView.swift similarity index 100% rename from Views/AcknowledgmentsView.swift rename to Views/SwiftUI/AcknowledgmentsView.swift diff --git a/Views/DomainBlocksView.swift b/Views/SwiftUI/DomainBlocksView.swift similarity index 100% rename from Views/DomainBlocksView.swift rename to Views/SwiftUI/DomainBlocksView.swift diff --git a/Views/EditFilterView.swift b/Views/SwiftUI/EditFilterView.swift similarity index 100% rename from Views/EditFilterView.swift rename to Views/SwiftUI/EditFilterView.swift diff --git a/Views/FiltersView.swift b/Views/SwiftUI/FiltersView.swift similarity index 100% rename from Views/FiltersView.swift rename to Views/SwiftUI/FiltersView.swift diff --git a/Views/ListsView.swift b/Views/SwiftUI/ListsView.swift similarity index 100% rename from Views/ListsView.swift rename to Views/SwiftUI/ListsView.swift diff --git a/Views/NotificationTypesPreferencesView.swift b/Views/SwiftUI/NotificationTypesPreferencesView.swift similarity index 100% rename from Views/NotificationTypesPreferencesView.swift rename to Views/SwiftUI/NotificationTypesPreferencesView.swift diff --git a/Views/PreferencesView.swift b/Views/SwiftUI/PreferencesView.swift similarity index 98% rename from Views/PreferencesView.swift rename to Views/SwiftUI/PreferencesView.swift index 2984efe..0d0382a 100644 --- a/Views/PreferencesView.swift +++ b/Views/SwiftUI/PreferencesView.swift @@ -92,7 +92,8 @@ struct PreferencesView: View { .disabled(reduceMotion) } .disabled(reduceMotion) - Toggle("preferences.show-reblog-and-favorite-counts", isOn: $identityContext.appPreferences.showReblogAndFavoriteCounts) + Toggle("preferences.show-reblog-and-favorite-counts", + isOn: $identityContext.appPreferences.showReblogAndFavoriteCounts) Picker("preferences.home-timeline-position-on-startup", selection: $identityContext.appPreferences.homeTimelineBehavior) { ForEach(AppPreferences.PositionBehavior.allCases) { option in diff --git a/Views/RegistrationView.swift b/Views/SwiftUI/RegistrationView.swift similarity index 100% rename from Views/RegistrationView.swift rename to Views/SwiftUI/RegistrationView.swift diff --git a/Views/ReportView.swift b/Views/SwiftUI/ReportView.swift similarity index 100% rename from Views/ReportView.swift rename to Views/SwiftUI/ReportView.swift diff --git a/Views/RootView.swift b/Views/SwiftUI/RootView.swift similarity index 100% rename from Views/RootView.swift rename to Views/SwiftUI/RootView.swift diff --git a/Views/SecondaryNavigationView.swift b/Views/SwiftUI/SecondaryNavigationView.swift similarity index 100% rename from Views/SecondaryNavigationView.swift rename to Views/SwiftUI/SecondaryNavigationView.swift diff --git a/Views/AddIdentityView.swift b/Views/SwiftUI/View Controller Representables/AddIdentityView.swift similarity index 100% rename from Views/AddIdentityView.swift rename to Views/SwiftUI/View Controller Representables/AddIdentityView.swift diff --git a/Views/EditAttachmentView.swift b/Views/SwiftUI/View Controller Representables/EditAttachmentView.swift similarity index 100% rename from Views/EditAttachmentView.swift rename to Views/SwiftUI/View Controller Representables/EditAttachmentView.swift diff --git a/Views/IdentitiesView.swift b/Views/SwiftUI/View Controller Representables/IdentitiesView.swift similarity index 100% rename from Views/IdentitiesView.swift rename to Views/SwiftUI/View Controller Representables/IdentitiesView.swift diff --git a/Views/MainNavigationView.swift b/Views/SwiftUI/View Controller Representables/MainNavigationView.swift similarity index 100% rename from Views/MainNavigationView.swift rename to Views/SwiftUI/View Controller Representables/MainNavigationView.swift diff --git a/Views/SafariView.swift b/Views/SwiftUI/View Controller Representables/SafariView.swift similarity index 100% rename from Views/SafariView.swift rename to Views/SwiftUI/View Controller Representables/SafariView.swift diff --git a/Views/TableView.swift b/Views/SwiftUI/View Controller Representables/TableView.swift similarity index 100% rename from Views/TableView.swift rename to Views/SwiftUI/View Controller Representables/TableView.swift diff --git a/Views/Status/ReportStatusView.swift b/Views/SwiftUI/View Repesentables/ReportStatusView.swift similarity index 100% rename from Views/Status/ReportStatusView.swift rename to Views/SwiftUI/View Repesentables/ReportStatusView.swift diff --git a/Views/AccountFieldView.swift b/Views/UIKit/AccountFieldView.swift similarity index 100% rename from Views/AccountFieldView.swift rename to Views/UIKit/AccountFieldView.swift diff --git a/Views/AccountHeaderView.swift b/Views/UIKit/AccountHeaderView.swift similarity index 100% rename from Views/AccountHeaderView.swift rename to Views/UIKit/AccountHeaderView.swift diff --git a/Views/AttachmentUploadView.swift b/Views/UIKit/AttachmentUploadView.swift similarity index 100% rename from Views/AttachmentUploadView.swift rename to Views/UIKit/AttachmentUploadView.swift diff --git a/Views/AttachmentView.swift b/Views/UIKit/AttachmentView.swift similarity index 100% rename from Views/AttachmentView.swift rename to Views/UIKit/AttachmentView.swift diff --git a/Views/AttachmentsView.swift b/Views/UIKit/AttachmentsView.swift similarity index 100% rename from Views/AttachmentsView.swift rename to Views/UIKit/AttachmentsView.swift diff --git a/Views/Status/CardView.swift b/Views/UIKit/CardView.swift similarity index 100% rename from Views/Status/CardView.swift rename to Views/UIKit/CardView.swift diff --git a/Views/EmojiCollectionViewCell.swift b/Views/UIKit/Collection View Cells/EmojiCollectionViewCell.swift similarity index 100% rename from Views/EmojiCollectionViewCell.swift rename to Views/UIKit/Collection View Cells/EmojiCollectionViewCell.swift diff --git a/Views/CompositionInputAccessoryView.swift b/Views/UIKit/CompositionInputAccessoryView.swift similarity index 100% rename from Views/CompositionInputAccessoryView.swift rename to Views/UIKit/CompositionInputAccessoryView.swift diff --git a/Views/CompositionPollOptionView.swift b/Views/UIKit/CompositionPollOptionView.swift similarity index 100% rename from Views/CompositionPollOptionView.swift rename to Views/UIKit/CompositionPollOptionView.swift diff --git a/Views/CompositionPollView.swift b/Views/UIKit/CompositionPollView.swift similarity index 100% rename from Views/CompositionPollView.swift rename to Views/UIKit/CompositionPollView.swift diff --git a/Views/CompositionView.swift b/Views/UIKit/CompositionView.swift similarity index 100% rename from Views/CompositionView.swift rename to Views/UIKit/CompositionView.swift diff --git a/Views/AccountContentConfiguration.swift b/Views/UIKit/Content Configurations/AccountContentConfiguration.swift similarity index 100% rename from Views/AccountContentConfiguration.swift rename to Views/UIKit/Content Configurations/AccountContentConfiguration.swift diff --git a/Views/ConversationContentConfiguration.swift b/Views/UIKit/Content Configurations/ConversationContentConfiguration.swift similarity index 100% rename from Views/ConversationContentConfiguration.swift rename to Views/UIKit/Content Configurations/ConversationContentConfiguration.swift diff --git a/Views/EmojiContentConfiguration.swift b/Views/UIKit/Content Configurations/EmojiContentConfiguration.swift similarity index 100% rename from Views/EmojiContentConfiguration.swift rename to Views/UIKit/Content Configurations/EmojiContentConfiguration.swift diff --git a/Views/EmojiView.swift b/Views/UIKit/Content Configurations/EmojiView.swift similarity index 100% rename from Views/EmojiView.swift rename to Views/UIKit/Content Configurations/EmojiView.swift diff --git a/Views/IdentityContentConfiguration.swift b/Views/UIKit/Content Configurations/IdentityContentConfiguration.swift similarity index 100% rename from Views/IdentityContentConfiguration.swift rename to Views/UIKit/Content Configurations/IdentityContentConfiguration.swift diff --git a/Views/LoadMoreContentConfiguration.swift b/Views/UIKit/Content Configurations/LoadMoreContentConfiguration.swift similarity index 100% rename from Views/LoadMoreContentConfiguration.swift rename to Views/UIKit/Content Configurations/LoadMoreContentConfiguration.swift diff --git a/Views/NotificationContentConfiguration.swift b/Views/UIKit/Content Configurations/NotificationContentConfiguration.swift similarity index 100% rename from Views/NotificationContentConfiguration.swift rename to Views/UIKit/Content Configurations/NotificationContentConfiguration.swift diff --git a/Views/Status/StatusContentConfiguration.swift b/Views/UIKit/Content Configurations/StatusContentConfiguration.swift similarity index 100% rename from Views/Status/StatusContentConfiguration.swift rename to Views/UIKit/Content Configurations/StatusContentConfiguration.swift diff --git a/Views/TagContentConfiguration.swift b/Views/UIKit/Content Configurations/TagContentConfiguration.swift similarity index 100% rename from Views/TagContentConfiguration.swift rename to Views/UIKit/Content Configurations/TagContentConfiguration.swift diff --git a/Views/AccountView.swift b/Views/UIKit/Content Views/AccountView.swift similarity index 100% rename from Views/AccountView.swift rename to Views/UIKit/Content Views/AccountView.swift diff --git a/Views/ConversationView.swift b/Views/UIKit/Content Views/ConversationView.swift similarity index 100% rename from Views/ConversationView.swift rename to Views/UIKit/Content Views/ConversationView.swift diff --git a/Views/IdentityView.swift b/Views/UIKit/Content Views/IdentityView.swift similarity index 100% rename from Views/IdentityView.swift rename to Views/UIKit/Content Views/IdentityView.swift diff --git a/Views/LoadMoreView.swift b/Views/UIKit/Content Views/LoadMoreView.swift similarity index 100% rename from Views/LoadMoreView.swift rename to Views/UIKit/Content Views/LoadMoreView.swift diff --git a/Views/NotificationView.swift b/Views/UIKit/Content Views/NotificationView.swift similarity index 100% rename from Views/NotificationView.swift rename to Views/UIKit/Content Views/NotificationView.swift diff --git a/Views/Status/StatusView.swift b/Views/UIKit/Content Views/StatusView.swift similarity index 100% rename from Views/Status/StatusView.swift rename to Views/UIKit/Content Views/StatusView.swift diff --git a/Views/TagView.swift b/Views/UIKit/Content Views/TagView.swift similarity index 100% rename from Views/TagView.swift rename to Views/UIKit/Content Views/TagView.swift diff --git a/Views/ConversationAvatarsView.swift b/Views/UIKit/ConversationAvatarsView.swift similarity index 100% rename from Views/ConversationAvatarsView.swift rename to Views/UIKit/ConversationAvatarsView.swift diff --git a/Views/EditThumbnailView.swift b/Views/UIKit/EditThumbnailView.swift similarity index 100% rename from Views/EditThumbnailView.swift rename to Views/UIKit/EditThumbnailView.swift diff --git a/Views/EmojiCategoryHeaderView.swift b/Views/UIKit/EmojiCategoryHeaderView.swift similarity index 100% rename from Views/EmojiCategoryHeaderView.swift rename to Views/UIKit/EmojiCategoryHeaderView.swift diff --git a/Views/LineChartView.swift b/Views/UIKit/LineChartView.swift similarity index 100% rename from Views/LineChartView.swift rename to Views/UIKit/LineChartView.swift diff --git a/Views/LoadingTableFooterView.swift b/Views/UIKit/LoadingTableFooterView.swift similarity index 100% rename from Views/LoadingTableFooterView.swift rename to Views/UIKit/LoadingTableFooterView.swift diff --git a/Views/MarkAttachmentsSensitiveView.swift b/Views/UIKit/MarkAttachmentsSensitiveView.swift similarity index 100% rename from Views/MarkAttachmentsSensitiveView.swift rename to Views/UIKit/MarkAttachmentsSensitiveView.swift diff --git a/Views/NewStatusButtonView.swift b/Views/UIKit/NewStatusButtonView.swift similarity index 100% rename from Views/NewStatusButtonView.swift rename to Views/UIKit/NewStatusButtonView.swift diff --git a/Views/PlayerView.swift b/Views/UIKit/PlayerView.swift similarity index 100% rename from Views/PlayerView.swift rename to Views/UIKit/PlayerView.swift diff --git a/Views/PollOptionButton.swift b/Views/UIKit/PollOptionButton.swift similarity index 100% rename from Views/PollOptionButton.swift rename to Views/UIKit/PollOptionButton.swift diff --git a/Views/PollResultView.swift b/Views/UIKit/PollResultView.swift similarity index 100% rename from Views/PollResultView.swift rename to Views/UIKit/PollResultView.swift diff --git a/Views/PollView.swift b/Views/UIKit/PollView.swift similarity index 100% rename from Views/PollView.swift rename to Views/UIKit/PollView.swift diff --git a/Views/SecondaryNavigationButton.swift b/Views/UIKit/SecondaryNavigationButton.swift similarity index 100% rename from Views/SecondaryNavigationButton.swift rename to Views/UIKit/SecondaryNavigationButton.swift diff --git a/Views/SecondaryNavigationTitleView.swift b/Views/UIKit/SecondaryNavigationTitleView.swift similarity index 100% rename from Views/SecondaryNavigationTitleView.swift rename to Views/UIKit/SecondaryNavigationTitleView.swift diff --git a/Views/Status/StatusBodyView.swift b/Views/UIKit/StatusBodyView.swift similarity index 100% rename from Views/Status/StatusBodyView.swift rename to Views/UIKit/StatusBodyView.swift diff --git a/Views/AccountTableViewCell.swift b/Views/UIKit/Table View Cells/AccountTableViewCell.swift similarity index 100% rename from Views/AccountTableViewCell.swift rename to Views/UIKit/Table View Cells/AccountTableViewCell.swift diff --git a/Views/ConversationTableViewCell.swift b/Views/UIKit/Table View Cells/ConversationTableViewCell.swift similarity index 100% rename from Views/ConversationTableViewCell.swift rename to Views/UIKit/Table View Cells/ConversationTableViewCell.swift diff --git a/Views/IdentityTableViewCell.swift b/Views/UIKit/Table View Cells/IdentityTableViewCell.swift similarity index 100% rename from Views/IdentityTableViewCell.swift rename to Views/UIKit/Table View Cells/IdentityTableViewCell.swift diff --git a/Views/LoadMoreTableViewCell.swift b/Views/UIKit/Table View Cells/LoadMoreTableViewCell.swift similarity index 100% rename from Views/LoadMoreTableViewCell.swift rename to Views/UIKit/Table View Cells/LoadMoreTableViewCell.swift diff --git a/Views/NotificationTableViewCell.swift b/Views/UIKit/Table View Cells/NotificationTableViewCell.swift similarity index 100% rename from Views/NotificationTableViewCell.swift rename to Views/UIKit/Table View Cells/NotificationTableViewCell.swift diff --git a/Views/Status/StatusTableViewCell.swift b/Views/UIKit/Table View Cells/StatusTableViewCell.swift similarity index 100% rename from Views/Status/StatusTableViewCell.swift rename to Views/UIKit/Table View Cells/StatusTableViewCell.swift diff --git a/Views/TagTableViewCell.swift b/Views/UIKit/Table View Cells/TagTableViewCell.swift similarity index 100% rename from Views/TagTableViewCell.swift rename to Views/UIKit/Table View Cells/TagTableViewCell.swift diff --git a/Views/TouchFallthroughTextView.swift b/Views/UIKit/TouchFallthroughTextView.swift similarity index 100% rename from Views/TouchFallthroughTextView.swift rename to Views/UIKit/TouchFallthroughTextView.swift diff --git a/Views/WebfingerIndicatorView.swift b/Views/UIKit/WebfingerIndicatorView.swift similarity index 100% rename from Views/WebfingerIndicatorView.swift rename to Views/UIKit/WebfingerIndicatorView.swift diff --git a/Views/VisualEffectBlur.swift b/Views/VisualEffectBlur.swift deleted file mode 100644 index 4009a8b..0000000 --- a/Views/VisualEffectBlur.swift +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright © 2020 Metabolist. All rights reserved. - -// Taken from Apple's Fruta example code - -import SwiftUI - -struct VisualEffectBlur: View { - var blurStyle: UIBlurEffect.Style - var vibrancyStyle: UIVibrancyEffectStyle? - var content: Content - - init(blurStyle: UIBlurEffect.Style = .systemMaterial, - vibrancyStyle: UIVibrancyEffectStyle? = nil, - @ViewBuilder content: () -> Content) { - self.blurStyle = blurStyle - self.vibrancyStyle = vibrancyStyle - self.content = content() - } - - var body: some View { - Representable( - blurStyle: blurStyle, - vibrancyStyle: vibrancyStyle, - content: ZStack { content }) - .accessibility(hidden: Content.self == EmptyView.self) - } -} - -extension VisualEffectBlur { - struct Representable: UIViewRepresentable { - var blurStyle: UIBlurEffect.Style - var vibrancyStyle: UIVibrancyEffectStyle? - var content: Content - - func makeUIView(context: Context) -> UIVisualEffectView { - context.coordinator.blurView - } - - func updateUIView(_ view: UIVisualEffectView, context: Context) { - context.coordinator.update(content: content, blurStyle: blurStyle, vibrancyStyle: vibrancyStyle) - } - - func makeCoordinator() -> Coordinator { - Coordinator(content: content) - } - } -} - -extension VisualEffectBlur.Representable { - class Coordinator { - let blurView = UIVisualEffectView() - let vibrancyView = UIVisualEffectView() - let hostingController: UIHostingController - - init(content: Content) { - hostingController = UIHostingController(rootView: content) - hostingController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight] - hostingController.view.backgroundColor = nil - blurView.contentView.addSubview(vibrancyView) - blurView.autoresizingMask = [.flexibleWidth, .flexibleHeight] - vibrancyView.contentView.addSubview(hostingController.view) - vibrancyView.autoresizingMask = [.flexibleWidth, .flexibleHeight] - } - - func update(content: Content, blurStyle: UIBlurEffect.Style, vibrancyStyle: UIVibrancyEffectStyle?) { - hostingController.rootView = content - - let blurEffect = UIBlurEffect(style: blurStyle) - - blurView.effect = blurEffect - - if let vibrancyStyle = vibrancyStyle { - vibrancyView.effect = UIVibrancyEffect(blurEffect: blurEffect, style: vibrancyStyle) - } else { - vibrancyView.effect = nil - } - - hostingController.view.setNeedsDisplay() - } - } -} - -extension VisualEffectBlur where Content == EmptyView { - init(blurStyle: UIBlurEffect.Style = .systemMaterial) { - self.init(blurStyle: blurStyle, vibrancyStyle: nil) { - EmptyView() - } - } -} - -struct VisualEffectBlur_Previews: PreviewProvider { - static var previews: some View { - ZStack { - LinearGradient( - gradient: Gradient(colors: [.red, .blue]), - startPoint: .topLeading, - endPoint: .bottomTrailing - ) - - VisualEffectBlur(blurStyle: .systemUltraThinMaterial, vibrancyStyle: .fill) { - Text("Hello World!") - .frame(width: 200, height: 100) - } - } - .previewLayout(.sizeThatFits) - } -}