From b5ce7325fccd6dd355afe165518194c889c6cc09 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 3 Sep 2019 15:19:06 -0400
Subject: [PATCH] Fix invite drawable on API 19.

---
 res/drawable/circle_invite.xml                |  5 +++
 res/drawable/ic_invite_circle.xml             | 14 ------
 .../contact_selection_invite_action_item.xml  | 44 ++++++++++++++-----
 3 files changed, 37 insertions(+), 26 deletions(-)
 create mode 100644 res/drawable/circle_invite.xml
 delete mode 100644 res/drawable/ic_invite_circle.xml

diff --git a/res/drawable/circle_invite.xml b/res/drawable/circle_invite.xml
new file mode 100644
index 0000000000..174d49351f
--- /dev/null
+++ b/res/drawable/circle_invite.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="#70707C" />
+</shape>
diff --git a/res/drawable/ic_invite_circle.xml b/res/drawable/ic_invite_circle.xml
deleted file mode 100644
index bf11042bc2..0000000000
--- a/res/drawable/ic_invite_circle.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#70707C" />
-        </shape>
-    </item>
-    <item
-        android:bottom="10dp"
-        android:drawable="@drawable/ic_invite_28dp"
-        android:left="10dp"
-        android:right="10dp"
-        android:top="10dp" />
-</layer-list>
diff --git a/res/layout/contact_selection_invite_action_item.xml b/res/layout/contact_selection_invite_action_item.xml
index e8cfd20df2..3a80975403 100644
--- a/res/layout/contact_selection_invite_action_item.xml
+++ b/res/layout/contact_selection_invite_action_item.xml
@@ -1,17 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Signal.Text.Body"
     android:layout_width="match_parent"
     android:layout_height="@dimen/contact_selection_item_height"
-    android:drawableStart="@drawable/ic_invite_circle"
-    android:drawablePadding="16dp"
-    android:ellipsize="marquee"
-    android:fontFamily="sans-serif-medium"
-    android:gravity="center_vertical|start"
-    android:labelFor="@id/action_icon"
     android:paddingStart="@dimen/selection_item_header_width"
-    android:singleLine="true"
-    android:text="@string/contact_selection_activity__invite_to_signal"
-    android:textAlignment="viewStart"
-    tools:ignore="RtlSymmetry" />
+    tools:ignore="RtlSymmetry,UseCompoundDrawables">
+
+    <FrameLayout
+        android:layout_width="@dimen/selection_item_header_width"
+        android:layout_height="@dimen/selection_item_header_width"
+        android:layout_gravity="center_vertical"
+        android:background="@drawable/circle_invite">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="10dp"
+            app:srcCompat="@drawable/ic_invite_28dp"
+            tools:ignore="ContentDescription" />
+    </FrameLayout>
+
+    <TextView
+        style="@style/Signal.Text.Body"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/contact_selection_item_height"
+        android:layout_marginStart="16dp"
+        android:ellipsize="marquee"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center_vertical|start"
+        android:labelFor="@id/action_icon"
+        android:singleLine="true"
+        android:text="@string/contact_selection_activity__invite_to_signal"
+        android:textAlignment="viewStart" />
+
+</LinearLayout>