From 015922ddd2d007be81311b11a2c9e53b35605330 Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Fri, 2 Aug 2019 15:50:42 -0700
Subject: [PATCH] No issue: Fix Crash lower API by setting gradient drawables
 in onBind

---
 .../onboarding/OnboardingAutomaticSignInViewHolder.kt      | 7 +++++--
 .../onboarding/OnboardingManualSignInViewHolder.kt         | 4 ++++
 app/src/main/res/layout/onboarding_automatic_signin.xml    | 1 -
 app/src/main/res/layout/onboarding_manual_signin.xml       | 1 -
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt
index 67c5ae2df..8a2b91d4c 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt
@@ -5,14 +5,15 @@
 package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
 
 import android.view.View
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.onboarding_automatic_signin.view.turn_on_sync_button
-import kotlinx.android.synthetic.main.onboarding_automatic_signin.view.header_text
+import kotlinx.android.synthetic.main.onboarding_automatic_signin.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import mozilla.components.service.fxa.sharing.ShareableAccount
+import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.ext.components
@@ -51,6 +52,8 @@ class OnboardingAutomaticSignInViewHolder(private val view: View) : RecyclerView
         view.header_text.text = view.context.getString(
             R.string.onboarding_firefox_account_auto_signin_header_2, account.email
         )
+        val icon = AppCompatResources.getDrawable(view.context, R.drawable.ic_onboarding_avatar_anonymous)
+        view.header_text.putCompoundDrawablesRelativeWithIntrinsicBounds(start = icon)
     }
 
     companion object {
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolder.kt
index cfda858c7..08b70a215 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingManualSignInViewHolder.kt
@@ -5,9 +5,11 @@
 package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
 
 import android.view.View
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.onboarding_manual_signin.view.*
+import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds
 import org.mozilla.fenix.R
 import org.mozilla.fenix.home.HomeFragmentDirections
 
@@ -22,6 +24,8 @@ class OnboardingManualSignInViewHolder(private val view: View) : RecyclerView.Vi
     fun bind() {
         val appName = view.context.getString(R.string.app_name)
         view.header_text.text = view.context.getString(R.string.onboarding_firefox_account_header, appName)
+        val icon = AppCompatResources.getDrawable(view.context, R.drawable.ic_onboarding_firefox_accounts)
+        view.header_text.putCompoundDrawablesRelativeWithIntrinsicBounds(start = icon)
     }
 
     companion object {
diff --git a/app/src/main/res/layout/onboarding_automatic_signin.xml b/app/src/main/res/layout/onboarding_automatic_signin.xml
index e7cfbfb53..50c9081bd 100644
--- a/app/src/main/res/layout/onboarding_automatic_signin.xml
+++ b/app/src/main/res/layout/onboarding_automatic_signin.xml
@@ -16,7 +16,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="14dp"
-        android:drawableStart="@drawable/ic_onboarding_avatar_anonymous"
         android:drawablePadding="12dp"
         android:textAppearance="@style/Header16TextStyle"
         android:textColor="@color/onboarding_card_primary_text_dark"
diff --git a/app/src/main/res/layout/onboarding_manual_signin.xml b/app/src/main/res/layout/onboarding_manual_signin.xml
index 23773c5d4..ffc46de96 100644
--- a/app/src/main/res/layout/onboarding_manual_signin.xml
+++ b/app/src/main/res/layout/onboarding_manual_signin.xml
@@ -16,7 +16,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="14dp"
-        android:drawableStart="@drawable/ic_onboarding_firefox_accounts"
         android:drawablePadding="12dp"
         android:textAppearance="@style/Header16TextStyle"
         android:textColor="@color/onboarding_card_primary_text_dark"