From bd4f7691e9a0338bfd83c72912d8d815e05589c9 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 27 Aug 2020 16:40:56 -0300
Subject: [PATCH] Add proper background color to camera icon.

Fixes #9945
---
 app/src/main/res/layout/profile_create_fragment.xml | 1 +
 app/src/main/res/values/attrs.xml                   | 2 ++
 app/src/main/res/values/themes.xml                  | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/app/src/main/res/layout/profile_create_fragment.xml b/app/src/main/res/layout/profile_create_fragment.xml
index 8a2a169147..b2ade4f095 100644
--- a/app/src/main/res/layout/profile_create_fragment.xml
+++ b/app/src/main/res/layout/profile_create_fragment.xml
@@ -106,6 +106,7 @@
                     android:cropToPadding="false"
                     android:elevation="4dp"
                     android:padding="14dp"
+                    app:backgroundTint="?attr/camera_icon_background_tint"
                     app:layout_constraintStart_toStartOf="@+id/avatar_background"
                     app:layout_constraintTop_toTopOf="@+id/avatar_background"
                     app:srcCompat="?conversation_attach_camera" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7f4489f1ed..7478643a43 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -34,6 +34,8 @@
     <attr name="conversation_list_compose_icon_tint" format="color" />
     <attr name="conversation_list_camera_button_background" format="color"/>
 
+    <attr name="camera_icon_background_tint" format="color" />
+
     <attr name="resource_placeholder_gradient" format="reference" />
 
     <attr name="avatar_selection_take_photo" format="reference" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0f79bcfab9..5f3e55dd37 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -228,6 +228,8 @@
         <item name="conversation_list_compose_icon_tint">@color/core_white</item>
         <item name="conversation_list_camera_button_background">@color/core_white</item>
 
+        <item name="camera_icon_background_tint">@color/core_grey_02</item>
+
         <item name="fab_color">@color/core_ultramarine</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
 
@@ -560,6 +562,8 @@
         <item name="conversation_list_compose_icon_tint">@color/core_white</item>
         <item name="conversation_list_camera_button_background">@color/core_grey_85</item>
 
+        <item name="camera_icon_background_tint">@color/core_grey_75</item>
+
         <item name="conversation_group_member_name">#99ffffff</item>
 
         <item name="conversation_item_bubble_background">@color/core_grey_75</item>