Merge branch 'swiftui-preferences'

Fixes #29

Tusker.xcodeproj/project.pbxproj

@@ -9,10 +9,16 @@
 /* Begin PBXBuildFile section */
 		0411610022B442870030A9B7 /* AttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041160FE22B442870030A9B7 /* AttachmentViewController.swift */; };
 		0411610122B442870030A9B7 /* AttachmentViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 041160FF22B442870030A9B7 /* AttachmentViewController.xib */; };
+		0427033622B30B3D000D31B6 /* Preference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427033522B30B3D000D31B6 /* Preference.swift */; };
+		0427033822B30F5F000D31B6 /* BehaviorPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427033722B30F5F000D31B6 /* BehaviorPrefsView.swift */; };
+		0427033A22B31269000D31B6 /* AdvancedPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427033922B31269000D31B6 /* AdvancedPrefsView.swift */; };
+		0427037C22B316B9000D31B6 /* SilentActionPrefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427037B22B316B9000D31B6 /* SilentActionPrefs.swift */; };
 		04496BD721625361001F1B23 /* ContentLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04496BD621625361001F1B23 /* ContentLabel.swift */; };
 		0450531F22B0097E00100BA2 /* Timline+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0450531E22B0097E00100BA2 /* Timline+UI.swift */; };
 		0454DDAF22B462EF00B8BB8E /* GalleryExpandAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0454DDAE22B462EF00B8BB8E /* GalleryExpandAnimationController.swift */; };
 		0454DDB122B467AA00B8BB8E /* GalleryShrinkAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0454DDB022B467AA00B8BB8E /* GalleryShrinkAnimationController.swift */; };
+		04586B4122B2FFB10021BD04 /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04586B4022B2FFB10021BD04 /* PreferencesView.swift */; };
+		04586B4322B301470021BD04 /* AppearancePrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04586B4222B301470021BD04 /* AppearancePrefsView.swift */; };
 		0461A3902163CBAE00C0A807 /* Cache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0461A38F2163CBAE00C0A807 /* Cache.framework */; };
 		0461A3912163CBAE00C0A807 /* Cache.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0461A38F2163CBAE00C0A807 /* Cache.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		04D14BB022B34A2800642648 /* GalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D14BAE22B34A2800642648 /* GalleryViewController.swift */; };
@@ -69,9 +75,7 @@
 		D627FF7B217E951500CC0648 /* DraftsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627FF7A217E951500CC0648 /* DraftsTableViewController.swift */; };
 		D627FF7D217E958900CC0648 /* DraftTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D627FF7C217E958900CC0648 /* DraftTableViewCell.xib */; };
 		D627FF7F217E95E000CC0648 /* DraftTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627FF7E217E95E000CC0648 /* DraftTableViewCell.swift */; };
-		D627FF81217FE8F400CC0648 /* BehaviorTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627FF80217FE8F400CC0648 /* BehaviorTableViewController.swift */; };
 		D6285B4F21EA695800FE4B39 /* StatusContentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6285B4E21EA695800FE4B39 /* StatusContentType.swift */; };
-		D6285B5121EA6E6E00FE4B39 /* AdvancedTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6285B5021EA6E6E00FE4B39 /* AdvancedTableViewController.swift */; };
 		D6285B5321EA708700FE4B39 /* StatusFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6285B5221EA708700FE4B39 /* StatusFormat.swift */; };
 		D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */; };
 		D62D2422217AA7E1005076CC /* UserActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2421217AA7E1005076CC /* UserActivityManager.swift */; };
@@ -100,8 +104,6 @@
 		D663625F2135C75500C9CBA2 /* ConversationMainStatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663625E2135C75500C9CBA2 /* ConversationMainStatusTableViewCell.swift */; };
 		D663626221360B1900C9CBA2 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663626121360B1900C9CBA2 /* Preferences.swift */; };
 		D663626421360D2300C9CBA2 /* AvatarStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663626321360D2300C9CBA2 /* AvatarStyle.swift */; };
-		D663626621360DD700C9CBA2 /* Preferences.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D663626521360DD700C9CBA2 /* Preferences.storyboard */; };
-		D663626821360E2C00C9CBA2 /* PreferencesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663626721360E2C00C9CBA2 /* PreferencesTableViewController.swift */; };
 		D663626A2136163000C9CBA2 /* PreferencesAdaptive.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66362692136163000C9CBA2 /* PreferencesAdaptive.swift */; };
 		D663626C21361C6700C9CBA2 /* Account+Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663626B21361C6700C9CBA2 /* Account+Preferences.swift */; };
 		D66362712136338600C9CBA2 /* ComposeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66362702136338600C9CBA2 /* ComposeViewController.swift */; };
@@ -121,7 +123,6 @@
 		D67C57AF21E28EAD00C3118B /* Array+Uniques.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67C57AE21E28EAD00C3118B /* Array+Uniques.swift */; };
 		D67C57B221E28FAD00C3118B /* ComposeStatusReplyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D67C57B121E28FAD00C3118B /* ComposeStatusReplyView.xib */; };
 		D67C57B421E2910700C3118B /* ComposeStatusReplyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67C57B321E2910700C3118B /* ComposeStatusReplyView.swift */; };
-		D67E0513216438A7000E0927 /* AppearanceTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67E0512216438A7000E0927 /* AppearanceTableViewController.swift */; };
 		D686329521ED8319008C716E /* GMImagePicker.strings in Resources */ = {isa = PBXBuildFile; fileRef = D686326E21ED8312008C716E /* GMImagePicker.strings */; };
 		D686329621ED8319008C716E /* GMImagePicker.strings in Resources */ = {isa = PBXBuildFile; fileRef = D686327121ED8312008C716E /* GMImagePicker.strings */; };
 		D686329721ED8319008C716E /* GMGridViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D686327321ED8312008C716E /* GMGridViewCell.m */; };
@@ -154,9 +155,6 @@
 		D6BC8748219738E1006163F1 /* EnhancedTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC8747219738E1006163F1 /* EnhancedTableViewController.swift */; };
 		D6BED170212663DA00F02DA0 /* SwiftSoup.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D6BED16E212663DA00F02DA0 /* SwiftSoup.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D6BED174212667E900F02DA0 /* StatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BED173212667E900F02DA0 /* StatusTableViewCell.swift */; };
-		D6C693CA2161253F007D6A6D /* SilentActionPermissionsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693C92161253F007D6A6D /* SilentActionPermissionsTableViewController.swift */; };
-		D6C693CD2161257B007D6A6D /* SilentActionPermissionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6C693CC2161257B007D6A6D /* SilentActionPermissionCell.xib */; };
-		D6C693CF216125FC007D6A6D /* SilentActionPermissionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693CE216125FC007D6A6D /* SilentActionPermissionTableViewCell.swift */; };
 		D6C693EF216192C2007D6A6D /* TuskerNavigationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */; };
 		D6C693F92162E4DB007D6A6D /* StatusContentLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693F82162E4DB007D6A6D /* StatusContentLabel.swift */; };
 		D6C693FC2162FE6F007D6A6D /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */; };
