From 4928104cc7b8d8d2b54e1d57d88bd1dd9e9a063e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=B5=E1=86=AB?= =?UTF-8?q?=E1=84=8B=E1=85=AE?= Date: Thu, 8 May 2025 22:41:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20empty=20view=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/pointhistory/PointHistoryScreen.kt | 45 ++++- ...img_empty_point_history_gained_history.xml | 166 +++++++++--------- .../img_empty_point_history_used_history.xml | 166 +++++++++--------- 3 files changed, 208 insertions(+), 169 deletions(-) diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryScreen.kt index 9fa90ea..b2d7f09 100644 --- a/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryScreen.kt @@ -1,21 +1,30 @@ package org.sopt.teamdateroad.presentation.ui.pointhistory +import androidx.compose.foundation.Image import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -40,7 +49,6 @@ import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadOneButtonD import org.sopt.teamdateroad.presentation.ui.component.tabbar.DateRoadTabBar import org.sopt.teamdateroad.presentation.ui.component.tabbar.DateRoadTabTitle import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadEmptyView import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView @@ -204,12 +212,35 @@ fun PointHistoryScreen( PointHistoryTabType.USED_HISTORY -> pointHistoryUiState.pointHistory.used } if (pointHistory.isEmpty()) { - DateRoadEmptyView( - emptyViewType = when (pointHistoryUiState.pointHistoryTabType) { - PointHistoryTabType.USED_HISTORY -> EmptyViewType.POINT_HISTORY_USED_HISTORY - PointHistoryTabType.GAINED_HISTORY -> EmptyViewType.POINT_HISTORY_GAINED_HISTORY - } - ) + val emptyViewType = when (pointHistoryUiState.pointHistoryTabType) { + PointHistoryTabType.USED_HISTORY -> EmptyViewType.POINT_HISTORY_USED_HISTORY + PointHistoryTabType.GAINED_HISTORY -> EmptyViewType.POINT_HISTORY_GAINED_HISTORY + } + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + modifier = Modifier.fillMaxSize() + ) { + Image( + modifier = Modifier + .wrapContentHeight() + .fillMaxWidth(), + painter = painterResource(id = emptyViewType.imageRes), + contentDescription = null, + contentScale = ContentScale.FillWidth + ) + Spacer(modifier = Modifier.height(57.dp)) + Text( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp), + text = stringResource(id = emptyViewType.titleRes), + color = DateRoadTheme.colors.gray300, + style = DateRoadTheme.typography.titleBold18, + textAlign = TextAlign.Center + ) + Spacer(modifier = Modifier.height(20.dp)) + } } else { LazyColumn { items(pointHistory.size) { index -> 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 44d3f84..70288ff 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,85 +1,89 @@ - - - - - - - - - - - - - - - - - - - - - + android:viewportHeight="212"> + + + + + + + + + + + + + + + + + + + + + + + + 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 935a2f4..6f91cc6 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,85 +1,89 @@ - - - - - - - - - - - - - - - - - - - - - + android:viewportHeight="212"> + + + + + + + + + + + + + + + + + + + + + + + + From 341ee8721a80e05f7414c67d42004318b2755c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=B5=E1=86=AB?= =?UTF-8?q?=E1=84=8B=E1=85=AE?= Date: Mon, 12 May 2025 00:46:58 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=ED=83=9C=EA=B7=B8=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/teamdateroad/presentation/type/TagType.kt | 2 +- .../presentation/ui/component/card/DateRoadPlaceCard.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/type/TagType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TagType.kt index 438b1c9..8b55c34 100644 --- a/app/src/main/java/org/sopt/teamdateroad/presentation/type/TagType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TagType.kt @@ -104,7 +104,7 @@ enum class TagType( PLACE_CARD_TIME( backgroundColor = defaultDateRoadColors.gray200, contentColor = defaultDateRoadColors.black, - paddingHorizontal = 14, + paddingHorizontal = 0, paddingVertical = 5, textStyle = defaultDateRoadTypography.bodyMed13, roundedCornerShape = 10 diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadPlaceCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadPlaceCard.kt index 4a43b1c..f1fa731 100644 --- a/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadPlaceCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadPlaceCard.kt @@ -37,7 +37,7 @@ fun DateRoadPlaceCard( place: Place, onIconClick: (() -> Unit)? = null ) { - val paddingValues = Modifier.padding(start = placeCardType.startPadding, end = 17.dp) + val paddingValues = Modifier.padding(start = placeCardType.startPadding, end = 13.dp) Row( modifier = modifier @@ -75,7 +75,7 @@ fun DateRoadPlaceCard( Spacer(modifier = Modifier.width(10.dp)) DateRoadTextTag( - modifier = Modifier.width(74.dp), + modifier = Modifier.width(61.dp), textContent = place.duration, tagContentType = TagType.PLACE_CARD_TIME ) From ccb72fe9048b5aa3fd01b59100b9bb4a6ebb54ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=B5=E1=86=AB?= =?UTF-8?q?=E1=84=8B=E1=85=AE?= Date: Tue, 13 May 2025 00:17:31 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore=20:=20=EA=B5=AC=EA=B8=80=20=EA=B4=91?= =?UTF-8?q?=EA=B3=A0=20id=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android_cd.yml | 2 +- .github/workflows/android_ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android_cd.yml b/.github/workflows/android_cd.yml index 2cc5065..e03d7f1 100644 --- a/.github/workflows/android_cd.yml +++ b/.github/workflows/android_cd.yml @@ -52,7 +52,7 @@ jobs: KAKAO_NATIVE_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }} AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} GOOGLE_ADS_API_ID: ${{ secrets.GOOGLE_ADS_API_ID }} - GOOGLE_ADS_API_ID_MANIFEST: ${{ secrets.GOOGLE_ADS_API_ID }} + GOOGLE_ADS_API_ID_MANIFEST: ${{ secrets.GOOGLE_ADS_API_ID_MANIFEST }} run: | echo "dev.base.url=\"$HFM_BASE_URL\"" >> local.properties echo "kakao.native.app.key.manifest=\"$KAKAO_NATIVE_APP_KEY_MANIFEST\"" >> local.properties diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml index b24c778..bb65213 100644 --- a/.github/workflows/android_ci.yml +++ b/.github/workflows/android_ci.yml @@ -55,7 +55,7 @@ jobs: KAKAO_REST_API_KEY: ${{ secrets.KAKAO_REST_API_KEY }} AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} GOOGLE_ADS_API_ID: ${{ secrets.GOOGLE_ADS_API_ID }} - GOOGLE_ADS_API_ID_MANIFEST: ${{ secrets.GOOGLE_ADS_API_ID }} + GOOGLE_ADS_API_ID_MANIFEST: ${{ secrets.GOOGLE_ADS_API_ID_MANIFEST }} run: | echo "dev.base.url=\"$BASE_URL\"" >> local.properties echo "kakao.base.url=\"$KAKAO_BASE_URL\"" >> local.properties