DatingApp fixed minor bug (#113)

* Gradle updated to 7.1.0-alpha11

* Fixed concurrent exception after setting mutableState in DatingHomeScreen.kt

Author: abbasiehsan1991

app/src/main/java/com/guru/composecookbook/ui/utils/Extentions.kt

@@ -0,0 +1,3 @@
+package com.guru.composecookbook.ui.utils
+
+fun Boolean?.orFalse(): Boolean = this ?: false

build.gradle.kts

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.0-alpha07")
+        classpath("com.android.tools.build:gradle:7.1.0-alpha11")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
     }
 }

buildSrc/build.gradle.kts

@@ -36,8 +36,8 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
 
     // in order to recognize the "plugins" block in the common script
-    implementation("com.android.tools.build:gradle:7.1.0-alpha07")
+    implementation("com.android.tools.build:gradle:7.1.0-alpha11")
 
     // in order to recognize the "android" block in the common script
-    implementation("com.android.tools.build:gradle-api:7.1.0-alpha07")
+    implementation("com.android.tools.build:gradle-api:7.1.0-alpha11")
 }

demos/datingapp/src/main/java/com/guru/composecookbook/datingapp/DatingHomeViewModel.kt

@@ -0,0 +1,20 @@
+package com.guru.composecookbook.datingapp
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.guru.composecookbook.data.AlbumsDataProvider
+import com.guru.composecookbook.data.model.Album
+
+class DatingHomeViewModel : ViewModel() {
+    private val _albumLiveData = MutableLiveData<MutableList<Album>>()
+    val albumLiveData: LiveData<MutableList<Album>> = _albumLiveData
+
+    init {
+        getAlbums()
+    }
+
+    private fun getAlbums(){
+        _albumLiveData.value = AlbumsDataProvider.albums.take(15).toMutableList()
+    }
+}

demos/datingapp/src/main/java/com/guru/composecookbook/datingapp/components/home/DatingHomeScreen.kt

@@ -11,6 +11,7 @@ import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.Favorite
 import androidx.compose.material.icons.outlined.Place
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -23,24 +24,27 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.guru.composecookbook.canvas.MultiStateAnimationCircleFilledCanvas
-import com.guru.composecookbook.data.AlbumsDataProvider
 import com.guru.composecookbook.data.R
 import com.guru.composecookbook.data.model.Album
+import com.guru.composecookbook.datingapp.DatingHomeViewModel
+import com.guru.composecookbook.datingapp.util.orFalse
 import com.guru.composecookbook.theme.modifiers.verticalGradientBackground
 import com.guru.composecookbook.theme.purple
 import com.guru.composecookbook.theme.typography
 import kotlin.random.Random
 
 @Composable
 fun DatingHomeScreen() {
+    val viewModel: DatingHomeViewModel = viewModel()
+    val persons = viewModel.albumLiveData.observeAsState()
+
     val configuration = LocalConfiguration.current
     val screenHeight = configuration.screenHeightDp.dp
     val cardHeight = screenHeight - 200.dp
 
     Surface(modifier = Modifier.fillMaxSize()) {
-        val persons = mutableListOf<Album>()
-        persons.addAll(AlbumsDataProvider.albums.take(15))
         val boxModifier = Modifier
 
         Box(
@@ -53,7 +57,7 @@ fun DatingHomeScreen() {
         ) {
             val listEmpty = remember { mutableStateOf(false) }
             DatingLoader(modifier = boxModifier)
-            persons.forEachIndexed { index, album ->
+            persons.value?.forEachIndexed { index, album ->
                 DraggableCard(
                     item = album,
                     modifier = Modifier
@@ -66,9 +70,9 @@ fun DatingHomeScreen() {
                             end = 16.dp
                         ),
                     onSwiped = { _, swipedAlbum ->
-                        if (persons.isNotEmpty()) {
-                            persons.remove(swipedAlbum)
-                            if (persons.isEmpty()) {
+                        if (persons.value?.isNotEmpty().orFalse()) {
+                            persons.value?.remove(swipedAlbum)
+                            if (persons.value?.isEmpty().orFalse()) {
                                 listEmpty.value = true
                             }
                         }

demos/datingapp/src/main/java/com/guru/composecookbook/datingapp/util/Extentions.kt

@@ -0,0 +1,3 @@
+package com.guru.composecookbook.datingapp.util
+
+fun Boolean?.orFalse(): Boolean = this ?: false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Jan 30 00:00:22 SGT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME