From 475e4f1a75fbc011ade838139f5bdf0a5eff4367 Mon Sep 17 00:00:00 2001 From: mangbaam Date: Fri, 1 Nov 2024 17:17:36 +0900 Subject: [PATCH] =?UTF-8?q?Boolti-325=20style:=20=EA=B3=B5=EC=97=B0=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=B6=9C=EC=97=B0=EC=A7=84=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=98=A4=EB=B2=84=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20?= =?UTF-8?q?=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/showdetail/ShowDetailScreen.kt | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 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 fef418f5..478b2798 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 @@ -3,6 +3,8 @@ package com.nexters.boolti.presentation.screen.showdetail import android.content.Intent import android.os.Build import androidx.activity.compose.BackHandler +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.LocalOverscrollConfiguration import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -37,6 +39,7 @@ import androidx.compose.material3.TabRowDefaults import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -506,6 +509,7 @@ private fun LazyListScope.ShowInfoTab( } } +@OptIn(ExperimentalFoundationApi::class) @Suppress("FunctionName") fun LazyListScope.CastTab( teams: List, @@ -553,14 +557,19 @@ fun LazyListScope.CastTab( * 중첩 Lazy 레이아웃 처리를 위해 높이 고정 필요 */ val gridHeight = memberHeight * rows + spacedBySize * (rows - 1) - LazyVerticalGrid( - modifier = Modifier.height(gridHeight), - columns = GridCells.Fixed(spanCount), - verticalArrangement = Arrangement.spacedBy(spacedBySize), - horizontalArrangement = Arrangement.spacedBy(16.dp), - ) { - items(team.members) { member -> - Cast(memberHeight, member, onClick = { onClickMember(member.userCode) }) + CompositionLocalProvider(LocalOverscrollConfiguration provides null) { + LazyVerticalGrid( + modifier = Modifier.height(gridHeight), + columns = GridCells.Fixed(spanCount), + verticalArrangement = Arrangement.spacedBy(spacedBySize), + horizontalArrangement = Arrangement.spacedBy(16.dp), + ) { + items(team.members) { member -> + Cast( + memberHeight, + member, + onClick = { onClickMember(member.userCode) }) + } } } }