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"

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

@@ -9,13 +9,31 @@
         "version" : "2.1.0"
       }
     },
+    {
+      "identity" : "buttonkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Dean151/ButtonKit",
+      "state" : {
+        "revision" : "377f5bab4ed047704316d531e0826d4de5ebf6a4",
+        "version" : "0.1.1"
+      }
+    },
     {
       "identity" : "emojitext",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/divadretlaw/EmojiText",
       "state" : {
-        "revision" : "65b570ea0b0d9fc89a000900691a73a16c0baa54",
-        "version" : "3.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"
       }
     },
     {
@@ -27,6 +45,15 @@
         "revision" : "f38cb0ada97847ac5068b915b8d2793b35435668"
       }
     },
+    {
+      "identity" : "libwebp-xcode",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/libwebp-Xcode",
+      "state" : {
+        "revision" : "b2b1d20a90b14d11f6ef4241da6b81c1d3f171e4",
+        "version" : "1.3.2"
+      }
+    },
     {
       "identity" : "lrucache",
       "kind" : "remoteSourceControl",
@@ -41,17 +68,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kean/Nuke",
       "state" : {
-        "revision" : "1694798e876113d44f6ec6ead965d7286695981d",
-        "version" : "12.2.0"
+        "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" : "b8d20ba1c8e13cc73d72e37cf98607d01fd357b6",
-        "version" : "4.31.2"
+        "revision" : "a9763ca482d52ea3d59aa2dfd2fc23427b02dada",
+        "version" : "4.40.1"
       }
     },
     {
@@ -72,6 +99,24 @@
         "version" : "0.14.1"
       }
     },
+    {
+      "identity" : "swift-cmark",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-cmark.git",
+      "state" : {
+        "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"
+      }
+    },
     {
       "identity" : "swiftsoup",
       "kind" : "remoteSourceControl",
@@ -89,15 +134,6 @@
         "revision" : "9e1cc02a65b22e09a8251261cccbccce02731fc5",
         "version" : "1.1.1"
       }
-    },
-    {
-      "identity" : "swiftui-shimmer",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/markiv/SwiftUI-Shimmer",
-      "state" : {
-        "revision" : "965a7cbcbf094cbcf22b9251a2323bdc3432e171",
-        "version" : "1.1.0"
-      }
     }
   ],
   "version" : 2

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/App/AppRegistry.swift

@@ -8,7 +8,8 @@ import LinkPresentation
 import Lists
 import MediaUI
 import Models
-import Status
+import Notifications
+import StatusKit
 import SwiftUI
 import Timeline
 
@@ -33,11 +34,13 @@ extension View {
         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)
@@ -53,63 +56,114 @@ extension View {
         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):
-        CardsListView(cards: 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
-      Group {
-        switch destination {
-        case let .replyToStatusEditor(status):
-          StatusEditorView(mode: .replyTo(status: status))
-        case let .newStatusEditor(visibility):
-          StatusEditorView(mode: .new(visibility: visibility))
-        case let .editStatusEditor(status):
-          StatusEditorView(mode: .edit(status: status))
-        case let .quoteStatusEditor(status):
-          StatusEditorView(mode: .quote(status: status))
-        case let .mentionStatusEditor(account, visibility):
-          StatusEditorView(mode: .mention(account: account, visibility: visibility))
-        case .listCreate:
-          ListCreateView()
-        case let .listEdit(list):
-          ListEditView(list: list)
-        case let .listAddAccount(account):
-          ListAddAccountView(account: account)
-        case .addAccount:
-          AddAccountView()
-        case .addRemoteLocalTimeline:
-          AddRemoteTimelineView()
-        case .addTagGroup:
-          EditTagGroupView()
-        case let .statusEditHistory(status):
-          StatusEditHistoryView(statusId: status)
-        case .settings:
-          SettingsTabs(popToRootTab: .constant(.settings), isModal: true)
-            .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)
-          } else {
-            EmptyView()
-          }
-        case let .report(status):
-          ReportView(status: status)
-        case let .shareImage(image, status):
-          ActivityView(image: image, status: status)
-        case let .editTagGroup(tagGroup, onSaved):
-          EditTagGroupView(tagGroup: tagGroup, onSaved: onSaved)
+      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()
       }
-      .withEnvironments()
     }
   }
 
@@ -129,6 +183,7 @@ extension View {
       Draft.self,
       LocalTimeline.self,
       TagGroup.self,
+      RecentTag.self,
     ])
   }
 }

IceCubesApp/App/IceCubesApp-release.entitlements

@@ -24,7 +24,7 @@
 	<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/>

IceCubesApp/App/IceCubesApp.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.$(BUNDLE_ID_PREFIX).IceCubesApp</string>
+		<string>iCloud.icecubesapp</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -24,7 +24,7 @@
 	<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/>

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

@@ -10,11 +10,11 @@ extension IceCubesApp {
       }
       .keyboardShortcut("n", modifiers: .shift)
       Button("menu.new-post") {
-#if targetEnvironment(macCatalyst)
-        openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
-#else
-        sidebarRouterPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
-#endif
+        #if targetEnvironment(macCatalyst)
+          openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
+        #else
+          appRouterPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
+        #endif
       }
       .keyboardShortcut("n", modifiers: .command)
     }
@@ -54,5 +54,11 @@ extension IceCubesApp {
       }
       .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

@@ -1,12 +1,13 @@
+import AppIntents
 import Env
 import MediaUI
