From 13ecc67b4d01cce9d4e60fd55d0649af55c0a030 Mon Sep 17 00:00:00 2001 From: SeonJeongk Date: Mon, 27 Jan 2025 05:44:41 +0900 Subject: [PATCH] =?UTF-8?q?[TNT-114]=20fix:=20PR=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/co/kr/tnt/designsystem/component/TextField.kt | 4 ++-- .../java/co/kr/tnt/trainee/signup/TraineeBasicInfoPage.kt | 4 ++-- .../co/kr/tnt/trainee/signup/TraineeNoteForTrainerPage.kt | 4 ++-- .../java/co/kr/tnt/trainee/signup/TraineePTPurposePage.kt | 4 ++-- .../java/co/kr/tnt/trainee/signup/TraineeProfileSetupPage.kt | 4 ++-- .../co/kr/tnt/trainee/signup/TraineeSignUpCompletePage.kt | 2 +- .../java/co/kr/tnt/trainer/signup/TrainerProfileSetupPage.kt | 4 ++-- .../co/kr/tnt/trainer/signup/TrainerSignUpCompletePage.kt | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/designsystem/src/main/java/co/kr/tnt/designsystem/component/TextField.kt b/core/designsystem/src/main/java/co/kr/tnt/designsystem/component/TextField.kt index 0c53068..910cbb2 100644 --- a/core/designsystem/src/main/java/co/kr/tnt/designsystem/component/TextField.kt +++ b/core/designsystem/src/main/java/co/kr/tnt/designsystem/component/TextField.kt @@ -296,9 +296,9 @@ fun TnTOutlinedTextField( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 8.dp), ) { - if (isError && !warningMessage.isNullOrEmpty()) { + if (isError && warningMessage.isNullOrEmpty().not()) { Text( - text = warningMessage, + text = warningMessage ?: "", style = TnTTheme.typography.body2Medium, color = counterColor, ) diff --git a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeBasicInfoPage.kt b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeBasicInfoPage.kt index f26de4f..0144da7 100644 --- a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeBasicInfoPage.kt +++ b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeBasicInfoPage.kt @@ -64,7 +64,7 @@ fun TraineeBasicInfoPage( val isFormValid by remember { derivedStateOf { isHeightValid && isWeightValid } } Scaffold( - topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, + topBar = { TnTTopBarWithBackButton(onBackClick = onBackClick) }, containerColor = TnTTheme.colors.commonColors.Common0, ) { innerPadding -> Box(modifier = Modifier.padding(innerPadding)) { @@ -141,7 +141,7 @@ fun TraineeBasicInfoPage( text = stringResource(uiResource.string.next), modifier = Modifier.align(Alignment.BottomCenter), enabled = isFormValid, - onClick = { onNextClick() }, + onClick = onNextClick, ) } } diff --git a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeNoteForTrainerPage.kt b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeNoteForTrainerPage.kt index a712139..9ae56d2 100644 --- a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeNoteForTrainerPage.kt +++ b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeNoteForTrainerPage.kt @@ -41,7 +41,7 @@ fun TraineeNoteForTrainerPage( var text by remember { mutableStateOf("") } Scaffold( - topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, + topBar = { TnTTopBarWithBackButton(onBackClick = onBackClick) }, containerColor = TnTTheme.colors.commonColors.Common0, ) { innerPadding -> Box(modifier = Modifier.padding(innerPadding)) { @@ -72,7 +72,7 @@ fun TraineeNoteForTrainerPage( TnTBottomButton( text = stringResource(uiResource.string.next), modifier = Modifier.align(Alignment.BottomCenter), - onClick = { onNextClick() }, + onClick = onNextClick, ) } } diff --git a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineePTPurposePage.kt b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineePTPurposePage.kt index d060191..2c4be6c 100644 --- a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineePTPurposePage.kt +++ b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineePTPurposePage.kt @@ -47,7 +47,7 @@ fun TraineePTPurposePage( var selectedPurposes by remember { mutableStateOf(setOf()) } Scaffold( - topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, + topBar = { TnTTopBarWithBackButton(onBackClick = onBackClick) }, containerColor = TnTTheme.colors.commonColors.Common0, ) { innerPadding -> Box(modifier = Modifier.padding(innerPadding)) { @@ -82,7 +82,7 @@ fun TraineePTPurposePage( } TnTBottomButton( text = stringResource(uiResource.string.next), - onClick = { onNextClick() }, + onClick = onNextClick, enabled = selectedPurposes.isNotEmpty(), modifier = Modifier.align(Alignment.BottomCenter), ) diff --git a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeProfileSetupPage.kt b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeProfileSetupPage.kt index f65cf81..5e79bf5 100644 --- a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeProfileSetupPage.kt +++ b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeProfileSetupPage.kt @@ -70,7 +70,7 @@ fun TraineeProfileSetupPage( ) Scaffold( - topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, + topBar = { TnTTopBarWithBackButton(onBackClick = onBackClick) }, containerColor = TnTTheme.colors.commonColors.Common0, ) { innerPadding -> Box(modifier = Modifier.padding(innerPadding)) { @@ -120,7 +120,7 @@ fun TraineeProfileSetupPage( TnTBottomButton( text = stringResource(uiResource.string.next), enabled = text.isNotBlank() && !isWarning, - onClick = { onNextClick() }, + onClick = onNextClick, modifier = Modifier.align(Alignment.BottomCenter), ) } diff --git a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeSignUpCompletePage.kt b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeSignUpCompletePage.kt index 488dea2..dd60f9c 100644 --- a/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeSignUpCompletePage.kt +++ b/feature/trainee/signup/src/main/java/co/kr/tnt/trainee/signup/TraineeSignUpCompletePage.kt @@ -77,7 +77,7 @@ fun TraineeSignUpCompletePage( } TnTBottomButton( text = stringResource(uiResource.string.start), - onClick = { onNextClick() }, + onClick = onNextClick, modifier = Modifier.align(Alignment.BottomCenter), ) } diff --git a/feature/trainer/signup/src/main/java/co/kr/tnt/trainer/signup/TrainerProfileSetupPage.kt b/feature/trainer/signup/src/main/java/co/kr/tnt/trainer/signup/TrainerProfileSetupPage.kt index 67e88e0..0cfce9d 100644 --- a/feature/trainer/signup/src/main/java/co/kr/tnt/trainer/signup/TrainerProfileSetupPage.kt +++ b/feature/trainer/signup/src/main/java/co/kr/tnt/trainer/signup/TrainerProfileSetupPage.kt @@ -70,7 +70,7 @@ fun TrainerProfileSetupPage( ) Scaffold( - topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, + topBar = { TnTTopBarWithBackButton(onBackClick = onBackClick) }, containerColor = TnTTheme.colors.commonColors.Common0, ) { innerPadding -> Box(modifier = Modifier.padding(innerPadding)) { @@ -122,7 +122,7 @@ fun TrainerProfileSetupPage( text = stringResource(uiResource.string.next), modifier = Modifier.align(Alignment.BottomCenter), enabled = text.isNotBlank() && !isWarning, - onClick = { onNextClick() }, + onClick = onNextClick, ) } } diff --git a/feature/trainer/signup/src/main/java/co/kr/tnt/trainer/signup/TrainerSignUpCompletePage.kt b/feature/trainer/signup/src/main/java/co/kr/tnt/trainer/signup/TrainerSignUpCompletePage.kt index 041d443..c5c0840 100644 --- a/feature/trainer/signup/src/main/java/co/kr/tnt/trainer/signup/TrainerSignUpCompletePage.kt +++ b/feature/trainer/signup/src/main/java/co/kr/tnt/trainer/signup/TrainerSignUpCompletePage.kt @@ -77,7 +77,7 @@ fun TrainerSignUpCompletePage( } TnTBottomButton( text = stringResource(uiResource.string.start), - onClick = { onNextClick() }, + onClick = onNextClick, modifier = Modifier.align(Alignment.BottomCenter), ) }