From 6c51a91b6831ff4f5e62ef5a716f2896a8f31e9b Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Wed, 15 May 2024 22:54:39 +0900 Subject: [PATCH] =?UTF-8?q?[delete]=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20import?= =?UTF-8?q?=EB=AC=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/dummy/View1Screen.kt | 35 ++++++++----------- .../main/java/org/sopt/kream/theme/Theme.kt | 4 +-- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/org/sopt/kream/presentation/ui/dummy/View1Screen.kt b/app/src/main/java/org/sopt/kream/presentation/ui/dummy/View1Screen.kt index 3ae6b65..67ad53e 100644 --- a/app/src/main/java/org/sopt/kream/presentation/ui/dummy/View1Screen.kt +++ b/app/src/main/java/org/sopt/kream/presentation/ui/dummy/View1Screen.kt @@ -5,10 +5,8 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -18,6 +16,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.PagerState import androidx.compose.foundation.pager.rememberPagerState +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon @@ -27,7 +26,6 @@ import androidx.compose.material3.Tab import androidx.compose.material3.TabRowDefaults import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset import androidx.compose.material3.Text -import androidx.compose.material3.minimumInteractiveComponentSize import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -37,7 +35,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview @@ -48,15 +45,12 @@ import org.sopt.kream.theme.Black01 import org.sopt.kream.theme.Black02 import org.sopt.kream.theme.Black09 import org.sopt.kream.theme.Gray06 -import org.sopt.kream.theme.PinkColor -import org.sopt.kream.theme.body2Regular import org.sopt.kream.theme.body3SemiBold import org.sopt.kream.theme.body5Regular import org.sopt.kream.theme.head1Bold val pages = listOf("추천", "랭킹", "발매정보", "럭셔리", "남성", "여성", "발견") - @OptIn(ExperimentalFoundationApi::class) @Preview @Composable @@ -83,10 +77,10 @@ fun View1Screen() { onValueChange = { editText = it }, singleLine = true, modifier = - Modifier - .weight(1f) - .size(width = 293.dp, height = 33.dp) - .background(color = Gray06, shape = RectangleShape), + Modifier + .weight(1f) + .size(width = 293.dp, height = 33.dp) + .background(color = Gray06, shape = RoundedCornerShape(9.dp)), decorationBox = { innerTextField -> Box( contentAlignment = Alignment.CenterStart, @@ -112,7 +106,7 @@ fun View1Screen() { ) Spacer(modifier = Modifier.width(11.dp)) } - CustomTabPager(pagerState, pages) + CustomTabPager(pagerState, pages) } }, ) { innerPadding -> @@ -132,16 +126,17 @@ fun CustomTabPager( selectedTabIndex = pagerState.currentPage, indicator = { tabPositions -> TabRowDefaults.SecondaryIndicator( - modifier = Modifier - .tabIndicatorOffset(tabPositions[pagerState.currentPage]) - .width(10.dp), + modifier = + Modifier + .tabIndicatorOffset(tabPositions[pagerState.currentPage]) + .width(10.dp), color = Black02, ) }, containerColor = Color.White, contentColor = Black02, edgePadding = 0.dp, - modifier = Modifier.padding(0.dp) + modifier = Modifier.padding(0.dp), ) { // Text(text = "서재패Md", style = body3SemiBold, color = PinkColor) tabs.forEachIndexed { index, title -> @@ -153,7 +148,7 @@ fun CustomTabPager( pagerState.animateScrollToPage(index) } }, - modifier = Modifier.width(0.dp) + modifier = Modifier.width(0.dp), ) } } @@ -170,9 +165,9 @@ fun CustomTabPager( ) { page -> Column( modifier = - Modifier - .fillMaxSize() - .background(Color.White), + Modifier + .fillMaxSize() + .background(Color.White), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) { diff --git a/app/src/main/java/org/sopt/kream/theme/Theme.kt b/app/src/main/java/org/sopt/kream/theme/Theme.kt index 64f4d34..2b3430d 100644 --- a/app/src/main/java/org/sopt/kream/theme/Theme.kt +++ b/app/src/main/java/org/sopt/kream/theme/Theme.kt @@ -20,7 +20,7 @@ private val DarkColorScheme = primary = White, secondary = White, tertiary = White, - background = White + background = White, ) private val LightColorScheme = @@ -28,7 +28,7 @@ private val LightColorScheme = primary = White, secondary = White, tertiary = White, - background = White + background = White, /* Other default colors to override background = Color(0xFFFFFBFE), surface = Color(0xFFFFFBFE),