Skip to content

Proposal to remove ActionSheetItemView #31

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
yccheok wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Proposal to remove ActionSheetItemView #31

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
9efeb51
Merge pull request #1 from beryu/master
yccheok Jan 13, 2021
0b1985b
Propose to remove ActionSheetItemView to simplify the code.
yccheok Jan 13, 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
54 changes: 12 additions & 42 deletions CustomizableActionSheet/CustomizableActionSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,41 +43,6 @@ public class CustomizableActionSheetItem: NSObject {
}
}

private class ActionSheetItemView: UIView {
var subview: UIView?

required init(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)!
self.setting()
}

override init(frame: CGRect) {
super.init(frame: frame)
self.setting()
}

init() {
super.init(frame: CGRect.zero)
self.setting()
}

func setting() {
self.clipsToBounds = true
}

override func addSubview(_ view: UIView) {
super.addSubview(view)
self.subview = view
}

override func layoutSubviews() {
super.layoutSubviews()
if let subview = self.subview {
subview.frame = self.bounds
}
}
}

@objc public enum CustomizableActionSheetPosition: Int {
case bottom
case top
Expand Down Expand Up @@ -143,6 +108,9 @@ public class CustomizableActionSheet: NSObject {
availableHeight = availableHeight - item.height - CustomizableActionSheet.kItemInterval
}

// Temporary hold itemContainerView's subviews. Only perform addSubview after itemContainerView's frame is initialized.
var subviews = [UIView]()

for item in items {
// Apply height of items
if availableHeight < 0 {
Expand Down Expand Up @@ -176,19 +144,18 @@ public class CustomizableActionSheet: NSObject {
button.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(CustomizableActionSheet.buttonWasTapped(_:))))
}
item.element = button
self.itemContainerView.addSubview(button)
subviews.append(button)
currentPosition = currentPosition + item.height + CustomizableActionSheet.kItemInterval
case .view:
if let view = item.view {
let containerView = ActionSheetItemView(frame: CGRect(
let frame = CGRect(
x: CustomizableActionSheet.kMarginSide,
y: currentPosition,
width: safeAreaWidth - (CustomizableActionSheet.kMarginSide * 2),
height: item.height))
containerView.layer.cornerRadius = defaultCornerRadius
containerView.addSubview(view)
view.frame = view.bounds
self.itemContainerView.addSubview(containerView)
height: item.height)
view.frame = frame
view.layer.cornerRadius = defaultCornerRadius
subviews.append(view)
item.element = view
currentPosition = currentPosition + item.height + CustomizableActionSheet.kItemInterval
}
Expand All @@ -206,6 +173,9 @@ public class CustomizableActionSheet: NSObject {
y: positionY,
width: safeAreaWidth,
height: currentPosition)
for subview in subviews {
self.itemContainerView.addSubview(subview)
}
self.items = items

// Show animation
Expand Down
54 changes: 12 additions & 42 deletions Source/CustomizableActionSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,41 +43,6 @@ public class CustomizableActionSheetItem: NSObject {
}
}

private class ActionSheetItemView: UIView {
var subview: UIView?

required init(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)!
self.setting()
}

override init(frame: CGRect) {
super.init(frame: frame)
self.setting()
}

init() {
super.init(frame: CGRect.zero)
self.setting()
}

func setting() {
self.clipsToBounds = true
}

override func addSubview(_ view: UIView) {
super.addSubview(view)
self.subview = view
}

override func layoutSubviews() {
super.layoutSubviews()
if let subview = self.subview {
subview.frame = self.bounds
}
}
}

@objc public enum CustomizableActionSheetPosition: Int {
case bottom
case top
Expand Down Expand Up @@ -143,6 +108,9 @@ public class CustomizableActionSheet: NSObject {
availableHeight = availableHeight - item.height - CustomizableActionSheet.kItemInterval
}

// Temporary hold itemContainerView's subviews. Only perform addSubview after itemContainerView's frame is initialized.
var subviews = [UIView]()

for item in items {
// Apply height of items
if availableHeight < 0 {
Expand Down Expand Up @@ -176,19 +144,18 @@ public class CustomizableActionSheet: NSObject {
button.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(CustomizableActionSheet.buttonWasTapped(_:))))
}
item.element = button
self.itemContainerView.addSubview(button)
subviews.append(button)
currentPosition = currentPosition + item.height + CustomizableActionSheet.kItemInterval
case .view:
if let view = item.view {
let containerView = ActionSheetItemView(frame: CGRect(
let frame = CGRect(
x: CustomizableActionSheet.kMarginSide,
y: currentPosition,
width: safeAreaWidth - (CustomizableActionSheet.kMarginSide * 2),
height: item.height))
containerView.layer.cornerRadius = defaultCornerRadius
containerView.addSubview(view)
view.frame = view.bounds
self.itemContainerView.addSubview(containerView)
height: item.height)
view.frame = frame
view.layer.cornerRadius = defaultCornerRadius
subviews.append(view)
item.element = view
currentPosition = currentPosition + item.height + CustomizableActionSheet.kItemInterval
}
Expand All @@ -206,6 +173,9 @@ public class CustomizableActionSheet: NSObject {
y: positionY,
width: safeAreaWidth,
height: currentPosition)
for subview in subviews {
self.itemContainerView.addSubview(subview)
}
self.items = items

// Show animation
Expand Down