refactor(ThreadListToolbar): Use isCompactWindow

Infomaniak · May 4, 2023 · 9027fa4 · 9027fa4
1 parent 36e8ff2
commit 9027fa4
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/Mail/Views/Thread List/ThreadListView.swift b/Mail/Views/Thread List/ThreadListView.swift
@@ -56,8 +56,6 @@ struct ThreadListView: View {
 
     @LazyInjectService private var matomo: MatomoUtils
 
-    let isCompact: Bool
-
     private var shouldDisplayEmptyView: Bool {
         viewModel.folder.lastUpdate != nil && viewModel.sections.isEmpty && !viewModel.isLoadingPage
     }
@@ -78,7 +76,6 @@ struct ThreadListView: View {
                                                                    isCompact: isCompact))
         _multipleSelectionViewModel =
             StateObject(wrappedValue: ThreadListMultipleSelectionViewModel(mailboxManager: mailboxManager))
-        self.isCompact = isCompact
 
         UITableViewCell.appearance().focusEffect = .none
     }
@@ -177,8 +174,7 @@ struct ThreadListView: View {
                 isRefreshing = false
             }
         }
-        .modifier(ThreadListToolbar(isCompact: isCompact,
-                                    flushAlert: $flushAlert,
+        .modifier(ThreadListToolbar(flushAlert: $flushAlert,
                                     viewModel: viewModel,
                                     multipleSelectionViewModel: multipleSelectionViewModel) {
                 withAnimation(.default.speed(2)) {
@@ -249,20 +245,20 @@ struct ThreadListView: View {
 }
 
 private struct ThreadListToolbar: ViewModifier {
-    var isCompact: Bool
+    @LazyInjectService private var matomo: MatomoUtils
 
-    @Binding var flushAlert: FlushAlertState?
+    @Environment(\.isCompactWindow) var isCompactWindow
 
-    @ObservedObject var viewModel: ThreadListViewModel
-    @ObservedObject var multipleSelectionViewModel: ThreadListMultipleSelectionViewModel
+    @EnvironmentObject private var splitViewManager: SplitViewManager
+    @EnvironmentObject private var navigationDrawerState: NavigationDrawerState
 
     @State private var isShowingSwitchAccount = false
     @State private var multipleSelectionActionsTarget: ActionsTarget?
 
-    @EnvironmentObject var splitViewManager: SplitViewManager
-    @EnvironmentObject var navigationDrawerState: NavigationDrawerState
+    @Binding var flushAlert: FlushAlertState?
 
-    @LazyInjectService private var matomo: MatomoUtils
+    @ObservedObject var viewModel: ThreadListViewModel
+    @ObservedObject var multipleSelectionViewModel: ThreadListMultipleSelectionViewModel
 
     var selectAll: () -> Void
 
@@ -278,7 +274,7 @@ private struct ThreadListToolbar: ViewModifier {
                             }
                         }
                     } else {
-                        if isCompact {
+                        if isCompactWindow {
                             Button {
                                 matomo.track(eventWithCategory: .menuDrawer, name: "openByButton")
                                 navigationDrawerState.open()