From d5491a2e845130e48e1b63eff9298e01e12c69d7 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 20 Sep 2021 10:19:03 -0300
Subject: [PATCH] Fix vector load crash on Kitkat.

Fixes #11628
---
 .../org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt  | 4 ++++
 .../securesms/scribbles/TextEntryDialogFragment.kt            | 4 ++++
 app/src/main/res/layout/v2_media_image_editor_hud.xml         | 1 -
 .../res/layout/v2_media_image_editor_text_entry_fragment.xml  | 1 -
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
index 0c0f6c19d..0e812a351 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
@@ -12,10 +12,12 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.SeekBar
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.AppCompatSeekBar
 import androidx.constraintlayout.widget.Guideline
 import androidx.core.animation.doOnEnd
 import androidx.core.content.ContextCompat
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
 import com.airbnb.lottie.SimpleColorFilter
 import com.google.android.material.switchmaterial.SwitchMaterial
 import org.thoughtcrime.securesms.R
@@ -92,6 +94,8 @@ class ImageEditorHudV2 @JvmOverloads constructor(
   }
 
   private fun initializeViews() {
+    colorIndicator.background = AppCompatResources.getDrawable(context, R.drawable.ic_color_preview)
+
     undoButton.setOnClickListener { listener?.onUndo() }
     clearAllButton.setOnClickListener { listener?.onClearAll() }
     cancelButton.setOnClickListener { listener?.onCancel() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt
index e6748ccb7..3ecfbd937 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.AppCompatSeekBar
 import androidx.fragment.app.FragmentManager
 import com.airbnb.lottie.SimpleColorFilter
@@ -62,6 +63,9 @@ class TextEntryDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_im
     val slider: AppCompatSeekBar = view.findViewById(R.id.image_editor_hud_draw_color_bar)
     val colorIndicator: ImageView = view.findViewById(R.id.image_editor_hud_color_indicator)
     val styleToggle: ImageView = view.findViewById(R.id.image_editor_hud_text_style_button)
+
+    colorIndicator.background = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_color_preview)
+
     slider.setUpForColor(
       Color.WHITE,
       {
diff --git a/app/src/main/res/layout/v2_media_image_editor_hud.xml b/app/src/main/res/layout/v2_media_image_editor_hud.xml
index 7d9ed3663..a3ca47d08 100644
--- a/app/src/main/res/layout/v2_media_image_editor_hud.xml
+++ b/app/src/main/res/layout/v2_media_image_editor_hud.xml
@@ -184,7 +184,6 @@
             android:layout_height="80dp"
             android:layout_marginBottom="8dp"
             android:alpha="0"
-            android:background="@drawable/ic_color_preview"
             android:importantForAccessibility="no"
             android:paddingBottom="12dp"
             android:scaleType="centerInside"
diff --git a/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml b/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
index dc8b1b7a8..f0058afe6 100644
--- a/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
+++ b/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
@@ -15,7 +15,6 @@
             android:layout_height="80dp"
             android:layout_marginBottom="8dp"
             android:alpha="0"
-            android:background="@drawable/ic_color_preview"
             android:importantForAccessibility="no"
             android:paddingBottom="12dp"
             android:scaleType="centerInside"