blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #1205: Adds search term to EditToolbar

master
Sawyer Blatz 2019-04-23 08:15:07 -07:00 committed by Emily Kager
parent 5cf83cf8c1
commit 8a4995099f
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -117,7 +117,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
view.browserLayout,
ActionBusFactory.get(this), sessionId,
(activity as HomeActivity).browsingModeManager.isPrivate,
SearchState("", isEditing = false),
SearchState("", getSessionByIdOrUseSelectedSession().searchTerms, isEditing = false),
search_engine_icon
)

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

@ -24,7 +24,7 @@ class ToolbarComponent(
bus: ActionBusFactory,
private val sessionId: String?,
private val isPrivate: Boolean,
override var initialState: SearchState = SearchState("", false),
override var initialState: SearchState = SearchState("", "", false),
private val engineIconView: ImageView? = null
) :
UIComponent<SearchState, SearchAction, SearchChange>(
@ -73,6 +73,7 @@ class ToolbarComponent(
data class SearchState(
val query: String,
val searchTerm: String,
val isEditing: Boolean,
val engine: SearchEngine? = null
) : ViewState

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

@ -52,19 +52,17 @@ class SearchFragment : Fragment() {
): View? {
sessionId = SearchFragmentArgs.fromBundle(arguments!!).sessionId
isPrivate = (activity as HomeActivity).browsingModeManager.isPrivate
val session = sessionId?.let { requireComponents.core.sessionManager.findSessionById(it) }
val view = inflater.inflate(R.layout.fragment_search, container, false)
val url = sessionId?.let {
requireComponents.core.sessionManager.findSessionById(it)?.let { session ->
session.url
}
} ?: ""
val url = session?.url ?: ""
toolbarComponent = ToolbarComponent(
view.toolbar_component_wrapper,
ActionBusFactory.get(this),
sessionId,
isPrivate,
SearchState(url, isEditing = true),
SearchState(url, session?.searchTerms ?: "", isEditing = true),
view.search_engine_icon
)