Skip to content
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

[UI/YAF-000] 세팅 UI Component를 연결합니다. #106

Merged
merged 3 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private fun TextFieldContainer(
if (text.text.isEmpty()) {
Text(
text = hint,
style = OrbitTheme.typography.body1Regular.copy(textAlign = TextAlign.Center),
style = OrbitTheme.typography.headline2SemiBold,
color = OrbitTheme.colors.gray_500,
)
}
Expand Down
66 changes: 66 additions & 0 deletions feature/setting/src/main/java/com/yapp/setting/SettingScreen.kt
Original file line number Diff line number Diff line change
@@ -1,14 +1,80 @@
package com.yapp.setting

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.HorizontalDivider
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.yapp.designsystem.theme.OrbitTheme
import com.yapp.setting.component.InquiryCard
import com.yapp.setting.component.SettingItem
import com.yapp.setting.component.SettingTopAppBar
import com.yapp.setting.component.TableOfContentsText
import com.yapp.setting.component.UserInfoCard
import com.yapp.setting.component.VersionCodeText

@Composable
fun SettingRoute() {
SettingScreen()
}

@Composable
fun SettingScreen() {
Column(
modifier = Modifier
.fillMaxSize()
.background(OrbitTheme.colors.gray_900)
.imePadding()
.navigationBarsPadding(),
) {
SettingTopAppBar(
onBackClick = { },
showTopAppBarActions = true,
title = "설정",
)
Spacer(modifier = Modifier.height(12.dp))
UserInfoCard(
name = "강문수",
gender = "남",
birth = "양력 1999년 7월 8일",
modifier = Modifier.padding(horizontal = 24.dp),
)
Spacer(modifier = Modifier.height(24.dp))
InquiryCard(
modifier = Modifier.padding(horizontal = 24.dp),
)
HorizontalDivider(
modifier = Modifier.padding(top = 16.dp),
thickness = 8.dp,
color = OrbitTheme.colors.gray_800,
)
Spacer(modifier = Modifier.height(24.dp))
TableOfContentsText(
contentsTitle = "서비스 약관",
modifier = Modifier.padding(horizontal = 24.dp),
)
Spacer(modifier = Modifier.height(12.dp))
SettingItem(
itemTitle = "이용약관",
modifier = Modifier.padding(horizontal = 24.dp),
)
Spacer(modifier = Modifier.height(24.dp))
SettingItem(
itemTitle = "개인정보 처리방침",
modifier = Modifier.padding(horizontal = 24.dp),
)
Spacer(modifier = Modifier.weight(1f))
VersionCodeText(versionCode = "v1.0.0")
Spacer(modifier = Modifier.height(24.dp))
}
}

@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,19 @@ import androidx.compose.ui.unit.dp
import com.yapp.designsystem.theme.OrbitTheme

@Composable
fun InquiryCard() {
fun InquiryCard(
modifier: Modifier = Modifier,
) {
Box(
modifier = Modifier
modifier = modifier
.fillMaxWidth()
.background(
color = OrbitTheme.colors.gray_900,
)
.fillMaxWidth(),
),
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(start = 24.dp)
.padding(vertical = 13.dp),
) {
InquiryCardTitle(title = "오르비는 여러분과 함께\n" + "성장해요!")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview

@Composable
fun SettingItem(itemTitle: String) {
fun SettingItem(
itemTitle: String,
modifier: Modifier = Modifier,
) {
Row(
modifier = Modifier
modifier = modifier
.fillMaxWidth()
.background(
color = com.yapp.designsystem.theme.OrbitTheme.colors.gray_900,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ import androidx.compose.ui.Modifier
import com.yapp.designsystem.theme.OrbitTheme

@Composable
fun TableOfContentsText(contentsTitle: String) {
fun TableOfContentsText(
contentsTitle: String,
modifier: Modifier = Modifier,
) {
Text(
text = contentsTitle,
modifier = Modifier.fillMaxWidth(),
modifier = modifier.fillMaxWidth(),
style = OrbitTheme.typography.body1Regular,
color = OrbitTheme.colors.gray_300,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,25 @@ import androidx.compose.ui.unit.dp
import com.yapp.designsystem.theme.OrbitTheme

@Composable
fun UserInfoCard() {
fun UserInfoCard(
name: String,
gender: String,
birth: String,
modifier: Modifier = Modifier,
) {
Box(
modifier = Modifier
modifier = modifier
.background(
color = OrbitTheme.colors.gray_700,
shape = RoundedCornerShape(20.dp),
)
.fillMaxWidth()
.padding(24.dp),
) {
Column() {
UserNameAndGenderText(name = "강문수", gender = "남성")
Column {
UserNameAndGenderText(name = name, gender = gender)
Spacer(modifier = Modifier.height(4.dp))
UserBirthDayText(birth = "양력 1999년 7월 8일")
UserBirthDayText(birth = birth)
}
Icon(
painter = painterResource(id = core.designsystem.R.drawable.ic_arrow_right),
Expand Down Expand Up @@ -84,5 +89,9 @@ fun UserBirthDayText(birth: String) {
@Composable
@Preview
fun UserInfoCardPreview() {
UserInfoCard()
UserInfoCard(
name = "강문수",
gender = "남",
birth = "1999.01.01",
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextAlign
import com.yapp.designsystem.theme.OrbitTheme

@Composable
Expand All @@ -13,5 +14,6 @@ fun VersionCodeText(versionCode: String) {
modifier = Modifier.fillMaxWidth(),
style = OrbitTheme.typography.body1Regular,
color = OrbitTheme.colors.gray_300,
textAlign = TextAlign.Center,
)
}
Loading