[feat] #52 네컷지도 API 연동 및 UX 개선

app/src/main/java/com/neki/android/app/ui/BottomNavigationBar.kt

@@ -53,7 +53,7 @@ fun BottomNavigationBar(
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(horizontal = 20.dp),
+                    .padding(horizontal = 19.5.dp, vertical = 2.dp),
                 horizontalArrangement = Arrangement.spacedBy(16.dp),
             ) {
                 tabs.forEach { tab ->
@@ -86,12 +86,12 @@ fun BottomNavigationBarItem(
         color = NekiTheme.colorScheme.white,
     ) {
         Column(
-            modifier = Modifier.padding(vertical = 4.dp),
+            modifier = Modifier.padding(vertical = 1.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.spacedBy(4.dp),
         ) {
             Icon(
-                modifier = Modifier.size(24.dp),
+                modifier = Modifier.size(26.dp),
                 imageVector = ImageVector.vectorResource(icon),
                 contentDescription = stringResource(tab.iconStringRes),
                 tint = iconColor,

core/common/src/main/java/com/neki/android/core/common/permission/LocationPermissionManager.kt

@@ -12,7 +12,7 @@ object LocationPermissionManager {
         Manifest.permission.ACCESS_COARSE_LOCATION,
     )
 
-    fun hasLocationPermission(context: Context): Boolean {
+    fun isGrantedLocationPermission(context: Context): Boolean {
         return ContextCompat.checkSelfPermission(
             context,
             Manifest.permission.ACCESS_FINE_LOCATION,

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/MapRepository.kt

@@ -0,0 +1,20 @@
+package com.neki.android.core.dataapi.repository
+
+import com.neki.android.core.model.Brand
+import com.neki.android.core.model.PhotoBooth
+
+interface MapRepository {
+    suspend fun getBrands(): Result<List<Brand>>
+
+    suspend fun getPhotoBoothsByPoint(
+        longitude: Double?,
+        latitude: Double?,
+        radiusInMeters: Int,
+        brandIds: List<Long>,
+    ): Result<List<PhotoBooth>>
+
+    suspend fun getPhotoBoothsByPolygon(
+        coordinates: List<Pair<Double, Double>>,
+        brandIds: List<Long>,
+    ): Result<List<PhotoBooth>>
+}

core/data/src/main/java/com/neki/android/core/data/remote/api/MapService.kt

@@ -0,0 +1,38 @@
+package com.neki.android.core.data.remote.api
+
+import com.neki.android.core.data.remote.model.request.PhotoBoothPointRequest
+import com.neki.android.core.data.remote.model.request.PhotoBoothPolygonRequest
+import com.neki.android.core.data.remote.model.response.BasicResponse
+import com.neki.android.core.data.remote.model.response.BrandResponse
+import com.neki.android.core.data.remote.model.response.PhotoBoothPointResponse
+import com.neki.android.core.data.remote.model.response.PhotoBoothPolygonResponse
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import io.ktor.client.request.setBody
+import javax.inject.Inject
+
+class MapService @Inject constructor(
+    private val client: HttpClient,
+) {
+    suspend fun getBrands(): BasicResponse<List<BrandResponse>> {
+        return client.get("/api/photo-booths/brand").body()
+    }
+
+    suspend fun getPhotoBoothsByPoint(
+        request: PhotoBoothPointRequest,
+    ): BasicResponse<PhotoBoothPointResponse> {
+        return client.post("/api/photo-booths/point") {
+            setBody(request)
+        }.body()
+    }
+
+    suspend fun getPhotoBoothsByPolygon(
+        request: PhotoBoothPolygonRequest,
+    ): BasicResponse<PhotoBoothPolygonResponse> {
+        return client.post("/api/photo-booths/polygon") {
+            setBody(request)
+        }.body()
+    }
+}

core/data/src/main/java/com/neki/android/core/data/remote/model/request/PhotoBoothPointRequest.kt

@@ -0,0 +1,12 @@
+package com.neki.android.core.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PhotoBoothPointRequest(
+    @SerialName("longitude") val longitude: Double?,
+    @SerialName("latitude") val latitude: Double?,
+    @SerialName("radiusInMeters") val radiusInMeters: Int,
+    @SerialName("brandIds") val brandIds: List<Long>,
+)

core/data/src/main/java/com/neki/android/core/data/remote/model/request/PhotoBoothPolygonRequest.kt

@@ -0,0 +1,16 @@
+package com.neki.android.core.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PhotoBoothPolygonRequest(
+    @SerialName("coordinates") val coordinates: List<Coordinate>,
+    @SerialName("brandIds") val brandIds: List<Long>,
+)
+
+@Serializable
+data class Coordinate(
+    @SerialName("longitude") val longitude: Double,
+    @SerialName("latitude") val latitude: Double,
+)

core/data/src/main/java/com/neki/android/core/data/remote/model/response/BrandResponse.kt

@@ -0,0 +1,22 @@
+package com.neki.android.core.data.remote.model.response
+
+import com.neki.android.core.model.Brand
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BrandResponse(
+    @SerialName("id") val id: Long,
+    @SerialName("name") val name: String,
+    @SerialName("code") val code: String,
+    @SerialName("imageUrl") val imageUrl: String,
+) {
+    internal fun toModel(): Brand = Brand(
+        id = id,
+        name = name,
+        code = code,
+        imageUrl = imageUrl,
+    )
+}
+
+internal fun List<BrandResponse>.toModels(): List<Brand> = map { it.toModel() }

core/data/src/main/java/com/neki/android/core/data/remote/model/response/PhotoBoothPointResponse.kt

@@ -0,0 +1,33 @@
+package com.neki.android.core.data.remote.model.response
+
+import com.neki.android.core.model.PhotoBooth
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PhotoBoothPointResponse(
+    @SerialName("items") val items: List<Item>,
+) {
+    @Serializable
+    data class Item(
+        @SerialName("id") val id: Long,
+        @SerialName("brandName") val brandName: String,
+        @SerialName("branchName") val branchName: String,
+        @SerialName("address") val address: String,
+        @SerialName("longitude") val longitude: Double,
+        @SerialName("latitude") val latitude: Double,
+        @SerialName("distance") val distance: Int,
+    ) {
+        internal fun toModel(): PhotoBooth = PhotoBooth(
+            id = id,
+            brandName = brandName,
+            branchName = branchName,
+            address = address,
+            longitude = longitude,
+            latitude = latitude,
+            distance = distance,
+        )
+    }
+
+    internal fun toModels(): List<PhotoBooth> = items.map { it.toModel() }
+}

core/data/src/main/java/com/neki/android/core/data/remote/model/response/PhotoBoothPolygonResponse.kt

@@ -0,0 +1,31 @@
+package com.neki.android.core.data.remote.model.response
+
+import com.neki.android.core.model.PhotoBooth
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PhotoBoothPolygonResponse(
+    @SerialName("items") val items: List<Item>,
+) {
+    @Serializable
+    data class Item(
+        @SerialName("id") val id: Long,
+        @SerialName("brandName") val brandName: String,
+        @SerialName("branchName") val branchName: String,
+        @SerialName("address") val address: String,
+        @SerialName("longitude") val longitude: Double,
+        @SerialName("latitude") val latitude: Double,
+    ) {
+        internal fun toModel(): PhotoBooth = PhotoBooth(
+            id = id,
+            brandName = brandName,
+            branchName = branchName,
+            address = address,
+            longitude = longitude,
+            latitude = latitude,
+        )
+    }
+
+    internal fun toModels(): List<PhotoBooth> = items.map { it.toModel() }
+}

core/data/src/main/java/com/neki/android/core/data/repository/di/RepositoryModule.kt

@@ -4,12 +4,14 @@ import com.neki.android.core.data.auth.AuthEventManagerImpl
 import com.neki.android.core.data.repository.impl.AuthRepositoryImpl
 import com.neki.android.core.data.repository.impl.DataStoreRepositoryImpl
 import com.neki.android.core.data.repository.impl.MediaUploadRepositoryImpl
+import com.neki.android.core.data.repository.impl.MapRepositoryImpl
 import com.neki.android.core.data.repository.impl.PhotoRepositoryImpl
 import com.neki.android.core.data.repository.impl.TokenRepositoryImpl
 import com.neki.android.core.dataapi.auth.AuthEventManager
 import com.neki.android.core.dataapi.repository.AuthRepository
 import com.neki.android.core.dataapi.repository.DataStoreRepository
 import com.neki.android.core.dataapi.repository.MediaUploadRepository
+import com.neki.android.core.dataapi.repository.MapRepository
 import com.neki.android.core.dataapi.repository.PhotoRepository
 import com.neki.android.core.dataapi.repository.TokenRepository
 import dagger.Binds
@@ -57,4 +59,10 @@ internal interface RepositoryModule {
     fun bindPhotoRepositoryImpl(
         photoRepositoryImpl: PhotoRepositoryImpl,
     ): PhotoRepository
+
+    @Binds
+    @Singleton
+    fun bindMapRepositoryImpl(
+        mapRepositoryImpl: MapRepositoryImpl,
+    ): MapRepository
 }

core/data/src/main/java/com/neki/android/core/data/repository/impl/MapRepositoryImpl.kt

@@ -0,0 +1,50 @@
+package com.neki.android.core.data.repository.impl
+
+import com.neki.android.core.data.remote.api.MapService
+import com.neki.android.core.data.remote.model.request.Coordinate
+import com.neki.android.core.data.remote.model.request.PhotoBoothPointRequest
+import com.neki.android.core.data.remote.model.request.PhotoBoothPolygonRequest
+import com.neki.android.core.data.remote.model.response.toModels
+import com.neki.android.core.data.util.runSuspendCatching
+import com.neki.android.core.dataapi.repository.MapRepository
+import com.neki.android.core.model.Brand
+import com.neki.android.core.model.PhotoBooth
+import javax.inject.Inject
+
+class MapRepositoryImpl @Inject constructor(
+    private val mapService: MapService,
+) : MapRepository {
+    override suspend fun getBrands(): Result<List<Brand>> = runSuspendCatching {
+        mapService.getBrands().data.toModels()
+    }
+
+    override suspend fun getPhotoBoothsByPoint(
+        longitude: Double?,
+        latitude: Double?,
+        radiusInMeters: Int,
+        brandIds: List<Long>,
+    ): Result<List<PhotoBooth>> = runSuspendCatching {
+        mapService.getPhotoBoothsByPoint(
+            request = PhotoBoothPointRequest(
+                longitude = longitude,
+                latitude = latitude,
+                radiusInMeters = radiusInMeters,
+                brandIds = brandIds,
+            ),
+        ).data.toModels()
+    }
+
+    override suspend fun getPhotoBoothsByPolygon(
+        coordinates: List<Pair<Double, Double>>,
+        brandIds: List<Long>,
+    ): Result<List<PhotoBooth>> = runSuspendCatching {
+        mapService.getPhotoBoothsByPolygon(
+            request = PhotoBoothPolygonRequest(
+                coordinates = coordinates.map { (longitude, latitude) ->
+                    Coordinate(longitude = longitude, latitude = latitude)
+                },
+                brandIds = brandIds,
+            ),
+        ).data.toModels()
+    }
+}

core/model/src/main/java/com/neki/android/core/model/Brand.kt

@@ -2,6 +2,8 @@ package com.neki.android.core.model
 
 data class Brand(
     val isChecked: Boolean = false,
-    val brandName: String = "",
-    val brandImageRes: Int = 0,
+    val id: Long = 0L,
+    val name: String = "",
+    val code: String = "",
+    val imageUrl: String = "",
 )

core/model/src/main/java/com/neki/android/core/model/PhotoBooth.kt

@@ -0,0 +1,14 @@
+package com.neki.android.core.model
+
+data class PhotoBooth(
+    val isFocused: Boolean = false,
+    val isCheckedBrand: Boolean = true,
+    val id: Long = 0L,
+    val brandName: String = "",
+    val branchName: String = "",
+    val address: String = "",
+    val longitude: Double = 0.0,
+    val latitude: Double = 0.0,
+    val distance: Int = 0,
+    val imageUrl: String = "",
+)

feature/map/impl/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     implementation(projects.feature.map.api)
     api(libs.map.sdk)
     implementation(libs.naver.map.compose)
+    implementation(libs.play.services.location)
 
     implementation(libs.kotlinx.collections.immutable)
     implementation(libs.coil.compose)