@@ -244,10 +242,16 @@
 /* Begin PBXFileReference section */
 		041160FE22B442870030A9B7 /* AttachmentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentViewController.swift; sourceTree = "<group>"; };
 		041160FF22B442870030A9B7 /* AttachmentViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AttachmentViewController.xib; sourceTree = "<group>"; };
+		0427033522B30B3D000D31B6 /* Preference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preference.swift; sourceTree = "<group>"; };
+		0427033722B30F5F000D31B6 /* BehaviorPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorPrefsView.swift; sourceTree = "<group>"; };
+		0427033922B31269000D31B6 /* AdvancedPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedPrefsView.swift; sourceTree = "<group>"; };
+		0427037B22B316B9000D31B6 /* SilentActionPrefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SilentActionPrefs.swift; sourceTree = "<group>"; };
 		04496BD621625361001F1B23 /* ContentLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentLabel.swift; sourceTree = "<group>"; };
 		0450531E22B0097E00100BA2 /* Timline+UI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Timline+UI.swift"; sourceTree = "<group>"; };
 		0454DDAE22B462EF00B8BB8E /* GalleryExpandAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryExpandAnimationController.swift; sourceTree = "<group>"; };
 		0454DDB022B467AA00B8BB8E /* GalleryShrinkAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryShrinkAnimationController.swift; sourceTree = "<group>"; };
+		04586B4022B2FFB10021BD04 /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
+		04586B4222B301470021BD04 /* AppearancePrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearancePrefsView.swift; sourceTree = "<group>"; };
 		0461A38F2163CBAE00C0A807 /* Cache.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Cache.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		04D14BAE22B34A2800642648 /* GalleryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryViewController.swift; sourceTree = "<group>"; };
 		04DACE8B212CB14B009840C4 /* MainTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarViewController.swift; sourceTree = "<group>"; };
@@ -304,9 +308,7 @@
 		D627FF7A217E951500CC0648 /* DraftsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsTableViewController.swift; sourceTree = "<group>"; };
 		D627FF7C217E958900CC0648 /* DraftTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DraftTableViewCell.xib; sourceTree = "<group>"; };
 		D627FF7E217E95E000CC0648 /* DraftTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftTableViewCell.swift; sourceTree = "<group>"; };
-		D627FF80217FE8F400CC0648 /* BehaviorTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorTableViewController.swift; sourceTree = "<group>"; };
 		D6285B4E21EA695800FE4B39 /* StatusContentType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusContentType.swift; sourceTree = "<group>"; };
-		D6285B5021EA6E6E00FE4B39 /* AdvancedTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedTableViewController.swift; sourceTree = "<group>"; };
 		D6285B5221EA708700FE4B39 /* StatusFormat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusFormat.swift; sourceTree = "<group>"; };
 		D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LargeImageViewController.xib; sourceTree = "<group>"; };
 		D62D2421217AA7E1005076CC /* UserActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivityManager.swift; sourceTree = "<group>"; };
@@ -334,8 +336,6 @@
 		D663625E2135C75500C9CBA2 /* ConversationMainStatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMainStatusTableViewCell.swift; sourceTree = "<group>"; };
 		D663626121360B1900C9CBA2 /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
 		D663626321360D2300C9CBA2 /* AvatarStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarStyle.swift; sourceTree = "<group>"; };
-		D663626521360DD700C9CBA2 /* Preferences.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = "<group>"; };
-		D663626721360E2C00C9CBA2 /* PreferencesTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesTableViewController.swift; sourceTree = "<group>"; };
 		D66362692136163000C9CBA2 /* PreferencesAdaptive.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesAdaptive.swift; sourceTree = "<group>"; };
 		D663626B21361C6700C9CBA2 /* Account+Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Account+Preferences.swift"; sourceTree = "<group>"; };
 		D66362702136338600C9CBA2 /* ComposeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeViewController.swift; sourceTree = "<group>"; };
@@ -355,7 +355,6 @@
 		D67C57AE21E28EAD00C3118B /* Array+Uniques.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+Uniques.swift"; sourceTree = "<group>"; };
 		D67C57B121E28FAD00C3118B /* ComposeStatusReplyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ComposeStatusReplyView.xib; sourceTree = "<group>"; };
 		D67C57B321E2910700C3118B /* ComposeStatusReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeStatusReplyView.swift; sourceTree = "<group>"; };
-		D67E0512216438A7000E0927 /* AppearanceTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceTableViewController.swift; sourceTree = "<group>"; };
 		D686326F21ED8312008C716E /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = GMImagePicker.strings; sourceTree = "<group>"; };
 		D686327221ED8312008C716E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = GMImagePicker.strings; sourceTree = "<group>"; };
 		D686327321ED8312008C716E /* GMGridViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GMGridViewCell.m; sourceTree = "<group>"; };
@@ -387,9 +386,6 @@
 		D6BC8747219738E1006163F1 /* EnhancedTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnhancedTableViewController.swift; sourceTree = "<group>"; };
 		D6BED16E212663DA00F02DA0 /* SwiftSoup.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SwiftSoup.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D6BED173212667E900F02DA0 /* StatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusTableViewCell.swift; sourceTree = "<group>"; };
-		D6C693C92161253F007D6A6D /* SilentActionPermissionsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SilentActionPermissionsTableViewController.swift; sourceTree = "<group>"; };
-		D6C693CC2161257B007D6A6D /* SilentActionPermissionCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SilentActionPermissionCell.xib; sourceTree = "<group>"; };
-		D6C693CE216125FC007D6A6D /* SilentActionPermissionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SilentActionPermissionTableViewCell.swift; sourceTree = "<group>"; };
 		D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TuskerNavigationDelegate.swift; sourceTree = "<group>"; };
 		D6C693F82162E4DB007D6A6D /* StatusContentLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusContentLabel.swift; sourceTree = "<group>"; };
 		D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
@@ -739,12 +735,11 @@
 		D641C789213DD87E004B4513 /* Preferences */ = {
 			isa = PBXGroup;
 			children = (
-				D663626521360DD700C9CBA2 /* Preferences.storyboard */,
+				04586B4022B2FFB10021BD04 /* PreferencesView.swift */,
-				D663626721360E2C00C9CBA2 /* PreferencesTableViewController.swift */,
+				04586B4222B301470021BD04 /* AppearancePrefsView.swift */,
-				D6285B5021EA6E6E00FE4B39 /* AdvancedTableViewController.swift */,
+				0427033722B30F5F000D31B6 /* BehaviorPrefsView.swift */,
-				D67E0512216438A7000E0927 /* AppearanceTableViewController.swift */,
+				0427033922B31269000D31B6 /* AdvancedPrefsView.swift */,
-				D627FF80217FE8F400CC0648 /* BehaviorTableViewController.swift */,
+				0427037B22B316B9000D31B6 /* SilentActionPrefs.swift */,
-				D6C693C92161253F007D6A6D /* SilentActionPermissionsTableViewController.swift */,
 			);
 			path = Preferences;
 			sourceTree = "<group>";
@@ -803,6 +798,7 @@
 				D663626121360B1900C9CBA2 /* Preferences.swift */,
 				D663626321360D2300C9CBA2 /* AvatarStyle.swift */,
 				D66362692136163000C9CBA2 /* PreferencesAdaptive.swift */,
+				0427033522B30B3D000D31B6 /* Preference.swift */,
 			);
 			path = Preferences;
 			sourceTree = "<group>";
