refactor: Update IKDivider padding with OptionSet

Infomaniak · Apr 4, 2023 · 34bc5b5 · 34bc5b5
1 parent b650939
commit 34bc5b5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/Mail/Components/IKDivider.swift b/Mail/Components/IKDivider.swift
@@ -21,14 +21,13 @@ import MailResources
 import SwiftUI
 
 struct IKDivider: View {
-    var withPadding = false
+    var paddingEdges: Edge.Set = []
 
     var body: some View {
         Divider()
             .frame(height: 1)
             .overlay(MailResourcesAsset.elementsColor.swiftUIColor)
-            .padding(.horizontal, withPadding ? UIConstants.menuDrawerHorizontalPadding : 0)
-            .padding(.bottom, withPadding ? 8 : 0)
+            .padding(paddingEdges, 8)
     }
 }
 

diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift
@@ -78,8 +78,7 @@ struct MailboxesManagementView: View {
                 }
             }
 
-            IKDivider(withPadding: true)
-                .padding(.top, 8)
+            IKDivider(paddingEdges: .all)
         }
         .padding(.top, 16)
         .sheet(isPresented: $isShowingSwitchAccount) {

diff --git a/Mail/Views/Menu Drawer/MenuDrawerView.swift b/Mail/Views/Menu Drawer/MenuDrawerView.swift
@@ -145,24 +145,24 @@ struct MenuDrawerView: View {
 
                     RoleFoldersListView(folders: viewModel.roleFolders, isCompact: isCompact)
 
-                    IKDivider(withPadding: true)
+                    IKDivider(paddingEdges: .all)
 
                     UserFoldersListView(folders: viewModel.userFolders, isCompact: isCompact)
 
-                    IKDivider(withPadding: true)
+                    IKDivider(paddingEdges: .all)
 
                     MenuDrawerItemsListView(
                         title: MailResourcesStrings.Localizable.menuDrawerAdvancedActions,
                         content: viewModel.actionsMenuItems,
                         matomoName: "advancedActions"
                     )
 
-                    IKDivider(withPadding: true)
+                    IKDivider(paddingEdges: .all)
 
                     MenuDrawerItemsListView(content: viewModel.helpMenuItems)
 
                     if viewModel.mailbox.isLimited, let quotas = viewModel.mailbox.quotas {
-                        IKDivider(withPadding: true)
+                        IKDivider(paddingEdges: .all)
 
                         MailboxQuotaView(quotas: quotas)
                     }
@@ -190,15 +190,16 @@ struct MenuDrawerView: View {
 
 struct AppVersionView: View {
     var body: some View {
-        IKDivider(withPadding: true)
+        IKDivider(paddingEdges: .all)
         Text(Constants.appVersion())
             .textStyle(.labelSecondary)
     }
 }
 
 struct MenuDrawerView_Previews: PreviewProvider {
     static var previews: some View {
-        MenuDrawerView(mailboxManager: PreviewHelper.sampleMailboxManager,
-                       isCompact: false)
+        MenuDrawerView(mailboxManager: PreviewHelper.sampleMailboxManager, isCompact: false)
+            .environmentObject(NavigationDrawerState())
+            .environmentObject(GlobalBottomSheet())
     }
 }
diff --git a/Mail/Views/Thread/MoveEmailView.swift b/Mail/Views/Thread/MoveEmailView.swift
@@ -56,8 +56,7 @@ struct MoveEmailView: View {
         ScrollView {
             LazyVStack(spacing: 0) {
                 listOfFolders(nestableFolders: nestableFolderSorted.filter { $0.content.role != nil })
-                IKDivider(withPadding: true)
-                    .padding(.top, 8)
+                IKDivider(paddingEdges: .all)
                 listOfFolders(nestableFolders: nestableFolderSorted.filter { $0.content.role == nil })
             }
         }