Skip to content

Commit 46a2694

Browse files
sungju-kimsungju-kim
committed
[#4] refactor: action board dismiss 방식 변경
1 parent 3deab9f commit 46a2694

File tree

7 files changed

+54
-10
lines changed

7 files changed

+54
-10
lines changed

‎iOS/TodoList.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
6C22959B27FD698000381DA2 /* EditCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C22959A27FD698000381DA2 /* EditCardViewController.swift */; };
1313
6CF3C10927FC2907003B4803 /* TaskCardViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CF3C10727FC2907003B4803 /* TaskCardViewCell.swift */; };
1414
6CF3C10A27FC2907003B4803 /* TaskCardViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6CF3C10827FC2907003B4803 /* TaskCardViewCell.xib */; };
15+
6CF532BE2803C807006AE77C /* ActionBoardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CF532BD2803C807006AE77C /* ActionBoardView.swift */; };
1516
6F41D5A327FAE04A00EA3FA8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F41D5A227FAE04A00EA3FA8 /* AppDelegate.swift */; };
1617
6F41D5A527FAE04A00EA3FA8 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F41D5A427FAE04A00EA3FA8 /* SceneDelegate.swift */; };
1718
6F41D5A727FAE04A00EA3FA8 /* MyTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F41D5A627FAE04A00EA3FA8 /* MyTaskViewController.swift */; };
@@ -34,6 +35,7 @@
3435
6C22959A27FD698000381DA2 /* EditCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditCardViewController.swift; sourceTree = "<group>"; };
3536
6CF3C10727FC2907003B4803 /* TaskCardViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskCardViewCell.swift; sourceTree = "<group>"; };
3637
6CF3C10827FC2907003B4803 /* TaskCardViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TaskCardViewCell.xib; sourceTree = "<group>"; };
38+
6CF532BD2803C807006AE77C /* ActionBoardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionBoardView.swift; sourceTree = "<group>"; };
3739
6F41D59F27FAE04A00EA3FA8 /* TodoList.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TodoList.app; sourceTree = BUILT_PRODUCTS_DIR; };
3840
6F41D5A227FAE04A00EA3FA8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3941
6F41D5A427FAE04A00EA3FA8 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -110,6 +112,7 @@
110112
6F77E26B27FED3670036B6E1 /* View */ = {
111113
isa = PBXGroup;
112114
children = (
115+
6CF532BD2803C807006AE77C /* ActionBoardView.swift */,
113116
6FC4ABD427FE7B0F00231F9E /* TaskBoardView.swift */,
114117
6F41D5BA27FBD6F700EA3FA8 /* TaskCardListView.swift */,
115118
6CF3C10727FC2907003B4803 /* TaskCardViewCell.swift */,
@@ -216,6 +219,7 @@
216219
6F41D5C127FC085C00EA3FA8 /* TaskCardListViewController.swift in Sources */,
217220
6F41D5A727FAE04A00EA3FA8 /* MyTaskViewController.swift in Sources */,
218221
6C22959727FD64C800381DA2 /* EditCardView.swift in Sources */,
222+
6CF532BE2803C807006AE77C /* ActionBoardView.swift in Sources */,
219223
6F77E26127FECCED0036B6E1 /* NameSpace.swift in Sources */,
220224
6F41D5BB27FBD6F700EA3FA8 /* TaskCardListView.swift in Sources */,
221225
6F41D5A327FAE04A00EA3FA8 /* AppDelegate.swift in Sources */,

‎iOS/TodoList/Base.lproj/Main.storyboard‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
<nil key="textColor"/>
4141
<nil key="highlightedColor"/>
4242
</label>
43-
<containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="At7-Pe-Txa">
43+
<containerView opaque="NO" contentMode="scaleToFill" id="At7-Pe-Txa" customClass="ActionBoardView" customModule="TodoList" customModuleProvider="target">
4444
<rect key="frame" x="766" y="0.0" width="428" height="834"/>
45+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
4546
<constraints>
4647
<constraint firstAttribute="width" constant="428" id="1Kw-1d-Brm"/>
4748
<constraint firstAttribute="height" constant="834" id="lZp-cd-2AU"/>
@@ -56,7 +57,6 @@
5657
<constraints>
5758
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="Xjx-qt-nUY" secondAttribute="trailing" constant="30" id="BSi-tT-Tsa"/>
5859
<constraint firstItem="JvC-rN-hhd" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="13" id="Kmw-pK-CWi"/>
59-
<constraint firstAttribute="trailing" secondItem="At7-Pe-Txa" secondAttribute="trailing" id="LsZ-kt-Abb"/>
6060
<constraint firstAttribute="bottom" secondItem="At7-Pe-Txa" secondAttribute="bottom" id="MAM-1u-PtL"/>
6161
<constraint firstItem="q3x-H0-srJ" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="48" id="SBh-xI-koj"/>
6262
<constraint firstItem="At7-Pe-Txa" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="Xky-M6-jTC"/>
@@ -102,7 +102,7 @@
102102
</viewController>
103103
<placeholder placeholderIdentifier="IBFirstResponder" id="4zZ-Fi-tA0" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
104104
</objects>
105-
<point key="canvasLocation" x="1125" y="137"/>
105+
<point key="canvasLocation" x="1501" y="137"/>
106106
</scene>
107107
<!--Action Board View Controller-->
108108
<scene sceneID="xEt-ac-OLo">
@@ -147,7 +147,7 @@
147147
</viewController>
148148
<placeholder placeholderIdentifier="IBFirstResponder" id="kJV-ZZ-MF4" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
149149
</objects>
150-
<point key="canvasLocation" x="619" y="137"/>
150+
<point key="canvasLocation" x="815" y="137"/>
151151
</scene>
152152
</scenes>
153153
<resources>

‎iOS/TodoList/Util/NameSpace.swift‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,11 @@ struct NameSpace {
1313
static let taskCardViewCell: String = "taskCardViewCell"
1414
static let actionCardViewCell: String = "actionCardViewCell"
1515
}
16+
17+
}
18+
19+
extension Notification.Name {
20+
static let actionFlowButtonTapped: Notification.Name = Notification.Name("actionFlowButtonTapped")
21+
static let actionFlowCloseButtonTapped: Notification.Name = Notification.Name("actionFlowCloseButtonTapped")
22+
1623
}

‎iOS/TodoList/View/ActionBoardView.swift‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import UIKit
2+
3+
class ActionBoardView: UIView {
4+
5+
override init(frame: CGRect) {
6+
super.init(frame: frame)
7+
addObserver()
8+
}
9+
10+
required init?(coder: NSCoder) {
11+
super.init(coder: coder)
12+
addObserver()
13+
}
14+
15+
@IBAction func menuButtonTapped() {
16+
self.animation(moveTo: 766)
17+
}
18+
19+
@IBAction func closeButtonTapped() {
20+
self.animation(moveTo: 1194)
21+
}
22+
23+
private func animation(moveTo xCoordinate: Int) {
24+
UIView.animate(withDuration: 0.2, animations: {
25+
self.frame = CGRect(x: xCoordinate, y: 0, width: 428, height: 834)
26+
})
27+
}
28+
29+
private func addObserver() {
30+
NotificationCenter.default.addObserver(self, selector: #selector(menuButtonTapped), name: Notification.Name.actionFlowButtonTapped, object: nil)
31+
NotificationCenter.default.addObserver(self, selector: #selector(closeButtonTapped), name: Notification.Name.actionFlowCloseButtonTapped, object: nil)
32+
}
33+
34+
}

‎iOS/TodoList/View/TaskCardListView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class TaskCardListView: UIView {
2121

2222
}
2323

24-
@IBAction func addTaskButtonTouched(_ sender: UIButton) {
24+
@IBAction func addTaskButtonTapped(_ sender: UIButton) {
2525
}
2626
}
2727

‎iOS/TodoList/ViewController/ActionBoardViewController.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ class ActionBoardViewController: UIViewController {
1616
table.register(nibName, forCellReuseIdentifier: NameSpace.identifier.actionCardViewCell)
1717
}
1818

19-
@IBAction func closeButtonTapped(_ sender: Any) {
20-
self.view.isHidden = true
21-
self.view.superview?.isHidden = true
19+
@IBAction func closeButtonTapped(_ sender: UIButton) {
20+
NotificationCenter.default.post(name: Notification.Name.actionFlowCloseButtonTapped, object: nil)
2221
}
2322
}
2423

‎iOS/TodoList/ViewController/MyTaskViewController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import UIKit
22

33
class MyTaskViewController: UIViewController {
44
@IBOutlet private weak var taskListStackView: TaskBoardView!
5-
@IBOutlet private weak var actionBoard: UIView!
5+
@IBOutlet private weak var actionBoard: ActionBoardView!
66

77
@IBOutlet private weak var actionFlowButton: UIButton!
88
@IBOutlet private weak var stackViewTrailing: NSLayoutConstraint!
@@ -17,7 +17,7 @@ class MyTaskViewController: UIViewController {
1717
}
1818

1919
@IBAction func actionFlowButtonTapped(_ sender: UIButton) {
20-
editCardButtonTapped()
20+
NotificationCenter.default.post(name: Notification.Name.actionFlowButtonTapped, object: nil)
2121
}
2222

2323
private func setupChildViewContoller() {

0 commit comments

Comments
 (0)