Skip to content

Commit 4c8f5b1

Browse files
OjongseokOjongseok
committed
[fix] #60 '카드 상세' PhotoBoothDetailContent, PhotoBoothDetailCard 네이밍 변경
1 parent d50eed1 commit 4c8f5b1

4 files changed

Lines changed: 257 additions & 152 deletions

File tree

‎feature/map/impl/src/main/java/com/neki/android/feature/map/impl/MapScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import com.neki.android.core.ui.toast.NekiToast
4646
import com.neki.android.feature.map.impl.component.AnchoredDraggablePanel
4747
import com.neki.android.feature.map.impl.component.DirectionBottomSheet
4848
import com.neki.android.feature.map.impl.component.MapRefreshChip
49-
import com.neki.android.feature.map.impl.component.PhotoBoothDetailCard
49+
import com.neki.android.feature.map.impl.component.PhotoBoothDetailContent
5050
import com.neki.android.feature.map.impl.component.PhotoBoothMarker
5151
import com.neki.android.feature.map.impl.component.ToMapChip
5252
import com.neki.android.feature.map.impl.const.MapConst
@@ -321,7 +321,7 @@ fun MapScreen(
321321
)
322322
} else if (uiState.dragLevel == DragLevel.INVISIBLE) {
323323
uiState.mapMarkers.find { it.isFocused }?.let { focusedPhotoBooth ->
324-
PhotoBoothDetailCard(
324+
PhotoBoothDetailContent(
325325
photoBooth = focusedPhotoBooth,
326326
modifier = Modifier.align(Alignment.BottomCenter),
327327
isCurrentLocation = locationTrackingMode == LocationTrackingMode.Follow,

‎feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothCard.kt‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -31,89 +31,89 @@ import com.neki.android.core.model.PhotoBooth
3131
import com.neki.android.core.ui.compose.HorizontalSpacer
3232
import com.neki.android.core.ui.compose.VerticalSpacer
3333

34-
@Composable
35-
internal fun PhotoBoothCard(
36-
photoBooth: PhotoBooth,
37-
modifier: Modifier = Modifier,
38-
onClick: () -> Unit = {},
39-
onClickDirection: () -> Unit = {},
40-
) {
41-
Row(
42-
modifier = modifier
43-
.fillMaxWidth()
44-
.cardShadow(shape = RoundedCornerShape(20.dp))
45-
.background(
46-
shape = RoundedCornerShape(20.dp),
47-
color = NekiTheme.colorScheme.white,
48-
)
49-
.noRippleClickableSingle(onClick = onClick)
50-
.padding(16.dp),
51-
verticalAlignment = Alignment.CenterVertically,
52-
) {
53-
AsyncImage(
54-
modifier = Modifier
55-
.clip(RoundedCornerShape(8.dp))
56-
.size(64.dp),
57-
model = photoBooth.imageUrl,
58-
placeholder = painterResource(R.drawable.icon_life_four_cut),
59-
error = painterResource(R.drawable.icon_life_four_cut),
60-
contentDescription = null,
61-
)
62-
HorizontalSpacer(16.dp)
63-
Column {
64-
Row(
65-
verticalAlignment = Alignment.CenterVertically,
66-
) {
67-
Text(
68-
text = photoBooth.brandName,
69-
color = NekiTheme.colorScheme.gray900,
70-
style = NekiTheme.typography.title18Bold,
71-
)
72-
HorizontalSpacer(4.dp)
73-
Text(
74-
text = photoBooth.branchName,
75-
color = NekiTheme.colorScheme.gray600,
76-
style = NekiTheme.typography.caption12Medium,
77-
)
78-
}
79-
VerticalSpacer(4.dp)
80-
Text(
81-
text = photoBooth.distance.formatDistance(),
82-
color = NekiTheme.colorScheme.gray400,
83-
style = NekiTheme.typography.caption12Medium,
84-
)
85-
}
86-
HorizontalSpacer(1f)
87-
Box(
88-
modifier = Modifier
89-
.background(
90-
shape = CircleShape,
91-
color = NekiTheme.colorScheme.gray900,
92-
)
93-
.noRippleClickableSingle(onClick = onClickDirection)
94-
.padding(4.dp),
95-
contentAlignment = Alignment.Center,
96-
) {
97-
Icon(
98-
modifier = Modifier.size(24.dp),
99-
imageVector = ImageVector.vectorResource(R.drawable.icon_find_direction),
100-
contentDescription = null,
101-
tint = Color.Unspecified,
102-
)
103-
}
104-
}
105-
}
106-
107-
@ComponentPreview
108-
@Composable
109-
private fun PhotoBoothCardPreview() {
110-
NekiTheme {
111-
PhotoBoothCard(
112-
photoBooth = PhotoBooth(
113-
brandName = "인생네컷",
114-
branchName = "사당역점",
115-
distance = 300,
116-
),
117-
)
118-
}
119-
}
34+
//@Composable
35+
//internal fun PhotoBoothCard(
36+
// photoBooth: PhotoBooth,
37+
// modifier: Modifier = Modifier,
38+
// onClick: () -> Unit = {},
39+
// onClickDirection: () -> Unit = {},
40+
//) {
41+
// Row(
42+
// modifier = modifier
43+
// .fillMaxWidth()
44+
// .cardShadow(shape = RoundedCornerShape(20.dp))
45+
// .background(
46+
// shape = RoundedCornerShape(20.dp),
47+
// color = NekiTheme.colorScheme.white,
48+
// )
49+
// .noRippleClickableSingle(onClick = onClick)
50+
// .padding(16.dp),
51+
// verticalAlignment = Alignment.CenterVertically,
52+
// ) {
53+
// AsyncImage(
54+
// modifier = Modifier
55+
// .clip(RoundedCornerShape(8.dp))
56+
// .size(64.dp),
57+
// model = photoBooth.imageUrl,
58+
// placeholder = painterResource(R.drawable.icon_life_four_cut),
59+
// error = painterResource(R.drawable.icon_life_four_cut),
60+
// contentDescription = null,
61+
// )
62+
// HorizontalSpacer(16.dp)
63+
// Column {
64+
// Row(
65+
// verticalAlignment = Alignment.CenterVertically,
66+
// ) {
67+
// Text(
68+
// text = photoBooth.brandName,
69+
// color = NekiTheme.colorScheme.gray900,
70+
// style = NekiTheme.typography.title18Bold,
71+
// )
72+
// HorizontalSpacer(4.dp)
73+
// Text(
74+
// text = photoBooth.branchName,
75+
// color = NekiTheme.colorScheme.gray600,
76+
// style = NekiTheme.typography.caption12Medium,
77+
// )
78+
// }
79+
// VerticalSpacer(4.dp)
80+
// Text(
81+
// text = photoBooth.distance.formatDistance(),
82+
// color = NekiTheme.colorScheme.gray400,
83+
// style = NekiTheme.typography.caption12Medium,
84+
// )
85+
// }
86+
// HorizontalSpacer(1f)
87+
// Box(
88+
// modifier = Modifier
89+
// .background(
90+
// shape = CircleShape,
91+
// color = NekiTheme.colorScheme.gray900,
92+
// )
93+
// .noRippleClickableSingle(onClick = onClickDirection)
94+
// .padding(4.dp),
95+
// contentAlignment = Alignment.Center,
96+
// ) {
97+
// Icon(
98+
// modifier = Modifier.size(24.dp),
99+
// imageVector = ImageVector.vectorResource(R.drawable.icon_find_direction),
100+
// contentDescription = null,
101+
// tint = Color.Unspecified,
102+
// )
103+
// }
104+
// }
105+
//}
106+
//
107+
//@ComponentPreview
108+
//@Composable
109+
//private fun PhotoBoothCardPreview() {
110+
// NekiTheme {
111+
// PhotoBoothCard(
112+
// photoBooth = PhotoBooth(
113+
// brandName = "인생네컷",
114+
// branchName = "사당역점",
115+
// distance = 300,
116+
// ),
117+
// )
118+
// }
119+
//}

‎feature/map/impl/src/main/java/com/neki/android/feature/map/impl/component/PhotoBoothDetailCard.kt‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)