Skip to content

Added a "5th" Intermediate Pushed Up Position #55

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

Open
anomaddev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added a "5th" Intermediate Pushed Up Position #55

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd1a4bb
Added `pushedUp` snap position that will raise the `partiallyOpen` he…
anomaddev Jul 14, 2023
2083b96
Merge pull request #1 from anomaddev/custom
anomaddev Jul 14, 2023
c99d4e1
Merge branch 'mkko:master' into master
anomaddev Feb 20, 2024
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
20 changes: 18 additions & 2 deletions DrawerView/DrawerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ let dateFormatter: DateFormatter = {
case closed = 0
case collapsed = 1
case partiallyOpen = 2
case open = 3
case pushedUp = 3
case open = 4
}

extension DrawerPosition: CustomStringConvertible {
Expand All @@ -34,6 +35,7 @@ extension DrawerPosition: CustomStringConvertible {
case .closed: return "closed"
case .collapsed: return "collapsed"
case .partiallyOpen: return "partiallyOpen"
case .pushedUp: return "pushedUp"
case .open: return "open"
}
}
Expand All @@ -42,7 +44,7 @@ extension DrawerPosition: CustomStringConvertible {
fileprivate extension DrawerPosition {

static var allPositions: [DrawerPosition] {
return [.closed, .collapsed, .partiallyOpen, .open]
return [.closed, .collapsed, .partiallyOpen, .pushedUp, .open]
}

static let activePositions: [DrawerPosition] = allPositions
Expand Down Expand Up @@ -372,6 +374,13 @@ private struct ChildScrollViewInfo {
self.updateSnapPosition(animated: false)
}
}

/// The amount the drawer is pushed up from partially open when selected.
public var pushUp: CGFloat = 50 {
didSet {
self.updateSnapPosition(animated: false)
}
}

/// The current position of the drawer.
public var position: DrawerPosition {
Expand Down Expand Up @@ -995,6 +1004,9 @@ private struct ChildScrollViewInfo {
} else {
return self.topMargin
}

case .pushedUp:
return superview.bounds.height - bottomInset - (self.pushUp + self.partiallyOpenHeight)
case .partiallyOpen:
return superview.bounds.height - bottomInset - self.partiallyOpenHeight
case .collapsed:
Expand All @@ -1016,6 +1028,8 @@ private struct ChildScrollViewInfo {
return (position.rawValue >= topmost) ? 1 : 0
case (.open, .whenOpen):
fallthrough
case (.pushedUp, .whenOpen):
return 1
case (.partiallyOpen, .whenOpen):
return 1
case (.collapsed, _):
Expand All @@ -1033,6 +1047,8 @@ private struct ChildScrollViewInfo {
switch position {
case .open:
return self.shadowOpacity
case .pushedUp:
return self.shadowOpacity
case .partiallyOpen:
return self.shadowOpacity
case .collapsed:
Expand Down