From c9570fd6ff5961340f119c763b29ea48e9c81a42 Mon Sep 17 00:00:00 2001
From: Denys M <dector9@gmail.com>
Date: Mon, 10 Jun 2019 15:50:37 +0300
Subject: [PATCH] Use `Drawable.toBitmap()` from androidx-ktx. (#3286)

---
 app/build.gradle                                                | 1 +
 .../org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt     | 2 +-
 .../fenix/search/awesomebar/ShortcutsSuggestionProvider.kt      | 2 +-
 buildSrc/src/main/java/Dependencies.kt                          | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fdb0f1b39..956dc7db3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -352,6 +352,7 @@ dependencies {
     implementation Deps.androidx_lifecycle_viewmodel_ktx
     implementation Deps.androidx_lifecycle_viewmodel_ss
     implementation Deps.androidx_core
+    implementation Deps.androidx_core_ktx
     implementation Deps.androidx_transition
     implementation Deps.google_material
 
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
index 27fdaf6ae..5f166ea0c 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
@@ -8,6 +8,7 @@ import android.graphics.PorterDuff
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.toBitmap
 import androidx.recyclerview.widget.RecyclerView
 import io.reactivex.Observable
 import io.reactivex.Observer
@@ -21,7 +22,6 @@ import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider
 import mozilla.components.feature.awesomebar.provider.SessionSuggestionProvider
 import mozilla.components.feature.search.SearchUseCases
 import mozilla.components.feature.session.SessionUseCases
-import mozilla.components.support.ktx.android.graphics.drawable.toBitmap
 import mozilla.components.support.ktx.android.view.hideKeyboard
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ThemeManager
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt
index e6a67c21a..d65445cc7 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProvider.kt
@@ -1,10 +1,10 @@
 package org.mozilla.fenix.search.awesomebar
 
 import android.content.Context
+import androidx.core.graphics.drawable.toBitmap
 import mozilla.components.browser.search.SearchEngine
 import mozilla.components.browser.search.SearchEngineManager
 import mozilla.components.concept.awesomebar.AwesomeBar
-import mozilla.components.support.ktx.android.graphics.drawable.toBitmap
 import org.mozilla.fenix.R
 import java.util.UUID
 
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 3a95e0045..ae4c2e61e 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -154,6 +154,7 @@ object Deps {
     const val androidx_navigation_ui = "androidx.navigation:navigation-ui:${Versions.androidx_navigation}"
     const val androidx_recyclerview = "androidx.recyclerview:recyclerview:${Versions.androidx_recyclerview}"
     const val androidx_core = "androidx.core:core:${Versions.androidx_core}"
+    const val androidx_core_ktx = "androidx.core:core-ktx:${Versions.androidx_core}"
     const val androidx_transition = "androidx.transition:transition:${Versions.androidx_transition}"
     const val google_material = "com.google.android.material:material:${Versions.google_material}"