From 799ff86fc0196dfc6880a5b3ebc429b7f42c7071 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sat, 23 Jan 2021 13:09:54 -0500
Subject: [PATCH] Fixed tinting of wallpaper bubble previews.

---
 .../res/drawable/chat_wallpaper_preview_bubble_background.xml   | 2 +-
 app/src/main/res/layout/chat_wallpaper_crop_activity.xml        | 1 +
 app/src/main/res/layout/chat_wallpaper_fragment.xml             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/drawable/chat_wallpaper_preview_bubble_background.xml b/app/src/main/res/drawable/chat_wallpaper_preview_bubble_background.xml
index 4dfe8d84a7..33cf2cb881 100644
--- a/app/src/main/res/drawable/chat_wallpaper_preview_bubble_background.xml
+++ b/app/src/main/res/drawable/chat_wallpaper_preview_bubble_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/signal_background_secondary" />
+    <solid android:color="@color/conversation_item_wallpaper_bubble_color" />
     <corners android:radius="18dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_wallpaper_crop_activity.xml b/app/src/main/res/layout/chat_wallpaper_crop_activity.xml
index fb12480072..2bd78ea316 100644
--- a/app/src/main/res/layout/chat_wallpaper_crop_activity.xml
+++ b/app/src/main/res/layout/chat_wallpaper_crop_activity.xml
@@ -74,6 +74,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxWidth="194dp"
             android:text="@string/WallpaperCropActivity__pinch_to_zoom_drag_to_adjust"
             android:textAppearance="@style/Signal.Text.Body"
             android:textColor="@color/core_white" />
diff --git a/app/src/main/res/layout/chat_wallpaper_fragment.xml b/app/src/main/res/layout/chat_wallpaper_fragment.xml
index d42b195762..eb61d2e632 100644
--- a/app/src/main/res/layout/chat_wallpaper_fragment.xml
+++ b/app/src/main/res/layout/chat_wallpaper_fragment.xml
@@ -189,7 +189,7 @@
             app:layout_constraintEnd_toEndOf="@id/chat_wallpaper_preview_background"
             app:layout_constraintTop_toBottomOf="@id/chat_wallpaper_preview_top_bar"
             app:srcCompat="@drawable/chat_wallpaper_preview_bubble_10"
-            app:tint="@color/signal_background_secondary" />
+            app:tint="@color/conversation_item_wallpaper_bubble_color" />
 
         <View
             android:layout_width="0dp"