diff --git a/app/src/main/java/com/paw/key/core/designsystem/component/DogkyButton.kt b/app/src/main/java/com/paw/key/core/designsystem/component/DogkyButton.kt index 72eebfd4..a2379142 100644 --- a/app/src/main/java/com/paw/key/core/designsystem/component/DogkyButton.kt +++ b/app/src/main/java/com/paw/key/core/designsystem/component/DogkyButton.kt @@ -23,12 +23,12 @@ fun DogkyButton( ) { val backgroundColor = when { enabled -> PawKeyTheme.colors.primary - else -> PawKeyTheme.colors.background1 + else -> PawKeyTheme.colors.defaultButton } val textColor = when { - enabled -> PawKeyTheme.colors.background1 - else -> PawKeyTheme.colors.default + enabled -> PawKeyTheme.colors.background + else -> PawKeyTheme.colors.defaultMiddle } Box( diff --git a/app/src/main/java/com/paw/key/core/designsystem/component/PawKeyBottomSheet.kt b/app/src/main/java/com/paw/key/core/designsystem/component/PawKeyBottomSheet.kt index fdc18dcb..b0516185 100644 --- a/app/src/main/java/com/paw/key/core/designsystem/component/PawKeyBottomSheet.kt +++ b/app/src/main/java/com/paw/key/core/designsystem/component/PawKeyBottomSheet.kt @@ -24,7 +24,7 @@ fun PawKeyBottomSheet( onDismissRequest = onDismissRequest, sheetState = sheetState, shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp), - containerColor = PawKeyTheme.colors.background2, + containerColor = PawKeyTheme.colors.background, modifier = modifier .fillMaxWidth(), dragHandle = null, diff --git a/app/src/main/java/com/paw/key/presentation/ui/region/RegionalManagementScreen.kt b/app/src/main/java/com/paw/key/presentation/ui/region/RegionalManagementScreen.kt index 6384ab3f..156e2990 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/region/RegionalManagementScreen.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/region/RegionalManagementScreen.kt @@ -177,7 +177,7 @@ fun RegionalManagementScreen( if (singlePolygonCoords.isNotEmpty()) { PolygonOverlay( coords = singlePolygonCoords, - color = PawKeyTheme.colors.opacityPrimary.copy(alpha = 0.3f), + color = PawKeyTheme.colors.opacity25Primary.copy(alpha = 0.3f), outlineWidth = 1.dp, outlineColor = PawKeyTheme.colors.green500 ) @@ -188,7 +188,7 @@ fun RegionalManagementScreen( regionCoordinates.forEach { PolygonOverlay( coords = it, - color = PawKeyTheme.colors.opacityPrimary.copy(alpha = 0.3f), + color = PawKeyTheme.colors.opacity25Primary.copy(alpha = 0.3f), outlineWidth = 1.dp, outlineColor = PawKeyTheme.colors.green500 ) diff --git a/app/src/main/java/com/paw/key/presentation/ui/signup/SignUpMapInfoScreen.kt b/app/src/main/java/com/paw/key/presentation/ui/signup/SignUpMapInfoScreen.kt index 77fa811f..7a86f3fd 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/signup/SignUpMapInfoScreen.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/signup/SignUpMapInfoScreen.kt @@ -81,7 +81,7 @@ fun SignUpMapInfoScreen( if (singlePolygonCoords.isNotEmpty()) { PolygonOverlay( coords = singlePolygonCoords, - color = PawKeyTheme.colors.opacityPrimary.copy(alpha = 0.3f), + color = PawKeyTheme.colors.opacity25Primary.copy(alpha = 0.3f), outlineWidth = 1.dp, outlineColor = PawKeyTheme.colors.green500 ) @@ -92,7 +92,7 @@ fun SignUpMapInfoScreen( regionCoordinates.forEach { PolygonOverlay( coords = it, - color = PawKeyTheme.colors.opacityPrimary.copy(alpha = 0.3f), + color = PawKeyTheme.colors.opacity25Primary.copy(alpha = 0.3f), outlineWidth = 1.dp, outlineColor = PawKeyTheme.colors.green500 ) diff --git a/app/src/main/java/com/paw/key/presentation/ui/signup/component/NeuteringCheckbox.kt b/app/src/main/java/com/paw/key/presentation/ui/signup/component/NeuteringCheckbox.kt index c4823b22..68ca49f5 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/signup/component/NeuteringCheckbox.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/signup/component/NeuteringCheckbox.kt @@ -38,7 +38,7 @@ fun SignUpNeuteringCheckRadio( ) Text( text = "중성화 했어요", - color = PawKeyTheme.colors.default, + color = PawKeyTheme.colors.defaultMiddle, style = PawKeyTheme.typography.bodySmall ) } diff --git a/app/src/main/java/com/paw/key/presentation/ui/signup/component/PetBreedSearchContent.kt b/app/src/main/java/com/paw/key/presentation/ui/signup/component/PetBreedSearchContent.kt index 123faac9..db48ec76 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/signup/component/PetBreedSearchContent.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/signup/component/PetBreedSearchContent.kt @@ -61,7 +61,7 @@ fun PetBreedSearchContent( .fillMaxWidth() .fillMaxHeight(0.7f) .background( - color = PawKeyTheme.colors.background2, + color = PawKeyTheme.colors.background, shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp) ) .padding(horizontal = 16.dp) @@ -150,7 +150,7 @@ fun PetBreedSearchItem( modifier: Modifier = Modifier ) { val textColor = if (isPetBreedSelected) { - PawKeyTheme.colors.background2 + PawKeyTheme.colors.background } else { PawKeyTheme.colors.contents } @@ -158,7 +158,7 @@ fun PetBreedSearchItem( val backgroundColor = if (isPetBreedSelected) { PawKeyTheme.colors.primary } else { - PawKeyTheme.colors.background2 + PawKeyTheme.colors.background } Text( diff --git a/app/src/main/java/com/paw/key/presentation/ui/signup/component/RegionSearchContent.kt b/app/src/main/java/com/paw/key/presentation/ui/signup/component/RegionSearchContent.kt index 3f5d44b8..27c9f402 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/signup/component/RegionSearchContent.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/signup/component/RegionSearchContent.kt @@ -117,7 +117,7 @@ fun RegionSearchContent( .fillMaxWidth() .fillMaxHeight(0.7f) .background( - color = PawKeyTheme.colors.background2, + color = PawKeyTheme.colors.background, shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp) ) .padding(horizontal = 16.dp) @@ -202,11 +202,11 @@ private fun RegionSearchList( VerticalDivider( thickness = 1.dp, - color = PawKeyTheme.colors.default, + color = PawKeyTheme.colors.defaultMiddle, modifier = Modifier .fillMaxHeight() .background( - color = PawKeyTheme.colors.default, + color = PawKeyTheme.colors.defaultMiddle, shape = RoundedCornerShape(8.dp) ) ) @@ -237,10 +237,10 @@ private fun RegionItem( modifier: Modifier = Modifier, textAlign: TextAlign = TextAlign.Center ) { - val textColor = if (isSelected) PawKeyTheme.colors.background2 else PawKeyTheme.colors.contents + val textColor = if (isSelected) PawKeyTheme.colors.background else PawKeyTheme.colors.contents val backgroundColor = - if (isSelected) PawKeyTheme.colors.primary else PawKeyTheme.colors.background2 + if (isSelected) PawKeyTheme.colors.primary else PawKeyTheme.colors.background Text( text = name, diff --git a/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpHeader.kt b/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpHeader.kt index bfcb6abd..184897ed 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpHeader.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpHeader.kt @@ -89,7 +89,7 @@ fun SignUpHeader( .fillMaxWidth() .height(2.dp), color = PawKeyTheme.colors.primary, - trackColor = PawKeyTheme.colors.default, + trackColor = PawKeyTheme.colors.defaultMiddle, strokeCap = StrokeCap.Square, gapSize = 0.dp ) diff --git a/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpSubHeader.kt b/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpSubHeader.kt index 06639c38..d1bef213 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpSubHeader.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpSubHeader.kt @@ -28,7 +28,7 @@ fun SignUpSubHeader() { Text( text = "서비스 시작을 위해 간단한 정보를 입력해주세요!", - color = PawKeyTheme.colors.default, + color = PawKeyTheme.colors.defaultMiddle, style = PawKeyTheme.typography.bodyDefault, modifier = Modifier .padding(horizontal = 16.dp) diff --git a/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpTextField.kt b/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpTextField.kt index 5c945cf3..88ee71f3 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpTextField.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpTextField.kt @@ -45,9 +45,9 @@ fun SignUpTextField( val isFocused = remember { mutableStateOf(false) } val borderColor = when { - !enabled -> PawKeyTheme.colors.default + !enabled -> PawKeyTheme.colors.defaultMiddle isFocused.value -> PawKeyTheme.colors.primary - else -> PawKeyTheme.colors.default + else -> PawKeyTheme.colors.defaultMiddle } // Todo : Gra로 변경 @@ -67,7 +67,7 @@ fun SignUpTextField( .onFocusChanged { focusState -> isFocused.value = focusState.isFocused } - .background(color = PawKeyTheme.colors.background2) + .background(color = PawKeyTheme.colors.background) .border( width = 1.dp, color = borderColor, @@ -96,7 +96,7 @@ fun SignUpTextField( Text( text = placeholder, style = PawKeyTheme.typography.bodyDefault, - color = PawKeyTheme.colors.default + color = PawKeyTheme.colors.defaultMiddle ) } innerTextField() diff --git a/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpUserSelectButton.kt b/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpUserSelectButton.kt index a39f92de..ee07f2ed 100644 --- a/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpUserSelectButton.kt +++ b/app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpUserSelectButton.kt @@ -43,7 +43,7 @@ fun SignUpUserSelectButton( color = if (isSelect) { PawKeyTheme.colors.primary } else { - PawKeyTheme.colors.background2 + PawKeyTheme.colors.background } ) .border( @@ -51,7 +51,7 @@ fun SignUpUserSelectButton( color = if (isSelect) { Color.Transparent } else { - PawKeyTheme.colors.default + PawKeyTheme.colors.defaultMiddle }, shape = RoundedCornerShape(8.dp) ) @@ -60,9 +60,9 @@ fun SignUpUserSelectButton( Text( text = user, color = if (isSelect) { - PawKeyTheme.colors.background2 + PawKeyTheme.colors.background } else { - PawKeyTheme.colors.default + PawKeyTheme.colors.defaultMiddle }, style = if (isSelect) { PawKeyTheme.typography.bodyActive