Organize views

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 = "<group>"; };
 		D0F0B12D251A97E400942152 /* TableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = "<group>"; };
 		D0F0B135251AA12700942152 /* CollectionItem+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CollectionItem+Extensions.swift"; sourceTree = "<group>"; };
-		D0F2D54A2581CF7D00986197 /* VisualEffectBlur.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisualEffectBlur.swift; sourceTree = "<group>"; };
 		D0F4362C25C10B9600E4F896 /* AddIdentityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddIdentityViewController.swift; sourceTree = "<group>"; };
 		D0FCC104259C4E61000B67DF /* NewStatusViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewStatusViewController.swift; sourceTree = "<group>"; };
 		D0FE1C8E253686F9003EF1EB /* PlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerView.swift; sourceTree = "<group>"; };
@@ -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 = "<group>";
+		};
+		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 = "<group>";
+		};
+		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 = "<group>";
+		};
+		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 = "<group>";
+		};
+		D021A66F25C3E1F9008A0C0D /* Collection View Cells */ = {
+			isa = PBXGroup;
+			children = (
+				D07EC7DB25B13DBB006DF726 /* EmojiCollectionViewCell.swift */,
+			);
+			path = "Collection View Cells";
+			sourceTree = "<group>";
+		};
+		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 = "<group>";
+		};
+		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 = "<group>";
+		};
+		D021A67225C3E2C8008A0C0D /* View Repesentables */ = {
+			isa = PBXGroup;
+			children = (
+				D0A7AC7225748BFF00E4E8AB /* ReportStatusView.swift */,
+			);
+			path = "View Repesentables";
+			sourceTree = "<group>";
+		};
 		D047FA7F24C3E21000AF17C5 = {
 			isa = PBXGroup;
 			children = (
@@ -432,19 +561,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		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 = "<group>";
-		};
 		D0666A2224C677B400F3F04B /* Tests */ = {
 			isa = PBXGroup;
 			children = (
@@ -504,72 +620,9 @@
 		D0C7D42024F76169001EBDBB /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				D021A62B25C38570008A0C0D /* AboutView.swift */,
+				D021A66425C3E170008A0C0D /* SwiftUI */,
-				D0F0B112251A86A000942152 /* AccountContentConfiguration.swift */,
+				D021A66325C3E167008A0C0D /* UIKit */,
-				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 */,
 				D0EA59472522B8B600804347 /* ViewConstants.swift */,
-				D0F2D54A2581CF7D00986197 /* VisualEffectBlur.swift */,
-				D0E1F582251F13EC00D45315 /* WebfingerIndicatorView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -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;
 		};

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

Views/VisualEffectBlur.swift

@@ -1,107 +0,0 @@
-// Copyright © 2020 Metabolist. All rights reserved.
-
-// Taken from Apple's Fruta example code
-
-import SwiftUI
-
-struct VisualEffectBlur<Content: View>: 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<Content: View>: 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<Content>
-
-        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)
-    }
-}