From 2a438ac24d0deab1011506b6aa14cfe134d95221 Mon Sep 17 00:00:00 2001
From: Fanchao Liu <273191+simophin@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:38:55 +1000
Subject: [PATCH] Add missing play button on media gallery page (#1626)

---
 .../thoughtcrime/securesms/media/MediaPage.kt | 24 +++++++++++++++----
 scripts/drone-static-upload.sh                |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/media/MediaPage.kt b/app/src/main/java/org/thoughtcrime/securesms/media/MediaPage.kt
index b7dfe68b24..c94b08b68b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/media/MediaPage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/media/MediaPage.kt
@@ -14,16 +14,20 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -34,6 +38,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader
 import org.thoughtcrime.securesms.ui.theme.LocalColors
+import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 import org.thoughtcrime.securesms.ui.theme.LocalType
 import kotlin.math.ceil
 
@@ -158,10 +163,21 @@ private fun ThumbnailRow(
 
                     when {
                         item.showPlayOverlay -> {
-                            Image(
-                                painter = painterResource(R.drawable.ic_baseline_play_circle_filled_48),
-                                contentDescription = null
-                            )
+                            // The code below is translated from thumbnail_view.xml:
+                            // Trying to show a green play button on a white background.
+                            Box(
+                                modifier = Modifier
+                                    .size(48.dp)
+                                    .background(Color.White, shape = CircleShape),
+                                contentAlignment = Alignment.Center,
+                            ) {
+                                Image(
+                                    modifier = Modifier.padding(start = LocalDimensions.current.xxxsSpacing),
+                                    painter = painterResource(R.drawable.triangle_right),
+                                    contentDescription = null,
+                                    colorFilter = ColorFilter.tint(LocalColors.current.primary)
+                                )
+                            }
                         }
                     }
 
diff --git a/scripts/drone-static-upload.sh b/scripts/drone-static-upload.sh
index b5c9ee83f7..0e5209c942 100755
--- a/scripts/drone-static-upload.sh
+++ b/scripts/drone-static-upload.sh
@@ -19,7 +19,7 @@ chmod 600 ssh_key
 
 # Define the output paths
 build_dir="app/build/outputs/apk/play/debug"
-target_path="${build_dir}/$(ls ${build_dir} | grep -o 'session-[^[:space:]]*-universal.apk')"
+target_path="${build_dir}/$(ls ${build_dir} | grep -o 'app-[^[:space:]]*-universal-debug.apk')"
 
 # Validate the paths exist
 if [ ! -d $build_path ]; then