Refactor/#134 kakao to naver

app/build.gradle.kts

@@ -28,6 +28,8 @@ android {
         buildConfigField("String", "BASE_URL", properties["base.url"].toString())
         buildConfigField("String", "KAKAO_NATIVE_KEY", properties["kakao.native.key"].toString())
         buildConfigField("String", "KAKAO_REST_API_KEY", properties["kakao.rest.api"].toString())
+        buildConfigField("String", "NAVERMAP_CLIENT_SECRET", properties["NAVERMAP_CLIENT_SECRET"].toString())
+        buildConfigField("String", "NAVERMAP_CLIENT_ID", properties["NAVERMAP_CLIENT_ID"].toString())
 
         manifestPlaceholders["KAKAO_NATIVE_KEY"] = properties["kakao.native.key"].toString()
     }
@@ -103,4 +105,7 @@ dependencies {
 
     //로띠 - 애니메이션
     implementation(libs.lottie.compose)
+
+    // 네이버
+    implementation(libs.bundles.naverMaps)
 }

app/src/main/AndroidManifest.xml

@@ -28,7 +28,6 @@
         <activity
             android:name=".presentation.ui.main.MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.PawKey">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/paw/key/PawKeyApplication.kt

@@ -3,6 +3,7 @@ package com.paw.key
 import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
 import com.kakao.vectormap.KakaoMapSdk
