[Preferences DataStore] Update to alpha07

Author: florina-muntenescu

app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt

@@ -25,7 +25,7 @@ import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.stringPreferencesKey
-import androidx.datastore.preferences.createDataStore
+import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
@@ -48,12 +48,11 @@ data class UserPreferences(
 /**
  * Class that handles saving and retrieving user preferences
  */
-class UserPreferencesRepository private constructor(context: Context) {
+class UserPreferencesRepository (private val context: Context) {
 
     private val TAG: String = "UserPreferencesRepo"
 
-    private val dataStore: DataStore<Preferences> =
-        context.createDataStore(
+    private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(
             name = USER_PREFERENCES_NAME,
             // Since we're migrating from SharedPreferences, add a migration based on the
             // SharedPreferences name
@@ -69,7 +68,7 @@ class UserPreferencesRepository private constructor(context: Context) {
     /**
      * Get the user preferences flow.
      */
-    val userPreferencesFlow: Flow<UserPreferences> = dataStore.data
+    val userPreferencesFlow: Flow<UserPreferences> = context.dataStore.data
         .catch { exception ->
             // dataStore.data throws an IOException when an error is encountered when reading data
             if (exception is IOException) {
@@ -96,7 +95,7 @@ class UserPreferencesRepository private constructor(context: Context) {
     suspend fun enableSortByDeadline(enable: Boolean) {
         // updateData handles data transactionally, ensuring that if the sort is updated at the same
         // time from another thread, we won't have conflicts
-        dataStore.edit { preferences ->
+        context.dataStore.edit { preferences ->
             val currentOrder = SortOrder.valueOf(
                 preferences[PreferencesKeys.SORT_ORDER] ?: SortOrder.NONE.name
             )
@@ -126,7 +125,7 @@ class UserPreferencesRepository private constructor(context: Context) {
     suspend fun enableSortByPriority(enable: Boolean) {
         // updateData handles data transactionally, ensuring that if the sort is updated at the same
         // time from another thread, we won't have conflicts
-        dataStore.edit { preferences ->
+        context.dataStore.edit { preferences ->
             val currentOrder = SortOrder.valueOf(
                 preferences[PreferencesKeys.SORT_ORDER] ?: SortOrder.NONE.name
             )
@@ -151,21 +150,8 @@ class UserPreferencesRepository private constructor(context: Context) {
     }
 
     suspend fun updateShowCompleted(showCompleted: Boolean) {
-        dataStore.edit { preferences ->
+        context.dataStore.edit { preferences ->
             preferences[PreferencesKeys.SHOW_COMPLETED] = showCompleted
         }
     }
-
-    companion object {
-        @Volatile
-        private var INSTANCE: UserPreferencesRepository? = null
-
-        fun getInstance(context: Context): UserPreferencesRepository {
-            return INSTANCE ?: synchronized(this) {
-                val instance = UserPreferencesRepository(context)
-                INSTANCE = instance
-                instance
-            }
-        }
-    }
 }

app/src/main/java/com/codelab/android/datastore/ui/TasksActivity.kt

@@ -41,7 +41,10 @@ class TasksActivity : AppCompatActivity() {
 
         viewModel = ViewModelProvider(
             this,
-            TasksViewModelFactory(TasksRepository, UserPreferencesRepository.getInstance(this))
+            TasksViewModelFactory(
+                TasksRepository,
+                UserPreferencesRepository(this.applicationContext)
+            )
         ).get(TasksViewModel::class.java)
 
         setupRecyclerView()

build.gradle

@@ -22,7 +22,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.0"
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha08'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -43,7 +43,7 @@ ext {
     constraintLayoutVersion = '2.0.2'
     coreVersion = '1.3.2'
     coroutinesVersion = '1.3.9'
-    dataStoreVersion = '1.0.0-alpha06'
+    dataStoreVersion = '1.0.0-alpha07'
     materialVersion = '1.2.1'
     lifecycleVersion = '2.2.0'
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-bin.zip