diff --git a/app/src/main/java/com/example/remind/feature/screens/doctor/DoctorMoodChartScreen.kt b/app/src/main/java/com/example/remind/feature/screens/doctor/DoctorMoodChartScreen.kt index 0da11e2..11c5d93 100644 --- a/app/src/main/java/com/example/remind/feature/screens/doctor/DoctorMoodChartScreen.kt +++ b/app/src/main/java/com/example/remind/feature/screens/doctor/DoctorMoodChartScreen.kt @@ -177,7 +177,21 @@ fun DoctorMoodChaartScreen( text = stringResource(id = R.string.무엇을_할_때_기분이_좋은지_확인), style = RemindTheme.typography.b2Medium.copy(color = RemindTheme.colors.grayscale_3) ) - //사진넣기 사진넣기 + Image( + modifier = Modifier.fillMaxWidth(), + contentScale = ContentScale.FillWidth, + painter = painterResource(id = R.drawable.ex_percentage), + contentDescription = null + ) + + Image( + modifier = Modifier + .fillMaxWidth() + .padding(top = 7.dp), + contentScale = ContentScale.FillWidth, + painter = painterResource(id = R.drawable.ex_activity), + contentDescription = null + ) Image( modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/java/com/example/remind/feature/screens/patience/moodchart/MoodChartScreen.kt b/app/src/main/java/com/example/remind/feature/screens/patience/moodchart/MoodChartScreen.kt index e94cde4..58738b2 100644 --- a/app/src/main/java/com/example/remind/feature/screens/patience/moodchart/MoodChartScreen.kt +++ b/app/src/main/java/com/example/remind/feature/screens/patience/moodchart/MoodChartScreen.kt @@ -1,7 +1,5 @@ package com.example.remind.feature.screens.patience.moodchart -import android.content.Intent -import android.net.Uri import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -60,7 +58,6 @@ import com.jaikeerthick.composable_graphs.composables.line.style.LineGraphStyle import com.jaikeerthick.composable_graphs.composables.line.style.LineGraphVisibility import com.jaikeerthick.composable_graphs.style.LabelPosition import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.launch import java.time.LocalDate @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class) @Composable @@ -217,27 +214,41 @@ fun MoodChartScreen(navController: NavHostController, viewModel:MoodChartViewMod text = stringResource(id = R.string.무엇을_할_때_기분이_좋은지_확인), style = RemindTheme.typography.b2Medium.copy(color = RemindTheme.colors.grayscale_3) ) - Box( - modifier = Modifier - .padding(top = 8.dp) - .border( - width = 1.dp, - color = RemindTheme.colors.grayscale_2, - shape = RoundedCornerShape(12.dp) - ) - ) { - if(uiState.feelingTotalPerCent.isNotEmpty()) { - FeelingPercentGraph( - modifier = Modifier.padding(top = 12.dp, bottom = 21.dp, start = 8.dp, end = 8.dp), - percentList = uiState.feelingTotalPerCent, - onClick = {} - ) - } else { - CircularProgressIndicator() - } +// Box( +// modifier = Modifier +// .padding(top = 8.dp) +// .border( +// width = 1.dp, +// color = RemindTheme.colors.grayscale_2, +// shape = RoundedCornerShape(12.dp) +// ) +// ) { +// if(uiState.feelingTotalPerCent.isNotEmpty()) { +// FeelingPercentGraph( +// modifier = Modifier.padding(top = 12.dp, bottom = 21.dp, start = 8.dp, end = 8.dp), +// percentList = uiState.feelingTotalPerCent, +// onClick = {} +// ) +// } else { +// CircularProgressIndicator() +// } +// +// } + Image( + modifier = Modifier.fillMaxWidth(), + contentScale = ContentScale.FillWidth, + painter = painterResource(id = R.drawable.ex_percentage), + contentDescription = null + ) - } - //활동 리스트들 들어가야함 + Image( + modifier = Modifier + .fillMaxWidth() + .padding(top = 7.dp), + contentScale = ContentScale.FillWidth, + painter = painterResource(id = R.drawable.ex_activity), + contentDescription = null + ) Text( modifier = Modifier.padding(top = 20.dp), text = stringResource(id = R.string.무드_차트_월별_비교) diff --git a/app/src/main/res/drawable/ex_activity.png b/app/src/main/res/drawable/ex_activity.png new file mode 100644 index 0000000..e04e8bb Binary files /dev/null and b/app/src/main/res/drawable/ex_activity.png differ diff --git a/app/src/main/res/drawable/ex_percentage.png b/app/src/main/res/drawable/ex_percentage.png new file mode 100644 index 0000000..6fea127 Binary files /dev/null and b/app/src/main/res/drawable/ex_percentage.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 80d9348..c4f0da0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,7 +88,7 @@ 오늘 하루,\n감사한 점 3가지를\n기록해 볼까요? 간단한 일기를 써도 좋아요:) 1.아름다운 벚꽃을 볼 수 있음에 감사해요.\n2.오늘 맛있는 빵을 먹어 감사해요.\n3.운동 할 수 있는 건강한 몸이 있음에 감사해요. - 무드 차트 월별 비동 + 무드 차트 월별 비교 주의관리 필요 환자 대처하기 보호자