Add followers count widget

* Resolve escaped characters in a status

Escaped characters are now returned to their original form for
HTMLString.asRawText.

* Unescape the markdown version too

The HTMLString.asMarkdown string is now also unescaped, & and
similar are resolved.

* Fix a internal fallback

If one of the unescape(...) commands fails, the original, unescaped
text is used instead of an empty string.

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "swift" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/validate_translations.yml

@@ -0,0 +1,35 @@
+name: Validate Translations
+
+on:
+  pull_request:
+    types: [synchronize, opened, reopened, labeled, unlabeled, edited]
+
+jobs:
+  main:
+    name: Validate Translations
+    runs-on: macOS-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v3
+
+      - name: ruby versions
+        run: |
+          ruby --version
+          gem --version
+          bundler --version
+
+      - name: ruby setup
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler-cache: true
+
+      # additional steps here, if needed
+
+      - name: Clone SwiftPolyglot
+        run: git clone https://github.com/appdecostudio/SwiftPolyglot.git --branch 0.2.0
+
+      - name: Build and Run SwiftPolyglot
+        run: |
+          swift build --package-path ./SwiftPolyglot --configuration release
+          swift run --package-path ./SwiftPolyglot swiftpolyglot "en,eu,be,ca,zh-Hans,zh-Hant,nl,en-GB,fr,de,it,ja,ko,nb,pl,pt-BR,es,tr,uk"

IceCubesActionExtension/ActionRequestHandler.swift

@@ -15,7 +15,7 @@ import Network
 // Sample code was sending this from a thread to another, let asume @Sendable for this
 extension NSExtensionContext: @unchecked Sendable {}
 
-class ActionRequestHandler: NSObject, NSExtensionRequestHandling {
+final class ActionRequestHandler: NSObject, NSExtensionRequestHandling, Sendable {
   enum Error: Swift.Error {
     case inputProviderNotFound
     case loadedItemHasWrongType

IceCubesActionExtension/IceCubesActionExtension.entitlements

@@ -2,9 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>OPENAI_SECRET</key>
-	<string>NICE_TRY</string>
-	<key>DEEPL_SECRET</key>
-	<string>NICE_TRY_AGAIN</string>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>

IceCubesActionExtension/uk.lproj/InfoPlist.strings

@@ -0,0 +1,9 @@
+/* 
+  InfoPlist.strings
+  IceCubesApp
+
+  Created by Thomas Durand on 27/01/2023.
+  
+*/
+
+"CFBundleDisplayName" = "Open in Ice Cubes";

IceCubesActionExtension/zh-Hant.lproj/InfoPlist.strings

@@ -0,0 +1,9 @@
+/* 
+  InfoPlist.strings
+  IceCubesApp
+
+  Created by Thomas Durand on 27/01/2023.
+  
+*/
+
+"CFBundleDisplayName" = "在 Ice Cubes 中開啟";

IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -3,19 +3,19 @@
     {
       "identity" : "bodega",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/mergesort/Bodega.git",
+      "location" : "https://github.com/mergesort/Bodega",
       "state" : {
-        "revision" : "3e7c1c58ad9a46aa8551cebfe87770003cdaaaca",
-        "version" : "2.0.2"
+        "revision" : "f0554077c178088ba11557bbdbb71775cc6a1b84",
+        "version" : "2.1.0"
       }
     },
     {
-      "identity" : "boutique",
+      "identity" : "buttonkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/mergesort/Boutique",
+      "location" : "https://github.com/Dean151/ButtonKit",
       "state" : {
-        "revision" : "b5b697de67100edc4b2d5c74724f3c1068b49d4e",
-        "version" : "2.1.1"
+        "revision" : "377f5bab4ed047704316d531e0826d4de5ebf6a4",
+        "version" : "0.1.1"
       }
     },
     {
@@ -23,8 +23,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/divadretlaw/EmojiText",
       "state" : {
-        "revision" : "b52cfb8278425c28771bee4cc9e87453a52f3f4d",
-        "version" : "2.0.2"
+        "revision" : "c54000aa9ccc048619054a5a2da2ce0576ffea18",
+        "version" : "4.0.1"
+      }
+    },
+    {
+      "identity" : "giphy-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Giphy/giphy-ios-sdk",
+      "state" : {
+        "revision" : "9c58a350a3381f1641f5a31cdcd162a406274892",
+        "version" : "2.2.8"
       }
     },
     {
@@ -33,7 +42,16 @@
       "location" : "https://github.com/evgenyneu/keychain-swift",
       "state" : {
         "branch" : "master",
-        "revision" : "e43f9b99b172ae6a7253047f8ba95c7a0b05b99f"
+        "revision" : "f38cb0ada97847ac5068b915b8d2793b35435668"
+      }
+    },
+    {
+      "identity" : "libwebp-xcode",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/libwebp-Xcode",
+      "state" : {
+        "revision" : "b2b1d20a90b14d11f6ef4241da6b81c1d3f171e4",
+        "version" : "1.3.2"
       }
     },
     {
@@ -50,17 +68,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kean/Nuke",
       "state" : {
-        "branch" : "nuke-12",
-        "revision" : "baccf1b00f458a77a9f9615e415bc4463029cf5e"
+        "revision" : "8ecbfc886da39bccb01c34abef5f2ff4073ad633",
+        "version" : "12.4.0"
       }
     },
     {
       "identity" : "purchases-ios",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/RevenueCat/purchases-ios.git",
+      "location" : "https://github.com/RevenueCat/purchases-ios",
       "state" : {
-        "revision" : "9cfb6adb41dc40d80c104b2ef6e9a84bca03ea48",
-        "version" : "4.16.0"
+        "revision" : "a9763ca482d52ea3d59aa2dfd2fc23427b02dada",
+        "version" : "4.40.1"
+      }
+    },
+    {
+      "identity" : "sfsafesymbols",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SFSafeSymbols/SFSafeSymbols",
+      "state" : {
+        "revision" : "7cca2d60925876b5953a2cf7341cd80fbeac983c",
+        "version" : "4.1.1"
       }
     },
     {
@@ -68,17 +95,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/stephencelis/SQLite.swift.git",
       "state" : {
-        "revision" : "4d543d811ee644fa4cc4bfa0be996b4dd6ba0f54",
-        "version" : "0.13.3"
+        "revision" : "7a2e3cd27de56f6d396e84f63beefd0267b55ccb",
+        "version" : "0.14.1"
       }
     },
     {
-      "identity" : "swift-collections",
+      "identity" : "swift-cmark",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-collections",
+      "location" : "https://github.com/apple/swift-cmark.git",
       "state" : {
-        "revision" : "48254824bb4248676bf7ce56014ff57b142b77eb",
-        "version" : "1.0.2"
+        "revision" : "f218e5d7691f78b55bfa39b367763f4612486c35",
+        "version" : "0.3.0"
+      }
+    },
+    {
+      "identity" : "swift-markdown",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-markdown",
+      "state" : {
+        "revision" : "e4f95e2dc23097a1a9a1dfdfe3fe3ee44de77378",
+        "version" : "0.3.0"
       }
     },
     {
@@ -86,8 +122,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/scinfu/SwiftSoup.git",
       "state" : {
-        "revision" : "f707b8680cddb96dc1855632340a572ef37bbb98",
-        "version" : "2.5.3"
+        "revision" : "8b6cf29eead8841a1fa7822481cb3af4ddaadba6",
+        "version" : "2.6.1"
       }
     },
     {
@@ -95,17 +131,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
       "state" : {
-        "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24",
-        "version" : "0.1.4"
-      }
-    },
-    {
-      "identity" : "swiftui-shimmer",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/markiv/SwiftUI-Shimmer",
-      "state" : {
-        "revision" : "965a7cbcbf094cbcf22b9251a2323bdc3432e171",
-        "version" : "1.1.0"
+        "revision" : "9e1cc02a65b22e09a8251261cccbccce02731fc5",
+        "version" : "1.1.1"
       }
     }
   ],

IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesActionExtension.xcscheme

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E9DF41F929830FEC0003AAD2"
+               BuildableName = "IceCubesActionExtension.appex"
+               BlueprintName = "IceCubesActionExtension"
+               ReferencedContainer = "container:IceCubesApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FBFE638292A715500C250E9"
+               BuildableName = "Ice Cubes.app"
+               BlueprintName = "IceCubesApp"
+               ReferencedContainer = "container:IceCubesApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FBFE638292A715500C250E9"
+            BuildableName = "Ice Cubes.app"
+            BlueprintName = "IceCubesApp"
+            ReferencedContainer = "container:IceCubesApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FBFE638292A715500C250E9"
+            BuildableName = "Ice Cubes.app"
+            BlueprintName = "IceCubesApp"
+            ReferencedContainer = "container:IceCubesApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "9FBFE638292A715500C250E9"
-               BuildableName = "IceCubesApp.app"
+               BuildableName = "Ice Cubes.app"
                BlueprintName = "IceCubesApp"
                ReferencedContainer = "container:IceCubesApp.xcodeproj">
             </BuildableReference>
@@ -45,7 +45,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9FBFE638292A715500C250E9"
-            BuildableName = "IceCubesApp.app"
+            BuildableName = "Ice Cubes.app"
             BlueprintName = "IceCubesApp"
             ReferencedContainer = "container:IceCubesApp.xcodeproj">
          </BuildableReference>
@@ -62,7 +62,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9FBFE638292A715500C250E9"
-            BuildableName = "IceCubesApp.app"
+            BuildableName = "Ice Cubes.app"
             BlueprintName = "IceCubesApp"
             ReferencedContainer = "container:IceCubesApp.xcodeproj">
          </BuildableReference>

IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesAppWidgetsExtensionExtension.xcscheme

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9F7788C42BE652B1004E6BEF"
+               BuildableName = "IceCubesAppWidgetsExtensionExtension.appex"
+               BlueprintName = "IceCubesAppWidgetsExtensionExtension"
+               ReferencedContainer = "container:IceCubesApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FBFE638292A715500C250E9"
+               BuildableName = "Ice Cubes.app"
+               BlueprintName = "IceCubesApp"
+               ReferencedContainer = "container:IceCubesApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FBFE638292A715500C250E9"
+            BuildableName = "Ice Cubes.app"
+            BlueprintName = "IceCubesApp"
+            ReferencedContainer = "container:IceCubesApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = ""
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetDefaultView"
+            value = "timeline"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetFamily"
+            value = "systemMedium"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FBFE638292A715500C250E9"
+            BuildableName = "Ice Cubes.app"
+            BlueprintName = "IceCubesApp"
+            ReferencedContainer = "container:IceCubesApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesNotifications.xcscheme

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9F2A5415296AB631009B2D7C"
+               BuildableName = "IceCubesNotifications.appex"
+               BlueprintName = "IceCubesNotifications"
+               ReferencedContainer = "container:IceCubesApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FBFE638292A715500C250E9"
+               BuildableName = "Ice Cubes.app"
+               BlueprintName = "IceCubesApp"
+               ReferencedContainer = "container:IceCubesApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FBFE638292A715500C250E9"
+            BuildableName = "Ice Cubes.app"
+            BlueprintName = "IceCubesApp"
+            ReferencedContainer = "container:IceCubesApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FBFE638292A715500C250E9"
+            BuildableName = "Ice Cubes.app"
+            BlueprintName = "IceCubesApp"
+            ReferencedContainer = "container:IceCubesApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesShareExtension.xcscheme

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FAD858729743F7400496AB1"
+               BuildableName = "IceCubesShareExtension.appex"
+               BlueprintName = "IceCubesShareExtension"
+               ReferencedContainer = "container:IceCubesApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FBFE638292A715500C250E9"
+               BuildableName = "Ice Cubes.app"
+               BlueprintName = "IceCubesApp"
+               ReferencedContainer = "container:IceCubesApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FBFE638292A715500C250E9"
+            BuildableName = "Ice Cubes.app"
+            BlueprintName = "IceCubesApp"
+            ReferencedContainer = "container:IceCubesApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FBFE638292A715500C250E9"
+            BuildableName = "Ice Cubes.app"
+            BlueprintName = "IceCubesApp"
+            ReferencedContainer = "container:IceCubesApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

IceCubesApp/App/AppRegistry.swift

@@ -0,0 +1,235 @@
+import Account
+import AppAccount
+import Conversations
+import DesignSystem
+import Env
+import Explore
+import LinkPresentation
+import Lists
+import MediaUI
+import Models
+import Notifications
+import StatusKit
+import SwiftUI
+import Timeline
+
+@MainActor
+extension View {
+  func withAppRouter() -> some View {
+    navigationDestination(for: RouterDestination.self) { destination in
+      switch destination {
+      case let .accountDetail(id):
+        AccountDetailView(accountId: id, scrollToTopSignal: .constant(0))
+      case let .accountDetailWithAccount(account):
+        AccountDetailView(account: account, scrollToTopSignal: .constant(0))
+      case let .accountSettingsWithAccount(account, appAccount):
+        AccountSettingsView(account: account, appAccount: appAccount)
+      case let .statusDetail(id):
+        StatusDetailView(statusId: id)
+      case let .statusDetailWithStatus(status):
+        StatusDetailView(status: status)
+      case let .remoteStatusDetail(url):
+        StatusDetailView(remoteStatusURL: url)
+      case let .conversationDetail(conversation):
+        ConversationDetailView(conversation: conversation)
+      case let .hashTag(tag, accountId):
+        TimelineView(timeline: .constant(.hashtag(tag: tag, accountId: accountId)),
+                     pinnedFilters: .constant([]),
+                     selectedTagGroup: .constant(nil),
+                     scrollToTopSignal: .constant(0),
+                     canFilterTimeline: false)
+      case let .list(list):
+        TimelineView(timeline: .constant(.list(list: list)),
+                     pinnedFilters: .constant([]),
+                     selectedTagGroup: .constant(nil),
+                     scrollToTopSignal: .constant(0),
+                     canFilterTimeline: false)
+      case let .following(id):
+        AccountsListView(mode: .following(accountId: id))
+      case let .followers(id):
+        AccountsListView(mode: .followers(accountId: id))
+      case let .favoritedBy(id):
+        AccountsListView(mode: .favoritedBy(statusId: id))
+      case let .rebloggedBy(id):
+        AccountsListView(mode: .rebloggedBy(statusId: id))
+      case let .accountsList(accounts):
+        AccountsListView(mode: .accountsList(accounts: accounts))
+      case .trendingTimeline:
+        TimelineView(timeline: .constant(.trending),
+                     pinnedFilters: .constant([]),
+                     selectedTagGroup: .constant(nil),
+                     scrollToTopSignal: .constant(0),
+                     canFilterTimeline: false)
+      case let .trendingLinks(cards):
+        TrendingLinksListView(cards: cards)
+      case let .tagsList(tags):
+        TagsListView(tags: tags)
+      case .notificationsRequests:
+        NotificationsRequestsListView()
+      case let .notificationForAccount(accountId):
+        NotificationsListView(lockedType: nil,
+                              lockedAccountId: accountId,
+                              scrollToTopSignal: .constant(0))
+      case .blockedAccounts:
+        AccountsListView(mode: .blocked)
+      case .mutedAccounts:
+        AccountsListView(mode: .muted)
+      }
+    }
+  }
+
+  func withSheetDestinations(sheetDestinations: Binding<SheetDestination?>) -> some View {
+    sheet(item: sheetDestinations) { destination in
+      switch destination {
+      case let .replyToStatusEditor(status):
+        StatusEditor.MainView(mode: .replyTo(status: status))
+          .withEnvironments()
+      case let .newStatusEditor(visibility):
+        StatusEditor.MainView(mode: .new(text: nil, visibility: visibility))
+          .withEnvironments()
+      case let .prefilledStatusEditor(text, visibility):
+        StatusEditor.MainView(mode: .new(text: text, visibility: visibility))
+          .withEnvironments()
+      case let .imageURL(urls, visibility):
+        StatusEditor.MainView(mode: .imageURL(urls: urls, visibility: visibility))
+          .withEnvironments()
+      case let .editStatusEditor(status):
+        StatusEditor.MainView(mode: .edit(status: status))
+          .withEnvironments()
+      case let .quoteStatusEditor(status):
+        StatusEditor.MainView(mode: .quote(status: status))
+          .withEnvironments()
+      case let .quoteLinkStatusEditor(link):
+        StatusEditor.MainView(mode: .quoteLink(link: link))
+          .withEnvironments()
+      case let .mentionStatusEditor(account, visibility):
+        StatusEditor.MainView(mode: .mention(account: account, visibility: visibility))
+          .withEnvironments()
+      case .listCreate:
+        ListCreateView()
+          .withEnvironments()
+      case let .listEdit(list):
+        ListEditView(list: list)
+          .withEnvironments()
+      case let .listAddAccount(account):
+        ListAddAccountView(account: account)
+          .withEnvironments()
+      case .addAccount:
+        AddAccountView()
+          .withEnvironments()
+      case .addRemoteLocalTimeline:
+        AddRemoteTimelineView()
+          .withEnvironments()
+      case .addTagGroup:
+        EditTagGroupView()
+          .withEnvironments()
+      case let .statusEditHistory(status):
+        StatusEditHistoryView(statusId: status)
+          .withEnvironments()
+      case .settings:
+        SettingsTabs(popToRootTab: .constant(.settings), isModal: true)
+          .withEnvironments()
+          .preferredColorScheme(Theme.shared.selectedScheme == .dark ? .dark : .light)
+      case .accountPushNotficationsSettings:
+        if let subscription = PushNotificationsService.shared.subscriptions.first(where: { $0.account.token == AppAccountsManager.shared.currentAccount.oauthToken }) {
+          NavigationSheet { PushNotificationsView(subscription: subscription) }
+            .withEnvironments()
+        } else {
+          EmptyView()
+        }
+      case .about:
+        NavigationSheet { AboutView() }
+          .withEnvironments()
+      case .support:
+        NavigationSheet { SupportAppView() }
+          .withEnvironments()
+      case let .report(status):
+        ReportView(status: status)
+          .withEnvironments()
+      case let .shareImage(image, status):
+        ActivityView(image: image, status: status)
+          .withEnvironments()
+      case let .editTagGroup(tagGroup, onSaved):
+        EditTagGroupView(tagGroup: tagGroup, onSaved: onSaved)
+          .withEnvironments()
+      case .timelineContentFilter:
+        NavigationSheet { TimelineContentFilterView() }
+          .presentationDetents([.medium])
+          .presentationBackground(.thinMaterial)
+          .withEnvironments()
+      case .accountEditInfo:
+        EditAccountView()
+          .withEnvironments()
+      case .accountFiltersList:
+        FiltersListView()
+          .withEnvironments()
+      }
+    }
+  }
+
+  func withEnvironments() -> some View {
+    environment(CurrentAccount.shared)
+      .environment(UserPreferences.shared)
+      .environment(CurrentInstance.shared)
+      .environment(Theme.shared)
+      .environment(AppAccountsManager.shared)
+      .environment(PushNotificationsService.shared)
+      .environment(AppAccountsManager.shared.currentClient)
+      .environment(QuickLook.shared)
+  }
+
+  func withModelContainer() -> some View {
+    modelContainer(for: [
+      Draft.self,
+      LocalTimeline.self,
+      TagGroup.self,
+      RecentTag.self,
+    ])
+  }
+}
+
+struct ActivityView: UIViewControllerRepresentable {
+  let image: UIImage
+  let status: Status
+
+  class LinkDelegate: NSObject, UIActivityItemSource {
+    let image: UIImage
+    let status: Status
+
+    init(image: UIImage, status: Status) {
+      self.image = image
+      self.status = status
+    }
+
+    func activityViewControllerLinkMetadata(_: UIActivityViewController) -> LPLinkMetadata? {
+      let imageProvider = NSItemProvider(object: image)
+      let metadata = LPLinkMetadata()
+      metadata.imageProvider = imageProvider
+      metadata.title = status.reblog?.content.asRawText ?? status.content.asRawText
+      return metadata
+    }
+
+    func activityViewControllerPlaceholderItem(_: UIActivityViewController) -> Any {
+      image
+    }
+
+    func activityViewController(_: UIActivityViewController,
+                                itemForActivityType _: UIActivity.ActivityType?) -> Any?
+    {
+      nil
+    }
+  }
+
+  func makeUIViewController(context _: UIViewControllerRepresentableContext<ActivityView>) -> UIActivityViewController {
+    UIActivityViewController(activityItems: [image, LinkDelegate(image: image, status: status)],
+                             applicationActivities: nil)
+  }
+
+  func updateUIViewController(_: UIActivityViewController, context _: UIViewControllerRepresentableContext<ActivityView>) {}
+}
+
+extension URL: Identifiable {
+  public var id: String {
+    absoluteString
+  }
+}

IceCubesApp/App/AppRouter.swift

@@ -1,151 +0,0 @@
-import Account
-import AppAccount
-import Conversations
-import DesignSystem
-import Env
-import Lists
-import Status
-import SwiftUI
-import Timeline
-import LinkPresentation
-import Models
-
-@MainActor
-extension View {
-  func withAppRouter() -> some View {
-    navigationDestination(for: RouterDestinations.self) { destination in
-      switch destination {
-      case let .accountDetail(id):
-        AccountDetailView(accountId: id)
-      case let .accountDetailWithAccount(account):
-        AccountDetailView(account: account)
-      case let .accountSettingsWithAccount(account, appAccount):
-        AccountSettingsView(account: account, appAccount: appAccount)
-      case let .statusDetail(id):
-        StatusDetailView(statusId: id)
-      case let .statusDetailWithStatus(status):
-        StatusDetailView(status: status)
-      case let .remoteStatusDetail(url):
-        StatusDetailView(remoteStatusURL: url)
-      case let .conversationDetail(conversation):
-        ConversationDetailView(conversation: conversation)
-      case let .hashTag(tag, accountId):
-        TimelineView(timeline: .constant(.hashtag(tag: tag, accountId: accountId)), scrollToTopSignal: .constant(0))
-      case let .list(list):
-        TimelineView(timeline: .constant(.list(list: list)), scrollToTopSignal: .constant(0))
-      case let .following(id):
-        AccountsListView(mode: .following(accountId: id))
-      case let .followers(id):
-        AccountsListView(mode: .followers(accountId: id))
-      case let .favoritedBy(id):
-        AccountsListView(mode: .favoritedBy(statusId: id))
-      case let .rebloggedBy(id):
-        AccountsListView(mode: .rebloggedBy(statusId: id))
-      case let .accountsList(accounts):
-        AccountsListView(mode: .accountsList(accounts: accounts))
-      }
-    }
-  }
-  
-  func withSheetDestinations(sheetDestinations: Binding<SheetDestinations?>) -> some View {
-    sheet(item: sheetDestinations) { destination in
-      switch destination {
-      case let .replyToStatusEditor(status):
-        StatusEditorView(mode: .replyTo(status: status))
-          .withEnvironments()
-      case let .newStatusEditor(visibility):
-        StatusEditorView(mode: .new(visibility: visibility))
-          .withEnvironments()
-      case let .editStatusEditor(status):
-        StatusEditorView(mode: .edit(status: status))
-          .withEnvironments()
-      case let .quoteStatusEditor(status):
-        StatusEditorView(mode: .quote(status: status))
-          .withEnvironments()
-      case let .mentionStatusEditor(account, visibility):
-        StatusEditorView(mode: .mention(account: account, visibility: visibility))
-          .withEnvironments()
-      case let .listEdit(list):
-        ListEditView(list: list)
-          .withEnvironments()
-      case let .listAddAccount(account):
-        ListAddAccountView(account: account)
-          .withEnvironments()
-      case .addAccount:
-        AddAccountView()
-          .withEnvironments()
-      case .addRemoteLocalTimeline:
-        AddRemoteTimelineView()
-          .withEnvironments()
-      case let .statusEditHistory(status):
-        StatusEditHistoryView(statusId: status)
-          .withEnvironments()
-      case .settings:
-        SettingsTabs(popToRootTab: .constant(.settings))
-          .withEnvironments()
-          .preferredColorScheme(Theme.shared.selectedScheme == .dark ? .dark : .light)
-      case .accountPushNotficationsSettings:
-        if let subscription = PushNotificationsService.shared.subscriptions.first(where: { $0.account.token == AppAccountsManager.shared.currentAccount.oauthToken }) {
-          PushNotificationsView(subscription: subscription)
-            .withEnvironments()
-        } else {
-          EmptyView()
-        }
-      case let .report(status):
-        ReportView(status: status)
-          .withEnvironments()
-      case let .shareImage(image, status):
-        ActivityView(image: image, status: status)
-      }
-    }
-  }
-  
-  func withEnvironments() -> some View {
-    environmentObject(CurrentAccount.shared)
-      .environmentObject(UserPreferences.shared)
-      .environmentObject(CurrentInstance.shared)
-      .environmentObject(Theme.shared)
-      .environmentObject(AppAccountsManager.shared)
-      .environmentObject(PushNotificationsService.shared)
-      .environmentObject(AppAccountsManager.shared.currentClient)
-  }
-}
-
-struct ActivityView: UIViewControllerRepresentable {
-  let image: UIImage
-  let status: Status
-  
-  class LinkDelegate: NSObject, UIActivityItemSource {
-    let image: UIImage
-    let status: Status
-    
-    init(image: UIImage, status: Status) {
-      self.image = image
-      self.status = status
-    }
-    
-    func activityViewControllerLinkMetadata(_ activityViewController: UIActivityViewController) -> LPLinkMetadata? {
-      let imageProvider = NSItemProvider(object: image)
-      let metadata = LPLinkMetadata()
-      metadata.imageProvider = imageProvider
-      metadata.title = status.reblog?.content.asRawText ?? status.content.asRawText
-      return metadata
-    }
-    
-    func activityViewControllerPlaceholderItem(_ activityViewController: UIActivityViewController) -> Any {
-      image
-    }
-    
-    func activityViewController(_ activityViewController: UIActivityViewController,
-                                itemForActivityType activityType: UIActivity.ActivityType?) -> Any? {
-      nil
-    }
-  }
-  
-  func makeUIViewController(context: UIViewControllerRepresentableContext<ActivityView>) -> UIActivityViewController {
-    return UIActivityViewController(activityItems: [image, LinkDelegate(image: image, status: status)],
-                                    applicationActivities: nil)
-  }
-  
-  func updateUIViewController(_ uiViewController: UIActivityViewController, context: UIViewControllerRepresentableContext<ActivityView>) {}
-}

IceCubesApp/App/IceCubesApp-release.entitlements

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.icecubesapp</string>
+	</array>
+	<key>com.apple.developer.icloud-services</key>
+	<array>
+		<string>CloudKit</string>
+	</array>
+	<key>com.apple.developer.user-fonts</key>
+	<array>
+		<string>app-usage</string>
+	</array>
+	<key>com.apple.developer.usernotifications.communication</key>
+	<true/>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.$(BUNDLE_ID_PREFIX).IceCubesApp</string>
+	</array>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)$(BUNDLE_ID_PREFIX).IceCubesApp</string>
+	</array>
+</dict>
+</plist>

IceCubesApp/App/IceCubesApp.entitlements

@@ -4,6 +4,14 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.icecubesapp</string>
+	</array>
+	<key>com.apple.developer.icloud-services</key>
+	<array>
+		<string>CloudKit</string>
+	</array>
 	<key>com.apple.developer.user-fonts</key>
 	<array>
 		<string>app-usage</string>
@@ -16,7 +24,9 @@
 	<array>
 		<string>group.$(BUNDLE_ID_PREFIX).IceCubesApp</string>
 	</array>
-	<key>com.apple.security.files.user-selected.read-only</key>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>keychain-access-groups</key>
 	<array>

IceCubesApp/App/IceCubesApp.swift

@@ -1,295 +0,0 @@
-import Account
-import AppAccount
-import AVFoundation
-import DesignSystem
-import Env
-import KeychainSwift
-import Network
-import RevenueCat
-import SwiftUI
-import Timeline
-
-@main
-struct IceCubesApp: App {
-  @UIApplicationDelegateAdaptor private var appDelegate: AppDelegate
-
-  @Environment(\.scenePhase) private var scenePhase
-
-  @StateObject private var appAccountsManager = AppAccountsManager.shared
-  @StateObject private var currentInstance = CurrentInstance.shared
-  @StateObject private var currentAccount = CurrentAccount.shared
-  @StateObject private var userPreferences = UserPreferences.shared
-  @StateObject private var pushNotificationsService = PushNotificationsService.shared
-  @StateObject private var watcher = StreamWatcher()
-  @StateObject private var quickLook = QuickLook()
-  @StateObject private var theme = Theme.shared
-  @StateObject private var sidebarRouterPath = RouterPath()
-
-  @State private var selectedTab: Tab = .timeline
-  @State private var selectSidebarItem: Tab? = .timeline
-  @State private var popToRootTab: Tab = .other
-  @State private var sideBarLoadedTabs: Set<Tab> = Set()
-
-  private var availableTabs: [Tab] {
-    appAccountsManager.currentClient.isAuth ? Tab.loggedInTabs() : Tab.loggedOutTab()
-  }
-
-  var body: some Scene {
-    WindowGroup {
-      appView
-        .applyTheme(theme)
-        .onAppear {
-          setNewClientsInEnv(client: appAccountsManager.currentClient)
-          setupRevenueCat()
-          refreshPushSubs()
-        }
-        .environmentObject(appAccountsManager)
-        .environmentObject(appAccountsManager.currentClient)
-        .environmentObject(quickLook)
-        .environmentObject(currentAccount)
-        .environmentObject(currentInstance)
-        .environmentObject(userPreferences)
-        .environmentObject(theme)
-        .environmentObject(watcher)
-        .environmentObject(pushNotificationsService)
-        .fullScreenCover(item: $quickLook.url, content: { url in
-          QuickLookPreview(selectedURL: url, urls: quickLook.urls)
-            .edgesIgnoringSafeArea(.bottom)
-            .background(TransparentBackground())
-        })
-        .onChange(of: pushNotificationsService.handledNotification) { notification in
-          if notification != nil {
-            pushNotificationsService.handledNotification = nil
-            if appAccountsManager.currentAccount.oauthToken?.accessToken != notification?.account.token.accessToken,
-               let account = appAccountsManager.availableAccounts.first(where:
-                 { $0.oauthToken?.accessToken == notification?.account.token.accessToken })
-            {
-              appAccountsManager.currentAccount = account
-              DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
-                selectedTab = .notifications
-                pushNotificationsService.handledNotification = notification
-              }
-            } else {
-              selectedTab = .notifications
-            }
-          }
-        }
-    }
-    .commands {
-      appMenu
-    }
-    .onChange(of: scenePhase) { scenePhase in
-      handleScenePhase(scenePhase: scenePhase)
-    }
-    .onChange(of: appAccountsManager.currentClient) { newClient in
-      setNewClientsInEnv(client: newClient)
-      if newClient.isAuth {
-        watcher.watch(streams: [.user, .direct])
-      }
-    }
-  }
-
-  @ViewBuilder
-  private var appView: some View {
-    if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
-      sidebarView
-    } else {
-      tabBarView
-    }
-  }
-
-  private func badgeFor(tab: Tab) -> Int {
-    if tab == .notifications && selectedTab != tab,
-        let token = appAccountsManager.currentAccount.oauthToken {
-      return watcher.unreadNotificationsCount + userPreferences.getNotificationsCount(for: token)
-    }
-    return 0
-  }
-
-  private var sidebarView: some View {
-    SideBarView(selectedTab: $selectedTab,
-                popToRootTab: $popToRootTab,
-                tabs: availableTabs,
-                routerPath: sidebarRouterPath) {
-      GeometryReader { proxy in
-        HStack(spacing: 0) {
-          ZStack {
-            if selectedTab == .profile {
-              ProfileTab(popToRootTab: $popToRootTab)
-            }
-            ForEach(availableTabs) { tab in
-              if tab == selectedTab || sideBarLoadedTabs.contains(tab) {
-                tab
-                  .makeContentView(popToRootTab: $popToRootTab)
-                  .opacity(tab == selectedTab ? 1 : 0)
-                  .transition(.opacity)
-                  .id("\(tab)\(appAccountsManager.currentAccount.id)")
-                  .onAppear {
-                    sideBarLoadedTabs.insert(tab)
-                  }
-              } else {
-                EmptyView()
-              }
-            }
-          }
-          if proxy.frame(in: .global).width > (.maxColumnWidth + .secondaryColumnWidth),
-             appAccountsManager.currentClient.isAuth,
-             userPreferences.showiPadSecondaryColumn
-          {
-            Divider().edgesIgnoringSafeArea(.all)
-            notificationsSecondaryColumn
-          }
-        }
-      }
-    }.onChange(of: $appAccountsManager.currentAccount.id) { _ in
-      sideBarLoadedTabs.removeAll()
-    }
-  }
-
-  private var notificationsSecondaryColumn: some View {
-    NotificationsTab(popToRootTab: $popToRootTab, lockedType: nil)
-      .environment(\.isSecondaryColumn, true)
-      .frame(maxWidth: 360)
-      .id(appAccountsManager.currentAccount.id)
-  }
-
-  private var tabBarView: some View {
-    TabView(selection: .init(get: {
-      selectedTab
-    }, set: { newTab in
-      var transaction = Transaction()
-      transaction.disablesAnimations = true
-      withTransaction(transaction) {
-        if newTab == selectedTab {
-          /// Stupid hack to trigger onChange binding in tab views.
-          popToRootTab = .other
-          DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
-            popToRootTab = selectedTab
-          }
-        }
-        selectedTab = newTab
-        if selectedTab == .notifications,
-           let token = appAccountsManager.currentAccount.oauthToken {
-          userPreferences.setNotification(count: 0, token: token)
-          watcher.unreadNotificationsCount = 0
-        }
-      }
-      HapticManager.shared.fireHaptic(of: .tabSelection)
-    })) {
-      ForEach(availableTabs) { tab in
-        tab.makeContentView(popToRootTab: $popToRootTab)
-          .tabItem {
-            if userPreferences.showiPhoneTabLabel {
-              tab.label
-                .labelStyle(TitleAndIconLabelStyle())
-            } else {
-              tab.label
-                .labelStyle(IconOnlyLabelStyle())
-            }
-          }
-          .tag(tab)
-          .badge(badgeFor(tab: tab))
-          .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .tabBar)
-      }
-    }
-    .id(appAccountsManager.currentClient.id)
-  }
-
-  private func setNewClientsInEnv(client: Client) {
-    currentAccount.setClient(client: client)
-    currentInstance.setClient(client: client)
-    userPreferences.setClient(client: client)
-    Task {
-      await currentInstance.fetchCurrentInstance()
-      watcher.setClient(client: client, instanceStreamingURL: currentInstance.instance?.urls?.streamingApi)
-      watcher.watch(streams: [.user, .direct])
-    }
-  }
-
-  private func handleScenePhase(scenePhase: ScenePhase) {
-    switch scenePhase {
-    case .background:
-      watcher.stopWatching()
-    case .active:
-      watcher.watch(streams: [.user, .direct])
-      UIApplication.shared.applicationIconBadgeNumber = 0
-      Task {
-        await userPreferences.refreshServerPreferences()
-      }
-    default:
-      break
-    }
-  }
-
-  private func setupRevenueCat() {
-    Purchases.logLevel = .error
-    Purchases.configure(withAPIKey: "appl_JXmiRckOzXXTsHKitQiicXCvMQi")
-  }
-
-  private func refreshPushSubs() {
-    PushNotificationsService.shared.requestPushNotifications()
-  }
-
-  @CommandsBuilder
-  private var appMenu: some Commands {
-    CommandGroup(replacing: .newItem) {
-      Button("menu.new-post") {
-        sidebarRouterPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
-      }
-    }
-    CommandGroup(replacing: .textFormatting) {
-      Menu("menu.font") {
-        Button("menu.font.bigger") {
-          if userPreferences.fontSizeScale < 1.5 {
-            userPreferences.fontSizeScale += 0.1
-          }
-        }
-        Button("menu.font.smaller") {
-          if userPreferences.fontSizeScale > 0.5 {
-            userPreferences.fontSizeScale -= 0.1
-          }
-        }
-      }
-    }
-  }
-}
-
-class AppDelegate: NSObject, UIApplicationDelegate {
-  let themeObserver = ThemeObserverViewController(nibName: nil, bundle: nil)
-
-  func application(_: UIApplication,
-                   didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool
-  {
-    try? AVAudioSession.sharedInstance().setCategory(.ambient, options: .mixWithOthers)
-    PushNotificationsService.shared.setAccounts(accounts: AppAccountsManager.shared.pushAccounts)
-    return true
-  }
-
-  func application(_: UIApplication,
-                   didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data)
-  {
-    PushNotificationsService.shared.pushToken = deviceToken
-    Task {
-      PushNotificationsService.shared.setAccounts(accounts: AppAccountsManager.shared.pushAccounts)
-      await PushNotificationsService.shared.updateSubscriptions(forceCreate: false)
-    }
-  }
-
-  func application(_: UIApplication, didFailToRegisterForRemoteNotificationsWithError _: Error) {}
-
-  func application(_: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options _: UIScene.ConnectionOptions) -> UISceneConfiguration {
-    let configuration = UISceneConfiguration(name: nil, sessionRole: connectingSceneSession.role)
-    if connectingSceneSession.role == .windowApplication {
-      configuration.delegateClass = SceneDelegate.self
-    }
-    return configuration
-  }
-}
-
-class ThemeObserverViewController: UIViewController {
-  override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-    super.traitCollectionDidChange(previousTraitCollection)
-
-    print(traitCollection.userInterfaceStyle.rawValue)
-  }
-}

