From 3258a69e6065f2cfb6a96454958d611ed434bd6b Mon Sep 17 00:00:00 2001 From: rladmsdh Date: Sat, 17 Jun 2023 23:54:39 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20::=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=A7=A4=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/schedule/WriteScheduleScreen.kt | 75 ++++++++++--------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/com/xquare/xquare_android/feature/schedule/WriteScheduleScreen.kt b/app/src/main/java/com/xquare/xquare_android/feature/schedule/WriteScheduleScreen.kt index 3a95caf4..b658c6c7 100644 --- a/app/src/main/java/com/xquare/xquare_android/feature/schedule/WriteScheduleScreen.kt +++ b/app/src/main/java/com/xquare/xquare_android/feature/schedule/WriteScheduleScreen.kt @@ -93,44 +93,45 @@ fun WriteScheduleContent( var timerModalState by remember { mutableStateOf(false) } val btnEnabled = name.length > 1 && date.isNotEmpty() - Header( - painter = painterResource(id = R.drawable.ic_back), - title = "일정 작성", - btnText = "등록", - btnEnabled = btnEnabled, - onIconClick = onIconClick, - onBtnClick = { onBtnClick(name, date) } - ) - Column( - modifier = Modifier - .padding(horizontal = 16.dp) - .fillMaxSize() - .padding(top = DevicePaddings.statusBarHeightDp.dp) - ) { - Spacer(modifier = Modifier.height(32.dp)) - HighlightedText(text = "일정제목") - Spacer(modifier = Modifier.height(8.dp)) - TextField( - text = name, - onTextChange = { name = it }, - placeholder = "최소 2자 이상" + Column(modifier = Modifier.padding(top = DevicePaddings.statusBarHeightDp.dp)) { + Header( + painter = painterResource(id = R.drawable.ic_back), + title = "일정 작성", + btnText = "등록", + btnEnabled = btnEnabled, + onIconClick = onIconClick, + onBtnClick = { onBtnClick(name, date) } ) - Spacer(modifier = Modifier.height(20.dp)) - HighlightedText(text = "날짜 선택") - Spacer(modifier = Modifier.height(8.dp)) - TextFieldBtn(text = date, placeholder = "날짜를 선택해주세요") { - timerModalState = true - } - if (timerModalState) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - DatePickerModal( - defaultDate = date, - onCancel = { timerModalState = false }, - onConfirm = { - date = it - timerModalState = false - } - ) + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 16.dp) + ) { + Spacer(modifier = Modifier.height(32.dp)) + HighlightedText(text = "일정제목") + Spacer(modifier = Modifier.height(8.dp)) + TextField( + text = name, + onTextChange = { name = it }, + placeholder = "최소 2자 이상" + ) + Spacer(modifier = Modifier.height(20.dp)) + HighlightedText(text = "날짜 선택") + Spacer(modifier = Modifier.height(8.dp)) + TextFieldBtn(text = date, placeholder = "날짜를 선택해주세요") { + timerModalState = true + } + if (timerModalState) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + DatePickerModal( + defaultDate = date, + onCancel = { timerModalState = false }, + onConfirm = { + date = it + timerModalState = false + } + ) + } } } } From c4d3770b02c69b16be07c133e86f1b2dfeefd6da Mon Sep 17 00:00:00 2001 From: rladmsdh Date: Sun, 18 Jun 2023 13:56:50 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80,=EB=B2=84=ED=8A=BC=ED=85=8D=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xquare_android/feature/schedule/WriteScheduleScreen.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/xquare/xquare_android/feature/schedule/WriteScheduleScreen.kt b/app/src/main/java/com/xquare/xquare_android/feature/schedule/WriteScheduleScreen.kt index b658c6c7..3c60a2ff 100644 --- a/app/src/main/java/com/xquare/xquare_android/feature/schedule/WriteScheduleScreen.kt +++ b/app/src/main/java/com/xquare/xquare_android/feature/schedule/WriteScheduleScreen.kt @@ -90,14 +90,16 @@ fun WriteScheduleContent( ) { var name by remember { mutableStateOf(schedulesData?.name ?: "") } var date by remember { mutableStateOf(schedulesData?.date?:"") } + val title by remember { mutableStateOf(if (schedulesData == null) "일정 작성" else "일정 수정") } + val btnText by remember { mutableStateOf(if (schedulesData == null) "등록" else "수정") } var timerModalState by remember { mutableStateOf(false) } val btnEnabled = name.length > 1 && date.isNotEmpty() Column(modifier = Modifier.padding(top = DevicePaddings.statusBarHeightDp.dp)) { Header( painter = painterResource(id = R.drawable.ic_back), - title = "일정 작성", - btnText = "등록", + title = title, + btnText = btnText, btnEnabled = btnEnabled, onIconClick = onIconClick, onBtnClick = { onBtnClick(name, date) }