Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: MenuDrawer paddings #682

Merged
merged 4 commits into from
Apr 5, 2023
Merged

Fix: MenuDrawer paddings #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93e4214
refactor: Update IKDivider padding with OptionSet
valentinperignon Apr 4, 2023
26eb2e4
feat: Update IKDividers
valentinperignon Apr 5, 2023
89d812e
refactor: Update paddings
valentinperignon Apr 5, 2023
f5b5946
refactor: Clean code
valentinperignon Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Mail/Components/IKDivider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ import MailResources
import SwiftUI

struct IKDivider: View {
var withPadding = false
var hasVerticalPadding = false
var horizontalPadding: CGFloat = 24

var body: some View {
Divider()
.frame(height: 1)
.overlay(MailResourcesAsset.elementsColor.swiftUIColor)
.padding(.horizontal, withPadding ? UIConstants.menuDrawerHorizontalPadding : 0)
.padding(.bottom, withPadding ? 8 : 0)
.padding(.vertical, hasVerticalPadding ? 8 : 0)
.padding(.horizontal, horizontalPadding)
}
}

Expand Down
1 change: 1 addition & 0 deletions Mail/Components/SelectionBackground.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import SwiftUI
enum SelectionBackgroundKind {
case none
case multiple
case folder
case single

var verticalPadding: CGFloat {
Expand Down
2 changes: 1 addition & 1 deletion Mail/Views/Menu Drawer/Folders/FolderCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ struct FolderCellContent: View {
@ViewBuilder
private var background: some View {
if cellType == .link {
SelectionBackground(selectionType: isCurrentFolder ? .multiple : .none)
SelectionBackground(selectionType: isCurrentFolder ? .folder : .none)
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions Mail/Views/Menu Drawer/Folders/RoleFoldersListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,5 @@ struct RoleFoldersListView: View {
matomoCategory: .menuDrawer)
}
}
.padding(.top, 4)
.padding(.bottom, 12)
}
}
8 changes: 2 additions & 6 deletions Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,10 @@ struct UserFoldersListView: View {
}
}
}
.padding(.leading, UIConstants.menuDrawerHorizontalPadding)
.padding(.trailing, 18)
.padding(.horizontal, UIConstants.menuDrawerHorizontalPadding)
.padding(.vertical, UIConstants.menuDrawerVerticalPadding)

