|
|
@ -4,10 +4,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
package org.mozilla.fenix.components.toolbar
|
|
|
|
package org.mozilla.fenix.components.toolbar
|
|
|
|
|
|
|
|
|
|
|
|
import android.graphics.drawable.BitmapDrawable
|
|
|
|
|
|
|
|
import android.view.LayoutInflater
|
|
|
|
import android.view.LayoutInflater
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.widget.ImageView
|
|
|
|
|
|
|
|
import androidx.core.content.ContextCompat
|
|
|
|
import androidx.core.content.ContextCompat
|
|
|
|
import io.reactivex.Observable
|
|
|
|
import io.reactivex.Observable
|
|
|
|
import io.reactivex.Observer
|
|
|
|
import io.reactivex.Observer
|
|
|
@ -16,7 +14,6 @@ import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
|
|
|
|
import mozilla.components.browser.toolbar.BrowserToolbar
|
|
|
|
import mozilla.components.browser.toolbar.BrowserToolbar
|
|
|
|
import mozilla.components.support.ktx.android.util.dpToFloat
|
|
|
|
import mozilla.components.support.ktx.android.util.dpToFloat
|
|
|
|
import mozilla.components.support.ktx.android.util.dpToPx
|
|
|
|
import mozilla.components.support.ktx.android.util.dpToPx
|
|
|
|
import org.jetbrains.anko.backgroundDrawable
|
|
|
|
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.customtabs.CustomTabToolbarMenu
|
|
|
|
import org.mozilla.fenix.customtabs.CustomTabToolbarMenu
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
@ -25,17 +22,13 @@ import org.mozilla.fenix.mvi.UIView
|
|
|
|
class ToolbarUIView(
|
|
|
|
class ToolbarUIView(
|
|
|
|
sessionId: String?,
|
|
|
|
sessionId: String?,
|
|
|
|
isPrivate: Boolean,
|
|
|
|
isPrivate: Boolean,
|
|
|
|
startInEditMode: Boolean,
|
|
|
|
|
|
|
|
container: ViewGroup,
|
|
|
|
container: ViewGroup,
|
|
|
|
actionEmitter: Observer<SearchAction>,
|
|
|
|
actionEmitter: Observer<SearchAction>,
|
|
|
|
changesObservable: Observable<SearchChange>,
|
|
|
|
changesObservable: Observable<SearchChange>
|
|
|
|
private val engineIconView: ImageView? = null
|
|
|
|
|
|
|
|
) :
|
|
|
|
) :
|
|
|
|
UIView<SearchState, SearchAction, SearchChange>(container, actionEmitter, changesObservable) {
|
|
|
|
UIView<SearchState, SearchAction, SearchChange>(container, actionEmitter, changesObservable) {
|
|
|
|
|
|
|
|
|
|
|
|
val toolbarIntegration: ToolbarIntegration
|
|
|
|
val toolbarIntegration: ToolbarIntegration
|
|
|
|
var state: SearchState? = null
|
|
|
|
|
|
|
|
private set
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override val view: BrowserToolbar = LayoutInflater.from(container.context)
|
|
|
|
override val view: BrowserToolbar = LayoutInflater.from(container.context)
|
|
|
|
.inflate(R.layout.component_search, container, true)
|
|
|
|
.inflate(R.layout.component_search, container, true)
|
|
|
@ -48,18 +41,11 @@ class ToolbarUIView(
|
|
|
|
val sessionManager = view.context.components.core.sessionManager
|
|
|
|
val sessionManager = view.context.components.core.sessionManager
|
|
|
|
val session = sessionId?.let { sessionManager.findSessionById(it) }
|
|
|
|
val session = sessionId?.let { sessionManager.findSessionById(it) }
|
|
|
|
?: sessionManager.selectedSession
|
|
|
|
?: sessionManager.selectedSession
|
|
|
|
|
|
|
|
val isCustomTabSession = session?.isCustomTabSession() == true
|
|
|
|
|
|
|
|
|
|
|
|
view.apply {
|
|
|
|
view.apply {
|
|
|
|
if (startInEditMode) {
|
|
|
|
|
|
|
|
editMode()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
elevation = TOOLBAR_ELEVATION.dpToFloat(resources.displayMetrics)
|
|
|
|
elevation = TOOLBAR_ELEVATION.dpToFloat(resources.displayMetrics)
|
|
|
|
|
|
|
|
|
|
|
|
setOnUrlCommitListener {
|
|
|
|
|
|
|
|
actionEmitter.onNext(SearchAction.UrlCommitted(it, sessionId, state?.engine))
|
|
|
|
|
|
|
|
false
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
onUrlClicked = {
|
|
|
|
onUrlClicked = {
|
|
|
|
actionEmitter.onNext(SearchAction.ToolbarClicked)
|
|
|
|
actionEmitter.onNext(SearchAction.ToolbarClicked)
|
|
|
|
false
|
|
|
|
false
|
|
|
@ -67,31 +53,16 @@ class ToolbarUIView(
|
|
|
|
|
|
|
|
|
|
|
|
browserActionMargin = browserActionMarginDp.dpToPx(resources.displayMetrics)
|
|
|
|
browserActionMargin = browserActionMarginDp.dpToPx(resources.displayMetrics)
|
|
|
|
|
|
|
|
|
|
|
|
val isCustomTabSession = (session?.isCustomTabSession() == true)
|
|
|
|
urlBoxView = if (isCustomTabSession) null else urlBackground
|
|
|
|
|
|
|
|
progressBarGravity = if (isCustomTabSession) PROGRESS_BOTTOM else PROGRESS_TOP
|
|
|
|
urlBoxView = if (isCustomTabSession) { null } else urlBackground
|
|
|
|
|
|
|
|
progressBarGravity = if (isCustomTabSession) { PROGRESS_BOTTOM } else PROGRESS_TOP
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
textColor = ContextCompat.getColor(context, R.color.photonGrey30)
|
|
|
|
textColor = ContextCompat.getColor(context, R.color.photonGrey30)
|
|
|
|
|
|
|
|
|
|
|
|
hint = context.getString(R.string.search_hint)
|
|
|
|
hint = context.getString(R.string.search_hint)
|
|
|
|
|
|
|
|
|
|
|
|
setOnEditListener(object : mozilla.components.concept.toolbar.Toolbar.OnEditListener {
|
|
|
|
|
|
|
|
override fun onCancelEditing(): Boolean {
|
|
|
|
|
|
|
|
actionEmitter.onNext(SearchAction.EditingCanceled)
|
|
|
|
|
|
|
|
return false
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
override fun onTextChanged(text: String) {
|
|
|
|
|
|
|
|
url = text
|
|
|
|
|
|
|
|
actionEmitter.onNext(SearchAction.TextChanged(text))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
with(view.context) {
|
|
|
|
with(view.context) {
|
|
|
|
val isCustom = session?.isCustomTabSession() ?: false
|
|
|
|
val menuToolbar = if (isCustomTabSession) {
|
|
|
|
|
|
|
|
|
|
|
|
val menuToolbar = if (isCustom) {
|
|
|
|
|
|
|
|
CustomTabToolbarMenu(
|
|
|
|
CustomTabToolbarMenu(
|
|
|
|
this,
|
|
|
|
this,
|
|
|
|
sessionManager,
|
|
|
|
sessionManager,
|
|
|
@ -120,77 +91,7 @@ class ToolbarUIView(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun updateView() = Consumer<SearchState> {
|
|
|
|
override fun updateView() = Consumer<SearchState> {}
|
|
|
|
var newState = it
|
|
|
|
|
|
|
|
if (shouldUpdateEngineIcon(newState)) {
|
|
|
|
|
|
|
|
updateEngineIcon(newState)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (shouldClearSearchURL(it)) {
|
|
|
|
|
|
|
|
newState = SearchState("", "", it.isEditing, it.engine, it.focused, it.isQueryUpdated)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (newState != it || shouldUpdateEditingState(newState)) {
|
|
|
|
|
|
|
|
updateEditingState(newState)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (newState.focused) {
|
|
|
|
|
|
|
|
view.focus()
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
view.clearFocus()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
state = newState
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun shouldUpdateEngineIcon(newState: SearchState): Boolean {
|
|
|
|
|
|
|
|
return newState.isEditing && (engineDidChange(newState) || state == null)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun updateEngineIcon(newState: SearchState) {
|
|
|
|
|
|
|
|
with(view.context) {
|
|
|
|
|
|
|
|
val defaultEngineIcon = components.search.searchEngineManager.defaultSearchEngine?.icon
|
|
|
|
|
|
|
|
val searchIcon = newState.engine?.icon ?: defaultEngineIcon
|
|
|
|
|
|
|
|
val draw = BitmapDrawable(resources, searchIcon)
|
|
|
|
|
|
|
|
val iconSize =
|
|
|
|
|
|
|
|
containerView?.context!!.resources.getDimension(R.dimen.preference_icon_drawable_size).toInt()
|
|
|
|
|
|
|
|
draw.setBounds(0, 0, iconSize, iconSize)
|
|
|
|
|
|
|
|
engineIconView?.backgroundDrawable = draw
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun shouldClearSearchURL(newState: SearchState): Boolean {
|
|
|
|
|
|
|
|
with(view.context) {
|
|
|
|
|
|
|
|
val defaultEngine = this
|
|
|
|
|
|
|
|
.components
|
|
|
|
|
|
|
|
.search
|
|
|
|
|
|
|
|
.searchEngineManager
|
|
|
|
|
|
|
|
.defaultSearchEngine
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (newState.engine != null && newState.engine != defaultEngine) ||
|
|
|
|
|
|
|
|
(state?.engine != null && state?.engine != defaultEngine)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun shouldUpdateEditingState(newState: SearchState): Boolean {
|
|
|
|
|
|
|
|
return !engineDidChange(newState) && (state?.isEditing != newState.isEditing)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun updateEditingState(newState: SearchState) {
|
|
|
|
|
|
|
|
if (newState.isEditing) {
|
|
|
|
|
|
|
|
view.setSearchTerms(newState.searchTerm)
|
|
|
|
|
|
|
|
view.url = newState.query
|
|
|
|
|
|
|
|
if (!newState.isQueryUpdated) {
|
|
|
|
|
|
|
|
view.editMode()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
view.displayMode()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun engineDidChange(newState: SearchState): Boolean {
|
|
|
|
|
|
|
|
return newState.engine != state?.engine
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
companion object {
|
|
|
|
companion object {
|
|
|
|
private const val TOOLBAR_ELEVATION = 16
|
|
|
|
private const val TOOLBAR_ELEVATION = 16
|
|
|
|