From ed1eb7838c9664bfc645bc7810985f87d71f9ede Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 31 Aug 2024 00:23:45 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[chore]=20#228=20=ED=8F=AC=EC=9D=B8?= =?UTF-8?q?=ED=8A=B8=20=EB=82=B4=EC=97=AD=20(PointHistory)=20=EB=B7=B0=20?= =?UTF-8?q?=EC=97=A0=ED=8B=B0=EB=B7=B0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/type/EmptyViewType.kt | 4 +- .../drawable/ic_empty_point_history_minus.xml | 59 ------------- .../drawable/ic_empty_point_history_plus.xml | 59 ------------- ...img_empty_point_history_gained_history.xml | 85 +++++++++++++++++++ .../img_empty_point_history_used_history.xml | 85 +++++++++++++++++++ 5 files changed, 172 insertions(+), 120 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_empty_point_history_minus.xml delete mode 100644 app/src/main/res/drawable/ic_empty_point_history_plus.xml create mode 100644 app/src/main/res/drawable/img_empty_point_history_gained_history.xml create mode 100644 app/src/main/res/drawable/img_empty_point_history_used_history.xml diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt b/app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt index 3629af85d..916b98fbb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt @@ -10,11 +10,11 @@ enum class EmptyViewType( ) { POINT_HISTORY_GAINED_HISTORY( titleRes = R.string.empty_view_point_history_earn_history, - imageRes = R.drawable.ic_empty_point_history_plus + imageRes = R.drawable.img_empty_point_history_gained_history ), POINT_HISTORY_USED_HISTORY( titleRes = R.string.empty_view_point_history_usage_history, - imageRes = R.drawable.ic_empty_point_history_minus + imageRes = R.drawable.img_empty_point_history_used_history ), READ( titleRes = R.string.empty_view_read, diff --git a/app/src/main/res/drawable/ic_empty_point_history_minus.xml b/app/src/main/res/drawable/ic_empty_point_history_minus.xml deleted file mode 100644 index ec2315941..000000000 --- a/app/src/main/res/drawable/ic_empty_point_history_minus.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_empty_point_history_plus.xml b/app/src/main/res/drawable/ic_empty_point_history_plus.xml deleted file mode 100644 index 8644c543f..000000000 --- a/app/src/main/res/drawable/ic_empty_point_history_plus.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/img_empty_point_history_gained_history.xml b/app/src/main/res/drawable/img_empty_point_history_gained_history.xml new file mode 100644 index 000000000..bdb86eaa4 --- /dev/null +++ b/app/src/main/res/drawable/img_empty_point_history_gained_history.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/img_empty_point_history_used_history.xml b/app/src/main/res/drawable/img_empty_point_history_used_history.xml new file mode 100644 index 000000000..040ded07b --- /dev/null +++ b/app/src/main/res/drawable/img_empty_point_history_used_history.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + From 659e00b8ba57d8ba26a86b1a168f240660a10a00 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 31 Aug 2024 00:27:36 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[chore]=20#228=20=EC=97=A0=ED=8B=B0?= =?UTF-8?q?=EB=B7=B0=20title=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/component/view/DateRoadEmptyView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt index 55a95601e..95d11f114 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt @@ -43,7 +43,7 @@ fun DateRoadEmptyView( .fillMaxWidth() .padding(horizontal = 20.dp), text = stringResource(id = emptyViewType.titleRes), - color = DateRoadTheme.colors.gray500, + color = DateRoadTheme.colors.gray300, style = DateRoadTheme.typography.titleBold18, textAlign = TextAlign.Center ) From 10ac5aea371c9339fecda3e26b0bead64961727f Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 31 Aug 2024 00:34:30 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[chore]=20#228=20=EC=97=A0=ED=8B=B0?= =?UTF-8?q?=EB=B7=B0=20=EB=86=92=EC=9D=B4=20=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/img_empty_point_history_gained_history.xml | 4 ++-- .../res/drawable/img_empty_point_history_used_history.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/drawable/img_empty_point_history_gained_history.xml b/app/src/main/res/drawable/img_empty_point_history_gained_history.xml index bdb86eaa4..44d3f842c 100644 --- a/app/src/main/res/drawable/img_empty_point_history_gained_history.xml +++ b/app/src/main/res/drawable/img_empty_point_history_gained_history.xml @@ -1,8 +1,8 @@ + android:viewportHeight="378"> diff --git a/app/src/main/res/drawable/img_empty_point_history_used_history.xml b/app/src/main/res/drawable/img_empty_point_history_used_history.xml index 040ded07b..935a2f4e8 100644 --- a/app/src/main/res/drawable/img_empty_point_history_used_history.xml +++ b/app/src/main/res/drawable/img_empty_point_history_used_history.xml @@ -1,8 +1,8 @@ + android:viewportHeight="378"> From 65e716d5c726bc271f0fd86a09ecf04d7c5b4bc9 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 31 Aug 2024 00:36:42 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[chore]=20#228=20=EB=82=B4=EA=B0=80=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=ED=95=9C=20=EC=BD=94=EC=8A=A4=20=EC=97=A0?= =?UTF-8?q?=ED=8B=B0=EB=B7=B0=20=EA=B0=80=EC=9A=B4=EB=8D=B0=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt index 3ba32d965..82eb09e6b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.res.stringResource @@ -107,7 +108,8 @@ fun MyCourseScreen( item { Box( modifier = Modifier - .fillParentMaxSize() + .fillParentMaxSize(), + contentAlignment = Alignment.Center ) { DateRoadEmptyView( emptyViewType = when (myCourseUiState.myCourseType) {