From fd4acf6e925432a6c10a456b0aee039debe6c8bb Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Tue, 12 Mar 2019 11:49:22 -0400
Subject: [PATCH] Upgrade AC dependency to 0.47.0-SNAPSHOT and GV to
 67.0.20190312095443 (#958)

* Upgrade AC dependency to 0.47.0-SNAPSHOT and GV to 67.0.20190312095443

* Fix compliation errors
---
 .../org/mozilla/fenix/library/history/HistoryItemMenu.kt     | 2 +-
 app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt | 3 ++-
 .../mozilla/fenix/search/awesomebar/AwesomeBarComponent.kt   | 3 ++-
 .../org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt  | 5 +++--
 buildSrc/src/main/java/Dependencies.kt                       | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt
index be02c8995..20727f605 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt
@@ -23,7 +23,7 @@ class HistoryItemMenu(
         listOf(
             SimpleBrowserMenuItem(
                 context.getString(R.string.history_delete_item),
-                R.color.photonRed60
+                textColorResource = R.color.photonRed60
             ) {
                 onItemTapped.invoke(Item.Delete)
             }
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
index 8c7510a9f..0bfb91a49 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -102,7 +102,8 @@ class SearchFragment : Fragment() {
                         (activity as HomeActivity).openToBrowser(sessionId, BrowserDirection.FromSearch)
                     }
                     is AwesomeBarAction.SearchTermsTapped -> {
-                        getSearchUseCase(requireContext(), sessionId == null).invoke(it.searchTerms)
+                        getSearchUseCase(requireContext(), sessionId == null)
+                            .invoke(it.searchTerms, it.engine)
                         (activity as HomeActivity).openToBrowser(sessionId, BrowserDirection.FromSearch)
                     }
                 }
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarComponent.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarComponent.kt
index 80c4574b7..815720e5b 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarComponent.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarComponent.kt
@@ -4,6 +4,7 @@ package org.mozilla.fenix.search.awesomebar
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import android.view.ViewGroup
+import mozilla.components.browser.search.SearchEngine
 import org.mozilla.fenix.mvi.Action
 import org.mozilla.fenix.mvi.ActionBusFactory
 import org.mozilla.fenix.mvi.Change
@@ -15,7 +16,7 @@ data class AwesomeBarState(val query: String) : ViewState
 
 sealed class AwesomeBarAction : Action {
     data class URLTapped(val url: String) : AwesomeBarAction()
-    data class SearchTermsTapped(val searchTerms: String) : AwesomeBarAction()
+    data class SearchTermsTapped(val searchTerms: String, val engine: SearchEngine?) : AwesomeBarAction()
 }
 
 sealed class AwesomeBarChange : Change {
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 29dbb60f9..a0120a077 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
@@ -10,6 +10,7 @@ import io.reactivex.Observable
 import io.reactivex.Observer
 import io.reactivex.functions.Consumer
 import mozilla.components.browser.awesomebar.BrowserAwesomeBar
+import mozilla.components.browser.search.SearchEngine
 import mozilla.components.feature.awesomebar.provider.ClipboardSuggestionProvider
 import mozilla.components.feature.awesomebar.provider.HistoryStorageSuggestionProvider
 import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider
@@ -43,8 +44,8 @@ class AwesomeBarUIView(
         }
 
         val searchUseCase = object : SearchUseCases.SearchUseCase {
-            override fun invoke(searchTerms: String) {
-                actionEmitter.onNext(AwesomeBarAction.SearchTermsTapped(searchTerms))
+            override fun invoke(searchTerms: String, searchEngine: SearchEngine?) {
+                actionEmitter.onNext(AwesomeBarAction.SearchTermsTapped(searchTerms, searchEngine))
             }
         }
 
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 04b357428..61b71ebfb 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -5,7 +5,7 @@
 private object Versions {
     const val kotlin = "1.3.11"
     const val android_gradle_plugin = "3.2.1"
-    const val geckoNightly = "67.0.20190305092747"
+    const val geckoNightly = "67.0.20190312095443"
     const val rxAndroid = "2.1.0"
     const val rxKotlin = "2.3.0"
     const val anko = "0.10.8"
@@ -24,7 +24,7 @@ private object Versions {
     const val androidx_navigation = "2.0.0-rc02"
 
     const val appservices_gradle_plugin = "0.3.1"
-    const val mozilla_android_components = "0.46.0-SNAPSHOT"
+    const val mozilla_android_components = "0.47.0-SNAPSHOT"
 
     const val test_tools = "1.0.2"
     const val espresso_core = "2.2.2"