Merge branch 'hotfix/1.1.7'

mshdabiola · Apr 23, 2023 · 168430a · 168430a
2 parents 8c8fe32 + 2ce6bf4
commit 168430a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 21 deletions.
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -34,8 +34,8 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 defaultConfig.targetSdk = 33
                // compileSdkPreview = "UpsideDownCake"
                 defaultConfig.minSdk = 24
-                defaultConfig.versionName = "1.1.6"
-                defaultConfig.versionCode = 14
+                defaultConfig.versionName = "1.1.7"
+                defaultConfig.versionCode = 15
 
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 defaultConfig.vectorDrawables {

diff --git a/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt b/feature/editScreen/src/main/java/com/mshdabiola/editscreen/EditViewModel.kt
@@ -195,29 +195,40 @@ class EditViewModel @Inject constructor(
             }
 
         }
-        viewModelScope.launch(Dispatchers.IO){
+        viewModelScope.launch{
             //on notepad image and labels change
-            notePadRepository.getOneNotePad(editArg.id)
-                .mapNotNull { it.images to it.labels }
-                .distinctUntilChanged()
-                .collectLatest { pair ->
-                    try {
-                        Log.e("editviewmodel",pair.first.joinToString())
-                        val labels = labelRepository.getAllLabels().first()
-                        val strLabel = pair.second.map { s ->
-                            labels.singleOrNull { it.id == s.labelId }?.label ?: ""
-                        }
-                        val image = pair.first.map { it.toNoteImageUiState(contentManager::getImagePath) }
-
-                        notePadUiState = notePadUiState.copy(
-                            labels = strLabel.toImmutableList(),
-                            images = image.toImmutableList(),
-                        )
-                    }catch (e:Exception){
-                        e.printStackTrace()
+            snapshotFlow {
+                notePadUiState
+            }
+                .map { it.note.id }
+                .distinctUntilChanged { old, new -> old == new }
+                .collectLatest {
+                    if (it>-1){
+
+                        notePadRepository.getOneNotePad(it)
+                            .mapNotNull { it.images to it.labels }
+                            .distinctUntilChanged()
+                            .collectLatest { pair ->
+
+                                Timber.tag("editviewmodel").e(pair.first.joinToString())
+                                val labels = labelRepository.getAllLabels().first()
+                                val strLabel = pair.second.map { s ->
+                                    labels.singleOrNull { it.id == s.labelId }?.label ?: ""
+                                }
+                                val image = pair.first.map { it.toNoteImageUiState(contentManager::getImagePath) }
+
+                                notePadUiState = notePadUiState.copy(
+                                    labels = strLabel.toImmutableList(),
+                                    images = image.toImmutableList(),
+                                )
+
+
+                            }
+
                     }
 
                 }
+
         }
 
         //save note