@@ -936,15 +932,6 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
-		D6C693CB2161256B007D6A6D /* Silent Action Permissions */ = {
-			isa = PBXGroup;
-			children = (
-				D6C693CC2161257B007D6A6D /* SilentActionPermissionCell.xib */,
-				D6C693CE216125FC007D6A6D /* SilentActionPermissionTableViewCell.swift */,
-			);
-			path = "Silent Action Permissions";
-			sourceTree = "<group>";
-		};
 		D6C693FA2162FE5D007D6A6D /* Utilities */ = {
 			isa = PBXGroup;
 			children = (
@@ -1304,7 +1291,6 @@
 				D641C779213CAC56004B4513 /* ActionNotificationTableViewCell.xib in Resources */,
 				D627FF7D217E958900CC0648 /* DraftTableViewCell.xib in Resources */,
 				D667E5E921349EE50057A976 /* ProfileHeaderTableViewCell.xib in Resources */,
-				D6C693CD2161257B007D6A6D /* SilentActionPermissionCell.xib in Resources */,
 				D6D4DDDA212518A200E1C4BB /* LaunchScreen.storyboard in Resources */,
 				D6D4DDD7212518A200E1C4BB /* Assets.xcassets in Resources */,
 				D663625D2135C74800C9CBA2 /* ConversationMainStatusTableViewCell.xib in Resources */,
@@ -1312,7 +1298,6 @@
 				D640D76922BAF5E6004FBE69 /* DomainBlocks.plist in Resources */,
 				D641C77B213CB017004B4513 /* FollowNotificationTableViewCell.xib in Resources */,
 				D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */,
-				D663626621360DD700C9CBA2 /* Preferences.storyboard in Resources */,
 				D627FF79217E950100CC0648 /* DraftsTableViewController.xib in Resources */,
 				D67C57B221E28FAD00C3118B /* ComposeStatusReplyView.xib in Resources */,
 				0411610122B442870030A9B7 /* AttachmentViewController.xib in Resources */,
@@ -1408,12 +1393,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				D6285B5321EA708700FE4B39 /* StatusFormat.swift in Sources */,
+				0427033A22B31269000D31B6 /* AdvancedPrefsView.swift in Sources */,
 				D6757A822157E8FA00721E32 /* XCBSession.swift in Sources */,
 				04DACE8C212CB14B009840C4 /* MainTabBarViewController.swift in Sources */,
 				D6C693F92162E4DB007D6A6D /* StatusContentLabel.swift in Sources */,
 				D6D58DF922074B74009C8DD9 /* LinkLabel.swift in Sources */,
 				0454DDAF22B462EF00B8BB8E /* GalleryExpandAnimationController.swift in Sources */,
-				D6285B5121EA6E6E00FE4B39 /* AdvancedTableViewController.swift in Sources */,
 				0450531F22B0097E00100BA2 /* Timline+UI.swift in Sources */,
 				D667E5F52135BCD50057A976 /* ConversationTableViewController.swift in Sources */,
 				D6C7D27D22B6EBF800071952 /* AttachmentsContainerView.swift in Sources */,
@@ -1421,7 +1406,6 @@
 				0411610022B442870030A9B7 /* AttachmentViewController.swift in Sources */,
 				D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */,
 				D66362712136338600C9CBA2 /* ComposeViewController.swift in Sources */,
-				D627FF81217FE8F400CC0648 /* BehaviorTableViewController.swift in Sources */,
 				D6028B9B2150811100F223B9 /* MastodonCache.swift in Sources */,
 				D62D2422217AA7E1005076CC /* UserActivityManager.swift in Sources */,
 				D62D2424217ABF3F005076CC /* NSUserActivity+Extensions.swift in Sources */,
@@ -1440,17 +1424,18 @@
 				D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */,
 				D6E0DC8E216EDF1E00369478 /* Previewing.swift in Sources */,
 				D6BED174212667E900F02DA0 /* StatusTableViewCell.swift in Sources */,
+				0427033822B30F5F000D31B6 /* BehaviorPrefsView.swift in Sources */,
 				D64D0AAD2128D88B005A6F37 /* LocalData.swift in Sources */,
 				D6C94D892139E6EC00CB5196 /* AttachmentView.swift in Sources */,
 				D6C693EF216192C2007D6A6D /* TuskerNavigationDelegate.swift in Sources */,
 				D6C94D872139E62700CB5196 /* LargeImageViewController.swift in Sources */,
 				D6434EB3215B1856001A919A /* XCBRequest.swift in Sources */,
+				0427033622B30B3D000D31B6 /* Preference.swift in Sources */,
 				D663626221360B1900C9CBA2 /* Preferences.swift in Sources */,
 				D6333B792139AEFD00CE884A /* Date+TimeAgo.swift in Sources */,
 				D641C77F213DC78A004B4513 /* InlineTextAttachment.swift in Sources */,
 				04496BD721625361001F1B23 /* ContentLabel.swift in Sources */,
 				D663626C21361C6700C9CBA2 /* Account+Preferences.swift in Sources */,
-				D6C693CA2161253F007D6A6D /* SilentActionPermissionsTableViewController.swift in Sources */,
 				D6333B372137838300CE884A /* AttributedString+Helpers.swift in Sources */,
 				D6B8DB342182A59300424AF7 /* UIAlertController+Visibility.swift in Sources */,
 				D67C57AD21E265FC00C3118B /* LargeAccountDetailView.swift in Sources */,
@@ -1458,22 +1443,22 @@
 				D6C693FE2162FEEA007D6A6D /* UIViewController+Children.swift in Sources */,
 				D64D0AB12128D9AE005A6F37 /* OnboardingViewController.swift in Sources */,
 				D627FF76217E923E00CC0648 /* DraftsManager.swift in Sources */,
-				D663626821360E2C00C9CBA2 /* PreferencesTableViewController.swift in Sources */,
 				D64F80E2215875CC00BEF393 /* XCBActionType.swift in Sources */,
+				04586B4322B301470021BD04 /* AppearancePrefsView.swift in Sources */,
 				D67C57AF21E28EAD00C3118B /* Array+Uniques.swift in Sources */,
 				D66362752137068A00C9CBA2 /* Visibility+Helpers.swift in Sources */,
-				D67E0513216438A7000E0927 /* AppearanceTableViewController.swift in Sources */,
 				D6C693FC2162FE6F007D6A6D /* LoadingViewController.swift in Sources */,
 				D646C95A213B5D0500269FB5 /* LargeImageInteractionController.swift in Sources */,
 				D6F953EC212519E700CF0F2B /* TimelineTableViewController.swift in Sources */,
+				04586B4122B2FFB10021BD04 /* PreferencesView.swift in Sources */,
 				D663626A2136163000C9CBA2 /* PreferencesAdaptive.swift in Sources */,
 				D667E5EB21349EF80057A976 /* ProfileHeaderTableViewCell.swift in Sources */,
 				04D14BB022B34A2800642648 /* GalleryViewController.swift in Sources */,
 				D641C77D213CB024004B4513 /* FollowNotificationTableViewCell.swift in Sources */,
 				D641C773213CAA25004B4513 /* NotificationsTableViewController.swift in Sources */,
 				D6757A7C2157E01900721E32 /* XCBManager.swift in Sources */,
-				D6C693CF216125FC007D6A6D /* SilentActionPermissionTableViewCell.swift in Sources */,
 				D6F1F84D2193B56E00F5FE67 /* Cache.swift in Sources */,
+				0427037C22B316B9000D31B6 /* SilentActionPrefs.swift in Sources */,
 				D6757A7E2157E02600721E32 /* XCBRequestSpec.swift in Sources */,
 				D667E5F12134D5050057A976 /* UIViewController+Delegates.swift in Sources */,
 				D6BC8748219738E1006163F1 /* EnhancedTableViewController.swift in Sources */,
@@ -1891,7 +1876,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = D9LRWNKC29;
+				DEVELOPMENT_TEAM = HGYVAQA9FW;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1913,7 +1898,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = D9LRWNKC29;
+				DEVELOPMENT_TEAM = HGYVAQA9FW;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (

Tusker/Extensions/Visibility+Helpers.swift

@@ -24,19 +24,17 @@ extension Status.Visibility {
         }
     }
     
-    var image: UIImage {
+    var imageName: String {
-        let name: String
         switch self {
         case .public:
-            name = "globe"
+            return "globe"
         case .unlisted:
-            name = "lock.open.fill"
+            return "lock.open.fill"
         case .private:
-            name = "lock.fill"
+            return "lock.fill"
         case .direct:
-            name = "envelope.fill"
+            return "envelope.fill"
         }
-        return UIImage(systemName: name)!
     }
     
 }

Tusker/Preferences/Preference.swift

@@ -0,0 +1,60 @@
+//  Preference.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 6/13/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+
+@propertyWrapper
+struct Preference<Value>: BindingConvertible {
+    let path: WritableKeyPath<Preferences, Value>
+    let binding: Binding<Value>
+    
+    init(_ path: WritableKeyPath<Preferences, Value>) {
+        self.path = path
+        self.binding = Binding(getValue: {
+            return Preferences.shared[keyPath: path]
+        }, setValue: { (newValue) in
+            Preferences.shared[keyPath: path] = newValue
+        })
+    }
+    
+    var wrappedValue: Value {
+        get {
+            return Preferences.shared[keyPath: path]
+        }
+        set {
+            Preferences.shared[keyPath: path] = newValue
+        }
+    }
+}
+
+@propertyWrapper
+struct MappedPreference<Value, PrefValue>: BindingConvertible {
+    let path: WritableKeyPath<Preferences, PrefValue>
+    let fromPref: (PrefValue) -> Value
+    let toPref: (Value) -> PrefValue
+    let binding: Binding<Value>
+    
+    init(_ path: WritableKeyPath<Preferences, PrefValue>, fromPref: @escaping (PrefValue) -> Value, toPref: @escaping (Value) -> PrefValue) {
+        self.path = path
+        self.fromPref = fromPref
+        self.toPref = toPref
+        self.binding = Binding(getValue: {
+            return fromPref(Preferences.shared[keyPath: path])
+        }, setValue: { (newValue) in
+            Preferences.shared[keyPath: path] = toPref(newValue)
+        })
+    }
+    
+    var wrappedValue: Value {
+        get {
+            return fromPref(Preferences.shared[keyPath: path])
+        }
+        set {
+            Preferences.shared[keyPath: path] = toPref(newValue)
+        }
+    }
+}

Tusker/Preferences/Preferences.swift

@@ -8,10 +8,12 @@
 
 import Foundation
 import Pachyderm
+import SwiftUI
+import Combine
 
-class Preferences: Codable {
+class Preferences: Codable, BindableObject {
 
-    private(set) static var shared: Preferences = load()
+    static var shared: Preferences = load()
     
     private static var documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
     private static var archiveURL = Preferences.documentsDirectory.appendingPathComponent("preferences").appendingPathExtension("plist")
@@ -33,22 +35,35 @@ class Preferences: Codable {
     
     private init() {}
     
+    typealias PublisherType = PassthroughSubject<Preferences, Never>
+    let willChange = PassthroughSubject<Preferences, Never>()
+    
     // MARK: - Appearance
-    var showRepliesInProfiles = false
+    var showRepliesInProfiles = false { willSet { willChange.send(self) } }
-    var avatarStyle = AvatarStyle.roundRect
+    var avatarStyle = AvatarStyle.roundRect { willSet { willChange.send(self) } }
-    var hideCustomEmojiInUsernames = false
+    var hideCustomEmojiInUsernames = false { willSet { willChange.send(self) } }
     
     // MARK: - Behavior
-    var defaultPostVisibility = Status.Visibility.public
+    var defaultPostVisibility = Status.Visibility.public { willSet { willChange.send(self) } }
-    var automaticallySaveDrafts = true
+    var automaticallySaveDrafts = true { willSet { willChange.send(self) } }
-    var openLinksInApps = true
+    var openLinksInApps = true { willSet { willChange.send(self) } }
     
     // MARK: - Advanced
-    var silentActions: [String: Permission] = [:]
+    var silentActions: [String: Permission] = [:] { willSet { willChange.send(self) } }
-    var statusContentType: StatusContentType = .plain
+    var statusContentType: StatusContentType = .plain { willSet { willChange.send(self) } }
     
 }
 
+extension PassthroughSubject: Codable {
+    public convenience init(from decoder: Decoder) throws {
+        self.init()
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        
+    }
+}
+
 extension Preferences {
     enum Permission: String, Codable {
         case undecided, accepted, rejected

Tusker/Screens/Compose/ComposeViewController.swift

@@ -103,7 +103,7 @@ class ComposeViewController: UIViewController {
         
         let toolbar = UIToolbar()
         contentWarningBarButtonItem = UIBarButtonItem(title: "CW", style: .plain, target: self, action: #selector(contentWarningButtonPressed))
-        visibilityBarButtonItem = UIBarButtonItem(image: nil, style: .plain, target: self, action: #selector(visibilityButtonPressed))
+        visibilityBarButtonItem = UIBarButtonItem(image: UIImage(systemName: Preferences.shared.defaultPostVisibility.imageName), style: .plain, target: self, action: #selector(visibilityButtonPressed))
         toolbar.items = [
             contentWarningBarButtonItem,
             visibilityBarButtonItem,
@@ -159,6 +159,8 @@ class ComposeViewController: UIViewController {
             stackView.insertArrangedSubview(replyLabelContainer, at: 1)
         }
         
+        // we have to set the font here, because the monospaced digit font is not available in IB
+        charactersRemainingLabel.font = .monospacedDigitSystemFont(ofSize: 17, weight: .regular)
         updateCharactersRemaining()
         updatePlaceholder()
         
@@ -294,7 +296,7 @@ class ComposeViewController: UIViewController {
     }
     
     func visibilityChanged() {
-        visibilityBarButtonItem.image = visibility.image
+        visibilityBarButtonItem.image = UIImage(systemName: visibility.imageName)
     }
     
     func saveDraft() {

Tusker/Screens/Onboarding/OnboardingViewController.swift

@@ -83,10 +83,12 @@ class OnboardingViewController: UIViewController {
                     }
                 }
             }
+            DispatchQueue.main.async {
                 self.authenticationSession!.presentationContextProvider = self
                 self.authenticationSession!.start()
             }
         }
+    }
     
     @IBAction func clearDataPressed(_ sender: Any) {
         LocalData.shared.instanceURL = nil

Tusker/Screens/Preferences/AdvancedPrefsView.swift

@@ -0,0 +1,65 @@
+//  AdvancedPrefsView.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 6/13/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+import Pachyderm
+
+struct AdvancedPrefsView : View {
+    @Preference(\.statusContentType) var statusContentType: StatusContentType
+    
+    var body: some View {
+        List {
+            formattingSection
+            automationSection
+        }.listStyle(.grouped)
+            .navigationBarTitle(Text("Advanced"))
+    }
+    
+    var formattingFooter: some View {
+        Text("This option is only supported for Pleroma and Mastodon instances with formatting enabled. On all other instances, formatting symbols will remain in the unformatted plain text.").lineLimit(nil)
+    }
+    
+    var formattingSection: some View {
+        Section(footer: formattingFooter) {
+            Picker(selection: _statusContentType.binding, label: Text("Post Content Type")) {
+                ForEach(StatusContentType.allCases, id: \.self) { type in
+                    Text(type.displayName).tag(type)
+                }//.navigationBarTitle("Post Content Type")
+                // see FB6838291
+            }
+        }
+    }
+    
+    var automationSection: some View {
+        Section(header: Text("AUTOMATION")) {
+            NavigationLink(destination: SilentActionPrefs()) {
+                Text("Silent Action Permissions")
+            }
+        }
+    }
+}
+
+extension StatusContentType {
+    var displayName: String {
+        switch self {
+        case .plain:
+            return "Plain"
+        case .markdown:
+            return "Markdown"
+        case .html:
+            return "HTML"
+        }
+    }
+}
+
+#if DEBUG
+struct AdvancedPrefsView_Previews : PreviewProvider {
+    static var previews: some View {
+        AdvancedPrefsView()
+    }
+}
+#endif

Tusker/Screens/Preferences/AdvancedTableViewController.swift

@@ -1,56 +0,0 @@
-//
-//  AdvancedTableViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 1/12/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import Pachyderm
-
-class AdvancedTableViewController: UITableViewController {
-
-    @IBOutlet weak var postContentTypeLabel: UILabel!
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        postContentTypeLabel.text = Preferences.shared.statusContentType.displayName
-    }
-
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        guard indexPath.section == 1 && indexPath.row == 0 else {
-            return
-        }
-        tableView.deselectRow(at: indexPath, animated: true)
-        
-        let alertController = UIAlertController(title: "Post Content Type", message: nil, preferredStyle: .actionSheet)
-        for contentType in StatusContentType.allCases {
-            let action = UIAlertAction(title: contentType.displayName, style: .default) { (_) in
-                Preferences.shared.statusContentType = contentType
-                self.postContentTypeLabel.text = contentType.displayName
-            }
-            if contentType == Preferences.shared.statusContentType {
-                action.setValue(true, forKey: "checked")
-            }
-            alertController.addAction(action)
-        }
-        alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-        present(alertController, animated: true)
-    }
-    
-}
-
-extension StatusContentType {
-    var displayName: String {
-        switch self {
-        case .plain:
-            return "Plain"
-        case .markdown:
-            return "Markdown"
-        case .html:
-            return "HTML"
-        }
-    }
-}

Tusker/Screens/Preferences/AppearancePrefsView.swift

@@ -0,0 +1,40 @@
+//  AppearancePrefsView.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 6/13/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+
+struct AppearancePrefsView : View {
+    @Preference(\.showRepliesInProfiles) var showRepliesInProfiles: Bool
+    @Preference(\.hideCustomEmojiInUsernames) var hideCustomEmojiInUsernames: Bool
+    
+    @MappedPreference(\.avatarStyle, fromPref: { $0 == .circle }, toPref: { $0 ? .circle : .roundRect })
+    var useCircularAvatars: Bool
+    
+    var body: some View {
+        List {
+            Toggle(isOn: _showRepliesInProfiles.binding) {
+                Text("Show Replies in Profiles")
+            }
+            Toggle(isOn: _useCircularAvatars.binding) {
+                Text("Use Circular Avatars")
+            }
+            Toggle(isOn: _hideCustomEmojiInUsernames.binding) {
+                Text("Hide Custom Emoji in Usernames")
+            }
+        }
+            .listStyle(.grouped)
+            .navigationBarTitle(Text("Appearance"))
+    }
+}
+
+#if DEBUG
+struct AppearancePrefsView_Previews : PreviewProvider {
+    static var previews: some View {
+        AppearancePrefsView()
+    }
+}
+#endif

Tusker/Screens/Preferences/AppearanceTableViewController.swift

@@ -1,49 +0,0 @@
-//
-//  AppearanceTableViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 10/2/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-class AppearanceTableViewController: UITableViewController {
-
-    @IBOutlet weak var showRepliesInProfilesSwitch: UISwitch!
-    @IBOutlet weak var circularAvatarsSwitch: UISwitch!
-    @IBOutlet weak var hideCustomEmojiInUsernamesSwitch: UISwitch!
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        showRepliesInProfilesSwitch.setOn(Preferences.shared.showRepliesInProfiles, animated: false)
-        circularAvatarsSwitch.setOn(Preferences.shared.avatarStyle == .circle, animated: false)
-        hideCustomEmojiInUsernamesSwitch.setOn(Preferences.shared.hideCustomEmojiInUsernames, animated: false)
-    }
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
-    }
-    */
-    
-    // MARK: - Interaction
-    
-    @IBAction func showRepliesInProfilesChanged(_ sender: Any) {
-        Preferences.shared.showRepliesInProfiles = showRepliesInProfilesSwitch.isOn
-    }
-    
-    @IBAction func circularAvatarsChanged(_ sender: Any) {
-        Preferences.shared.avatarStyle = circularAvatarsSwitch.isOn ? .circle : .roundRect
-    }
-    
-    @IBAction func hideCustomEmojiInUsernamesChanged(_ sender: Any) {
-        Preferences.shared.hideCustomEmojiInUsernames = hideCustomEmojiInUsernamesSwitch.isOn
-    }
-
-}

Tusker/Screens/Preferences/BehaviorPrefsView.swift

@@ -0,0 +1,57 @@
+//  BehaviorPrefsView.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 6/13/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+import Pachyderm
+
+struct BehaviorPrefsView : View {
+    @Preference(\.defaultPostVisibility) var defaultPostVisibility: Status.Visibility
+    @Preference(\.automaticallySaveDrafts) var automaticallySaveDrafts: Bool
+    @Preference(\.openLinksInApps) var openLinksInApps: Bool
+    
+    var body: some View {
+        List {
+            section1
+            section2
+        }.listStyle(.grouped)
+            .navigationBarTitle(Text("Behavior"))
+    }
+    
+    var section1: some View {
+        Section {
+            Picker(selection: _defaultPostVisibility.binding, label: Text("Default Post Visibility")) {
+                ForEach(Status.Visibility.allCases, id: \.self) { visibility in
+                    HStack {
+                        Image(systemName: visibility.imageName)
+                        Text(visibility.displayName)
+                    }
+                    .tag(visibility)
+                }//.navigationBarTitle("Default Post Visibility")
+                // navbar title on the ForEach is currently incorrectly applied when the picker is not expanded, see FB6838291
+            }
+            Toggle(isOn: _automaticallySaveDrafts.binding) {
+                Text("Automatically Save Drafts")
+            }
+        }
+    }
+    
+    var section2: some View {
+        Section {
+            Toggle(isOn: _openLinksInApps.binding) {
+                Text("Open Links in Apps")
+            }
+        }
+    }
+}
+
+#if DEBUG
+struct BehaviorPrefsView_Previews : PreviewProvider {
+    static var previews: some View {
+        BehaviorPrefsView()
+    }
+}
+#endif

Tusker/Screens/Preferences/BehaviorTableViewController.swift

@@ -1,53 +0,0 @@
-//
-//  BehaviorTableViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 10/23/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-class BehaviorTableViewController: UITableViewController {
-
-    @IBOutlet weak var defaultPostVisibilityLabel: UILabel!
-    @IBOutlet weak var automaticallySaveDraftsSwitch: UISwitch!
-    @IBOutlet weak var openLinksInAppsSwitch: UISwitch!
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        defaultPostVisibilityLabel.text = Preferences.shared.defaultPostVisibility.displayName
-        automaticallySaveDraftsSwitch.setOn(Preferences.shared.automaticallySaveDrafts, animated: false)
-        openLinksInAppsSwitch.setOn(Preferences.shared.openLinksInApps, animated: false)
-    }
-    
-    override func tableView(_ tableView: UITableView, willSelectRowAt indexPath: IndexPath) -> IndexPath? {
-        if indexPath.row == 0 {
-            return indexPath
-        } else {
-            return nil
-        }
-    }
-    
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        tableView.deselectRow(at: indexPath, animated: true)
-        
-        let alertController = UIAlertController(currentVisibility: Preferences.shared.defaultPostVisibility) { (visibility) in
-            guard let visibility = visibility else { return }
-            Preferences.shared.defaultPostVisibility = visibility
-            self.defaultPostVisibilityLabel.text = visibility.displayName
-        }
-        present(alertController, animated: true)
-    }
-    
-    @IBAction func automaticallySaveDraftsChanged(_ sender: Any) {
-        Preferences.shared.automaticallySaveDrafts = automaticallySaveDraftsSwitch.isOn
-    }
-    
-    @IBAction func openLinksInAppsChanged(_ sender: Any) {
-        Preferences.shared.openLinksInApps = openLinksInAppsSwitch.isOn
-    }
-    
-    
-}

Tusker/Screens/Preferences/Preferences.storyboard

@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.11" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="VJJ-jC-9g8">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.13"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-        <capability name="iOS 13.0 system colors" minToolsVersion="11.0"/>
-    </dependencies>
-    <scenes>
-        <!--Preferences-->
-        <scene sceneID="PD7-d3-cFe">
-            <objects>
-                <tableViewController id="ArB-e7-yko" customClass="PreferencesTableViewController" customModule="Tusker" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="JGC-f9-j7V">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <sections>
-                            <tableViewSection id="L3p-2V-jca">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="RYV-cK-4my">
-                                        <rect key="frame" x="16" y="18" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="RYV-cK-4my" id="Vmf-7I-FNS">
-                                            <rect key="frame" x="0.0" y="0.0" width="316.5" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Appearance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mb9-q2-iNW">
-                                                    <rect key="frame" x="16" y="11.5" width="93" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="Mb9-q2-iNW" firstAttribute="centerY" secondItem="Vmf-7I-FNS" secondAttribute="centerY" id="3QP-UK-jxr"/>
-                                                <constraint firstItem="Mb9-q2-iNW" firstAttribute="leading" secondItem="Vmf-7I-FNS" secondAttribute="leadingMargin" constant="8" id="yi1-5N-Tbj"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <segue destination="oM9-mi-wRc" kind="show" id="G45-fS-Nsj"/>
-                                        </connections>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="58g-Zq-ZuE">
-                                        <rect key="frame" x="16" y="62" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="58g-Zq-ZuE" id="4bV-t8-TdS">
-                                            <rect key="frame" x="0.0" y="0.0" width="316.5" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Behavior" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8XT-eR-Gzo">
-                                                    <rect key="frame" x="16" y="11.5" width="67" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="8XT-eR-Gzo" firstAttribute="leading" secondItem="4bV-t8-TdS" secondAttribute="leadingMargin" constant="8" id="Fe9-Ba-kbK"/>
-                                                <constraint firstItem="8XT-eR-Gzo" firstAttribute="centerY" secondItem="4bV-t8-TdS" secondAttribute="centerY" id="huw-Dv-Z4B"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <segue destination="Nk9-yO-78a" kind="show" id="PFV-VR-Ujc"/>
-                                        </connections>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="eQh-JA-eyx">
-                                        <rect key="frame" x="16" y="106" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="eQh-JA-eyx" id="2y5-gN-4xJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="316.5" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Advanced" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SWr-6T-ZL5">
-                                                    <rect key="frame" x="16" y="11.5" width="77" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="SWr-6T-ZL5" firstAttribute="leading" secondItem="2y5-gN-4xJ" secondAttribute="leadingMargin" constant="8" id="1hJ-fj-Llf"/>
-                                                <constraint firstItem="SWr-6T-ZL5" firstAttribute="centerY" secondItem="2y5-gN-4xJ" secondAttribute="centerY" id="Qao-fy-t0w"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <segue destination="3mv-l7-6We" kind="show" id="v4C-bk-CFc"/>
-                                        </connections>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="ArB-e7-yko" id="Kxa-qc-mae"/>
-                            <outlet property="delegate" destination="ArB-e7-yko" id="BFj-a8-oE6"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Preferences" id="dN7-yl-voz">
-                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="k5d-0p-0Yf">
-                            <connections>
-                                <action selector="donePressed:" destination="ArB-e7-yko" id="6na-ww-vm4"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="GBL-Cz-yNZ" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="825" y="-234"/>
-        </scene>
-        <!--Appearance-->
-        <scene sceneID="Dvq-ZP-V7u">
-            <objects>
-                <tableViewController id="oM9-mi-wRc" customClass="AppearanceTableViewController" customModule="Tusker" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="zP4-rb-dsB">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <sections>
-                            <tableViewSection headerTitle="Display" id="gwC-db-0ec">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="cSJ-mP-CMQ">
-                                        <rect key="frame" x="16" y="55.5" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cSJ-mP-CMQ" id="K0u-vm-1cA">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Show Replies in Profiles" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lhL-hU-TwV">
-                                                    <rect key="frame" x="16" y="11.5" width="182" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1r3-n8-8xm">
-                                                    <rect key="frame" x="286" y="6.5" width="51" height="31"/>
-                                                    <connections>
-                                                        <action selector="showRepliesInProfilesChanged:" destination="oM9-mi-wRc" eventType="valueChanged" id="2T6-AX-x81"/>
-                                                        <action selector="showRepliesInProfilesChanged:" destination="ArB-e7-yko" eventType="valueChanged" id="4Dp-OY-jWt"/>
-                                                    </connections>
-                                                </switch>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="lhL-hU-TwV" firstAttribute="leading" secondItem="K0u-vm-1cA" secondAttribute="leadingMargin" constant="8" id="QM5-y3-iGB"/>
-                                                <constraint firstItem="lhL-hU-TwV" firstAttribute="centerY" secondItem="K0u-vm-1cA" secondAttribute="centerY" id="Xq4-5w-m1n"/>
-                                                <constraint firstItem="1r3-n8-8xm" firstAttribute="centerY" secondItem="K0u-vm-1cA" secondAttribute="centerY" id="aC7-WR-8R4"/>
-                                                <constraint firstAttribute="trailing" secondItem="1r3-n8-8xm" secondAttribute="trailing" constant="8" id="co5-zL-DP5"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="KRM-HM-H3l">
-                                        <rect key="frame" x="16" y="99.5" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="KRM-HM-H3l" id="1OA-09-UkD">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Use Circular Avatars" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U0d-1s-1mq">
-                                                    <rect key="frame" x="16" y="11.5" width="155" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Huh-Lk-M4J">
-                                                    <rect key="frame" x="286" y="6.5" width="51" height="31"/>
-                                                    <connections>
-                                                        <action selector="circularAvatarsChanged:" destination="oM9-mi-wRc" eventType="valueChanged" id="Jd1-cu-AUu"/>
-                                                    </connections>
-                                                </switch>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="U0d-1s-1mq" firstAttribute="leading" secondItem="1OA-09-UkD" secondAttribute="leadingMargin" constant="8" id="RpK-YC-s0g"/>
-                                                <constraint firstItem="U0d-1s-1mq" firstAttribute="centerY" secondItem="1OA-09-UkD" secondAttribute="centerY" id="TzO-tq-5ab"/>
-                                                <constraint firstItem="Huh-Lk-M4J" firstAttribute="centerY" secondItem="1OA-09-UkD" secondAttribute="centerY" id="c9P-0f-jL9"/>
-                                                <constraint firstAttribute="trailing" secondItem="Huh-Lk-M4J" secondAttribute="trailing" constant="8" id="dZP-bT-whk"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="KoZ-lA-gof">
-                                        <rect key="frame" x="16" y="143.5" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="KoZ-lA-gof" id="ZiQ-kq-AHv">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hide Custom Emoji in Usernames" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fM0-HA-l0w">
-                                                    <rect key="frame" x="16" y="11.5" width="255" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XJI-I2-vRF">
-                                                    <rect key="frame" x="286" y="6.5" width="51" height="31"/>
-                                                    <connections>
-                                                        <action selector="hideCustomEmojiInUsernamesChanged:" destination="oM9-mi-wRc" eventType="valueChanged" id="dPX-Di-Ie4"/>
-                                                    </connections>
-                                                </switch>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="fM0-HA-l0w" firstAttribute="leading" secondItem="ZiQ-kq-AHv" secondAttribute="leadingMargin" constant="8" id="CkT-N0-BAq"/>
-                                                <constraint firstItem="fM0-HA-l0w" firstAttribute="centerY" secondItem="ZiQ-kq-AHv" secondAttribute="centerY" id="ko9-pK-miM"/>
-                                                <constraint firstAttribute="trailing" secondItem="XJI-I2-vRF" secondAttribute="trailing" constant="8" id="oCf-HZ-z6n"/>
-                                                <constraint firstItem="XJI-I2-vRF" firstAttribute="centerY" secondItem="ZiQ-kq-AHv" secondAttribute="centerY" id="tti-fN-d32"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                            <tableViewSection headerTitle="Interaction" id="2hR-aI-CRP">
-                                <cells/>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="oM9-mi-wRc" id="ubt-jB-z6P"/>
-                            <outlet property="delegate" destination="oM9-mi-wRc" id="Mal-XI-CBW"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Appearance" id="Ygz-zL-xT0"/>
-                    <connections>
-                        <outlet property="circularAvatarsSwitch" destination="Huh-Lk-M4J" id="D0Q-1G-ZaY"/>
-                        <outlet property="hideCustomEmojiInUsernamesSwitch" destination="XJI-I2-vRF" id="yOV-Zc-uPV"/>
-                        <outlet property="showRepliesInProfilesSwitch" destination="1r3-n8-8xm" id="dfM-E0-fYY"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Rkj-gt-dSt" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2" y="535"/>
-        </scene>
-        <!--Behavior-->
-        <scene sceneID="Ebo-tR-MEU">
-            <objects>
-                <tableViewController id="Nk9-yO-78a" customClass="BehaviorTableViewController" customModule="Tusker" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="mh1-En-1nK">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <sections>
-                            <tableViewSection id="aBH-nA-3uG">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="d0B-9U-ZkB">
-                                        <rect key="frame" x="16" y="18" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="d0B-9U-ZkB" id="GI8-Xu-bhJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Default Post Visibility" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xrH-fX-mdk">
-                                                    <rect key="frame" x="16" y="11.5" width="162" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Public" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OBq-tA-USG">
-                                                    <rect key="frame" x="280" y="11.5" width="47" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="secondaryLabelColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstAttribute="trailingMargin" secondItem="OBq-tA-USG" secondAttribute="trailing" constant="8" id="PEX-ks-Ntx"/>
-                                                <constraint firstItem="xrH-fX-mdk" firstAttribute="centerY" secondItem="GI8-Xu-bhJ" secondAttribute="centerY" id="SlK-Id-U1r"/>
-                                                <constraint firstItem="OBq-tA-USG" firstAttribute="centerY" secondItem="GI8-Xu-bhJ" secondAttribute="centerY" id="VT7-GB-9U4"/>
-                                                <constraint firstItem="xrH-fX-mdk" firstAttribute="leading" secondItem="GI8-Xu-bhJ" secondAttribute="leadingMargin" constant="8" id="vwm-LF-b6v"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="T41-nS-8UI">
-                                        <rect key="frame" x="16" y="62" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="T41-nS-8UI" id="bCk-ll-mpm">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Automatically Save Drafts" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2y8-UR-gqh">
-                                                    <rect key="frame" x="16" y="11.5" width="196" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HV4-3m-Mal">
-                                                    <rect key="frame" x="278" y="6.5" width="51" height="31"/>
-                                                    <connections>
-                                                        <action selector="automaticallySaveDraftsChanged:" destination="Nk9-yO-78a" eventType="valueChanged" id="oHc-vf-afw"/>
-                                                    </connections>
-                                                </switch>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="2y8-UR-gqh" firstAttribute="leading" secondItem="bCk-ll-mpm" secondAttribute="leadingMargin" constant="8" id="MWr-9X-TKF"/>
-                                                <constraint firstItem="HV4-3m-Mal" firstAttribute="centerY" secondItem="bCk-ll-mpm" secondAttribute="centerY" id="Ogg-Sb-CpW"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="HV4-3m-Mal" secondAttribute="trailing" constant="8" id="h5L-QT-jeb"/>
-                                                <constraint firstItem="2y8-UR-gqh" firstAttribute="centerY" secondItem="bCk-ll-mpm" secondAttribute="centerY" id="pZ7-S0-xAN"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                            <tableViewSection id="pnH-qu-zTX">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="A95-CC-eMR">
-                                        <rect key="frame" x="16" y="142" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="A95-CC-eMR" id="0l5-fe-g8R">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Open Links in Apps" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pRl-1e-i4j">
-                                                    <rect key="frame" x="16" y="11.5" width="148" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="85C-G0-cRk">
-                                                    <rect key="frame" x="278" y="6.5" width="51" height="31"/>
-                                                    <connections>
-                                                        <action selector="automaticallySaveDraftsChanged:" destination="Nk9-yO-78a" eventType="valueChanged" id="3jl-gq-XEX"/>
-                                                        <action selector="openLinksInAppsChanged:" destination="Nk9-yO-78a" eventType="valueChanged" id="THd-FD-XYN"/>
-                                                    </connections>
-                                                </switch>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="85C-G0-cRk" firstAttribute="centerY" secondItem="0l5-fe-g8R" secondAttribute="centerY" id="QuM-P5-nPV"/>
-                                                <constraint firstItem="pRl-1e-i4j" firstAttribute="leading" secondItem="0l5-fe-g8R" secondAttribute="leadingMargin" constant="8" id="Xqp-IO-EiQ"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="85C-G0-cRk" secondAttribute="trailing" constant="8" id="bKz-K4-r5w"/>
-                                                <constraint firstItem="pRl-1e-i4j" firstAttribute="centerY" secondItem="0l5-fe-g8R" secondAttribute="centerY" id="ns6-xZ-q0A"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="Nk9-yO-78a" id="bN3-mz-nCZ"/>
-                            <outlet property="delegate" destination="Nk9-yO-78a" id="06Z-ze-T6Q"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Behavior" id="PaI-hR-64i"/>
-                    <connections>
-                        <outlet property="automaticallySaveDraftsSwitch" destination="HV4-3m-Mal" id="eE1-Q4-za9"/>
-                        <outlet property="defaultPostVisibilityLabel" destination="OBq-tA-USG" id="yFX-yQ-dN9"/>
-                        <outlet property="openLinksInAppsSwitch" destination="85C-G0-cRk" id="2lR-Jb-O6K"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="YN6-Jb-XJJ" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="825" y="528"/>
-        </scene>
-        <!--Advanced-->
-        <scene sceneID="xgj-Fx-53j">
-            <objects>
-                <tableViewController id="3mv-l7-6We" customClass="AdvancedTableViewController" customModule="Tusker" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="hcR-ju-th0">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <sections>
-                            <tableViewSection headerTitle="Automation" id="eWp-x3-oMd">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" id="O0c-tR-bX1">
-                                        <rect key="frame" x="16" y="55.5" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="O0c-tR-bX1" id="im1-BJ-7Ov">
-                                            <rect key="frame" x="0.0" y="0.0" width="316.5" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Silent Action Permissions" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dxZ-65-xsN">
-                                                    <rect key="frame" x="16" y="11.5" width="193" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="dxZ-65-xsN" firstAttribute="centerY" secondItem="im1-BJ-7Ov" secondAttribute="centerY" id="8kb-23-tWR"/>
-                                                <constraint firstItem="dxZ-65-xsN" firstAttribute="leading" secondItem="im1-BJ-7Ov" secondAttribute="leadingMargin" constant="8" id="cx9-eY-n5y"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <segue destination="aHP-YB-bnY" kind="show" id="YTT-Nh-TBJ"/>
-                                        </connections>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                            <tableViewSection id="aNt-ow-hHp">
-                                <string key="footerTitle">This option is only supported for Pleroma instances with formatting enabled. On all other instances, formatting symbols will remain in the plain, unformatted text.</string>
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="L56-bm-5R5">
-                                        <rect key="frame" x="16" y="135.5" width="343" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="L56-bm-5R5" id="mtr-Qa-CSI">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Post Content Type" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ThO-WW-QsH">
-                                                    <rect key="frame" x="16" y="11.5" width="142" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Plain" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uq5-Fi-mpp">
-                                                    <rect key="frame" x="290" y="11.5" width="37" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="secondaryLabelColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstItem="uq5-Fi-mpp" firstAttribute="centerY" secondItem="mtr-Qa-CSI" secondAttribute="centerY" id="BMn-9K-DXz"/>
-                                                <constraint firstItem="ThO-WW-QsH" firstAttribute="centerY" secondItem="mtr-Qa-CSI" secondAttribute="centerY" id="p7P-du-z4q"/>
-                                                <constraint firstItem="ThO-WW-QsH" firstAttribute="leading" secondItem="mtr-Qa-CSI" secondAttribute="leadingMargin" constant="8" id="upT-aD-0JW"/>
-                                                <constraint firstItem="uq5-Fi-mpp" firstAttribute="trailing" secondItem="mtr-Qa-CSI" secondAttribute="trailingMargin" constant="-8" id="vW4-hc-eeu"/>
-                                            </constraints>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="3mv-l7-6We" id="Ots-vG-253"/>
-                            <outlet property="delegate" destination="3mv-l7-6We" id="sgz-7z-l0C"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Advanced" id="Rav-Eq-k22"/>
-                    <connections>
-                        <outlet property="postContentTypeLabel" destination="uq5-Fi-mpp" id="LN1-20-FMA"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="4wC-Hp-AZk" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1612" y="528"/>
-        </scene>
-        <!--Silent Actions-->
-        <scene sceneID="Vyy-sh-Tca">
-            <objects>
-                <tableViewController id="aHP-YB-bnY" customClass="SilentActionPermissionsTableViewController" customModule="Tusker" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Bpx-p9-yXW">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                        <connections>
-                            <outlet property="dataSource" destination="aHP-YB-bnY" id="f9C-VF-QBf"/>
-                            <outlet property="delegate" destination="aHP-YB-bnY" id="8P5-YV-yop"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Silent Actions" id="W0R-yx-QyV"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Db4-9Z-l6U" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1612" y="1280"/>
-        </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="3UV-H1-kd4">
-            <objects>
-                <navigationController id="VJJ-jC-9g8" sceneMemberID="viewController">
-                    <nil key="simulatedBottomBarMetrics"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="YW6-8Y-aXt">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="ArB-e7-yko" kind="relationship" relationship="rootViewController" id="iO7-5u-D0i"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Otz-oe-r9y" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="825" y="-1025"/>
-        </scene>
-    </scenes>
-</document>

Tusker/Screens/Preferences/PreferencesTableViewController.swift

@@ -1,22 +0,0 @@
-//
-//  PreferencesTableViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 8/28/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-class PreferencesTableViewController: UITableViewController {
-
-    static func create() -> UINavigationController {
-        guard let navigationController = UIStoryboard(name: "Preferences", bundle: nil).instantiateInitialViewController() as? UINavigationController else { fatalError() }
-        return navigationController
-    }
-    
-    @IBAction func donePressed(_ sender: Any) {
-        dismiss(animated: true)
-    }
-    
-}

