diff --git a/app/src/main/java/com/kongjak/koreatechboard/ui/components/dialog/BasicDialog.kt b/app/src/main/java/com/kongjak/koreatechboard/ui/components/dialog/BasicDialog.kt index 583b4647..f025acbf 100644 --- a/app/src/main/java/com/kongjak/koreatechboard/ui/components/dialog/BasicDialog.kt +++ b/app/src/main/java/com/kongjak/koreatechboard/ui/components/dialog/BasicDialog.kt @@ -29,7 +29,7 @@ fun BasicDialog( Surface( modifier = Modifier .fillMaxWidth(), - shape = RoundedCornerShape(16) + shape = RoundedCornerShape(16.dp) ) { Box(modifier = modifier.padding(16.dp)) { content() @@ -49,7 +49,7 @@ fun BasicDialog( Surface( modifier = Modifier .fillMaxWidth(), - shape = RoundedCornerShape(16) + shape = RoundedCornerShape(16.dp) ) { Column( modifier = modifier.padding(vertical = 16.dp, horizontal = 32.dp) @@ -79,7 +79,7 @@ fun BasicDialog( Surface( modifier = Modifier .fillMaxWidth(), - shape = RoundedCornerShape(16) + shape = RoundedCornerShape(16.dp) ) { Column( modifier = modifier.padding(vertical = 16.dp, horizontal = 32.dp) @@ -118,7 +118,7 @@ fun BasicDialog( Surface( modifier = Modifier .fillMaxWidth(), - shape = RoundedCornerShape(16) + shape = RoundedCornerShape(16.dp) ) { Column( modifier = modifier.padding(vertical = 16.dp, horizontal = 32.dp) diff --git a/app/src/main/java/com/kongjak/koreatechboard/ui/components/preference/PreferenceColumn.kt b/app/src/main/java/com/kongjak/koreatechboard/ui/components/preference/PreferenceColumn.kt index 67532155..cac3b4f2 100644 --- a/app/src/main/java/com/kongjak/koreatechboard/ui/components/preference/PreferenceColumn.kt +++ b/app/src/main/java/com/kongjak/koreatechboard/ui/components/preference/PreferenceColumn.kt @@ -3,6 +3,7 @@ package com.kongjak.koreatechboard.ui.components.preference import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Card import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -19,7 +20,8 @@ fun PreferenceColumn( Card( modifier = Modifier .fillMaxWidth() - .padding(8.dp) + .padding(8.dp), + shape = RoundedCornerShape(16.dp) ) { Column( modifier = Modifier @@ -39,7 +41,8 @@ fun PreferenceColumn( Card( modifier = Modifier .fillMaxWidth() - .padding(8.dp) + .padding(8.dp), + shape = RoundedCornerShape(16.dp) ) { Column( modifier = Modifier diff --git a/app/src/main/java/com/kongjak/koreatechboard/ui/main/board/Board.kt b/app/src/main/java/com/kongjak/koreatechboard/ui/main/board/Board.kt index 1b1fe430..7d26363d 100644 --- a/app/src/main/java/com/kongjak/koreatechboard/ui/main/board/Board.kt +++ b/app/src/main/java/com/kongjak/koreatechboard/ui/main/board/Board.kt @@ -19,6 +19,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Search import androidx.compose.material3.BottomSheetScaffold @@ -106,6 +107,7 @@ fun BottomSheetScaffold( BottomSheetScaffold( scaffoldState = scaffoldState, + sheetShape = RoundedCornerShape(16.dp), sheetPeekHeight = 64.dp, sheetContent = { LazyColumn { @@ -413,6 +415,7 @@ fun SearchFAB(department: Department, index: Int) { val context = LocalContext.current FloatingActionButton( + shape = RoundedCornerShape(16.dp), onClick = { showDialog = true } diff --git a/app/src/main/java/com/kongjak/koreatechboard/ui/main/home/Home.kt b/app/src/main/java/com/kongjak/koreatechboard/ui/main/home/Home.kt index 177d24aa..8d2fab44 100644 --- a/app/src/main/java/com/kongjak/koreatechboard/ui/main/home/Home.kt +++ b/app/src/main/java/com/kongjak/koreatechboard/ui/main/home/Home.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button import androidx.compose.material3.Card @@ -99,7 +100,8 @@ fun BoardInHome( Card( modifier = Modifier .fillMaxWidth() - .padding(8.dp) + .padding(8.dp), + shape = RoundedCornerShape(16.dp) ) { Column( modifier = Modifier