IceCubesApp/App/Main/AppView.swift

@@ -0,0 +1,150 @@
+import Account
+import AppAccount
+import AVFoundation
+import DesignSystem
+import Env
+import KeychainSwift
+import MediaUI
+import Network
+import RevenueCat
+import StatusKit
+import SwiftUI
+import Timeline
+
+@MainActor
+struct AppView: View {
+  @Environment(AppAccountsManager.self) private var appAccountsManager
+  @Environment(UserPreferences.self) private var userPreferences
+  @Environment(Theme.self) private var theme
+  @Environment(StreamWatcher.self) private var watcher
+
+  @Environment(\.openWindow) var openWindow
+  @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+
+  @Binding var selectedTab: Tab
+  @Binding var appRouterPath: RouterPath
+
+  @State var popToRootTab: Tab = .other
+  @State var iosTabs = iOSTabs.shared
+  @State var sidebarTabs = SidebarTabs.shared
+
+  var body: some View {
+    #if os(visionOS)
+      tabBarView
+    #else
+      if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
+        sidebarView
+      } else {
+        tabBarView
+      }
+    #endif
+  }
+
+  var availableTabs: [Tab] {
+    guard appAccountsManager.currentClient.isAuth else {
+      return Tab.loggedOutTab()
+    }
+    if UIDevice.current.userInterfaceIdiom == .phone || horizontalSizeClass == .compact {
+      return iosTabs.tabs
+    } else if UIDevice.current.userInterfaceIdiom == .vision {
+      return Tab.visionOSTab()
+    }
+    return sidebarTabs.tabs.map { $0.tab }
+  }
+
+  var tabBarView: some View {
+    TabView(selection: .init(get: {
+      selectedTab
+    }, set: { newTab in
+      if newTab == .post {
+        #if os(visionOS)
+          openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
+        #else
+          appRouterPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
+        #endif
+        return
+      }
+      if newTab == selectedTab {
+        /// Stupid hack to trigger onChange binding in tab views.
+        popToRootTab = .other
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
+          popToRootTab = selectedTab
+        }
+      }
+
+      HapticManager.shared.fireHaptic(.tabSelection)
+      SoundEffectManager.shared.playSound(.tabSelection)
+
+      selectedTab = newTab
+    })) {
+      ForEach(availableTabs) { tab in
+        tab.makeContentView(selectedTab: $selectedTab, popToRootTab: $popToRootTab)
+          .tabItem {
+            if userPreferences.showiPhoneTabLabel {
+              tab.label
+                .environment(\.symbolVariants, tab == selectedTab ? .fill : .none)
+            } else {
+              Image(systemName: tab.iconName)
+            }
+          }
+          .tag(tab)
+          .badge(badgeFor(tab: tab))
+          .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .tabBar)
+      }
+    }
+    .id(appAccountsManager.currentClient.id)
+    .withSheetDestinations(sheetDestinations: $appRouterPath.presentedSheet)
+  }
+
+  private func badgeFor(tab: Tab) -> Int {
+    if tab == .notifications, selectedTab != tab,
+       let token = appAccountsManager.currentAccount.oauthToken
+    {
+      return watcher.unreadNotificationsCount + (userPreferences.notificationsCount[token] ?? 0)
+    }
+    return 0
+  }
+
+  #if !os(visionOS)
+    var sidebarView: some View {
+      SideBarView(selectedTab: $selectedTab,
+                  popToRootTab: $popToRootTab,
+                  tabs: availableTabs)
+      {
+        HStack(spacing: 0) {
+          TabView(selection: $selectedTab) {
+            ForEach(availableTabs) { tab in
+              tab
+                .makeContentView(selectedTab: $selectedTab, popToRootTab: $popToRootTab)
+                .tabItem {
+                  tab.label
+                }
+                .tag(tab)
+            }
+          }
+          .introspect(.tabView, on: .iOS(.v17)) { (tabview: UITabBarController) in
+            tabview.tabBar.isHidden = horizontalSizeClass == .regular
+            tabview.customizableViewControllers = []
+            tabview.moreNavigationController.isNavigationBarHidden = true
+          }
+          if horizontalSizeClass == .regular,
+             appAccountsManager.currentClient.isAuth,
+             userPreferences.showiPadSecondaryColumn
+          {
+            Divider().edgesIgnoringSafeArea(.all)
+            notificationsSecondaryColumn
+          }
+        }
+      }
+      .environment(appRouterPath)
+    }
+  #endif
+
+  var notificationsSecondaryColumn: some View {
+    NotificationsTab(selectedTab: .constant(.notifications),
+                     popToRootTab: $popToRootTab, lockedType: nil)
+      .environment(\.isSecondaryColumn, true)
+      .frame(maxWidth: .secondaryColumnWidth)
+      .id(appAccountsManager.currentAccount.id)
+  }
+}

IceCubesApp/App/Main/IceCubesApp+Menu.swift

@@ -0,0 +1,64 @@
+import Env
+import SwiftUI
+
+extension IceCubesApp {
+  @CommandsBuilder
+  var appMenu: some Commands {
+    CommandGroup(replacing: .newItem) {
+      Button("menu.new-window") {
+        openWindow(id: "MainWindow")
+      }
+      .keyboardShortcut("n", modifiers: .shift)
+      Button("menu.new-post") {
+        #if targetEnvironment(macCatalyst)
+          openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
+        #else
+          appRouterPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
+        #endif
+      }
+      .keyboardShortcut("n", modifiers: .command)
+    }
+    CommandGroup(replacing: .textFormatting) {
+      Menu("menu.font") {
+        Button("menu.font.bigger") {
+          if theme.fontSizeScale < 1.5 {
+            theme.fontSizeScale += 0.1
+          }
+        }
+        Button("menu.font.smaller") {
+          if theme.fontSizeScale > 0.5 {
+            theme.fontSizeScale -= 0.1
+          }
+        }
+      }
+    }
+    CommandMenu("tab.timeline") {
+      Button("timeline.latest") {
+        NotificationCenter.default.post(name: .refreshTimeline, object: nil)
+      }
+      .keyboardShortcut("r", modifiers: .command)
+      Button("timeline.home") {
+        NotificationCenter.default.post(name: .homeTimeline, object: nil)
+      }
+      .keyboardShortcut("h", modifiers: .shift)
+      Button("timeline.trending") {
+        NotificationCenter.default.post(name: .trendingTimeline, object: nil)
+      }
+      .keyboardShortcut("t", modifiers: .shift)
+      Button("timeline.federated") {
+        NotificationCenter.default.post(name: .federatedTimeline, object: nil)
+      }
+      .keyboardShortcut("f", modifiers: .shift)
+      Button("timeline.local") {
+        NotificationCenter.default.post(name: .localTimeline, object: nil)
+      }
+      .keyboardShortcut("l", modifiers: .shift)
+    }
+    CommandGroup(replacing: .help) {
+      Button("menu.help.github") {
+        let url = URL(string: "https://github.com/Dimillian/IceCubesApp/issues")!
+        UIApplication.shared.open(url)
+      }
+    }
+  }
+}

IceCubesApp/App/Main/IceCubesApp+Scene.swift

@@ -0,0 +1,148 @@
+import AppIntents
+import Env
+import MediaUI
+import StatusKit
+import SwiftUI
+
+extension IceCubesApp {
+  var appScene: some Scene {
+    WindowGroup(id: "MainWindow") {
+      AppView(selectedTab: $selectedTab, appRouterPath: $appRouterPath)
+        .applyTheme(theme)
+        .onAppear {
+          setNewClientsInEnv(client: appAccountsManager.currentClient)
+          setupRevenueCat()
+          refreshPushSubs()
+        }
+        .environment(appAccountsManager)
+        .environment(appAccountsManager.currentClient)
+        .environment(quickLook)
+        .environment(currentAccount)
+        .environment(currentInstance)
+        .environment(userPreferences)
+        .environment(theme)
+        .environment(watcher)
+        .environment(pushNotificationsService)
+        .environment(appIntentService)
+        .environment(\.isSupporter, isSupporter)
+        .sheet(item: $quickLook.selectedMediaAttachment) { selectedMediaAttachment in
+          MediaUIView(selectedAttachment: selectedMediaAttachment,
+                      attachments: quickLook.mediaAttachments)
+            .presentationBackground(.ultraThinMaterial)
+            .presentationCornerRadius(16)
+            .withEnvironments()
+        }
+        .onChange(of: pushNotificationsService.handledNotification) { _, newValue in
+          if newValue != nil {
+            pushNotificationsService.handledNotification = nil
+            if appAccountsManager.currentAccount.oauthToken?.accessToken != newValue?.account.token.accessToken,
+               let account = appAccountsManager.availableAccounts.first(where:
+                 { $0.oauthToken?.accessToken == newValue?.account.token.accessToken })
+            {
+              appAccountsManager.currentAccount = account
+              DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
+                selectedTab = .notifications
+                pushNotificationsService.handledNotification = newValue
+              }
+            } else {
+              selectedTab = .notifications
+            }
+          }
+        }
+        .onChange(of: appIntentService.handledIntent) { _, _ in
+          if let intent = appIntentService.handledIntent?.intent {
+            handleIntent(intent)
+            appIntentService.handledIntent = nil
+          }
+        }
+        .withModelContainer()
+    }
+    #if targetEnvironment(macCatalyst)
+    .defaultSize(width: userPreferences.showiPadSecondaryColumn ? 1100 : 800, height: 1400)
+    #elseif os(visionOS)
+    .defaultSize(width: 800, height: 1200)
+    #endif
+    .commands {
+      appMenu
+    }
+    .onChange(of: scenePhase) { _, newValue in
+      handleScenePhase(scenePhase: newValue)
+    }
+    .onChange(of: appAccountsManager.currentClient) { _, newValue in
+      setNewClientsInEnv(client: newValue)
+      if newValue.isAuth {
+        watcher.watch(streams: [.user, .direct])
+      }
+    }
+  }
+
+  @SceneBuilder
+  var otherScenes: some Scene {
+    WindowGroup(for: WindowDestinationEditor.self) { destination in
+      Group {
+        switch destination.wrappedValue {
+        case let .newStatusEditor(visibility):
+          StatusEditor.MainView(mode: .new(text: nil, visibility: visibility))
+        case let .prefilledStatusEditor(text, visibility):
+          StatusEditor.MainView(mode: .new(text: text, visibility: visibility))
+        case let .editStatusEditor(status):
+          StatusEditor.MainView(mode: .edit(status: status))
+        case let .quoteStatusEditor(status):
+          StatusEditor.MainView(mode: .quote(status: status))
+        case let .replyToStatusEditor(status):
+          StatusEditor.MainView(mode: .replyTo(status: status))
+        case let .mentionStatusEditor(account, visibility):
+          StatusEditor.MainView(mode: .mention(account: account, visibility: visibility))
+        case let .quoteLinkStatusEditor(link):
+          StatusEditor.MainView(mode: .quoteLink(link: link))
+        case .none:
+          EmptyView()
+        }
+      }
+      .withEnvironments()
+      .environment(RouterPath())
+      .withModelContainer()
+      .applyTheme(theme)
+      .frame(minWidth: 300, minHeight: 400)
+    }
+    .defaultSize(width: 600, height: 800)
+    .windowResizability(.contentMinSize)
+
+    WindowGroup(for: WindowDestinationMedia.self) { destination in
+      Group {
+        switch destination.wrappedValue {
+        case let .mediaViewer(attachments, selectedAttachment):
+          MediaUIView(selectedAttachment: selectedAttachment,
+                      attachments: attachments)
+        case .none:
+          EmptyView()
+        }
+      }
+      .withEnvironments()
+      .withModelContainer()
+      .applyTheme(theme)
+      .frame(minWidth: 300, minHeight: 400)
+    }
+    .defaultSize(width: 1200, height: 1000)
+    .windowResizability(.contentMinSize)
+  }
+
+  private func handleIntent(_: any AppIntent) {
+    if let postIntent = appIntentService.handledIntent?.intent as? PostIntent {
+      #if os(visionOS) || os(macOS)
+        openWindow(value: WindowDestinationEditor.prefilledStatusEditor(text: postIntent.content ?? "",
+                                                                        visibility: userPreferences.postVisibility))
+      #else
+        appRouterPath.presentedSheet = .prefilledStatusEditor(text: postIntent.content ?? "",
+                                                              visibility: userPreferences.postVisibility)
+      #endif
+    } else if let tabIntent = appIntentService.handledIntent?.intent as? TabIntent {
+      selectedTab = tabIntent.tab.toAppTab
+    } else if let imageIntent = appIntentService.handledIntent?.intent as? PostImageIntent,
+              let urls = imageIntent.images?.compactMap({ $0.fileURL })
+    {
+      appRouterPath.presentedSheet = .imageURL(urls: urls,
+                                               visibility: userPreferences.postVisibility)
+    }
+  }
+}

IceCubesApp/App/Main/IceCubesApp.swift

