Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

Commit

Permalink
⚡️ :: 함수 분리 및 정보 구현
Browse files Browse the repository at this point in the history
  • Loading branch information
@chlgkdms
chlgkdms committed Dec 7, 2023
1 parent 0498eac commit b62a256
Showing 1 changed file with 70 additions and 123 deletions.
193 changes: 70 additions & 123 deletions presentation/src/main/java/com/signal/signal_android/feature/main/home/Home.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -75,129 +76,7 @@ internal fun Home(

if (dialogState) {
Dialog(onDismissRequest = { dialogState = false }) {
Column(
modifier = Modifier
.background(
color = SignalColor.White,
shape = RoundedCornerShape(6.dp),
)
.padding(
horizontal = 55.dp,
vertical = 30.dp,
),
horizontalAlignment = Alignment.CenterHorizontally,
) {
BodyLarge2(
text = stringResource(id = R.string.home_information_title),
color = SignalColor.Black,
)
Body(
text = stringResource(id = R.string.home_information_description),
color = SignalColor.Gray500,
)
Spacer(modifier = Modifier.height(30.dp))
Row(
verticalAlignment = Alignment.CenterVertically,
) {
Column(
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
BodyStrong(
text = stringResource(id = R.string.home_very_high),
color = SignalColor.Wine,
)
BodyStrong(
text = stringResource(id = R.string.home_high),
color = SignalColor.Error,
)
BodyStrong(
text = stringResource(id = R.string.home_normal),
color = SignalColor.Yellow,
)
BodyStrong(
text = stringResource(id = R.string.home_low),
color = SignalColor.Primary100,
)
}
Column(
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
Body(
text = stringResource(id = R.string.home_very_high_score),
color = SignalColor.Black,
)
Body(
text = stringResource(id = R.string.home_high_score),
color = SignalColor.Black,
)
Body(
text = stringResource(id = R.string.home_normal_score),
color = SignalColor.Black,
)
Body(
text = stringResource(id = R.string.home_low_score),
color = SignalColor.Black,
)
}
}
/*Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
) {
BodyStrong(
text = stringResource(id = R.string.home_very_high),
color = SignalColor.Wine,
)
Body(
text = stringResource(id = R.string.home_very_high_score),
color = SignalColor.Black,
)
}
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(30.dp),
) {
BodyStrong(
text = stringResource(id = R.string.home_high),
color = SignalColor.Error,
)
Body(
text = stringResource(id = R.string.home_high_score),
color = SignalColor.Black,
)
}
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(30.dp),
) {
BodyStrong(
text = stringResource(id = R.string.home_normal),
color = SignalColor.Yellow,
)
Body(
text = stringResource(id = R.string.home_normal_score),
color = SignalColor.Black,
)
}
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(30.dp),
) {
BodyStrong(
text = stringResource(id = R.string.home_low),
color = SignalColor.Primary100,
)
Body(
text = stringResource(id = R.string.home_low_score),
color = SignalColor.Black,
)
}
}*/
}
ChartInformationDialog()
}
}

Expand Down Expand Up @@ -289,6 +168,74 @@ internal fun Home(
}
}

@Composable
private fun ChartInformationDialog() {
Column(
modifier = Modifier
.background(
color = SignalColor.White,
shape = RoundedCornerShape(6.dp),
)
.padding(
horizontal = 55.dp,
vertical = 30.dp,
),
horizontalAlignment = Alignment.CenterHorizontally,
) {
BodyLarge2(
text = stringResource(id = R.string.home_information_title),
color = SignalColor.Black,
)
Body(
modifier = Modifier.padding(bottom = 30.dp),
text = stringResource(id = R.string.home_information_description),
color = SignalColor.Gray500,
)
ChartInformationText(
scoreName = stringResource(id = R.string.home_very_high),
scoreNameColor = SignalColor.Wine,
score = stringResource(id = R.string.home_very_high_score),
)
ChartInformationText(
scoreName = stringResource(id = R.string.home_high),
scoreNameColor = SignalColor.Error,
score = stringResource(id = R.string.home_high_score),
)
ChartInformationText(
scoreName = stringResource(id = R.string.home_normal),
scoreNameColor = SignalColor.Yellow,
score = stringResource(id = R.string.home_normal_score),
)
ChartInformationText(
scoreName = stringResource(id = R.string.home_low),
scoreNameColor = SignalColor.Primary100,
score = stringResource(id = R.string.home_low_score),
)
}
}

@Composable
private fun ChartInformationText(
scoreName: String,
scoreNameColor: Color,
score: String,
) {
Row(
modifier = Modifier.fillMaxWidth(0.8f),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
) {
BodyStrong(
text = scoreName,
color = scoreNameColor,
)
Body(
text = score,
color = SignalColor.Black,
)
}
}

@Composable
private fun OngoingActivity(
title: String,
Expand Down

0 comments on commit b62a256

Please sign in to comment.