From 4f9e23296fa9c8abb812bc24f0f9a1ce0c86b28a Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Wed, 6 Dec 2023 18:56:19 +0100
Subject: [PATCH] Cleanup

---
 IceCubesApp/App/AppRegistry.swift             | 97 ++++++++-----------
 .../AppAccount/AppAccountsSelectorView.swift  | 10 +-
 2 files changed, 43 insertions(+), 64 deletions(-)

diff --git a/IceCubesApp/App/AppRegistry.swift b/IceCubesApp/App/AppRegistry.swift
index 737b9a0f..c60ec3da 100644
--- a/IceCubesApp/App/AppRegistry.swift
+++ b/IceCubesApp/App/AppRegistry.swift
@@ -66,63 +66,50 @@ extension View {
 
   func withSheetDestinations(sheetDestinations: Binding<SheetDestination?>) -> some View {
     sheet(item: sheetDestinations) { destination in
-      switch destination {
-      case let .replyToStatusEditor(status):
-        StatusEditorView(mode: .replyTo(status: status))
-          .withEnvironments()
-      case let .newStatusEditor(visibility):
-        StatusEditorView(mode: .new(visibility: visibility))
-          .withEnvironments()
-      case let .editStatusEditor(status):
-        StatusEditorView(mode: .edit(status: status))
-          .withEnvironments()
-      case let .quoteStatusEditor(status):
-        StatusEditorView(mode: .quote(status: status))
-          .withEnvironments()
-      case let .mentionStatusEditor(account, visibility):
-        StatusEditorView(mode: .mention(account: account, visibility: visibility))
-          .withEnvironments()
-      case .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 }) {
-          PushNotificationsView(subscription: subscription)
-            .withEnvironments()
-        } else {
-          EmptyView()
+      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)
         }
-      case let .report(status):
-        ReportView(status: status)
-          .withEnvironments()
-      case let .shareImage(image, status):
-        ActivityView(image: image, status: status)
-      case let .editTagGroup(tagGroup, onSaved):
-        EditTagGroupView(tagGroup: tagGroup, onSaved: onSaved)
-          .withEnvironments()
       }
+      .withEnvironments()
     }
   }
 
diff --git a/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift b/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
index 2a801464..721fb438 100644
--- a/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
+++ b/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
@@ -88,14 +88,6 @@ public struct AppAccountsSelectorView: View {
     }
   }
 
-  private var accountBackgroundColor: Color {
-    if #available(iOS 16.4, *) {
-      Color.clear
-    } else {
-      theme.secondaryBackgroundColor
-    }
-  }
-
   private var accountsView: some View {
     NavigationStack {
       List {
@@ -124,7 +116,7 @@ public struct AppAccountsSelectorView: View {
       }
       .listStyle(.insetGrouped)
       .scrollContentBackground(.hidden)
-      .background(accountBackgroundColor)
+      .background(.clear)
       .navigationTitle("settings.section.accounts")
       .navigationBarTitleDisplayMode(.inline)
       .toolbar {