From a3d3e63bad8c4ad699e8a2dd79eba3a1c57db1de Mon Sep 17 00:00:00 2001 From: mangbaam Date: Thu, 10 Oct 2024 13:31:52 +0900 Subject: [PATCH 1/3] =?UTF-8?q?QA1.7.0=20=EC=B6=9C=EC=97=B0=EC=A7=84=20?= =?UTF-8?q?=EB=8B=89=EB=84=A4=EC=9E=84=201=EC=A4=84=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boolti/presentation/screen/showdetail/ShowDetailScreen.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt index fc209115..c73bda7b 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt @@ -674,6 +674,8 @@ private fun Cast( text = member.nickname, style = MaterialTheme.typography.bodyLarge, color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis, ) Text( text = member.roleName, From d5446589367b1b243462e74155d464e26c11c17e Mon Sep 17 00:00:00 2001 From: mangbaam Date: Thu, 10 Oct 2024 13:58:32 +0900 Subject: [PATCH 2/3] =?UTF-8?q?QA1.7.0=20=EC=B6=9C=EC=97=B0=EC=A7=84=20?= =?UTF-8?q?=EC=84=B9=EC=85=98=20=EA=B0=84=EA=B2=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/screen/showdetail/ShowDetailScreen.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt index c73bda7b..fef418f5 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt @@ -416,7 +416,7 @@ private fun LazyListScope.ShowInfoTab( val formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd (${daysOfWeek[indexOfDay]}) / HH:mm (${showDetail.runningTime}${minute})") Section( - modifier = paddingModifier, + modifier = paddingModifier.padding(top = 8.dp), title = { SectionTitle(stringResource(id = R.string.ticketing_datetime)) }, content = { SectionContent(text = showDetail.date.format(formatter)) }, ) @@ -537,11 +537,12 @@ fun LazyListScope.CastTab( } } else { itemsIndexed(teams) { index, team -> - if (index > 0) Divider(paddingModifier) else Spacer(modifier = Modifier.size(8.dp)) + if (index > 0) Divider(paddingModifier) else Spacer(modifier = Modifier.size(16.dp)) Section( modifier = paddingModifier, title = { SectionTitle(title = team.teamName) }, - space = 20.dp, + space = if (team.members.isNotEmpty()) 20.dp else 0.dp, + paddingVertical = 24.dp, content = { val spacedBySize = 20.dp val memberHeight = 46.dp @@ -603,9 +604,10 @@ private fun Section( title: @Composable () -> Unit, content: @Composable () -> Unit, modifier: Modifier = Modifier, + paddingVertical: Dp = 32.dp, space: Dp = 16.dp, ) { - Column(modifier.padding(top = 40.dp, bottom = 32.dp)) { + Column(modifier.padding(vertical = paddingVertical)) { title() Spacer(modifier = Modifier.height(space)) content() From 82eed464a9f88ed5c1ea6cc397731e6a6084700a Mon Sep 17 00:00:00 2001 From: mangbaam Date: Thu, 10 Oct 2024 22:27:23 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=EB=B2=84=EC=A0=84=20=EC=97=85=20(?= =?UTF-8?q?1.7.0,=2021)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 31df883d..5bcb7c0c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] minSdk = "26" targetSdk = "34" -versionCode = "20" -versionName = "1.6.6" +versionCode = "21" +versionName = "1.7.0" packageName = "com.nexters.boolti" compileSdk = "34" targetJvm = "17"