diff --git a/core/designsystem/src/main/res/drawable/icon_agreement.xml b/core/designsystem/src/main/res/drawable/icon_agreement.xml deleted file mode 100644 index 1fb90bab3..000000000 --- a/core/designsystem/src/main/res/drawable/icon_agreement.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/res/drawable/icon_camera.xml b/core/designsystem/src/main/res/drawable/icon_camera.xml deleted file mode 100644 index ee23c05cc..000000000 --- a/core/designsystem/src/main/res/drawable/icon_camera.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/designsystem/src/main/res/drawable/icon_camera_filled.xml b/core/designsystem/src/main/res/drawable/icon_camera_filled.xml new file mode 100644 index 000000000..ccac3322c --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_camera_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/designsystem/src/main/res/drawable/icon_camera_stroke.xml b/core/designsystem/src/main/res/drawable/icon_camera_stroke.xml new file mode 100644 index 000000000..295c3638b --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_camera_stroke.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/core/designsystem/src/main/res/drawable/icon_check.xml b/core/designsystem/src/main/res/drawable/icon_check.xml index f16588162..eb7303983 100644 --- a/core/designsystem/src/main/res/drawable/icon_check.xml +++ b/core/designsystem/src/main/res/drawable/icon_check.xml @@ -1,9 +1,12 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M4,12.262L8.876,17.211C9.033,17.37 9.29,17.37 9.446,17.211L20,6.5" + android:strokeWidth="2" + android:fillColor="#00000000" + android:strokeColor="#B7B9C3" + android:strokeLineCap="round"/> diff --git a/core/designsystem/src/main/res/drawable/icon_check_primary.xml b/core/designsystem/src/main/res/drawable/icon_check_primary.xml deleted file mode 100644 index 51f0bd40f..000000000 --- a/core/designsystem/src/main/res/drawable/icon_check_primary.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/designsystem/src/main/res/drawable/icon_current_location_off.xml b/core/designsystem/src/main/res/drawable/icon_current_location_off.xml deleted file mode 100644 index 0fc38bf56..000000000 --- a/core/designsystem/src/main/res/drawable/icon_current_location_off.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - diff --git a/core/designsystem/src/main/res/drawable/icon_current_location_on.xml b/core/designsystem/src/main/res/drawable/icon_current_location_on.xml deleted file mode 100644 index de7abcd66..000000000 --- a/core/designsystem/src/main/res/drawable/icon_current_location_on.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - diff --git a/core/designsystem/src/main/res/drawable/icon_current_position.xml b/core/designsystem/src/main/res/drawable/icon_current_position.xml new file mode 100644 index 000000000..95a6368e6 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_current_position.xml @@ -0,0 +1,39 @@ + + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/icon_edit.xml b/core/designsystem/src/main/res/drawable/icon_edit.xml index db5b49de9..d725bdf33 100644 --- a/core/designsystem/src/main/res/drawable/icon_edit.xml +++ b/core/designsystem/src/main/res/drawable/icon_edit.xml @@ -4,6 +4,7 @@ android:viewportWidth="20" android:viewportHeight="20"> + android:pathData="M15.384,7.839L5.973,17.25C5.805,17.418 5.575,17.511 5.338,17.507L3.348,17.473C2.869,17.465 2.486,17.075 2.485,16.597V14.652C2.485,14.42 2.578,14.197 2.742,14.032L12.16,4.615L15.384,7.839ZM14.019,2.757C14.362,2.414 14.917,2.414 15.26,2.757L17.243,4.74C17.586,5.083 17.586,5.638 17.243,5.98L16.004,7.221L12.779,3.997L14.019,2.757Z" + android:fillColor="#74788B" + android:fillType="evenOdd"/> diff --git a/core/designsystem/src/main/res/drawable/icon_find_direction.xml b/core/designsystem/src/main/res/drawable/icon_find_direction.xml deleted file mode 100644 index dc8027f61..000000000 --- a/core/designsystem/src/main/res/drawable/icon_find_direction.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/core/designsystem/src/main/res/drawable/icon_info_primary_fill.xml b/core/designsystem/src/main/res/drawable/icon_info_filled.xml similarity index 100% rename from core/designsystem/src/main/res/drawable/icon_info_primary_fill.xml rename to core/designsystem/src/main/res/drawable/icon_info_filled.xml diff --git a/core/designsystem/src/main/res/drawable/icon_info_gray_stroke.xml b/core/designsystem/src/main/res/drawable/icon_info_gray_stroke.xml deleted file mode 100644 index 7553ccda0..000000000 --- a/core/designsystem/src/main/res/drawable/icon_info_gray_stroke.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/designsystem/src/main/res/drawable/icon_info_stroke.xml b/core/designsystem/src/main/res/drawable/icon_info_stroke.xml new file mode 100644 index 000000000..37438ca20 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_info_stroke.xml @@ -0,0 +1,20 @@ + + + + + diff --git a/core/designsystem/src/main/res/drawable/icon_life_four_cut.xml b/core/designsystem/src/main/res/drawable/icon_life_four_cut.xml deleted file mode 100644 index 8e78244f8..000000000 --- a/core/designsystem/src/main/res/drawable/icon_life_four_cut.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/core/designsystem/src/main/res/drawable/icon_map_filled.xml b/core/designsystem/src/main/res/drawable/icon_map_filled.xml new file mode 100644 index 000000000..e2535f9fa --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_map_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/designsystem/src/main/res/drawable/icon_map_pin.xml b/core/designsystem/src/main/res/drawable/icon_map_pin.xml deleted file mode 100644 index 9b95789ba..000000000 --- a/core/designsystem/src/main/res/drawable/icon_map_pin.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/designsystem/src/main/res/drawable/icon_photo_booth_empty.xml b/core/designsystem/src/main/res/drawable/icon_photo_booth_empty.xml new file mode 100644 index 000000000..8007e73b1 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_photo_booth_empty.xml @@ -0,0 +1,12 @@ + + + + diff --git a/core/designsystem/src/main/res/drawable/icon_pin.xml b/core/designsystem/src/main/res/drawable/icon_pin.xml new file mode 100644 index 000000000..12421bfe2 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_pin.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/icon_road.xml b/core/designsystem/src/main/res/drawable/icon_road.xml new file mode 100644 index 000000000..c8a3cf4b7 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_road.xml @@ -0,0 +1,18 @@ + + + + diff --git a/core/designsystem/src/main/res/drawable/icon_rotate.xml b/core/designsystem/src/main/res/drawable/icon_rotate.xml new file mode 100644 index 000000000..8e7fdb6d9 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/icon_rotate.xml @@ -0,0 +1,19 @@ + + + + diff --git a/core/designsystem/src/main/res/drawable/icon_rotation.xml b/core/designsystem/src/main/res/drawable/icon_rotation.xml deleted file mode 100644 index b9ad21315..000000000 --- a/core/designsystem/src/main/res/drawable/icon_rotation.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/core/designsystem/src/main/res/drawable/image_agreement.png b/core/designsystem/src/main/res/drawable/image_agreement.png new file mode 100644 index 000000000..5cfe403ac Binary files /dev/null and b/core/designsystem/src/main/res/drawable/image_agreement.png differ diff --git a/core/designsystem/src/main/res/drawable/image_empty_profile_image.png b/core/designsystem/src/main/res/drawable/image_empty_profile_image.png deleted file mode 100644 index 3c36f1f7d..000000000 Binary files a/core/designsystem/src/main/res/drawable/image_empty_profile_image.png and /dev/null differ diff --git a/core/designsystem/src/main/res/drawable/image_map_empty.png b/core/designsystem/src/main/res/drawable/image_map_empty.png new file mode 100644 index 000000000..c14d183b2 Binary files /dev/null and b/core/designsystem/src/main/res/drawable/image_map_empty.png differ diff --git a/core/designsystem/src/main/res/drawable/image_near_photo_booth_empty.png b/core/designsystem/src/main/res/drawable/image_near_photo_booth_empty.png new file mode 100644 index 000000000..c14d183b2 Binary files /dev/null and b/core/designsystem/src/main/res/drawable/image_near_photo_booth_empty.png differ diff --git a/core/designsystem/src/main/res/drawable/image_profile_empty.png b/core/designsystem/src/main/res/drawable/image_profile_empty.png new file mode 100644 index 000000000..4046e490c Binary files /dev/null and b/core/designsystem/src/main/res/drawable/image_profile_empty.png differ diff --git a/feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/term/component/AgreementSection.kt b/feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/term/component/AgreementSection.kt index f39bd6c86..2e3bb3498 100644 --- a/feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/term/component/AgreementSection.kt +++ b/feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/term/component/AgreementSection.kt @@ -1,6 +1,5 @@ package com.neki.android.feature.auth.impl.term.component -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -27,15 +26,16 @@ internal fun AgreementSection( onClickNavigateUrl: () -> Unit = {}, ) { Row( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier + .fillMaxWidth() + .padding(end = 4.dp), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(10.dp), ) { Row( modifier = Modifier .weight(1f) .noRippleClickable(onClick = onClickAgree) - .padding(start = 10.dp, top = 10.dp, bottom = 10.dp), + .padding(10.dp), verticalAlignment = Alignment.CenterVertically, ) { Icon( @@ -60,8 +60,9 @@ internal fun AgreementSection( } Icon( modifier = Modifier - .size(24.dp) - .noRippleClickableSingle(onClick = onClickNavigateUrl), + .noRippleClickableSingle(onClick = onClickNavigateUrl) + .padding(vertical = 10.dp) + .size(24.dp), imageVector = ImageVector.vectorResource(R.drawable.icon_arrow_right), contentDescription = null, tint = NekiTheme.colorScheme.gray300, diff --git a/feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/term/component/TermContent.kt b/feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/term/component/TermContent.kt index 50b13cd7f..8672a03e8 100644 --- a/feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/term/component/TermContent.kt +++ b/feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/term/component/TermContent.kt @@ -16,6 +16,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp import com.neki.android.core.designsystem.ComponentPreview @@ -41,7 +42,7 @@ internal fun TermContent( ) { Image( modifier = Modifier.padding(bottom = 12.dp), - imageVector = ImageVector.vectorResource(R.drawable.icon_agreement), + painter = painterResource(R.drawable.image_agreement), contentDescription = null, ) Text( diff --git a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/AnchoredDraggablePanel.kt b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/AnchoredDraggablePanel.kt index d15654b73..cd71b9e9a 100644 --- a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/AnchoredDraggablePanel.kt +++ b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/AnchoredDraggablePanel.kt @@ -2,6 +2,7 @@ package com.neki.android.feature.map.impl.component import androidx.compose.animation.core.tween import androidx.compose.animation.splineBasedDecay +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.gestures.AnchoredDraggableState import androidx.compose.foundation.gestures.DraggableAnchors @@ -40,9 +41,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp @@ -146,7 +149,7 @@ internal fun AnchoredDraggablePanel( Column { CurrentLocationButton( modifier = Modifier - .padding(start = 20.dp, bottom = 12.dp) + .padding(start = 20.dp, bottom = 8.dp) .alpha(alpha = if (dragLevel == DragLevel.THIRD) 0f else 1f), isActiveCurrentLocation = isCurrentLocation, onClick = onClickCurrentLocation, @@ -210,38 +213,56 @@ internal fun AnchoredPanelContent( horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, ) { - Text( - text = buildAnnotatedString { - withStyle(SpanStyle(color = NekiTheme.colorScheme.primary400)) { - append("가까운") - } - append(" 네컷 사진 브랜드 📌") - }, - color = NekiTheme.colorScheme.gray900, - style = NekiTheme.typography.title18Bold, - ) + Row( + horizontalArrangement = Arrangement.spacedBy(2.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = buildAnnotatedString { + withStyle(SpanStyle(color = NekiTheme.colorScheme.primary400)) { + append("가까운") + } + append(" 네컷 사진 브랜드") + }, + color = NekiTheme.colorScheme.gray900, + style = NekiTheme.typography.title18Bold, + ) + Icon( + modifier = Modifier.size(24.dp), + imageVector = ImageVector.vectorResource(R.drawable.icon_pin), + contentDescription = null, + tint = Color.Unspecified, + ) + } Icon( modifier = Modifier - .size(24.dp) .noRippleClickableSingle(onClick = onClickInfoIcon) - .padding(2.dp), - imageVector = ImageVector.vectorResource(R.drawable.icon_info_gray_stroke), + .padding(start = 2.dp, top = 2.dp, bottom = 2.dp) + .size(24.dp), + imageVector = ImageVector.vectorResource(R.drawable.icon_info_stroke), contentDescription = null, + tint = NekiTheme.colorScheme.gray300, ) } VerticalSpacer(8.dp) val filteredNearbyPhotoBooths = nearbyPhotoBooths.filter { it.isCheckedBrand } if (filteredNearbyPhotoBooths.isEmpty()) { - Box( + Column( modifier = Modifier .fillMaxWidth() - .padding(vertical = 175.5.dp), - contentAlignment = Alignment.Center, + .padding(top = 123.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(12.dp), ) { + Image( + painter = painterResource(R.drawable.image_near_photo_booth_empty), + contentDescription = null, + ) Text( - text = "1km 이내에 가까운 네컷 사진관이 없어요!", + text = "1km 이내에 가까운\n네컷 사진관이 없어요!", color = NekiTheme.colorScheme.gray500, style = NekiTheme.typography.body16Medium, + textAlign = TextAlign.Center, ) } } else { @@ -250,7 +271,7 @@ internal fun AnchoredPanelContent( .weight(1f) .padding(horizontal = 20.dp), verticalArrangement = Arrangement.spacedBy(16.dp), - contentPadding = PaddingValues(bottom = MapConst.BOTTOM_NAVIGATION_BAR_HEIGHT.dp), + contentPadding = PaddingValues(bottom = 128.dp), ) { items(filteredNearbyPhotoBooths) { photoBooth -> HorizontalBrandItem( diff --git a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/CurrentLocationButton.kt b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/CurrentLocationButton.kt index b294f3043..bf028fee5 100644 --- a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/CurrentLocationButton.kt +++ b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/CurrentLocationButton.kt @@ -4,13 +4,11 @@ import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.Icon import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp @@ -33,16 +31,13 @@ internal fun CurrentLocationButton( color = NekiTheme.colorScheme.white, ) .clickable(onClick = onClick) - .padding(8.dp), + .padding(6.dp), contentAlignment = Alignment.Center, ) { Icon( - modifier = Modifier.size(20.dp), - imageVector = ImageVector.vectorResource( - if (isActiveCurrentLocation) R.drawable.icon_current_location_on else R.drawable.icon_current_location_off, - ), + imageVector = ImageVector.vectorResource(R.drawable.icon_current_position), contentDescription = null, - tint = Color.Unspecified, + tint = if (isActiveCurrentLocation) NekiTheme.colorScheme.primary500 else NekiTheme.colorScheme.gray800, ) } } diff --git a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/HorizontalBrandItem.kt b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/HorizontalBrandItem.kt index b34aaeb4a..d84acd1be 100644 --- a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/HorizontalBrandItem.kt +++ b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/HorizontalBrandItem.kt @@ -39,8 +39,8 @@ internal fun HorizontalBrandItem( .clip(RoundedCornerShape(8.dp)) .size(64.dp), model = photoBooth.imageUrl, - placeholder = painterResource(R.drawable.icon_life_four_cut), - error = painterResource(R.drawable.icon_life_four_cut), + placeholder = painterResource(R.drawable.icon_photo_booth_empty), + error = painterResource(R.drawable.icon_photo_booth_empty), contentDescription = null, ) HorizontalSpacer(16.dp) @@ -51,7 +51,7 @@ internal fun HorizontalBrandItem( Text( text = photoBooth.brandName, color = NekiTheme.colorScheme.gray900, - style = NekiTheme.typography.title18Bold, + style = NekiTheme.typography.title18SemiBold, ) HorizontalSpacer(4.dp) Text( diff --git a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/MapRefreshChip.kt b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/MapRefreshChip.kt index e86aff9c5..65931c85d 100644 --- a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/MapRefreshChip.kt +++ b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/MapRefreshChip.kt @@ -39,20 +39,20 @@ internal fun MapRefreshChip( .border( width = 1.dp, shape = CircleShape, - color = NekiTheme.colorScheme.gray100, + color = NekiTheme.colorScheme.primary400, ) - .padding(horizontal = 13.09.dp, vertical = 8.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), + .padding(horizontal = 13.dp, vertical = 12.dp), + horizontalArrangement = Arrangement.spacedBy(7.dp), verticalAlignment = Alignment.CenterVertically, ) { Icon( modifier = Modifier.size(16.dp), - imageVector = ImageVector.vectorResource(R.drawable.icon_rotation), + imageVector = ImageVector.vectorResource(R.drawable.icon_rotate), contentDescription = null, tint = NekiTheme.colorScheme.primary400, ) Text( - text = "현 위치에서 탐색", + text = "이 지역 재검색", style = NekiTheme.typography.body14SemiBold, color = NekiTheme.colorScheme.gray800, ) diff --git a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothDetailContent.kt b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothDetailContent.kt index db6693b54..33d4ba98b 100644 --- a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothDetailContent.kt +++ b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothDetailContent.kt @@ -46,6 +46,7 @@ internal fun PhotoBoothDetailContent( modifier = modifier .fillMaxWidth() .padding(horizontal = 20.dp, vertical = 12.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), ) { Row( modifier = Modifier.fillMaxWidth(), @@ -58,7 +59,6 @@ internal fun PhotoBoothDetailContent( ) CloseButton(onClick = onClickCloseCard) } - VerticalSpacer(12.dp) PhotoBoothDetailCard( photoBooth = photoBooth, onClick = onClickCard, @@ -91,35 +91,36 @@ private fun PhotoBoothDetailCard( .clip(RoundedCornerShape(8.dp)) .size(64.dp), model = photoBooth.imageUrl, - placeholder = painterResource(R.drawable.icon_life_four_cut), - error = painterResource(R.drawable.icon_life_four_cut), + placeholder = painterResource(R.drawable.icon_photo_booth_empty), + error = painterResource(R.drawable.icon_photo_booth_empty), contentDescription = null, ) HorizontalSpacer(16.dp) - Column { + Column( + modifier = Modifier.weight(1f), + ) { Row( verticalAlignment = Alignment.CenterVertically, ) { Text( text = photoBooth.brandName, color = NekiTheme.colorScheme.gray900, - style = NekiTheme.typography.title18Bold, + style = NekiTheme.typography.title20SemiBold, ) - HorizontalSpacer(4.dp) + HorizontalSpacer(6.dp) Text( text = photoBooth.branchName, color = NekiTheme.colorScheme.gray600, - style = NekiTheme.typography.caption12Medium, + style = NekiTheme.typography.body14Medium, ) } VerticalSpacer(4.dp) Text( text = photoBooth.distance.formatDistance(), color = NekiTheme.colorScheme.gray400, - style = NekiTheme.typography.caption12Medium, + style = NekiTheme.typography.body14Medium, ) } - HorizontalSpacer(1f) Box( modifier = Modifier .background( @@ -131,8 +132,7 @@ private fun PhotoBoothDetailCard( contentAlignment = Alignment.Center, ) { Icon( - modifier = Modifier.size(24.dp), - imageVector = ImageVector.vectorResource(R.drawable.icon_find_direction), + imageVector = ImageVector.vectorResource(R.drawable.icon_road), contentDescription = null, tint = Color.Unspecified, ) diff --git a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothMarker.kt b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothMarker.kt index 1211d6193..bbbf3c8e9 100644 --- a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothMarker.kt +++ b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothMarker.kt @@ -189,7 +189,7 @@ internal fun PhotoBoothMarkerContent( if (isFocused) FOCUSED_MARKER_IMAGE_RADIUS.dp else MARKER_IMAGE_RADIUS.dp, ), ), - painter = painterResource(R.drawable.icon_info_gray_stroke), + painter = painterResource(R.drawable.icon_photo_booth_empty), contentScale = ContentScale.Crop, contentDescription = null, ) diff --git a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/ToMapChip.kt b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/ToMapChip.kt index 0914429f9..b7dedd12a 100644 --- a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/ToMapChip.kt +++ b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/ToMapChip.kt @@ -40,7 +40,7 @@ internal fun ToMapChip( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = ImageVector.vectorResource(R.drawable.icon_map_pin), + imageVector = ImageVector.vectorResource(R.drawable.icon_map_filled), contentDescription = null, tint = Color.Unspecified, ) diff --git a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/VerticalBrandItem.kt b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/VerticalBrandItem.kt index 189642d12..cb5c99c8a 100644 --- a/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/VerticalBrandItem.kt +++ b/feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/VerticalBrandItem.kt @@ -51,8 +51,8 @@ internal fun VerticalBrandItem( .fillMaxSize() .clip(CircleShape), model = brand.imageUrl, - placeholder = painterResource(R.drawable.icon_life_four_cut), - error = painterResource(R.drawable.icon_life_four_cut), + placeholder = painterResource(R.drawable.icon_photo_booth_empty), + error = painterResource(R.drawable.icon_photo_booth_empty), contentDescription = null, ) @@ -79,7 +79,7 @@ internal fun VerticalBrandItem( Text( text = brand.name, color = if (brand.isChecked) NekiTheme.colorScheme.primary400 else NekiTheme.colorScheme.gray900, - style = NekiTheme.typography.body14Medium, + style = NekiTheme.typography.body14SemiBold, textAlign = TextAlign.Center, ) } diff --git a/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/main/component/ProfileCard.kt b/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/main/component/ProfileCard.kt index bc7090b35..ce6969545 100644 --- a/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/main/component/ProfileCard.kt +++ b/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/main/component/ProfileCard.kt @@ -16,6 +16,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage import com.neki.android.core.designsystem.ComponentPreview @@ -42,9 +43,11 @@ internal fun ProfileCard( modifier = Modifier .size(78.dp) .clip(CircleShape), - model = profileImageUrl.ifEmpty { R.drawable.image_empty_profile_image }, + model = profileImageUrl.ifEmpty { R.drawable.image_profile_empty }, contentDescription = null, contentScale = ContentScale.Crop, + placeholder = painterResource(R.drawable.image_profile_empty), + error = painterResource(R.drawable.image_profile_empty), ) HorizontalSpacer(16.dp) Column( diff --git a/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/EditProfileScreen.kt b/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/EditProfileScreen.kt index c8308f518..c35b186df 100644 --- a/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/EditProfileScreen.kt +++ b/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/EditProfileScreen.kt @@ -90,7 +90,7 @@ fun EditProfileScreen( when (uiState.profileImageState) { is EditProfileImageType.OriginalImageUrl -> {} is EditProfileImageType.ImageUri -> displayProfileImage = uiState.profileImageState.uri - EditProfileImageType.Default -> displayProfileImage = R.drawable.image_empty_profile_image + EditProfileImageType.Default -> displayProfileImage = R.drawable.image_profile_empty } } diff --git a/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/component/EditProfileImage.kt b/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/component/EditProfileImage.kt index 4e37d9399..9d68a0802 100644 --- a/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/component/EditProfileImage.kt +++ b/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/component/EditProfileImage.kt @@ -1,7 +1,6 @@ package com.neki.android.feature.mypage.impl.profile.component import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -11,8 +10,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp @@ -35,30 +36,27 @@ internal fun EditProfileImage( modifier = Modifier .size(imageSize) .clip(CircleShape), - model = profileImage ?: R.drawable.image_empty_profile_image, + model = profileImage ?: R.drawable.image_profile_empty, contentDescription = null, contentScale = ContentScale.Crop, + placeholder = painterResource(R.drawable.image_profile_empty), + error = painterResource(R.drawable.image_profile_empty), ) Box( modifier = Modifier .align(Alignment.BottomEnd) - .border( - width = 1.dp, - shape = CircleShape, - color = NekiTheme.colorScheme.primary400, - ) .background( - color = NekiTheme.colorScheme.white, + color = NekiTheme.colorScheme.gray700, shape = CircleShape, ) - .padding(8.dp) - .noRippleClickableSingle(onClick = onClickCameraIcon), + .noRippleClickableSingle(onClick = onClickCameraIcon) + .padding(8.dp), contentAlignment = Alignment.Center, ) { Icon( - imageVector = ImageVector.vectorResource(R.drawable.icon_camera), + imageVector = ImageVector.vectorResource(R.drawable.icon_camera_filled), contentDescription = null, - tint = NekiTheme.colorScheme.primary400, + tint = Color.Unspecified, ) } } diff --git a/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/component/SettingProfileImage.kt b/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/component/SettingProfileImage.kt index a3f1787e8..2d333d9cb 100644 --- a/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/component/SettingProfileImage.kt +++ b/feature/mypage/impl/src/main/java/com/neki/android/feature/mypage/impl/profile/component/SettingProfileImage.kt @@ -16,6 +16,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage @@ -28,7 +29,7 @@ import com.neki.android.core.ui.compose.VerticalSpacer @Composable internal fun SettingProfileImage( nickname: String, - profileImage: Any? = null, + profileImage: String = "", imageSize: Dp = 142.dp, onClickEdit: () -> Unit, ) { @@ -40,9 +41,11 @@ internal fun SettingProfileImage( modifier = Modifier .size(imageSize) .clip(CircleShape), - model = profileImage ?: R.drawable.image_empty_profile_image, + model = profileImage.ifEmpty { R.drawable.image_profile_empty }, contentDescription = null, contentScale = ContentScale.Crop, + placeholder = painterResource(R.drawable.image_profile_empty), + error = painterResource(R.drawable.image_profile_empty), ) VerticalSpacer(16.dp) Row( diff --git a/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/main/component/PeopleCountBottomSheet.kt b/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/main/component/PeopleCountBottomSheet.kt index 9ee314fd8..59989fcd3 100644 --- a/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/main/component/PeopleCountBottomSheet.kt +++ b/feature/pose/impl/src/main/java/com/neki/android/feature/pose/impl/main/component/PeopleCountBottomSheet.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.ModalBottomSheet @@ -75,6 +76,7 @@ private fun PeopleCountBottomSheetContent( ) { if (item == selectedItem) { Icon( + modifier = Modifier.size(24.dp), imageVector = ImageVector.vectorResource(R.drawable.icon_check), contentDescription = null, tint = NekiTheme.colorScheme.primary500,