-
Notifications
You must be signed in to change notification settings - Fork 1
[Feat-T3-197] 제보 상세 화면 UI 구현 #67
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
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
aff99bd
Feat: FloatingMenu에 제보하기 버튼 추가 (#T3-197)
choijungp 9667b3f
Feat: ReportDetailView UI 구현 (#T3-197)
choijungp 5da662e
Fix: ScrollView 추가 및 ReportType으로 타입 변경
choijungp 34c9d8b
Feat: Xcode 업데이트로 인한 Tuist 설정 일부 수정
choijungp 6ea3423
Fix: Tuist 설정 롤백
choijungp 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
23 changes: 23 additions & 0 deletions
23
Projects/Presentation/Resources/Images.xcassets/Common/report_icon.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" : "report_icon.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "report_icon@2x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "report_icon@3x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+607 Bytes
...sentation/Resources/Images.xcassets/Common/report_icon.imageset/report_icon.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
+1.03 KB
...tation/Resources/Images.xcassets/Common/report_icon.imageset/report_icon@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
+1.51 KB
...tation/Resources/Images.xcassets/Common/report_icon.imageset/report_icon@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
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 |
|---|---|---|
|
|
@@ -45,7 +45,7 @@ final class HomeViewController: BaseViewController<HomeViewModel> { | |
| static let floatingButtonBottomSpacing: CGFloat = 19 | ||
| static let floatingButtonSize: CGFloat = 52 | ||
| static let floatingMenuBottomSpacing: CGFloat = 16 | ||
| static let floatingMenuHeight: CGFloat = 56 | ||
| static let floatingMenuHeight: CGFloat = 104 | ||
| static let floatingMenuWidth: CGFloat = 144 | ||
| } | ||
|
|
||
|
|
@@ -664,6 +664,18 @@ extension HomeViewController: RoutineViewDelegate { | |
|
|
||
| // MARK: FloatingMenuViewDelegate | ||
| extension HomeViewController: FloatingMenuViewDelegate { | ||
| func floatingMenuDidTapReportButton(_ sender: FloatingMenuView) { | ||
| toggleFloatingButton() | ||
| // TODO: 제보하기 뷰로 이동 (현재는 제보 detailView) | ||
| guard let reportDetailViewModel = DIContainer.shared.resolve(type: ReportDetailViewModel.self) | ||
|
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. 요 부분은 다음 pr 올릴때 적용해서 올리겠습니다! |
||
| else { fatalError("reportDetailViewModel 의존성이 등록되지 않았습니다.") } | ||
|
|
||
| let reportDetailViewController = ReportDetailViewController(viewModel: reportDetailViewModel) | ||
| reportDetailViewController.hidesBottomBarWhenPushed = true | ||
|
|
||
| self.navigationController?.pushViewController(reportDetailViewController, animated: true) | ||
| } | ||
|
|
||
| func floatingMenuDidTapRegisterRoutineButton(_ sender: FloatingMenuView) { | ||
| toggleFloatingButton() | ||
| guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self) else { | ||
|
|
||
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
16 changes: 16 additions & 0 deletions
16
Projects/Presentation/Sources/Report/Model/ReportDetail.swift
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,16 @@ | ||
| // | ||
| // ReportDetail.swift | ||
| // Presentation | ||
| // | ||
| // Created by 최정인 on 11/18/25. | ||
| // | ||
|
|
||
| import Domain | ||
|
|
||
| struct ReportDetail { | ||
| let date: String | ||
| let title: String | ||
| let category: ReportType | ||
| let description: String | ||
| let location: String | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
홈 화면 버튼 작업도 해주셨군요 감사합니다!