From f0623adc74d71f41d1f04487b3f4e35f51f91794 Mon Sep 17 00:00:00 2001 From: jinukeu Date: Mon, 12 Feb 2024 19:53:29 +0900 Subject: [PATCH] =?UTF-8?q?feat/QA-53:=20=EC=9E=A5=EB=B6=80=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=ED=8E=B8=EC=A7=91=20=EC=8B=9C=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../received/ledgeredit/LedgerEditScreen.kt | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditScreen.kt b/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditScreen.kt index 0c1dc054..49f1593d 100644 --- a/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditScreen.kt +++ b/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditScreen.kt @@ -12,6 +12,8 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.runtime.Composable @@ -132,23 +134,20 @@ fun LedgerEditScreen( .background(SusuTheme.colorScheme.background15) .fillMaxSize(), ) { - Column( - modifier = Modifier - .background(SusuTheme.colorScheme.background15) - .fillMaxSize(), - ) { + Column { SusuDefaultAppBar( leftIcon = { BackIcon(onClickBack) }, ) - - Spacer(modifier = Modifier.size(23.dp)) - Column( modifier = Modifier + .verticalScroll(rememberScrollState()) + .weight(1f) .padding(horizontal = SusuTheme.spacing.spacing_m), ) { + Spacer(modifier = Modifier.size(23.dp)) + LedgerEditContainer( name = stringResource(id = com.susu.core.ui.R.string.word_event_name), verticalAlignment = Alignment.CenterVertically, @@ -270,21 +269,20 @@ fun LedgerEditScreen( }, ) } - } - SusuFilledButton( - modifier = Modifier - .align(Alignment.BottomCenter) - .fillMaxWidth() - .imePadding(), - shape = RectangleShape, - isActive = uiState.saveButtonEnabled, - isClickable = uiState.saveButtonEnabled, - color = FilledButtonColor.Black, - style = MediumButtonStyle.height60, - text = stringResource(id = com.susu.core.ui.R.string.word_save), - onClick = onClickSaveButton, - ) + SusuFilledButton( + modifier = Modifier + .fillMaxWidth() + .imePadding(), + shape = RectangleShape, + isActive = uiState.saveButtonEnabled, + isClickable = uiState.saveButtonEnabled, + color = FilledButtonColor.Black, + style = MediumButtonStyle.height60, + text = stringResource(id = com.susu.core.ui.R.string.word_save), + onClick = onClickSaveButton, + ) + } if (uiState.showStartDateBottomSheet) { SusuLimitDatePickerBottomSheet(