-
Notifications
You must be signed in to change notification settings - Fork 0
[Feat] 마이페이지 UI 개편 #203
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: "FLT-14-\uB9C8\uC774\uD398\uC774\uC9C0-UI-\uAC1C\uD3B8"
Merged
[Feat] 마이페이지 UI 개편 #203
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9f845e6
feat: 프로필 정보 안내 모달 트리거 컴포넌트 추가
ckals413 04d5897
feat: 프로필 화면 내 컬렉션 섹션 타이틀 수정
ckals413 cd57e7e
feat: 프로필 화면 내 설정 및 취향 키워드 안내 모달 추가
ckals413 53c98f1
feat: 프로필 키워드 그래프 그라데이션 추가
ckals413 b15513f
feat: 프로필 키워드 그래프 추가 및 상위 3개 항목 노출 제한
ckals413 5b4e0fb
feat: 프로필 키워드 섹션 레이아웃 및 간격 조정
ckals413 13e23d4
feat: 프로필 키워드 그래프 퍼센트 값 범위 제한
ckals413 e387a81
fix: InfoModalTrigger 내 FlintTheme 기반 색상 시스템 적용
ckals413 cbcff1e
fix: 마이페이지에서 뒤로가기 아이콘 노출되지 않도록 수정
ckals413 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
44 changes: 44 additions & 0 deletions
44
app/src/main/java/com/flint/presentation/profile/component/InfoModalTrigger.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,44 @@ | ||
| package com.flint.presentation.profile.component | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| 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.Color | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.flint.core.designsystem.theme.FlintTheme | ||
|
|
||
| @Composable | ||
| fun InfoModalTrigger( | ||
| text: String, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Box( | ||
| contentAlignment = Alignment.Center, | ||
| modifier = modifier | ||
| .background( | ||
| color = FlintTheme.colors.gray800, | ||
| shape = RoundedCornerShape(size = 12.dp), | ||
| ) | ||
| .padding(horizontal = 12.dp, vertical = 14.dp), | ||
| ) { | ||
| Text( | ||
| text = text, | ||
| style = FlintTheme.typography.body2R14, | ||
| color = FlintTheme.colors.gray300, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview(showBackground = true, backgroundColor = 0xFF141417) | ||
| @Composable | ||
| private fun InfoModalTriggerPreview() { | ||
| FlintTheme { | ||
| InfoModalTrigger(text = "저장한 작품들에서 반복되는 키워드를 분석해 취향 키워드를 만들어요. n개 이상 작품이 쌓이면 업데이트할 수 있어요.") | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.