[fix] #60 네트워크 브랜드 이미지 캐싱 로직 변경

Author: Ojongseok

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

@@ -1,17 +1,21 @@
 package com.neki.android.feature.map.impl
 
+import androidx.compose.ui.graphics.ImageBitmap
 import com.neki.android.core.model.Brand
 import com.neki.android.core.model.PhotoBooth
 import com.neki.android.feature.map.impl.const.DirectionApp
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
 
 data class MapState(
     val isLoading: Boolean = false,
     val currentLocLatLng: LocLatLng? = null,
     val isCameraOnCurrentLocation: Boolean = false,
     val dragLevel: DragLevel = DragLevel.FIRST,
     val brands: ImmutableList<Brand> = persistentListOf(),
+    val brandImageCache: ImmutableMap<String, ImageBitmap> = persistentMapOf(),
     val mapMarkers: ImmutableList<PhotoBooth> = persistentListOf(),
     val nearbyPhotoBooths: ImmutableList<PhotoBooth> = persistentListOf(),
     val isShowInfoDialog: Boolean = false,

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

@@ -16,7 +16,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
@@ -51,7 +50,6 @@ import com.neki.android.feature.map.impl.component.PhotoBoothMarker
 import com.neki.android.feature.map.impl.component.ToMapChip
 import com.neki.android.feature.map.impl.const.MapConst
 import com.neki.android.feature.map.impl.util.DirectionHelper
-import com.neki.android.feature.map.impl.util.rememberCachedBrandImage
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalNaverMapApi::class)
@@ -72,7 +70,6 @@ fun MapRoute(
             MapConst.DEFAULT_ZOOM_LEVEL,
         )
     }
-    val brandImageCache = rememberCachedBrandImage(uiState.brands)
     var isNavigatedToSettings by remember { mutableStateOf(false) }
 
     val locationPermissionLauncher = rememberLauncherForActivityResult(
@@ -185,7 +182,6 @@ fun MapRoute(
         onIntent = viewModel.store::onIntent,
         locationTrackingMode = locationTrackingMode,
         cameraPositionState = cameraPositionState,
-        brandImageCache = brandImageCache,
     )
 }
 
@@ -198,7 +194,6 @@ fun MapScreen(
     cameraPositionState: CameraPositionState = rememberCameraPositionState {
         position = CameraPosition(LatLng(MapConst.DEFAULT_LATITUDE, MapConst.DEFAULT_LONGITUDE), MapConst.DEFAULT_ZOOM_LEVEL)
     },
-    brandImageCache: Map<String, ImageBitmap> = emptyMap(),
 ) {
     val mapProperties = remember(locationTrackingMode) {
         MapProperties(
@@ -227,11 +222,9 @@ fun MapScreen(
             },
         ) {
             uiState.mapMarkers.filter { it.isCheckedBrand }.forEach { photoBooth ->
-                val cachedBitmap = brandImageCache[photoBooth.imageUrl]
                 PhotoBoothMarker(
                     photoBooth = photoBooth,
-                    isFocused = photoBooth.isFocused,
-                    cachedBitmap = cachedBitmap,
+                    cachedBitmap = uiState.brandImageCache[photoBooth.imageUrl],
                     onClick = {
                         onIntent(MapIntent.ClickPhotoBoothMarker(LocLatLng(photoBooth.latitude, photoBooth.longitude)))
                     },

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

@@ -2,8 +2,15 @@ package com.neki.android.feature.map.impl
 
 import android.annotation.SuppressLint
 import android.content.Context
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import coil3.ImageLoader
+import coil3.request.ImageRequest
+import coil3.request.SuccessResult
+import coil3.request.allowHardware
+import coil3.toBitmap
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.Priority
 import com.google.android.gms.tasks.CancellationTokenSource
@@ -19,7 +26,10 @@ import com.neki.android.feature.map.impl.util.calculateDistance
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @HiltViewModel
@@ -283,13 +293,43 @@ class MapViewModel @Inject constructor(
             mapRepository.getBrands()
                 .onSuccess { loadedBrands ->
                     reduce { copy(isLoading = false, brands = loadedBrands.toImmutableList()) }
+                    cacheBrandImages(loadedBrands, reduce)
                 }
                 .onFailure {
                     reduce { copy(isLoading = false) }
                 }
         }
     }
 
+    private fun cacheBrandImages(
+        brands: List<Brand>,
+        reduce: (MapState.() -> MapState) -> Unit,
+    ) {
+        viewModelScope.launch {
+            val imageLoader = ImageLoader(context)
+            val cache = mutableMapOf<String, ImageBitmap>()
+
+            brands.forEach { brand ->
+                if (brand.imageUrl.isNotEmpty()) {
+                    val request = ImageRequest.Builder(context)
+                        .data(brand.imageUrl)
+                        .allowHardware(false)
+                        .build()
+
+                    val result = withContext(Dispatchers.IO) {
+                        imageLoader.execute(request)
+                    }
+
+                    if (result is SuccessResult) {
+                        cache[brand.imageUrl] = result.image.toBitmap().asImageBitmap()
+                    }
+                }
+            }
+
+            reduce { copy(brandImageCache = cache.toImmutableMap()) }
+        }
+    }
+
     private fun loadNearbyPhotoBooths(
         longitude: Double?,
         latitude: Double?,

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

@@ -46,12 +46,11 @@ import com.neki.android.feature.map.impl.const.MapConst.MARKER_TRIANGLE_WIDTH
 @Composable
 internal fun PhotoBoothMarker(
     photoBooth: PhotoBooth,
-    isFocused: Boolean = false,
     cachedBitmap: ImageBitmap? = null,
     onClick: () -> Unit = {},
 ) {
     MarkerComposable(
-        keys = arrayOf("$isFocused", photoBooth.imageUrl, "${cachedBitmap != null}"),
+        keys = arrayOf("${photoBooth.id}", "${photoBooth.isFocused}", "$cachedBitmap"),
         state = rememberUpdatedMarkerState(
             position = LatLng(photoBooth.latitude, photoBooth.longitude),
         ),
@@ -65,7 +64,7 @@ internal fun PhotoBoothMarker(
     ) {
         PhotoBoothMarkerContent(
             cachedBitmap = cachedBitmap,
-            isFocused = isFocused,
+            isFocused = photoBooth.isFocused,
         )
     }
 }