Merge branch 'master' into feature/DRA-141

Author: rajdeveloper90

app/src/main/java/eu/theappfactory/dailyrecipes/data/userEvent/FirestoreUserEventDataSource.kt

@@ -257,7 +257,7 @@ class FirestoreUserEventDataSource @Inject constructor(
 
     override suspend fun updateUser(user: UserResponse) =
         suspendCancellableCoroutine<Result<UpdateUserStatus>> { continuation ->
-            val result = checkIfUsernameExists(user.username)
+            val result = checkIfUsernameExists(user.username, user.id)
 
             when (result) {
                 is Result.Success -> {
@@ -316,7 +316,7 @@ class FirestoreUserEventDataSource @Inject constructor(
             }
         }
 
-    private fun checkIfUsernameExists(username: String): Result<UpdateUserStatus> {
+    private fun checkIfUsernameExists(username: String, id: String): Result<UpdateUserStatus> {
         val users = ArrayList<UserResponse>()
         val itemSnapshot = firestore.collection(USERS_COLLECTION).get()
 
@@ -346,7 +346,7 @@ class FirestoreUserEventDataSource @Inject constructor(
             it.username.equals(username, ignoreCase = true)
         }
 
-        if (count == 0) {
+        if (count == 0 || users.find { it.username == username }?.id == id) {
             return Result.Success(UpdateUserStatus.UPDATE_OK)
         } else {
             return Result.Error(Exception("username is taken."))

app/src/main/java/eu/theappfactory/dailyrecipes/ui/home/pager/ItemHolder.kt

@@ -427,7 +427,9 @@ class ItemHolder(
         binding.videoView.hideController()
         if (item.showThumbnail && item.imageUri.isNotEmpty()) {
             binding.loadingFrame.postDelayed({
-                binding.videoView.player?.playWhenReady = true
+                if (itemView.isAttachedToWindow) {
+                    binding.videoView.player?.playWhenReady = true
+                }
             }, PAN_ANIMATION_DURATION)
         } else {
             binding.videoView.player?.playWhenReady = true

app/src/main/res/layout/list_item_items.xml

@@ -13,6 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
+            app:keep_content_on_player_reset="true"
             app:use_controller="false" />
 
         <ImageView