Tusker/Screens/Preferences/PreferencesView.swift

@@ -0,0 +1,37 @@
+//  PreferencesView.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 6/13/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+
+struct PreferencesView : View {
+    var body: some View {
+        // workaround: the navigation view is provided by MyProfileTableViewController so that it can inject the Done button
+//        NavigationView {
+            List {
+                NavigationLink(destination: AppearancePrefsView()) {
+                    Text("Appearance")
+                }
+                NavigationLink(destination: BehaviorPrefsView()) {
+                    Text("Behavior")
+                }
+                NavigationLink(destination: AdvancedPrefsView()) {
+                    Text("Advanced")
+                }
+            }
+                .listStyle(.grouped)
+                .navigationBarTitle(Text("Preferences"), displayMode: .inline)
+//        }
+    }
+}
+
+#if DEBUG
+struct PreferencesView_Previews : PreviewProvider {
+    static var previews: some View {
+        PreferencesView()
+    }
+}
+#endif

Tusker/Screens/Preferences/SilentActionPermissionsTableViewController.swift

@@ -1,49 +0,0 @@
-//
-//  SilentActionPermissionsTableViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 9/30/18.
-//  Copyright © 2018 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-class SilentActionPermissionsTableViewController: UITableViewController {
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        tableView.register(UINib(nibName: "SilentActionPermissionCell", bundle: nil), forCellReuseIdentifier: "permissionCell")
-    }
-
-    // MARK: - Table view data source
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return Preferences.shared.silentActions.count
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        guard let cell = tableView.dequeueReusableCell(withIdentifier: "permissionCell", for: indexPath) as? SilentActionPermissionTableViewCell else { fatalError() }
-
-        let index = Preferences.shared.silentActions.index(Preferences.shared.silentActions.startIndex, offsetBy: indexPath.row)
-        let (source, permission) = Preferences.shared.silentActions[index]
-        cell.updateUI(source: source, permission: permission)
-
-        return cell
-    }
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
-    }
-    */
-
-}

