From ad6d1a2e8d01759403aa05b56d2e654df338399a Mon Sep 17 00:00:00 2001
From: Nicholas <nicholas@signal.org>
Date: Wed, 21 Dec 2022 09:30:44 -0500
Subject: [PATCH] Update styling of the media rail selection states.

---
 .../mediapreview/mediarail/MediaRailAdapter.kt         |  6 ++++++
 ...xml => mediapreview_rail_item_overlay_selected.xml} |  4 +---
 .../mediapreview_rail_item_overlay_unselected.xml      | 10 ++++++++++
 app/src/main/res/drawable/mediarail_media_outline.xml  |  2 +-
 app/src/main/res/layout/mediarail_media_item.xml       |  3 ++-
 5 files changed, 20 insertions(+), 5 deletions(-)
 rename app/src/main/res/drawable/{mediapicker_item_border_dark.xml => mediapreview_rail_item_overlay_selected.xml} (63%)
 create mode 100644 app/src/main/res/drawable/mediapreview_rail_item_overlay_unselected.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/mediarail/MediaRailAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/mediarail/MediaRailAdapter.kt
index 66dcb0909..2dfb02a84 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/mediarail/MediaRailAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/mediarail/MediaRailAdapter.kt
@@ -4,6 +4,7 @@ import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -57,11 +58,13 @@ class MediaRailAdapter(private val glideRequests: GlideRequests, listener: RailI
     private val image: ThumbnailView
     private val outline: View
     private val captionIndicator: View
+    private val overlay: ImageView
 
     init {
       image = itemView.findViewById(R.id.rail_item_image)
       outline = itemView.findViewById(R.id.rail_item_outline)
       captionIndicator = itemView.findViewById(R.id.rail_item_caption)
+      overlay = itemView.findViewById(R.id.rail_item_overlay)
     }
 
     fun bind(
@@ -84,6 +87,9 @@ class MediaRailAdapter(private val glideRequests: GlideRequests, listener: RailI
 
     fun setSelectedItem(isActive: Boolean) {
       outline.visible = isActive
+
+      val resId = if (isActive) R.drawable.mediapreview_rail_item_overlay_selected else R.drawable.mediapreview_rail_item_overlay_unselected
+      overlay.setImageResource(resId)
     }
   }
 
diff --git a/app/src/main/res/drawable/mediapicker_item_border_dark.xml b/app/src/main/res/drawable/mediapreview_rail_item_overlay_selected.xml
similarity index 63%
rename from app/src/main/res/drawable/mediapicker_item_border_dark.xml
rename to app/src/main/res/drawable/mediapreview_rail_item_overlay_selected.xml
index f2aa578a9..7b9e913c7 100644
--- a/app/src/main/res/drawable/mediapicker_item_border_dark.xml
+++ b/app/src/main/res/drawable/mediapreview_rail_item_overlay_selected.xml
@@ -5,8 +5,6 @@
 
     <corners android:radius="8dp" />
 
-    <stroke
-        android:width="1px"
-        android:color="@color/transparent_white_20" />
+    <solid android:color="#1F000000" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/mediapreview_rail_item_overlay_unselected.xml b/app/src/main/res/drawable/mediapreview_rail_item_overlay_unselected.xml
new file mode 100644
index 000000000..de64ebc31
--- /dev/null
+++ b/app/src/main/res/drawable/mediapreview_rail_item_overlay_unselected.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="8dp" />
+
+    <solid android:color="#3D000000" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/mediarail_media_outline.xml b/app/src/main/res/drawable/mediarail_media_outline.xml
index 785b432e7..abd0c8a7a 100644
--- a/app/src/main/res/drawable/mediarail_media_outline.xml
+++ b/app/src/main/res/drawable/mediarail_media_outline.xml
@@ -4,5 +4,5 @@
 
     <stroke
         android:width="3dp"
-        android:color="@color/core_ultramarine"/>
+        android:color="@color/signal_light_colorNeutral"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mediarail_media_item.xml b/app/src/main/res/layout/mediarail_media_item.xml
index fbea9f72e..d93ae6173 100644
--- a/app/src/main/res/layout/mediarail_media_item.xml
+++ b/app/src/main/res/layout/mediarail_media_item.xml
@@ -26,10 +26,11 @@
         tools:visibility="visible"/>
 
     <ImageView
+        android:id="@+id/rail_item_overlay"
         android:layout_width="45dp"
         android:layout_height="45dp"
         android:layout_gravity="center"
-        android:src="@drawable/mediapicker_item_border_dark"/>
+        android:src="@drawable/mediapreview_rail_item_overlay_unselected"/>
 
     <ImageView
         android:id="@+id/rail_item_caption"