+import com.naver.maps.map.NaverMapSdk
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 import javax.inject.Inject
@@ -12,7 +13,7 @@ import javax.inject.Named
 class PawKeyApplication : Application() {
     @Inject
     @Named("kakao.native.key")
-    lateinit var kakaoNativeKey: String
+    lateinit var kakaoNativeKey: String // BuildConfig는 컴파일 타임에 생성되는 정적 클래스이기 때문에 Mocking이 불가능 = 테스트 용이성
 
     override fun onCreate() {
         super.onCreate()
@@ -21,6 +22,8 @@ class PawKeyApplication : Application() {
         setDarkMode()
 
         KakaoMapSdk.init(this, kakaoNativeKey)
+        NaverMapSdk.getInstance(this).client =
+            NaverMapSdk.NcpKeyClient(BuildConfig.NAVERMAP_CLIENT_ID)
     }
 
     private fun setTimber() {

app/src/main/java/com/paw/key/core/designsystem/component/CourseCard.kt

@@ -27,7 +27,7 @@ import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.paw.key.R
 import com.paw.key.core.designsystem.theme.PawKeyTheme
-import com.paw.key.core.util.noRippleClickable
+import com.paw.key.core.extension.noRippleClickable
 
 @Composable
 fun CourseCard(

app/src/main/java/com/paw/key/core/designsystem/component/FeedbackItem.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import com.paw.key.core.designsystem.theme.PawKeyTheme
-import com.paw.key.core.util.noRippleClickable
+import com.paw.key.core.extension.noRippleClickable
 
 @Composable
 fun FeedbackItem(

app/src/main/java/com/paw/key/core/designsystem/component/PawkeyButton.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.paw.key.core.designsystem.theme.PawKeyTheme
-import com.paw.key.core.util.noRippleClickable
+import com.paw.key.core.extension.noRippleClickable
 
 
 @Preview(showBackground = true)

app/src/main/java/com/paw/key/core/designsystem/component/SubChip.kt

@@ -1,7 +1,6 @@
 package com.paw.key.core.designsystem.component
 
 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.shape.RoundedCornerShape
@@ -11,7 +10,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.paw.key.core.designsystem.theme.PawKeyTheme
-import com.paw.key.core.util.noRippleClickable
+import com.paw.key.core.extension.noRippleClickable
 
 @Preview
 @Composable

app/src/main/java/com/paw/key/core/designsystem/component/TopBar.kt

@@ -15,13 +15,14 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.paw.key.R
 import com.paw.key.core.designsystem.theme.PawKeyTheme
-import com.paw.key.core.util.noRippleClickable
+import com.paw.key.core.extension.noRippleClickable
 
 @Composable
 fun TopBar(
     title: String,
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
+    onClickTitle : () -> Unit = {},
     isBackVisible: Boolean = true,
 ) {
     Box(
@@ -45,6 +46,7 @@ fun TopBar(
             style = PawKeyTheme.typography.head18Sb,
             modifier = Modifier
                 .align(Alignment.Center)
+                .noRippleClickable(onClickTitle)
         )
     }
 }

app/src/main/java/com/paw/key/core/extension/LatLngExtension.kt

@@ -0,0 +1,8 @@
+package com.paw.key.core.extension
+
+import android.location.Location
+import com.naver.maps.geometry.LatLng
+
+fun Location.toLatLng(): LatLng {
+    return LatLng(this.latitude, this.longitude)
+}

app/src/main/java/com/paw/key/core/util/Modifier.kt → app/src/main/java/com/paw/key/core/extension/Modifier.kt

@@ -1,4 +1,4 @@
-package com.paw.key.core.util
+package com.paw.key.core.extension
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource

app/src/main/java/com/paw/key/core/util/PreferenceDataStore.kt

@@ -7,7 +7,7 @@ import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
-import com.kakao.vectormap.LatLng
+import com.naver.maps.geometry.LatLng
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
@@ -35,15 +35,6 @@ private val ACTIVE_REGION_KEY = stringPreferencesKey("active_region")
 private fun List<LatLng>.toPreferenceString(): String =
     joinToString(";") { "${it.latitude},${it.longitude}" }
 
-private fun String.toLatLngList(): List<LatLng> =
-    split(";").mapNotNull {
-        val parts = it.split(",")
-        if (parts.size == 2) {
-            LatLng.from(parts[0].toDoubleOrNull() ?: return@mapNotNull null, parts[1].toDoubleOrNull() ?: return@mapNotNull null)
-        }
-        else null
-    }
-
 object PreferenceDataStore {
 
     private lateinit var appContext: Context
@@ -70,10 +61,6 @@ object PreferenceDataStore {
         }
     }
 
-    fun getPoints(): Flow<List<LatLng>> = summaryStore.data.map {
-        it[POINTS_KEY]?.toLatLngList() ?: emptyList()
-    }
-
     fun getTotalDistance(): Flow<Float> = summaryStore.data.map {
         it[TOTAL_DISTANCE_KEY] ?: 0f
     }
@@ -141,7 +128,7 @@ object PreferenceDataStore {
     }
 
     fun getUserId(): Flow<Int> = summaryStore.data.map {
-        it[USER_ID_KEY] ?: 41
+        it[USER_ID_KEY] ?: 43
     }
 
     fun getUserName(): Flow<String> = summaryStore.data.map {

app/src/main/java/com/paw/key/core/util/UiState.kt

@@ -1,15 +1,15 @@
 package com.paw.key.core.util
 
-sealed class UiState<out T> {
-    data object Empty : UiState<Nothing>()
+sealed interface UiState<out T> {
+    data object Empty : UiState<Nothing>
 
-    data object Loading : UiState<Nothing>()
+    data object Loading : UiState<Nothing>
 
     data class Success<T>(
         val data: T,
-    ) : UiState<T>()
+    ) : UiState<T>
 
     data class Failure(
         val message: String,
-    ) : UiState<Nothing>()
+    ) : UiState<Nothing>
 }

app/src/main/java/com/paw/key/data/repositoryimpl/WalkSharedResultRepositoryImpl.kt

@@ -2,13 +2,11 @@ package com.paw.key.data.repositoryimpl
 
 import android.graphics.Bitmap
 import android.util.Log
-import com.kakao.vectormap.LatLng
+import com.naver.maps.geometry.LatLng
 import com.paw.key.domain.model.entity.sharedresult.WalkResult
 import com.paw.key.domain.repository.WalkSharedResultRepository
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import javax.inject.Inject
 import javax.inject.Singleton

app/src/main/java/com/paw/key/domain/model/entity/sharedresult/WalkResult.kt

@@ -1,7 +1,7 @@
 package com.paw.key.domain.model.entity.sharedresult
 
 import android.graphics.Bitmap
-import com.kakao.vectormap.LatLng
+import com.naver.maps.geometry.LatLng
 
 data class WalkResult(
     val bitmap: Bitmap?,

app/src/main/java/com/paw/key/domain/repository/WalkSharedResultRepository.kt

@@ -1,7 +1,7 @@
 package com.paw.key.domain.repository
 
 import android.graphics.Bitmap
-import com.kakao.vectormap.LatLng
+import com.naver.maps.geometry.LatLng
 import com.paw.key.domain.model.entity.sharedresult.WalkResult
 import kotlinx.coroutines.flow.Flow
 

app/src/main/java/com/paw/key/presentation/ui/course/entire/tab/map/List/TabListScreen.kt

@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
@@ -35,7 +34,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.paw.key.R
 import com.paw.key.core.designsystem.component.CourseCard
 import com.paw.key.core.designsystem.theme.PawKeyTheme
-import com.paw.key.core.util.noRippleClickable
+import com.paw.key.core.extension.noRippleClickable
 import com.paw.key.presentation.ui.course.entire.tab.map.List.viewmodel.TapListViewModel
 
 @Preview(showBackground = true)

app/src/main/java/com/paw/key/presentation/ui/course/entire/tab/map/List/viewmodel/TapListViewModel.kt

@@ -110,20 +110,21 @@ class TapListViewModel @Inject constructor(
     }
 
     fun updateSortTime(option: String) {
+        Log.e("updateSortTime", option)
         when (option) {
-            "21분 이내" -> {
+            "20분 이내" -> {
                 _state.update {
                     it.copy(
                         selectedSortTimeStart = 0,
-                        selectedSortTimeEnd = 21
+                        selectedSortTimeEnd = 20
                     )
                 }
             }
 
             "21~40분" -> {
                 _state.update {
                     it.copy(
-                        selectedSortTimeStart = 21,
+                        selectedSortTimeStart = 20,
                         selectedSortTimeEnd = 40
                     )
                 }
@@ -132,7 +133,7 @@ class TapListViewModel @Inject constructor(
             "41~60분" -> {
                 _state.update {
                     it.copy(
-                        selectedSortTimeStart = 41,
+                        selectedSortTimeStart = 40,
                         selectedSortTimeEnd = 60
                     )
                 }
@@ -141,7 +142,7 @@ class TapListViewModel @Inject constructor(
             "1시간 이상" -> {
                 _state.update {
                     it.copy(
-                        selectedSortTimeStart = 61,
+                        selectedSortTimeStart = 60,
                         selectedSortTimeEnd = null
                     )
                 }
@@ -321,6 +322,8 @@ class TapListViewModel @Inject constructor(
                     selectedOptions = selectedOptions.ifEmpty { null }
                 )
 
+                Log.e("TapListViewModel", "요청 데이터: $request")
+
                 postsListRepository.postList(
                     userId = userId.first(),
                     request = request