blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Cleans up SearchShortcut changes

master
Sawyer Blatz 2019-04-17 09:14:29 -07:00 committed by Colin Lee
parent 5390aed795
commit f48e2b072e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt
View File

@ -36,7 +36,6 @@ class ToolbarComponent(
override val reducer: Reducer<SearchState, SearchChange> = { state, change ->
when (change) {
is SearchChange.QueryChanged -> state.copy(query = change.query)
is SearchChange.SearchShortcutEngineSelected ->
state.copy(engine = change.engine)
}
@ -88,6 +87,5 @@ sealed class SearchAction : Action {
}
sealed class SearchChange : Change {
data class QueryChanged(val query: String) : SearchChange()
data class SearchShortcutEngineSelected(val engine: SearchEngine) : SearchChange()
}

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

@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import kotlinx.android.synthetic.main.fragment_search.*
import kotlinx.android.synthetic.main.fragment_search.view.*
import mozilla.components.browser.search.SearchEngine
import mozilla.components.feature.search.SearchUseCases
import mozilla.components.feature.session.SessionUseCases
import mozilla.components.support.ktx.kotlin.isUrl
@ -119,9 +120,7 @@ class SearchFragment : Fragment() {
val event = if (it.url.isUrl()) {
Event.EnteredUrl(false)
} else {
val isSearchShortcut = it.engine !=
requireComponents.search.searchEngineManager.defaultSearchEngine
Event.PerformedSearch(false, isSearchShortcut)
Event.PerformedSearch(false, isSearchShortcut(it.engine))
}
requireComponents.analytics.metrics.track(event)
@ -151,11 +150,8 @@ class SearchFragment : Fragment() {
.invoke(it.searchTerms, it.engine)
(activity as HomeActivity).openToBrowser(sessionId, BrowserDirection.FromSearch)
val isSearchShortcut = it.engine !=
requireComponents.search.searchEngineManager.defaultSearchEngine
requireComponents.analytics.metrics
.track(Event.PerformedSearch(true, isSearchShortcut))
.track(Event.PerformedSearch(true, isSearchShortcut(it.engine)))
}
is AwesomeBarAction.SearchShortcutEngineSelected -> {
getManagedEmitter<AwesomeBarChange>()
@ -190,4 +186,8 @@ class SearchFragment : Fragment() {
false -> context.components.useCases.tabsUseCases.addTab
}
}
private fun isSearchShortcut(engine: SearchEngine?): Boolean {
return engine != null && engine != requireComponents.search.searchEngineManager.defaultSearchEngine
}
}