-import Status
+import StatusKit
 import SwiftUI
 
 extension IceCubesApp {
   var appScene: some Scene {
     WindowGroup(id: "MainWindow") {
-      appView
+      AppView(selectedTab: $selectedTab, appRouterPath: $appRouterPath)
         .applyTheme(theme)
         .onAppear {
           setNewClientsInEnv(client: appAccountsManager.currentClient)
@@ -22,6 +23,7 @@ extension IceCubesApp {
         .environment(theme)
         .environment(watcher)
         .environment(pushNotificationsService)
+        .environment(appIntentService)
         .environment(\.isSupporter, isSupporter)
         .sheet(item: $quickLook.selectedMediaAttachment) { selectedMediaAttachment in
           MediaUIView(selectedAttachment: selectedMediaAttachment,
@@ -47,8 +49,19 @@ extension IceCubesApp {
             }
           }
         }
+        .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
     }
@@ -63,40 +76,38 @@ extension IceCubesApp {
     }
   }
 
-  @ViewBuilder
-  private var appView: some View {
-    if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
-      sidebarView
-    } else {
-      tabBarView
-    }
-  }
-
   @SceneBuilder
   var otherScenes: some Scene {
     WindowGroup(for: WindowDestinationEditor.self) { destination in
       Group {
         switch destination.wrappedValue {
         case let .newStatusEditor(visibility):
-          StatusEditorView(mode: .new(visibility: 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):
-          StatusEditorView(mode: .edit(status: status))
+          StatusEditor.MainView(mode: .edit(status: status))
         case let .quoteStatusEditor(status):
-          StatusEditorView(mode: .quote(status: status))
+          StatusEditor.MainView(mode: .quote(status: status))
         case let .replyToStatusEditor(status):
-          StatusEditorView(mode: .replyTo(status: 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 {
@@ -115,4 +126,23 @@ extension IceCubesApp {
     .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+Sidebar.swift

@@ -1,49 +0,0 @@
-import Env
-import SwiftUI
-
-extension IceCubesApp {
-  var sidebarView: some View {
-    SideBarView(selectedTab: $selectedTab,
-                popToRootTab: $popToRootTab,
-                tabs: availableTabs)
-    {
-      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 appAccountsManager.currentClient.isAuth,
-           userPreferences.showiPadSecondaryColumn
-        {
-          Divider().edgesIgnoringSafeArea(.all)
-          notificationsSecondaryColumn
-        }
-      }
-    }.onChange(of: $appAccountsManager.currentAccount.id) {
-      sideBarLoadedTabs.removeAll()
-    }
-    .environment(sidebarRouterPath)
-  }
-
-  var notificationsSecondaryColumn: some View {
-    NotificationsTab(popToRootTab: $popToRootTab, lockedType: nil)
-      .environment(\.isSecondaryColumn, true)
-      .frame(maxWidth: .secondaryColumnWidth)
-      .id(appAccountsManager.currentAccount.id)
-  }
-}

IceCubesApp/App/Main/IceCubesApp+Tabbar.swift

@@ -1,57 +0,0 @@
-import Env
-import SwiftUI
-
-extension IceCubesApp {
-  var tabBarView: some View {
-    TabView(selection: .init(get: {
-      selectedTab
-    }, set: { newTab in
-      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
-
-      DispatchQueue.main.async {
-        if selectedTab == .notifications,
-           let token = appAccountsManager.currentAccount.oauthToken
-        {
-          userPreferences.notificationsCount[token] = 0
-          watcher.unreadNotificationsCount = 0
-        }
-      }
-
-    })) {
-      ForEach(availableTabs) { tab in
-        tab.makeContentView(popToRootTab: $popToRootTab)
-          .tabItem {
-            if userPreferences.showiPhoneTabLabel {
-              tab.label
-            } else {
-              Image(systemName: tab.iconName)
-            }
-          }
-          .tag(tab)
-          .badge(badgeFor(tab: tab))
-          .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .tabBar)
-      }
-    }
-    .id(appAccountsManager.currentClient.id)
-  }
-
-  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
-  }
-}

IceCubesApp/App/Main/IceCubesApp.swift

@@ -7,7 +7,7 @@ import KeychainSwift
 import MediaUI
 import Network
 import RevenueCat
-import Status
+import StatusKit
 import SwiftUI
 import Timeline
 
@@ -23,19 +23,15 @@ struct IceCubesApp: App {
   @State var currentAccount = CurrentAccount.shared
   @State var userPreferences = UserPreferences.shared
   @State var pushNotificationsService = PushNotificationsService.shared
-  @State var watcher = StreamWatcher()
+  @State var appIntentService = AppIntentService.shared
+  @State var watcher = StreamWatcher.shared
   @State var quickLook = QuickLook.shared
   @State var theme = Theme.shared
-  @State var sidebarRouterPath = RouterPath()
 
   @State var selectedTab: Tab = .timeline
-  @State var popToRootTab: Tab = .other
-  @State var sideBarLoadedTabs: Set<Tab> = Set()
-  @State var isSupporter: Bool = false
+  @State var appRouterPath = RouterPath()
 
-  var availableTabs: [Tab] {
-    appAccountsManager.currentClient.isAuth ? Tab.loggedInTabs() : Tab.loggedOutTab()
-  }
+  @State var isSupporter: Bool = false
 
   var body: some Scene {
     appScene
@@ -84,11 +80,12 @@ struct IceCubesApp: App {
   }
 }
 
-class AppDelegate: NSObject, UIApplicationDelegate {
+class AppDelegate: UIResponder, UIApplicationDelegate {
   func application(_: UIApplication,
                    didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool
   {
-    try? AVAudioSession.sharedInstance().setCategory(.ambient)
+    try? AVAudioSession.sharedInstance().setCategory(.ambient, options: .mixWithOthers)
+    try? AVAudioSession.sharedInstance().setActive(true)
     PushNotificationsService.shared.setAccounts(accounts: AppAccountsManager.shared.pushAccounts)
     return true
   }
@@ -117,4 +114,11 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     }
     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/Report/ReportView.swift

@@ -2,7 +2,7 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Status
+import StatusKit
 import SwiftUI
 
 public struct ReportView: View {
@@ -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,9 +1,9 @@
 import DesignSystem
 import Env
+import Models
 import Observation
 import SafariServices
 import SwiftUI
-import Models
 
 extension View {
   @MainActor func withSafariRouter() -> some View {
@@ -13,23 +13,28 @@ extension View {
 
 @MainActor
 private struct SafariRouter: ViewModifier {
+  @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 safariManager = InAppSafariManager()
+  #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 { url in
         // Open external URL (from icecubesapp://)
+        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
@@ -43,76 +48,86 @@ private struct SafariRouter: ViewModifier {
               return .handled
             }
           }
-#if !targetEnvironment(macCatalyst)
-          guard preferences.preferredBrowser == .inAppSafari else { return .systemAction }
-#endif
-          // 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
-          }
-          return safariManager.open(url)
+          #endif
         }
       }
+    #if !os(visionOS)
       .background {
         WindowReader { window in
           safariManager.windowScene = window.windowScene
         }
       }
+    #endif
   }
 }
 
-@MainActor
-@Observable private class InAppSafariManager: NSObject, SFSafariViewControllerDelegate {
-  var windowScene: UIWindowScene?
-  let viewController: UIViewController = .init()
-  var window: UIWindow?
-
+#if !os(visionOS)
   @MainActor
-  func open(_ url: URL) -> OpenURLAction.Result {
-    guard let windowScene else { return .systemAction }
+  @Observable private class InAppSafariManager: NSObject, SFSafariViewControllerDelegate {
+    var windowScene: UIWindowScene?
+    let viewController: UIViewController = .init()
+    var window: UIWindow?
 
-    window = setupWindow(windowScene: windowScene)
+    @MainActor
+    func open(_ url: URL) -> OpenURLAction.Result {
+      guard let windowScene else { return .systemAction }
 
-    let configuration = SFSafariViewController.Configuration()
-    configuration.entersReaderIfAvailable = UserPreferences.shared.inAppBrowserReaderView
+      window = setupWindow(windowScene: windowScene)
 
-    let safari = SFSafariViewController(url: url, configuration: configuration)
-    safari.preferredBarTintColor = UIColor(Theme.shared.primaryBackgroundColor)
-    safari.preferredControlTintColor = UIColor(Theme.shared.tintColor)
-    safari.delegate = self
+      let configuration = SFSafariViewController.Configuration()
+      configuration.entersReaderIfAvailable = UserPreferences.shared.inAppBrowserReaderView
 
-    DispatchQueue.main.async { [weak self] in
-      self?.viewController.present(safari, animated: true)
+      let safari = SFSafariViewController(url: url, configuration: configuration)
+      safari.preferredBarTintColor = UIColor(Theme.shared.primaryBackgroundColor)
+      safari.preferredControlTintColor = UIColor(Theme.shared.tintColor)
+      safari.delegate = self
+
+      DispatchQueue.main.async { [weak self] in
+        self?.viewController.present(safari, animated: true)
+      }
+
+      return .handled
     }
 
-    return .handled
-  }
+    func setupWindow(windowScene: UIWindowScene) -> UIWindow {
+      let window = window ?? UIWindow(windowScene: windowScene)
 
-  func setupWindow(windowScene: UIWindowScene) -> UIWindow {
-    let window = window ?? UIWindow(windowScene: windowScene)
+      window.rootViewController = viewController
+      window.makeKeyAndVisible()
 
-    window.rootViewController = viewController
-    window.makeKeyAndVisible()
+      switch Theme.shared.selectedScheme {
+      case .dark:
+        window.overrideUserInterfaceStyle = .dark
+      case .light:
+        window.overrideUserInterfaceStyle = .light
+      }
 
-    switch Theme.shared.selectedScheme {
-    case .dark:
-      window.overrideUserInterfaceStyle = .dark
-    case .light:
-      window.overrideUserInterfaceStyle = .light
+      self.window = window
+      return window
     }
 
-    self.window = window
-    return window
-  }
-
-  nonisolated func safariViewControllerDidFinish(_: SFSafariViewController) {
-    Task { @MainActor in
-      window?.resignKey()
-      window?.isHidden = false
-      window = nil
+    nonisolated func safariViewControllerDidFinish(_: SFSafariViewController) {
+      Task { @MainActor in
+        window?.resignKey()
+        window?.isHidden = false
+        window = nil
+      }
     }
   }
-}
+#endif
 
 private struct WindowReader: UIViewRepresentable {
   var onUpdate: (UIWindow) -> Void

IceCubesApp/App/SideBarView.swift

@@ -4,10 +4,12 @@ import DesignSystem
 import Env
 import Models
 import SwiftUI
+import SwiftUIIntrospect
 
 @MainActor
 struct SideBarView<Content: View>: View {
   @Environment(\.openWindow) private var openWindow
+  @Environment(\.horizontalSizeClass) private var horizontalSizeClass
 
   @Environment(AppAccountsManager.self) private var appAccounts
   @Environment(CurrentAccount.self) private var currentAccount
@@ -21,6 +23,8 @@ struct SideBarView<Content: View>: View {
   var tabs: [Tab]
   @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
@@ -31,16 +35,25 @@ struct SideBarView<Content: View>: View {
   }
 
   private func makeIconForTab(tab: Tab) -> some View {
-    ZStack(alignment: .topTrailing) {
-      SideBarIcon(systemIconName: tab.iconName,
-                  isSelected: tab == selectedTab)
-      let badge = badgeFor(tab: tab)
-      if 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 {
@@ -57,18 +70,20 @@ struct SideBarView<Content: View>: View {
 
   private var postButton: some View {
     Button {
-#if targetEnvironment(macCatalyst)
-      openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
-#else
-      routerPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
-#endif
+      #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)
+    .help(Tab.post.title)
   }
 
   private func makeAccountButton(account: AppAccount, showBadge: Bool) -> some View {
@@ -85,8 +100,19 @@ struct SideBarView<Content: View>: View {
       }
     } label: {
       ZStack(alignment: .topTrailing) {
-        AppAccountView(viewModel: .init(appAccount: account, isCompact: true))
-        if showBadge,
+        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
@@ -94,69 +120,95 @@ struct SideBarView<Content: View>: View {
           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 {
-        // ensure keyboard is always dismissed when selecting a tab
-        hideKeyboard()
+      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
+          if tab == selectedTab {
+            popToRootTab = .other
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
+              popToRootTab = tab
+            }
           }
-        }
-        selectedTab = tab
-        SoundEffectManager.shared.playSound(.tabSelection)
-        if tab == .notifications {
-          if let token = appAccounts.currentAccount.oauthToken {
-            userPreferences.notificationsCount[token] = 0
+          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)
   }
 }
@@ -174,12 +226,14 @@ 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)
   }
 }
 

IceCubesApp/App/Tabs/ExploreTab.swift

@@ -4,7 +4,6 @@ import Env
 import Explore
 import Models
 import Network
-import Shimmer
 import SwiftUI
 
 @MainActor
@@ -22,18 +21,9 @@ struct ExploreTab: View {
       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)
-            }
-          }
-          if UIDevice.current.userInterfaceIdiom == .pad, !preferences.showiPadSecondaryColumn {
-            SecondaryColumnToolbarItem()
-          }
+          ToolbarTab(routerPath: $routerPath)
         }
     }
     .withSafariRouter()

IceCubesApp/App/Tabs/MessagesTab.swift

@@ -5,7 +5,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI
 
 @MainActor
@@ -25,13 +24,9 @@ struct MessagesTab: View {
         .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) { _, newValue in

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

@@ -21,6 +21,8 @@ struct NotificationsTab: View {
   @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?
@@ -31,29 +33,21 @@ struct NotificationsTab: View {
         .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)
-              }
-            }
-          }
-          if UIDevice.current.userInterfaceIdiom == .pad {
-            if (!isSecondaryColumn && !userPreferences.showiPadSecondaryColumn) || isSecondaryColumn {
-              SecondaryColumnToolbarItem()
+          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
-      if isSecondaryColumn {
-        clearNotifications()
-      }
+      clearNotifications()
     }
     .withSafariRouter()
     .environment(routerPath)
@@ -66,6 +60,9 @@ struct NotificationsTab: View {
         }
       }
     }
+    .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) {
@@ -94,7 +91,7 @@ struct NotificationsTab: View {
   }
 
   private func clearNotifications() {
-    if isSecondaryColumn {
+    if selectedTab == .notifications || isSecondaryColumn {
       if let token = appAccount.currentAccount.oauthToken {
         userPreferences.notificationsCount[token] = 0
       }

IceCubesApp/App/Tabs/ProfileTab.swift

@@ -5,7 +5,6 @@ import DesignSystem
 import Env
 import Models
 import Network
-import Shimmer
 import SwiftUI
 
 @MainActor
@@ -24,7 +23,7 @@ struct ProfileTab: View {
         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(), scrollToTopSignal: $scrollToTopSignal)

IceCubesApp/App/Tabs/Settings/AboutView.swift

@@ -1,9 +1,9 @@
+import Account
 import DesignSystem
 import Env
-import SwiftUI
-import Account
-import Network
 import Models
+import Network
+import SwiftUI
 
 @MainActor
 struct AboutView: View {
@@ -13,7 +13,7 @@ struct AboutView: View {
 
   @State private var dimillianAccount: AccountsListRowViewModel?
   @State private var iceCubesAccount: AccountsListRowViewModel?
-  
+
   let versionNumber: String
 
   init() {
@@ -27,26 +27,28 @@ struct AboutView: View {
   var body: some View {
     List {
       Section {
-        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()
-        }
+        #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")
         }
@@ -55,11 +57,12 @@ struct AboutView: View {
           Label("settings.support.terms-of-use", systemImage: "checkmark.shield")
         }
       } footer: {
-        Text("\(versionNumber)©2023 Thomas Ricouard")
+        Text("\(versionNumber)© 2024 Thomas Ricouard")
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
 
-      
       followAccountsSection
 
       Section {
@@ -95,22 +98,25 @@ struct AboutView: View {
         Text("settings.about.built-with")
           .textCase(nil)
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
     .task {
       await fetchAccounts()
     }
     .listStyle(.insetGrouped)
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
-    .navigationTitle(Text("settings.about.title"))
-    .navigationBarTitleDisplayMode(.large)
-    .environment(\.openURL, OpenURLAction { url in
-      routerPath.handle(url: url)
-    })
+    #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 {
@@ -118,12 +124,16 @@ struct AboutView: View {
         AccountsListRow(viewModel: iceCubesAccount)
         AccountsListRow(viewModel: dimillianAccount)
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     } else {
       Section {
         ProgressView()
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
   }
 
@@ -132,18 +142,18 @@ struct AboutView: View {
       group.addTask {
         let viewModel = try await fetchAccountViewModel(account: "dimillian@mastodon.social")
         await MainActor.run {
-          self.dimillianAccount = viewModel
+          dimillianAccount = viewModel
         }
       }
       group.addTask {
         let viewModel = try await fetchAccountViewModel(account: "icecubesapp@mastodon.online")
         await MainActor.run {
-          self.iceCubesAccount = viewModel
+          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]))

IceCubesApp/App/Tabs/Settings/AccountSettingView.swift

@@ -17,9 +17,8 @@ struct AccountSettingsView: View {
   @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()
 
@@ -30,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)
@@ -40,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)
@@ -96,12 +95,6 @@ struct AccountSettingsView: View {
       }
       .listRowBackground(theme.primaryBackgroundColor)
     }
-    .sheet(isPresented: $isEditingAccount, content: {
-      EditAccountView()
-    })
-    .sheet(isPresented: $isEditingFilters, content: {
-      FiltersListView()
-    })
     .toolbar {
       ToolbarItem(placement: .principal) {
         HStack {
@@ -115,7 +108,9 @@ struct AccountSettingsView: View {
       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,7 +6,6 @@ import Models
 import Network
 import NukeUI
 import SafariServices
-import Shimmer
 import SwiftUI
 
 @MainActor
@@ -28,6 +27,9 @@ struct AddAccountView: View {
   @State private var signInClient: Client?
   @State private var instances: [InstanceSocial] = []
   @State private var instanceFetchError: LocalizedStringKey?
+  @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>()
 
@@ -53,7 +55,9 @@ struct AddAccountView: View {
     NavigationStack {
       Form {
         TextField("instance.url", text: $instanceName)
+        #if !os(visionOS)
           .listRowBackground(theme.primaryBackgroundColor)
+        #endif
           .keyboardType(.URL)
           .textContentType(.URL)
           .textInputAutocapitalization(.never)
@@ -77,65 +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)) { _ in
-        // let newValue = newValue
-        //  .replacingOccurrences(of: "http://", with: "")
-        //  .replacingOccurrences(of: "https://", with: "")
-        let client = Client(server: sanitizedName)
-        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
-                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
+        .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) { _, newValue in
-        switch newValue {
-        case .active:
-          isSigninIn = false
-        default:
-          break
+        .onChange(of: scenePhase) { _, newValue in
+          switch newValue {
+          case .active:
+            isSigninIn = false
+          default:
+            break
+          }
         }
-      }
     }
   }
 
@@ -164,7 +179,9 @@ struct AddAccountView: View {
       }
       .buttonStyle(.borderedProminent)
     }
+    #if !os(visionOS)
     .listRowBackground(theme.tintColor)
+    #endif
   }
 
   private var instancesListView: some View {
@@ -172,30 +189,65 @@ struct AddAccountView: View {
       if instances.isEmpty {
         placeholderRow
       } else {
-        ForEach(sanitizedName.isEmpty ? instances : instances.filter { $0.name.contains(sanitizedName.lowercased()) }) { instance in
+        ForEach(instances) { instance in
           Button {
             instanceName = instance.name
           } label: {
             VStack(alignment: .leading, spacing: 4) {
-              Text(instance.name)
-                .font(.scaledHeadline)
-                .foregroundColor(.primary)
-              Text(instance.info?.shortDescription ?? "")
-                .font(.scaledBody)
-                .foregroundStyle(Color.secondary)
-              (Text("instance.list.users-\(instance.users)")
-                + Text("  ⸱  ")
-                + Text("instance.list.posts-\(instance.statuses)"))
-                .font(.scaledFootnote)
-                .foregroundStyle(Color.secondary)
+              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")
@@ -210,15 +262,17 @@ struct AddAccountView: View {
     }
     .redacted(reason: .placeholder)
     .allowsHitTesting(false)
-    .shimmering()
-    .listRowBackground(theme.primaryBackgroundColor)
+    #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private func signIn() async {
     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: "")){
+                                                                  callbackURLScheme: AppInfo.scheme.replacingOccurrences(of: "://", with: ""))
+    {
       await continueSignIn(url: url)
     } else {
       isSigninIn = false
@@ -248,13 +302,3 @@ struct AddAccountView: View {
     }
   }
 }
-
-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,6 +5,7 @@ import Models
 import Network
 import NukeUI
 import SwiftUI
+import Timeline
 import UserNotifications
 
 @MainActor
@@ -12,23 +13,25 @@ struct ContentSettingsView: View {
   @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) {
@@ -38,20 +41,25 @@ struct ContentSettingsView: View {
           }
         }
       }
+      #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)
+      #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
         }
       }
 
@@ -76,7 +84,9 @@ struct ContentSettingsView: View {
       } 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) {
@@ -103,12 +113,37 @@ struct ContentSettingsView: View {
           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

@@ -4,9 +4,10 @@ import Env
 import Models
 import Network
 import Observation
-import Status
+import StatusKit
 import SwiftUI
 
+@MainActor
 @Observable class DisplaySettingsLocalValues {
   var tintColor = Theme.shared.tintColor
   var primaryBackgroundColor = Theme.shared.primaryBackgroundColor
@@ -35,44 +36,50 @@ struct DisplaySettingsView: View {
   var body: some View {
     ZStack(alignment: .top) {
       Form {
-        StatusRowView(viewModel: previewStatusViewModel)
-          .allowsHitTesting(false)
-          .opacity(0)
-          .hidden()
-        themeSection
+        #if !os(visionOS)
+          StatusRowView(viewModel: previewStatusViewModel)
+            .allowsHitTesting(false)
+            .opacity(0)
+            .hidden()
+          themeSection
+        #endif
         fontSection
         layoutSection
         platformsSection
         resetSection
       }
       .navigationTitle("settings.display.navigation-title")
-      .scrollContentBackground(.hidden)
-      .background(theme.secondaryBackgroundColor)
-      .task(id: localValues.tintColor) {
-        do { try await Task.sleep(for: .microseconds(500)) } catch {}
-        theme.tintColor = localValues.tintColor
-      }
-      .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
-      }
-      examplePost
+      #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
+        }
+        .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
     }
   }
 
@@ -121,7 +128,9 @@ struct DisplaySettingsView: View {
         Text("settings.display.section.theme.footer")
       }
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private var fontSection: some View {
@@ -173,7 +182,9 @@ struct DisplaySettingsView: View {
         d[.leading]
       }
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   @ViewBuilder
@@ -197,6 +208,11 @@ struct DisplaySettingsView: View {
           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)
@@ -207,55 +223,51 @@ struct DisplaySettingsView: View {
       Toggle("settings.display.pending-left", isOn: $userPreferences.pendingShownLeft)
       Toggle("settings.display.show-reply-indentation", isOn: $userPreferences.showReplyIndentation)
       if userPreferences.showReplyIndentation {
-        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)
+        VStack {
+          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]
+        }
       }
+      Toggle("settings.display.show-account-popover", isOn: $userPreferences.showAccountPopover)
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   @ViewBuilder
   private var platformsSection: some View {
     @Bindable var userPreferences = userPreferences
-    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") {
+      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.followSystemColorScheme = true
-        theme.applySet(set: colorScheme == .dark ? .iceCubeDark : .iceCubeLight)
-        theme.avatarShape = .rounded
-        theme.avatarPosition = .top
-        theme.statusActionsDisplay = .full
-
-        localValues.tintColor = theme.tintColor
-        localValues.primaryBackgroundColor = theme.primaryBackgroundColor
-        localValues.secondaryBackgroundColor = theme.secondaryBackgroundColor
-        localValues.labelColor = theme.labelColor
-
+        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,7 +1,7 @@
 import DesignSystem
 import Env
 import Models
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor
@@ -17,10 +17,14 @@ struct HapticSettingsView: View {
         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

@@ -9,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: "")))!)!
@@ -17,31 +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 alt34, alt35
-    case alt36
+    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, alt39
-    case alt40, alt41, alt42
-    case alt43, alt44, alt45, alt46, alt47, alt48, alt49
+    case alt38
+    case alt39, alt40, alt41, alt42, alt43
+    case alt44, alt45
+    case alt46
 
     var appIconName: String {
-      switch self {
-      case .primary:
-        "AppIcon"
-      default:
-        "AppIconAlternate\(rawValue)"
-      }
-    }
-
-    var iconName: String {
-      "icon\(rawValue)"
+      return "AppIconAlternate\(rawValue)"
     }
   }
 
@@ -51,17 +39,18 @@ 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, 
-                                                                          .alt43, .alt44, .alt45, .alt46, .alt47]),
-      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) Chanhwi Joo (GitHub @te6-in)", icons: [.alt29, .alt34, .alt31, .alt35, .alt30, .alt32, .alt40]),
-      IconSelector(title: "\("settings.app.icon.designed-by".localized) W. Kovács Ágnes (@wildgica)", icons: [.alt33]),
-      IconSelector(title: "\("settings.app.icon.designed-by".localized) Duncan Horne", icons: [.alt36]),
-      IconSelector(title: "\("settings.app.icon.designed-by".localized) BeAware@social.beaware.live", icons: [.alt37, .alt41, .alt42, .alt48, .alt49]),
-      IconSelector(title: "\("settings.app.icon.designed-by".localized) Simone Margio", icons: [.alt38, .alt39]),
+      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]),
     ]
   }
 
@@ -85,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 {
@@ -103,7 +94,7 @@ struct IconSelectorView: View {
           }
         } 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)
@@ -116,6 +107,7 @@ struct IconSelectorView: View {
             }
           }
         }
+        .buttonStyle(.plain)
       }
     }
   }

IceCubesApp/App/Tabs/Settings/InstanceInfoView.swift

@@ -13,8 +13,10 @@ 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
   }
 }
 
@@ -35,7 +37,9 @@ public struct InstanceInfoSection: View {
       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") {
@@ -43,7 +47,9 @@ public struct InstanceInfoSection: View {
           Text(rule.text.trimmingCharacters(in: .whitespacesAndNewlines))
         }
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
     }
   }
 

IceCubesApp/App/Tabs/Settings/PushNotificationsView.swift

@@ -33,7 +33,9 @@ struct PushNotificationsView: View {
       } footer: {
         Text("settings.push.main-toggle.description")
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
 
       if subscription.isEnabled {
         Section {
@@ -86,7 +88,9 @@ struct PushNotificationsView: View {
             Label("settings.push.new-posts", systemImage: "bubble.right")
           }
         }
+        #if !os(visionOS)
         .listRowBackground(theme.primaryBackgroundColor)
+        #endif
       }
 
       Section {
@@ -101,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

@@ -13,7 +13,7 @@ import Timeline
 @MainActor
 struct SettingsTabs: View {
   @Environment(\.dismiss) private var dismiss
-  @Environment(\.modelContext) private var context
+  @Environment(\.horizontalSizeClass) private var horizontalSizeClass
 
   @Environment(PushNotificationsService.self) private var pushNotifications
   @Environment(UserPreferences.self) private var preferences
@@ -29,12 +29,11 @@ struct SettingsTabs: View {
   @State private var timelineCache = TimelineCache()
 
   @Binding var popToRootTab: Tab
-  
+
   let isModal: Bool
-
-  @Query(sort: \LocalTimeline.creationDate, order: .reverse) var localTimelines: [LocalTimeline]
-  @Query(sort: \TagGroup.creationDate, order: .reverse) var tagGroups: [TagGroup]
-
+  
+  @State private var startingPoint: SettingsStartingPoint? = nil
+  
   var body: some View {
     NavigationStack(path: $routerPath.path) {
       Form {
@@ -45,26 +44,54 @@ struct SettingsTabs: View {
         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 || isModal {
-          ToolbarItem {
-            Button {
-              dismiss()
-            } label: {
-              Text("action.done").bold()
+      #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()
+          }
         }
-        if UIDevice.current.userInterfaceIdiom == .pad, !preferences.showiPadSecondaryColumn {
-          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
@@ -98,7 +125,7 @@ struct SettingsTabs: View {
                 .tint(.red)
             }
           }
-          AppAccountView(viewModel: .init(appAccount: account))
+          AppAccountView(viewModel: .init(appAccount: account), isParentPresented: .constant(false))
         }
       }
       .onDelete { indexSet in
@@ -114,7 +141,9 @@ struct SettingsTabs: View {
       }
       addAccountButton
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private func logoutAccount(account: AppAccount) async {
@@ -144,53 +173,67 @@ 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: tagGroupsView) {
+      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.stack")
       }
       NavigationLink(destination: SwipeActionsSettingsView()) {
         Label("settings.general.swipeactions", systemImage: "hand.draw")
       }
+      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")
+        }
+      }
       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)
+        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 {
     @Bindable var preferences = preferences
-    Section("settings.section.other") {
-#if !targetEnvironment(macCatalyst)
-      Picker(selection: $preferences.preferredBrowser) {
-        ForEach(PreferredBrowser.allCases, id: \.rawValue) { browser in
-          switch browser {
-          case .inAppSafari:
-            Text("settings.general.browser.in-app").tag(browser)
-          case .safari:
-            Text("settings.general.browser.system").tag(browser)
+    Section {
+      #if !targetEnvironment(macCatalyst)
+        Picker(selection: $preferences.preferredBrowser) {
+          ForEach(PreferredBrowser.allCases, id: \.rawValue) { browser in
+            switch browser {
+            case .inAppSafari:
+              Text("settings.general.browser.in-app").tag(browser)
+            case .safari:
+              Text("settings.general.browser.system").tag(browser)
+            }
           }
+        } label: {
+          Label("settings.general.browser", systemImage: "network")
         }
-      } label: {
-        Label("settings.general.browser", systemImage: "network")
-      }
-      Toggle(isOn: $preferences.inAppBrowserReaderView) {
-        Label("settings.general.browser.in-app.readerview", systemImage: "doc.plaintext")
-      }
-      .disabled(preferences.preferredBrowser != PreferredBrowser.inAppSafari)
-#endif
+        Toggle(isOn: $preferences.inAppBrowserReaderView) {
+          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")
       }
@@ -203,25 +246,31 @@ struct SettingsTabs: View {
       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 !targetEnvironment(macCatalyst)
-      NavigationLink(destination: IconSelectorView()) {
-        Label {
-          Text("settings.app.icon")
-        } icon: {
-          let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon")
-          Image(uiImage: .init(named: icon.iconName)!)
-            .resizable()
-            .frame(width: 25, height: 25)
-            .cornerRadius(4)
+      #if !targetEnvironment(macCatalyst) && !os(visionOS)
+        NavigationLink(destination: IconSelectorView()) {
+          Label {
+            Text("settings.app.icon")
+          } icon: {
+            let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon")
+            Image(uiImage: .init(named: icon.appIconName)!)
+              .resizable()
+              .frame(width: 25, height: 25)
+              .cornerRadius(4)
+          }
         }
-      }
-#endif
+      #endif
 
       Link(destination: URL(string: "https://github.com/Dimillian/IceCubesApp")!) {
         Label("settings.app.source", systemImage: "link")
@@ -252,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 {
@@ -280,61 +331,6 @@ struct SettingsTabs: View {
     }
   }
 
-  private var tagGroupsView: 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])
-        }
-      }
-      .listRowBackground(theme.primaryBackgroundColor)
-
-      Button {
-        routerPath.presentedSheet = .addTagGroup
-      } label: {
-        Label("timeline.filter.add-tag-groups", systemImage: "plus")
-      }
-      .listRowBackground(theme.primaryBackgroundColor)
-    }
-    .navigationTitle("timeline.filter.tag-groups")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
-    .toolbar {
-      EditButton()
-    }
-  }
-
-  private var remoteLocalTimelinesView: some View {
-    Form {
-      ForEach(localTimelines) { timeline in
-        Text(timeline.instance)
-      }.onDelete { indexes in
-        if let index = indexes.first {
-          context.delete(localTimelines[index])
-        }
-      }
-      .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)
-    .toolbar {
-      EditButton()
-    }
-  }
-
   private var cacheSection: some View {
     Section("settings.section.cache") {
       if cachedRemoved {
@@ -349,6 +345,8 @@ struct SettingsTabs: View {
         }
       }
     }
+    #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,7 +1,6 @@
 import DesignSystem
 import Env
 import RevenueCat
-import Shimmer
 import SwiftUI
 
 @MainActor
@@ -69,23 +68,25 @@ struct SupportAppView: View {
       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
-      fetchStoreProducts()
-      refreshUserInfo()
-    }
+    #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 {
@@ -151,7 +152,9 @@ struct SupportAppView: View {
         Text("settings.support.message-from-dev")
       }
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private var subscriptionSection: some View {
@@ -188,7 +191,9 @@ struct SupportAppView: View {
         Text("settings.support.supporter.subscription-info")
       }
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private var tipsSection: some View {
@@ -213,7 +218,9 @@ struct SupportAppView: View {
         }
       }
     }
+    #if !os(visionOS)
     .listRowBackground(theme.primaryBackgroundColor)
+    #endif
   }
 
   private var restorePurchase: some View {
@@ -232,7 +239,9 @@ struct SupportAppView: View {
     } footer: {
       Text("settings.support.restore-purchase.explanation")
     }
+    #if !os(visionOS)
     .listRowBackground(theme.secondaryBackgroundColor)
+    #endif
   }
 
   private var linksSection: some View {
@@ -252,7 +261,9 @@ struct SupportAppView: View {
         .buttonStyle(.borderless)
       }
     }
+    #if !os(visionOS)
     .listRowBackground(theme.secondaryBackgroundColor)
+    #endif
   }
 
   private var loadingPlaceholder: some View {
@@ -268,6 +279,5 @@ struct SupportAppView: View {
     }
     .redacted(reason: .placeholder)
     .allowsHitTesting(false)
-    .shimmering()
   }
 }

IceCubesApp/App/Tabs/Settings/SwipeActionsSettingsView.swift

@@ -46,7 +46,9 @@ struct SwipeActionsSettingsView: View {
       } footer: {
         Text("settings.swipeactions.status.explanation")
       }
+      #if !os(visionOS)
       .listRowBackground(theme.primaryBackgroundColor)
+      #endif
 
       Section {
         Picker(selection: $userPreferences.swipeActionsIconStyle, label: Text("settings.swipeactions.icon-style")) {
@@ -62,11 +64,15 @@ struct SwipeActionsSettingsView: View {
       } 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 createStatusActionPicker(selection: Binding<StatusAction>, label: LocalizedStringKey) -> some View {

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

@@ -11,17 +11,16 @@ struct TranslationSettingsView: View {
 
   var body: some View {
     Form {
-      deepLToggle
-      if preferences.alwaysUseDeepl {
+      translationSelector
+      if preferences.preferredTranslationType == .useDeepl {
         Section("settings.translation.user-api-key") {
           deepLPicker
           SecureField("settings.translation.user-api-key", text: $apiKey)
             .textContentType(.password)
         }
-        .onAppear {
-          readValue()
-        }
+        #if !os(visionOS)
         .listRowBackground(theme.primaryBackgroundColor)
+        #endif
 
         if apiKey.isEmpty {
           Section {
@@ -30,27 +29,54 @@ struct TranslationSettingsView: View {
                 .foregroundColor(.red)
             }
           }
+          #if !os(visionOS)
           .listRowBackground(theme.primaryBackgroundColor)
+          #endif
         }
       }
+      backgroundAPIKey
       autoDetectSection
     }
     .navigationTitle("settings.translation.navigation-title")
-    .scrollContentBackground(.hidden)
-    .background(theme.secondaryBackgroundColor)
-    .onChange(of: apiKey) {
-      writeNewValue()
-    }
-    .onAppear(perform: updatePrefs)
+    #if !os(visionOS)
+      .scrollContentBackground(.hidden)
+      .background(theme.secondaryBackgroundColor)
+    #endif
+      .onChange(of: apiKey) {
+        writeNewValue()
+      }
+      .onAppear(perform: updatePrefs)
+      .onAppear(perform: readValue)
   }
 
   @ViewBuilder
-  private var deepLToggle: some View {
+  private var translationSelector: some View {
     @Bindable var preferences = preferences
-    Toggle(isOn: $preferences.alwaysUseDeepl) {
-      Text("settings.translation.always-deepl")
+    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
@@ -72,6 +98,34 @@ struct TranslationSettingsView: View {
     } 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() {
@@ -83,11 +137,7 @@ struct TranslationSettingsView: View {
   }
 
   private func readValue() {
-    if let apiKey = DeepLUserAPIHandler.readIfAllowed() {
-      self.apiKey = apiKey
-    } else {
-      apiKey = ""
-    }
+    apiKey = DeepLUserAPIHandler.readKey()
   }
 
   private func updatePrefs() {

IceCubesApp/App/Tabs/Tabs.swift

@@ -1,15 +1,22 @@
 import Account
+import AppIntents
 import DesignSystem
 import Explore
 import Foundation
-import Status
+import StatusKit
 import SwiftUI
 
 @MainActor
-enum Tab: Int, Identifiable, Hashable {
+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
 
   nonisolated var id: Int {
     rawValue
@@ -19,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)
@@ -39,9 +42,9 @@ 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:
@@ -50,6 +53,26 @@ enum Tab: Int, Identifiable, Hashable {
       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()
     }
@@ -57,29 +80,47 @@ 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()
+      ""
     }
   }
 
@@ -105,8 +146,127 @@ enum Tab: Int, Identifiable, Hashable {
       "gear"
     case .profile:
       "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:
       ""
     }
   }
 }
+
+@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

@@ -4,10 +4,9 @@ import Env
 import Models
 import Network
 import NukeUI
-import Shimmer
-import SwiftUI
-import SwiftData
 import SFSafeSymbols
+import SwiftData
+import SwiftUI
 
 @MainActor
 struct EditTagGroupView: View {
@@ -39,7 +38,9 @@ struct EditTagGroupView: View {
             focusedField: $focusedField
           )
         }
+        #if !os(visionOS)
         .listRowBackground(theme.primaryBackgroundColor)
+        #endif
 
         Section("add-tag-groups.edit.tags") {
           TagsInputView(
@@ -48,37 +49,39 @@ struct EditTagGroupView: View {
             focusedField: $focusedField
           )
         }
+        #if !os(visionOS)
         .listRowBackground(theme.primaryBackgroundColor)
+        #endif
       }
       .formStyle(.grouped)
       .navigationTitle(
         isNewGroup
-        ? "timeline.filter.add-tag-groups"
-        : "timeline.filter.edit-tag-groups"
+          ? "timeline.filter.add-tag-groups"
+          : "timeline.filter.edit-tag-groups"
       )
       .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(.interactively)
+      #endif
+        .toolbar {
+          CancelToolbarItem()
+          ToolbarItem(placement: .navigationBarTrailing) {
+            Button("action.save", action: { save() })
+              .disabled(!tagGroup.isValid)
+          }
         }
-        ToolbarItem(placement: .navigationBarTrailing) {
-          Button("action.save", action: { save() })
-            .disabled(!tagGroup.isValid)
+        .onAppear {
+          focusedField = .title
         }
-      }
-      .onAppear {
-        focusedField = .title
-      }
     }
   }
 
   init(tagGroup: TagGroup = .emptyGroup(), onSaved: ((TagGroup) -> Void)? = nil) {
-    self._tagGroup = State(wrappedValue: tagGroup)
+    _tagGroup = State(wrappedValue: tagGroup)
     self.onSaved = onSaved
-    self.isNewGroup = tagGroup.title.isEmpty
+    isNewGroup = tagGroup.title.isEmpty
   }
 
   private func save() {
@@ -101,7 +104,7 @@ struct AddTagGroupView_Previews: PreviewProvider {
     let container = try? ModelContainer(for: TagGroup.self, configurations: ModelConfiguration())
 
     // need to use `sheet` to show `symbolsSuggestionView` in preview
-    return Text("parent view for EditTagGroupView")
+    return Text(verbatim: "parent view for EditTagGroupView")
       .sheet(isPresented: .constant(true)) {
         EditTagGroupView()
           .withEnvironments()
@@ -320,7 +323,7 @@ private struct SymbolSearchResultsView: View {
         .onAppear {
           results = TagGroup.searchSymbol(for: symbolQuery, exclude: selectedSymbol)
         }
-      case .invalid(let description):
+      case let .invalid(description):
         Text(description)
           .font(.subheadline)
           .foregroundStyle(.secondary)
@@ -335,6 +338,7 @@ private struct SymbolSearchResultsView: View {
   }
 
   // MARK: search results validation
+
   enum ValidationStatus: Equatable {
     case valid
     case invalid(description: LocalizedStringKey)
@@ -342,22 +346,23 @@ private struct SymbolSearchResultsView: View {
 
   var validationStatus: ValidationStatus {
     if results.isEmpty {
-      if symbolQuery == selectedSymbol
-          && !symbolQuery.isEmpty
-          && results.count == 0
+      if symbolQuery == selectedSymbol,
+         !symbolQuery.isEmpty,
+         results.count == 0
       {
-        return .invalid(description: "\(symbolQuery) add-tag-groups.edit.tags.field.warning.search-results.already-selected")
+        .invalid(description: "\(symbolQuery) add-tag-groups.edit.tags.field.warning.search-results.already-selected")
       } else {
-        return .invalid(description: "add-tag-groups.edit.tags.field.warning.search-results.no-symbol-found")
+        .invalid(description: "add-tag-groups.edit.tags.field.warning.search-results.no-symbol-found")
       }
     } else {
-      return .valid
+      .valid
     }
   }
 }
 
 extension TagGroup {
   // MARK: title validation
+
   enum TitleValidationStatus: Equatable {
     case valid
     case invalid(description: LocalizedStringKey)
@@ -365,11 +370,12 @@ extension TagGroup {
 
   var titleValidationStatus: TitleValidationStatus {
     title.isEmpty
-    ? .invalid(description: "add-tag-groups.edit.title.field.warning.empty-title")
-    : .valid
+      ? .invalid(description: "add-tag-groups.edit.title.field.warning.empty-title")
+      : .valid
   }
 
   // MARK: symbolName validation
+
   enum SymbolNameValidationStatus: Equatable {
     case valid
     case invalid(description: LocalizedStringKey)
@@ -386,6 +392,7 @@ extension TagGroup {
   }
 
   // MARK: tags validation
+
   enum TagsValidationStatus: Equatable {
     case valid
     case invalid(description: LocalizedStringKey)
@@ -399,19 +406,22 @@ extension TagGroup {
   }
 
   // MARK: TagGroup validation
+
   var isValid: Bool {
     titleValidationStatus == .valid
-    && symbolNameValidationStatus == .valid
-    && tagsValidationStatus == .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: [])
   }
@@ -419,9 +429,9 @@ extension TagGroup {
   static func searchSymbol(for query: String, exclude excludedSymbol: String) -> [String] {
     guard !query.isEmpty else { return [] }
 
-    return Self.allSymbols.filter {
+    return allSymbols.filter {
       $0.contains(query) &&
-      $0 != excludedSymbol
+        $0 != excludedSymbol
     }
   }
 
@@ -432,7 +442,7 @@ extension TagGroup {
 
 extension Text {
   func warningLabel() -> Text {
-    self.font(.caption)
+    font(.caption)
       .foregroundStyle(.red)
   }
 }

IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift

@@ -4,7 +4,6 @@ import Env
 import Models
 import Network
 import NukeUI
-import Shimmer
 import SwiftUI
 
 @MainActor
@@ -52,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 {
-          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)
+          }
         }
-      }
     }
   }
 

IceCubesApp/App/Tabs/Timeline/TimelineTab.swift

@@ -29,6 +29,7 @@ struct TimelineTab: View {
   @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
 
@@ -41,6 +42,7 @@ struct TimelineTab: View {
   var body: some View {
     NavigationStack(path: $routerPath.path) {
       TimelineView(timeline: $timeline,
+                   pinnedFilters: $pinnedFilters,
                    selectedTagGroup: $selectedTagGroup,
                    scrollToTopSignal: $scrollToTopSignal,
                    canFilterTimeline: canFilterTimeline)
@@ -49,7 +51,7 @@ struct TimelineTab: View {
         .toolbar {
           toolbarView
         }
-        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
+        .toolbarBackground(theme.primaryBackgroundColor.opacity(0.30), for: .navigationBar)
         .id(client.id)
     }
     .onAppear {
@@ -92,8 +94,10 @@ struct TimelineTab: View {
         lastTimelineFilter = newValue
       }
       switch newValue {
-      case .tagGroup:
-        break
+      case let .tagGroup(title, _, _):
+        if let group = tagGroups.first(where: { $0.title == title }) {
+          selectedTagGroup = group
+        }
       default:
         selectedTagGroup = nil
       }
@@ -119,86 +123,14 @@ struct TimelineTab: View {
 
   @ViewBuilder
   private var timelineFilterButton: some View {
-    if timeline.supportNewestPagination {
-      Button {
-        timeline = .latest
-      } label: {
-        Label(TimelineFilter.latest.localizedTitle(), systemImage: TimelineFilter.latest.iconName() ?? "")
-      }
-      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")
-          }
-        }
-        Button {
-          routerPath.presentedSheet = .listCreate
-        } label: {
-          Label("account.list.create", systemImage: "plus")
-        }
-      }
-    }
-
-    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(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")
-      }
-    }
-
-    Menu("timeline.filter.tag-groups") {
-      ForEach(tagGroups) { group in
-        Button {
-          selectedTagGroup = group
-          timeline = .tagGroup(title: group.title, tags: group.tags)
-        } 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")
-      }
-    }
+    headerGroup
+    timelineFiltersButtons
+    listsFiltersButons
+    tagsFiltersButtons
+    localTimelinesFiltersButtons
+    tagGroupsFiltersButtons
+    Divider()
+    contentFilterButton
   }
 
   private var addAccountButton: some View {
@@ -218,17 +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)
-      if UIDevice.current.userInterfaceIdiom == .pad, !preferences.showiPadSecondaryColumn {
-        SecondaryColumnToolbarItem()
-      }
+      ToolbarTab(routerPath: $routerPath)
     } else {
       ToolbarItem(placement: .navigationBarTrailing) {
         addAccountButton
@@ -264,10 +186,145 @@ 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 {
+    } 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,211 +1,67 @@
 {
   "images" : [
-    {
-      "filename" : "40.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "60.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "29.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "58.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "87.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "80.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "120.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "57.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "57x57"
-    },
-    {
-      "filename" : "114.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "57x57"
-    },
-    {
-      "filename" : "120.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "180.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "40.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "29.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "58.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "40.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "80.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "50.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "50x50"
-    },
-    {
-      "filename" : "100.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "50x50"
-    },
-    {
-      "filename" : "72.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "72x72"
-    },
-    {
-      "filename" : "144.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "72x72"
-    },
-    {
-      "filename" : "76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "152.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "167.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
     {
       "filename" : "1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "idiom" : "universal",
+      "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-      "filename" : "Icon-16.png",
+      "filename" : "macos16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "Icon-32.png",
+      "filename" : "macos32 1.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "Icon-32 1.png",
+      "filename" : "macos32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "Icon-64.png",
+      "filename" : "macos64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "Icon-128.png",
+      "filename" : "macos128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "Icon-256 1.png",
+      "filename" : "mac256 1.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "Icon-256.png",
+      "filename" : "mac256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "Icon-512 1.png",
+      "filename" : "macOS512 1.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "Icon-512.png",
+      "filename" : "macOS512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "Icon-1024.png",
+      "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

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

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

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