[TNT-281] 네이밍 방식 통일

core/designsystem/src/main/java/co/kr/tnt/designsystem/component/Toggle.kt

@@ -32,7 +32,7 @@ import co.kr.tnt.designsystem.theme.TnTTheme
 @Composable
 fun TnTCheckToggle(
     isChecked: Boolean = false,
-    onCheckClick: () -> Unit,
+    onClickCheck: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val icon = if (isChecked) {
@@ -47,7 +47,7 @@ fun TnTCheckToggle(
         modifier = modifier
             .size(24.dp)
             .clip(CircleShape)
-            .clickable(onClick = onCheckClick),
+            .clickable(onClick = onClickCheck),
     )
 }
 
@@ -96,7 +96,7 @@ private fun TnTCheckTogglePreview() {
 
         TnTCheckToggle(
             isChecked = isChecked,
-            onCheckClick = { isChecked = !isChecked },
+            onClickCheck = { isChecked = !isChecked },
         )
     }
 }

core/ui/src/main/java/co/kr/tnt/ui/component/TnTCheckToggleDialog.kt

@@ -41,7 +41,7 @@ fun TnTCheckToggleDialog(
     onLeftButtonClick: () -> Unit,
     onRightButtonClick: () -> Unit,
     cancelable: Boolean = false,
-    onCheckClick: () -> Unit,
+    onClickCheck: () -> Unit,
     onDismiss: () -> Unit,
 ) {
     Dialog(
@@ -88,15 +88,15 @@ fun TnTCheckToggleDialog(
                 ) {
                     TnTCheckToggle(
                         isChecked = isChecked,
-                        onCheckClick = onCheckClick,
+                        onClickCheck = onClickCheck,
                     )
                     Text(
                         text = checkToggleText,
                         style = TnTTheme.typography.body2Medium,
                         color = TnTTheme.colors.neutralColors.Neutral500,
                         modifier = Modifier
                             .padding(start = 4.dp)
-                            .clickable(onClick = onCheckClick),
+                            .clickable(onClick = onClickCheck),
                     )
                 }
                 Row(
@@ -135,7 +135,7 @@ private fun TnTCheckToggleDialogPreview() {
             isChecked = isChecked,
             onLeftButtonClick = {},
             onRightButtonClick = {},
-            onCheckClick = { isChecked = !isChecked },
+            onClickCheck = { isChecked = !isChecked },
             leftButtonText = "다음에",
             rightButtonText = "연결하기",
             onDismiss = {},

feature/roleselect/src/main/java/co/kr/tnt/roleselect/RoleSelectionContract.kt

@@ -11,7 +11,7 @@ internal class RoleSelectionContract {
     ) : UiState
 
     sealed interface RoleSelectionUiEvent : UiEvent {
-        data class OnNextClick(val role: RoleState) : RoleSelectionUiEvent
+        data class OnClickNext(val role: RoleState) : RoleSelectionUiEvent
     }
 
     sealed interface RoleSelectionEffect : UiSideEffect {

feature/roleselect/src/main/java/co/kr/tnt/roleselect/RoleSelectionScreen.kt

@@ -45,7 +45,7 @@ internal fun RoleSelectionRoute(
     navigateToTrainerSignUp: () -> Unit,
 ) {
     RoleSelectionScreen(
-        onNextClick = { viewModel.setEvent(RoleSelectionUiEvent.OnNextClick(it)) },
+        onClickNext = { viewModel.setEvent(RoleSelectionUiEvent.OnClickNext(it)) },
     )
 
     LaunchedEffect(viewModel.effect) {
@@ -60,7 +60,7 @@ internal fun RoleSelectionRoute(
 
 @Composable
 fun RoleSelectionScreen(
-    onNextClick: (RoleState) -> Unit = {},
+    onClickNext: (RoleState) -> Unit = {},
 ) {
     var selectedRole by remember { mutableStateOf(RoleState.fromDomain(UserType.TRAINER)) }
 
@@ -69,7 +69,7 @@ fun RoleSelectionScreen(
             TnTBottomButton(
                 text = stringResource(uiResource.string.next),
                 enabled = true,
-                onClick = { onNextClick(selectedRole) },
+                onClick = { onClickNext(selectedRole) },
                 modifier = Modifier.navigationBarsPadding(),
             )
         },
@@ -112,7 +112,11 @@ fun RoleSelectionScreen(
                     text = stringResource(RoleState.Trainer.textResId),
                     modifier = Modifier.weight(1f),
                     size = ButtonSize.Large,
-                    type = if (selectedRole == RoleState.Trainer) ButtonType.RedOutline else ButtonType.GrayOutline,
+                    type = if (selectedRole == RoleState.Trainer) {
+                        ButtonType.RedOutline
+                    } else {
+                        ButtonType.GrayOutline
+                    },
                     onClick = {
                         selectedRole = RoleState.Trainer
                     },
@@ -121,7 +125,11 @@ fun RoleSelectionScreen(
                     text = stringResource(RoleState.Trainee.textResId),
                     modifier = Modifier.weight(1f),
                     size = ButtonSize.Large,
-                    type = if (selectedRole == RoleState.Trainee) ButtonType.RedOutline else ButtonType.GrayOutline,
+                    type = if (selectedRole == RoleState.Trainee) {
+                        ButtonType.RedOutline
+                    } else {
+                        ButtonType.GrayOutline
+                    },
                     onClick = {
                         selectedRole = RoleState.Trainee
                     },
@@ -137,7 +145,7 @@ fun RoleSelectionScreen(
 private fun RoleScreenPreview() {
     TnTTheme {
         RoleSelectionScreen(
-            onNextClick = {},
+            onClickNext = { },
         )
     }
 }

feature/roleselect/src/main/java/co/kr/tnt/roleselect/RoleSelectionViewModel.kt

@@ -15,7 +15,7 @@ internal class RoleSelectionViewModel @Inject constructor() :
     ) {
         override suspend fun handleEvent(event: RoleSelectionUiEvent) {
             when (event) {
-                is RoleSelectionUiEvent.OnNextClick -> navigateToSignUp(event.role)
+                is RoleSelectionUiEvent.OnClickNext -> navigateToSignUp(event.role)
             }
         }
 

feature/trainee/connect/src/main/java/co/kr/tnt/trainee/connect/CodeEntryPage.kt

@@ -39,19 +39,19 @@ internal fun CodeEntryPage(
     inviteCode: String,
     inputState: InputState,
     screenMode: ScreenMode,
-    onSkipClick: () -> Unit,
-    onBackClick: () -> Unit,
-    onNextClick: () -> Unit,
+    onClickSkip: () -> Unit,
+    onClickBack: () -> Unit,
+    onClickNext: () -> Unit,
     onChangeInviteCode: (code: String) -> Unit,
-    onValidateClick: (code: String) -> Unit,
-    onCancelClick: () -> Unit,
-    onDismissPopup: () -> Unit,
+    onClickValidate: (code: String) -> Unit,
+    onClickCancel: () -> Unit,
+    onDismissDialog: () -> Unit,
 ) {
     BackHandler {
         when (screenMode) {
-            ScreenMode.BACK -> onBackClick()
-            ScreenMode.SKIP -> onSkipClick()
-            ScreenMode.CLOSE -> onBackClick()
+            ScreenMode.BACK -> onClickBack()
+            ScreenMode.SKIP -> onClickSkip()
+            ScreenMode.CLOSE -> onClickBack()
         }
     }
 
@@ -61,7 +61,7 @@ internal fun CodeEntryPage(
                 ScreenMode.BACK -> {
                     TnTTopBarWithBackButton(
                         title = stringResource(coreR.string.connect),
-                        onBackClick = onBackClick,
+                        onBackClick = onClickBack,
                     )
                 }
                 ScreenMode.SKIP -> {
@@ -72,9 +72,7 @@ internal fun CodeEntryPage(
                                 text = stringResource(coreR.string.skip),
                                 color = TnTTheme.colors.neutralColors.Neutral400,
                                 style = TnTTheme.typography.body2Medium,
-                                modifier = Modifier.clickable {
-                                    onSkipClick()
-                                },
+                                modifier = Modifier.clickable { onClickSkip() },
                             )
                         },
                     )
@@ -84,7 +82,7 @@ internal fun CodeEntryPage(
                         title = stringResource(coreR.string.connect),
                         trailingComponent = {
                             IconButton(
-                                onClick = onBackClick,
+                                onClick = onClickBack,
                             ) {
                                 Icon(
                                     painter = painterResource(uiResource.drawable.ic_delete),
@@ -119,15 +117,15 @@ internal fun CodeEntryPage(
                             text = stringResource(R.string.verification),
                             size = ButtonSize.Small,
                             enabled = inviteCode.isNotBlank(),
-                            onClick = { onValidateClick(inviteCode) },
+                            onClick = { onClickValidate(inviteCode) },
                         )
                     },
                 )
             }
             TnTBottomButton(
                 text = stringResource(coreR.string.next),
                 enabled = inputState.isValid,
-                onClick = onNextClick,
+                onClick = onClickNext,
                 modifier = Modifier.align(Alignment.BottomCenter),
             )
         }
@@ -139,9 +137,9 @@ internal fun CodeEntryPage(
             content = stringResource(R.string.warning_reconnect_needed),
             leftButtonText = stringResource(coreR.string.cancel),
             rightButtonText = stringResource(coreR.string.ok),
-            onLeftButtonClick = onCancelClick,
-            onRightButtonClick = onDismissPopup,
-            onDismiss = onDismissPopup,
+            onLeftButtonClick = onClickCancel,
+            onRightButtonClick = onDismissDialog,
+            onDismiss = onDismissDialog,
         )
     }
 }
@@ -155,13 +153,13 @@ private fun CodeEntryPagePreview() {
             inputState = InputState.FOCUS,
             inviteCode = "23A4SDA31",
             screenMode = ScreenMode.CLOSE,
-            onSkipClick = {},
-            onNextClick = {},
-            onValidateClick = {},
-            onChangeInviteCode = {},
-            onBackClick = {},
-            onDismissPopup = {},
-            onCancelClick = {},
+            onClickSkip = { },
+            onClickNext = { },
+            onClickBack = { },
+            onClickValidate = { },
+            onChangeInviteCode = { },
+            onDismissDialog = { },
+            onClickCancel = { },
         )
     }
 }

feature/trainee/connect/src/main/java/co/kr/tnt/trainee/connect/PTSessionFormPage.kt

@@ -51,10 +51,10 @@ internal fun PTSessionFormPage(
     onChangeSessionStartDate: (date: LocalDate) -> Unit,
     onChangeCompletedSessionCount: (count: String) -> Unit,
     onChangeTotalSessionCount: (count: String) -> Unit,
-    onNextClick: () -> Unit,
-    onBackClick: () -> Unit,
+    onClickNext: () -> Unit,
+    onClickBack: () -> Unit,
 ) {
-    BackHandler { onBackClick() }
+    BackHandler { onClickBack() }
 
     val today = LocalDate.now()
 
@@ -84,7 +84,7 @@ internal fun PTSessionFormPage(
         topBar = {
             TnTTopBarWithBackButton(
                 title = stringResource(R.string.add_pt_info),
-                onBackClick = onBackClick,
+                onBackClick = onClickBack,
             )
         },
         containerColor = TnTTheme.colors.commonColors.Common0,
@@ -210,7 +210,7 @@ internal fun PTSessionFormPage(
                 text = stringResource(uiResource.string.next),
                 modifier = Modifier.align(Alignment.BottomCenter),
                 enabled = isFormValid,
-                onClick = throttled { onNextClick() },
+                onClick = throttled { onClickNext() },
             )
         }
     }
@@ -311,8 +311,8 @@ private fun PTSessionFormPagePreview() {
             completedSessionCount = "15",
             totalSessionCount = "10",
             isLoading = false,
-            onNextClick = { },
-            onBackClick = { },
+            onClickNext = { },
+            onClickBack = { },
             onChangeSessionStartDate = { },
             onChangeCompletedSessionCount = { },
             onChangeTotalSessionCount = { },

feature/trainee/connect/src/main/java/co/kr/tnt/trainee/connect/TraineeConnectCompletePage.kt

@@ -42,10 +42,10 @@ internal fun TraineeConnectCompletePage(
     trainerImage: String,
     traineeName: String,
     traineeImage: String,
-    onNextClick: () -> Unit,
-    onBackClick: () -> Unit,
+    onClickNext: () -> Unit,
+    onClickBack: () -> Unit,
 ) {
-    BackHandler { onBackClick() }
+    BackHandler { onClickBack() }
 
     val context = LocalContext.current
 
@@ -108,7 +108,7 @@ internal fun TraineeConnectCompletePage(
             }
             TnTBottomButton(
                 text = stringResource(uiResource.string.next),
-                onClick = onNextClick,
+                onClick = onClickNext,
                 modifier = Modifier.align(Alignment.BottomCenter),
             )
         }
@@ -162,8 +162,8 @@ private fun TraineeConnectCompletePagePreview() {
             trainerImage = "",
             traineeName = "김회원",
             traineeImage = "",
-            onNextClick = {},
-            onBackClick = {},
+            onClickNext = { },
+            onClickBack = { },
         )
     }
 }

feature/trainee/connect/src/main/java/co/kr/tnt/trainee/connect/TraineeConnectContract.kt

@@ -23,15 +23,15 @@ internal class TraineeConnectContract {
     ) : UiState
 
     sealed interface TraineeConnectUiEvent : UiEvent {
-        data class OnCodeValidateClick(val code: String) : TraineeConnectUiEvent
+        data class OnClickValidateCode(val code: String) : TraineeConnectUiEvent
         data class OnChangeInviteCode(val code: String) : TraineeConnectUiEvent
         data object OnChangeDialogState : TraineeConnectUiEvent
         data class OnChangeSessionStartDate(val date: LocalDate) : TraineeConnectUiEvent
         data class OnChangeCompletedSessionCount(val count: String) : TraineeConnectUiEvent
         data class OnChangeTotalSessionCount(val count: String) : TraineeConnectUiEvent
-        data object OnNextClick : TraineeConnectUiEvent
-        data object OnBackClick : TraineeConnectUiEvent
-        data object OnSkipClick : TraineeConnectUiEvent
+        data object OnClickNext : TraineeConnectUiEvent
+        data object OnClickBack : TraineeConnectUiEvent
+        data object OnClickSkip : TraineeConnectUiEvent
     }
 
     sealed interface TraineeConnectSideEffect : UiSideEffect {