[Feat] 한 눈에 보기 화면 Compose 마이그레이션

app/src/main/java/com/daedan/festabook/di/FestaBookAppGraph.kt

@@ -8,7 +8,6 @@ import com.daedan.festabook.di.viewmodel.MetroViewModelFactory
 import com.daedan.festabook.logging.DefaultFirebaseLogger
 import com.daedan.festabook.presentation.main.MainActivity
 import com.daedan.festabook.presentation.placeDetail.PlaceDetailActivity
-import com.daedan.festabook.presentation.placeMap.placeList.behavior.PlaceListBottomSheetBehavior
 import com.daedan.festabook.presentation.schedule.ScheduleViewModel
 import com.daedan.festabook.presentation.splash.SplashActivity
 import com.google.android.play.core.appupdate.AppUpdateManager
@@ -34,8 +33,6 @@ interface FestaBookAppGraph {
 
     fun inject(activity: PlaceDetailActivity)
 
-    fun inject(placeListBottomSheetBehavior: PlaceListBottomSheetBehavior<*>)
-
     // splashActivity
     @Provides
     fun provideAppUpdateManager(application: Application): AppUpdateManager = AppUpdateManagerFactory.create(application)

app/src/main/java/com/daedan/festabook/presentation/common/FragmentUtil.kt

@@ -8,12 +8,10 @@ import android.os.Parcelable
 import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
-import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import com.daedan.festabook.R
 import com.daedan.festabook.data.util.ApiResultException
-import com.daedan.festabook.presentation.placeMap.placeList.behavior.PlaceListBottomSheetFollowBehavior
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import java.io.Serializable
@@ -128,8 +126,3 @@ fun Activity.showSnackBar(msg: String) {
         }.setActionTextColor(getColor(R.color.blue400))
     snackBar.show()
 }
-
-fun View.placeListBottomSheetFollowBehavior(): PlaceListBottomSheetFollowBehavior? {
-    val params = layoutParams as? CoordinatorLayout.LayoutParams
-    return params?.behavior as? PlaceListBottomSheetFollowBehavior
-}

app/src/main/java/com/daedan/festabook/presentation/common/component/CoilImage.kt

@@ -12,6 +12,7 @@ import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import coil3.request.crossfade
 import com.daedan.festabook.R
+import com.daedan.festabook.presentation.common.convertImageUrl
 
 @Composable
 fun CoilImage(
@@ -26,7 +27,7 @@ fun CoilImage(
             ImageRequest
                 .Builder(LocalContext.current)
                 .apply(builder)
-                .data(url)
+                .data(url.convertImageUrl())
                 .crossfade(true)
                 .build(),
         contentDescription = contentDescription,

app/src/main/java/com/daedan/festabook/presentation/placeMap/PlaceMapViewModel.kt

@@ -22,6 +22,7 @@ import com.daedan.festabook.presentation.placeMap.model.toUiModel
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesIntoMap
 import dev.zacsweers.metro.Inject
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -67,6 +68,15 @@ class PlaceMapViewModel(
     private val _isExceededMaxLength: MutableLiveData<Boolean> = MutableLiveData()
     val isExceededMaxLength: LiveData<Boolean> = _isExceededMaxLength
 
+    val isExceededMaxLengthFlow: StateFlow<Boolean> =
+        _isExceededMaxLength
+            .asFlow()
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.Lazily,
+                initialValue = false,
+            )
+
     private val _backToInitialPositionClicked: MutableLiveData<Event<Unit>> = MutableLiveData()
     val backToInitialPositionClicked: LiveData<Event<Unit>> = _backToInitialPositionClicked
 
@@ -76,6 +86,10 @@ class PlaceMapViewModel(
     private val _onMapViewClick: MutableLiveData<Event<Unit>> = MutableLiveData()
     val onMapViewClick: LiveData<Event<Unit>> = _onMapViewClick
 
+    val onMapViewClickFlow: Flow<Event<Unit>> =
+        _onMapViewClick
+            .asFlow()
+
     init {
         loadOrganizationGeography()
         loadTimeTags()

app/src/main/java/com/daedan/festabook/presentation/placeMap/component/PlaceCategoryLabel.kt

@@ -0,0 +1,79 @@
+package com.daedan.festabook.presentation.placeMap.component
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardColors
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+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.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.daedan.festabook.presentation.placeMap.model.PlaceCategoryUiModel
+import com.daedan.festabook.presentation.placeMap.model.getIconId
+import com.daedan.festabook.presentation.placeMap.model.getLabelColor
+import com.daedan.festabook.presentation.placeMap.model.getTextId
+import com.daedan.festabook.presentation.theme.festabookShapes
+import kotlin.math.roundToInt
+
+@Composable
+fun PlaceCategoryLabel(
+    category: PlaceCategoryUiModel,
+    modifier: Modifier = Modifier,
+    iconColor: Color = category.getLabelColor(),
+) {
+    Card(
+        shape = festabookShapes.radius1,
+        colors =
+            CardColors(
+                containerColor = getBackgroundColor(iconColor),
+                contentColor = Color.Unspecified,
+                disabledContainerColor = getBackgroundColor(iconColor),
+                disabledContentColor = Color.Unspecified,
+            ),
+        modifier = modifier,
+    ) {
+        Row(
+            modifier = Modifier.padding(horizontal = 4.dp, vertical = 2.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                painter = painterResource(category.getIconId()),
+                contentDescription = stringResource(category.getTextId()),
+                tint = iconColor,
+                modifier = Modifier.size(12.dp),
+            )
+            Text(
+                modifier = Modifier.padding(start = 4.dp),
+                text = stringResource(category.getTextId()),
+                style = MaterialTheme.typography.labelMedium,
+            )
+        }
+    }
+}
+
+private fun getBackgroundColor(color: Color): Color {
+    // 10% 투명도를 가지게 변경
+    val alpha = (MAX_ALPHA * ALPHA_RATIO).roundToInt()
+    return color.copy(alpha = alpha / MAX_ALPHA.toFloat())
+}
+
+private const val MAX_ALPHA = 255
+private const val ALPHA_RATIO = 0.10f
+
+@Preview(showBackground = true)
+@Composable
+private fun PlaceCategoryLabelPreview() {
+    val category = PlaceCategoryUiModel.FOOD_TRUCK
+    PlaceCategoryLabel(
+        category = category,
+        iconColor = Color(0xFF00AB40),
+    )
+}

app/src/main/java/com/daedan/festabook/presentation/placeMap/component/PlaceMapScreen.kt

@@ -5,16 +5,41 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.daedan.festabook.domain.model.TimeTag
+import com.daedan.festabook.presentation.placeMap.model.PlaceCategoryUiModel
+import com.daedan.festabook.presentation.placeMap.model.PlaceUiModel
+import com.daedan.festabook.presentation.placeMap.placeCategory.component.PlaceCategoryScreen
 import com.daedan.festabook.presentation.placeMap.timeTagSpinner.component.TimeTagMenu
 import com.daedan.festabook.presentation.theme.FestabookColor
+import com.daedan.festabook.presentation.theme.FestabookTheme
 import com.naver.maps.map.NaverMap
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun PlaceMapScreen(
+    timeTagTitle: String,
+    timeTags: List<TimeTag>,
+    places: List<PlaceUiModel>,
+    modifier: Modifier = Modifier,
+    onMapReady: (NaverMap) -> Unit = {},
+    onPlaceClick: (PlaceUiModel) -> Unit = {},
+    onTimeTagClick: (TimeTag) -> Unit = {},
+) {
+    PlaceMapContent(
+        title = timeTagTitle,
+        timeTags = timeTags,
+        onMapReady = onMapReady,
+        onTimeTagClick = onTimeTagClick,
+    )
+}
+
+@Composable
+private fun PlaceMapContent(
     timeTags: List<TimeTag>,
     title: String,
     onMapReady: (NaverMap) -> Unit,
@@ -42,6 +67,35 @@ fun PlaceMapScreen(
                             ).padding(horizontal = 24.dp),
                 )
             }
+            PlaceCategoryScreen()
         }
     }
 }
