-
Notifications
You must be signed in to change notification settings - Fork 6
[Feat] #117 - 신고폼 구현 #125
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.
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
Merged
The head ref may contain hidden characters: "#117-\uC0AD\uC81C\uAE30\uB2A5\uAD6C\uD604"
Merged
[Feat] #117 - 신고폼 구현 #125
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_more.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Frame 9479.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "Frame 9479@2x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "Frame 9479@3x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+203 Bytes
...iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_more.imageset/Frame 9479.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+313 Bytes
.../Runnect-iOS/Global/Resource/Assets.xcassets/ic_more.imageset/Frame 9479@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+482 Bytes
.../Runnect-iOS/Global/Resource/Assets.xcassets/ic_more.imageset/Frame 9479@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,10 @@ final class CourseDetailVC: UIViewController { | |
|
|
||
| // MARK: - UI Components | ||
| private lazy var navibar = CustomNavigationBar(self, type: .titleWithLeftButton) | ||
| private let moreButton = UIButton(type: .system).then { | ||
| $0.setImage(ImageLiterals.icMore, for: .normal) | ||
| $0.tintColor = .g1 | ||
| } | ||
| private lazy var middleScorollView = UIScrollView().then { | ||
| $0.isScrollEnabled = true | ||
| $0.showsVerticalScrollIndicator = false | ||
|
|
@@ -127,6 +131,22 @@ extension CourseDetailVC { | |
| getCourseDetailWithPath(courseId: courseId) | ||
| } | ||
|
|
||
| @objc func moreButtonDidTap() { | ||
|
|
||
| let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) | ||
|
|
||
| let saveAction = UIAlertAction(title: "저장하기", style: .default, handler: nil) | ||
| let reportAction = UIAlertAction(title: "신고하기", style: .destructive, handler: {(_: UIAlertAction!) in | ||
| //report action | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 신고폼은 슬랙에 시원님이 올려주신 구글 폼 링크를 연결하면 됩니다. 신고하기 버튼 클릭하면 사파리가 열리면서 해당 구글폼으로 가지도록! |
||
| }) | ||
| let cancelAction = UIAlertAction(title: "닫기", style: .cancel, handler: nil) | ||
|
|
||
| [ saveAction, reportAction, cancelAction ].forEach { alertController.addAction($0) } | ||
|
|
||
| present(alertController, animated: true, completion: nil) | ||
|
|
||
| } | ||
|
|
||
| private func pushToCountDownVC() { | ||
| guard let courseModel = self.courseModel, | ||
| let path = courseModel.path, | ||
|
|
@@ -176,6 +196,8 @@ extension CourseDetailVC { | |
|
|
||
| private func setAddTarget() { | ||
| likeButton.addTarget(self, action: #selector(likeButtonDidTap), for: .touchUpInside) | ||
|
|
||
| moreButton.addTarget(self, action: #selector(moreButtonDidTap), for: .touchUpInside) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -184,11 +206,16 @@ extension CourseDetailVC { | |
| // MARK: - Layout Helpers | ||
| private func setNavigationBar() { | ||
| view.addSubview(navibar) | ||
|
|
||
| view.addSubview(moreButton) | ||
| navibar.snp.makeConstraints { make in | ||
| make.top.leading.trailing.equalTo(view.safeAreaLayoutGuide) | ||
| make.height.equalTo(48) | ||
| } | ||
| moreButton.snp.makeConstraints { make in | ||
lee-yeonwoo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| make.trailing.equalTo(self.view.safeAreaLayoutGuide).inset(16) | ||
| make.centerY.equalTo(navibar) | ||
| } | ||
|
|
||
lee-yeonwoo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| private func setUI() { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.