From 4930002bc02a3f43bebca48f3a3cbe8290fa97d2 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Fri, 19 Jul 2024 04:09:13 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[ADD/#143]=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/ic_home_scrap_empty.xml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 feature/src/main/res/drawable/ic_home_scrap_empty.xml diff --git a/feature/src/main/res/drawable/ic_home_scrap_empty.xml b/feature/src/main/res/drawable/ic_home_scrap_empty.xml new file mode 100644 index 000000000..c162a7276 --- /dev/null +++ b/feature/src/main/res/drawable/ic_home_scrap_empty.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + From 3575ceaf807a9c12a37816346a088c0984e2b61b Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Fri, 19 Jul 2024 04:10:38 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[FEAT/#143]=20=EC=98=A4=EB=8A=98=20?= =?UTF-8?q?=EB=A7=88=EA=B0=90=20=EA=B3=B5=EA=B3=A0=20=EB=B9=88=20=EB=B7=B0?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terning/feature/home/home/HomeRoute.kt | 4 +- .../home/component/HomeTodayEmptyWithImg.kt | 62 +++++++++++++++++++ feature/src/main/res/values/strings.xml | 1 + 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 feature/src/main/java/com/terning/feature/home/home/component/HomeTodayEmptyWithImg.kt diff --git a/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt b/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt index d9595218c..544fd9c92 100644 --- a/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt +++ b/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt @@ -52,7 +52,7 @@ import com.terning.feature.home.changefilter.navigation.navigateChangeFilter import com.terning.feature.home.home.component.HomeFilteringEmptyIntern import com.terning.feature.home.home.component.HomeFilteringScreen import com.terning.feature.home.home.component.HomeRecommendEmptyIntern -import com.terning.feature.home.home.component.HomeTodayEmptyIntern +import com.terning.feature.home.home.component.HomeTodayEmptyWithImg import com.terning.feature.home.home.component.HomeTodayIntern import com.terning.feature.home.home.navigation.navigateHome import com.terning.feature.intern.navigation.navigateIntern @@ -301,7 +301,7 @@ private fun ShowMainTitleWithName(userName: String) { @Composable private fun ShowTodayIntern(homeTodayInternList: List) { if (homeTodayInternList.isEmpty()) { - HomeTodayEmptyIntern(isButtonExist = false) + HomeTodayEmptyWithImg() } else { HomeTodayIntern(internList = homeTodayInternList) } diff --git a/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayEmptyWithImg.kt b/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayEmptyWithImg.kt new file mode 100644 index 000000000..2d681f98d --- /dev/null +++ b/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayEmptyWithImg.kt @@ -0,0 +1,62 @@ +package com.terning.feature.home.home.component + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentWidth +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.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.terning.core.designsystem.component.image.TerningImage +import com.terning.core.designsystem.theme.Grey200 +import com.terning.core.designsystem.theme.Grey500 +import com.terning.core.designsystem.theme.TerningTheme +import com.terning.core.designsystem.theme.White +import com.terning.core.extension.customShadow +import com.terning.feature.R + +@Composable +fun HomeTodayEmptyWithImg( + modifier: Modifier = Modifier, +) { + Column( + modifier = modifier + .fillMaxWidth() + .padding(top = 19.dp) + .padding(horizontal = 24.dp) + .customShadow( + color = Grey200, + shadowRadius = 5.dp, + shadowWidth = 2.dp + ) + .background( + color = White, + shape = RoundedCornerShape(5.dp) + ), + verticalArrangement = Arrangement.Center + ) { + TerningImage( + painter = R.drawable.ic_home_scrap_empty, + modifier = Modifier + .align(Alignment.CenterHorizontally) + .padding(top = 24.dp) + ) + Text( + text = stringResource(id = R.string.home_scrap_empty), + modifier = modifier + .padding(top = 8.dp, bottom = 25.dp) + .fillMaxWidth() + .wrapContentWidth(Alignment.CenterHorizontally), + textAlign = TextAlign.Center, + style = TerningTheme.typography.detail3, + color = Grey500, + ) + } +} \ No newline at end of file diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml index b3f441ccc..5a2a3746f 100644 --- a/feature/src/main/res/values/strings.xml +++ b/feature/src/main/res/values/strings.xml @@ -76,6 +76,7 @@ 지금 공고 필터링을 설정하고\n내 계획에 딱 맞는 대학생 인턴 공고를 추천받아보세요! - + 오늘 마감인 공고가 없어요 터치 3번으로\n원하는 대학생 인턴 공고를 띄워드릴게요 From de42b4b7c71fcd81dd4d79528c5fb68d305a7855 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Fri, 19 Jul 2024 04:36:22 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[ADD/#143]=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/ic_home_empty_filtering.xml | 200 ++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 feature/src/main/res/drawable/ic_home_empty_filtering.xml diff --git a/feature/src/main/res/drawable/ic_home_empty_filtering.xml b/feature/src/main/res/drawable/ic_home_empty_filtering.xml new file mode 100644 index 000000000..9c6c313b3 --- /dev/null +++ b/feature/src/main/res/drawable/ic_home_empty_filtering.xml @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8540ff60b1754f6190c1bea2671a0220afda2356 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Fri, 19 Jul 2024 04:39:59 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[MOD/#143]=20=ED=95=84=ED=84=B0=EB=A7=81=20?= =?UTF-8?q?=EC=97=86=EC=9D=84=20=EB=95=8C=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/component/HomeFilteringEmptyIntern.kt | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringEmptyIntern.kt b/feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringEmptyIntern.kt index 896715b29..e9a2ef319 100644 --- a/feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringEmptyIntern.kt +++ b/feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringEmptyIntern.kt @@ -1,19 +1,15 @@ package com.terning.feature.home.home.component import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp +import com.terning.core.designsystem.component.image.TerningImage import com.terning.feature.R @Composable @@ -22,20 +18,18 @@ fun HomeFilteringEmptyIntern( ) { Column( modifier = modifier, - verticalArrangement = Arrangement.Bottom + verticalArrangement = Arrangement.Center ) { - Box( + + TerningImage( + painter = R.drawable.ic_home_empty_filtering, modifier = Modifier - .padding( - top = 16.dp, - bottom = 12.dp - ) + .align(Alignment.CenterHorizontally) ) Text( text = stringResource(id = R.string.home_recommend_no_filtering), modifier = Modifier .fillMaxWidth() - .padding(bottom = 25.dp) .align(Alignment.CenterHorizontally), textAlign = TextAlign.Center, )