-
Notifications
You must be signed in to change notification settings - Fork 0
[#45] 검색/알림 수정된 UI 구현 및 로직 수정 #46
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
Open
Funital
wants to merge
21
commits into
develop
Choose a base branch
from
feat/#45
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
48427e9
[#45] 변경된 검색 결과창 수정
Funital 0c75967
[#45] Mark 주석 추가
Funital 1d0883f
[#45] 검색결과뷰 UI 수정
Funital 0cb83e9
[#45] 알람 조회 api에 맞는 entity로 수정 및 mock data 수정
Funital 7a85bbe
[#45] 신고 접수 안내 component 제작
Funital f9b234f
[#45] 신고 접수 안내 띄우기
Funital 13713bc
[#45] 신고 유형 entity에 추가
Funital b63815f
[#45] 경고 없애기
Funital da54855
[#45] 읽지 않음 알람 선택 로직 추가
Funital a7ff22a
[#45] 알림 읽음 처리 api 로직 추가
Funital 2fc2626
[#45] padding 값 수정
Funital 9aa7267
[#45] 에러처리 로직 수정
Funital cce88a8
[#45] 불필요한 VStack 제거
Funital d5d2390
[#45] 읽음 상태 갱신 로직 개선하기
Funital 14a9a3b
[#45] SearchResultView에 정의된 struct를 파일로 분리시키기
Funital 9d95cc2
[#45] 최근 검색어 tag를 눌렀을때 검색하기 로직 추가
Funital 4bb9e82
[#45] 테두리 여백 추가
Funital 5129b67
[#45] 키보드 내려가기 제스처 추가
Funital 2f01b88
[#45] 검색 버튼 동작 생성 및 검색 로직 부여
Funital 1a71b0a
[#45] 아이콘 이미지 버그 수정
Funital 0805f34
[#45] 검색 시에 네비게이션 스택 쌓이지 않도록 수정
Funital 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
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
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
72 changes: 72 additions & 0 deletions
72
Codive/Features/Notification/Presentation/Component/ReportSubmissionGuide.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,72 @@ | ||
| // | ||
| // ReportSubmissionGuide.swift | ||
| // Codive | ||
| // | ||
| // Created by 한금준 on 12/30/25. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct ReportSubmissionGuide: View { | ||
| let reportType: ReportType | ||
|
|
||
| // 타입에 따른 안내 문구 결정 | ||
| private var reportTargetText: String { | ||
| switch reportType { | ||
| case .feed: | ||
| return "게시글이" | ||
| case .comment: | ||
| return "댓글이" | ||
| } | ||
| } | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .leading, spacing: 12) { | ||
| HStack(alignment: .center, spacing: 8) { | ||
| Image("warning") | ||
| .resizable() | ||
| .renderingMode(.template) | ||
| .frame(width: 24, height: 24) | ||
| .foregroundColor(Color.Codive.point1) | ||
|
|
||
| VStack(alignment: .leading, spacing: 12) { | ||
| Text("신고 접수 안내") | ||
| .font(.codive_body1_medium) | ||
| .foregroundColor(Color.Codive.grayscale1) | ||
| } | ||
Funital marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Spacer() | ||
| } | ||
|
|
||
| VStack(alignment: .leading, spacing: 4) { | ||
| // 동적 텍스트 적용 | ||
| Text("회원님의 \(reportTargetText) 운영 정책 위반으로 신고되었습니다.") | ||
| .font(.codive_body2_regular) | ||
| .foregroundColor(Color.Codive.grayscale1) | ||
|
|
||
| Text("확인 및 조치는 영업일 기준 3~5일정도 소요됩니다.") | ||
| .font(.codive_body2_regular) | ||
| .foregroundColor(Color.Codive.grayscale1) | ||
| } | ||
| } | ||
| .padding(.horizontal, 16) | ||
| .padding(.top, 16) | ||
| .padding(.bottom, 20) | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| .background( | ||
| RoundedRectangle(cornerRadius: 8, style: .continuous) | ||
| .fill(Color.Codive.point4) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Preview | ||
|
|
||
| #Preview { | ||
| VStack { | ||
| ReportSubmissionGuide(reportType: .comment) | ||
| .padding(.horizontal, 20) | ||
|
|
||
| ReportSubmissionGuide(reportType: .feed) | ||
| .padding(.horizontal, 20) | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.