|
|
@ -11,9 +11,13 @@ import android.view.View
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import androidx.appcompat.app.AppCompatActivity
|
|
|
|
import androidx.appcompat.app.AppCompatActivity
|
|
|
|
import androidx.fragment.app.Fragment
|
|
|
|
import androidx.fragment.app.Fragment
|
|
|
|
|
|
|
|
import androidx.navigation.Navigation
|
|
|
|
import kotlinx.android.synthetic.main.fragment_search.view.*
|
|
|
|
import kotlinx.android.synthetic.main.fragment_search.view.*
|
|
|
|
|
|
|
|
import mozilla.components.browser.session.Session
|
|
|
|
import mozilla.components.feature.search.SearchUseCases
|
|
|
|
import mozilla.components.feature.search.SearchUseCases
|
|
|
|
import mozilla.components.feature.session.SessionUseCases
|
|
|
|
import mozilla.components.feature.session.SessionUseCases
|
|
|
|
|
|
|
|
import mozilla.components.support.ktx.kotlin.isUrl
|
|
|
|
|
|
|
|
import mozilla.components.support.ktx.kotlin.toNormalizedUrl
|
|
|
|
import org.mozilla.fenix.HomeActivity
|
|
|
|
import org.mozilla.fenix.HomeActivity
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.components.toolbar.SearchAction
|
|
|
|
import org.mozilla.fenix.components.toolbar.SearchAction
|
|
|
@ -44,8 +48,8 @@ class SearchFragment : Fragment() {
|
|
|
|
isPrivate = (activity as HomeActivity).browsingModeManager.isPrivate
|
|
|
|
isPrivate = (activity as HomeActivity).browsingModeManager.isPrivate
|
|
|
|
val view = inflater.inflate(R.layout.fragment_search, container, false)
|
|
|
|
val view = inflater.inflate(R.layout.fragment_search, container, false)
|
|
|
|
val url = sessionId?.let {
|
|
|
|
val url = sessionId?.let {
|
|
|
|
requireComponents.core.sessionManager.findSessionById(it)?.let {
|
|
|
|
requireComponents.core.sessionManager.findSessionById(it)?.let { session ->
|
|
|
|
session -> session.url
|
|
|
|
session.url
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} ?: ""
|
|
|
|
} ?: ""
|
|
|
|
|
|
|
|
|
|
|
@ -83,7 +87,8 @@ class SearchFragment : Fragment() {
|
|
|
|
when (it) {
|
|
|
|
when (it) {
|
|
|
|
is SearchAction.UrlCommitted -> {
|
|
|
|
is SearchAction.UrlCommitted -> {
|
|
|
|
if (it.url.isNotBlank()) {
|
|
|
|
if (it.url.isNotBlank()) {
|
|
|
|
(activity as HomeActivity).openToBrowserAndLoad(it.url, it.session)
|
|
|
|
transitionToBrowser()
|
|
|
|
|
|
|
|
load(it.url)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
is SearchAction.TextChanged -> {
|
|
|
|
is SearchAction.TextChanged -> {
|
|
|
@ -97,22 +102,16 @@ class SearchFragment : Fragment() {
|
|
|
|
when (it) {
|
|
|
|
when (it) {
|
|
|
|
is AwesomeBarAction.URLTapped -> {
|
|
|
|
is AwesomeBarAction.URLTapped -> {
|
|
|
|
getSessionUseCase(requireContext(), sessionId == null).invoke(it.url)
|
|
|
|
getSessionUseCase(requireContext(), sessionId == null).invoke(it.url)
|
|
|
|
navigateToBrowser()
|
|
|
|
transitionToBrowser()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
is AwesomeBarAction.SearchTermsTapped -> {
|
|
|
|
is AwesomeBarAction.SearchTermsTapped -> {
|
|
|
|
getSearchUseCase(requireContext(), sessionId == null).invoke(it.searchTerms)
|
|
|
|
getSearchUseCase(requireContext(), sessionId == null).invoke(it.searchTerms)
|
|
|
|
navigateToBrowser()
|
|
|
|
transitionToBrowser()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private fun navigateToBrowser() {
|
|
|
|
|
|
|
|
requireComponents.core.sessionManager.selectedSession?.apply {
|
|
|
|
|
|
|
|
(activity as HomeActivity).openToBrowser(sessionId)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun getSearchUseCase(context: Context, useNewTab: Boolean): SearchUseCases.SearchUseCase {
|
|
|
|
private fun getSearchUseCase(context: Context, useNewTab: Boolean): SearchUseCases.SearchUseCase {
|
|
|
|
if (!useNewTab) {
|
|
|
|
if (!useNewTab) {
|
|
|
|
return context.components.useCases.searchUseCases.defaultSearch
|
|
|
|
return context.components.useCases.searchUseCases.defaultSearch
|
|
|
@ -134,4 +133,42 @@ class SearchFragment : Fragment() {
|
|
|
|
false -> context.components.useCases.tabsUseCases.addTab
|
|
|
|
false -> context.components.useCases.tabsUseCases.addTab
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Issue: https://github.com/mozilla-mobile/fenix/issues/626
|
|
|
|
|
|
|
|
// Currently we were kind of forcing all this logic through the Toolbar Feature.
|
|
|
|
|
|
|
|
// But since we cannot actually load a page without an available GeckoSession
|
|
|
|
|
|
|
|
// we have to wait until after we navigate to call the use case.
|
|
|
|
|
|
|
|
// We should move this logic into a place that makes more sense.
|
|
|
|
|
|
|
|
private fun load(text: String) {
|
|
|
|
|
|
|
|
val sessionId = SearchFragmentArgs.fromBundle(arguments!!).sessionId
|
|
|
|
|
|
|
|
val isPrivate = (activity as HomeActivity).browsingModeManager.isPrivate
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
val loadUrlUseCase = if (sessionId == null) {
|
|
|
|
|
|
|
|
if (isPrivate) {
|
|
|
|
|
|
|
|
requireComponents.useCases.tabsUseCases.addPrivateTab
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
requireComponents.useCases.tabsUseCases.addTab
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else requireComponents.useCases.sessionUseCases.loadUrl
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
val searchUseCase: (String) -> Unit = { searchTerms ->
|
|
|
|
|
|
|
|
if (sessionId == null) {
|
|
|
|
|
|
|
|
requireComponents.useCases.searchUseCases.newTabSearch
|
|
|
|
|
|
|
|
.invoke(searchTerms, Session.Source.USER_ENTERED, true, isPrivate)
|
|
|
|
|
|
|
|
} else requireComponents.useCases.searchUseCases.defaultSearch.invoke(searchTerms)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (text.isUrl()) {
|
|
|
|
|
|
|
|
loadUrlUseCase.invoke(text.toNormalizedUrl())
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
searchUseCase.invoke(text)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun transitionToBrowser() {
|
|
|
|
|
|
|
|
val sessionId = SearchFragmentArgs.fromBundle(arguments!!).sessionId
|
|
|
|
|
|
|
|
val directions = SearchFragmentDirections.actionSearchFragmentToBrowserFragment(sessionId)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Navigation.findNavController(view!!.search_layout).navigate(directions)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|