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

Swipe actions #5

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Swipe actions #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f8c1e4
Use a list layout so we get free swipe actions
zachwaugh May 20, 2021
0776c2c
Incorporate block spacing into cells
zachwaugh May 20, 2021
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
23 changes: 13 additions & 10 deletions Source/View Controllers/DocumentViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,17 +359,20 @@ final class DocumentViewController: UIViewController {
}()

private func makeCollectionViewLayout() -> UICollectionViewCompositionalLayout {
let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .estimated(Metrics.estimatedBlockHeight))
let item = NSCollectionLayoutItem(layoutSize: itemSize)

let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .fractionalHeight(1))
let group = NSCollectionLayoutGroup.vertical(layoutSize: groupSize, subitems: [item])
group.interItemSpacing = .fixed(Metrics.blockSpacing)

let section = NSCollectionLayoutSection(group: group)
section.contentInsets = NSDirectionalEdgeInsets(top: Metrics.sectionTopPadding, leading: 0, bottom: 0, trailing: 0)
var config = UICollectionLayoutListConfiguration(appearance: .plain)
config.backgroundColor = .white
config.showsSeparators = false

config.trailingSwipeActionsConfigurationProvider = { indexPath in
UISwipeActionsConfiguration(actions: [
UIContextualAction(style: .destructive, title: "Delete", handler: { _, _, handler in
self.deleteBlock(at: indexPath)
handler(true)
})
])
}

return UICollectionViewCompositionalLayout(section: section)
return UICollectionViewCompositionalLayout.list(using: config)
}
}

Expand Down
6 changes: 3 additions & 3 deletions Source/Views/Cells/ListItemBlockCellView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ final class ListItemBlockCellView: BaseTextCellView {
contentView.addSubview(textView)

NSLayoutConstraint.activate([
listItemLabel.topAnchor.constraint(equalTo: contentView.topAnchor),
listItemLabel.topAnchor.constraint(equalTo: contentView.topAnchor, constant: Metrics.blockContentVerticalPadding),
listItemLabel.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: Metrics.blockContentHorizontalPadding),

textView.leadingAnchor.constraint(equalTo: listItemLabel.trailingAnchor, constant: Metrics.listItemLabelContentSpacing),
textView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -Metrics.blockContentHorizontalPadding),
textView.topAnchor.constraint(equalTo: contentView.topAnchor),
textView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
textView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: Metrics.blockContentVerticalPadding),
textView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Metrics.blockContentVerticalPadding),
])
}

Expand Down
8 changes: 4 additions & 4 deletions Source/Views/Cells/QuoteBlockCellView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ final class QuoteBlockCellView: BaseTextCellView {

NSLayoutConstraint.activate([
quoteBorderView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: Metrics.blockContentHorizontalPadding),
quoteBorderView.topAnchor.constraint(equalTo: contentView.topAnchor),
quoteBorderView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
quoteBorderView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: Metrics.blockContentVerticalPadding),
quoteBorderView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Metrics.blockContentVerticalPadding),
quoteBorderView.widthAnchor.constraint(equalToConstant: Metrics.quoteBorderWidth),

textView.leadingAnchor.constraint(equalTo: quoteBorderView.trailingAnchor, constant: Metrics.quoteBorderSpacing),
textView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -Metrics.blockContentHorizontalPadding),
textView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: Metrics.quoteContentVerticalPadding),
textView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Metrics.quoteContentVerticalPadding),
textView.topAnchor.constraint(equalTo: quoteBorderView.topAnchor, constant: Metrics.quoteContentVerticalPadding),
textView.bottomAnchor.constraint(equalTo: quoteBorderView.bottomAnchor, constant: -Metrics.quoteContentVerticalPadding),
])
}

Expand Down
4 changes: 2 additions & 2 deletions Source/Views/Cells/TextBlockCellView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ final class TextBlockCellView: BaseTextCellView {
NSLayoutConstraint.activate([
textView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: Metrics.blockContentHorizontalPadding),
textView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -Metrics.blockContentHorizontalPadding),
textView.topAnchor.constraint(equalTo: contentView.topAnchor),
textView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
textView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: Metrics.blockContentVerticalPadding),
textView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Metrics.blockContentVerticalPadding),
])
}
}
4 changes: 2 additions & 2 deletions Source/Views/Cells/TodoBlockCellView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ final class TodoBlockCellView: BaseTextCellView {

NSLayoutConstraint.activate([
checkboxButton.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: Metrics.blockContentHorizontalPadding),
checkboxButton.topAnchor.constraint(equalTo: contentView.topAnchor),
checkboxButton.topAnchor.constraint(equalTo: contentView.topAnchor, constant: Metrics.blockContentVerticalPadding),
checkboxButton.heightAnchor.constraint(equalToConstant: Metrics.checkboxSize.height),
checkboxButton.widthAnchor.constraint(equalToConstant: Metrics.checkboxSize.width),

textView.leadingAnchor.constraint(equalTo: checkboxButton.trailingAnchor, constant: Metrics.checkboxTextContentSpacing),
textView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -Metrics.blockContentHorizontalPadding),
textView.topAnchor.constraint(equalTo: checkboxButton.topAnchor, constant: Metrics.checkboxTextContentVerticalOffset),
textView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
textView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Metrics.blockContentVerticalPadding),

contentView.heightAnchor.constraint(greaterThanOrEqualToConstant: Metrics.checkboxSize.height)
])
Expand Down
6 changes: 3 additions & 3 deletions Source/Views/Metrics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import UIKit
enum Metrics {
static let sectionTopPadding: CGFloat = 16

/// Spacing in-between adjacent blocks
static let blockSpacing: CGFloat = 12

/// Leading/trailing padding of content blocks
static let blockContentHorizontalPadding: CGFloat = 16

/// Top/Bottom padding added to each cell that controls block spacing in list
static let blockContentVerticalPadding: CGFloat = 6

static let estimatedBlockHeight: CGFloat = 40
static let listItemLabelContentSpacing: CGFloat = 4

Expand Down