[Refactor] SharedPreference에서 datastore로 마이그레이션

app/build.gradle.kts

@@ -214,6 +214,9 @@ dependencies {
     //data store (with flow)
     implementation(libs.androidx.datastore.preferences)
 
+    // EncryptedSharedPreferences
+    implementation(libs.androidx.security.crypto)
+
     // naver maps
     implementation (libs.map.sdk)
 

app/src/main/java/com/eatssu/android/App.kt

@@ -1,7 +1,6 @@
 package com.eatssu.android
 
 import android.app.Application
-import android.content.Context
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.eatssu.android.domain.model.TokenState
@@ -23,9 +22,6 @@ import javax.inject.Inject
 /** App: 앱이 살아있는 동안 공통 리소스 관리를 위한 클래스 */
 @HiltAndroidApp
 class App : Application(), Configuration.Provider {
-    companion object{
-        lateinit var appContext: Context //todo 이거 빼기
-    }
 
     /** 앱 전체에서 사용할 수 있는 CoroutineScope(독립적인 공간을 만들어 안정성 높임)
      *  자식 CoroutineScope가 취소되더라도 부모 CoroutineScope는 취소되지 않음
@@ -39,7 +35,6 @@ class App : Application(), Configuration.Provider {
         super.onCreate()
         FirebaseApp.initializeApp(this)
 
-        appContext = this
         KakaoSdk.init(this,BuildConfig.KAKAO_NATIVE_APP_KEY)
 
         if (BuildConfig.DEBUG) {

app/src/main/java/com/eatssu/android/data/local/AccountDataStore.kt

@@ -0,0 +1,60 @@
+package com.eatssu.android.data.local
+
+import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import com.eatssu.android.domain.model.College
+import com.eatssu.android.domain.model.Department
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private val Context.accountDataStore by preferencesDataStore(name = "account")
+
+@Singleton
+class AccountDataStore @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    companion object Keys {
+        val EMAIL = stringPreferencesKey("MY_EMAIL")
+        val NAME = stringPreferencesKey("MY_NAME")
+        val COLLEGE_ID = intPreferencesKey("MY_COLLEGE_ID")
+        val COLLEGE_NAME = stringPreferencesKey("MY_COLLEGE")
+        val DEPT_ID = intPreferencesKey("MY_DEPARTMENT_ID")
+        val DEPT_NAME = stringPreferencesKey("MY_DEPARTMENT")
+    }
+
+    val email: Flow<String> = context.accountDataStore.data.map { it[EMAIL].orEmpty() }
+    suspend fun setEmail(v: String) = context.accountDataStore.edit { it[EMAIL] = v }
+
+    val name: Flow<String> = context.accountDataStore.data.map { it[NAME].orEmpty() }
+    suspend fun setName(v: String) = context.accountDataStore.edit { it[NAME] = v }
+
+    val college: Flow<College?> = context.accountDataStore.data.map {
+        val id = it[COLLEGE_ID] ?: -1
+        val name = it[COLLEGE_NAME]
+        if (id >= 0 && !name.isNullOrBlank()) College(id, name) else null
+    }
+
+    suspend fun setCollege(v: College) = context.accountDataStore.edit {
+        it[COLLEGE_ID] = v.collegeId
+        it[COLLEGE_NAME] = v.collegeName
+    }
+
+    val department: Flow<Department?> = context.accountDataStore.data.map {
+        val id = it[DEPT_ID] ?: -1
+        val name = it[DEPT_NAME]
+        if (id >= 0 && !name.isNullOrBlank()) Department(id, name) else null
+    }
+
+    suspend fun setDepartment(v: Department) = context.accountDataStore.edit {
+        it[DEPT_ID] = v.departmentId
+        it[DEPT_NAME] = v.departmentName
+    }
+
+    suspend fun clear() = context.accountDataStore.edit { it.clear() }
+}

app/src/main/java/com/eatssu/android/data/repository/PreferencesRepository.kt → app/src/main/java/com/eatssu/android/data/local/SettingDataStore.kt

@@ -1,31 +1,36 @@
-// PreferencesRepository.kt
-package com.eatssu.android.data.repository
+package com.eatssu.android.data.local
 
 import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.preferencesDataStore
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import javax.inject.Inject
 
-class PreferencesRepository(private val context: Context) {
+private val Context.settingDataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
 
-    private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
+class SettingDataStore @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
 
     companion object {
         private val DAILY_NOTIFICATION_KEY = booleanPreferencesKey("daily_notification")
     }
 
-    val dailyNotificationStatus: Flow<Boolean> = context.dataStore.data
+    val dailyNotificationStatus: Flow<Boolean> = context.settingDataStore.data
         .map { preferences ->
             preferences[DAILY_NOTIFICATION_KEY] ?: false // Default value is false
         }
 
     suspend fun setDailyNotificationStatus(status: Boolean) {
-        context.dataStore.edit { preferences ->
+        context.settingDataStore.edit { preferences ->
             preferences[DAILY_NOTIFICATION_KEY] = status
         }
     }
+
+    suspend fun clear() = context.settingDataStore.edit { it.clear() }
 }

app/src/main/java/com/eatssu/android/data/local/TokenStore.kt

@@ -0,0 +1,26 @@
+package com.eatssu.android.data.local
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TokenStore @Inject constructor(
+    private val securePrefs: SharedPreferences
+) {
+    private companion object {
+        const val KEY_ACCESS = "ACCESS_TOKEN"
+        const val KEY_REFRESH = "REFRESH_TOKEN"
+    }
+
+    var accessToken: String
+        get() = securePrefs.getString(KEY_ACCESS, "").orEmpty()
+        set(v) = securePrefs.edit { putString(KEY_ACCESS, v) }
+
+    var refreshToken: String
+        get() = securePrefs.getString(KEY_REFRESH, "").orEmpty()
+        set(v) = securePrefs.edit { putString(KEY_REFRESH, v) }
+
+    fun clear() = securePrefs.edit { remove(KEY_ACCESS); remove(KEY_REFRESH) }
+}

app/src/main/java/com/eatssu/android/data/repository/WidgetPreferencesRepository.kt → app/src/main/java/com/eatssu/android/data/local/WidgetDataStore.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.data.repository
+package com.eatssu.android.data.local
 
 import android.content.Context
 import androidx.datastore.core.DataStore
@@ -7,16 +7,18 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.eatssu.common.enums.Restaurant
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.first
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private val Context.widgetPrefsDataStore: DataStore<Preferences> by preferencesDataStore(name = "widget_prefs")
+
 @Singleton
-class WidgetPreferencesRepository @Inject constructor(
-    private val context: Context,
+class WidgetDataStore @Inject constructor(
+    @ApplicationContext private val context: Context,
 ) {
-    private val Context.widgetPrefsDataStore: DataStore<Preferences> by preferencesDataStore(name = "widget_prefs")
     private fun fileKeyRestaurantKey(fileKey: String) =
         stringPreferencesKey("widget_restaurant_by_fileKey_$fileKey")
 

app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequest.kt → app/src/main/java/com/eatssu/android/data/remote/dto/request/ChangeNicknameRequest.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.data.dto.request
+package com.eatssu.android.data.remote.dto.request
 
 data class ChangeNicknameRequest(
     val nickname: String,

app/src/main/java/com/eatssu/android/data/dto/request/CheckValidTokenRequest.kt → app/src/main/java/com/eatssu/android/data/remote/dto/request/CheckValidTokenRequest.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.data.dto.request
+package com.eatssu.android.data.remote.dto.request
 
 data class CheckValidTokenRequest(
     val token: String,

app/src/main/java/com/eatssu/android/data/dto/request/LoginWithKakaoRequest.kt → app/src/main/java/com/eatssu/android/data/remote/dto/request/LoginWithKakaoRequest.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.data.dto.request
+package com.eatssu.android.data.remote.dto.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/eatssu/android/data/dto/request/ModifyReviewRequest.kt → app/src/main/java/com/eatssu/android/data/remote/dto/request/ModifyReviewRequest.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.data.dto.request
+package com.eatssu.android.data.remote.dto.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/eatssu/android/data/dto/request/ReportRequest.kt → app/src/main/java/com/eatssu/android/data/remote/dto/request/ReportRequest.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.data.dto.request
+package com.eatssu.android.data.remote.dto.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/eatssu/android/data/dto/request/UserDepartmentRequest.kt → app/src/main/java/com/eatssu/android/data/remote/dto/request/UserDepartmentRequest.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.data.dto.request
+package com.eatssu.android.data.remote.dto.request
 
 data class UserDepartmentRequest(
     val departmentId: Int

app/src/main/java/com/eatssu/android/data/dto/request/WriteReviewRequest.kt → app/src/main/java/com/eatssu/android/data/remote/dto/request/WriteReviewRequest.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.data.dto.request
+package com.eatssu.android.data.remote.dto.request
 
 import com.google.gson.annotations.SerializedName