diff --git a/Handy/Handy-Storybook/Atom/DividerViewController.swift b/Handy/Handy-Storybook/Atom/DividerViewController.swift index b66434d..64ef47e 100644 --- a/Handy/Handy-Storybook/Atom/DividerViewController.swift +++ b/Handy/Handy-Storybook/Atom/DividerViewController.swift @@ -12,61 +12,30 @@ import SnapKit class DividerViewController: BaseViewController { //MARK: - 프로퍼티 선언 - // horizontal Divider let divider1: HandyDivider = { - let divider = HandyDivider(.horizontal) - divider.thickness = .thickness4 + let divider = HandyDivider() + divider.thickness = .thickness1 return divider }() let divider2: HandyDivider = { - let divider = HandyDivider(.horizontal) + let divider = HandyDivider() divider.thickness = .thickness2 return divider }() let divider4: HandyDivider = { - let divider = HandyDivider(.horizontal) + let divider = HandyDivider() divider.thickness = .thickness4 return divider }() let divider8: HandyDivider = { - let divider = HandyDivider(.horizontal) - divider.thickness = .thickness8 - return divider - }() - - // vertical Divider - let vContainerView: UIView = { - let view = UIView() - return view - }() - - let vDivider1: HandyDivider = { - let divider = HandyDivider(.vertical) - divider.thickness = .thickness1 - return divider - }() - - let vDivider2: HandyDivider = { - let divider = HandyDivider(.vertical) - divider.thickness = .thickness2 - return divider - }() - - let vDivider4: HandyDivider = { - let divider = HandyDivider(.vertical) - divider.thickness = .thickness4 - return divider - }() - - let vDivider8: HandyDivider = { - let divider = HandyDivider(.vertical) + let divider = HandyDivider() divider.thickness = .thickness8 return divider }() - + //MARK: - 뷰에 추가 override func setViewHierarchies() { self.view.backgroundColor = .black @@ -74,72 +43,32 @@ class DividerViewController: BaseViewController { self.view.addSubview(divider2) self.view.addSubview(divider4) self.view.addSubview(divider8) - - self.view.addSubview(vDivider1) - self.view.addSubview(vDivider2) - self.view.addSubview(vDivider4) - self.view.addSubview(vDivider8) } //MARK: - 레이아웃 배치 override func setViewLayouts() { - /// horizontal Divider Layout divider1.snp.makeConstraints { - $0.height.equalTo(0) $0.width.equalTo(375) $0.centerX.equalToSuperview() - $0.top.equalTo(self.view.snp.top).offset(150) + $0.top.equalTo(self.view.snp.top).offset(300) } - divider2.snp.makeConstraints { - $0.height.equalTo(0) $0.width.equalTo(375) $0.centerX.equalToSuperview() $0.top.equalTo(divider1.snp.bottom).offset(20) } divider4.snp.makeConstraints { - $0.height.equalTo(0) $0.width.equalTo(375) $0.centerX.equalToSuperview() $0.top.equalTo(divider2.snp.bottom).offset(20) } divider8.snp.makeConstraints { - $0.height.equalTo(0) $0.width.equalTo(375) $0.centerX.equalToSuperview() $0.top.equalTo(divider4.snp.bottom).offset(20) } - - /// vertical Divider Layout - vDivider1.snp.makeConstraints { - $0.height.equalTo(375) - $0.width.equalTo(0) - $0.leading.equalToSuperview().offset(155) - $0.top.equalTo(divider1.snp.bottom).offset(200) - } - - vDivider2.snp.makeConstraints { - $0.height.equalTo(375) - $0.width.equalTo(0) - $0.centerY.equalTo(vDivider1.snp.centerY) - $0.leading.equalTo(vDivider1.snp.trailing).offset(20) - } - - vDivider4.snp.makeConstraints { - $0.height.equalTo(375) - $0.width.equalTo(0) - $0.centerY.equalTo(vDivider1.snp.centerY) - $0.leading.equalTo(vDivider2.snp.trailing).offset(20) - } - - vDivider8.snp.makeConstraints { - $0.height.equalTo(375) - $0.width.equalTo(0) - $0.centerY.equalTo(vDivider1.snp.centerY) - $0.leading.equalTo(vDivider4.snp.trailing).offset(20) - } } } diff --git a/Handy/Handy/Source/Atom/HandyDivider.swift b/Handy/Handy/Source/Atom/HandyDivider.swift index 7b18d11..b454388 100644 --- a/Handy/Handy/Source/Atom/HandyDivider.swift +++ b/Handy/Handy/Source/Atom/HandyDivider.swift @@ -30,21 +30,14 @@ public class HandyDivider: UIView { } } - public enum DividerDirection { - case horizontal - case vertical - } - @Invalidating(.layout) public var thickness: DividerThickness = .thickness1 { didSet { setNeedsUpdateConstraints() } } - @Invalidating(.layout) private var direction: DividerDirection = .horizontal - public init(_ direction: DividerDirection) { - self.direction = direction - super.init(frame: .zero) + public override init(frame: CGRect) { + super.init(frame: frame) setupView() } @@ -54,6 +47,7 @@ public class HandyDivider: UIView { private func setupView() { setColor() + setThickness() } private func setColor() { @@ -66,15 +60,8 @@ public class HandyDivider: UIView { } private func setThickness() { - switch direction { - case .horizontal: - self.snp.updateConstraints { - $0.height.equalTo(thickness.rawValue) - } - case .vertical: - self.snp.updateConstraints { - $0.width.equalTo(thickness.rawValue) - } + self.snp.updateConstraints { + $0.height.equalTo(thickness.rawValue) } } }