Skip to content

[mod/#145] 예전에 사용되었던 색상 새로운 색상으로 교체 #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sonms merged 3 commits into from
Oct 2, 2025
Merged

[mod/#145] 예전에 사용되었던 색상 새로운 색상으로 교체 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3db4f86
mod/#145 예전에 사용되었던 색상 새로운 색상으로 교체
Oct 2, 2025
4c84ad5
mod/#145 예전에 사용되었던 색상 새로운 색상으로 교체2
Oct 2, 2025
8c64743
mod/#145 색상 수정
Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/com/paw/key/core/designsystem/component/DogkyButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/paw/key/core/designsystem/component/PawKeyBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/paw/key/presentation/ui/region/RegionalManagementScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/paw/key/presentation/ui/signup/SignUpMapInfoScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/paw/key/presentation/ui/signup/component/NeuteringCheckbox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fun SignUpNeuteringCheckRadio(
)
Text(
text = "중성화 했어요",
color = PawKeyTheme.colors.default,
color = PawKeyTheme.colors.defaultMiddle,
style = PawKeyTheme.typography.bodySmall
)
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/paw/key/presentation/ui/signup/component/PetBreedSearchContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -150,15 +150,15 @@ fun PetBreedSearchItem(
modifier: Modifier = Modifier
) {
val textColor = if (isPetBreedSelected) {
PawKeyTheme.colors.background2
PawKeyTheme.colors.background
} else {
PawKeyTheme.colors.contents
}

val backgroundColor = if (isPetBreedSelected) {
PawKeyTheme.colors.primary
} else {
PawKeyTheme.colors.background2
PawKeyTheme.colors.background
}

Text(
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/paw/key/presentation/ui/signup/component/RegionSearchContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
)
)
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpHeader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpSubHeader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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로 변경
Expand All @@ -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,
Expand Down Expand Up @@ -96,7 +96,7 @@ fun SignUpTextField(
Text(
text = placeholder,
style = PawKeyTheme.typography.bodyDefault,
color = PawKeyTheme.colors.default
color = PawKeyTheme.colors.defaultMiddle
)
}
innerTextField()
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/paw/key/presentation/ui/signup/component/SignUpUserSelectButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ fun SignUpUserSelectButton(
color = if (isSelect) {
PawKeyTheme.colors.primary
} else {
PawKeyTheme.colors.background2
PawKeyTheme.colors.background
}
)
.border(
width = 1.dp,
color = if (isSelect) {
Color.Transparent
} else {
PawKeyTheme.colors.default
PawKeyTheme.colors.defaultMiddle
},
shape = RoundedCornerShape(8.dp)
)
Expand All @@ -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
Expand Down