@@ -0,0 +1,124 @@
+import Account
+import AppAccount
+import AVFoundation
+import DesignSystem
+import Env
+import KeychainSwift
+import MediaUI
+import Network
+import RevenueCat
+import StatusKit
+import SwiftUI
+import Timeline
+
+@main
+struct IceCubesApp: App {
+  @UIApplicationDelegateAdaptor private var appDelegate: AppDelegate
+
+  @Environment(\.scenePhase) var scenePhase
+  @Environment(\.openWindow) var openWindow
+
+  @State var appAccountsManager = AppAccountsManager.shared
+  @State var currentInstance = CurrentInstance.shared
+  @State var currentAccount = CurrentAccount.shared
+  @State var userPreferences = UserPreferences.shared
+  @State var pushNotificationsService = PushNotificationsService.shared
+  @State var appIntentService = AppIntentService.shared
+  @State var watcher = StreamWatcher.shared
+  @State var quickLook = QuickLook.shared
+  @State var theme = Theme.shared
+
+  @State var selectedTab: Tab = .timeline
+  @State var appRouterPath = RouterPath()
+
+  @State var isSupporter: Bool = false
+
+  var body: some Scene {
+    appScene
+    otherScenes
+  }
+
+  func setNewClientsInEnv(client: Client) {
+    currentAccount.setClient(client: client)
+    currentInstance.setClient(client: client)
+    userPreferences.setClient(client: client)
+    Task {
+      await currentInstance.fetchCurrentInstance()
+      watcher.setClient(client: client, instanceStreamingURL: currentInstance.instance?.urls?.streamingApi)
+      watcher.watch(streams: [.user, .direct])
+    }
+  }
+
+  func handleScenePhase(scenePhase: ScenePhase) {
+    switch scenePhase {
+    case .background:
+      watcher.stopWatching()
+    case .active:
+      watcher.watch(streams: [.user, .direct])
+      UNUserNotificationCenter.current().setBadgeCount(0)
+      userPreferences.reloadNotificationsCount(tokens: appAccountsManager.availableAccounts.compactMap(\.oauthToken))
+      Task {
+        await userPreferences.refreshServerPreferences()
+      }
+    default:
+      break
+    }
+  }
+
+  func setupRevenueCat() {
+    Purchases.logLevel = .error
+    Purchases.configure(withAPIKey: "appl_JXmiRckOzXXTsHKitQiicXCvMQi")
+    Purchases.shared.getCustomerInfo { info, _ in
+      if info?.entitlements["Supporter"]?.isActive == true {
+        isSupporter = true
+      }
+    }
+  }
+
+  func refreshPushSubs() {
+    PushNotificationsService.shared.requestPushNotifications()
+  }
+}
+
+class AppDelegate: UIResponder, UIApplicationDelegate {
+  func application(_: UIApplication,
+                   didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool
+  {
+    try? AVAudioSession.sharedInstance().setCategory(.ambient, options: .mixWithOthers)
+    try? AVAudioSession.sharedInstance().setActive(true)
+    PushNotificationsService.shared.setAccounts(accounts: AppAccountsManager.shared.pushAccounts)
+    return true
+  }
+
+  func application(_: UIApplication,
+                   didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data)
+  {
+    PushNotificationsService.shared.pushToken = deviceToken
+    Task {
+      PushNotificationsService.shared.setAccounts(accounts: AppAccountsManager.shared.pushAccounts)
+      await PushNotificationsService.shared.updateSubscriptions(forceCreate: false)
+    }
+  }
+
+  func application(_: UIApplication, didFailToRegisterForRemoteNotificationsWithError _: Error) {}
+
+  func application(_: UIApplication, didReceiveRemoteNotification _: [AnyHashable: Any]) async -> UIBackgroundFetchResult {
+    UserPreferences.shared.reloadNotificationsCount(tokens: AppAccountsManager.shared.availableAccounts.compactMap(\.oauthToken))
+    return .noData
+  }
+
+  func application(_: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options _: UIScene.ConnectionOptions) -> UISceneConfiguration {
+    let configuration = UISceneConfiguration(name: nil, sessionRole: connectingSceneSession.role)
+    if connectingSceneSession.role == .windowApplication {
+      configuration.delegateClass = SceneDelegate.self
+    }
+    return configuration
+  }
+
+  override func buildMenu(with builder: UIMenuBuilder) {
+    super.buildMenu(with: builder)
+    builder.remove(menu: .document)
+    builder.remove(menu: .toolbar)
+    builder.remove(menu: .sidebar)
+  }
+}

IceCubesApp/App/QuickLookRepresentable.swift

@@ -1,92 +0,0 @@
-import QuickLook
-import SwiftUI
-import UIKit
-
-extension URL: Identifiable {
-  public var id: String {
-    absoluteString
-  }
-}
-
-struct QuickLookPreview: UIViewControllerRepresentable {
-  let selectedURL: URL
-  let urls: [URL]
-
-  func makeUIViewController(context _: Context) -> UIViewController {
-    return AppQLPreviewController(selectedURL: selectedURL, urls: urls)
-  }
-
-  func updateUIViewController(
-    _: UIViewController, context _: Context
-  ) {}
-}
-
-class AppQLPreviewController: UIViewController {
-  let selectedURL: URL
-  let urls: [URL]
-
-  var qlController: QLPreviewController?
-
-  init(selectedURL: URL, urls: [URL]) {
-    self.selectedURL = selectedURL
-    self.urls = urls
-    super.init(nibName: nil, bundle: nil)
-  }
-
-  @available(*, unavailable)
-  required init?(coder _: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
-  }
-
-  override func viewWillAppear(_ animated: Bool) {
-    super.viewWillAppear(animated)
-    if qlController == nil {
-      qlController = QLPreviewController()
-      qlController?.dataSource = self
-      qlController?.delegate = self
-      qlController?.currentPreviewItemIndex = urls.firstIndex(of: selectedURL) ?? 0
-      present(qlController!, animated: true)
-    }
-  }
-}
-
-extension AppQLPreviewController: QLPreviewControllerDataSource {
-  func numberOfPreviewItems(in _: QLPreviewController) -> Int {
-    return urls.count
-  }
-
-  func previewController(_: QLPreviewController, previewItemAt index: Int) -> QLPreviewItem {
-    return urls[index] as QLPreviewItem
-  }
-}
-
-extension AppQLPreviewController: QLPreviewControllerDelegate {
-  func previewController(_: QLPreviewController, editingModeFor _: QLPreviewItem) -> QLPreviewItemEditingMode {
-    .createCopy
-  }
-
-  func previewControllerWillDismiss(_: QLPreviewController) {
-    dismiss(animated: true)
-  }
-}
-
-struct TransparentBackground: UIViewControllerRepresentable {
-  public func makeUIViewController(context _: Context) -> UIViewController {
-    return TransparentController()
-  }
-
-  public func updateUIViewController(_: UIViewController, context _: Context) {}
-
-  class TransparentController: UIViewController {
-    override func viewDidLoad() {
-      super.viewDidLoad()
-      view.backgroundColor = .clear
-    }
-
-    override func willMove(toParent parent: UIViewController?) {
-      super.willMove(toParent: parent)
-      parent?.view?.backgroundColor = .clear
-      parent?.modalPresentationStyle = .overCurrentContext
-    }
-  }
-}

IceCubesApp/App/Report/ReportView.swift

@@ -2,14 +2,14 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Status
+import StatusKit
 import SwiftUI
 
 public struct ReportView: View {
   @Environment(\.dismiss) private var dismiss
 
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var client: Client
+  @Environment(Theme.self) private var theme
+  @Environment(Client.self) private var client
 
   let status: Status
   @State private var commentText: String = ""
@@ -35,42 +35,38 @@ public struct ReportView: View {
       }
       .navigationTitle("report.title")
       .navigationBarTitleDisplayMode(.inline)
-      .scrollContentBackground(.hidden)
-      .background(theme.secondaryBackgroundColor)
-      .scrollDismissesKeyboard(.immediately)
-      .toolbar {
-        ToolbarItem(placement: .navigationBarTrailing) {
-          Button {
-            isSendingReport = true
-            Task {
-              do {
-                let _: ReportSent =
-                  try await client.post(endpoint: Statuses.report(accountId: status.account.id,
-                                                                  statusId: status.id,
-                                                                  comment: commentText))
-                dismiss()
-                isSendingReport = false
-              } catch {
-                isSendingReport = false
+      #if !os(visionOS)
+        .scrollContentBackground(.hidden)
+        .background(theme.secondaryBackgroundColor)
+        .scrollDismissesKeyboard(.immediately)
+      #endif
+        .toolbar {
+          ToolbarItem(placement: .navigationBarTrailing) {
+            Button {
+              isSendingReport = true
+              Task {
+                do {
+                  let _: ReportSent =
+                    try await client.post(endpoint: Statuses.report(accountId: status.account.id,
+                                                                    statusId: status.id,
+                                                                    comment: commentText))
+                  dismiss()
+                  isSendingReport = false
+                } catch {
+                  isSendingReport = false
+                }
+              }
+            } label: {
+              if isSendingReport {
+                ProgressView()
+              } else {
+                Text("report.action.send")
               }
             }
-          } label: {
-            if isSendingReport {
-              ProgressView()
-            } else {
-              Text("report.action.send")
-            }
           }
-        }
 
-        ToolbarItem(placement: .navigationBarLeading) {
-          Button {
-            dismiss()
-          } label: {
-            Text("action.cancel")
-          }
+          CancelToolbarItem()
         }
-      }
     }
   }
 }

IceCubesApp/App/SafariRouter.swift

@@ -1,33 +1,41 @@
 import DesignSystem
 import Env
+import Models
+import Observation
 import SafariServices
 import SwiftUI
 
 extension View {
-  func withSafariRouter() -> some View {
+  @MainActor func withSafariRouter() -> some View {
     modifier(SafariRouter())
   }
 }
 
+@MainActor
 private struct SafariRouter: ViewModifier {
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var preferences: UserPreferences
-  @EnvironmentObject private var routerPath: RouterPath
+  @Environment(\.isSecondaryColumn) private var isSecondaryColumn: Bool
+  @Environment(Theme.self) private var theme
+  @Environment(UserPreferences.self) private var preferences
+  @Environment(RouterPath.self) private var routerPath
 
-  @State private var presentedURL: URL?
+  #if !os(visionOS)
+    @State private var safariManager = InAppSafariManager()
+  #endif
 
   func body(content: Content) -> some View {
     content
       .environment(\.openURL, OpenURLAction { url in
         // Open internal URL.
-        routerPath.handle(url: url)
+        guard !isSecondaryColumn else { return .discarded }
+        return routerPath.handle(url: url)
       })
-      .onOpenURL(perform: { url in
+      .onOpenURL { url in
         // Open external URL (from icecubesapp://)
-        let urlString = url.absoluteString.replacingOccurrences(of: "icecubesapp://", with: "https://")
+        guard !isSecondaryColumn else { return }
+        let urlString = url.absoluteString.replacingOccurrences(of: AppInfo.scheme, with: "https://")
         guard let url = URL(string: urlString), url.host != nil else { return }
-        _ = routerPath.handle(url: url)
-      })
+        _ = routerPath.handleDeepLink(url: url)
+      }
       .onAppear {
         routerPath.urlHandler = { url in
           if url.absoluteString.contains("@twitter.com"), url.absoluteString.hasPrefix("mailto:") {
@@ -40,36 +48,123 @@ private struct SafariRouter: ViewModifier {
               return .handled
             }
           }
-          guard preferences.preferredBrowser == .inAppSafari, !ProcessInfo.processInfo.isiOSAppOnMac else { return .systemAction }
-          // SFSafariViewController only supports initial URLs with http:// or https:// schemes.
-          guard let scheme = url.scheme, ["https", "http"].contains(scheme.lowercased()) else {
+          #if !targetEnvironment(macCatalyst)
+            guard preferences.preferredBrowser == .inAppSafari else { return .systemAction }
+            // SFSafariViewController only supports initial URLs with http:// or https:// schemes.
+            guard let scheme = url.scheme, ["https", "http"].contains(scheme.lowercased()) else {
+              return .systemAction
+            }
+            #if os(visionOS)
+              return .systemAction
+            #else
+              return safariManager.open(url)
+            #endif
+          #else
             return .systemAction
-          }
-
-          presentedURL = url
-          return .handled
+          #endif
         }
       }
-      .fullScreenCover(item: $presentedURL, content: { url in
-        SafariView(url: url, inAppBrowserReaderView: preferences.inAppBrowserReaderView)
-          .edgesIgnoringSafeArea(.all)
-      })
+    #if !os(visionOS)
+      .background {
+        WindowReader { window in
+          safariManager.windowScene = window.windowScene
+        }
+      }
+    #endif
   }
+}
 
-  struct SafariView: UIViewControllerRepresentable {
-    let url: URL
-    let inAppBrowserReaderView: Bool
+#if !os(visionOS)
+  @MainActor
+  @Observable private class InAppSafariManager: NSObject, SFSafariViewControllerDelegate {
+    var windowScene: UIWindowScene?
+    let viewController: UIViewController = .init()
+    var window: UIWindow?
+
+    @MainActor
+    func open(_ url: URL) -> OpenURLAction.Result {
+      guard let windowScene else { return .systemAction }
+
+      window = setupWindow(windowScene: windowScene)
 
-    func makeUIViewController(context _: UIViewControllerRepresentableContext<SafariView>) -> SFSafariViewController {
       let configuration = SFSafariViewController.Configuration()
-      configuration.entersReaderIfAvailable = inAppBrowserReaderView
+      configuration.entersReaderIfAvailable = UserPreferences.shared.inAppBrowserReaderView
 
       let safari = SFSafariViewController(url: url, configuration: configuration)
       safari.preferredBarTintColor = UIColor(Theme.shared.primaryBackgroundColor)
       safari.preferredControlTintColor = UIColor(Theme.shared.tintColor)
-      return safari
+      safari.delegate = self
+
+      DispatchQueue.main.async { [weak self] in
+        self?.viewController.present(safari, animated: true)
+      }
+
+      return .handled
     }
 
-    func updateUIViewController(_: SFSafariViewController, context _: UIViewControllerRepresentableContext<SafariView>) {}
+    func setupWindow(windowScene: UIWindowScene) -> UIWindow {
+      let window = window ?? UIWindow(windowScene: windowScene)
+
+      window.rootViewController = viewController
+      window.makeKeyAndVisible()
+
+      switch Theme.shared.selectedScheme {
+      case .dark:
+        window.overrideUserInterfaceStyle = .dark
+      case .light:
+        window.overrideUserInterfaceStyle = .light
+      }
+
+      self.window = window
+      return window
+    }
+
+    nonisolated func safariViewControllerDidFinish(_: SFSafariViewController) {
+      Task { @MainActor in
+        window?.resignKey()
+        window?.isHidden = false
+        window = nil
+      }
+    }
+  }
+#endif
+
+private struct WindowReader: UIViewRepresentable {
+  var onUpdate: (UIWindow) -> Void
+
+  func makeUIView(context _: Context) -> InjectView {
+    InjectView(onUpdate: onUpdate)
+  }
+
+  func updateUIView(_: InjectView, context _: Context) {}
+
+  class InjectView: UIView {
+    var onUpdate: (UIWindow) -> Void
+
+    init(onUpdate: @escaping (UIWindow) -> Void) {
+      self.onUpdate = onUpdate
+      super.init(frame: .zero)
+      isHidden = true
+      isUserInteractionEnabled = false
+    }
+
+    @available(*, unavailable)
+    required init?(coder _: NSCoder) {
+      fatalError("init(coder:) has not been implemented")
+    }
+
+    override func willMove(toWindow newWindow: UIWindow?) {
+      super.willMove(toWindow: newWindow)
+
+      if let window = newWindow {
+        onUpdate(window)
+      } else {
+        DispatchQueue.main.async { [weak self] in
+          if let window = self?.window {
+            self?.onUpdate(window)
+          }
+        }
+      }
+    }
   }
 }

IceCubesApp/App/SideBarView.swift

@@ -4,69 +4,93 @@ import DesignSystem
 import Env
 import Models
 import SwiftUI
+import SwiftUIIntrospect
 
+@MainActor
 struct SideBarView<Content: View>: View {
-  @EnvironmentObject private var appAccounts: AppAccountsManager
-  @EnvironmentObject private var currentAccount: CurrentAccount
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var watcher: StreamWatcher
-  @EnvironmentObject private var userPreferences: UserPreferences
+  @Environment(\.openWindow) private var openWindow
+  @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+
+  @Environment(AppAccountsManager.self) private var appAccounts
+  @Environment(CurrentAccount.self) private var currentAccount
+  @Environment(Theme.self) private var theme
+  @Environment(StreamWatcher.self) private var watcher
+  @Environment(UserPreferences.self) private var userPreferences
+  @Environment(RouterPath.self) private var routerPath
 
   @Binding var selectedTab: Tab
   @Binding var popToRootTab: Tab
   var tabs: [Tab]
-  @ObservedObject var routerPath = RouterPath()
   @ViewBuilder var content: () -> Content
 
+  @State private var sidebarTabs = SidebarTabs.shared
+
   private func badgeFor(tab: Tab) -> Int {
-    if tab == .notifications && selectedTab != tab,
-       let token = appAccounts.currentAccount.oauthToken {
-      return watcher.unreadNotificationsCount + userPreferences.getNotificationsCount(for: token)
+    if tab == .notifications, selectedTab != tab,
+       let token = appAccounts.currentAccount.oauthToken
+    {
+      return watcher.unreadNotificationsCount + (userPreferences.notificationsCount[token] ?? 0)
     }
     return 0
   }
-  
+
   private func makeIconForTab(tab: Tab) -> some View {
-    ZStack(alignment: .topTrailing) {
-      SideBarIcon(systemIconName: tab.iconName,
-                  isSelected: tab == selectedTab)
-      if let badge = badgeFor(tab: tab), badge > 0 {
-        makeBadgeView(count: badge)
+    HStack {
+      ZStack(alignment: .topTrailing) {
+        SideBarIcon(systemIconName: tab.iconName,
+                    isSelected: tab == selectedTab)
+        let badge = badgeFor(tab: tab)
+        if badge > 0 {
+          makeBadgeView(count: badge)
+        }
+      }
+      if userPreferences.isSidebarExpanded {
+        Text(tab.title)
+          .font(.headline)
+          .foregroundColor(tab == selectedTab ? theme.tintColor : theme.labelColor)
+          .frame(maxWidth: .infinity, alignment: .leading)
       }
     }
-    .contentShape(Rectangle())
-    .frame(width: .sidebarWidth, height: 50)
+    .frame(width: (userPreferences.isSidebarExpanded ? .sidebarWidthExpanded : .sidebarWidth) - 24, height: 50)
+    .background(tab == selectedTab ? theme.secondaryBackgroundColor : .clear,
+                in: RoundedRectangle(cornerRadius: 8))
   }
-  
+
   private func makeBadgeView(count: Int) -> some View {
     ZStack {
       Circle()
         .fill(.red)
-      Text(String(count))
+      Text(count > 99 ? "99+" : String(count))
         .foregroundColor(.white)
         .font(.caption2)
     }
-    .frame(width: 20, height: 20)
-    .offset(x: 10, y: -10)
+    .frame(width: 24, height: 24)
+    .offset(x: 14, y: -14)
   }
 
   private var postButton: some View {
     Button {
-      routerPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
+      #if targetEnvironment(macCatalyst) || os(visionOS)
+        openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
+      #else
+        routerPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
+      #endif
     } label: {
       Image(systemName: "square.and.pencil")
         .resizable()
         .aspectRatio(contentMode: .fit)
         .frame(width: 20, height: 30)
+        .offset(x: 2, y: -2)
     }
     .buttonStyle(.borderedProminent)
-    .keyboardShortcut("n", modifiers: .command)
+    .help(Tab.post.title)
   }
 
   private func makeAccountButton(account: AppAccount, showBadge: Bool) -> some View {
     Button {
       if account.id == appAccounts.currentAccount.id {
         selectedTab = .profile
+        SoundEffectManager.shared.playSound(.tabSelection)
       } else {
         var transation = Transaction()
         transation.disablesAnimations = true
@@ -76,77 +100,121 @@ struct SideBarView<Content: View>: View {
       }
     } label: {
       ZStack(alignment: .topTrailing) {
-        AppAccountView(viewModel: .init(appAccount: account, isCompact: true))
-        if showBadge,
-            let token = account.oauthToken,
-            userPreferences.getNotificationsCount(for: token) > 0 {
-          makeBadgeView(count: userPreferences.getNotificationsCount(for: token))
+        if userPreferences.isSidebarExpanded {
+          AppAccountView(viewModel: .init(appAccount: account, 
+                                          isCompact: false,
+                                          isInSettings: false),
+                         isParentPresented: .constant(false))
+        } else {
+          AppAccountView(viewModel: .init(appAccount: account, 
+                                          isCompact: true,
+                                          isInSettings: false),
+                         isParentPresented: .constant(false))
+        }
+        if !userPreferences.isSidebarExpanded,
+           showBadge,
+           let token = account.oauthToken,
+           let notificationsCount = userPreferences.notificationsCount[token],
+           notificationsCount > 0
+        {
+          makeBadgeView(count: notificationsCount)
         }
       }
+      .padding(.leading, userPreferences.isSidebarExpanded ? 16 : 0)
     }
-    .frame(width: .sidebarWidth, height: 50)
+    .help(accountButtonTitle(accountName: account.accountName))
+    .frame(width: userPreferences.isSidebarExpanded ? .sidebarWidthExpanded : .sidebarWidth, height: 50)
     .padding(.vertical, 8)
     .background(selectedTab == .profile && account.id == appAccounts.currentAccount.id ?
       theme.secondaryBackgroundColor : .clear)
   }
 
+  private func accountButtonTitle(accountName: String?) -> LocalizedStringKey {
+    if let accountName {
+      "tab.profile-account-\(accountName)"
+    } else {
+      Tab.profile.title
+    }
+  }
+
   private var tabsView: some View {
     ForEach(tabs) { tab in
-      Button {
-        if tab == selectedTab {
-          popToRootTab = .other
-          DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
-            popToRootTab = tab
+      if tab != .profile && sidebarTabs.isEnabled(tab) {
+        Button {
+          // ensure keyboard is always dismissed when selecting a tab
+          hideKeyboard()
+
+          if tab == selectedTab {
+            popToRootTab = .other
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
+              popToRootTab = tab
+            }
           }
-        }
-        selectedTab = tab
-        if tab == .notifications {
-          if let token = appAccounts.currentAccount.oauthToken {
-            userPreferences.setNotification(count: 0, token: token)
+          selectedTab = tab
+          SoundEffectManager.shared.playSound(.tabSelection)
+          if tab == .notifications {
+            if let token = appAccounts.currentAccount.oauthToken {
+              userPreferences.notificationsCount[token] = 0
+            }
+            watcher.unreadNotificationsCount = 0
           }
-          watcher.unreadNotificationsCount = 0
+        } label: {
+          makeIconForTab(tab: tab)
         }
-      } label: {
-        makeIconForTab(tab: tab)
+        .help(tab.title)
       }
-      .background(tab == selectedTab ? theme.secondaryBackgroundColor : .clear)
     }
   }
 
   var body: some View {
+    @Bindable var routerPath = routerPath
     HStack(spacing: 0) {
-      ScrollView {
-        VStack(alignment: .center) {
-          if appAccounts.availableAccounts.isEmpty {
-            tabsView
-          } else {
-            ForEach(appAccounts.availableAccounts) { account in
-              makeAccountButton(account: account,
-                                showBadge: account.id != appAccounts.currentAccount.id)
-              if account.id == appAccounts.currentAccount.id {
-                tabsView
+      if horizontalSizeClass == .regular {
+        ScrollView {
+          VStack(alignment: .center) {
+            if appAccounts.availableAccounts.isEmpty {
+              tabsView
+            } else {
+              ForEach(appAccounts.availableAccounts) { account in
+                makeAccountButton(account: account,
+                                  showBadge: account.id != appAccounts.currentAccount.id)
+                if account.id == appAccounts.currentAccount.id {
+                  tabsView
+                }
               }
             }
           }
-          postButton
-            .padding(.top, 12)
-          Spacer()
         }
+        .frame(width: userPreferences.isSidebarExpanded ? .sidebarWidthExpanded : .sidebarWidth)
+        .scrollContentBackground(.hidden)
+        .background(.thinMaterial)
+        .safeAreaInset(edge: .bottom, content: {
+          HStack(spacing: 16) {
+            postButton
+              .padding(.vertical, 24)
+              .padding(.leading, userPreferences.isSidebarExpanded ? 18 : 0)
+            if userPreferences.isSidebarExpanded {
+              Text("menu.new-post")
+                .font(.subheadline)
+                .foregroundColor(theme.labelColor)
+                .frame(maxWidth: .infinity, alignment: .leading)
+            }
+          }
+          .frame(width: userPreferences.isSidebarExpanded ? .sidebarWidthExpanded : .sidebarWidth)
+          .background(.thinMaterial)
+        })
+        Divider().edgesIgnoringSafeArea(.all)
       }
-      .frame(width: .sidebarWidth)
-      .scrollContentBackground(.hidden)
-      .background(.thinMaterial)
-      Divider()
-        .edgesIgnoringSafeArea(.top)
       content()
     }
     .background(.thinMaterial)
+    .edgesIgnoringSafeArea(.bottom)
     .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
   }
 }
 
 private struct SideBarIcon: View {
-  @EnvironmentObject private var theme: Theme
+  @Environment(Theme.self) private var theme
 
   let systemIconName: String
   let isSelected: Bool
@@ -158,11 +226,20 @@ private struct SideBarIcon: View {
       .font(.title2)
       .fontWeight(.medium)
       .foregroundColor(isSelected ? theme.tintColor : theme.labelColor)
+      .symbolVariant(isSelected ? .fill : .none)
       .scaleEffect(isHovered ? 0.8 : 1.0)
       .onHover { isHovered in
         withAnimation(.interpolatingSpring(stiffness: 300, damping: 15)) {
           self.isHovered = isHovered
         }
       }
+      .frame(width: 50, height: 40)
+  }
+}
+
+extension View {
+  @MainActor func hideKeyboard() {
+    let resign = #selector(UIResponder.resignFirstResponder)
+    UIApplication.shared.sendAction(resign, to: nil, from: nil, for: nil)
   }
 }

IceCubesApp/App/Tabs/ExploreTab.swift

@@ -4,41 +4,40 @@ import Env
 import Explore
 import Models
 import Network
-import Shimmer
 import SwiftUI
 
+@MainActor
 struct ExploreTab: View {
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var preferences: UserPreferences
-  @EnvironmentObject private var currentAccount: CurrentAccount
-  @EnvironmentObject private var client: Client
-  @StateObject private var routerPath = RouterPath()
+  @Environment(Theme.self) private var theme
+  @Environment(UserPreferences.self) private var preferences
+  @Environment(CurrentAccount.self) private var currentAccount
+  @Environment(Client.self) private var client
+  @State private var routerPath = RouterPath()
+  @State private var scrollToTopSignal: Int = 0
   @Binding var popToRootTab: Tab
 
   var body: some View {
     NavigationStack(path: $routerPath.path) {
-      ExploreView()
+      ExploreView(scrollToTopSignal: $scrollToTopSignal)
         .withAppRouter()
         .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
-        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
+        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .navigationBar)
         .toolbar {
-          statusEditorToolbarItem(routerPath: routerPath,
-                                  visibility: preferences.postVisibility)
-          if UIDevice.current.userInterfaceIdiom != .pad {
-            ToolbarItem(placement: .navigationBarLeading) {
-              AppAccountsSelectorView(routerPath: routerPath)
-            }
-          }
+          ToolbarTab(routerPath: $routerPath)
         }
     }
     .withSafariRouter()
-    .environmentObject(routerPath)
-    .onChange(of: $popToRootTab.wrappedValue) { popToRootTab in
-      if popToRootTab == .explore {
-        routerPath.path = []
+    .environment(routerPath)
+    .onChange(of: $popToRootTab.wrappedValue) { _, newValue in
+      if newValue == .explore {
+        if routerPath.path.isEmpty {
+          scrollToTopSignal += 1
+        } else {
+          routerPath.path = []
+        }
       }
     }
-    .onChange(of: client.id) { _ in
+    .onChange(of: client.id) {
       routerPath.path = []
     }
     .onAppear {

IceCubesApp/App/Tabs/MessagesTab.swift

@@ -5,45 +5,46 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI
 
+@MainActor
 struct MessagesTab: View {
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var watcher: StreamWatcher
-  @EnvironmentObject private var client: Client
-  @EnvironmentObject private var currentAccount: CurrentAccount
-  @EnvironmentObject private var appAccount: AppAccountsManager
-  @StateObject private var routerPath = RouterPath()
+  @Environment(Theme.self) private var theme
+  @Environment(StreamWatcher.self) private var watcher
+  @Environment(Client.self) private var client
+  @Environment(CurrentAccount.self) private var currentAccount
+  @Environment(AppAccountsManager.self) private var appAccount
+  @State private var routerPath = RouterPath()
+  @State private var scrollToTopSignal: Int = 0
   @Binding var popToRootTab: Tab
 
   var body: some View {
     NavigationStack(path: $routerPath.path) {
-      ConversationsListView()
+      ConversationsListView(scrollToTopSignal: $scrollToTopSignal)
         .withAppRouter()
         .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
         .toolbar {
-          if UIDevice.current.userInterfaceIdiom != .pad {
-            ToolbarItem(placement: .navigationBarLeading) {
-              AppAccountsSelectorView(routerPath: routerPath)
-            }
-          }
+          ToolbarTab(routerPath: $routerPath)
         }
-        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
+        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .navigationBar)
         .id(client.id)
     }
-    .onChange(of: $popToRootTab.wrappedValue) { popToRootTab in
-      if popToRootTab == .messages {
-        routerPath.path = []
+    .onChange(of: $popToRootTab.wrappedValue) { _, newValue in
+      if newValue == .messages {
+        if routerPath.path.isEmpty {
+          scrollToTopSignal += 1
+        } else {
+          routerPath.path = []
+        }
       }
     }
-    .onChange(of: client.id) { _ in
+    .onChange(of: client.id) {
       routerPath.path = []
     }
     .onAppear {
       routerPath.client = client
     }
     .withSafariRouter()
-    .environmentObject(routerPath)
+    .environment(routerPath)
   }
 }

IceCubesApp/App/Tabs/NavigationSheet.swift

@@ -0,0 +1,24 @@
+import AppAccount
+import DesignSystem
+import Env
+import SwiftUI
+
+@MainActor
+struct NavigationSheet<Content: View>: View {
+  @Environment(\.dismiss) private var dismiss
+
+  var content: () -> Content
+
+  init(@ViewBuilder content: @escaping () -> Content) {
+    self.content = content
+  }
+
+  var body: some View {
+    NavigationStack {
+      content()
+        .toolbar {
+          CloseToolbarItem()
+        }
+    }
+  }
+}

IceCubesApp/App/Tabs/NavigationTab.swift

@@ -0,0 +1,46 @@
+import AppAccount
+import DesignSystem
+import Env
+import Network
+import SwiftUI
+
+@MainActor
+struct NavigationTab<Content: View>: View {
+  @Environment(\.isSecondaryColumn) private var isSecondaryColumn: Bool
+
+  @Environment(AppAccountsManager.self) private var appAccount
+  @Environment(CurrentAccount.self) private var currentAccount
+  @Environment(UserPreferences.self) private var userPreferences
+  @Environment(Theme.self) private var theme
+  @Environment(Client.self) private var client
+
+  var content: () -> Content
+
+  @State private var routerPath = RouterPath()
+
+  init(@ViewBuilder content: @escaping () -> Content) {
+    self.content = content
+  }
+
+  var body: some View {
+    NavigationStack(path: $routerPath.path) {
+      content()
+        .withEnvironments()
+        .withAppRouter()
+        .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+        .withSafariRouter()
+        .toolbar {
+          ToolbarTab(routerPath: $routerPath)
+        }
+        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .navigationBar)
+        .onChange(of: client.id) {
+          routerPath.path = []
+        }
+        .onAppear {
+          routerPath.client = client
+        }
+        .withSafariRouter()
+    }
+    .environment(routerPath)
+  }
+}

IceCubesApp/App/Tabs/NotificationTab.swift

@@ -7,80 +7,95 @@ import Notifications
 import SwiftUI
 import Timeline
 
+@MainActor
 struct NotificationsTab: View {
   @Environment(\.isSecondaryColumn) private var isSecondaryColumn: Bool
   @Environment(\.scenePhase) private var scenePhase
 
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var client: Client
-  @EnvironmentObject private var watcher: StreamWatcher
-  @EnvironmentObject private var appAccount: AppAccountsManager
-  @EnvironmentObject private var currentAccount: CurrentAccount
-  @EnvironmentObject private var userPreferences: UserPreferences
-  @EnvironmentObject private var pushNotificationsService: PushNotificationsService
-  @StateObject private var routerPath = RouterPath()
+  @Environment(Theme.self) private var theme
+  @Environment(Client.self) private var client
+  @Environment(StreamWatcher.self) private var watcher
+  @Environment(AppAccountsManager.self) private var appAccount
+  @Environment(CurrentAccount.self) private var currentAccount
+  @Environment(UserPreferences.self) private var userPreferences
+  @Environment(PushNotificationsService.self) private var pushNotificationsService
+  @State private var routerPath = RouterPath()
+  @State private var scrollToTopSignal: Int = 0
+
+  @Binding var selectedTab: Tab
   @Binding var popToRootTab: Tab
 
   let lockedType: Models.Notification.NotificationType?
 
   var body: some View {
     NavigationStack(path: $routerPath.path) {
-      NotificationsListView(lockedType: lockedType)
+      NotificationsListView(lockedType: lockedType, scrollToTopSignal: $scrollToTopSignal)
         .withAppRouter()
         .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
         .toolbar {
-          if !isSecondaryColumn {
-            statusEditorToolbarItem(routerPath: routerPath,
-                                    visibility: userPreferences.postVisibility)
-            if UIDevice.current.userInterfaceIdiom != .pad {
-              ToolbarItem(placement: .navigationBarLeading) {
-                AppAccountsSelectorView(routerPath: routerPath)
-              }
+          ToolbarItem(placement: .topBarTrailing) {
+            Button {
+              routerPath.presentedSheet = .accountPushNotficationsSettings
+            } label: {
+              Image(systemName: "bell")
             }
           }
+          ToolbarTab(routerPath: $routerPath)
         }
-        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
+        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .navigationBar)
         .id(client.id)
     }
     .onAppear {
       routerPath.client = client
+      clearNotifications()
     }
     .withSafariRouter()
-    .environmentObject(routerPath)
-    .onChange(of: $popToRootTab.wrappedValue) { popToRootTab in
-      if popToRootTab == .notifications {
-        routerPath.path = []
+    .environment(routerPath)
+    .onChange(of: $popToRootTab.wrappedValue) { _, newValue in
+      if newValue == .notifications {
+        if routerPath.path.isEmpty {
+          scrollToTopSignal += 1
+        } else {
+          routerPath.path = []
+        }
       }
     }
-    .onChange(of: pushNotificationsService.handledNotification) { notification in
-      if let notification, let type = notification.notification.supportedType {
+    .onChange(of: selectedTab) { _, _ in
+      clearNotifications()
+    }
+    .onChange(of: pushNotificationsService.handledNotification) { _, newValue in
+      if let newValue, let type = newValue.notification.supportedType {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
           switch type {
           case .follow, .follow_request:
-            routerPath.navigate(to: .accountDetailWithAccount(account: notification.notification.account))
+            routerPath.navigate(to: .accountDetailWithAccount(account: newValue.notification.account))
           default:
-            if let status = notification.notification.status {
+            if let status = newValue.notification.status {
               routerPath.navigate(to: .statusDetailWithStatus(status: status))
             }
           }
         }
       }
     }
-    .onChange(of: scenePhase, perform: { scenePhase in
-      switch scenePhase {
+    .onChange(of: scenePhase) { _, newValue in
+      switch newValue {
       case .active:
-        if isSecondaryColumn {
-          if let token = appAccount.currentAccount.oauthToken {
-            userPreferences.setNotification(count: 0, token: token)
-          }
-          watcher.unreadNotificationsCount = 0
-        }
+        clearNotifications()
       default:
         break
       }
-    })
-    .onChange(of: client.id) { _ in
+    }
+    .onChange(of: client.id) {
       routerPath.path = []
     }
   }
+
+  private func clearNotifications() {
+    if selectedTab == .notifications || isSecondaryColumn {
+      if let token = appAccount.currentAccount.oauthToken {
+        userPreferences.notificationsCount[token] = 0
+      }
+      watcher.unreadNotificationsCount = 0
+    }
+  }
 }

IceCubesApp/App/Tabs/ProfileTab.swift

@@ -5,42 +5,48 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI
 
+@MainActor
 struct ProfileTab: View {
-  @EnvironmentObject private var appAccount: AppAccountsManager
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var client: Client
-  @EnvironmentObject private var currentAccount: CurrentAccount
-  @StateObject private var routerPath = RouterPath()
+  @Environment(AppAccountsManager.self) private var appAccount
+  @Environment(Theme.self) private var theme
+  @Environment(Client.self) private var client
+  @Environment(CurrentAccount.self) private var currentAccount
+  @State private var routerPath = RouterPath()
+  @State private var scrollToTopSignal: Int = 0
   @Binding var popToRootTab: Tab
 
   var body: some View {
     NavigationStack(path: $routerPath.path) {
       if let account = currentAccount.account {
-        AccountDetailView(account: account)
+        AccountDetailView(account: account, scrollToTopSignal: $scrollToTopSignal)
           .withAppRouter()
           .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
-          .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
+          .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .navigationBar)
           .id(account.id)
       } else {
-        AccountDetailView(account: .placeholder())
+        AccountDetailView(account: .placeholder(), scrollToTopSignal: $scrollToTopSignal)
           .redacted(reason: .placeholder)
+          .allowsHitTesting(false)
       }
     }
-    .onChange(of: $popToRootTab.wrappedValue) { popToRootTab in
-      if popToRootTab == .profile {
-        routerPath.path = []
+    .onChange(of: $popToRootTab.wrappedValue) { _, newValue in
+      if newValue == .profile {
+        if routerPath.path.isEmpty {
+          scrollToTopSignal += 1
+        } else {
+          routerPath.path = []
+        }
       }
     }
-    .onChange(of: client.id) { _ in
+    .onChange(of: client.id) {
       routerPath.path = []
     }
     .onAppear {
       routerPath.client = client
     }
     .withSafariRouter()
-    .environmentObject(routerPath)
+    .environment(routerPath)
   }
 }

IceCubesApp/App/Tabs/Settings/AboutView.swift

@@ -1,10 +1,18 @@
+import Account
 import DesignSystem
 import Env
+import Models
+import Network
 import SwiftUI
 
+@MainActor
 struct AboutView: View {
-  @EnvironmentObject private var routerPath: RouterPath
-  @EnvironmentObject private var theme: Theme
+  @Environment(RouterPath.self) private var routerPath
+  @Environment(Theme.self) private var theme
+  @Environment(Client.self) private var client
+
+  @State private var dimillianAccount: AccountsListRowViewModel?
+  @State private var iceCubesAccount: AccountsListRowViewModel?
 
   let versionNumber: String
 
@@ -17,45 +25,47 @@ struct AboutView: View {
   }
 
   var body: some View {
-    ScrollView {
-      VStack(alignment: .leading) {
-        Divider()
-        HStack {
-          Spacer()
-          Image("icon0")
-            .resizable()
-            .frame(width: 50, height: 50)
-            .cornerRadius(4)
-          Image("icon14")
-            .resizable()
-            .frame(width: 50, height: 50)
-            .cornerRadius(4)
-          Image("icon17")
-            .resizable()
-            .frame(width: 50, height: 50)
-            .cornerRadius(4)
-          Image("icon23")
-            .resizable()
-            .frame(width: 50, height: 50)
-            .cornerRadius(4)
-          Spacer()
+    List {
+      Section {
+        #if !targetEnvironment(macCatalyst) && !os(visionOS)
+          HStack {
+            Spacer()
+            Image(uiImage: .init(named: "AppIconAlternate0")!)
+              .resizable()
+              .frame(width: 50, height: 50)
+              .cornerRadius(4)
+            Image(uiImage: .init(named: "AppIconAlternate4")!)
+              .resizable()
+              .frame(width: 50, height: 50)
+              .cornerRadius(4)
+            Image(uiImage: .init(named: "AppIconAlternate17")!)
+              .resizable()
+              .frame(width: 50, height: 50)
+              .cornerRadius(4)
+            Image(uiImage: .init(named: "AppIconAlternate23")!)
+              .resizable()
+              .frame(width: 50, height: 50)
+              .cornerRadius(4)
+            Spacer()
+          }
+        #endif
+        Link(destination: URL(string: "https://github.com/Dimillian/IceCubesApp/blob/main/PRIVACY.MD")!) {
+          Label("settings.support.privacy-policy", systemImage: "lock")
         }
-        .padding(.top, 10)
-        HStack {
-          Spacer()
-          Text("\(versionNumber)©2023 Thomas Ricouard")
-            .font(.scaledFootnote)
-            .foregroundColor(.gray)
-            .fontWeight(.semibold)
-            .padding(.bottom, 10)
-          Spacer()
+
+        Link(destination: URL(string: "https://github.com/Dimillian/IceCubesApp/blob/main/TERMS.MD")!) {
+          Label("settings.support.terms-of-use", systemImage: "checkmark.shield")
         }
-        Divider()
-        Text("settings.about.built-with")
-          .padding(.horizontal, 25)
-          .padding(.bottom, 10)
-          .font(.scaledSubheadline)
-          .foregroundColor(.gray)
+      } footer: {
+        Text("\(versionNumber)© 2024 Thomas Ricouard")
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+
+      followAccountsSection
+
+      Section {
         Text("""
         • [EmojiText](https://github.com/divadretlaw/EmojiText)
 
@@ -65,7 +75,7 @@ struct AboutView: View {
 
         • [LRUCache](https://github.com/nicklockwood/LRUCache)
 
-        • [Boutique](https://github.com/mergesort/Boutique)
+        • [Bodega](https://github.com/mergesort/Bodega)
 
         • [Nuke](https://github.com/kean/Nuke)
 
@@ -74,27 +84,86 @@ struct AboutView: View {
         • [Atkinson Hyperlegible](https://github.com/googlefonts/atkinson-hyperlegible)
 
         • [OpenDyslexic](http://opendyslexic.org)
+
+        • [SwiftUI-Introspect](https://github.com/siteline/SwiftUI-Introspect)
+
+        • [RevenueCat](https://github.com/RevenueCat/purchases-ios)
+
+        • [SFSafeSymbols](https://github.com/SFSafeSymbols/SFSafeSymbols)
         """)
-        .padding(.horizontal, 25)
         .multilineTextAlignment(.leading)
         .font(.scaledSubheadline)
-        .foregroundColor(.gray)
+        .foregroundStyle(.secondary)
+      } header: {
+        Text("settings.about.built-with")
+          .textCase(nil)
       }
-      Divider()
-      Spacer()
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
-    .navigationTitle(Text("settings.about.title"))
-    .navigationBarTitleDisplayMode(.large)
-    .environment(\.openURL, OpenURLAction { url in
-      routerPath.handle(url: url)
-    })
+    .task {
+      await fetchAccounts()
+    }
+    .listStyle(.insetGrouped)
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+      .navigationTitle(Text("settings.about.title"))
+      .navigationBarTitleDisplayMode(.large)
+      .environment(\.openURL, OpenURLAction { url in
+        routerPath.handle(url: url)
+      })
+  }
+
+  @ViewBuilder
+  private var followAccountsSection: some View {
+    if let iceCubesAccount, let dimillianAccount {
+      Section {
+        AccountsListRow(viewModel: iceCubesAccount)
+        AccountsListRow(viewModel: dimillianAccount)
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    } else {
+      Section {
+        ProgressView()
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    }
+  }
+
+  private func fetchAccounts() async {
+    await withThrowingTaskGroup(of: Void.self) { group in
+      group.addTask {
+        let viewModel = try await fetchAccountViewModel(account: "dimillian@mastodon.social")
+        await MainActor.run {
+          dimillianAccount = viewModel
+        }
+      }
+      group.addTask {
+        let viewModel = try await fetchAccountViewModel(account: "icecubesapp@mastodon.online")
+        await MainActor.run {
+          iceCubesAccount = viewModel
+        }
+      }
+    }
+  }
+
+  private func fetchAccountViewModel(account: String) async throws -> AccountsListRowViewModel {
+    let dimillianAccount: Account = try await client.get(endpoint: Accounts.lookup(name: account))
+    let rel: [Relationship] = try await client.get(endpoint: Accounts.relationships(ids: [dimillianAccount.id]))
+    return .init(account: dimillianAccount, relationShip: rel.first)
   }
 }
 
 struct AboutView_Previews: PreviewProvider {
   static var previews: some View {
     AboutView()
+      .environment(Theme.shared)
   }
 }

IceCubesApp/App/Tabs/Settings/AccountSettingView.swift

@@ -9,16 +9,18 @@ import Timeline
 
 struct AccountSettingsView: View {
   @Environment(\.dismiss) private var dismiss
+  @Environment(\.openURL) private var openURL
 
-  @EnvironmentObject private var pushNotifications: PushNotificationsService
-  @EnvironmentObject private var currentAccount: CurrentAccount
-  @EnvironmentObject private var currentInstance: CurrentInstance
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var appAccountsManager: AppAccountsManager
+  @Environment(PushNotificationsService.self) private var pushNotifications
+  @Environment(CurrentAccount.self) private var currentAccount
+  @Environment(CurrentInstance.self) private var currentInstance
+  @Environment(Theme.self) private var theme
+  @Environment(AppAccountsManager.self) private var appAccountsManager
+  @Environment(Client.self) private var client
+  @Environment(RouterPath.self) private var routerPath
 
-  @State private var isEditingAccount: Bool = false
-  @State private var isEditingFilters: Bool = false
   @State private var cachedPostsCount: Int = 0
+  @State private var timelineCache = TimelineCache()
 
   let account: Account
   let appAccount: AppAccount
@@ -27,7 +29,7 @@ struct AccountSettingsView: View {
     Form {
       Section {
         Button {
-          isEditingAccount = true
+          routerPath.presentedSheet = .accountEditInfo
         } label: {
           Label("account.action.edit-info", systemImage: "pencil")
             .frame(maxWidth: .infinity, alignment: .leading)
@@ -37,7 +39,7 @@ struct AccountSettingsView: View {
 
         if currentInstance.isFiltersSupported {
           Button {
-            isEditingFilters = true
+            routerPath.presentedSheet = .accountFiltersList
           } label: {
             Label("account.action.edit-filters", systemImage: "line.3.horizontal.decrease.circle")
               .frame(maxWidth: .infinity, alignment: .leading)
@@ -57,19 +59,28 @@ struct AccountSettingsView: View {
         Label("settings.account.cached-posts-\(String(cachedPostsCount))", systemImage: "internaldrive")
         Button("settings.account.action.delete-cache", role: .destructive) {
           Task {
-            await TimelineCache.shared.clearCache(for: appAccountsManager.currentClient.id)
-            cachedPostsCount = await TimelineCache.shared.cachedPostsCount(for: appAccountsManager.currentClient.id)
+            await timelineCache.clearCache(for: appAccountsManager.currentClient.id)
+            cachedPostsCount = await timelineCache.cachedPostsCount(for: appAccountsManager.currentClient.id)
           }
         }
       }
       .listRowBackground(theme.primaryBackgroundColor)
 
+      Section {
+        Button {
+          openURL(URL(string: "https://\(client.server)/settings/profile")!)
+        } label: {
+          Text("account.action.more")
+        }
+      }
+      .listRowBackground(theme.primaryBackgroundColor)
+
       Section {
         Button(role: .destructive) {
           if let token = appAccount.oauthToken {
             Task {
               let client = Client(server: appAccount.server, oauthToken: token)
-              await TimelineCache.shared.clearCache(for: client.id)
+              await timelineCache.clearCache(for: client.id)
               if let sub = pushNotifications.subscriptions.first(where: { $0.account.token == token }) {
                 await sub.deleteSubscription()
               }
@@ -84,26 +95,22 @@ struct AccountSettingsView: View {
       }
       .listRowBackground(theme.primaryBackgroundColor)
     }
-    .sheet(isPresented: $isEditingAccount, content: {
-      EditAccountView()
-    })
-    .sheet(isPresented: $isEditingFilters, content: {
-      FiltersListView()
-    })
     .toolbar {
       ToolbarItem(placement: .principal) {
         HStack {
-          AvatarView(url: account.avatar, size: .embed)
+          AvatarView(account.avatar, config: .embed)
           Text(account.safeDisplayName)
             .font(.headline)
         }
       }
     }
     .task {
-      cachedPostsCount = await TimelineCache.shared.cachedPostsCount(for: appAccountsManager.currentClient.id)
+      cachedPostsCount = await timelineCache.cachedPostsCount(for: appAccountsManager.currentClient.id)
     }
     .navigationTitle(account.safeDisplayName)
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
   }
 }

IceCubesApp/App/Tabs/Settings/AddAccountsView.swift

@@ -6,18 +6,20 @@ import Models
 import Network
 import NukeUI
 import SafariServices
-import Shimmer
 import SwiftUI
 
+@MainActor
 struct AddAccountView: View {
   @Environment(\.dismiss) private var dismiss
   @Environment(\.scenePhase) private var scenePhase
+  @Environment(\.openURL) private var openURL
+  @Environment(\.webAuthenticationSession) private var webAuthenticationSession
 
-  @EnvironmentObject private var appAccountsManager: AppAccountsManager
-  @EnvironmentObject private var currentAccount: CurrentAccount
-  @EnvironmentObject private var currentInstance: CurrentInstance
-  @EnvironmentObject private var pushNotifications: PushNotificationsService
-  @EnvironmentObject private var theme: Theme
+  @Environment(AppAccountsManager.self) private var appAccountsManager
+  @Environment(CurrentAccount.self) private var currentAccount
+  @Environment(CurrentInstance.self) private var currentInstance
+  @Environment(PushNotificationsService.self) private var pushNotifications
+  @Environment(Theme.self) private var theme
 
   @State private var instanceName: String = ""
   @State private var instance: Instance?
@@ -25,22 +27,45 @@ struct AddAccountView: View {
   @State private var signInClient: Client?
   @State private var instances: [InstanceSocial] = []
   @State private var instanceFetchError: LocalizedStringKey?
-  @State private var oauthURL: URL?
+  @State private var instanceSocialClient = InstanceSocialClient()
+  @State private var searchingTask = Task<Void, Never> {}
+  @State private var getInstanceDetailTask = Task<Void, Never> {}
 
   private let instanceNamePublisher = PassthroughSubject<String, Never>()
 
+  private var sanitizedName: String {
+    var name = instanceName
+      .replacingOccurrences(of: "http://", with: "")
+      .replacingOccurrences(of: "https://", with: "")
+
+    if name.contains("@") {
+      let parts = name.components(separatedBy: "@")
+      name = parts[parts.count - 1] // [@]username@server.address.com
+    }
+    return name
+  }
+
   @FocusState private var isInstanceURLFieldFocused: Bool
 
+  private func cleanServerStr(_ server: String) -> String {
+    server.replacingOccurrences(of: " ", with: "")
+  }
+
   var body: some View {
     NavigationStack {
       Form {
         TextField("instance.url", text: $instanceName)
+        #if !os(visionOS)
           .listRowBackground(theme.primaryBackgroundColor)
+        #endif
           .keyboardType(.URL)
           .textContentType(.URL)
           .textInputAutocapitalization(.never)
           .autocorrectionDisabled()
           .focused($isInstanceURLFieldFocused)
+          .onChange(of: instanceName) { _, _ in
+            instanceName = cleanServerStr(instanceName)
+          }
         if let instanceFetchError {
           Text(instanceFetchError)
         }
@@ -56,77 +81,76 @@ struct AddAccountView: View {
       .formStyle(.grouped)
       .navigationTitle("account.add.navigation-title")
       .navigationBarTitleDisplayMode(.inline)
-      .scrollContentBackground(.hidden)
-      .background(theme.secondaryBackgroundColor)
-      .scrollDismissesKeyboard(.immediately)
-      .toolbar {
-        if !appAccountsManager.availableAccounts.isEmpty {
-          ToolbarItem(placement: .navigationBarLeading) {
-            Button("action.cancel", action: { dismiss() })
+      #if !os(visionOS)
+        .scrollContentBackground(.hidden)
+        .background(theme.secondaryBackgroundColor)
+        .scrollDismissesKeyboard(.immediately)
+      #endif
+        .toolbar {
+          if !appAccountsManager.availableAccounts.isEmpty {
+            CancelToolbarItem()
           }
         }
-      }
-      .onAppear {
-        isInstanceURLFieldFocused = true
-        let client = InstanceSocialClient()
-        Task {
-          let instances = await client.fetchInstances()
-          withAnimation {
-            self.instances = instances
-          }
-        }
-        isSigninIn = false
-      }
-      .onChange(of: instanceName) { newValue in
-        instanceNamePublisher.send(newValue)
-      }
-      .onReceive(instanceNamePublisher.debounce(for: .milliseconds(500), scheduler: DispatchQueue.main)) { newValue in
-        let newValue = newValue
-          .replacingOccurrences(of: "http://", with: "")
-          .replacingOccurrences(of: "https://", with: "")
-        let client = Client(server: newValue)
-        Task {
-          do {
-            // bare bones preflight for domain validity
-            if client.server.contains(".") && client.server.last != "." {
-              let instance: Instance = try await client.get(endpoint: Instances.instance)
-              withAnimation {
-                self.instance = instance
-              }
-              instanceFetchError = nil
-            } else {
-              instance = nil
-              instanceFetchError = nil
+        .onAppear {
+          isInstanceURLFieldFocused = true
+          Task {
+            let instances = await instanceSocialClient.fetchInstances(keyword: instanceName)
+            withAnimation {
+              self.instances = instances
+            }
+          }
+          isSigninIn = false
+        }
+        .onChange(of: instanceName) {
+          searchingTask.cancel()
+          searchingTask = Task {
+            try? await Task.sleep(for: .seconds(0.1))
+            guard !Task.isCancelled else { return }
+
+            let instances = await instanceSocialClient.fetchInstances(keyword: instanceName)
+            withAnimation {
+              self.instances = instances
+            }
+          }
+
+          getInstanceDetailTask.cancel()
+          getInstanceDetailTask = Task {
+            try? await Task.sleep(for: .seconds(0.1))
+            guard !Task.isCancelled else { return }
+
+            do {
+              // bare bones preflight for domain validity
+              let instanceDetailClient = Client(server: sanitizedName)
+              if
+                instanceDetailClient.server.contains("."),
+                instanceDetailClient.server.last != "."
+              {
+                let instance: Instance = try await instanceDetailClient.get(endpoint: Instances.instance)
+                withAnimation {
+                  self.instance = instance
+                  instanceName = sanitizedName // clean up the text box, principally to chop off the username if present so it's clear that you might not wind up siging in as the thing in the box
+                }
+                instanceFetchError = nil
+              } else {
+                instance = nil
+                instanceFetchError = nil
+              }
+            } catch _ as DecodingError {
+              instance = nil
+              instanceFetchError = "account.add.error.instance-not-supported"
+            } catch {
+              instance = nil
             }
-          } catch _ as DecodingError {
-            instance = nil
-            instanceFetchError = "account.add.error.instance-not-supported"
-          } catch {
-            instance = nil
           }
         }
-      }
-      .onChange(of: scenePhase, perform: { scenePhase in
-        switch scenePhase {
-        case .active:
-          isSigninIn = false
-        default:
-          break
+        .onChange(of: scenePhase) { _, newValue in
+          switch newValue {
+          case .active:
+            isSigninIn = false
+          default:
+            break
+          }
         }
-      })
-      .onOpenURL(perform: { url in
-        Task {
-          await continueSignIn(url: url)
-        }
-      })
-      .onChange(of: oauthURL, perform: { newValue in
-        if newValue == nil {
-          isSigninIn = false
-        }
-      })
-      .sheet(item: $oauthURL, content: { url in
-        SafariView(url: url)
-      })
     }
   }
 
@@ -142,9 +166,9 @@ struct AddAccountView: View {
       } label: {
         HStack {
           Spacer()
-          if isSigninIn || !instanceName.isEmpty && instance == nil {
+          if isSigninIn || !sanitizedName.isEmpty && instance == nil {
             ProgressView()
-              .id(instanceName)
+              .id(sanitizedName)
               .tint(theme.labelColor)
           } else {
             Text("account.add.sign-in")
@@ -155,7 +179,9 @@ struct AddAccountView: View {
       }
       .buttonStyle(.borderedProminent)
     }
+    #if !os(visionOS)
     .listRowBackground(theme.tintColor)
+    #endif
   }
 
   private var instancesListView: some View {
@@ -163,30 +189,65 @@ struct AddAccountView: View {
       if instances.isEmpty {
         placeholderRow
       } else {
-        ForEach(instanceName.isEmpty ? instances : instances.filter { $0.name.contains(instanceName.lowercased()) }) { instance in
+        ForEach(instances) { instance in
           Button {
-            self.instanceName = instance.name
+            instanceName = instance.name
           } label: {
             VStack(alignment: .leading, spacing: 4) {
-              Text(instance.name)
-                .font(.scaledHeadline)
-                .foregroundColor(.primary)
-              Text(instance.info?.shortDescription ?? "")
-                .font(.scaledBody)
-                .foregroundColor(.gray)
-              (Text("instance.list.users-\(instance.users)")
-                + Text("  ⸱  ")
-                + Text("instance.list.posts-\(instance.statuses)"))
-                .font(.scaledFootnote)
-                .foregroundColor(.gray)
+              LazyImage(url: instance.thumbnail) { state in
+                if let image = state.image {
+                  image
+                    .resizable()
+                    .scaledToFill()
+                } else {
+                  Rectangle().fill(theme.tintColor.opacity(0.1))
+                }
+              }
+              .frame(height: 100)
+              .frame(maxWidth: .infinity)
+              .clipped()
+
+              VStack(alignment: .leading) {
+                HStack {
+                  Text(instance.name)
+                    .font(.scaledHeadline)
+                    .foregroundColor(.primary)
+                  Spacer()
+                  (Text("instance.list.users-\(formatAsNumber(instance.users))")
+                    + Text("  ⸱  ")
+                    + Text("instance.list.posts-\(formatAsNumber(instance.statuses))"))
+                    .foregroundStyle(theme.tintColor)
+                }
+                .padding(.bottom, 5)
+                Text(instance.info?.shortDescription?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "")
+                  .foregroundStyle(Color.secondary)
+                  .lineLimit(10)
+              }
+              .font(.scaledFootnote)
+              .padding(10)
             }
           }
-          .listRowBackground(theme.primaryBackgroundColor)
+          #if !os(visionOS)
+          .background(theme.primaryBackgroundColor)
+          .listRowBackground(Color.clear)
+          .listRowInsets(EdgeInsets(top: 10, leading: 0, bottom: 10, trailing: 0))
+          .listRowSeparator(.hidden)
+          .clipShape(RoundedRectangle(cornerRadius: 4))
+          #endif
         }
       }
     }
   }
 
+  private func formatAsNumber(_ string: String) -> String {
+    (Int(string) ?? 0)
+      .formatted(
+        .number
+          .notation(.compactName)
+          .locale(.current)
+      )
+  }
+
   private var placeholderRow: some View {
     VStack(alignment: .leading, spacing: 4) {
       Text("placeholder.loading.short")
@@ -194,25 +255,26 @@ struct AddAccountView: View {
         .foregroundColor(.primary)
       Text("placeholder.loading.long")
         .font(.scaledBody)
-        .foregroundColor(.gray)
+        .foregroundStyle(.secondary)
       Text("placeholder.loading.short")
         .font(.scaledFootnote)
-        .foregroundColor(.gray)
+        .foregroundStyle(.secondary)
     }
     .redacted(reason: .placeholder)
-    .shimmering()
-    .listRowBackground(theme.primaryBackgroundColor)
+    .allowsHitTesting(false)
+    #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private func signIn() async {
-    do {
-      signInClient = .init(server: instanceName)
-      if let oauthURL = try await signInClient?.oauthURL() {
-        self.oauthURL = oauthURL
-      } else {
-        isSigninIn = false
-      }
-    } catch {
+    signInClient = .init(server: sanitizedName)
+    if let oauthURL = try? await signInClient?.oauthURL(),
+       let url = try? await webAuthenticationSession.authenticate(using: oauthURL,
+                                                                  callbackURLScheme: AppInfo.scheme.replacingOccurrences(of: "://", with: ""))
+    {
+      await continueSignIn(url: url)
+    } else {
       isSigninIn = false
     }
   }
@@ -223,7 +285,6 @@ struct AddAccountView: View {
       return
     }
     do {
-      oauthURL = nil
       let oauthToken = try await client.continueOauthFlow(url: url)
       let client = Client(server: client.server, oauthToken: oauthToken)
       let account: Account = try await client.get(endpoint: Accounts.verifyCredentials)
@@ -237,18 +298,7 @@ struct AddAccountView: View {
       isSigninIn = false
       dismiss()
     } catch {
-      oauthURL = nil
       isSigninIn = false
     }
   }
 }
-
-struct SafariView: UIViewControllerRepresentable {
-  let url: URL
-
-  func makeUIViewController(context _: UIViewControllerRepresentableContext<SafariView>) -> SFSafariViewController {
-    SFSafariViewController(url: url)
-  }
-
-  func updateUIViewController(_: SFSafariViewController, context _: UIViewControllerRepresentableContext<SafariView>) {}
-}

IceCubesApp/App/Tabs/Settings/ContentSettingsView.swift

@@ -5,42 +5,65 @@ import Models
 import Network
 import NukeUI
 import SwiftUI
+import Timeline
 import UserNotifications
 
+@MainActor
 struct ContentSettingsView: View {
-  @EnvironmentObject private var userPreferences: UserPreferences
-  @EnvironmentObject private var theme: Theme
+  @Environment(UserPreferences.self) private var userPreferences
+  @Environment(Theme.self) private var theme
+
+  @State private var contentFilter = TimelineContentFilter.shared
 
   var body: some View {
+    @Bindable var userPreferences = userPreferences
     Form {
-      Section("settings.content.boosts") {
-        Toggle(isOn: $userPreferences.suppressDupeReblogs) {
-          Text("settings.content.hide-repeated-boosts")
-        }
-      }.listRowBackground(theme.primaryBackgroundColor)
-
       Section("settings.content.media") {
+        Toggle(isOn: $userPreferences.autoPlayVideo) {
+          Text("settings.other.autoplay-video")
+        }
+        Toggle(isOn: $userPreferences.muteVideo) {
+          Text("settings.other.mute-video")
+        }
         Toggle(isOn: $userPreferences.showAltTextForMedia) {
           Text("settings.content.media.show.alt")
         }
-      }.listRowBackground(theme.primaryBackgroundColor)
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+
+      Section("settings.content.sharing") {
+        Picker("settings.content.sharing.share-button-behavior", selection: $userPreferences.shareButtonBehavior) {
+          ForEach(PreferredShareButtonBehavior.allCases, id: \.rawValue) { option in
+            Text(option.title)
+              .tag(option)
+          }
+        }
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
 
       Section("settings.content.instance-settings") {
         Toggle(isOn: $userPreferences.useInstanceContentSettings) {
           Text("settings.content.use-instance-settings")
         }
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
-      .onChange(of: userPreferences.useInstanceContentSettings) { newVal in
+      #endif
+      .onChange(of: userPreferences.useInstanceContentSettings) { _, newVal in
         if newVal {
           userPreferences.appAutoExpandSpoilers = userPreferences.autoExpandSpoilers
           userPreferences.appAutoExpandMedia = userPreferences.autoExpandMedia
           userPreferences.appDefaultPostsSensitive = userPreferences.postIsSensitive
           userPreferences.appDefaultPostVisibility = userPreferences.postVisibility
+          userPreferences.appRequireAltText = userPreferences.appRequireAltText
         }
       }
 
-      Section("settings.content.reading") {
+      Section {
         Toggle(isOn: $userPreferences.appAutoExpandSpoilers) {
           Text("settings.content.expand-spoilers")
         }
@@ -52,7 +75,18 @@ struct ContentSettingsView: View {
           }
         }
         .disabled(userPreferences.useInstanceContentSettings)
-      }.listRowBackground(theme.primaryBackgroundColor)
+
+        Toggle(isOn: $userPreferences.collapseLongPosts) {
+          Text("settings.content.collapse-long-posts")
+        }
+      } header: {
+        Text("settings.content.reading")
+      } footer: {
+        Text("settings.content.collapse-long-posts-hint")
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
 
       Section("settings.content.posting") {
         Picker("settings.content.default-visibility", selection: $userPreferences.appDefaultPostVisibility) {
@@ -62,16 +96,54 @@ struct ContentSettingsView: View {
         }
         .disabled(userPreferences.useInstanceContentSettings)
 
+        Picker("settings.content.default-reply-visibility", selection: $userPreferences.appDefaultReplyVisibility) {
+          ForEach(Visibility.allCases, id: \.rawValue) { vis in
+            if UserPreferences.getIntOfVisibility(vis) <=
+              UserPreferences.getIntOfVisibility(userPreferences.postVisibility)
+            {
+              Text(vis.title).tag(vis)
+            }
+          }
+        }
+        .onChange(of: userPreferences.postVisibility) {
+          userPreferences.conformReplyVisibilityConstraints()
+        }
+
         Toggle(isOn: $userPreferences.appDefaultPostsSensitive) {
           Text("settings.content.default-sensitive")
         }
         .disabled(userPreferences.useInstanceContentSettings)
-      }
 
+        Toggle(isOn: $userPreferences.appRequireAltText) {
+          Text("settings.content.require-alt-text")
+        }
+      }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+
+      Section("timeline.content-filter.title") {
+        Toggle(isOn: $contentFilter.showBoosts) {
+          Label("timeline.filter.show-boosts", image: "Rocket")
+        }
+        Toggle(isOn: $contentFilter.showReplies) {
+          Label("timeline.filter.show-replies", systemImage: "bubble.left.and.bubble.right")
+        }
+        Toggle(isOn: $contentFilter.showThreads) {
+          Label("timeline.filter.show-threads", systemImage: "bubble.left.and.text.bubble.right")
+        }
+        Toggle(isOn: $contentFilter.showQuotePosts) {
+          Label("timeline.filter.show-quote", systemImage: "quote.bubble")
+        }
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
     .navigationTitle("settings.content.navigation-title")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
   }
 }

IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift

@@ -1,143 +1,273 @@
+import Combine
 import DesignSystem
 import Env
 import Models
 import Network
-import Status
+import Observation
+import StatusKit
 import SwiftUI
 
+@MainActor
+@Observable class DisplaySettingsLocalValues {
+  var tintColor = Theme.shared.tintColor
+  var primaryBackgroundColor = Theme.shared.primaryBackgroundColor
+  var secondaryBackgroundColor = Theme.shared.secondaryBackgroundColor
+  var labelColor = Theme.shared.labelColor
+  var lineSpacing = Theme.shared.lineSpacing
+  var fontSizeScale = Theme.shared.fontSizeScale
+}
+
+@MainActor
 struct DisplaySettingsView: View {
   typealias FontState = Theme.FontState
 
   @Environment(\.colorScheme) private var colorScheme
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var userPreferences: UserPreferences
+  @Environment(Theme.self) private var theme
+  @Environment(UserPreferences.self) private var userPreferences
+
+  @State private var localValues = DisplaySettingsLocalValues()
 
   @State private var isFontSelectorPresented = false
-  private var previewStatusViewModel = StatusRowViewModel(status: Status.placeholder(forSettings: true, language: "la"),
+
+  private let previewStatusViewModel = StatusRowViewModel(status: Status.placeholder(forSettings: true, language: "la"),
                                                           client: Client(server: ""),
                                                           routerPath: RouterPath()) // translate from latin button
+
   var body: some View {
-    Form {
-      Section("settings.display.example-toot") {
-        StatusRowView(viewModel: previewStatusViewModel)
-          .allowsHitTesting(false)
+    ZStack(alignment: .top) {
+      Form {
+        #if !os(visionOS)
+          StatusRowView(viewModel: previewStatusViewModel)
+            .allowsHitTesting(false)
+            .opacity(0)
+            .hidden()
+          themeSection
+        #endif
+        fontSection
+        layoutSection
+        platformsSection
+        resetSection
       }
-
-      Section {
-        Toggle("settings.display.theme.systemColor", isOn: $theme.followSystemColorScheme)
-        themeSelectorButton
-        Group {
-          ColorPicker("settings.display.theme.tint", selection: $theme.tintColor)
-          ColorPicker("settings.display.theme.background", selection: $theme.primaryBackgroundColor)
-          ColorPicker("settings.display.theme.secondary-background", selection: $theme.secondaryBackgroundColor)
+      .navigationTitle("settings.display.navigation-title")
+      #if !os(visionOS)
+        .scrollContentBackground(.hidden)
+        .background(theme.secondaryBackgroundColor)
+      #endif
+        .task(id: localValues.tintColor) {
+          do { try await Task.sleep(for: .microseconds(500)) } catch {}
+          theme.tintColor = localValues.tintColor
         }
-        .disabled(theme.followSystemColorScheme)
-        .opacity(theme.followSystemColorScheme ? 0.5 : 1.0)
-      } header: {
-        Text("settings.display.section.theme")
-      } footer: {
-        if theme.followSystemColorScheme {
-          Text("settings.display.section.theme.footer")
+        .task(id: localValues.primaryBackgroundColor) {
+          do { try await Task.sleep(for: .microseconds(500)) } catch {}
+          theme.primaryBackgroundColor = localValues.primaryBackgroundColor
+        }
+        .task(id: localValues.secondaryBackgroundColor) {
+          do { try await Task.sleep(for: .microseconds(500)) } catch {}
+          theme.secondaryBackgroundColor = localValues.secondaryBackgroundColor
+        }
+        .task(id: localValues.labelColor) {
+          do { try await Task.sleep(for: .microseconds(500)) } catch {}
+          theme.labelColor = localValues.labelColor
+        }
+        .task(id: localValues.lineSpacing) {
+          do { try await Task.sleep(for: .microseconds(500)) } catch {}
+          theme.lineSpacing = localValues.lineSpacing
+        }
+        .task(id: localValues.fontSizeScale) {
+          do { try await Task.sleep(for: .microseconds(500)) } catch {}
+          theme.fontSizeScale = localValues.fontSizeScale
+        }
+      #if !os(visionOS)
+        examplePost
+      #endif
+    }
+  }
+
+  private var examplePost: some View {
+    VStack(spacing: 0) {
+      StatusRowView(viewModel: previewStatusViewModel)
+        .allowsHitTesting(false)
+        .padding(.layoutPadding)
+        .background(theme.primaryBackgroundColor)
+        .cornerRadius(8)
+        .padding(.horizontal, .layoutPadding)
+        .padding(.top, .layoutPadding)
+        .background(theme.secondaryBackgroundColor)
+      Rectangle()
+        .fill(theme.secondaryBackgroundColor)
+        .frame(height: 30)
+        .mask(LinearGradient(gradient: Gradient(colors: [theme.secondaryBackgroundColor, .clear]),
+                             startPoint: .top, endPoint: .bottom))
+    }
+  }
+
+  @ViewBuilder
+  private var themeSection: some View {
+    @Bindable var theme = theme
+    Section {
+      Toggle("settings.display.theme.systemColor", isOn: $theme.followSystemColorScheme)
+      themeSelectorButton
+      Group {
+        ColorPicker("settings.display.theme.tint", selection: $localValues.tintColor)
+        ColorPicker("settings.display.theme.background", selection: $localValues.primaryBackgroundColor)
+        ColorPicker("settings.display.theme.secondary-background", selection: $localValues.secondaryBackgroundColor)
+        ColorPicker("settings.display.theme.text-color", selection: $localValues.labelColor)
+      }
+      .disabled(theme.followSystemColorScheme)
+      .opacity(theme.followSystemColorScheme ? 0.5 : 1.0)
+      .onChange(of: theme.selectedSet) {
+        localValues.tintColor = theme.tintColor
+        localValues.primaryBackgroundColor = theme.primaryBackgroundColor
+        localValues.secondaryBackgroundColor = theme.secondaryBackgroundColor
+        localValues.labelColor = theme.labelColor
+      }
+    } header: {
+      Text("settings.display.section.theme")
+    } footer: {
+      if theme.followSystemColorScheme {
+        Text("settings.display.section.theme.footer")
+      }
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
+  }
+
+  private var fontSection: some View {
+    Section("settings.display.section.font") {
+      Picker("settings.display.font", selection: .init(get: { () -> FontState in
+        if theme.chosenFont?.fontName == "OpenDyslexic-Regular" {
+          return FontState.openDyslexic
+        } else if theme.chosenFont?.fontName == "AtkinsonHyperlegible-Regular" {
+          return FontState.hyperLegible
+        } else if theme.chosenFont?.fontName == ".AppleSystemUIFontRounded-Regular" {
+          return FontState.SFRounded
+        }
+        return theme.chosenFontData != nil ? FontState.custom : FontState.system
+      }, set: { newValue in
+        switch newValue {
+        case .system:
+          theme.chosenFont = nil
+        case .openDyslexic:
+          theme.chosenFont = UIFont(name: "OpenDyslexic", size: 1)
+        case .hyperLegible:
+          theme.chosenFont = UIFont(name: "Atkinson Hyperlegible", size: 1)
+        case .SFRounded:
+          theme.chosenFont = UIFont.systemFont(ofSize: 1).rounded()
+        case .custom:
+          isFontSelectorPresented = true
+        }
+      })) {
+        ForEach(FontState.allCases, id: \.rawValue) { fontState in
+          Text(fontState.title).tag(fontState)
         }
       }
-      .listRowBackground(theme.primaryBackgroundColor)
+      .navigationDestination(isPresented: $isFontSelectorPresented, destination: { FontPicker() })
 
-      Section("settings.display.section.font") {
-        Picker("settings.display.font", selection: .init(get: { () -> FontState in
-          if userPreferences.chosenFont?.fontName == "OpenDyslexic-Regular" {
-            return FontState.openDyslexic
-          } else if userPreferences.chosenFont?.fontName == "AtkinsonHyperlegible-Regular" {
-            return FontState.hyperLegible
-          }
-          return userPreferences.chosenFontData != nil ? FontState.custom : FontState.system
-        }, set: { newValue in
-          switch newValue {
-          case .system:
-            userPreferences.chosenFont = nil
-          case .openDyslexic:
-            userPreferences.chosenFont = UIFont(name: "OpenDyslexic", size: 1)
-          case .hyperLegible:
-            userPreferences.chosenFont = UIFont(name: "Atkinson Hyperlegible", size: 1)
-          case .custom:
-            isFontSelectorPresented = true
-          }
-        })) {
-          ForEach(FontState.allCases, id: \.rawValue) { fontState in
-            Text(fontState.title).tag(fontState)
-          }
+      VStack {
+        Slider(value: $localValues.fontSizeScale, in: 0.5 ... 1.5, step: 0.1)
+        Text("settings.display.font.scaling-\(String(format: "%.1f", localValues.fontSizeScale))")
+          .font(.scaledBody)
+      }
+      .alignmentGuide(.listRowSeparatorLeading) { d in
+        d[.leading]
+      }
+
+      VStack {
+        Slider(value: $localValues.lineSpacing, in: 0.4 ... 10.0, step: 0.2)
+        Text("settings.display.font.line-spacing-\(String(format: "%.1f", localValues.lineSpacing))")
+          .font(.scaledBody)
+      }
+      .alignmentGuide(.listRowSeparatorLeading) { d in
+        d[.leading]
+      }
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
+  }
+
+  @ViewBuilder
+  private var layoutSection: some View {
+    @Bindable var theme = theme
+    @Bindable var userPreferences = userPreferences
+    Section("settings.display.section.display") {
+      Picker("settings.display.avatar.position", selection: $theme.avatarPosition) {
+        ForEach(Theme.AvatarPosition.allCases, id: \.rawValue) { position in
+          Text(position.description).tag(position)
         }
-        .navigationDestination(isPresented: $isFontSelectorPresented, destination: { FontPicker() })
-
-        Toggle("settings.display.font.rounded", isOn: $userPreferences.useSFRoundedFont)
-          .disabled(userPreferences.chosenFont != nil)
-
+      }
+      Picker("settings.display.avatar.shape", selection: $theme.avatarShape) {
+        ForEach(Theme.AvatarShape.allCases, id: \.rawValue) { shape in
+          Text(shape.description).tag(shape)
+        }
+      }
+      Toggle("settings.display.full-username", isOn: $theme.displayFullUsername)
+      Picker("settings.display.status.action-buttons", selection: $theme.statusActionsDisplay) {
+        ForEach(Theme.StatusActionsDisplay.allCases, id: \.rawValue) { buttonStyle in
+          Text(buttonStyle.description).tag(buttonStyle)
+        }
+      }
+      Picker("settings.display.status.action-secondary", selection: $theme.statusActionSecondary) {
+        ForEach(Theme.StatusActionSecondary.allCases, id: \.rawValue) { action in
+          Text(action.description).tag(action)
+        }
+      }
+      Picker("settings.display.status.media-style", selection: $theme.statusDisplayStyle) {
+        ForEach(Theme.StatusDisplayStyle.allCases, id: \.rawValue) { buttonStyle in
+          Text(buttonStyle.description).tag(buttonStyle)
+        }
+      }
+      Toggle("settings.display.translate-button", isOn: $userPreferences.showTranslateButton)
+      Toggle("settings.display.pending-at-bottom", isOn: $userPreferences.pendingShownAtBottom)
+      Toggle("settings.display.pending-left", isOn: $userPreferences.pendingShownLeft)
+      Toggle("settings.display.show-reply-indentation", isOn: $userPreferences.showReplyIndentation)
+      if userPreferences.showReplyIndentation {
         VStack {
-          Slider(value: $userPreferences.fontSizeScale, in: 0.5 ... 1.5, step: 0.1)
-          Text("settings.display.font.scaling-\(String(format: "%.1f", userPreferences.fontSizeScale))")
+          Slider(value: .init(get: {
+            Double(userPreferences.maxReplyIndentation)
+          }, set: { newVal in
+            userPreferences.maxReplyIndentation = UInt(newVal)
+          }), in: 1 ... 20, step: 1)
+          Text("settings.display.max-reply-indentation-\(String(userPreferences.maxReplyIndentation))")
             .font(.scaledBody)
         }
         .alignmentGuide(.listRowSeparatorLeading) { d in
           d[.leading]
         }
       }
-      .listRowBackground(theme.primaryBackgroundColor)
-
-      Section("settings.display.section.display") {
-        Picker("settings.display.avatar.position", selection: $theme.avatarPosition) {
-          ForEach(Theme.AvatarPosition.allCases, id: \.rawValue) { position in
-            Text(position.description).tag(position)
-          }
-        }
-        Picker("settings.display.avatar.shape", selection: $theme.avatarShape) {
-          ForEach(Theme.AvatarShape.allCases, id: \.rawValue) { shape in
-            Text(shape.description).tag(shape)
-          }
-        }
-        Picker("settings.display.status.action-buttons", selection: $theme.statusActionsDisplay) {
-          ForEach(Theme.StatusActionsDisplay.allCases, id: \.rawValue) { buttonStyle in
-            Text(buttonStyle.description).tag(buttonStyle)
-          }
-        }
-
-        Picker("settings.display.status.media-style", selection: $theme.statusDisplayStyle) {
-          ForEach(Theme.StatusDisplayStyle.allCases, id: \.rawValue) { buttonStyle in
-            Text(buttonStyle.description).tag(buttonStyle)
-          }
-        }
-        Toggle("settings.display.translate-button", isOn: $userPreferences.showTranslateButton)
-      }
-      .listRowBackground(theme.primaryBackgroundColor)
-
-      if UIDevice.current.userInterfaceIdiom == .phone {
-        Section("iPhone") {
-          Toggle("settings.display.show-tab-label", isOn: $userPreferences.showiPhoneTabLabel)
-        }
-        .listRowBackground(theme.primaryBackgroundColor)
-      }
-
-      if UIDevice.current.userInterfaceIdiom == .pad {
-        Section("iPad") {
-          Toggle("settings.display.show-ipad-column", isOn: $userPreferences.showiPadSecondaryColumn)
-        }
-        .listRowBackground(theme.primaryBackgroundColor)
-      }
-
-      Section {
-        Button {
-          theme.followSystemColorScheme = true
-          theme.selectedSet = colorScheme == .dark ? .iceCubeDark : .iceCubeLight
-          theme.avatarShape = .rounded
-          theme.avatarPosition = .top
-          theme.statusActionsDisplay = .full
-        } label: {
-          Text("settings.display.restore")
-        }
-      }
-      .listRowBackground(theme.primaryBackgroundColor)
+      Toggle("settings.display.show-account-popover", isOn: $userPreferences.showAccountPopover)
     }
-    .navigationTitle("settings.display.navigation-title")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
+  }
+
+  @ViewBuilder
+  private var platformsSection: some View {
+    @Bindable var userPreferences = userPreferences
+
+    if UIDevice.current.userInterfaceIdiom == .pad {
+      Section("settings.display.section.platform") {
+        Toggle("settings.display.show-ipad-column", isOn: $userPreferences.showiPadSecondaryColumn)
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    }
+  }
+
+  private var resetSection: some View {
+    Section {
+      Button {
+        theme.restoreDefault()
+      } label: {
+        Text("settings.display.restore")
+      }
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private var themeSelectorButton: some View {

IceCubesApp/App/Tabs/Settings/HapticSettingsView.swift

@@ -1,24 +1,30 @@
 import DesignSystem
 import Env
 import Models
-import Status
+import StatusKit
 import SwiftUI
 
+@MainActor
 struct HapticSettingsView: View {
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var userPreferences: UserPreferences
+  @Environment(Theme.self) private var theme
+  @Environment(UserPreferences.self) private var userPreferences
 
   var body: some View {
+    @Bindable var userPreferences = userPreferences
     Form {
       Section {
         Toggle("settings.haptic.timeline", isOn: $userPreferences.hapticTimelineEnabled)
         Toggle("settings.haptic.tab-selection", isOn: $userPreferences.hapticTabSelectionEnabled)
         Toggle("settings.haptic.buttons", isOn: $userPreferences.hapticButtonPressEnabled)
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
     .navigationTitle("settings.haptic.navigation-title")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
   }
 }

IceCubesApp/App/Tabs/Settings/IconSelectorView.swift

@@ -1,6 +1,7 @@
 import DesignSystem
 import SwiftUI
 
+@MainActor
 struct IconSelectorView: View {
   enum Icon: Int, CaseIterable, Identifiable {
     var id: String {
@@ -8,7 +9,7 @@ struct IconSelectorView: View {
     }
 
     init(string: String) {
-      if string == Icon.primary.appIconName {
+      if string == "AppIcon" {
         self = .primary
       } else {
         self = .init(rawValue: Int(String(string.replacing("AppIconAlternate", with: "")))!)!
@@ -16,25 +17,19 @@ struct IconSelectorView: View {
     }
 
     case primary = 0
-    case alt1, alt2, alt3, alt4, alt5, alt6, alt7, alt8
-    case alt9, alt10, alt11, alt12, alt13, alt14
-    case alt15, alt16, alt17, alt18, alt19, alt20, alt21
-    case alt22, alt23, alt24, alt25
-    case alt26, alt27, alt28
-    case alt29, alt30, alt31, alt32
-    case alt33
+    case alt1, alt2, alt3, alt4, alt5, alt6, alt7, alt8, alt9, alt10, alt11, alt12, alt13, alt14, alt15
+    case alt16, alt17, alt18, alt19, alt20, alt21
+    case alt22, alt23, alt24, alt25, alt26
+    case alt27, alt28, alt29
+    case alt30, alt31, alt32, alt33, alt34, alt35, alt36
+    case alt37
+    case alt38
+    case alt39, alt40, alt41, alt42, alt43
+    case alt44, alt45
+    case alt46
 
     var appIconName: String {
-      switch self {
-      case .primary:
-        return "AppIcon"
-      default:
-        return "AppIconAlternate\(rawValue)"
-      }
-    }
-
-    var iconName: String {
-      "icon\(rawValue)"
+      return "AppIconAlternate\(rawValue)"
     }
   }
 
@@ -44,17 +39,22 @@ struct IconSelectorView: View {
     let icons: [Icon]
 
     static let items = [
-      IconSelector(title: "settings.app.icon.official".localized, icons: [.primary, .alt1, .alt2, .alt3, .alt4, .alt5, .alt6, .alt7, .alt8,
-                                                                          .alt9, .alt10, .alt11, .alt12, .alt13, .alt14,
-                                                                          .alt15, .alt16, .alt17, .alt18, .alt19, .alt25]),
-      IconSelector(title: "\("settings.app.icon.designed-by".localized) Albert Kinng", icons: [.alt20, .alt21, .alt22, .alt23, .alt24]),
-      IconSelector(title: "\("settings.app.icon.designed-by".localized) Dan van Moll", icons: [.alt26, .alt27, .alt28]),
-      IconSelector(title: "\("settings.app.icon.designed-by".localized) @te6-in (GitHub)", icons: [.alt29, .alt30, .alt31, .alt32]),
-      IconSelector(title: "\("settings.app.icon.designed-by".localized) W. Kovács Ágnes (@wildgica)", icons: [.alt33]),
+      IconSelector(title: "settings.app.icon.official".localized, icons: [
+        .primary, .alt46, .alt1, .alt2, .alt3, .alt4,
+        .alt5, .alt6, .alt7, .alt8,
+        .alt9, .alt10, .alt11, .alt12, .alt13, .alt14, .alt15,
+        .alt16, .alt17, .alt18, .alt19, .alt20, .alt21]),
+      IconSelector(title: "\("settings.app.icon.designed-by".localized) Albert Kinng", icons: [.alt22, .alt23, .alt24, .alt25, .alt26]),
+      IconSelector(title: "\("settings.app.icon.designed-by".localized) Dan van Moll", icons: [.alt27, .alt28, .alt29]),
+      IconSelector(title: "\("settings.app.icon.designed-by".localized) Chanhwi Joo (GitHub @te6-in)", icons: [.alt30, .alt31, .alt32, .alt33, .alt34, .alt35, .alt36]),
+      IconSelector(title: "\("settings.app.icon.designed-by".localized) W. Kovács Ágnes (@wildgica)", icons: [.alt37]),
+      IconSelector(title: "\("settings.app.icon.designed-by".localized) Duncan Horne", icons: [.alt38]),
+      IconSelector(title: "\("settings.app.icon.designed-by".localized) BeAware@social.beaware.live", icons: [.alt39, .alt40, .alt41, .alt42, .alt43]),
+      IconSelector(title: "\("settings.app.icon.designed-by".localized) Simone Margio", icons: [.alt44, .alt45]),
     ]
   }
 
-  @EnvironmentObject private var theme: Theme
+  @Environment(Theme.self) private var theme
   @State private var currentIcon = UIApplication.shared.alternateIconName ?? Icon.primary.appIconName
 
   private let columns = [GridItem(.adaptive(minimum: 125, maximum: 1024))]
@@ -74,7 +74,9 @@ struct IconSelectorView: View {
       .padding(6)
       .navigationTitle("settings.app.icon.navigation-title")
     }
+    #if !os(visionOS)
     .background(theme.primaryBackgroundColor)
+    #endif
   }
 
   private func makeIconGridView(icons: [Icon]) -> some View {
@@ -85,11 +87,14 @@ struct IconSelectorView: View {
           if icon.rawValue == Icon.primary.rawValue {
             UIApplication.shared.setAlternateIconName(nil)
           } else {
-            UIApplication.shared.setAlternateIconName(icon.appIconName)
+            UIApplication.shared.setAlternateIconName(icon.appIconName) { err in
+              guard let err else { return }
+              assertionFailure("\(err.localizedDescription) - Icon name: \(icon.appIconName)")
+            }
           }
         } label: {
           ZStack(alignment: .bottomTrailing) {
-            Image(uiImage: .init(named: icon.iconName) ?? .init())
+            Image(uiImage: .init(named: icon.appIconName) ?? .init())
               .resizable()
               .aspectRatio(contentMode: .fit)
               .frame(minHeight: 125, maxHeight: 1024)
@@ -102,6 +107,7 @@ struct IconSelectorView: View {
             }
           }
         }
+        .buttonStyle(.plain)
       }
     }
   }
@@ -109,6 +115,6 @@ struct IconSelectorView: View {
 
 extension String {
   var localized: String {
-    return NSLocalizedString(self, comment: "")
+    NSLocalizedString(self, comment: "")
   }
 }

IceCubesApp/App/Tabs/Settings/InstanceInfoView.swift

@@ -4,7 +4,7 @@ import NukeUI
 import SwiftUI
 
 struct InstanceInfoView: View {
-  @EnvironmentObject private var theme: Theme
+  @Environment(Theme.self) private var theme
 
   let instance: Instance
 
@@ -13,13 +13,15 @@ struct InstanceInfoView: View {
       InstanceInfoSection(instance: instance)
     }
     .navigationTitle("instance.info.navigation-title")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
   }
 }
 
 public struct InstanceInfoSection: View {
-  @EnvironmentObject private var theme: Theme
+  @Environment(Theme.self) private var theme
 
   let instance: Instance
 
@@ -28,20 +30,32 @@ public struct InstanceInfoSection: View {
       LabeledContent("instance.info.name", value: instance.title)
       Text(instance.shortDescription)
       LabeledContent("instance.info.email", value: instance.email)
-      LabeledContent("instance.info.version", value: instance.version)
-      LabeledContent("instance.info.users", value: "\(instance.stats.userCount)")
-      LabeledContent("instance.info.posts", value: "\(instance.stats.statusCount)")
-      LabeledContent("instance.info.domains", value: "\(instance.stats.domainCount)")
+      LabeledContent("instance.info.version") {
+        Text(instance.version).monospaced()
+      }
+      LabeledContent("instance.info.users", value: format(instance.stats.userCount))
+      LabeledContent("instance.info.posts", value: format(instance.stats.statusCount))
+      LabeledContent("instance.info.domains", value: format(instance.stats.domainCount))
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
 
     if let rules = instance.rules {
       Section("instance.info.section.rules") {
         ForEach(rules) { rule in
-          Text(rule.text)
+          Text(rule.text.trimmingCharacters(in: .whitespacesAndNewlines))
         }
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
   }
+
+  private func format(_ int: Int) -> String {
+    let formatter = NumberFormatter()
+    formatter.numberStyle = .decimal
+    return formatter.string(from: NSNumber(value: int))!
+  }
 }

IceCubesApp/App/Tabs/Settings/PushNotificationsView.swift

@@ -7,12 +7,13 @@ import NukeUI
 import SwiftUI
 import UserNotifications
 
+@MainActor
 struct PushNotificationsView: View {
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var appAccountsManager: AppAccountsManager
-  @EnvironmentObject private var pushNotifications: PushNotificationsService
+  @Environment(Theme.self) private var theme
+  @Environment(AppAccountsManager.self) private var appAccountsManager
+  @Environment(PushNotificationsService.self) private var pushNotifications
 
-  @StateObject public var subscription: PushNotificationSubscriptionSettings
+  @State public var subscription: PushNotificationSubscriptionSettings
 
   var body: some View {
     Form {
@@ -32,7 +33,9 @@ struct PushNotificationsView: View {
       } footer: {
         Text("settings.push.main-toggle.description")
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
 
       if subscription.isEnabled {
         Section {
@@ -66,7 +69,7 @@ struct PushNotificationsView: View {
             subscription.isReblogNotificationEnabled = newValue
             updateSubscription()
           })) {
-            Label("settings.push.boosts", systemImage: "arrow.left.arrow.right.circle")
+            Label("settings.push.boosts", image: "Rocket")
           }
           Toggle(isOn: .init(get: {
             subscription.isPollNotificationEnabled
@@ -85,7 +88,9 @@ struct PushNotificationsView: View {
             Label("settings.push.new-posts", systemImage: "bubble.right")
           }
         }
+        #if !os(visionOS)
         .listRowBackground(theme.primaryBackgroundColor)
+        #endif
       }
 
       Section {
@@ -100,14 +105,18 @@ struct PushNotificationsView: View {
       } footer: {
         Text("settings.push.duplicate.footer")
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
     .navigationTitle("settings.push.navigation-title")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
-    .task {
-      await subscription.fetchSubscription()
-    }
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+      .task {
+        await subscription.fetchSubscription()
+      }
   }
 
   private func updateSubscription() {

IceCubesApp/App/Tabs/Settings/RecenTagsSettingView.swift

@@ -0,0 +1,44 @@
+import DesignSystem
+import Env
+import Models
+import SwiftData
+import SwiftUI
+
+struct RecenTagsSettingView: View {
+  @Environment(\.modelContext) private var context
+
+  @Environment(RouterPath.self) private var routerPath
+  @Environment(Theme.self) private var theme
+
+  @Query(sort: \RecentTag.lastUse, order: .reverse) var tags: [RecentTag]
+
+  var body: some View {
+    Form {
+      ForEach(tags) { tag in
+        VStack(alignment: .leading) {
+          Text("#\(tag.title)")
+            .font(.scaledBody)
+            .foregroundColor(.primary)
+          Text(tag.formattedDate)
+            .font(.scaledFootnote)
+            .foregroundStyle(.secondary)
+        }
+      }.onDelete { indexes in
+        if let index = indexes.first {
+          context.delete(tags[index])
+        }
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    }
+    .navigationTitle("settings.general.recent-tags")
+    .scrollContentBackground(.hidden)
+    #if !os(visionOS)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+      .toolbar {
+        EditButton()
+      }
+  }
+}

IceCubesApp/App/Tabs/Settings/RemoteTimelinesSettingView.swift

@@ -0,0 +1,45 @@
+import DesignSystem
+import Env
+import Models
+import SwiftData
+import SwiftUI
+
+struct RemoteTimelinesSettingView: View {
+  @Environment(\.modelContext) private var context
+
+  @Environment(RouterPath.self) private var routerPath
+  @Environment(Theme.self) private var theme
+
+  @Query(sort: \LocalTimeline.creationDate, order: .reverse) var localTimelines: [LocalTimeline]
+
+  var body: some View {
+    Form {
+      ForEach(localTimelines) { timeline in
+        Text(timeline.instance)
+      }.onDelete { indexes in
+        if let index = indexes.first {
+          context.delete(localTimelines[index])
+        }
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+      Button {
+        routerPath.presentedSheet = .addRemoteLocalTimeline
+      } label: {
+        Label("settings.timeline.add", systemImage: "badge.plus.radiowaves.right")
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    }
+    .navigationTitle("settings.general.remote-timelines")
+    .scrollContentBackground(.hidden)
+    #if !os(visionOS)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+      .toolbar {
+        EditButton()
+      }
+  }
+}

IceCubesApp/App/Tabs/Settings/SettingsTab.swift

@@ -5,26 +5,35 @@ import Env
 import Foundation
 import Models
 import Network
+import Nuke
+import SwiftData
 import SwiftUI
 import Timeline
 
+@MainActor
 struct SettingsTabs: View {
   @Environment(\.dismiss) private var dismiss
+  @Environment(\.horizontalSizeClass) private var horizontalSizeClass
 
-  @EnvironmentObject private var pushNotifications: PushNotificationsService
-  @EnvironmentObject private var preferences: UserPreferences
-  @EnvironmentObject private var client: Client
-  @EnvironmentObject private var currentInstance: CurrentInstance
-  @EnvironmentObject private var appAccountsManager: AppAccountsManager
-  @EnvironmentObject private var theme: Theme
-
-  @StateObject private var routerPath = RouterPath()
+  @Environment(PushNotificationsService.self) private var pushNotifications
+  @Environment(UserPreferences.self) private var preferences
+  @Environment(Client.self) private var client
+  @Environment(CurrentInstance.self) private var currentInstance
+  @Environment(AppAccountsManager.self) private var appAccountsManager
+  @Environment(Theme.self) private var theme
 
+  @State private var routerPath = RouterPath()
   @State private var addAccountSheetPresented = false
   @State private var isEditingAccount = false
+  @State private var cachedRemoved = false
+  @State private var timelineCache = TimelineCache()
 
   @Binding var popToRootTab: Tab
 
+  let isModal: Bool
+  
+  @State private var startingPoint: SettingsStartingPoint? = nil
+  
   var body: some View {
     NavigationStack(path: $routerPath.path) {
       Form {
@@ -32,23 +41,57 @@ struct SettingsTabs: View {
         accountsSection
         generalSection
         otherSections
+        cacheSection
       }
       .scrollContentBackground(.hidden)
-      .background(theme.secondaryBackgroundColor)
-      .navigationTitle(Text("settings.title"))
-      .navigationBarTitleDisplayMode(.inline)
-      .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
-      .toolbar {
-        if UIDevice.current.userInterfaceIdiom == .phone {
-          ToolbarItem {
-            Button("action.done") {
-              dismiss()
+      #if !os(visionOS)
+        .background(theme.secondaryBackgroundColor)
+      #endif
+        .navigationTitle(Text("settings.title"))
+        .navigationBarTitleDisplayMode(.inline)
+        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .navigationBar)
+        .toolbar {
+          if isModal {
+            ToolbarItem {
+              Button {
+                dismiss()
+              } label: {
+                Text("action.done").bold()
+              }
             }
           }
+          if UIDevice.current.userInterfaceIdiom == .pad, !preferences.showiPadSecondaryColumn, !isModal {
+            SecondaryColumnToolbarItem()
+          }
+        }
+        .withAppRouter()
+        .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
+        .onAppear {
+          startingPoint = RouterPath.settingsStartingPoint
+          RouterPath.settingsStartingPoint = nil
+        }
+        .navigationDestination(item: $startingPoint) { targetView in
+          switch targetView {
+            case .display:
+              DisplaySettingsView()
+            case .haptic:
+              HapticSettingsView()
+            case .remoteTimelines:
+              RemoteTimelinesSettingView()
+            case .tagGroups:
+              TagsGroupSettingView()
+            case .recentTags:
+              RecenTagsSettingView()
+            case .content:
+              ContentSettingsView()
+            case .swipeActions:
+              SwipeActionsSettingsView()
+            case .tabAndSidebarEntries:
+              EmptyView()
+            case .translation:
+              TranslationSettingsView()
+          }
         }
-      }
-      .withAppRouter()
-      .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
     }
     .onAppear {
       routerPath.client = client
@@ -59,9 +102,9 @@ struct SettingsTabs: View {
       }
     }
     .withSafariRouter()
-    .environmentObject(routerPath)
-    .onChange(of: $popToRootTab.wrappedValue) { popToRootTab in
-      if popToRootTab == .notifications {
+    .environment(routerPath)
+    .onChange(of: $popToRootTab.wrappedValue) { _, newValue in
+      if newValue == .notifications {
         routerPath.path = []
       }
     }
@@ -82,7 +125,7 @@ struct SettingsTabs: View {
                 .tint(.red)
             }
           }
-          AppAccountView(viewModel: .init(appAccount: account))
+          AppAccountView(viewModel: .init(appAccount: account), isParentPresented: .constant(false))
         }
       }
       .onDelete { indexSet in
@@ -98,7 +141,9 @@ struct SettingsTabs: View {
       }
       addAccountButton
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private func logoutAccount(account: AppAccount) async {
@@ -106,7 +151,7 @@ struct SettingsTabs: View {
        let sub = pushNotifications.subscriptions.first(where: { $0.account.token == token })
     {
       let client = Client(server: account.server, oauthToken: token)
-      await TimelineCache.shared.clearCache(for: client.id)
+      await timelineCache.clearCache(for: client.id)
       await sub.deleteSubscription()
       appAccountsManager.delete(account: account)
     }
@@ -128,26 +173,50 @@ struct SettingsTabs: View {
           Label("settings.general.haptic", systemImage: "waveform.path")
         }
       }
-      NavigationLink(destination: remoteLocalTimelinesView) {
+      NavigationLink(destination: RemoteTimelinesSettingView()) {
         Label("settings.general.remote-timelines", systemImage: "dot.radiowaves.right")
       }
+      NavigationLink(destination: TagsGroupSettingView()) {
+        Label("timeline.filter.tag-groups", systemImage: "number")
+      }
+      NavigationLink(destination: RecenTagsSettingView()) {
+        Label("settings.general.recent-tags", systemImage: "clock")
+      }
       NavigationLink(destination: ContentSettingsView()) {
-        Label("settings.general.content", systemImage: "rectangle.on.rectangle")
+        Label("settings.general.content", systemImage: "rectangle.stack")
       }
       NavigationLink(destination: SwipeActionsSettingsView()) {
         Label("settings.general.swipeactions", systemImage: "hand.draw")
       }
-      Link(destination: URL(string: UIApplication.openSettingsURLString)!) {
-        Label("settings.system", systemImage: "gear")
+      if UIDevice.current.userInterfaceIdiom == .phone || horizontalSizeClass == .compact {
+        NavigationLink(destination: TabbarEntriesSettingsView()) {
+          Label("settings.general.tabbarEntries", systemImage: "platter.filled.bottom.iphone")
+        }
+      } else if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
+        NavigationLink(destination: SidebarEntriesSettingsView()) {
+          Label("settings.general.sidebarEntries", systemImage: "sidebar.squares.leading")
+        }
       }
-      .tint(theme.labelColor)
+      NavigationLink(destination: TranslationSettingsView()) {
+        Label("settings.general.translate", systemImage: "captions.bubble")
+      }
+      #if !targetEnvironment(macCatalyst)
+        Link(destination: URL(string: UIApplication.openSettingsURLString)!) {
+          Label("settings.system", systemImage: "gear")
+        }
+        .tint(theme.labelColor)
+      #endif
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
+  @ViewBuilder
   private var otherSections: some View {
-    Section("settings.section.other") {
-      if !ProcessInfo.processInfo.isiOSAppOnMac {
+    @Bindable var preferences = preferences
+    Section {
+      #if !targetEnvironment(macCatalyst)
         Picker(selection: $preferences.preferredBrowser) {
           ForEach(PreferredBrowser.allCases, id: \.rawValue) { browser in
             switch browser {
@@ -164,40 +233,49 @@ struct SettingsTabs: View {
           Label("settings.general.browser.in-app.readerview", systemImage: "doc.plaintext")
         }
         .disabled(preferences.preferredBrowser != PreferredBrowser.inAppSafari)
-      }
+      #endif
       Toggle(isOn: $preferences.isOpenAIEnabled) {
         Label("settings.other.hide-openai", systemImage: "faxmachine")
       }
       Toggle(isOn: $preferences.isSocialKeyboardEnabled) {
         Label("settings.other.social-keyboard", systemImage: "keyboard")
       }
-      Toggle(isOn: $preferences.autoPlayVideo) {
-        Label("settings.other.autoplay-video", systemImage: "play.square.stack")
+      Toggle(isOn: $preferences.soundEffectEnabled) {
+        Label("settings.other.sound-effect", systemImage: "hifispeaker")
       }
+      Toggle(isOn: $preferences.fastRefreshEnabled) {
+        Label("settings.other.fast-refresh", systemImage: "arrow.clockwise")
+      }
+    } header: {
+      Text("settings.section.other")
+    } footer: {
+      Text("settings.section.other.footer")
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private var appSection: some View {
     Section {
-      if !ProcessInfo.processInfo.isiOSAppOnMac {
+      #if !targetEnvironment(macCatalyst) && !os(visionOS)
         NavigationLink(destination: IconSelectorView()) {
           Label {
             Text("settings.app.icon")
           } icon: {
-            if let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon") {
-              Image(uiImage: .init(named: icon.iconName)!)
-                .resizable()
-                .frame(width: 25, height: 25)
-                .cornerRadius(4)
-            }
+            let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon")
+            Image(uiImage: .init(named: icon.appIconName)!)
+              .resizable()
+              .frame(width: 25, height: 25)
+              .cornerRadius(4)
           }
         }
-      }
+      #endif
 
       Link(destination: URL(string: "https://github.com/Dimillian/IceCubesApp")!) {
         Label("settings.app.source", systemImage: "link")
       }
+      .accessibilityRemoveTraits(.isButton)
       .tint(theme.labelColor)
 
       NavigationLink(destination: SupportAppView()) {
@@ -208,6 +286,7 @@ struct SettingsTabs: View {
         Link(destination: reviewURL) {
           Label("settings.rate", systemImage: "link")
         }
+        .accessibilityRemoveTraits(.isButton)
         .tint(theme.labelColor)
       }
 
@@ -222,7 +301,9 @@ struct SettingsTabs: View {
         Text("settings.section.app.footer \(appVersion)").frame(maxWidth: .infinity, alignment: .center)
       }
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private var addAccountButton: some View {
@@ -250,25 +331,22 @@ struct SettingsTabs: View {
     }
   }
 
-  private var remoteLocalTimelinesView: some View {
-    Form {
-      ForEach(preferences.remoteLocalTimelines, id: \.self) { server in
-        Text(server)
-      }.onDelete { indexes in
-        if let index = indexes.first {
-          _ = preferences.remoteLocalTimelines.remove(at: index)
+  private var cacheSection: some View {
+    Section("settings.section.cache") {
+      if cachedRemoved {
+        Text("action.done")
+          .transition(.move(edge: .leading))
+      } else {
+        Button("settings.cache-media.clear", role: .destructive) {
+          ImagePipeline.shared.cache.removeAll()
+          withAnimation {
+            cachedRemoved = true
+          }
         }
       }
-      .listRowBackground(theme.primaryBackgroundColor)
-      Button {
-        routerPath.presentedSheet = .addRemoteLocalTimeline
-      } label: {
-        Label("settings.timeline.add", systemImage: "badge.plus.radiowaves.right")
-      }
-      .listRowBackground(theme.primaryBackgroundColor)
     }
-    .navigationTitle("settings.general.remote-timelines")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 }

IceCubesApp/App/Tabs/Settings/SidebarEntriesSettingsView.swift

@@ -0,0 +1,40 @@
+import DesignSystem
+import Env
+import SwiftUI
+
+@MainActor
+struct SidebarEntriesSettingsView: View {
+  @Environment(Theme.self) private var theme
+  @Environment(UserPreferences.self) private var userPreferences
+
+  @State private var sidebarTabs = SidebarTabs.shared
+
+  var body: some View {
+    @Bindable var userPreferences = userPreferences
+    Form {
+      Section {
+        ForEach($sidebarTabs.tabs, id: \.tab) { $tab in
+          if tab.tab != .profile && tab.tab != .settings {
+            Toggle(isOn: $tab.enabled) {
+              tab.tab.label
+            }
+          }
+        }
+        .onMove(perform: move)
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    }
+    .environment(\.editMode, .constant(.active))
+    .navigationTitle("settings.general.sidebarEntries")
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+  }
+
+  func move(from source: IndexSet, to destination: Int) {
+    sidebarTabs.tabs.move(fromOffsets: source, toOffset: destination)
+  }
+}

IceCubesApp/App/Tabs/Settings/SupportAppView.swift

@@ -1,12 +1,12 @@
 import DesignSystem
 import Env
 import RevenueCat
-import Shimmer
 import SwiftUI
 
+@MainActor
 struct SupportAppView: View {
-  enum Tips: String, CaseIterable {
-    case one, two, three, four
+  enum Tip: String, CaseIterable {
+    case one, two, three, four, supporter
 
     init(productId: String) {
       self = .init(rawValue: String(productId.split(separator: ".")[2]))!
@@ -19,134 +19,265 @@ struct SupportAppView: View {
     var title: LocalizedStringKey {
       switch self {
       case .one:
-        return "settings.support.one.title"
+        "settings.support.one.title"
       case .two:
-        return "settings.support.two.title"
+        "settings.support.two.title"
       case .three:
-        return "settings.support.three.title"
+        "settings.support.three.title"
       case .four:
-        return "settings.support.four.title"
+        "settings.support.four.title"
+      case .supporter:
+        "settings.support.supporter.title"
       }
     }
 
     var subtitle: LocalizedStringKey {
       switch self {
       case .one:
-        return "settings.support.one.subtitle"
+        "settings.support.one.subtitle"
       case .two:
-        return "settings.support.two.subtitle"
+        "settings.support.two.subtitle"
       case .three:
-        return "settings.support.three.subtitle"
+        "settings.support.three.subtitle"
       case .four:
-        return "settings.support.four.subtitle"
+        "settings.support.four.subtitle"
+      case .supporter:
+        "settings.support.supporter.subtitle"
       }
     }
   }
 
-  @EnvironmentObject private var theme: Theme
+  @Environment(Theme.self) private var theme
+
+  @Environment(\.openURL) private var openURL
 
   @State private var loadingProducts: Bool = false
   @State private var products: [StoreProduct] = []
+  @State private var subscription: StoreProduct?
+  @State private var customerInfo: CustomerInfo?
   @State private var isProcessingPurchase: Bool = false
   @State private var purchaseSuccessDisplayed: Bool = false
   @State private var purchaseErrorDisplayed: Bool = false
 
   var body: some View {
     Form {
-      Section {
-        HStack(alignment: .top, spacing: 12) {
-          VStack(spacing: 18) {
-            Image("avatar")
-              .resizable()
-              .frame(width: 50, height: 50)
-              .cornerRadius(4)
-            Image("icon0")
-              .resizable()
-              .frame(width: 50, height: 50)
-              .cornerRadius(4)
-          }
-          Text("settings.support.message-from-dev")
-        }
-      }
-      .listRowBackground(theme.primaryBackgroundColor)
-
-      Section {
-        if loadingProducts {
-          HStack {
-            VStack(alignment: .leading) {
-              Text("placeholder.loading.short.")
-                .font(.scaledSubheadline)
-              Text("settings.support.placeholder.loading-subtitle")
-                .font(.scaledFootnote)
-                .foregroundColor(.gray)
-            }
-            .padding(.vertical, 8)
-          }
-          .redacted(reason: .placeholder)
-          .shimmering()
-        } else {
-          ForEach(products, id: \.productIdentifier) { product in
-            let tip = Tips(productId: product.productIdentifier)
-            HStack {
-              VStack(alignment: .leading) {
-                Text(tip.title)
-                  .font(.scaledSubheadline)
-                Text(tip.subtitle)
-                  .font(.scaledFootnote)
-                  .foregroundColor(.gray)
-              }
-              Spacer()
-              Button {
-                if !isProcessingPurchase {
-                  isProcessingPurchase = true
-                  Task {
-                    do {
-                      let result = try await Purchases.shared.purchase(product: product)
-                      if !result.userCancelled {
-                        purchaseSuccessDisplayed = true
-                      }
-                    } catch {
-                      purchaseErrorDisplayed = true
-                    }
-                    isProcessingPurchase = false
-                  }
-                }
-              } label: {
-                if isProcessingPurchase {
-                  ProgressView()
-                } else {
-                  Text(product.localizedPriceString)
-                }
-              }
-              .buttonStyle(.bordered)
-            }
-            .padding(.vertical, 8)
-          }
-        }
-      }
-      .listRowBackground(theme.primaryBackgroundColor)
+      aboutSection
+      subscriptionSection
+      tipsSection
+      restorePurchase
+      linksSection
     }
     .navigationTitle("settings.support.navigation-title")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
-    .alert("settings.support.alert.title", isPresented: $purchaseSuccessDisplayed, actions: {
-      Button { purchaseSuccessDisplayed = false } label: { Text("alert.button.ok") }
-    }, message: {
-      Text("settings.support.alert.message")
-    })
-    .alert("alert.error", isPresented: $purchaseErrorDisplayed, actions: {
-      Button { purchaseErrorDisplayed = false } label: { Text("alert.button.ok") }
-    }, message: {
-      Text("settings.support.alert.error.message")
-    })
-    .onAppear {
-      loadingProducts = true
-      Purchases.shared.getProducts(Tips.allCases.map { $0.productId }) { products in
-        self.products = products.sorted(by: { $0.price < $1.price })
-        withAnimation {
-          loadingProducts = false
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+      .alert("settings.support.alert.title", isPresented: $purchaseSuccessDisplayed, actions: {
+        Button { purchaseSuccessDisplayed = false } label: { Text("alert.button.ok") }
+      }, message: {
+        Text("settings.support.alert.message")
+      })
+      .alert("alert.error", isPresented: $purchaseErrorDisplayed, actions: {
+        Button { purchaseErrorDisplayed = false } label: { Text("alert.button.ok") }
+      }, message: {
+        Text("settings.support.alert.error.message")
+      })
+      .onAppear {
+        loadingProducts = true
+        fetchStoreProducts()
+        refreshUserInfo()
+      }
+  }
+
+  private func purchase(product: StoreProduct) async {
+    if !isProcessingPurchase {
+      isProcessingPurchase = true
+      do {
+        let result = try await Purchases.shared.purchase(product: product)
+        if !result.userCancelled {
+          purchaseSuccessDisplayed = true
         }
+      } catch {
+        purchaseErrorDisplayed = true
+      }
+      isProcessingPurchase = false
+    }
+  }
+
+  private func fetchStoreProducts() {
+    Purchases.shared.getProducts(Tip.allCases.map(\.productId)) { products in
+      subscription = products.first(where: { $0.productIdentifier == Tip.supporter.productId })
+      self.products = products.filter { $0.productIdentifier != Tip.supporter.productId }.sorted(by: { $0.price < $1.price })
+      withAnimation {
+        loadingProducts = false
       }
     }
   }
+
+  private func refreshUserInfo() {
+    Purchases.shared.getCustomerInfo { info, _ in
+      customerInfo = info
+    }
+  }
+
+  private func makePurchaseButton(product: StoreProduct) -> some View {
+    Button {
+      Task {
+        await purchase(product: product)
+        refreshUserInfo()
+      }
+    } label: {
+      if isProcessingPurchase {
+        ProgressView()
+      } else {
+        Text(product.localizedPriceString)
+      }
+    }
+    .buttonStyle(.bordered)
+  }
+
+  private var aboutSection: some View {
+    Section {
+      HStack(alignment: .top, spacing: 12) {
+        VStack(spacing: 18) {
+          Image("avatar")
+            .resizable()
+            .frame(width: 50, height: 50)
+            .cornerRadius(4)
+          Image("icon0")
+            .resizable()
+            .frame(width: 50, height: 50)
+            .cornerRadius(4)
+        }
+        Text("settings.support.message-from-dev")
+      }
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
+  }
+
+  private var subscriptionSection: some View {
+    Section {
+      if loadingProducts {
+        loadingPlaceholder
+      } else if let subscription {
+        HStack {
+          if customerInfo?.entitlements["Supporter"]?.isActive == true {
+            Text(Image(systemName: "checkmark.seal.fill"))
+              .foregroundColor(theme.tintColor)
+              .baselineOffset(-1) +
+              Text("settings.support.supporter.subscribed")
+              .font(.scaledSubheadline)
+          } else {
+            VStack(alignment: .leading) {
+              Text(Image(systemName: "checkmark.seal.fill"))
+                .foregroundColor(theme.tintColor)
+                .baselineOffset(-1) +
+                Text(Tip.supporter.title)
+                .font(.scaledSubheadline)
+              Text(Tip.supporter.subtitle)
+                .font(.scaledFootnote)
+                .foregroundStyle(.secondary)
+            }
+            Spacer()
+            makePurchaseButton(product: subscription)
+          }
+        }
+        .padding(.vertical, 8)
+      }
+    } footer: {
+      if customerInfo?.entitlements.active.isEmpty == true {
+        Text("settings.support.supporter.subscription-info")
+      }
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
+  }
+
+  private var tipsSection: some View {
+    Section {
+      if loadingProducts {
+        loadingPlaceholder
+      } else {
+        ForEach(products, id: \.productIdentifier) { product in
+          let tip = Tip(productId: product.productIdentifier)
+          HStack {
+            VStack(alignment: .leading) {
+              Text(tip.title)
+                .font(.scaledSubheadline)
+              Text(tip.subtitle)
+                .font(.scaledFootnote)
+                .foregroundStyle(.secondary)
+            }
+            Spacer()
+            makePurchaseButton(product: product)
+          }
+          .padding(.vertical, 8)
+        }
+      }
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
+  }
+
+  private var restorePurchase: some View {
+    Section {
+      HStack {
+        Spacer()
+        Button {
+          Purchases.shared.restorePurchases { info, _ in
+            customerInfo = info
+          }
+        } label: {
+          Text("settings.support.restore-purchase.button")
+        }.buttonStyle(.bordered)
+        Spacer()
+      }
+    } footer: {
+      Text("settings.support.restore-purchase.explanation")
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.secondaryBackgroundColor)
+    #endif
+  }
+
+  private var linksSection: some View {
+    Section {
+      VStack(alignment: .leading, spacing: 16) {
+        Button {
+          openURL(URL(string: "https://github.com/Dimillian/IceCubesApp/blob/main/PRIVACY.MD")!)
+        } label: {
+          Text("settings.support.privacy-policy")
+        }
+        .buttonStyle(.borderless)
+        Button {
+          openURL(URL(string: "https://github.com/Dimillian/IceCubesApp/blob/main/TERMS.MD")!)
+        } label: {
+          Text("settings.support.terms-of-use")
+        }
+        .buttonStyle(.borderless)
+      }
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.secondaryBackgroundColor)
+    #endif
+  }
+
+  private var loadingPlaceholder: some View {
+    HStack {
+      VStack(alignment: .leading) {
+        Text("placeholder.loading.short")
+          .font(.scaledSubheadline)
+        Text("settings.support.placeholder.loading-subtitle")
+          .font(.scaledFootnote)
+          .foregroundStyle(.secondary)
+      }
+      .padding(.vertical, 8)
+    }
+    .redacted(reason: .placeholder)
+    .allowsHitTesting(false)
+  }
 }

IceCubesApp/App/Tabs/Settings/SwipeActionsSettingsView.swift

@@ -2,81 +2,91 @@ import DesignSystem
 import Env
 import SwiftUI
 
+@MainActor
 struct SwipeActionsSettingsView: View {
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var userPreferences: UserPreferences
+  @Environment(Theme.self) private var theme
+  @Environment(UserPreferences.self) private var userPreferences
 
   var body: some View {
+    @Bindable var userPreferences = userPreferences
     Form {
-      Section("settings.swipeactions.status") {
-        Label("settings.swipeactions.status.leading", systemImage: "arrow.right.circle")
-        Picker(selection: $userPreferences.swipeActionsStatusLeadingLeft, label: makeSwipeLabel(left: true, text: "settings.swipeactions.status.leading.left")) {
-          Section {
-            Text(StatusAction.none.displayName()).tag(StatusAction.none)
-          }
-          Section {
-            ForEach(StatusAction.allCases) { action in
-              if action != .none {
-                Text(action.displayName()).tag(action)
-              }
+      Section {
+        Label("settings.swipeactions.status.leading", systemImage: "arrow.right")
+          .foregroundColor(.secondary)
+
+        createStatusActionPicker(selection: $userPreferences.swipeActionsStatusLeadingLeft,
+                                 label: "settings.swipeactions.primary")
+          .onChange(of: userPreferences.swipeActionsStatusLeadingLeft) { _, action in
+            if action == .none {
+              userPreferences.swipeActionsStatusLeadingRight = .none
             }
           }
-        }
-        Picker(selection: $userPreferences.swipeActionsStatusLeadingRight, label: makeSwipeLabel(left: false, text: "settings.swipeactions.status.leading.right")) {
-          Section {
-            Text(StatusAction.none.displayName()).tag(StatusAction.none)
-          }
-          Section {
-            ForEach(StatusAction.allCases) { action in
-              if action != .none {
-                Text(action.displayName()).tag(action)
-              }
+
+        createStatusActionPicker(selection: $userPreferences.swipeActionsStatusLeadingRight,
+                                 label: "settings.swipeactions.secondary")
+          .disabled(userPreferences.swipeActionsStatusLeadingLeft == .none)
+
+        Label("settings.swipeactions.status.trailing", systemImage: "arrow.left")
+          .foregroundColor(.secondary)
+
+        createStatusActionPicker(selection: $userPreferences.swipeActionsStatusTrailingRight,
+                                 label: "settings.swipeactions.primary")
+          .onChange(of: userPreferences.swipeActionsStatusTrailingRight) { _, action in
+            if action == .none {
+              userPreferences.swipeActionsStatusTrailingLeft = .none
             }
           }
-        }
-        Label("settings.swipeactions.status.trailing", systemImage: "arrow.left.circle")
-        Picker(selection: $userPreferences.swipeActionsStatusTrailingLeft, label: makeSwipeLabel(left: true, text: "settings.swipeactions.status.trailing.left")) {
-          Section {
-            Text(StatusAction.none.displayName()).tag(StatusAction.none)
-          }
-          Section {
-            ForEach(StatusAction.allCases) { action in
-              if action != .none {
-                Text(action.displayName()).tag(action)
-              }
-            }
-          }
-        }
-        Picker(selection: $userPreferences.swipeActionsStatusTrailingRight, label: makeSwipeLabel(left: false, text: "settings.swipeactions.status.trailing.right")) {
-          Section {
-            Text(StatusAction.none.displayName()).tag(StatusAction.none)
-          }
-          Section {
-            ForEach(StatusAction.allCases) { action in
-              if action != .none {
-                Text(action.displayName()).tag(action)
-              }
-            }
-          }
-        }
-        Toggle(isOn: $userPreferences.swipeActionsUseThemeColor) {
-          Label("settings.swipeactions.status.use-theme-colors", systemImage: "paintbrush.pointed")
-        }
-        Picker(selection: $userPreferences.swipeActionsIconStyle, label: Label("settings.swipeactions.status.icon-style", systemImage: "text.below.photo")) {
+
+        createStatusActionPicker(selection: $userPreferences.swipeActionsStatusTrailingLeft,
+                                 label: "settings.swipeactions.secondary")
+          .disabled(userPreferences.swipeActionsStatusTrailingRight == .none)
+
+      } header: {
+        Text("settings.swipeactions.status")
+      } footer: {
+        Text("settings.swipeactions.status.explanation")
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+
+      Section {
+        Picker(selection: $userPreferences.swipeActionsIconStyle, label: Text("settings.swipeactions.icon-style")) {
           ForEach(UserPreferences.SwipeActionsIconStyle.allCases, id: \.rawValue) { style in
             Text(style.description).tag(style)
           }
         }
+        Toggle(isOn: $userPreferences.swipeActionsUseThemeColor) {
+          Text("settings.swipeactions.use-theme-colors")
+        }
+      } header: {
+        Text("settings.swipeactions.appearance")
+      } footer: {
+        Text("settings.swipeactions.use-theme-colors-explanation")
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
     .navigationTitle("settings.swipeactions.navigation-title")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
   }
 
-  private func makeSwipeLabel(left: Bool, text: LocalizedStringKey) -> some View {
-    return Label(text, systemImage: left ? "rectangle.lefthalf.filled" : "rectangle.righthalf.filled")
-      .padding(.leading, 16)
+  private func createStatusActionPicker(selection: Binding<StatusAction>, label: LocalizedStringKey) -> some View {
+    Picker(selection: selection, label: Text(label)) {
+      Section {
+        Text(StatusAction.none.displayName()).tag(StatusAction.none)
+      }
+      Section {
+        ForEach(StatusAction.allCases) { action in
+          if action != .none {
+            Text(action.displayName()).tag(action)
+          }
+        }
+      }
+    }
   }
 }

IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift

@@ -0,0 +1,59 @@
+import DesignSystem
+import Env
+import SwiftUI
+
+@MainActor
+struct TabbarEntriesSettingsView: View {
+  @Environment(Theme.self) private var theme
+  @Environment(UserPreferences.self) private var userPreferences
+
+  @State private var tabs = iOSTabs.shared
+
+  var body: some View {
+    @Bindable var userPreferences = userPreferences
+    Form {
+      Section {
+        Picker("settings.tabs.first-tab", selection: $tabs.firstTab) {
+          ForEach(Tab.allCases) { tab in
+            tab.label.tag(tab)
+          }
+        }
+        Picker("settings.tabs.second-tab", selection: $tabs.secondTab) {
+          ForEach(Tab.allCases) { tab in
+            tab.label.tag(tab)
+          }
+        }
+        Picker("settings.tabs.third-tab", selection: $tabs.thirdTab) {
+          ForEach(Tab.allCases) { tab in
+            tab.label.tag(tab)
+          }
+        }
+        Picker("settings.tabs.fourth-tab", selection: $tabs.fourthTab) {
+          ForEach(Tab.allCases) { tab in
+            tab.label.tag(tab)
+          }
+        }
+        Picker("settings.tabs.fifth-tab", selection: $tabs.fifthTab) {
+          ForEach(Tab.allCases) { tab in
+            tab.label.tag(tab)
+          }
+        }
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+
+      Section {
+        Toggle("settings.display.show-tab-label", isOn: $userPreferences.showiPhoneTabLabel)
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    }
+    .navigationTitle("settings.general.tabbarEntries")
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+  }
+}

IceCubesApp/App/Tabs/Settings/TagsGroupSettingView.swift

@@ -0,0 +1,50 @@
+import DesignSystem
+import Env
+import Models
+import SwiftData
+import SwiftUI
+
+struct TagsGroupSettingView: View {
+  @Environment(\.modelContext) private var context
+
+  @Environment(RouterPath.self) private var routerPath
+  @Environment(Theme.self) private var theme
+
+  @Query(sort: \TagGroup.creationDate, order: .reverse) var tagGroups: [TagGroup]
+
+  var body: some View {
+    Form {
+      ForEach(tagGroups) { group in
+        Label(group.title, systemImage: group.symbolName)
+          .onTapGesture {
+            routerPath.presentedSheet = .editTagGroup(tagGroup: group, onSaved: nil)
+          }
+      }
+      .onDelete { indexes in
+        if let index = indexes.first {
+          context.delete(tagGroups[index])
+        }
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+
+      Button {
+        routerPath.presentedSheet = .addTagGroup
+      } label: {
+        Label("timeline.filter.add-tag-groups", systemImage: "plus")
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    }
+    .navigationTitle("timeline.filter.tag-groups")
+    .scrollContentBackground(.hidden)
+    #if !os(visionOS)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+      .toolbar {
+        EditButton()
+      }
+  }
+}

IceCubesApp/App/Tabs/Settings/TranslationSettingsView.swift

@@ -0,0 +1,153 @@
+import DesignSystem
+import Env
+import SwiftUI
+
+@MainActor
+struct TranslationSettingsView: View {
+  @Environment(UserPreferences.self) private var preferences
+  @Environment(Theme.self) private var theme
+
+  @State private var apiKey: String = ""
+
+  var body: some View {
+    Form {
+      translationSelector
+      if preferences.preferredTranslationType == .useDeepl {
+        Section("settings.translation.user-api-key") {
+          deepLPicker
+          SecureField("settings.translation.user-api-key", text: $apiKey)
+            .textContentType(.password)
+        }
+        #if !os(visionOS)
+        .listRowBackground(theme.primaryBackgroundColor)
+        #endif
+
+        if apiKey.isEmpty {
+          Section {
+            Link(destination: URL(string: "https://www.deepl.com/pro-api")!) {
+              Text("settings.translation.needed-message")
+                .foregroundColor(.red)
+            }
+          }
+          #if !os(visionOS)
+          .listRowBackground(theme.primaryBackgroundColor)
+          #endif
+        }
+      }
+      backgroundAPIKey
+      autoDetectSection
+    }
+    .navigationTitle("settings.translation.navigation-title")
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+      .onChange(of: apiKey) {
+        writeNewValue()
+      }
+      .onAppear(perform: updatePrefs)
+      .onAppear(perform: readValue)
+  }
+
+  @ViewBuilder
+  private var translationSelector: some View {
+    @Bindable var preferences = preferences
+    Picker("Translation Service", selection: $preferences.preferredTranslationType) {
+      ForEach(allTTCases, id: \.self) { type in
+        Text(type.description).tag(type)
+      }
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
+  }
+
+  var allTTCases: [TranslationType] {
+    TranslationType.allCases.filter { type in
+      if type != .useApple {
+        return true
+      }
+      #if canImport(_Translation_SwiftUI)
+        if #available(iOS 17.4, *) {
+          return true
+        } else {
+          return false
+        }
+      #else
+        return false
+      #endif
+    }
+  }
+
+  @ViewBuilder
+  private var deepLPicker: some View {
+    @Bindable var preferences = preferences
+    Picker("settings.translation.api-key-type", selection: $preferences.userDeeplAPIFree) {
+      Text("DeepL API Free").tag(true)
+      Text("DeepL API Pro").tag(false)
+    }
+  }
+
+  @ViewBuilder
+  private var autoDetectSection: some View {
+    @Bindable var preferences = preferences
+    Section {
+      Toggle(isOn: $preferences.autoDetectPostLanguage) {
+        Text("settings.translation.auto-detect-post-language")
+      }
+    } footer: {
+      Text("settings.translation.auto-detect-post-language-footer")
+    }
+    #if !os(visionOS)
+    .listRowBackground(theme.primaryBackgroundColor)
+    #endif
+  }
+
+  @ViewBuilder
+  private var backgroundAPIKey: some View {
+    if preferences.preferredTranslationType != .useDeepl,
+       !apiKey.isEmpty
+    {
+      Section {
+        Text("The DeepL API Key is still stored!")
+        if preferences.preferredTranslationType == .useServerIfPossible {
+          Text("It can however still be used as a fallback for your instance's translation service.")
+        }
+        Button(role: .destructive) {
+          withAnimation {
+            writeNewValue(value: "")
+            readValue()
+          }
+        } label: {
+          Text("action.delete")
+        }
+      }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
+    }
+  }
+
+  private func writeNewValue() {
+    writeNewValue(value: apiKey)
+  }
+
+  private func writeNewValue(value: String) {
+    DeepLUserAPIHandler.write(value: value)
+  }
+
+  private func readValue() {
+    apiKey = DeepLUserAPIHandler.readKey()
+  }
+
+  private func updatePrefs() {
+    DeepLUserAPIHandler.deactivateToggleIfNoKey()
+  }
+}
+
+struct TranslationSettingsView_Previews: PreviewProvider {
+  static var previews: some View {
+    TranslationSettingsView()
+      .environment(UserPreferences.shared)
+  }
+}

IceCubesApp/App/Tabs/Tabs.swift

@@ -1,15 +1,24 @@
 import Account
+import AppIntents
+import DesignSystem
 import Explore
 import Foundation
-import Status
+import StatusKit
 import SwiftUI
 
-enum Tab: Int, Identifiable, Hashable {
+@MainActor
+enum Tab: Int, Identifiable, Hashable, CaseIterable, Codable {
   case timeline, notifications, mentions, explore, messages, settings, other
   case trending, federated, local
   case profile
+  case bookmarks
+  case favorites
+  case post
+  case followedTags
+  case lists
+  case links
 
-  var id: Int {
+  nonisolated var id: Int {
     rawValue
   }
 
@@ -17,16 +26,12 @@ enum Tab: Int, Identifiable, Hashable {
     [.timeline, .settings]
   }
 
-  static func loggedInTabs() -> [Tab] {
-    if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
-      return [.timeline, .trending, .federated, .local, .notifications, .mentions, .explore, .messages, .settings]
-    } else {
-      return [.timeline, .notifications, .explore, .messages, .profile]
-    }
+  static func visionOSTab() -> [Tab] {
+    [.profile, .timeline, .notifications, .mentions, .explore, .post, .settings]
   }
 
   @ViewBuilder
-  func makeContentView(popToRootTab: Binding<Tab>) -> some View {
+  func makeContentView(selectedTab: Binding<Tab>, popToRootTab: Binding<Tab>) -> some View {
     switch self {
     case .timeline:
       TimelineTab(popToRootTab: popToRootTab)
@@ -37,17 +42,37 @@ enum Tab: Int, Identifiable, Hashable {
     case .federated:
       TimelineTab(popToRootTab: popToRootTab, timeline: .federated)
     case .notifications:
-      NotificationsTab(popToRootTab: popToRootTab, lockedType: nil)
+      NotificationsTab(selectedTab: selectedTab, popToRootTab: popToRootTab, lockedType: nil)
     case .mentions:
-      NotificationsTab(popToRootTab: popToRootTab, lockedType: .mention)
+      NotificationsTab(selectedTab: selectedTab, popToRootTab: popToRootTab, lockedType: .mention)
     case .explore:
       ExploreTab(popToRootTab: popToRootTab)
     case .messages:
       MessagesTab(popToRootTab: popToRootTab)
     case .settings:
-      SettingsTabs(popToRootTab: popToRootTab)
+      SettingsTabs(popToRootTab: popToRootTab, isModal: false)
     case .profile:
       ProfileTab(popToRootTab: popToRootTab)
+    case .bookmarks:
+      NavigationTab {
+        AccountStatusesListView(mode: .bookmarks)
+      }
+    case .favorites:
+      NavigationTab {
+        AccountStatusesListView(mode: .favorites)
+      }
+    case .followedTags:
+      NavigationTab {
+        FollowedTagsListView()
+      }
+    case .lists:
+      NavigationTab {
+        ListsListView()
+      }
+    case .links:
+      NavigationTab { TrendingLinksListView(cards: []) }
+    case .post:
+      VStack {}
     case .other:
       EmptyView()
     }
@@ -55,56 +80,193 @@ enum Tab: Int, Identifiable, Hashable {
 
   @ViewBuilder
   var label: some View {
+    if self != .other {
+      Label(title, systemImage: iconName)
+    }
+  }
+
+  var title: LocalizedStringKey {
     switch self {
     case .timeline:
-      Label("tab.timeline", systemImage: iconName)
+      "tab.timeline"
     case .trending:
-      Label("tab.trending", systemImage: iconName)
+      "tab.trending"
     case .local:
-      Label("tab.local", systemImage: iconName)
+      "tab.local"
     case .federated:
-      Label("tab.federated", systemImage: iconName)
+      "tab.federated"
     case .notifications:
-      Label("tab.notifications", systemImage: iconName)
+      "tab.notifications"
     case .mentions:
-      Label("tab.notifications", systemImage: iconName)
+      "tab.mentions"
     case .explore:
-      Label("tab.explore", systemImage: iconName)
+      "tab.explore"
     case .messages:
-      Label("tab.messages", systemImage: iconName)
+      "tab.messages"
     case .settings:
-      Label("tab.settings", systemImage: iconName)
+      "tab.settings"
     case .profile:
-      Label("tab.profile", systemImage: iconName)
+      "tab.profile"
+    case .bookmarks:
+      "accessibility.tabs.profile.picker.bookmarks"
+    case .favorites:
+      "accessibility.tabs.profile.picker.favorites"
+    case .post:
+      "menu.new-post"
+    case .followedTags:
+      "timeline.filter.tags"
+    case .lists:
+      "timeline.filter.lists"
+    case .links:
+      "explore.section.trending.links"
     case .other:
-      EmptyView()
+      ""
     }
   }
 
   var iconName: String {
     switch self {
     case .timeline:
-      return "rectangle.stack"
+      "rectangle.stack"
     case .trending:
-      return "chart.line.uptrend.xyaxis"
+      "chart.line.uptrend.xyaxis"
     case .local:
-      return "person.2"
+      "person.2"
     case .federated:
-      return "globe.americas"
+      "globe.americas"
     case .notifications:
-      return "bell"
+      "bell"
     case .mentions:
-      return "at"
+      "at"
     case .explore:
-      return "magnifyingglass"
+      "magnifyingglass"
     case .messages:
-      return "tray"
+      "tray"
     case .settings:
-      return "gear"
+      "gear"
     case .profile:
-      return "person.crop.circle"
+      "person.crop.circle"
+    case .bookmarks:
+      "bookmark"
+    case .favorites:
+      "star"
+    case .post:
+      "square.and.pencil"
+    case .followedTags:
+      "tag"
+    case .lists:
+      "list.bullet"
+    case .links:
+      "newspaper"
     case .other:
-      return ""
+      ""
     }
   }
 }
+
+@MainActor
+@Observable
+class SidebarTabs {
+  struct SidedebarTab: Hashable, Codable {
+    let tab: Tab
+    var enabled: Bool
+  }
+
+  class Storage {
+    @AppStorage("sidebar_tabs") var tabs: [SidedebarTab] = [
+      .init(tab: .timeline, enabled: true),
+      .init(tab: .trending, enabled: true),
+      .init(tab: .federated, enabled: true),
+      .init(tab: .local, enabled: true),
+      .init(tab: .notifications, enabled: true),
+      .init(tab: .mentions, enabled: true),
+      .init(tab: .messages, enabled: true),
+      .init(tab: .explore, enabled: true),
+      .init(tab: .bookmarks, enabled: true),
+      .init(tab: .favorites, enabled: true),
+      .init(tab: .followedTags, enabled: true),
+      .init(tab: .lists, enabled: true),
+
+      .init(tab: .settings, enabled: true),
+      .init(tab: .profile, enabled: true),
+    ]
+  }
+
+  private let storage = Storage()
+  public static let shared = SidebarTabs()
+
+  var tabs: [SidedebarTab] {
+    didSet {
+      storage.tabs = tabs
+    }
+  }
+
+  func isEnabled(_ tab: Tab) -> Bool {
+    tabs.first(where: { $0.tab.id == tab.id })?.enabled == true
+  }
+
+  private init() {
+    tabs = storage.tabs
+  }
+}
+
+@MainActor
+@Observable
+class iOSTabs {
+  enum TabEntries: String {
+    case first, second, third, fourth, fifth
+  }
+
+  class Storage {
+    @AppStorage(TabEntries.first.rawValue) var firstTab = Tab.timeline
+    @AppStorage(TabEntries.second.rawValue) var secondTab = Tab.notifications
+    @AppStorage(TabEntries.third.rawValue) var thirdTab = Tab.explore
+    @AppStorage(TabEntries.fourth.rawValue) var fourthTab = Tab.messages
+    @AppStorage(TabEntries.fifth.rawValue) var fifthTab = Tab.profile
+  }
+
+  private let storage = Storage()
+  public static let shared = iOSTabs()
+
+  var tabs: [Tab] {
+    [firstTab, secondTab, thirdTab, fourthTab, fifthTab]
+  }
+
+  var firstTab: Tab {
+    didSet {
+      storage.firstTab = firstTab
+    }
+  }
+
+  var secondTab: Tab {
+    didSet {
+      storage.secondTab = secondTab
+    }
+  }
+
+  var thirdTab: Tab {
+    didSet {
+      storage.thirdTab = thirdTab
+    }
+  }
+
+  var fourthTab: Tab {
+    didSet {
+      storage.fourthTab = fourthTab
+    }
+  }
+
+  var fifthTab: Tab {
+    didSet {
+      storage.fifthTab = fifthTab
+    }
+  }
+
+  private init() {
+    firstTab = storage.firstTab
+    secondTab = storage.secondTab
+    thirdTab = storage.thirdTab
+    fourthTab = storage.fourthTab
+    fifthTab = storage.fifthTab
+  }
+}

IceCubesApp/App/Tabs/TagGroup/EditTagGroupView.swift

@@ -0,0 +1,448 @@
+import Combine
+import DesignSystem
+import Env
+import Models
+import Network
+import NukeUI
+import SFSafeSymbols
+import SwiftData
+import SwiftUI
+
+@MainActor
+struct EditTagGroupView: View {
+  @Environment(\.dismiss) private var dismiss
+  @Environment(\.modelContext) private var context
+  @Environment(Theme.self) private var theme
+
+  @State private var tagGroup: TagGroup
+
+  private let onSaved: ((TagGroup) -> Void)?
+  private let isNewGroup: Bool
+
+  @FocusState private var focusedField: Focus?
+
+  var body: some View {
+    NavigationStack {
+      Form {
+        Section {
+          TitleInputView(
+            title: $tagGroup.title,
+            titleValidationStatus: tagGroup.titleValidationStatus,
+            focusedField: $focusedField,
+            isNewGroup: isNewGroup
+          )
+
+          SymbolInputView(
+            selectedSymbol: $tagGroup.symbolName,
+            selectedSymbolValidationStatus: tagGroup.symbolNameValidationStatus,
+            focusedField: $focusedField
+          )
+        }
+        #if !os(visionOS)
+        .listRowBackground(theme.primaryBackgroundColor)
+        #endif
+
+        Section("add-tag-groups.edit.tags") {
+          TagsInputView(
+            tags: $tagGroup.tags,
+            tagsValidationStatus: tagGroup.tagsValidationStatus,
+            focusedField: $focusedField
+          )
+        }
+        #if !os(visionOS)
+        .listRowBackground(theme.primaryBackgroundColor)
+        #endif
+      }
+      .formStyle(.grouped)
+      .navigationTitle(
+        isNewGroup
+          ? "timeline.filter.add-tag-groups"
+          : "timeline.filter.edit-tag-groups"
+      )
+      .navigationBarTitleDisplayMode(.inline)
+      #if !os(visionOS)
+        .scrollContentBackground(.hidden)
+        .background(theme.secondaryBackgroundColor)
+        .scrollDismissesKeyboard(.interactively)
+      #endif
+        .toolbar {
+          CancelToolbarItem()
+          ToolbarItem(placement: .navigationBarTrailing) {
+            Button("action.save", action: { save() })
+              .disabled(!tagGroup.isValid)
+          }
+        }
+        .onAppear {
+          focusedField = .title
+        }
+    }
+  }
+
+  init(tagGroup: TagGroup = .emptyGroup(), onSaved: ((TagGroup) -> Void)? = nil) {
+    _tagGroup = State(wrappedValue: tagGroup)
+    self.onSaved = onSaved
+    isNewGroup = tagGroup.title.isEmpty
+  }
+
+  private func save() {
+    tagGroup.format()
+    context.insert(tagGroup)
+    onSaved?(tagGroup)
+
+    dismiss()
+  }
+
+  enum Focus {
+    case title
+    case symbol
+    case new
+  }
+}
+
+struct AddTagGroupView_Previews: PreviewProvider {
+  static var previews: some View {
+    let container = try? ModelContainer(for: TagGroup.self, configurations: ModelConfiguration())
+
+    // need to use `sheet` to show `symbolsSuggestionView` in preview
+    return Text(verbatim: "parent view for EditTagGroupView")
+      .sheet(isPresented: .constant(true)) {
+        EditTagGroupView()
+          .withEnvironments()
+          .modelContainer(container!)
+      }
+  }
+}
+
+private struct TitleInputView: View {
+  @Binding var title: String
+  let titleValidationStatus: TagGroup.TitleValidationStatus
+
+  @FocusState.Binding var focusedField: EditTagGroupView.Focus?
+
+  @Query var tagGroups: [TagGroup]
+
+  let isNewGroup: Bool
+
+  var body: some View {
+    VStack(alignment: .leading) {
+      TextField("add-tag-groups.edit.title.field", text: $title, axis: .horizontal)
+        .focused($focusedField, equals: .title)
+        .onSubmit {
+          focusedField = .symbol
+        }
+
+      if focusedField == .title, warningText != "" {
+        Text(warningText).warningLabel()
+      }
+    }
+  }
+
+  var warningText: LocalizedStringKey {
+    if case let .invalid(description) = titleValidationStatus {
+      return description
+    } else if
+      isNewGroup,
+      tagGroups.contains(where: { $0.title == title })
+    {
+      return "\(title) add-tag-groups.edit.title.field.warning.already-exists"
+    }
+    return ""
+  }
+}
+
+private struct SymbolInputView: View {
+  @State private var symbolQuery = ""
+
+  @Binding var selectedSymbol: String
+  let selectedSymbolValidationStatus: TagGroup.SymbolNameValidationStatus
+
+  @FocusState.Binding var focusedField: EditTagGroupView.Focus?
+
+  var body: some View {
+    VStack(alignment: .leading) {
+      HStack {
+        TextField("add-tag-groups.edit.icon.field", text: $symbolQuery, axis: .horizontal)
+          .textInputAutocapitalization(.never)
+          .autocorrectionDisabled()
+          .focused($focusedField, equals: .symbol)
+          .onSubmit {
+            if TagGroup.allSymbols.contains(symbolQuery) {
+              selectedSymbol = symbolQuery
+            }
+            focusedField = .new
+          }
+          .onChange(of: focusedField) {
+            symbolQuery = selectedSymbol
+          }
+
+        Image(systemName: selectedSymbol)
+          .frame(height: 30)
+      }
+
+      if case let .invalid(description) = selectedSymbolValidationStatus,
+         focusedField == .symbol
+      {
+        Text(description).warningLabel()
+      }
+
+      if focusedField == .symbol {
+        SymbolSearchResultsView(
+          symbolQuery: $symbolQuery,
+          selectedSymbol: $selectedSymbol,
+          focusedField: $focusedField
+        )
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .frame(height: 40)
+      }
+    }
+  }
+}
+
+private struct TagsInputView: View {
+  @State private var newTag: String = ""
+  @Binding var tags: [String]
+  let tagsValidationStatus: TagGroup.TagsValidationStatus
+
+  @FocusState.Binding var focusedField: EditTagGroupView.Focus?
+
+  var body: some View {
+    ForEach(tags, id: \.self) { tag in
+      HStack {
+        Text(tag)
+        Spacer()
+        Button { deleteTag(tag) } label: {
+          Image(systemName: "trash")
+            .foregroundStyle(.red)
+        }
+        .buttonStyle(.plain)
+      }
+    }
+    .onDelete { indexes in
+      if let index = indexes.first {
+        let tag = tags[index]
+        deleteTag(tag)
+      }
+    }
+
+    // this `VStack` need to be here to overcome a SwiftUI bug
+    // "add new tag" `TextField` is not focused after adding the first tag
+    VStack(alignment: .leading) {
+      HStack {
+        // this condition is using to overcome a SwiftUI bug
+        // "add new tag" `TextField` is not focused after adding the first tag
+        if tags.isEmpty {
+          addNewTagTextField()
+        } else {
+          addNewTagTextField()
+            .onAppear { focusedField = .new }
+        }
+
+        Spacer()
+
+        if !newTag.isEmpty, !tags.contains(newTag) {
+          Button { addNewTag() } label: {
+            Image(systemName: "checkmark.circle.fill").tint(.green)
+          }
+        }
+      }
+
+      if focusedField == .new, warningText != "" {
+        Text(warningText).warningLabel()
+      }
+    }
+
+    var warningText: LocalizedStringKey {
+      if tags.contains(newTag) {
+        return "add-tag-groups.edit.tags.field.warning.duplicated-tag"
+      } else if case let .invalid(description) = tagsValidationStatus {
+        return description
+      }
+      return ""
+    }
+  }
+
+  private func addNewTagTextField() -> some View {
+    VStack(alignment: .leading) {
+      TextField("add-tag-groups.edit.tags.add", text: $newTag, axis: .horizontal)
+        .textInputAutocapitalization(.never)
+        .autocorrectionDisabled()
+        .onSubmit {
+          addNewTag()
+        }
+        .focused($focusedField, equals: .new)
+    }
+  }
+
+  private func addNewTag() {
+    addTag(newTag.trimmingCharacters(in: .whitespaces).lowercased())
+    newTag = ""
+    focusedField = .new
+  }
+
+  private func addTag(_ tag: String) {
+    guard !tag.isEmpty,
+          !tags.contains(tag)
+    else { return }
+
+    tags.append(tag)
+    tags.sort()
+  }
+
+  private func deleteTag(_ tag: String) {
+    tags.removeAll(where: { $0 == tag })
+  }
+}
+
+private struct SymbolSearchResultsView: View {
+  @Binding var symbolQuery: String
+  @Binding var selectedSymbol: String
+  @State private var results: [String] = []
+
+  @FocusState.Binding var focusedField: EditTagGroupView.Focus?
+
+  var body: some View {
+    Group {
+      switch validationStatus {
+      case .valid:
+        ScrollView(.horizontal, showsIndicators: false) {
+          LazyHStack {
+            ForEach(results, id: \.self) { name in
+              Button {
+                results = TagGroup.searchSymbol(for: symbolQuery, exclude: selectedSymbol)
+                selectedSymbol = name
+                symbolQuery = name
+                focusedField = .new
+              } label: {
+                Image(systemName: name)
+              }
+              .buttonStyle(.plain)
+            }
+          }
+          .animation(.spring(duration: 0.2), value: results)
+        }
+        .onAppear {
+          results = TagGroup.searchSymbol(for: symbolQuery, exclude: selectedSymbol)
+        }
+      case let .invalid(description):
+        Text(description)
+          .font(.subheadline)
+          .foregroundStyle(.secondary)
+      }
+    }
+    .onAppear {
+      results = TagGroup.searchSymbol(for: symbolQuery, exclude: selectedSymbol)
+    }
+    .onChange(of: symbolQuery) {
+      results = TagGroup.searchSymbol(for: symbolQuery, exclude: selectedSymbol)
+    }
+  }
+
+  // MARK: search results validation
+
+  enum ValidationStatus: Equatable {
+    case valid
+    case invalid(description: LocalizedStringKey)
+  }
+
+  var validationStatus: ValidationStatus {
+    if results.isEmpty {
+      if symbolQuery == selectedSymbol,
+         !symbolQuery.isEmpty,
+         results.count == 0
+      {
+        .invalid(description: "\(symbolQuery) add-tag-groups.edit.tags.field.warning.search-results.already-selected")
+      } else {
+        .invalid(description: "add-tag-groups.edit.tags.field.warning.search-results.no-symbol-found")
+      }
+    } else {
+      .valid
+    }
+  }
+}
+
+extension TagGroup {
+  // MARK: title validation
+
+  enum TitleValidationStatus: Equatable {
+    case valid
+    case invalid(description: LocalizedStringKey)
+  }
+
+  var titleValidationStatus: TitleValidationStatus {
+    title.isEmpty
+      ? .invalid(description: "add-tag-groups.edit.title.field.warning.empty-title")
+      : .valid
+  }
+
+  // MARK: symbolName validation
+
+  enum SymbolNameValidationStatus: Equatable {
+    case valid
+    case invalid(description: LocalizedStringKey)
+  }
+
+  var symbolNameValidationStatus: SymbolNameValidationStatus {
+    if symbolName.isEmpty {
+      return .invalid(description: "add-tag-groups.edit.title.field.warning.no-symbol-selected")
+    } else if !Self.allSymbols.contains(symbolName) {
+      return .invalid(description: "\(symbolName) add-tag-groups.edit.title.field.warning.invalid-sfsymbol-name")
+    }
+
+    return .valid
+  }
+
+  // MARK: tags validation
+
+  enum TagsValidationStatus: Equatable {
+    case valid
+    case invalid(description: LocalizedStringKey)
+  }
+
+  var tagsValidationStatus: TagsValidationStatus {
+    if tags.count < 2 {
+      return .invalid(description: "add-tag-groups.edit.tags.field.warning.number-of-tags")
+    }
+    return .valid
+  }
+
+  // MARK: TagGroup validation
+
+  var isValid: Bool {
+    titleValidationStatus == .valid
+      && symbolNameValidationStatus == .valid
+      && tagsValidationStatus == .valid
+  }
+
+  // MARK: format
+
+  func format() {
+    title = title.trimmingCharacters(in: .whitespacesAndNewlines)
+    tags = tags.map { $0.lowercased() }
+  }
+
+  // MARK: static members
+
+  static func emptyGroup() -> TagGroup {
+    TagGroup(title: "", symbolName: "", tags: [])
+  }
+
+  static func searchSymbol(for query: String, exclude excludedSymbol: String) -> [String] {
+    guard !query.isEmpty else { return [] }
+
+    return allSymbols.filter {
+      $0.contains(query) &&
+        $0 != excludedSymbol
+    }
+  }
+
+  static let allSymbols: [String] = SFSymbol.allSymbols.map { symbol in
+    symbol.rawValue
+  }
+}
+
+extension Text {
+  func warningLabel() -> Text {
+    font(.caption)
+      .foregroundStyle(.red)
+  }
+}

IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift

@@ -4,14 +4,15 @@ import Env
 import Models
 import Network
 import NukeUI
-import Shimmer
 import SwiftUI
 
+@MainActor
 struct AddRemoteTimelineView: View {
   @Environment(\.dismiss) private var dismiss
+  @Environment(\.modelContext) private var context
 
-  @EnvironmentObject private var preferences: UserPreferences
-  @EnvironmentObject private var theme: Theme
+  @Environment(UserPreferences.self) private var preferences
+  @Environment(Theme.self) private var theme
 
   @State private var instanceName: String = ""
   @State private var instance: Instance?
@@ -38,7 +39,7 @@ struct AddRemoteTimelineView: View {
         }
         Button {
           guard instance != nil else { return }
-          preferences.remoteLocalTimelines.append(instanceName)
+          context.insert(LocalTimeline(instance: instanceName))
           dismiss()
         } label: {
           Text("timeline.add.action.add")
@@ -50,30 +51,30 @@ struct AddRemoteTimelineView: View {
       .formStyle(.grouped)
       .navigationTitle("timeline.add-remote.title")
       .navigationBarTitleDisplayMode(.inline)
-      .scrollContentBackground(.hidden)
-      .background(theme.secondaryBackgroundColor)
-      .scrollDismissesKeyboard(.immediately)
-      .toolbar {
-        ToolbarItem(placement: .navigationBarLeading) {
-          Button("action.cancel", action: { dismiss() })
+      #if !os(visionOS)
+        .scrollContentBackground(.hidden)
+        .background(theme.secondaryBackgroundColor)
+        .scrollDismissesKeyboard(.immediately)
+      #endif
+        .toolbar {
+          CancelToolbarItem()
         }
-      }
-      .onChange(of: instanceName) { newValue in
-        instanceNamePublisher.send(newValue)
-      }
-      .onReceive(instanceNamePublisher.debounce(for: .milliseconds(500), scheduler: DispatchQueue.main)) { newValue in
-        Task {
-          let client = Client(server: newValue)
-          instance = try? await client.get(endpoint: Instances.instance)
+        .onChange(of: instanceName) { _, newValue in
+          instanceNamePublisher.send(newValue)
         }
-      }
-      .onAppear {
-        isInstanceURLFieldFocused = true
-        let client = InstanceSocialClient()
-        Task {
-          self.instances = await client.fetchInstances()
+        .onReceive(instanceNamePublisher.debounce(for: .milliseconds(500), scheduler: DispatchQueue.main)) { newValue in
+          Task {
+            let client = Client(server: newValue)
+            instance = try? await client.get(endpoint: Instances.instance)
+          }
+        }
+        .onAppear {
+          isInstanceURLFieldFocused = true
+          let client = InstanceSocialClient()
+          Task {
+            instances = await client.fetchInstances(keyword: instanceName)
+          }
         }
-      }
     }
   }
 
@@ -85,7 +86,7 @@ struct AddRemoteTimelineView: View {
       } else {
         ForEach(instanceName.isEmpty ? instances : instances.filter { $0.name.contains(instanceName.lowercased()) }) { instance in
           Button {
-            self.instanceName = instance.name
+            instanceName = instance.name
           } label: {
             VStack(alignment: .leading, spacing: 4) {
               Text(instance.name)
@@ -93,13 +94,13 @@ struct AddRemoteTimelineView: View {
                 .foregroundColor(.primary)
               Text(instance.info?.shortDescription ?? "")
                 .font(.scaledBody)
-                .foregroundColor(.gray)
+                .foregroundStyle(Color.secondary)
 
               (Text("instance.list.users-\(instance.users)")
                 + Text("  ⸱  ")
                 + Text("instance.list.posts-\(instance.statuses)"))
                 .font(.scaledFootnote)
-                .foregroundColor(.gray)
+                .foregroundStyle(Color.secondary)
             }
           }
           .listRowBackground(theme.primaryBackgroundColor)

IceCubesApp/App/Tabs/Timeline/TimelineTab.swift

@@ -4,46 +4,59 @@ import DesignSystem
 import Env
 import Models
 import Network
+import SwiftData
 import SwiftUI
 import Timeline
 
+@MainActor
 struct TimelineTab: View {
-  @EnvironmentObject private var appAccount: AppAccountsManager
-  @EnvironmentObject private var theme: Theme
-  @EnvironmentObject private var currentAccount: CurrentAccount
-  @EnvironmentObject private var preferences: UserPreferences
-  @EnvironmentObject private var client: Client
-  @StateObject private var routerPath = RouterPath()
+  @Environment(\.modelContext) private var context
+
+  @Environment(AppAccountsManager.self) private var appAccount
+  @Environment(Theme.self) private var theme
+  @Environment(CurrentAccount.self) private var currentAccount
+  @Environment(UserPreferences.self) private var preferences
+  @Environment(Client.self) private var client
+  @State private var routerPath = RouterPath()
   @Binding var popToRootTab: Tab
 
   @State private var didAppear: Bool = false
-  @State private var timeline: TimelineFilter
+  @State private var timeline: TimelineFilter = .home
+  @State private var selectedTagGroup: TagGroup?
   @State private var scrollToTopSignal: Int = 0
 
-  @AppStorage("last_timeline_filter") public var lastTimelineFilter: TimelineFilter = .home
+  @Query(sort: \LocalTimeline.creationDate, order: .reverse) var localTimelines: [LocalTimeline]
+  @Query(sort: \TagGroup.creationDate, order: .reverse) var tagGroups: [TagGroup]
+
+  @AppStorage("last_timeline_filter") var lastTimelineFilter: TimelineFilter = .home
+  @AppStorage("timeline_pinned_filters") private var pinnedFilters: [TimelineFilter] = []
 
   private let canFilterTimeline: Bool
 
   init(popToRootTab: Binding<Tab>, timeline: TimelineFilter? = nil) {
     canFilterTimeline = timeline == nil
-    self.timeline = timeline ?? .home
     _popToRootTab = popToRootTab
+    _timeline = .init(initialValue: timeline ?? .home)
   }
 
   var body: some View {
     NavigationStack(path: $routerPath.path) {
-      TimelineView(timeline: $timeline, scrollToTopSignal: $scrollToTopSignal)
+      TimelineView(timeline: $timeline,
+                   pinnedFilters: $pinnedFilters,
+                   selectedTagGroup: $selectedTagGroup,
+                   scrollToTopSignal: $scrollToTopSignal,
+                   canFilterTimeline: canFilterTimeline)
         .withAppRouter()
         .withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
         .toolbar {
           toolbarView
         }
-        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
+        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .navigationBar)
         .id(client.id)
     }
     .onAppear {
       routerPath.client = client
-      if !didAppear && canFilterTimeline {
+      if !didAppear, canFilterTimeline {
         didAppear = true
         if client.isAuth {
           timeline = lastTimelineFilter
@@ -58,22 +71,14 @@ struct TimelineTab: View {
         routerPath.presentedSheet = .addAccount
       }
     }
-    .onChange(of: client.isAuth, perform: { _ in
-      if client.isAuth {
-        timeline = lastTimelineFilter
-      } else {
-        timeline = .federated
-      }
-    })
-    .onChange(of: currentAccount.account?.id, perform: { _ in
-      if client.isAuth, canFilterTimeline {
-        timeline = lastTimelineFilter
-      } else {
-        timeline = .federated
-      }
-    })
-    .onChange(of: $popToRootTab.wrappedValue) { popToRootTab in
-      if popToRootTab == .timeline {
+    .onChange(of: client.isAuth) {
+      resetTimelineFilter()
+    }
+    .onChange(of: currentAccount.account?.id) {
+      resetTimelineFilter()
+    }
+    .onChange(of: $popToRootTab.wrappedValue) { _, newValue in
+      if newValue == .timeline {
         if routerPath.path.isEmpty {
           scrollToTopSignal += 1
         } else {
@@ -81,76 +86,51 @@ struct TimelineTab: View {
         }
       }
     }
-    .onChange(of: client.id) { _ in
+    .onChange(of: client.id) {
       routerPath.path = []
     }
-    .onChange(of: timeline) { timeline in
-      if timeline == .home || timeline == .federated || timeline == .local {
-        lastTimelineFilter = timeline
+    .onChange(of: timeline) { _, newValue in
+      if client.isAuth, canFilterTimeline {
+        lastTimelineFilter = newValue
+      }
+      switch newValue {
+      case let .tagGroup(title, _, _):
+        if let group = tagGroups.first(where: { $0.title == title }) {
+          selectedTagGroup = group
+        }
+      default:
+        selectedTagGroup = nil
       }
     }
+    .onReceive(NotificationCenter.default.publisher(for: .refreshTimeline)) { _ in
+      timeline = .latest
+    }
+    .onReceive(NotificationCenter.default.publisher(for: .trendingTimeline)) { _ in
+      timeline = .trending
+    }
+    .onReceive(NotificationCenter.default.publisher(for: .localTimeline)) { _ in
+      timeline = .local
+    }
+    .onReceive(NotificationCenter.default.publisher(for: .federatedTimeline)) { _ in
+      timeline = .federated
+    }
+    .onReceive(NotificationCenter.default.publisher(for: .homeTimeline)) { _ in
+      timeline = .home
+    }
     .withSafariRouter()
-    .environmentObject(routerPath)
+    .environment(routerPath)
   }
 
   @ViewBuilder
   private var timelineFilterButton: some View {
-    if timeline == .home {
-      Button {
-        self.timeline = .latest
-      } label: {
-        Label(TimelineFilter.latest.localizedTitle(), systemImage: TimelineFilter.latest.iconName() ?? "")
-      }
-      .keyboardShortcut("r", modifiers: .command)
-      Divider()
-    }
-    ForEach(TimelineFilter.availableTimeline(client: client), id: \.self) { timeline in
-      Button {
-        self.timeline = timeline
-      } label: {
-        Label(timeline.localizedTitle(), systemImage: timeline.iconName() ?? "")
-      }
-    }
-    if !currentAccount.lists.isEmpty {
-      Menu("timeline.filter.lists") {
-        ForEach(currentAccount.sortedLists) { list in
-          Button {
-            timeline = .list(list: list)
-          } label: {
-            Label(list.title, systemImage: "list.bullet")
-          }
-        }
-      }
-    }
-
-    if !currentAccount.tags.isEmpty {
-      Menu("timeline.filter.tags") {
-        ForEach(currentAccount.sortedTags) { tag in
-          Button {
-            timeline = .hashtag(tag: tag.name, accountId: nil)
-          } label: {
-            Label("#\(tag.name)", systemImage: "number")
-          }
-        }
-      }
-    }
-
-    Menu("timeline.filter.local") {
-      ForEach(preferences.remoteLocalTimelines, id: \.self) { server in
-        Button {
-          timeline = .remoteLocal(server: server, filter: .local)
-        } label: {
-          VStack {
-            Label(server, systemImage: "dot.radiowaves.right")
-          }
-        }
-      }
-      Button {
-        routerPath.presentedSheet = .addRemoteLocalTimeline
-      } label: {
-        Label("timeline.filter.add-local", systemImage: "badge.plus.radiowaves.right")
-      }
-    }
+    headerGroup
+    timelineFiltersButtons
+    listsFiltersButons
+    tagsFiltersButtons
+    localTimelinesFiltersButtons
+    tagGroupsFiltersButtons
+    Divider()
+    contentFilterButton
   }
 
   private var addAccountButton: some View {
@@ -170,14 +150,7 @@ struct TimelineTab: View {
       }
     }
     if client.isAuth {
-      if UIDevice.current.userInterfaceIdiom != .pad {
-        ToolbarItem(placement: .navigationBarLeading) {
-          AppAccountsSelectorView(routerPath: routerPath)
-            .id(currentAccount.account?.id)
-        }
-      }
-      statusEditorToolbarItem(routerPath: routerPath,
-                              visibility: preferences.postVisibility)
+      ToolbarTab(routerPath: $routerPath)
     } else {
       ToolbarItem(placement: .navigationBarTrailing) {
         addAccountButton
@@ -212,4 +185,147 @@ struct TimelineTab: View {
       }
     }
   }
+
+  @ViewBuilder
+  private var headerGroup: some View {
+    ControlGroup {
+      if timeline.supportNewestPagination {
+        Button {
+          timeline = .latest
+        } label: {
+          Label(TimelineFilter.latest.localizedTitle(), systemImage: TimelineFilter.latest.iconName())
+        }
+      }
+      if timeline == .home {
+        Button {
+          timeline = .resume
+        } label: {
+          VStack {
+            Label(TimelineFilter.resume.localizedTitle(),
+                  systemImage: TimelineFilter.resume.iconName())
+          }
+        }
+      }
+      pinButton
+    }
+  }
+
+  @ViewBuilder
+  private var pinButton: some View {
+    let index = pinnedFilters.firstIndex(where: { $0.id == timeline.id })
+    Button {
+      withAnimation {
+        if let index {
+          pinnedFilters.remove(at: index)
+        } else {
+          pinnedFilters.append(timeline)
+        }
+      }
+    } label: {
+      if index != nil {
+        Label("status.action.unpin", systemImage: "pin.slash")
+      } else {
+        Label("status.action.pin", systemImage: "pin")
+      }
+    }
+  }
+
+  private var timelineFiltersButtons: some View {
+    ForEach(TimelineFilter.availableTimeline(client: client), id: \.self) { timeline in
+      Button {
+        self.timeline = timeline
+      } label: {
+        Label(timeline.localizedTitle(), systemImage: timeline.iconName())
+      }
+    }
+  }
+
+  @ViewBuilder
+  private var listsFiltersButons: some View {
+    Menu("timeline.filter.lists") {
+      Button {
+        routerPath.presentedSheet = .listCreate
+      } label: {
+        Label("account.list.create", systemImage: "plus")
+      }
+      ForEach(currentAccount.sortedLists) { list in
+        Button {
+          timeline = .list(list: list)
+        } label: {
+          Label(list.title, systemImage: "list.bullet")
+        }
+      }
+    }
+  }
+
+  @ViewBuilder
+  private var tagsFiltersButtons: some View {
+    if !currentAccount.tags.isEmpty {
+      Menu("timeline.filter.tags") {
+        ForEach(currentAccount.sortedTags) { tag in
+          Button {
+            timeline = .hashtag(tag: tag.name, accountId: nil)
+          } label: {
+            Label("#\(tag.name)", systemImage: "number")
+          }
+        }
+      }
+    }
+  }
+
+  private var localTimelinesFiltersButtons: some View {
+    Menu("timeline.filter.local") {
+      ForEach(localTimelines) { remoteLocal in
+        Button {
+          timeline = .remoteLocal(server: remoteLocal.instance, filter: .local)
+        } label: {
+          VStack {
+            Label(remoteLocal.instance, systemImage: "dot.radiowaves.right")
+          }
+        }
+      }
+      Button {
+        routerPath.presentedSheet = .addRemoteLocalTimeline
+      } label: {
+        Label("timeline.filter.add-local", systemImage: "badge.plus.radiowaves.right")
+      }
+    }
+  }
+
+  private var tagGroupsFiltersButtons: some View {
+    Menu("timeline.filter.tag-groups") {
+      ForEach(tagGroups) { group in
+        Button {
+          timeline = .tagGroup(title: group.title, tags: group.tags, symbolName: group.symbolName)
+        } label: {
+          VStack {
+            let icon = group.symbolName.isEmpty ? "number" : group.symbolName
+            Label(group.title, systemImage: icon)
+          }
+        }
+      }
+
+      Button {
+        routerPath.presentedSheet = .addTagGroup
+      } label: {
+        Label("timeline.filter.add-tag-groups", systemImage: "plus")
+      }
+    }
+  }
+
+  private var contentFilterButton: some View {
+    Button(action: {
+      routerPath.presentedSheet = .timelineContentFilter
+    }, label: {
+      Label("timeline.content-filter.title", systemSymbol: .line3HorizontalDecrease)
+    })
+  }
+
+  private func resetTimelineFilter() {
+    if client.isAuth, canFilterTimeline {
+      timeline = lastTimelineFilter
+    } else if !client.isAuth {
+      timeline = .federated
+    }
+  }
 }

IceCubesApp/App/Tabs/ToolbarTab.swift

@@ -0,0 +1,48 @@
+import AppAccount
+import DesignSystem
+import Env
+import SwiftUI
+
+@MainActor
+struct ToolbarTab: ToolbarContent {
+  @Environment(\.isSecondaryColumn) private var isSecondaryColumn: Bool
+  @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+
+  @Environment(UserPreferences.self) private var userPreferences
+
+  @Binding var routerPath: RouterPath
+
+  var body: some ToolbarContent {
+    if !isSecondaryColumn {
+      ToolbarItem(placement: .topBarLeading) {
+        if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
+          Button {
+            withAnimation {
+              userPreferences.isSidebarExpanded.toggle()
+            }
+          } label: {
+            if userPreferences.isSidebarExpanded {
+              Image(systemName: "sidebar.squares.left")
+            } else {
+              Image(systemName: "sidebar.left")
+            }
+          }
+        }
+      }
+      statusEditorToolbarItem(routerPath: routerPath,
+                              visibility: userPreferences.postVisibility)
+      if UIDevice.current.userInterfaceIdiom != .pad ||
+        (UIDevice.current.userInterfaceIdiom == .pad && horizontalSizeClass == .compact)
+      {
+        ToolbarItem(placement: .navigationBarLeading) {
+          AppAccountsSelectorView(routerPath: routerPath)
+        }
+      }
+    }
+    if UIDevice.current.userInterfaceIdiom == .pad && horizontalSizeClass == .regular {
+      if (!isSecondaryColumn && !userPreferences.showiPadSecondaryColumn) || isSecondaryColumn {
+        SecondaryColumnToolbarItem()
+      }
+    }
+  }
+}

IceCubesApp/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,57 +1,67 @@
 {
   "images" : [
     {
-      "filename" : "icon.png",
+      "filename" : "1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
     },
     {
+      "filename" : "macos16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
+      "filename" : "macos32 1.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
+      "filename" : "macos32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
+      "filename" : "macos64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
+      "filename" : "macos128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
+      "filename" : "mac256 1.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
+      "filename" : "mac256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
+      "filename" : "macOS512 1.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
+      "filename" : "macOS512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
+      "filename" : "macOS1024.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"

IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "filename" : "Background.png",
+      "idiom" : "vision",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Contents.json

@@ -0,0 +1,17 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "layers" : [
+    {
+      "filename" : "Front.solidimagestacklayer"
+    },
+    {
+      "filename" : "Mid.solidimagestacklayer"
+    },
+    {
+      "filename" : "Back.solidimagestacklayer"
+    }
+  ]
+}

IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "filename" : "Layer 1.png",
+      "idiom" : "vision",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "vision",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

IceCubesApp/Assets.xcassets/AppIcon.solidimagestack/Mid.solidimagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

IceCubesApp/Assets.xcassets/AppIconAlternate0.appiconset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

IceCubesApp/Assets.xcassets/AppIconAlternate1.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon.png",
+      "filename" : "1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

IceCubesApp/Assets.xcassets/AppIconAlternate10.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Dimillian_Ice_Cubes_in_a_glass_neon_style_glyph_retro_4b25c3a5-7ae2-401b-9b2f-17c9832e175a.png",
+      "filename" : "AppIconAlternate10.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

IceCubesApp/Assets.xcassets/AppIconAlternate11.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Dimillian_Ice_Cubes_in_a_glass_neon_style_glyph_retro_7ca60288-3e96-43a3-a88b-f4c882ac2183.png",
+      "filename" : "icon15.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

IceCubesApp/Assets.xcassets/AppIconAlternate12.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Dimillian_Ice_Cubes_in_a_glass_neon_style_glyph_retro_2338f943-14f9-4639-aabf-70dc18cf4d52.png",
+      "filename" : "icon16.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

IceCubesApp/Assets.xcassets/AppIconAlternate13.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon13.png",
+      "filename" : "icon17.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

IceCubesApp/Assets.xcassets/AppIconAlternate14.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon14.png",
+      "filename" : "icon18.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

IceCubesApp/Assets.xcassets/AppIconAlternate15.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon15.png",
+      "filename" : "AppIconAlternate15.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

IceCubesApp/Assets.xcassets/AppIconAlternate16.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon16.png",
+      "filename" : "icon.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

IceCubesApp/Assets.xcassets/AppIconAlternate17.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon17.png",
+      "filename" : "Alternate43-fs8.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"