+
+@Preview(showBackground = true)
+@Composable
+private fun PlaceMapScreenPreview() {
+    FestabookTheme {
+        PlaceMapScreen(
+            timeTagTitle = "테스트",
+            timeTags =
+                listOf(
+                    TimeTag(1, "테스트1"),
+                    TimeTag(2, "테스트2"),
+                ),
+            places =
+                (0..100).map {
+                    PlaceUiModel(
+                        id = it.toLong(),
+                        imageUrl = null,
+                        title = "테스트테스트테스트테스트테스트테스트테스트테스트테스트테스트",
+                        description = "테스트테스트테스트테스트테스트테스트테스트테스트테스트테스트테스트",
+                        location = "테스트테스트테스트테스트테스트테스트테스트테스트테스트",
+                        category = PlaceCategoryUiModel.BAR,
+                        isBookmarked = true,
+                        timeTagId = listOf(1),
+                    )
+                },
+        )
+    }
+}

app/src/main/java/com/daedan/festabook/presentation/placeMap/model/PlaceCategoryUiModel.kt

@@ -1,5 +1,6 @@
 package com.daedan.festabook.presentation.placeMap.model
 
+import androidx.compose.ui.graphics.Color
 import com.daedan.festabook.R
 import com.daedan.festabook.domain.model.PlaceCategory
 import com.daedan.festabook.presentation.placeMap.mapManager.internal.OverlayImageManager
@@ -65,6 +66,14 @@ val PlaceCategoryUiModel.Companion.iconResources: List<Int>
             R.drawable.ic_extra_selected,
         )
 
+fun PlaceCategoryUiModel.getLabelColor() =
+    when (this) {
+        PlaceCategoryUiModel.BOOTH -> Color(0xFF0094FF)
+        PlaceCategoryUiModel.FOOD_TRUCK -> Color(0xFF00AB40)
+        PlaceCategoryUiModel.BAR -> Color(0xFFFF9D00)
+        else -> Color.Unspecified
+    }
+
 fun OverlayImageManager.getNormalIcon(category: PlaceCategoryUiModel): OverlayImage? =
     when (category) {
         PlaceCategoryUiModel.BOOTH -> getImage(R.drawable.ic_booth)

app/src/main/java/com/daedan/festabook/presentation/placeMap/model/PlaceListUiState.kt

@@ -14,6 +14,4 @@ sealed interface PlaceListUiState<T> {
     data class Error<T>(
         val throwable: Throwable,
     ) : PlaceListUiState<T>
-
-    class Complete<T> : PlaceListUiState<T>
 }