Merge remote-tracking branch 'origin/feature/BDBD-328' into stage/san…

…dbox
FakeDevelopers · Jul 6, 2022 · 6ed7277 · 6ed7277
2 parents c039653 + 6f566de
commit 6ed7277
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/...n/com/fakedevelopers/bidderbidder/ui/product_registration/ProductRegistrationViewModel.kt b/...n/com/fakedevelopers/bidderbidder/ui/product_registration/ProductRegistrationViewModel.kt
@@ -149,11 +149,11 @@ class ProductRegistrationViewModel @Inject constructor(
 
     fun setUrlList(list: List<String>) {
         viewModelScope.launch {
-            _urlList.emit(list.toMutableList())
             adapter.submitList(list)
-            if (list.isNotEmpty()) {
+            if (list.isNotEmpty() && !list.contains(urlList.value[0])) {
                 adapter.notifyItemChanged(1)
             }
+            _urlList.emit(list.toMutableList())
         }
     }
 

diff --git a/...n/com/fakedevelopers/bidderbidder/ui/product_registration/album_list/AlbumListFragment.kt b/...n/com/fakedevelopers/bidderbidder/ui/product_registration/album_list/AlbumListFragment.kt
@@ -1,7 +1,6 @@
 package com.fakedevelopers.bidderbidder.ui.product_registration.album_list
 
 import android.content.ContentUris
-import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import android.view.LayoutInflater

diff --git a/.../com/fakedevelopers/bidderbidder/ui/product_registration/album_list/AlbumListViewModel.kt b/.../com/fakedevelopers/bidderbidder/ui/product_registration/album_list/AlbumListViewModel.kt
@@ -101,12 +101,12 @@ class AlbumListViewModel : ViewModel() {
 
     fun setSelectedImage(list: List<String>) {
         viewModelScope.launch {
-            _selectedImageList.emit(list.toMutableList())
             selectedPictureAdapter.submitList(list.toMutableList())
-            if (list.isNotEmpty()) {
+            if (list.isNotEmpty() && !list.contains(selectedImageList.value[0])) {
                 selectedPictureAdapter.notifyItemChanged(1)
             }
             albumListAdapter.notifyDataSetChanged()
+            _selectedImageList.emit(list.toMutableList())
         }
     }