Tusker/Screens/Preferences/SilentActionPrefs.swift

@@ -0,0 +1,77 @@
+//  SilentActionPrefs.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 6/13/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+
+//struct SilentActionPermission: Identifiable {
+//    let application: String
+//    let permission: Preferences.Permission
+//
+//    var id: String {
+//        return application
+//    }
+//
+//    init(_ application: String, _ permission: Preferences.Permission) {
+//        self.application = application
+//        self.permission = permission
+//    }
+//}
+
+struct SilentActionPrefs : View {
+//    @MappedPreference(\.silentActions, fromPref: {
+//        var array = [SilentActionPermission]()
+//        for (application, permission) in $0 {
+//            array.append(SilentActionPermission(application, permission))
+//        }
+//        return array
+//    })
+//    var silentActionPermissions: [SilentActionPermission]
+//    @Preference(\.silentActions) var silentActions: [String: Preferences.Permission]
+    @EnvironmentObject var preferences: Preferences
+    
+    var body: some View {
+        List(Array(preferences.silentActions.keys), id: \.self) { source in
+            SilentActionPermissionCell(source: source)
+        }
+            .listStyle(.grouped)
+//            .navigationBarTitle("Silent Action Permissions")
+        // see FB6838291
+//        List(Array(silentActions.keys).identified(by: \.self)) { application in
+//            Text(application)
+////            Toggle(isOn: Binding(getValue: { self.silentActions[application] == .accepted }, setValue: { self.silentActions[application] = $0 ? .accepted : .rejected }), label: Text(application))
+//        }.listStyle(.grouped)
+    }
+}
+
+struct SilentActionPermissionCell: View {
+    @EnvironmentObject var preferences: Preferences
+    let source: String
+//    var binding: Binding<Bool>
+    
+    init(source: String) {
+        self.source = source
+//        self.binding = Binding(getValue: { self.preferences.silentActions[source] == .accepted }, setValue: { self.preferences.silentActions[source] = $0 ? .accepted : .rejected })
+    }
+    
+    var body: some View {
+        Toggle(isOn: Binding(getValue: {
+            self.preferences.silentActions[self.source] == .accepted
+        }, setValue: {
+            self.preferences.silentActions[self.source] = $0 ? .accepted : .rejected
+        })) {
+            Text(verbatim: source)
+        }
+    }
+}
+
+#if DEBUG
+struct SilentActionPrefs_Previews : PreviewProvider {
+    static var previews: some View {
+        SilentActionPrefs().environmentObject(Preferences.shared)
+    }
+}
+#endif