if isExpanded {
Spacer(minLength: UIConstants.menuDrawerVerticalPadding)

if folders.isEmpty {
Text(MailResourcesStrings.Localizable.noFolderTitle)
.textStyle(.bodySmallSecondary)
Expand All @@ -81,7 +79,5 @@ struct UserFoldersListView: View {
}
}
}
.padding(.top, 16)
.padding(.bottom, 12)
}
}
2 changes: 1 addition & 1 deletion Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct MenuDrawerItemCell: View {
.textStyle(.bodyMedium)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 14)
.padding(.vertical, UIConstants.menuDrawerVerticalPadding)
}
}
}
Expand Down
13 changes: 4 additions & 9 deletions Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct MenuDrawerItemsListView: View {

var body: some View {
VStack(alignment: .leading, spacing: 0) {
if let title = title {
if let title {
Button {
withAnimation {
isExpanded.toggle()
Expand All @@ -60,20 +60,15 @@ struct MenuDrawerItemsListView: View {
Spacer()
}
}
.padding(.vertical, 16)
.padding(.vertical, UIConstants.menuDrawerVerticalPadding)
}

if isExpanded {
ForEach(content) { item in
MenuDrawerItemCell(content: item)
}
}
} else {
if title == nil || isExpanded {
ForEach(content) { item in
MenuDrawerItemCell(content: item)
}
}
}
.padding(.bottom, 16)
.padding(.horizontal, UIConstants.menuDrawerHorizontalPadding)
}
}
Expand Down
4 changes: 0 additions & 4 deletions Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,7 @@ struct MailboxesManagementView: View {
try? await updateAccount()
}
}

IKDivider(withPadding: true)
.padding(.top, 8)
}
.padding(.top, 16)
.sheet(isPresented: $isShowingSwitchAccount) {
SheetView(mailboxManager: mailboxManager) {
AccountListView()
Expand Down
2 changes: 1 addition & 1 deletion Mail/Views/Menu Drawer/MailboxQuotaView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct MailboxQuotaView: View {

Spacer()
}
.padding(.vertical, 19)
.padding(.vertical, 12)
.padding(.horizontal, UIConstants.menuDrawerHorizontalPadding)
}
}
Expand Down
48 changes: 28 additions & 20 deletions Mail/Views/Menu Drawer/MenuDrawerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,34 +147,42 @@ struct MenuDrawerView: View {

ScrollView {
VStack(spacing: 0) {
MailboxesManagementView(mailboxes: viewModel.mailboxes)
Group {
MailboxesManagementView(mailboxes: viewModel.mailboxes)

RoleFoldersListView(folders: viewModel.roleFolders, isCompact: isCompact)
IKDivider(hasVerticalPadding: true, horizontalPadding: UIConstants.menuDrawerHorizontalPadding)

IKDivider(withPadding: true)
RoleFoldersListView(folders: viewModel.roleFolders, isCompact: isCompact)

UserFoldersListView(folders: viewModel.userFolders, isCompact: isCompact)
IKDivider(hasVerticalPadding: true, horizontalPadding: UIConstants.menuDrawerHorizontalPadding)

IKDivider(withPadding: true)
UserFoldersListView(folders: viewModel.userFolders, isCompact: isCompact)

MenuDrawerItemsListView(
title: MailResourcesStrings.Localizable.menuDrawerAdvancedActions,
content: viewModel.actionsMenuItems,
matomoName: "advancedActions"
)
IKDivider(hasVerticalPadding: true, horizontalPadding: UIConstants.menuDrawerHorizontalPadding)
}
Group {
MenuDrawerItemsListView(
title: MailResourcesStrings.Localizable.menuDrawerAdvancedActions,
content: viewModel.actionsMenuItems,
matomoName: "advancedActions"
)

IKDivider(withPadding: true)
IKDivider(hasVerticalPadding: true, horizontalPadding: UIConstants.menuDrawerHorizontalPadding)

MenuDrawerItemsListView(content: viewModel.helpMenuItems)
MenuDrawerItemsListView(content: viewModel.helpMenuItems)

if viewModel.mailbox.isLimited, let quotas = viewModel.mailbox.quotas {
IKDivider(withPadding: true)
if viewModel.mailbox.isLimited, let quotas = viewModel.mailbox.quotas {
IKDivider(hasVerticalPadding: true, horizontalPadding: UIConstants.menuDrawerHorizontalPadding)

MailboxQuotaView(quotas: quotas)
}
MailboxQuotaView(quotas: quotas)
}

AppVersionView()
IKDivider(hasVerticalPadding: true, horizontalPadding: UIConstants.menuDrawerHorizontalPadding)

AppVersionView()
}
}
.padding(.vertical, 16)
}
}
.background(MailResourcesAsset.backgroundSecondaryColor.swiftUIColor.ignoresSafeArea())
Expand All @@ -196,15 +204,15 @@ struct MenuDrawerView: View {

struct AppVersionView: View {
var body: some View {
IKDivider(withPadding: true)
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())
}
}
3 changes: 1 addition & 2 deletions Mail/Views/Thread/MoveEmailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(horizontalPadding: 8)
listOfFolders(nestableFolders: nestableFolderSorted.filter { $0.content.role == nil })
}
}
Expand Down
4 changes: 2 additions & 2 deletions MailCore/UI/UIConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public enum UIConstants {
public static let onboardingBottomButtonPadding: CGFloat = 32
public static let onboardingArrowIconSize: CGFloat = 24

public static let menuDrawerHorizontalPadding: CGFloat = 20
public static let menuDrawerVerticalPadding: CGFloat = 12
public static let menuDrawerHorizontalPadding: CGFloat = 24
public static let menuDrawerVerticalPadding: CGFloat = 14
public static let menuDrawerSubFolderPadding: CGFloat = 15
public static let menuDrawerHorizontalItemSpacing: CGFloat = 16
public static let menuDrawerMaximumSubfolderLevel = 2
Expand Down