-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Setting/#22] datastore 모듈 세팅 #23
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
7e69528
#22 [setting] : datastore 모듈 생성
chanubc 33800fb
#22 [setting] : datastore 의존 그래프 설정
chanubc c2e55e8
#22 [setting] : datastore 모듈 의존성 추가
chanubc 06a9d7a
#22 [setting] : wable preference datasource 추가
chanubc 07804f2
#22 [setting] : default datastore preference 구현
chanubc 0f2aa00
#22 [setting] : datastore module di setting
chanubc 408b84d
#22 [setting] : UserInfoRepository setting
chanubc 0e04333
#22 [setting] : UserInfoRepositoryimpl 구현체 구현
chanubc c87887d
#22 [setting] : userInfoRepository, wable local datasource di setting
chanubc 5529b44
#22 [feat] : 약식 자동로그인 구현, datastore 테스트
chanubc 8679fc3
#22 [fix] : 불필요한 intent provider props 제거
chanubc 02d73e1
#22 [delete] : isNewUser 제거
chanubc eb01f6b
Merge branch 'refs/heads/develop' into setting/#22-datastore
chanubc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
core/data/src/main/java/com/teamwable/data/repository/UserInfoRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package com.teamwable.data.repository | ||
|
||
import kotlinx.coroutines.flow.Flow | ||
|
||
interface UserInfoRepository { | ||
fun getAccessToken(): Flow<String> | ||
|
||
fun getRefreshToken(): Flow<String> | ||
|
||
fun getAutoLogin(): Flow<Boolean> | ||
|
||
fun getNickname(): Flow<String> | ||
|
||
fun getMemberId(): Flow<Int> | ||
|
||
fun getMemberProfileUrl(): Flow<String> | ||
|
||
fun getIsPushAlarmAllowed(): Flow<Boolean> | ||
|
||
suspend fun saveAccessToken(accessToken: String) | ||
|
||
suspend fun saveRefreshToken(refreshToken: String) | ||
|
||
suspend fun saveAutoLogin(autoLogin: Boolean) | ||
|
||
suspend fun saveNickname(name: String) | ||
|
||
suspend fun saveMemberId(memberId: Int) | ||
|
||
suspend fun saveMemberProfileUrl(memberUrl: String) | ||
|
||
suspend fun saveIsPushAlarmAllowed(isPushAlarmAllowed: Boolean) | ||
|
||
suspend fun clearAll() | ||
|
||
suspend fun clearForRefreshToken() | ||
} |
67 changes: 67 additions & 0 deletions
67
core/data/src/main/java/com/teamwable/data/repositoryimpl/DefaultUserInfoRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
package com.teamwable.data.repositoryimpl | ||
|
||
import com.teamwable.data.repository.UserInfoRepository | ||
import com.teamwable.datastore.datasource.WablePreferencesDataSource | ||
import kotlinx.coroutines.flow.Flow | ||
import javax.inject.Inject | ||
|
||
internal class DefaultUserInfoRepository @Inject constructor( | ||
private val wablePreferencesDataSource: WablePreferencesDataSource, | ||
) : UserInfoRepository { | ||
override fun getAccessToken(): Flow<String> = | ||
wablePreferencesDataSource.accessToken | ||
|
||
override fun getRefreshToken(): Flow<String> = | ||
wablePreferencesDataSource.refreshToken | ||
|
||
override fun getAutoLogin(): Flow<Boolean> = | ||
wablePreferencesDataSource.autoLogin | ||
|
||
override fun getNickname(): Flow<String> = | ||
wablePreferencesDataSource.nickname | ||
|
||
override fun getMemberId(): Flow<Int> = | ||
wablePreferencesDataSource.memberId | ||
|
||
override fun getMemberProfileUrl(): Flow<String> = | ||
wablePreferencesDataSource.memberProfileUrl | ||
|
||
override fun getIsPushAlarmAllowed(): Flow<Boolean> = | ||
wablePreferencesDataSource.isPushAlarmAllowed | ||
|
||
override suspend fun saveAccessToken(accessToken: String) { | ||
wablePreferencesDataSource.updateAccessToken(accessToken) | ||
} | ||
|
||
override suspend fun saveRefreshToken(refreshToken: String) { | ||
wablePreferencesDataSource.updateRefreshToken(refreshToken) | ||
} | ||
|
||
override suspend fun saveAutoLogin(autoLogin: Boolean) { | ||
wablePreferencesDataSource.updateAutoLogin(autoLogin) | ||
} | ||
|
||
override suspend fun saveNickname(name: String) { | ||
wablePreferencesDataSource.updateNickname(name) | ||
} | ||
|
||
override suspend fun saveMemberId(memberId: Int) { | ||
wablePreferencesDataSource.updateMemberId(memberId) | ||
} | ||
|
||
override suspend fun saveMemberProfileUrl(memberUrl: String) { | ||
wablePreferencesDataSource.updateMemberProfileUrl(memberUrl) | ||
} | ||
|
||
override suspend fun saveIsPushAlarmAllowed(isPushAlarmAllowed: Boolean) { | ||
wablePreferencesDataSource.updateIsPushAlarmAllowed(isPushAlarmAllowed) | ||
} | ||
|
||
override suspend fun clearAll() { | ||
wablePreferencesDataSource.clear() | ||
} | ||
|
||
override suspend fun clearForRefreshToken() { | ||
wablePreferencesDataSource.clearForRefreshToken() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
plugins { | ||
alias(libs.plugins.android.library) | ||
id("com.teamwable.wable.kotlin") | ||
id("com.teamwable.wable.hilt") | ||
} | ||
|
||
android { | ||
namespace = "com.teamwable.datastore" | ||
} | ||
|
||
dependencies { | ||
implementation(libs.bundles.datastore) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<manifest> | ||
|
||
</manifest> |
132 changes: 132 additions & 0 deletions
132
...tore/src/main/java/com/teamwable/datastore/datasource/DefaultWablePreferenceDatasource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,132 @@ | ||
package com.teamwable.datastore.datasource | ||
|
||
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.core.emptyPreferences | ||
import androidx.datastore.preferences.core.intPreferencesKey | ||
import androidx.datastore.preferences.core.stringPreferencesKey | ||
import kotlinx.coroutines.flow.Flow | ||
import kotlinx.coroutines.flow.FlowCollector | ||
import kotlinx.coroutines.flow.catch | ||
import kotlinx.coroutines.flow.map | ||
import java.io.IOException | ||
import javax.inject.Inject | ||
|
||
class DefaultWablePreferenceDatasource @Inject constructor( | ||
private val dataStore: DataStore<Preferences>, | ||
) : WablePreferencesDataSource { | ||
private object PreferencesKeys { | ||
val AccessToken = stringPreferencesKey("accessToken") | ||
val RefreshToken = stringPreferencesKey("refreshToken") | ||
val Nickname = stringPreferencesKey("nickname") | ||
val AutoLogin = booleanPreferencesKey("autoLogin") | ||
val MemberId = intPreferencesKey("memberId") | ||
val MemberProfileUrl = stringPreferencesKey("memberProfileUrl") | ||
val IsPushAlarmAllowed = booleanPreferencesKey("isPushAlarmAllowed") | ||
} | ||
|
||
override val accessToken: Flow<String> = dataStore.data | ||
.catch { handleError(it) } | ||
.map { preferences -> | ||
preferences[PreferencesKeys.AccessToken].orEmpty() | ||
} | ||
|
||
override val refreshToken: Flow<String> = dataStore.data | ||
.catch { handleError(it) } | ||
.map { preferences -> | ||
preferences[PreferencesKeys.RefreshToken].orEmpty() | ||
} | ||
|
||
override val autoLogin: Flow<Boolean> = dataStore.data | ||
.catch { handleError(it) } | ||
.map { preferences -> | ||
preferences[PreferencesKeys.AutoLogin] ?: false | ||
} | ||
|
||
override val nickname: Flow<String> = dataStore.data | ||
.catch { handleError(it) } | ||
.map { preferences -> | ||
preferences[PreferencesKeys.Nickname].orEmpty() | ||
} | ||
|
||
override val memberId: Flow<Int> = dataStore.data | ||
.catch { handleError(it) } | ||
.map { preferences -> | ||
preferences[PreferencesKeys.MemberId] ?: -1 | ||
} | ||
|
||
override var memberProfileUrl: Flow<String> = dataStore.data | ||
.catch { handleError(it) } | ||
.map { preferences -> | ||
preferences[PreferencesKeys.MemberProfileUrl].orEmpty() | ||
} | ||
|
||
override var isPushAlarmAllowed: Flow<Boolean> = dataStore.data | ||
.catch { handleError(it) } | ||
.map { preferences -> | ||
preferences[PreferencesKeys.IsPushAlarmAllowed] ?: false | ||
} | ||
|
||
override suspend fun updateAccessToken(accessToken: String) { | ||
dataStore.edit { preferences -> | ||
preferences[PreferencesKeys.AccessToken] = accessToken | ||
} | ||
} | ||
|
||
override suspend fun updateRefreshToken(refreshToken: String) { | ||
dataStore.edit { preferences -> | ||
preferences[PreferencesKeys.RefreshToken] = refreshToken | ||
} | ||
} | ||
|
||
override suspend fun updateAutoLogin(autoLogin: Boolean) { | ||
dataStore.edit { preferences -> | ||
preferences[PreferencesKeys.AutoLogin] = autoLogin | ||
} | ||
} | ||
|
||
override suspend fun updateNickname(name: String) { | ||
dataStore.edit { preferences -> | ||
preferences[PreferencesKeys.Nickname] = name | ||
} | ||
} | ||
|
||
override suspend fun updateMemberId(memberId: Int) { | ||
dataStore.edit { preferences -> | ||
preferences[PreferencesKeys.MemberId] = memberId | ||
} | ||
} | ||
|
||
override suspend fun updateMemberProfileUrl(memberUrl: String) { | ||
dataStore.edit { preferences -> | ||
preferences[PreferencesKeys.MemberProfileUrl] = memberUrl | ||
} | ||
} | ||
|
||
override suspend fun updateIsPushAlarmAllowed(isPushAlarmAllowed: Boolean) { | ||
dataStore.edit { preferences -> | ||
preferences[PreferencesKeys.IsPushAlarmAllowed] = isPushAlarmAllowed | ||
} | ||
} | ||
|
||
override suspend fun clear() { | ||
dataStore.edit { preferences -> | ||
preferences.clear() | ||
} | ||
} | ||
|
||
override suspend fun clearForRefreshToken() { | ||
dataStore.edit { preferences -> | ||
preferences.remove(PreferencesKeys.AccessToken) | ||
preferences.remove(PreferencesKeys.RefreshToken) | ||
preferences.remove(PreferencesKeys.AutoLogin) | ||
} | ||
} | ||
} | ||
|
||
private suspend fun FlowCollector<Preferences>.handleError(it: Throwable) { | ||
if (it is IOException) emit(emptyPreferences()) | ||
else throw it | ||
} |
31 changes: 31 additions & 0 deletions
31
.../datastore/src/main/java/com/teamwable/datastore/datasource/WablePreferencesDataSource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package com.teamwable.datastore.datasource | ||
|
||
import kotlinx.coroutines.flow.Flow | ||
|
||
interface WablePreferencesDataSource { | ||
val accessToken: Flow<String> | ||
val refreshToken: Flow<String> | ||
val autoLogin: Flow<Boolean> | ||
val nickname: Flow<String> | ||
val memberId: Flow<Int> | ||
val memberProfileUrl: Flow<String> | ||
val isPushAlarmAllowed: Flow<Boolean> | ||
|
||
suspend fun updateAccessToken(accessToken: String) | ||
|
||
suspend fun updateRefreshToken(refreshToken: String) | ||
|
||
suspend fun updateAutoLogin(autoLogin: Boolean) | ||
|
||
suspend fun updateNickname(name: String) | ||
|
||
suspend fun updateMemberId(memberId: Int) | ||
|
||
suspend fun updateMemberProfileUrl(memberUrl: String) | ||
|
||
suspend fun updateIsPushAlarmAllowed(isPushAlarmAllowed: Boolean) | ||
|
||
suspend fun clear() | ||
|
||
suspend fun clearForRefreshToken() | ||
} |
25 changes: 25 additions & 0 deletions
25
core/datastore/src/main/java/com/teamwable/datastore/di/DataStoreModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package com.teamwable.datastore.di | ||
|
||
import android.content.Context | ||
import androidx.datastore.core.DataStore | ||
import androidx.datastore.preferences.core.Preferences | ||
import androidx.datastore.preferences.preferencesDataStore | ||
import dagger.Module | ||
import dagger.Provides | ||
import dagger.hilt.InstallIn | ||
import dagger.hilt.android.qualifiers.ApplicationContext | ||
import dagger.hilt.components.SingletonComponent | ||
import javax.inject.Singleton | ||
|
||
@Module | ||
@InstallIn(SingletonComponent::class) | ||
object DataStoreModule { | ||
private val Context.dataStore by preferencesDataStore(name = "wable_data_store") | ||
|
||
@Singleton | ||
@Provides | ||
fun provideDataStore( | ||
@ApplicationContext context: Context, | ||
): DataStore<Preferences> = | ||
context.dataStore | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
여기서 throw된 exception은 어디서 핸들링 되나요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
공식문서 복붙 해온거라 그 생각은 못해봤네요!
이 예외는 상위에서 에러핸들링 하라는 의도인것 같습니다.
해당 flow를 viewmodel이나 activity에서 collect하기전 catch문을 통해서 error를 로깅을 찍거나 할수는 있을 것 같아요!
모든 datastore.data에 각 타입별로 default값을 할당 해놓아서 실패시에도 값이 map이 되긴 합니다!