Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

For #7423: remove unnecessary CoordinatorLayout in fragment_home.

Browse Source 
Co-authored-by: Emma Malysz <emalysz@mozilla.com>
fennec/nightly
Michael Comella 4 years ago committed by Michael Comella
parent a1cbbba4ea
commit ffb2e72b97
1 changed files with 110 additions and 116 deletions
Show Stats Download Patch File Download Diff File

226
app/src/main/res/layout/fragment_home.xml
Unescape Escape View File

@ -2,136 +2,130 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.constraintlayout.motion.widget.MotionLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/homeLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="?homeBackground"
app:layoutDescription="@xml/home_scene"
tools:context=".home.HomeFragment">
<androidx.constraintlayout.motion.widget.MotionLayout <ImageButton
android:id="@+id/homeLayout" android:id="@+id/privateBrowsingButton"
android:layout_width="match_parent" android:layout_width="@dimen/glyph_button_height"
android:layout_height="match_parent" android:layout_height="@dimen/glyph_button_height"
android:background="?homeBackground" android:layout_marginEnd="12dp"
app:layoutDescription="@xml/home_scene" android:background="?android:attr/selectableItemBackgroundBorderless"
tools:context=".home.HomeFragment"> android:contentDescription="@string/content_description_private_browsing_button"
app:srcCompat="@drawable/private_browsing_button"
app:layout_constraintBottom_toTopOf="@+id/wordmark"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton <ImageView
android:id="@+id/privateBrowsingButton" android:id="@+id/wordmark"
android:layout_width="@dimen/glyph_button_height" android:layout_width="wrap_content"
android:layout_height="@dimen/glyph_button_height" android:layout_height="80dp"
android:layout_marginEnd="12dp" android:layout_marginStart="16dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:layout_marginTop="60dp"
android:contentDescription="@string/content_description_private_browsing_button" android:layout_marginBottom="32dp"
app:srcCompat="@drawable/private_browsing_button" android:adjustViewBounds="true"
app:layout_constraintBottom_toTopOf="@+id/wordmark" android:clickable="false"
app:layout_constraintEnd_toEndOf="parent" android:contentDescription="@string/app_name"
app:layout_constraintTop_toTopOf="parent" /> android:focusable="false"
android:importantForAccessibility="no"
app:srcCompat="?fenixLogo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView <View
android:id="@+id/wordmark" android:id="@+id/bottomBarShadow"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="80dp" android:layout_height="1dp"
android:layout_marginStart="16dp" android:background="@color/bottom_bar_shadow"
android:layout_marginTop="60dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginBottom="32dp" app:layout_constraintStart_toStartOf="parent"
android:adjustViewBounds="true" app:layout_constraintBottom_toTopOf="@id/bottom_bar"/>
android:clickable="false"
android:contentDescription="@string/app_name"
android:focusable="false"
android:importantForAccessibility="no"
app:srcCompat="?fenixLogo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottomBarShadow" android:id="@+id/bottom_bar"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content"
android:background="@color/bottom_bar_shadow" android:background="?bottomBarBackground"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_bar"/> app:layout_constraintEnd_toEndOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <org.mozilla.fenix.home.SearchView
android:id="@+id/bottom_bar" android:id="@+id/toolbar_wrapper"
android:layout_width="match_parent" android:transitionName="toolbar_wrapper_transition"
android:layout_height="wrap_content" android:layout_width="0dp"
android:background="?bottomBarBackground" android:layout_height="40dp"
android:layout_marginEnd="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/home_search_background_normal"
android:clickable="true"
android:contentDescription="@string/search_hint"
android:focusable="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/add_tab_button"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintStart_toStartOf="parent">
<org.mozilla.fenix.home.SearchView <ImageView
android:id="@+id/toolbar_wrapper" android:id="@+id/search_engine_icon"
android:transitionName="toolbar_wrapper_transition" android:layout_width="24dp"
android:layout_width="0dp" android:layout_height="24dp"
android:layout_height="40dp"
android:layout_marginEnd="0dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_gravity="start|center_vertical"
android:layout_marginBottom="8dp" android:clickable="false"
android:background="@drawable/home_search_background_normal" android:focusable="false"
android:clickable="true" android:importantForAccessibility="no" />
android:contentDescription="@string/search_hint"
android:focusable="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/add_tab_button"
app:layout_constraintStart_toStartOf="parent">
<ImageView <TextView
android:id="@+id/search_engine_icon" android:id="@+id/toolbar"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_gravity="start|center_vertical"
android:layout_gravity="start|center_vertical" android:layout_marginStart="44dp"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:importantForAccessibility="no" /> android:lines="1"
android:ellipsize="end"
android:importantForAccessibility="no"
android:text="@string/search_hint"
android:textColor="?primaryText"
android:textSize="15sp" />
</org.mozilla.fenix.home.SearchView>
<TextView <ImageButton
android:id="@+id/toolbar" android:id="@+id/add_tab_button"
android:layout_width="wrap_content" android:layout_width="48dp"
android:layout_height="wrap_content" android:layout_height="48dp"
android:layout_gravity="start|center_vertical" android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_marginStart="44dp" android:contentDescription="@string/add_tab"
android:clickable="false" app:srcCompat="@drawable/ic_new"
android:focusable="false" app:layout_constraintBottom_toBottomOf="parent"
android:lines="1" app:layout_constraintEnd_toStartOf="@+id/menuButton"
android:ellipsize="end" app:layout_constraintStart_toEndOf="@id/toolbar_wrapper"
android:importantForAccessibility="no" app:layout_constraintTop_toTopOf="parent" />
android:text="@string/search_hint"
android:textColor="?primaryText"
android:textSize="15sp" />
</org.mozilla.fenix.home.SearchView>
<ImageButton
android:id="@+id/add_tab_button"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/add_tab"
app:srcCompat="@drawable/ic_new"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/menuButton"
app:layout_constraintStart_toEndOf="@id/toolbar_wrapper"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/menuButton"
android:layout_width="36dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_menu"
app:srcCompat="@drawable/ic_menu"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> <ImageButton
android:id="@+id/menuButton"
android:layout_width="36dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_menu"
app:srcCompat="@drawable/ic_menu"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.motion.widget.MotionLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.constraintlayout.motion.widget.MotionLayout>

Write Preview
Loading…
Cancel
Save