-
Notifications
You must be signed in to change notification settings - Fork 0
[FEAT/#87] 챌린지 로딩 스크린 구현 #89
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
8 commits
Select commit
Hold shift + click to select a range
a24e243
[FEAT/#87] ChallengeLoadingScreen 구현
hyeminililo 9e87422
[REF/#87] ChallengeLoadingScreen 코드리뷰 수정
hyeminililo 00b4c1c
[REF/#87] ChallengeLoadingScreen 코드리뷰 수정
hyeminililo 134bf9f
[CHORE/#87] ktLint 실행
hyeminililo 8758c08
[CHORE/#87] ktLint 실행 및 패딩 적용
hyeminililo c1c6ae7
Merge branch 'develop' of https://github.com/TEAM-Cherrish/Cherrish-A…
hyeminililo 713ce90
[CHORE/#87] ktLint 실행 및 코드리뷰 반영
hyeminililo 9e3906d
[CHORE/#87] ktLint 실행 및 추가 패딩 적용
hyeminililo 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
115 changes: 115 additions & 0 deletions
115
app/src/main/java/com/cherrish/android/presentation/challenge/ChallengeLoadingScreen.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,115 @@ | ||
| package com.cherrish.android.presentation.challenge | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.navigationBarsPadding | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.vector.ImageVector | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.vectorResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.cherrish.android.R | ||
| import com.cherrish.android.core.common.extension.noRippleClickable | ||
| import com.cherrish.android.core.designsystem.theme.CherrishTheme | ||
|
|
||
| @Composable | ||
| fun ChallengeLoadingScreen( | ||
| paddingValues: PaddingValues, | ||
| modifier: Modifier = Modifier, | ||
| onCloseClick: () -> Unit | ||
| ) { | ||
| Column( | ||
| modifier = modifier | ||
| .fillMaxSize() | ||
| .padding(horizontal = 10.dp) | ||
| .padding(paddingValues) | ||
| .navigationBarsPadding(), | ||
| horizontalAlignment = Alignment.CenterHorizontally | ||
| ) { | ||
| Spacer(modifier = Modifier.height(44.dp)) | ||
|
|
||
| Icon( | ||
| modifier = Modifier | ||
| .noRippleClickable(onClick = onCloseClick) | ||
| .align(Alignment.Start) | ||
| .padding(10.dp), | ||
| imageVector = ImageVector.vectorResource(R.drawable.ic_arrow_left), | ||
| contentDescription = null, | ||
| tint = CherrishTheme.colors.gray1000 | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.weight(84f)) | ||
|
|
||
| Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) { | ||
| Text( | ||
| text = "피부 컨디션", | ||
| color = CherrishTheme.colors.red700, | ||
| style = CherrishTheme.typography.title1SB18 | ||
| ) | ||
|
|
||
| Text( | ||
| text = "관리 방향을 바탕으로", | ||
| color = CherrishTheme.colors.gray800, | ||
| style = CherrishTheme.typography.title1SB18 | ||
| ) | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(2.dp)) | ||
|
|
||
| Text( | ||
| text = "TO-DO 미션을 만들고 있어요.", | ||
| color = CherrishTheme.colors.gray800, | ||
| style = CherrishTheme.typography.title1SB18 | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(60.dp)) | ||
|
|
||
| Image( | ||
|
Contributor
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. p1: 이거 그냥 size 150.dp 지정해주느게 좋을 것 같아요!
Contributor
Author
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. 이미지요 ?? |
||
| painter = painterResource(id = R.drawable.img_challenge_loading), | ||
| contentDescription = null, | ||
| modifier = Modifier.size(150.dp) | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(80.dp)) | ||
|
|
||
| Text( | ||
| text = "잠시만 기다려주세요!", | ||
| color = CherrishTheme.colors.gray800, | ||
| style = CherrishTheme.typography.title2SB16 | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.weight(147f)) | ||
|
|
||
| Text( | ||
| text = "AI가 맞춤형 루틴을 제작하고 있어요.", | ||
| color = CherrishTheme.colors.gray600, | ||
| style = CherrishTheme.typography.body3M12 | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(30.dp)) | ||
| } | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun ChallengeLoadingScreenPreview() { | ||
| CherrishTheme { | ||
| ChallengeLoadingScreen( | ||
| paddingValues = PaddingValues(), | ||
| onCloseClick = {} | ||
| ) | ||
| } | ||
| } | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
접근성: 클릭 가능한 아이콘에 contentDescription 필요
현재 뒤로가기 아이콘이 클릭 가능하지만
contentDescription = null이라 스크린리더가 기능을 알 수 없습니다. 접근성상 차단 이슈이므로 라벨을 제공해 주세요.🔧 제안 수정
🤖 Prompt for AI Agents