Improving the video switching from blurhash to video

app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt

@@ -182,28 +182,7 @@ fun VideoView(
         )
     }
 
-    if (!automaticallyStartPlayback.value) {
+    if (blurhash == null) {
-        if (blurhash != null) {
-            val ratio = aspectRatio(dimensions)
-            val modifier = if (ratio != null && roundedCorner) {
-                Modifier.aspectRatio(ratio)
-            } else {
-                Modifier
-            }
-
-            Box(modifier, contentAlignment = Alignment.Center) {
-                DisplayBlurHash(blurhash, null, ContentScale.Crop, MaterialTheme.colorScheme.imageModifier)
-                IconButton(
-                    modifier = Modifier.size(Size75dp),
-                    onClick = { automaticallyStartPlayback.value = true }
-                ) {
-                    DownloadForOfflineIcon(Size75dp, Color.White)
-                }
-            }
-        } else {
-            ImageUrlWithDownloadButton(url = videoUri, showImage = automaticallyStartPlayback)
-        }
-    } else {
         val ratio = aspectRatio(dimensions)
         val modifier = if (ratio != null && roundedCorner) {
             Modifier.aspectRatio(ratio)
@@ -212,6 +191,9 @@ fun VideoView(
         }
 
         Box(modifier) {
+            if (!automaticallyStartPlayback.value) {
+                ImageUrlWithDownloadButton(url = videoUri, showImage = automaticallyStartPlayback)
+            } else {
                 VideoViewInner(
                     videoUri = videoUri,
                     defaultToStart = defaultToStart,
@@ -231,6 +213,44 @@ fun VideoView(
                 )
             }
         }
+    } else {
+        val ratio = aspectRatio(dimensions)
+        val modifier = if (ratio != null && roundedCorner) {
+            Modifier.aspectRatio(ratio)
+        } else {
+            Modifier
+        }
+
+        Box(modifier, contentAlignment = Alignment.Center) {
+            if (!automaticallyStartPlayback.value) {
+                DisplayBlurHash(blurhash, null, ContentScale.Crop, MaterialTheme.colorScheme.imageModifier)
+                IconButton(
+                    modifier = Modifier.size(Size75dp),
+                    onClick = { automaticallyStartPlayback.value = true }
+                ) {
+                    DownloadForOfflineIcon(Size75dp, Color.White)
+                }
+            } else {
+                VideoViewInner(
+                    videoUri = videoUri,
+                    defaultToStart = defaultToStart,
+                    title = title,
+                    thumb = thumb,
+                    roundedCorner = roundedCorner,
+                    topPaddingForControllers = topPaddingForControllers,
+                    waveform = waveform,
+                    artworkUri = artworkUri,
+                    authorName = authorName,
+                    dimensions = dimensions,
+                    blurhash = blurhash,
+                    nostrUriCallback = nostrUriCallback,
+                    automaticallyStartPlayback = automaticallyStartPlayback,
+                    onControllerVisibilityChanged = onControllerVisibilityChanged,
+                    onDialog = onDialog
+                )
+            }
+        }
+    }
 }
 
 @Composable