-
Notifications
You must be signed in to change notification settings - Fork 0
[feat/#278] 공통 여정 관련 UI #280
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
znayeonzn
wants to merge
37
commits into
develop
Choose a base branch
from
feat/#278-common-quest-ui
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.
+1,449
−155
Open
Changes from 18 commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
d84676a
#268 [remove]: 나의 여정 퀘스트 다시보기 패키지 이동
znayeonzn f0f58b4
#268 [feat]: 공통 여정 퀘스트 돌아보기 UI
znayeonzn 3c76f91
#268 [feat]: 네비 연결
znayeonzn a491d58
#268 [add]: icon 추가
znayeonzn 5c1b171
#268 [add]: icon 추가
znayeonzn cb29c4a
#268 [feat]: 추가옵션 바텀시트 구현
znayeonzn d54b372
#268 [feat]: 스낵바 icon 파라미터 추가
znayeonzn 4c0d871
#268 [move]: all 패키지로 이동
znayeonzn 93fa701
#268 [feat]: 공통퀘스트 나의 답변 UI 구현
znayeonzn e5d0ee3
#268 [feat]: MyAnswer 컴포넌트 구현
znayeonzn 60f9292
#268 [feat]: 나의 답변 상세 페이지 구현
znayeonzn f53f2d3
#268 [feat]: 공통퀘스트 네비 연결
znayeonzn 6f29f00
#268 [mod]: 분기처리 수정
znayeonzn 1d71455
#278 [merge] : develop 브랜치 반영
znayeonzn fa19a72
#278 [feat] : snackBar iconType 추가
znayeonzn 2ac162e
#278 [chore] : ktlint format
znayeonzn 582a749
#278 [feat] : 상세 답변 topBar component 분리
znayeonzn eebf0ca
#278 [mod] : 코리 반영
znayeonzn a80f199
#278 [mod] : snackBar 타입에 message 추가
znayeonzn 533afa9
#278 [mod] : OptionType sealed class 로 분리
znayeonzn 7e9818d
#278 [mod] : 코드리뷰 반영
znayeonzn 5348a26
#278 [chore] : ktlint format
znayeonzn 5977911
#278 [chore] : 함수명 변경
znayeonzn a45233b
Merge branch 'develop' of https://github.com/36-APPJAM-HEARTZ/ByeBoo-…
sohee6989 7bbf351
Merge from origin branch
sohee6989 6be15c5
#278 [chore]: ktlint 체크
sohee6989 f18548e
#278 [chore]: ktlint 체크
sohee6989 58534eb
#278 [refactor]: 몇몇 화면 리팩토링
sohee6989 c0283a0
#278 [chore]: 파일명 변경
sohee6989 744a2e2
#278 [chore]: 뷰모델 import 경로 수정
sohee6989 6d3f7db
#278 [chore]: 닉네임 하드코딩 된 것 변경
sohee6989 4de9028
#278 [chore]: 제목 요구사항 변경 반영
sohee6989 c27bdf0
#278 [feat]: 날짜 변경 공통 함수 구현
sohee6989 b934dda
#278 [refactor]: 자잘한 리팩토링
sohee6989 e3f5289
#278 [feat]: QuestCommonTitle 구현
sohee6989 a917937
#278 [chore]: 나의 답변 확인 / 세부 화면 state, viewmodel 분리 및 답변 확인 하는 방법 변경
sohee6989 80a00c4
#278 [chore]: ktlint 체크
sohee6989 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
13 changes: 13 additions & 0 deletions
13
...rc/main/java/com/byeboo/app/core/designsystem/component/snackbar/CustomSnackBarVisuals.kt
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,13 @@ | ||
| package com.byeboo.app.core.designsystem.component.snackbar | ||
|
|
||
| import androidx.compose.material3.SnackbarDuration | ||
| import androidx.compose.material3.SnackbarVisuals | ||
| import com.byeboo.app.core.designsystem.type.CustomSnackBarType | ||
|
|
||
| class CustomSnackBarVisuals( | ||
| override val message: String, | ||
| val type: CustomSnackBarType, | ||
| override val actionLabel: String? = null, | ||
| override val withDismissAction: Boolean = false, | ||
| override val duration: SnackbarDuration = SnackbarDuration.Short, | ||
| ) : SnackbarVisuals |
3 changes: 2 additions & 1 deletion
3
app/src/main/java/com/byeboo/app/core/designsystem/event/SnackbarTrigger.kt
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 |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| package com.byeboo.app.core.designsystem.event | ||
|
|
||
| import androidx.compose.runtime.staticCompositionLocalOf | ||
| import com.byeboo.app.core.designsystem.type.CustomSnackBarType | ||
|
|
||
| val LocalSnackBarTrigger = | ||
| staticCompositionLocalOf<(String) -> Unit> { | ||
| staticCompositionLocalOf<(String, CustomSnackBarType) -> Unit> { | ||
| error("No SnackBar provided") | ||
| } |
16 changes: 16 additions & 0 deletions
16
app/src/main/java/com/byeboo/app/core/designsystem/type/CustomSnackBarType.kt
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 @@ | ||
| package com.byeboo.app.core.designsystem.type | ||
|
|
||
| import androidx.annotation.DrawableRes | ||
| import com.byeboo.app.R | ||
|
|
||
| enum class CustomSnackBarType( | ||
| @DrawableRes val icon: Int, | ||
| ) { | ||
| ALERT( | ||
| icon = R.drawable.ic_alert, | ||
| ), | ||
|
|
||
| SUCCESS( | ||
| icon = R.drawable.ic_success, | ||
| ), | ||
| } |
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
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
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
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.
상세 화면 네비게이션에
clearStackNavOptions사용 검토 필요navigateToQuestCommonAnswer,navigateToQuestMyAnswers,navigateToQuestMyAnswerDetail에clearStackNavOptions를 사용하면 전체 네비게이션 스택이 삭제됩니다. 이로 인해 사용자가 상세 화면에서 뒤로가기를 할 수 없게 됩니다.다른 상세/편집 화면들(예: Line 109-115의
navigateToQuestRecordingEdit)은keepStackNavOptions를 사용하여 뒤로가기를 지원합니다. 의도된 동작이 아니라면keepStackNavOptions사용을 권장합니다.🛠️ 수정 제안
navigateToQuestCommonAnswer = { answerId -> navigator.navigateToQuestCommonAnswer( answerId = answerId, - navOptions = clearStackNavOptions, + navOptions = keepStackNavOptions, ) }, navigateToQuestMyAnswers = { - navigator.navigateToQuestMyAnswers(navOptions = clearStackNavOptions) + navigator.navigateToQuestMyAnswers(navOptions = keepStackNavOptions) }, navigateToQuestMyAnswerDetail = { answerId -> navigator.navigateToQuestMyAnswerDetail( answerId = answerId, - navOptions = clearStackNavOptions, + navOptions = keepStackNavOptions, ) },📝 Committable suggestion
🤖 Prompt for AI Agents