blallo
/
fenix
1
0
Fork 0
Code Releases Activity

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
master
Arturo Mejia 2019-03-12 11:49:22 -04:00 committed by Sawyer Blatz
parent 8fb3a0df2e
commit fd4acf6e92
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt
View File

@ -23,7 +23,7 @@ class HistoryItemMenu(
listOf( listOf(
SimpleBrowserMenuItem( SimpleBrowserMenuItem(
context.getString(R.string.history_delete_item), context.getString(R.string.history_delete_item),
R.color.photonRed60 textColorResource = R.color.photonRed60
) { ) {
onItemTapped.invoke(Item.Delete) onItemTapped.invoke(Item.Delete)
} }

3
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -102,7 +102,8 @@ class SearchFragment : Fragment() {
(activity as HomeActivity).openToBrowser(sessionId, BrowserDirection.FromSearch) (activity as HomeActivity).openToBrowser(sessionId, BrowserDirection.FromSearch)
} }
is AwesomeBarAction.SearchTermsTapped -> { 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) (activity as HomeActivity).openToBrowser(sessionId, BrowserDirection.FromSearch)
} }
} }

3
app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarComponent.kt
View File

@ -4,6 +4,7 @@ package org.mozilla.fenix.search.awesomebar
file, You can obtain one at http://mozilla.org/MPL/2.0/. */ file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import android.view.ViewGroup import android.view.ViewGroup
import mozilla.components.browser.search.SearchEngine
import org.mozilla.fenix.mvi.Action import org.mozilla.fenix.mvi.Action
import org.mozilla.fenix.mvi.ActionBusFactory import org.mozilla.fenix.mvi.ActionBusFactory
import org.mozilla.fenix.mvi.Change import org.mozilla.fenix.mvi.Change
@ -15,7 +16,7 @@ data class AwesomeBarState(val query: String) : ViewState
sealed class AwesomeBarAction : Action { sealed class AwesomeBarAction : Action {
data class URLTapped(val url: String) : AwesomeBarAction() 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 { sealed class AwesomeBarChange : Change {

5
app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
View File

@ -10,6 +10,7 @@ import io.reactivex.Observable
import io.reactivex.Observer import io.reactivex.Observer
import io.reactivex.functions.Consumer import io.reactivex.functions.Consumer
import mozilla.components.browser.awesomebar.BrowserAwesomeBar 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.ClipboardSuggestionProvider
import mozilla.components.feature.awesomebar.provider.HistoryStorageSuggestionProvider import mozilla.components.feature.awesomebar.provider.HistoryStorageSuggestionProvider
import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider
@ -43,8 +44,8 @@ class AwesomeBarUIView(
} }
val searchUseCase = object : SearchUseCases.SearchUseCase { val searchUseCase = object : SearchUseCases.SearchUseCase {
override fun invoke(searchTerms: String) { override fun invoke(searchTerms: String, searchEngine: SearchEngine?) {
actionEmitter.onNext(AwesomeBarAction.SearchTermsTapped(searchTerms)) actionEmitter.onNext(AwesomeBarAction.SearchTermsTapped(searchTerms, searchEngine))
} }
} }

4
buildSrc/src/main/java/Dependencies.kt
View File

@ -5,7 +5,7 @@
private object Versions { private object Versions {
const val kotlin = "1.3.11" const val kotlin = "1.3.11"
const val android_gradle_plugin = "3.2.1" 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 rxAndroid = "2.1.0"
const val rxKotlin = "2.3.0" const val rxKotlin = "2.3.0"
const val anko = "0.10.8" const val anko = "0.10.8"
@ -24,7 +24,7 @@ private object Versions {
const val androidx_navigation = "2.0.0-rc02" const val androidx_navigation = "2.0.0-rc02"
const val appservices_gradle_plugin = "0.3.1" 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 test_tools = "1.0.2"
const val espresso_core = "2.2.2" const val espresso_core = "2.2.2"