blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Init Toolbar in edit mode so we don't see the flash

master
Emily Kager 2019-05-28 10:53:35 -07:00 committed by Jeff Boek
parent dee3c059dc
commit 8181705b58
6 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,6 +135,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
view.browserLayout,
ActionBusFactory.get(this), customTabSessionId,
(activity as HomeActivity).browsingModeManager.isPrivate,
false,
search_engine_icon,
FenixViewModelProvider.create(
this,

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

@ -26,6 +26,7 @@ class ToolbarComponent(
bus: ActionBusFactory,
private val sessionId: String?,
private val isPrivate: Boolean,
private val inSearchFragment: Boolean,
private val engineIconView: ImageView? = null,
viewModelProvider: UIComponentViewModelProvider<SearchState, SearchChange>
) :
@ -40,6 +41,7 @@ class ToolbarComponent(
override fun initView() = ToolbarUIView(
sessionId,
isPrivate,
inSearchFragment,
container,
actionEmitter,
changesObservable,

5
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
View File

@ -24,6 +24,7 @@ import org.mozilla.fenix.mvi.UIView
class ToolbarUIView(
sessionId: String?,
isPrivate: Boolean,
inSearchFragment: Boolean,
container: ViewGroup,
actionEmitter: Observer<SearchAction>,
changesObservable: Observable<SearchChange>,
@ -48,6 +49,10 @@ class ToolbarUIView(
?: sessionManager.selectedSession
view.apply {
if (inSearchFragment) {
editMode()
}
elevation = resources.pxToDp(TOOLBAR_ELEVATION).toFloat()
setOnUrlCommitListener {

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

@ -83,6 +83,7 @@ class SearchFragment : Fragment(), BackHandler {
ActionBusFactory.get(this),
sessionId,
isPrivate,
true,
view.search_engine_icon,
FenixViewModelProvider.create(
this,

22
app/src/main/res/layout/fragment_home.xml
View File

@ -50,38 +50,38 @@
<org.mozilla.fenix.home.SearchView
android:id="@+id/toolbar_wrapper"
android:transitionName="toolbar_wrapper_transition"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="64dp"
android:layout_marginStart="16dp"
android:elevation="@dimen/toolbar_elevation"
android:layout_marginTop="64dp"
android:layout_marginEnd="16dp"
android:background="@drawable/home_search_background_normal"
android:elevation="@dimen/toolbar_elevation"
android:transitionName="toolbar_wrapper_transition"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/wordmark">
<ImageView
android:id="@+id/search_engine_icon"
android:transitionName="toolbar_icon_transition"
android:layout_margin="12dp"
android:layout_width="24dp"
android:layout_height="24dp" />
android:layout_height="24dp"
android:layout_margin="12dp"
android:transitionName="toolbar_icon_transition" />
<TextView
android:transitionName="toolbar_transition"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginStart="47dp"
android:padding="12dp"
android:clickable="true"
android:focusable="true"
android:layout_gravity="center_vertical"
android:padding="12dp"
android:text="@string/search_hint"
android:textColor="?primaryText"
android:textSize="15sp" />
android:textSize="15sp"
android:transitionName="toolbar_transition" />
</org.mozilla.fenix.home.SearchView>
<View

62
app/src/main/res/layout/fragment_search.xml
View File

@ -5,15 +5,14 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/search_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".search.SearchFragment"
android:id="@+id/search_layout"
android:background="?above">
android:background="?above"
tools:context=".search.SearchFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbar_wrapper"
android:transitionName="toolbar_wrapper_transition"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -21,60 +20,63 @@
android:layout_marginEnd="16dp"
android:background="@drawable/search_url_background"
android:outlineProvider="paddedBounds"
android:transitionName="toolbar_wrapper_transition"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/search_engine_icon"
android:transitionName="toolbar_icon_transition"
android:layout_margin="12dp"
android:layout_width="24dp"
android:layout_height="24dp"
app:layout_constraintTop_toTopOf="parent"
android:layout_margin="12dp"
android:transitionName="toolbar_icon_transition"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:id="@+id/toolbar_component_wrapper"
android:layout_height="0dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/search_engine_icon"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/search_with_shortcuts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:visibility="gone"
android:fontFamily="Inter UI"
android:textAllCaps="true"
android:textStyle="bold"
android:textSize="12sp"
android:textColor="?secondaryText"
android:letterSpacing="0.15"
android:text="@string/search_shortcuts_search_with"
app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
app:layout_constraintStart_toStartOf="@id/toolbar_wrapper"/>
android:id="@+id/search_with_shortcuts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:fontFamily="Inter UI"
android:letterSpacing="0.15"
android:text="@string/search_shortcuts_search_with"
android:textAllCaps="true"
android:textColor="?secondaryText"
android:textSize="12sp"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintStart_toStartOf="@id/toolbar_wrapper"
app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper" />
<LinearLayout
android:id="@+id/pill_wrapper"
android:background="?foundation"
android:elevation="10dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?foundation"
android:elevation="10dp"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="16dp"
android:paddingTop="4dp"
android:paddingEnd="16dp"
android:paddingBottom="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintStart_toStartOf="parent">
<ToggleButton
android:id="@+id/search_scan_button"