Tusker/Screens/Profile/MyProfileTableViewController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftUI
 
 class MyProfileTableViewController: ProfileTableViewController {
 
@@ -50,7 +51,15 @@ class MyProfileTableViewController: ProfileTableViewController {
     }
     
     @objc func preferencesPressed() {
-        present(PreferencesTableViewController.create(), animated: true)
+        let view = PreferencesView().environmentObject(Preferences.shared)
+        let hostingController = UIHostingController(rootView: view)
+        let navigationController = UINavigationController(rootViewController: hostingController)
+        hostingController.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(closePreferences))
+        present(navigationController, animated: true)
+    }
+    
+    @objc func closePreferences() {
+        dismiss(animated: true)
     }
 
 }

Tusker/Screens/Utilities/EnhancedTableViewController.swift

@@ -47,8 +47,7 @@ extension EnhancedTableViewController {
                 return nil
             }
             let actionProvider: UIContextMenuActionProvider = { (elements) in
-//                return UIMenu.create(title: "test", children: elements + actionsProvider())
+                return UIMenu(title: "", image: nil, identifier: nil, options: [], children: elements + actionsProvider())
-                return nil
             }
             return UIContextMenuConfiguration(identifier: nil, previewProvider: previewProvider, actionProvider: actionProvider)
         } else {

Tusker/Screens/Utilities/Previewing.swift

@@ -27,26 +27,26 @@ extension MenuPreviewProvider {
     func actionsForProfile(accountID: String) -> [UIAction] {
         guard let account = MastodonCache.account(for: accountID) else { return [] }
         return [
-            UIAction(__title: "Open in Safari", image: UIImage(systemName: "safari")) { (_) in
+            createAction(identifier: "openinsafari", title: "Open in Safari", systemImageName: "safari", handler: { (_) in
                 self.present(SFSafariViewController(url: account.url))
-            },
+            }),
-            UIAction(__title: "Send Message", image: UIImage(systemName: "envelope")) { (_) in
+            createAction(identifier: "sendmessage", title: "Send Message", systemImageName: "envelope", handler: { (_) in
                 self.present(UINavigationController(rootViewController: ComposeViewController(mentioningAcct: account.acct)))
-            },
+            }),
-            UIAction(__title: "Share...", image: UIImage(systemName: "square.and.arrow.up")) { (_) in
+            createAction(identifier: "share", title: "Share...", systemImageName: "square.and.arrow.up", handler: { (_) in
                 self.present(UIActivityViewController(activityItems: [account.url], applicationActivities: nil))
-            }
+            })
         ]
     }
     
     func actionsForURL(_ url: URL) -> [UIAction] {
         return [
-            UIAction(__title: "Open in Safari", image: UIImage(systemName: "safari")) { (_) in
+            createAction(identifier: "openinsafari", title: "Open in Safari", systemImageName: "safari", handler: { (_) in
                 self.present(SFSafariViewController(url: url))
-            },
+            }),
-            UIAction(__title: "Share...", image: UIImage(systemName: "square.and.arrow.up")) { (_) in
+            createAction(identifier: "share", title: "Share...", systemImageName: "square.and.arrow.up", handler: { (_) in
                 self.present(UIActivityViewController(activityItems: [url], applicationActivities: nil))
-            }
+            })
         ]
     }
     
@@ -57,16 +57,20 @@ extension MenuPreviewProvider {
     func actionsForStatus(statusID: String) -> [UIAction] {
         guard let status = MastodonCache.status(for: statusID) else { return [] }
         return [
-            UIAction(__title: "Reply", image: UIImage(systemName: "arrowshape.turn.up.left")) { (_) in
+            createAction(identifier: "reply", title: "Reply", systemImageName: "arrowshape.turn.up.left", handler: { (_) in
                 self.present(UINavigationController(rootViewController: ComposeViewController(inReplyTo: statusID)))
-            },
+            }),
-            UIAction(__title: "Open in Safari", image: UIImage(systemName: "safari")) { (_) in
+            createAction(identifier: "openinsafari", title: "Open in Safari", systemImageName: "safari", handler: { (_) in
                 self.present(SFSafariViewController(url: status.url!))
-            },
+            }),
-            UIAction(__title: "Share...", image: UIImage(systemName: "square.and.arrow.up")) { (_) in
+            createAction(identifier: "share", title: "Share...", systemImageName: "square.and.arrow.up", handler: { (_) in
                 self.present(UIActivityViewController(activityItems: [status.url!], applicationActivities: nil))
-            }
+            })
         ]
     }
     
+    private func createAction(identifier: String, title: String, systemImageName: String, handler: @escaping UIActionHandler) -> UIAction {
+        return UIAction(title: title, image: UIImage(systemName: systemImageName), identifier: UIAction.Identifier(identifier), discoverabilityTitle: nil, attributes: [], state: .off, handler: handler)
+    }
+    
 }

Tusker/Screens/Utilities/UIAlertController+Visibility.swift

@@ -21,7 +21,7 @@ extension UIAlertController {
             if visibility == currentVisibility {
                 action.setValue(true, forKey: "checked")
             }
-            action.setValue(visibility.image, forKey: "image")
+            action.setValue(UIImage(systemName: visibility.imageName), forKey: "image")
             addAction(action)
         }