Merge pull request #306 from Nexters/qa/v1.7.0

Qa/v1.7.0
Nexters · Oct 10, 2024 · 3ad915d · 3ad915d
2 parents 85c2587 + 82eed46
commit 3ad915d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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"

diff --git a/...ation/src/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailScreen.kt b/...ation/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()
@@ -674,6 +676,8 @@ private fun Cast(
                 text = member.nickname,
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onBackground,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
             )
             Text(
                 text = member.roleName,