[refactor] #51 네컷지도 기능 및 UI 고도화

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

@@ -86,9 +86,9 @@ fun BottomNavigationBarItem(
         color = NekiTheme.colorScheme.white,
     ) {
         Column(
-            modifier = Modifier.padding(vertical = 8.dp),
+            modifier = Modifier.padding(vertical = 4.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(1.dp),
+            verticalArrangement = Arrangement.spacedBy(4.dp),
         ) {
             Icon(
                 modifier = Modifier.size(24.dp),
@@ -99,7 +99,7 @@ fun BottomNavigationBarItem(
             Text(
                 text = stringResource(tab.iconStringRes),
                 color = textColor,
-                style = NekiTheme.typography.caption11SemiBold,
+                style = NekiTheme.typography.caption12SemiBold,
             )
         }
     }

core/common/build.gradle.kts

@@ -10,5 +10,6 @@ android {
 dependencies {
     api(libs.timber)
     implementation(libs.androidx.security.crypto)
+    implementation(libs.androidx.core.ktx)
 
-}
+}

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

@@ -0,0 +1,39 @@
+package com.neki.android.core.common.permission
+
+import android.Manifest
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
+import androidx.core.content.ContextCompat
+import androidx.core.content.PermissionChecker
+
+object PermissionManager {
+    val LOCATION_PERMISSIONS = arrayOf(
+        Manifest.permission.ACCESS_FINE_LOCATION,
+        Manifest.permission.ACCESS_COARSE_LOCATION,
+    )
+
+    fun hasLocationPermission(context: Context): Boolean {
+        return ContextCompat.checkSelfPermission(
+            context,
+            Manifest.permission.ACCESS_FINE_LOCATION,
+        ) == PermissionChecker.PERMISSION_GRANTED ||
+            ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.ACCESS_COARSE_LOCATION,
+            ) == PermissionChecker.PERMISSION_GRANTED
+    }
+
+    fun shouldShowLocationRationale(activity: Activity): Boolean {
+        return activity.shouldShowRequestPermissionRationale(Manifest.permission.ACCESS_FINE_LOCATION)
+    }
+
+    fun navigateToAppSettings(context: Context) {
+        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+            data = Uri.fromParts("package", context.packageName, null)
+        }
+        context.startActivity(intent)
+    }
+}

core/data-api/build.gradle.kts

@@ -5,5 +5,5 @@ plugins {
 dependencies {
     implementation(projects.core.model)
     implementation(libs.kotlinx.coroutines.core)
-
+    api(libs.androidx.datastore.preferences)
 }

core/data-api/src/main/java/com/neki/android/core/dataapi/datastore/DataStoreKey.kt

@@ -0,0 +1,11 @@
+package com.neki.android.core.dataapi.datastore
+
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+
+object DataStoreKey {
+    val ACCESS_TOKEN = stringPreferencesKey("access_token")
+    val REFRESH_TOKEN = stringPreferencesKey("refresh_token")
+
+    val IS_FIRST_LOCATION_PERMISSION = booleanPreferencesKey("is_first_location_permission")
+}

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

@@ -1,15 +1,18 @@
 package com.neki.android.core.dataapi.repository
 
+import androidx.datastore.preferences.core.Preferences
 import kotlinx.coroutines.flow.Flow
 
 interface DataStoreRepository {
     suspend fun saveJwtTokens(
         accessToken: String,
         refreshToken: String,
     )
-
     fun isSavedJwtTokens(): Flow<Boolean>
-    fun getAccessToken(): Flow<String?>
-    fun getRefreshToken(): Flow<String?>
+    fun getAccessToken(): Flow<String>
+    fun getRefreshToken(): Flow<String>
     suspend fun clearTokens()
+
+    suspend fun setBoolean(key: Preferences.Key<Boolean>, value: Boolean)
+    fun getBoolean(key: Preferences.Key<Boolean>): Flow<Boolean>
 }

core/data/src/main/java/com/neki/android/core/data/remote/di/NetworkModule.kt

@@ -33,7 +33,6 @@ import io.ktor.http.HttpHeaders
 import io.ktor.http.encodedPath
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.serialization.json.Json
 import timber.log.Timber
 import javax.inject.Singleton
@@ -82,8 +81,8 @@ internal object NetworkModule {
                         Timber.d("BearerAuth - loadTokens")
                         if (dataStoreRepository.isSavedJwtTokens().first()) {
                             BearerTokens(
-                                accessToken = dataStoreRepository.getAccessToken().firstOrNull() ?: "",
-                                refreshToken = dataStoreRepository.getRefreshToken().firstOrNull() ?: "",
+                                accessToken = dataStoreRepository.getAccessToken().first(),
+                                refreshToken = dataStoreRepository.getRefreshToken().first(),
                             )
                         } else null
                     }
@@ -95,7 +94,7 @@ internal object NetworkModule {
                                 val response = client.post("/api/auth/refresh") {
                                     setBody(
                                         RefreshTokenRequest(
-                                            refreshToken = dataStoreRepository.getRefreshToken().firstOrNull() ?: "",
+                                            refreshToken = dataStoreRepository.getRefreshToken().first(),
                                         ),
                                     )
                                 }.body<BasicResponse<AuthResponse>>()

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

@@ -3,8 +3,8 @@ package com.neki.android.core.data.repository.impl
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.stringPreferencesKey
 import com.neki.android.core.common.crypto.CryptoManager
+import com.neki.android.core.dataapi.datastore.DataStoreKey
 import com.neki.android.core.dataapi.repository.DataStoreRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -13,43 +13,51 @@ import javax.inject.Inject
 class DataStoreRepositoryImpl @Inject constructor(
     private val dataStore: DataStore<Preferences>,
 ) : DataStoreRepository {
-    companion object {
-        private val ACCESS_TOKEN = stringPreferencesKey("access_token")
-        private val REFRESH_TOKEN = stringPreferencesKey("refresh_token")
-    }
 
     override suspend fun saveJwtTokens(
         accessToken: String,
         refreshToken: String,
     ) {
         dataStore.edit { preferences ->
-            preferences[ACCESS_TOKEN] = CryptoManager.encrypt(accessToken)
-            preferences[REFRESH_TOKEN] = CryptoManager.encrypt(refreshToken)
+            preferences[DataStoreKey.ACCESS_TOKEN] = CryptoManager.encrypt(accessToken)
+            preferences[DataStoreKey.REFRESH_TOKEN] = CryptoManager.encrypt(refreshToken)
         }
     }
 
     override fun isSavedJwtTokens(): Flow<Boolean> {
         return dataStore.data.map { preferences ->
-            val accessToken = preferences[ACCESS_TOKEN]?.let { CryptoManager.decrypt(it) }
-            val refreshToken = preferences[REFRESH_TOKEN]?.let { CryptoManager.decrypt(it) }
+            val accessToken = preferences[DataStoreKey.ACCESS_TOKEN]?.let { CryptoManager.decrypt(it) }
+            val refreshToken = preferences[DataStoreKey.REFRESH_TOKEN]?.let { CryptoManager.decrypt(it) }
 
             !accessToken.isNullOrBlank() && !refreshToken.isNullOrBlank()
         }
     }
 
-    override fun getAccessToken(): Flow<String?> {
+    override fun getAccessToken(): Flow<String> {
         return dataStore.data.map { preferences ->
-            preferences[ACCESS_TOKEN]?.let { CryptoManager.decrypt(it) }
+            preferences[DataStoreKey.ACCESS_TOKEN]?.let { CryptoManager.decrypt(it) } ?: ""
         }
     }
 
-    override fun getRefreshToken(): Flow<String?> {
+    override fun getRefreshToken(): Flow<String> {
         return dataStore.data.map { preferences ->
-            preferences[REFRESH_TOKEN]?.let { CryptoManager.decrypt(it) }
+            preferences[DataStoreKey.REFRESH_TOKEN]?.let { CryptoManager.decrypt(it) } ?: ""
         }
     }
 
     override suspend fun clearTokens() {
         dataStore.edit { it.clear() }
     }
+
+    override suspend fun setBoolean(key: Preferences.Key<Boolean>, value: Boolean) {
+        dataStore.edit { preferences ->
+            preferences[key] = value
+        }
+    }
+
+    override fun getBoolean(key: Preferences.Key<Boolean>): Flow<Boolean> {
+        return dataStore.data.map { preferences ->
+            preferences[key] ?: false
+        }
+    }
 }

core/designsystem/src/main/res/drawable/icon_rotation.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,4V10H17"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#3C3E48"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20.49,15C19.84,16.84 18.609,18.419 16.984,19.499C15.359,20.578 13.426,21.101 11.478,20.987C9.53,20.873 7.672,20.129 6.184,18.867C4.695,17.605 3.657,15.893 3.226,13.99C2.795,12.087 2.994,10.095 3.794,8.315C4.593,6.535 5.949,5.063 7.658,4.121C9.367,3.178 11.336,2.817 13.268,3.091C15.2,3.365 16.99,4.26 18.37,5.64L23,10"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#3C3E48"
+      android:strokeLineCap="round"/>
+</vector>

feature/auth/impl/src/main/kotlin/com/neki/android/feature/auth/impl/LoginViewModel.kt

@@ -9,7 +9,6 @@ import com.neki.android.core.ui.MviIntentStore
 import com.neki.android.core.ui.mviIntentStore
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -47,7 +46,7 @@ class LoginViewModel @Inject constructor(
         if (dataStoreRepository.isSavedJwtTokens().first()) {
             Timber.d("JWT 토큰 O")
             authRepository.updateAccessToken(
-                refreshToken = dataStoreRepository.getRefreshToken().firstOrNull() ?: "",
+                refreshToken = dataStoreRepository.getRefreshToken().first(),
             ).onSuccess {
                 postSideEffect(LoginSideEffect.NavigateToHome)
             }.onFailure {

feature/map/impl/build.gradle.kts

@@ -13,4 +13,5 @@ dependencies {
 
     implementation(libs.kotlinx.collections.immutable)
     implementation(libs.coil.compose)
+    implementation(libs.androidx.activity.compose)
 }

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

@@ -8,14 +8,15 @@ import kotlinx.collections.immutable.persistentListOf
 
 data class MapState(
     val isLoading: Boolean = false,
-    val dragState: DragValue = DragValue.Bottom,
     val currentLocation: Pair<Double, Double> = Pair(0.0, 0.0),
+    val dragLevel: DragLevel = DragLevel.FIRST,
     val brands: ImmutableList<Brand> = persistentListOf(),
     val nearbyBrands: ImmutableList<BrandInfo> = persistentListOf(),
     val focusedMarkerPosition: Pair<Double, Double> = Pair(0.0, 0.0),
     val selectedBrandInfo: BrandInfo? = null,
     val isShowInfoDialog: Boolean = false,
     val isShowDirectionBottomSheet: Boolean = false,
+    val isShowLocationPermissionDialog: Boolean = false,
 )
 
 sealed interface MapIntent {
@@ -32,6 +33,9 @@ sealed interface MapIntent {
         val longitude: Double,
     ) : MapIntent
 
+    data object ClickRefresh : MapIntent
+    data class UpdateCurrentLocation(val latitude: Double, val longitude: Double) : MapIntent
+
     // in 패널
     data object ClickCurrentLocation : MapIntent
     data object ClickInfoIcon : MapIntent
@@ -42,10 +46,16 @@ sealed interface MapIntent {
     data object ClickCloseBrandCard : MapIntent
     data object CloseDirectionBottomSheet : MapIntent
     data class ClickDirectionItem(val app: DirectionApp) : MapIntent
-    data class ChangeDragValue(val dragValue: DragValue) : MapIntent
+    data class ChangeDragLevel(val dragLevel: DragLevel) : MapIntent
+
+    // 위치 권한
+    data class RequestLocationPermission(val shouldShowRationale: Boolean) : MapIntent
+    data object DismissLocationPermissionDialog : MapIntent
+    data object ConfirmLocationPermissionDialog : MapIntent
 }
 
 sealed interface MapEffect {
+    data object RefreshPhotoBooth : MapEffect
     data object RefreshCurrentLocation : MapEffect
     data class ShowToastMessage(val message: String) : MapEffect
     data class MoveCameraToPosition(
@@ -55,7 +65,14 @@ sealed interface MapEffect {
 
     data class MoveDirectionApp(
         val app: DirectionApp,
+        val startLatitude: Double,
+        val startLongitude: Double,
+        val endLatitude: Double,
+        val endLongitude: Double,
     ) : MapEffect
+
+    data object NavigateToAppSettings : MapEffect
+    data object RequestLocationPermission : MapEffect
 }
 
-enum class DragValue { Bottom, Center, Top, Invisible }
+enum class DragLevel { FIRST, SECOND, THIRD, INVISIBLE }