From b37ffcdcdf82a4ee677601d94b3ad9dc25128773 Mon Sep 17 00:00:00 2001 From: jjwm10625 Date: Wed, 19 Feb 2025 02:44:01 +0900 Subject: [PATCH 1/9] =?UTF-8?q?[REFACTOR]=20=EC=9A=94=EC=9D=BC,=20?= =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EB=B6=88=EC=9D=BC=EC=B9=98=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0=20+=20=EC=9D=BC=EC=9A=94?= =?UTF-8?q?=EC=9D=BC=EC=9D=84=20=EC=8B=9C=EC=9E=91=20=EC=9A=94=EC=9D=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/calendar/Calendar.kt | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt b/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt index 2e0fe57..a18f6b4 100644 --- a/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt +++ b/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt @@ -33,9 +33,11 @@ import com.gdg.core.designsystem.theme.CrowdZeroAndroidTheme import com.gdg.core.designsystem.theme.CrowdZeroTheme import com.gdg.core.extension.noRippleClickable import com.gdg.core.util.getDaysForMonth -import okhttp3.internal.immutableListOf +import java.time.DayOfWeek import java.time.LocalDate import java.time.YearMonth +import java.time.format.TextStyle +import java.util.Locale @Composable fun CalendarComponent( @@ -45,6 +47,7 @@ fun CalendarComponent( onDateSelected: (LocalDate) -> Unit, ) { val days = remember(currentMonth) { getDaysForMonth(currentMonth) } + val firstDayOfWeek = DayOfWeek.SUNDAY // 일요일을 주의 시작으로 변경 Column( modifier = Modifier @@ -93,7 +96,17 @@ fun CalendarComponent( modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceAround ) { - immutableListOf("일", "월", "화", "수", "목", "금", "토").forEach { day -> + val weekDays = listOf( + DayOfWeek.SUNDAY, + DayOfWeek.MONDAY, + DayOfWeek.TUESDAY, + DayOfWeek.WEDNESDAY, + DayOfWeek.THURSDAY, + DayOfWeek.FRIDAY, + DayOfWeek.SATURDAY + ) + weekDays.forEach { dayOfWeek -> + val day = dayOfWeek.getDisplayName(TextStyle.SHORT, Locale.KOREAN) Text( text = day, style = CrowdZeroTheme.typography.c2Medium2, @@ -106,11 +119,14 @@ fun CalendarComponent( columns = GridCells.Fixed(7), modifier = Modifier.fillMaxWidth() ) { + val emptyDays = (days.first().dayOfWeek.value % 7 - firstDayOfWeek.value + 7) % 7 + items(emptyDays) { + Box(modifier = Modifier.aspectRatio(1f)) + } items(days) { date -> val isSelected = date == selectedDate Box( modifier = Modifier - .weight(1f) .aspectRatio(1f) .padding(5.dp) .background( From 81c914c114e8cb94f304e520a388e8450ef4da87 Mon Sep 17 00:00:00 2001 From: jjwm10625 Date: Wed, 19 Feb 2025 04:25:35 +0900 Subject: [PATCH 2/9] =?UTF-8?q?[REFACTOR]=20=EC=A7=91=ED=9A=8C=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20-=20?= =?UTF-8?q?=EA=B8=B4=20=EB=AC=B8=EA=B5=AC=20=EB=8B=A8=EC=9C=84=EB=A1=9C=20?= =?UTF-8?q?=EC=A4=84=EB=B0=94=EA=BF=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gdg/core/designsystem/component/calendar/Calendar.kt | 2 +- feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt b/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt index a18f6b4..4106c4f 100644 --- a/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt +++ b/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt @@ -158,4 +158,4 @@ fun CalendarComponentPreview() { onDateSelected = {} ) } -} +} \ No newline at end of file diff --git a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt index 9724626..f36f45f 100644 --- a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt +++ b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt @@ -235,7 +235,7 @@ fun CalendarInfoBox(data: ScheduleEntity) { ) { Text( modifier = Modifier.padding(end = 8.dp), - text = data.location, + text = data.location.chunked(45).joinToString("\n"), // 긴 문구 단어 단위로 줄바꿈 style = CrowdZeroTheme.typography.h5Bold, color = CrowdZeroTheme.colors.gray900 ) From ff17f9632b98fb05dce4b797d78e36b8d4faf9df Mon Sep 17 00:00:00 2001 From: jjwm10625 Date: Wed, 19 Feb 2025 14:03:40 +0900 Subject: [PATCH 3/9] =?UTF-8?q?[REFACTOR]=20=EC=A7=91=ED=9A=8C=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20-=20?= =?UTF-8?q?=EA=B4=80=ED=95=A0=EC=8B=9C=20=EA=B0=80=EB=A1=9C=20=EB=B0=B0?= =?UTF-8?q?=EC=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/gdg/feature/calendar/CalendarRoute.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt index f36f45f..73e212d 100644 --- a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt +++ b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt @@ -274,7 +274,7 @@ fun CalendarInfoBox(data: ScheduleEntity) { color = CrowdZeroTheme.colors.gray600 ) Text( - text = data.jurisdiction, + text = data.jurisdiction.split("\n").joinToString(" "), // 세로 배열을 가로 배열로 변경 style = CrowdZeroTheme.typography.c3Regular, color = CrowdZeroTheme.colors.gray800 ) @@ -282,6 +282,7 @@ fun CalendarInfoBox(data: ScheduleEntity) { } } + @Preview(showBackground = true) @Composable fun CalendarScreenPreview() { From 45d1673d8663f057b6ec254e7570bb76d9db5677 Mon Sep 17 00:00:00 2001 From: jjwm10625 Date: Wed, 19 Feb 2025 14:06:59 +0900 Subject: [PATCH 4/9] =?UTF-8?q?[REFACTOR]=20=EC=A7=91=ED=9A=8C=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20-=20?= =?UTF-8?q?=EA=B4=80=ED=95=A0=EC=8B=9C=20=EC=82=AC=EC=9D=B4=20=EC=89=BC?= =?UTF-8?q?=ED=91=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt index 73e212d..e55d8fb 100644 --- a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt +++ b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt @@ -274,7 +274,7 @@ fun CalendarInfoBox(data: ScheduleEntity) { color = CrowdZeroTheme.colors.gray600 ) Text( - text = data.jurisdiction.split("\n").joinToString(" "), // 세로 배열을 가로 배열로 변경 + text = data.jurisdiction.split("\n").joinToString(", "), // 세로 배열을 가로 배열로 변경 style = CrowdZeroTheme.typography.c3Regular, color = CrowdZeroTheme.colors.gray800 ) From c2f8d0ca1429ee7e80aea4fa6ddb0f2d3d7c111e Mon Sep 17 00:00:00 2001 From: jjwm10625 Date: Wed, 19 Feb 2025 14:09:52 +0900 Subject: [PATCH 5/9] =?UTF-8?q?[REFACTOR]=20=EC=A7=91=ED=9A=8C=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20-=20?= =?UTF-8?q?=EC=89=BC=ED=91=9C=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20=EC=B6=94?= =?UTF-8?q?=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt | 2 +- feature/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt index e55d8fb..ec395a0 100644 --- a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt +++ b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt @@ -274,7 +274,7 @@ fun CalendarInfoBox(data: ScheduleEntity) { color = CrowdZeroTheme.colors.gray600 ) Text( - text = data.jurisdiction.split("\n").joinToString(", "), // 세로 배열을 가로 배열로 변경 + text = data.jurisdiction.split("\n").joinToString(stringResource(R.string.calendar_jurisdiction_rest)), style = CrowdZeroTheme.typography.c3Regular, color = CrowdZeroTheme.colors.gray800 ) diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml index bd87730..e494eea 100644 --- a/feature/src/main/res/values/strings.xml +++ b/feature/src/main/res/values/strings.xml @@ -53,6 +53,7 @@ %1$s명 / 관할시 + ", " 해당 날짜의 집회 정보가 없습니다 해당 날짜의 집회 정보를 가져오지 못했어요 혼잡도 api 오류 : %1$s From a21796bc6924a99989a1f7d47747bc1079931ff3 Mon Sep 17 00:00:00 2001 From: jjwm10625 Date: Wed, 19 Feb 2025 19:40:30 +0900 Subject: [PATCH 6/9] =?UTF-8?q?[REFACTOR]=20=EC=A7=91=ED=9A=8C=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20-=20?= =?UTF-8?q?=EC=A4=84=EB=B0=94=EA=BF=88,=20=EB=9D=84=EC=96=B4=EC=93=B0?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/build.gradle.kts | 1 + .../gdg/core/designsystem/component/calendar/Calendar.kt | 3 ++- .../main/java/com/gdg/feature/calendar/CalendarRoute.kt | 9 ++++++--- gradle/libs.versions.toml | 2 ++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 58ff077..2fd3f7d 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -49,6 +49,7 @@ dependencies { implementation(libs.core.ktx) implementation(libs.material) implementation(libs.activity.compose) + implementation(libs.androidx.runtime.android) // Test testImplementation(libs.junit) diff --git a/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt b/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt index 4106c4f..d84b937 100644 --- a/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt +++ b/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt @@ -33,6 +33,7 @@ import com.gdg.core.designsystem.theme.CrowdZeroAndroidTheme import com.gdg.core.designsystem.theme.CrowdZeroTheme import com.gdg.core.extension.noRippleClickable import com.gdg.core.util.getDaysForMonth +import okhttp3.internal.immutableListOf import java.time.DayOfWeek import java.time.LocalDate import java.time.YearMonth @@ -96,7 +97,7 @@ fun CalendarComponent( modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceAround ) { - val weekDays = listOf( + val weekDays = immutableListOf( DayOfWeek.SUNDAY, DayOfWeek.MONDAY, DayOfWeek.TUESDAY, diff --git a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt index ec395a0..4194f4e 100644 --- a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt +++ b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt @@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBarsPadding +import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape @@ -234,12 +235,14 @@ fun CalendarInfoBox(data: ScheduleEntity) { verticalAlignment = Alignment.CenterVertically ) { Text( - modifier = Modifier.padding(end = 8.dp), - text = data.location.chunked(45).joinToString("\n"), // 긴 문구 단어 단위로 줄바꿈 + modifier = Modifier.padding(end = 8.dp) + .weight(1f), + text = data.location.replace("\n", " "), style = CrowdZeroTheme.typography.h5Bold, color = CrowdZeroTheme.colors.gray900 ) Text( + modifier = Modifier.wrapContentSize(), text = data.region, style = CrowdZeroTheme.typography.c4SemiBold, color = CrowdZeroTheme.colors.gray600 @@ -274,7 +277,7 @@ fun CalendarInfoBox(data: ScheduleEntity) { color = CrowdZeroTheme.colors.gray600 ) Text( - text = data.jurisdiction.split("\n").joinToString(stringResource(R.string.calendar_jurisdiction_rest)), + text = data.jurisdiction.replace("\n", " "), style = CrowdZeroTheme.typography.c3Regular, color = CrowdZeroTheme.colors.gray800 ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75419ae..33ba6ef 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -81,6 +81,7 @@ material = "1.12.0" naver-map-compose = "1.7.2" naver-map-location = "21.0.2" play-services-location = "21.0.1" +runtimeAndroid = "1.7.2" [plugins] @@ -186,6 +187,7 @@ material = { group = "com.google.android.material", name = "material", version.r android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle-plugin" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } compose-compiler-gradle-plugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" } +androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" } [bundles] retrofit = ["retrofit-core", "retrofit-kotlin-serialization", "okhttp-logging"] From d4b220cf9b5f5c7c0923a04d83e639718bff968a Mon Sep 17 00:00:00 2001 From: jjwm10625 Date: Thu, 20 Feb 2025 10:45:18 +0900 Subject: [PATCH 7/9] =?UTF-8?q?[REFACTOR]=20=EC=A7=91=ED=9A=8C=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20-=20?= =?UTF-8?q?=EC=A4=84=EB=B0=94=EA=BF=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gdg/feature/calendar/CalendarRoute.kt | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt index 4194f4e..c6599cf 100644 --- a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt +++ b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape @@ -228,26 +229,32 @@ fun CalendarInfoBox(data: ScheduleEntity) { style = CrowdZeroTheme.typography.c4SemiBold, color = CrowdZeroTheme.colors.green600 ) + + var isMultiline by remember { mutableStateOf(false) } + Row( - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 2.dp), + modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically ) { Text( - modifier = Modifier.padding(end = 8.dp) - .weight(1f), text = data.location.replace("\n", " "), style = CrowdZeroTheme.typography.h5Bold, - color = CrowdZeroTheme.colors.gray900 + color = CrowdZeroTheme.colors.gray900, + modifier = Modifier + .padding(end = 8.dp) + .then(if (isMultiline) Modifier.weight(1f) else Modifier.wrapContentWidth()), + onTextLayout = { textLayoutResult -> + isMultiline = textLayoutResult.lineCount > 1 + } ) Text( - modifier = Modifier.wrapContentSize(), text = data.region, style = CrowdZeroTheme.typography.c4SemiBold, - color = CrowdZeroTheme.colors.gray600 + color = CrowdZeroTheme.colors.gray600, + modifier = Modifier.wrapContentWidth() ) } + Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically @@ -286,6 +293,7 @@ fun CalendarInfoBox(data: ScheduleEntity) { } + @Preview(showBackground = true) @Composable fun CalendarScreenPreview() { @@ -300,7 +308,15 @@ fun CalendarScreenPreview() { region = "한남동", people = "3000", jurisdiction = "용산" - ) + ), + ScheduleEntity( + date = LocalDate.now().toString(), + duration = "07:30 ~ 24:00", + location = "두터교회 앞 인도 및 2개 차로두터교회 앞 인도 및 2개 차로두터교회 앞 인도 및 2개 차로", + region = "한남동", + people = "3000", + jurisdiction = "용산" + ) ) ), selectedDate = LocalDate.now(), From 0bf7f20613ddf006f6f502656ba89169e97d6495 Mon Sep 17 00:00:00 2001 From: jjwm10625 Date: Thu, 20 Feb 2025 14:14:45 +0900 Subject: [PATCH 8/9] =?UTF-8?q?[REFACTOR]=20=EC=A7=91=ED=9A=8C=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20-=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gdg/feature/calendar/CalendarRoute.kt | 55 +++++++++---------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt index c6599cf..146b6eb 100644 --- a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt +++ b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt @@ -15,8 +15,6 @@ import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBarsPadding -import androidx.compose.foundation.layout.wrapContentSize -import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape @@ -224,37 +222,35 @@ fun CalendarInfoBox(data: ScheduleEntity) { .background(CrowdZeroTheme.colors.white) .padding(dimensionResource(R.dimen.default_padding)) ) { - Text( - text = data.duration, - style = CrowdZeroTheme.typography.c4SemiBold, - color = CrowdZeroTheme.colors.green600 - ) - - var isMultiline by remember { mutableStateOf(false) } - Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically ) { Text( - text = data.location.replace("\n", " "), - style = CrowdZeroTheme.typography.h5Bold, - color = CrowdZeroTheme.colors.gray900, - modifier = Modifier - .padding(end = 8.dp) - .then(if (isMultiline) Modifier.weight(1f) else Modifier.wrapContentWidth()), - onTextLayout = { textLayoutResult -> - isMultiline = textLayoutResult.lineCount > 1 - } + modifier = Modifier.padding(end = 8.dp), + text = data.duration, + style = CrowdZeroTheme.typography.c4SemiBold, + color = CrowdZeroTheme.colors.green600 ) Text( text = data.region, style = CrowdZeroTheme.typography.c4SemiBold, - color = CrowdZeroTheme.colors.gray600, - modifier = Modifier.wrapContentWidth() + color = CrowdZeroTheme.colors.white, + modifier = Modifier + .background( + color = CrowdZeroTheme.colors.green600, + shape = RoundedCornerShape(30.dp) + ) + .padding(horizontal = 8.dp, vertical = 3.dp) ) } + Text( + text = data.location.replace("\n", " "), + style = CrowdZeroTheme.typography.h5Bold, + color = CrowdZeroTheme.colors.gray900 + ) + Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically @@ -293,7 +289,6 @@ fun CalendarInfoBox(data: ScheduleEntity) { } - @Preview(showBackground = true) @Composable fun CalendarScreenPreview() { @@ -309,14 +304,14 @@ fun CalendarScreenPreview() { people = "3000", jurisdiction = "용산" ), - ScheduleEntity( - date = LocalDate.now().toString(), - duration = "07:30 ~ 24:00", - location = "두터교회 앞 인도 및 2개 차로두터교회 앞 인도 및 2개 차로두터교회 앞 인도 및 2개 차로", - region = "한남동", - people = "3000", - jurisdiction = "용산" - ) + ScheduleEntity( + date = LocalDate.now().toString(), + duration = "07:30 ~ 24:00", + location = "두터교회 앞 인도 및 2개 차로두터교회 앞 인도 및 2개 차로두터교회 앞 인도 및 2개 차로", + region = "한남동", + people = "3000", + jurisdiction = "용산" + ) ) ), selectedDate = LocalDate.now(), From d8227788e907caadb4c3c3e765015d20a0de813d Mon Sep 17 00:00:00 2001 From: gaeulzzang Date: Thu, 20 Feb 2025 14:56:11 +0900 Subject: [PATCH 9/9] =?UTF-8?q?#23=20[DEL]=20runtime=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/build.gradle.kts | 1 - .../com/gdg/core/designsystem/component/calendar/Calendar.kt | 2 +- .../src/main/java/com/gdg/feature/calendar/CalendarRoute.kt | 5 +---- gradle/libs.versions.toml | 3 --- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 2fd3f7d..58ff077 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -49,7 +49,6 @@ dependencies { implementation(libs.core.ktx) implementation(libs.material) implementation(libs.activity.compose) - implementation(libs.androidx.runtime.android) // Test testImplementation(libs.junit) diff --git a/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt b/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt index d84b937..41a2679 100644 --- a/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt +++ b/core/src/main/java/com/gdg/core/designsystem/component/calendar/Calendar.kt @@ -159,4 +159,4 @@ fun CalendarComponentPreview() { onDateSelected = {} ) } -} \ No newline at end of file +} diff --git a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt index 146b6eb..16c687c 100644 --- a/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt +++ b/feature/src/main/java/com/gdg/feature/calendar/CalendarRoute.kt @@ -244,13 +244,11 @@ fun CalendarInfoBox(data: ScheduleEntity) { .padding(horizontal = 8.dp, vertical = 3.dp) ) } - Text( text = data.location.replace("\n", " "), style = CrowdZeroTheme.typography.h5Bold, color = CrowdZeroTheme.colors.gray900 ) - Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically @@ -288,7 +286,6 @@ fun CalendarInfoBox(data: ScheduleEntity) { } } - @Preview(showBackground = true) @Composable fun CalendarScreenPreview() { @@ -318,4 +315,4 @@ fun CalendarScreenPreview() { onDateSelected = {} ) } -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 33ba6ef..77c7302 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -81,8 +81,6 @@ material = "1.12.0" naver-map-compose = "1.7.2" naver-map-location = "21.0.2" play-services-location = "21.0.1" -runtimeAndroid = "1.7.2" - [plugins] ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } # Kotlin Symbol Processing (KSP) 플러그인 @@ -187,7 +185,6 @@ material = { group = "com.google.android.material", name = "material", version.r android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle-plugin" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } compose-compiler-gradle-plugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" } -androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" } [bundles] retrofit = ["retrofit-core", "retrofit-kotlin-serialization", "okhttp-logging"]