ishan/fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes #4067 besides snackbar (#4777)

Browse Source 
* Fixes #4067 besides snackbar

Makes layout hierarchy more shallow to increase performance.

* Fix #4067 Feedback

Make sure quick_action_overlay appears on top and use horizontal chain in tab_header.
This commit is contained in:
Amaan Marfatia 2019-08-27 13:09:55 -04:00 committed by Jeff Boek
parent 1621229a7f
commit dc9fdd9db3
8 changed files with 447 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt
View File

@ -10,7 +10,7 @@ import android.util.AttributeSet
import android.view.View import android.view.View
import android.view.accessibility.AccessibilityEvent import android.view.accessibility.AccessibilityEvent
import android.view.accessibility.AccessibilityNodeInfo import android.view.accessibility.AccessibilityNodeInfo
import android.widget.LinearLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.widget.NestedScrollView import androidx.core.widget.NestedScrollView
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
import kotlinx.android.synthetic.main.layout_quick_action_sheet.view.* import kotlinx.android.synthetic.main.layout_quick_action_sheet.view.*
@ -29,7 +29,7 @@ class QuickActionSheet @JvmOverloads constructor(
attrs: AttributeSet? = null, attrs: AttributeSet? = null,
defStyle: Int = 0, defStyle: Int = 0,
defStyleRes: Int = 0 defStyleRes: Int = 0
) : LinearLayout(context, attrs, defStyle, defStyleRes) { ) : ConstraintLayout(context, attrs, defStyle, defStyleRes) {
private val scope = MainScope() private val scope = MainScope()

14
app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetView.kt
View File

@ -66,12 +66,12 @@ class QuickActionSheetView(
updateImportantForAccessibility(quickActionSheetBehavior.state) updateImportantForAccessibility(quickActionSheetBehavior.state)
view.quick_action_share.setOnClickListener(this) quick_action_share.setOnClickListener(this)
view.quick_action_downloads.setOnClickListener(this) quick_action_downloads.setOnClickListener(this)
view.quick_action_bookmark.setOnClickListener(this) quick_action_bookmark.setOnClickListener(this)
view.quick_action_read.setOnClickListener(this) quick_action_read.setOnClickListener(this)
view.quick_action_appearance.setOnClickListener(this) quick_action_appearance.setOnClickListener(this)
view.quick_action_open_app_link.setOnClickListener(this) quick_action_open_app_link.setOnClickListener(this)
} }
/** /**
@ -94,7 +94,7 @@ class QuickActionSheetView(
* Changes alpha of overlay based on new offset of this sheet within [-1,1] range. * Changes alpha of overlay based on new offset of this sheet within [-1,1] range.
*/ */
private fun animateOverlay(offset: Float) { private fun animateOverlay(offset: Float) {
overlay.alpha = (1 - offset) quick_action_overlay.alpha = (1 - offset)
} }
/** /**

207
app/src/main/res/layout/collection_home_list_row.xml
View File

@ -2,116 +2,111 @@
<!-- 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/. -->
<FrameLayout <androidx.constraintlayout.widget.ConstraintLayout
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/item_collection" android:id="@+id/item_collection"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="@drawable/collection_home_list_row_background"
android:clickable="true"
android:clipToPadding="false"
android:elevation="5dp"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/collection_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginStart="16dp"
android:background="@drawable/collection_home_list_row_background" android:layout_marginTop="16dp"
android:clickable="true" android:importantForAccessibility="no"
android:clipToPadding="false" android:src="@drawable/ic_tab_collection"
android:elevation="5dp" android:tint="@null"
android:focusable="true" app:layout_constraintStart_toStartOf="parent"
android:foreground="?android:attr/selectableItemBackground"> app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout <TextView
android:layout_width="match_parent" android:id="@+id/collection_title"
android:layout_height="wrap_content"> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:gravity="start"
android:maxLines="1"
android:minLines="1"
android:textAppearance="@style/Header16TextStyle"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@id/chevron"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/collection_icon"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/lorem/random" />
<ImageView <ImageView
android:id="@+id/collection_icon" android:id="@+id/chevron"
android:layout_width="wrap_content" android:layout_width="10dp"
android:layout_height="wrap_content" android:layout_height="6dp"
android:layout_marginStart="16dp" android:layout_marginTop="24dp"
android:layout_marginTop="16dp" android:layout_marginEnd="16dp"
android:importantForAccessibility="no" android:background="@drawable/ic_chevron"
android:src="@drawable/ic_tab_collection" android:contentDescription="@string/tab_menu"
android:tint="@null" app:layout_constraintEnd_toStartOf="@+id/collection_share_button"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@+id/collection_title"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/collection_title" android:id="@+id/collection_description"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginTop="8dp"
android:layout_marginTop="16dp" android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp" android:ellipsize="end"
android:ellipsize="end" android:maxLines="2"
android:gravity="start" android:minLines="2"
android:maxLines="1" android:textAppearance="@style/SubtitleTextStyle"
android:minLines="1" app:layout_constraintBottom_toBottomOf="parent"
android:textAppearance="@style/Header16TextStyle" app:layout_constraintEnd_toStartOf="@id/collection_share_button"
app:layout_constrainedWidth="true" app:layout_constraintStart_toStartOf="@id/collection_title"
app:layout_constraintEnd_toStartOf="@id/chevron" app:layout_constraintTop_toBottomOf="@id/collection_title"
app:layout_constraintHorizontal_bias="0.0" tools:text="@tools:sample/lorem/random" />
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/collection_icon"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/lorem/random" />
<ImageView <ImageButton
android:id="@+id/chevron" android:id="@+id/collection_share_button"
android:layout_width="10dp" android:layout_width="48dp"
android:layout_height="6dp" android:layout_height="48dp"
android:layout_marginTop="24dp" android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_marginEnd="16dp" android:contentDescription="@string/share_button_content_description"
android:background="@drawable/ic_chevron" android:src="@drawable/ic_hollow_share"
android:contentDescription="@string/tab_menu" app:layout_constraintBottom_toBottomOf="@id/collection_icon"
app:layout_constraintEnd_toStartOf="@+id/collection_share_button" app:layout_constraintEnd_toStartOf="@id/collection_overflow_button"
app:layout_constraintStart_toEndOf="@+id/collection_title" app:layout_constraintTop_toTopOf="@id/collection_icon" />
app:layout_constraintTop_toTopOf="parent" />
<TextView <ImageButton
android:id="@+id/collection_description" android:id="@+id/collection_overflow_button"
android:layout_width="0dp" android:layout_width="48dp"
android:layout_height="wrap_content" android:layout_height="48dp"
android:layout_marginTop="8dp" android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_marginBottom="16dp" android:contentDescription="@string/collection_menu_button_content_description"
android:ellipsize="end" android:src="@drawable/ic_menu"
android:maxLines="2" app:layout_constraintBottom_toBottomOf="@id/collection_icon"
android:minLines="2" app:layout_constraintEnd_toEndOf="parent"
android:textAppearance="@style/SubtitleTextStyle" app:layout_constraintTop_toTopOf="@id/collection_icon" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/collection_share_button"
app:layout_constraintStart_toStartOf="@id/collection_title"
app:layout_constraintTop_toBottomOf="@id/collection_title"
tools:text="@tools:sample/lorem/random" />
<ImageButton <View
android:id="@+id/collection_share_button" android:id="@+id/selected_border"
android:layout_width="48dp" android:layout_width="0dp"
android:layout_height="48dp" android:layout_height="0dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:alpha="0"
android:contentDescription="@string/share_button_content_description" android:background="@drawable/session_border"
android:src="@drawable/ic_hollow_share" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/collection_overflow_button" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/collection_icon" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/collection_icon" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageButton
android:id="@+id/collection_overflow_button"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/collection_menu_button_content_description"
android:src="@drawable/ic_menu"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/collection_icon"
app:layout_constraintBottom_toBottomOf="@id/collection_icon"/>
<View
android:id="@+id/selected_border"
android:layout_width="0dp"
android:layout_height="0dp"
android:alpha="0"
android:background="@drawable/session_border"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

164
app/src/main/res/layout/component_share.xml
View File

@ -26,103 +26,97 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<FrameLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="?above"
android:background="@drawable/bottom_sheet_dialog_fragment_background" android:background="@drawable/bottom_sheet_dialog_fragment_background"
android:backgroundTint="?above"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.Group
android:id="@+id/send_tab_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="account_header,account_devices_recyclerview,divider_line" />
<TextView
android:id="@+id/account_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:singleLine="true"
android:text="@string/share_device_subheader"
android:textAllCaps="true"
android:textColor="?secondaryText"
android:textSize="12sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<org.mozilla.fenix.share.AccountDevicesShareRecyclerView
android:id="@+id/account_devices_recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:clipToPadding="false"
android:paddingStart="16dp"
android:paddingEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/account_header" />
<androidx.constraintlayout.widget.Group <View
android:id="@+id/send_tab_group" android:id="@+id/divider_line"
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
app:constraint_referenced_ids="account_header,account_devices_recyclerview,divider_line"/> android:layout_marginTop="8dp"
android:background="?neutralFaded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/account_devices_recyclerview" />
<TextView <TextView
android:text="@string/share_device_subheader" android:id="@+id/link_header"
android:textAllCaps="true" android:layout_width="wrap_content"
android:singleLine="true" android:layout_height="wrap_content"
android:textColor="?secondaryText" android:layout_marginStart="16dp"
android:textSize="12sp" android:layout_marginTop="8dp"
android:textStyle="bold" android:singleLine="true"
android:layout_marginStart="16dp" android:text="@string/share_link_subheader"
android:layout_marginTop="12dp" android:textAllCaps="true"
android:layout_width="wrap_content" android:textColor="?secondaryText"
android:layout_height="wrap_content" android:textSize="12sp"
android:id="@+id/account_header" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/divider_line" />
<org.mozilla.fenix.share.AccountDevicesShareRecyclerView <ProgressBar
android:id="@+id/account_devices_recyclerview" android:id="@+id/progress_bar"
android:layout_width="match_parent" android:layout_width="76dp"
android:layout_height="wrap_content" android:layout_height="37dp"
android:paddingStart="16dp" android:layout_marginTop="16dp"
android:paddingEnd="8dp" android:layout_marginBottom="16dp"
android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
android:clipToPadding="false" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/link_header" />
app:layout_constraintTop_toBottomOf="@+id/account_header"/>
<View <org.mozilla.fenix.share.AppShareRecyclerView
android:id="@+id/divider_line" android:id="@+id/intent_handler_recyclerview"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginBottom="8dp"
android:background="?neutralFaded" android:clipToPadding="false"
app:layout_constraintStart_toStartOf="parent" android:paddingStart="16dp"
app:layout_constraintEnd_toEndOf="parent" android:paddingEnd="8dp"
app:layout_constraintTop_toBottomOf="@+id/account_devices_recyclerview"/> android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/link_header" />
<TextView </androidx.constraintlayout.widget.ConstraintLayout>
android:text="@string/share_link_subheader"
android:textAllCaps="true"
android:singleLine="true"
android:textColor="?secondaryText"
android:textSize="12sp"
android:textStyle="bold"
android:layout_marginStart="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:id="@+id/link_header"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider_line"/>
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="76dp"
android:layout_height="37dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
app:layout_constraintTop_toBottomOf="@+id/link_header"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<org.mozilla.fenix.share.AppShareRecyclerView
android:id="@+id/intent_handler_recyclerview"
android:paddingStart="16dp"
android:paddingEnd="8dp"
android:layout_marginBottom="8dp"
android:clipToPadding="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/link_header"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

52
app/src/main/res/layout/fenix_snackbar.xml
View File

@ -2,63 +2,65 @@
<!-- 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/. -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout
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" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"> android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:orientation="horizontal" android:layout_width="match_parent"
android:paddingTop="8dp" android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:background="@drawable/fenix_snackbar_background"
android:layout_margin="8dp" android:layout_margin="8dp"
android:background="@drawable/fenix_snackbar_background"
android:elevation="4dp" android:elevation="4dp"
android:minHeight="48dp" android:minHeight="48dp"
android:layout_width="match_parent" android:orientation="horizontal"
android:layout_height="wrap_content"> android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<TextView <TextView
android:id="@+id/snackbar_text" android:id="@+id/snackbar_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:letterSpacing="0.05"
android:maxLines="2" android:maxLines="2"
android:textAlignment="textStart"
android:textColor="@color/photonWhite" android:textColor="@color/photonWhite"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
android:typeface="sans" android:typeface="sans"
android:letterSpacing="0.05" app:layout_constraintBottom_toBottomOf="parent"
tools:text="This is a custom Snackbar text"
android:textAlignment="textStart"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/snackbar_btn" app:layout_constraintEnd_toStartOf="@id/snackbar_btn"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" /> tools:text="This is a custom Snackbar text" />
<Button <Button
android:id="@+id/snackbar_btn" android:id="@+id/snackbar_btn"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/photonWhite"
android:textAlignment="textEnd"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
tools:text="Action text" android:letterSpacing="0.05"
android:padding="0dp"
android:minHeight="0dp"
android:minWidth="0dp" android:minWidth="0dp"
android:textSize="14sp" android:minHeight="0dp"
android:padding="0dp"
android:textAlignment="textEnd"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/photonWhite"
android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
android:typeface="sans" android:typeface="sans"
android:letterSpacing="0.05"
android:visibility="gone" android:visibility="gone"
app:layout_constraintStart_toEndOf="@id/snackbar_text" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/snackbar_text"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" /> tools:text="Action text" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout> </FrameLayout>

211
app/src/main/res/layout/layout_quick_action_sheet.xml
View File

@ -2,18 +2,23 @@
<!-- 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/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/quick_action_sheet" android:id="@+id/quick_action_sheet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?foundation" android:background="?foundation">
android:orientation="vertical">
<View <View
android:id="@+id/quick_action_sheet_faded_handle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/neutralFaded" android:background="?attr/neutralFaded"
android:focusable="false" /> android:focusable="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton <ImageButton
android:id="@+id/quick_action_sheet_handle" android:id="@+id/quick_action_sheet_handle"
@ -22,109 +27,115 @@
android:background="@null" android:background="@null"
android:contentDescription="@string/quick_action_sheet_handle" android:contentDescription="@string/quick_action_sheet_handle"
android:paddingTop="7dp" android:paddingTop="7dp"
android:src="@drawable/ic_drawer_pull_tab" /> android:src="@drawable/ic_drawer_pull_tab"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/quick_action_sheet_faded_handle" />
<FrameLayout <LinearLayout
android:id="@+id/quick_action_buttons_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="12dp"
android:background="@null"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/quick_action_sheet_handle">
<LinearLayout <Button
android:id="@+id/quick_action_buttons_layout" android:id="@+id/quick_action_share"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_weight="1"
android:layout_marginBottom="12dp" android:background="?selectableItemBackgroundBorderless"
android:background="@null" android:drawableTop="@drawable/quick_action_icon_share"
android:orientation="horizontal"> android:drawablePadding="5dp"
android:text="@string/quick_action_share"
android:textAllCaps="false"
android:textColor="?primaryText"
android:textSize="12sp" />
<Button <Button
android:id="@+id/quick_action_share" android:id="@+id/quick_action_downloads"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/quick_action_icon_share" android:drawableTop="@drawable/library_icon_downloads_circle_background"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:text="@string/quick_action_share" android:text="@string/quick_action_download"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="12sp" /> android:textSize="12sp"
android:visibility="gone" />
<Button <Button
android:id="@+id/quick_action_downloads" android:id="@+id/quick_action_bookmark"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/library_icon_downloads_circle_background" android:drawableTop="@drawable/bookmark_two_state"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:text="@string/quick_action_download" android:text="@string/quick_action_bookmark"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="12sp" android:textSize="12sp" />
android:visibility="gone" />
<Button <Button
android:id="@+id/quick_action_bookmark" android:id="@+id/quick_action_appearance"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/bookmark_two_state" android:drawableTop="@drawable/quick_action_icon_appearance"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:text="@string/quick_action_bookmark" android:text="@string/quick_action_read_appearance"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="12sp" /> android:textSize="12sp"
android:visibility="gone" />
<Button <Button
android:id="@+id/quick_action_appearance" android:id="@+id/quick_action_open_app_link"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/quick_action_icon_appearance" android:drawableTop="@drawable/library_icon_app_links_circle_background"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:text="@string/quick_action_read_appearance" android:text="@string/quick_action_open_app_link"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="12sp" android:textSize="12sp"
android:visibility="gone" /> android:visibility="gone" />
<Button <Button
android:id="@+id/quick_action_open_app_link" android:id="@+id/quick_action_read"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/library_icon_app_links_circle_background" android:drawableTop="@drawable/reader_two_state"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:text="@string/quick_action_open_app_link" android:text="@string/quick_action_read"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="12sp" android:textSize="12sp"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout>
<Button <View
android:id="@+id/quick_action_read" android:id="@+id/quick_action_overlay"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_weight="1" android:alpha="0.0"
android:background="?selectableItemBackgroundBorderless" android:background="?foundation"
android:drawableTop="@drawable/reader_two_state" app:layout_constraintBottom_toBottomOf="parent"
android:drawablePadding="5dp" app:layout_constraintEnd_toEndOf="parent"
android:text="@string/quick_action_read" app:layout_constraintStart_toStartOf="parent"
android:textAllCaps="false" app:layout_constraintTop_toTopOf="@id/quick_action_buttons_layout" />
android:textColor="?primaryText" </androidx.constraintlayout.widget.ConstraintLayout>
android:textSize="12sp"
android:visibility="gone" />
</LinearLayout>
<View
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0.0"
android:background="?foundation" />
</FrameLayout>
</LinearLayout>

88
app/src/main/res/layout/tab_header.xml
View File

@ -6,58 +6,68 @@
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"
android:id="@+id/tabs_header" android:id="@+id/tabs_header"
android:layout_marginBottom="8dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_marginBottom="8dp">
<TextView <TextView
android:id="@+id/header_text" android:id="@+id/header_text"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4.5dp" android:layout_marginStart="4.5dp"
android:text="@string/tab_header_label" android:text="@string/tab_header_label"
android:textAppearance="@style/HeaderTextStyle" android:textAppearance="@style/HeaderTextStyle"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/add_tab_button"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <ImageButton
android:layout_width="wrap_content" android:id="@+id/add_tab_button"
android:layout_height="wrap_content" android:layout_width="48dp"
android:orientation="horizontal" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/add_tab"
android:src="@drawable/ic_new"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@+id/share_tabs_button"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintStart_toEndOf="@id/header_text"
<ImageButton app:layout_constraintTop_toTopOf="parent" />
android:id="@+id/add_tab_button"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/add_tab"
android:src="@drawable/ic_new"/>
<ImageButton <ImageButton
android:id="@+id/share_tabs_button" android:id="@+id/share_tabs_button"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/tabs_menu_share_tabs" android:contentDescription="@string/tabs_menu_share_tabs"
android:src="@drawable/ic_hollow_share"/> android:src="@drawable/ic_hollow_share"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/close_tabs_button"
app:layout_constraintStart_toEndOf="@+id/add_tab_button"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton <ImageButton
android:id="@+id/close_tabs_button" android:id="@+id/close_tabs_button"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/tabs_menu_close_all_tabs" android:contentDescription="@string/tabs_menu_close_all_tabs"
android:src="@drawable/ic_delete"/> android:src="@drawable/ic_delete"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tabs_overflow_button"
app:layout_constraintStart_toEndOf="@+id/share_tabs_button"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton <ImageButton
android:id="@+id/tabs_overflow_button" android:id="@+id/tabs_overflow_button"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/open_tabs_menu" android:contentDescription="@string/open_tabs_menu"
android:src="@drawable/ic_menu" /> android:src="@drawable/ic_menu"
</LinearLayout> app:layout_constraintBottom_toBottomOf="parent"
</androidx.constraintlayout.widget.ConstraintLayout> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/close_tabs_button"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

147
app/src/main/res/layout/tab_in_collection.xml
View File

@ -2,84 +2,79 @@
<!-- 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/. -->
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
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"
android:id="@+id/tab_in_collection_item" android:id="@+id/tab_in_collection_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?above"
android:clickable="true"
android:clipToPadding="false"
android:elevation="5dp"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/collection_tab_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_marginTop="23dp"
android:layout_marginBottom="24dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_tab_collection"
android:tint="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/collection_tab_hostname"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:layout_marginStart="14dp"
android:clipToPadding="false" android:layout_marginTop="8dp"
android:focusable="true" android:layout_marginEnd="74dp"
android:foreground="?android:attr/selectableItemBackground" android:ellipsize="end"
android:background="?above" android:maxLines="1"
android:elevation="5dp"> android:minLines="1"
android:textAppearance="@style/Header12TextStyle"
app:layout_constraintEnd_toStartOf="@id/collection_tab_close_button"
app:layout_constraintStart_toEndOf="@id/collection_tab_icon"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout <TextView
android:layout_width="match_parent" android:id="@+id/collection_tab_title"
android:layout_height="wrap_content"> android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ellipsize="end"
android:maxLines="2"
android:minLines="2"
android:textAppearance="@style/Body14TextStyle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/collection_tab_hostname"
app:layout_constraintStart_toStartOf="@id/collection_tab_hostname"
app:layout_constraintTop_toBottomOf="@id/collection_tab_hostname" />
<ImageView <ImageButton
android:id="@+id/collection_tab_icon" android:id="@+id/collection_tab_close_button"
android:importantForAccessibility="no" android:layout_width="48dp"
android:layout_width="24dp" android:layout_height="48dp"
android:layout_height="24dp" android:alpha="0.8"
android:layout_marginTop="23dp" android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_marginBottom="24dp" android:contentDescription="@string/close_tab"
android:layout_marginStart="16dp" android:src="@drawable/ic_close"
android:tint="@null" app:layout_constraintBottom_toBottomOf="parent"
android:src="@drawable/ic_tab_collection" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
<TextView <View
android:id="@+id/collection_tab_hostname" android:id="@+id/divider_line"
android:layout_width="0dp" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
android:layout_marginTop="8dp" android:background="?neutralFaded"
android:layout_marginStart="14dp" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginEnd="74dp" app:layout_constraintStart_toStartOf="parent" />
android:ellipsize="end"
android:maxLines="1"
android:minLines="1"
android:textAppearance="@style/Header12TextStyle"
app:layout_constraintStart_toEndOf="@id/collection_tab_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/collection_tab_close_button"/>
<TextView </androidx.constraintlayout.widget.ConstraintLayout>
android:id="@+id/collection_tab_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ellipsize="end"
android:maxLines="2"
android:minLines="2"
android:textAppearance="@style/Body14TextStyle"
app:layout_constraintStart_toStartOf="@id/collection_tab_hostname"
app:layout_constraintTop_toBottomOf="@id/collection_tab_hostname"
app:layout_constraintEnd_toEndOf="@id/collection_tab_hostname"
app:layout_constraintBottom_toBottomOf="parent"/>
<ImageButton
android:id="@+id/collection_tab_close_button"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/close_tab"
android:src="@drawable/ic_close"
android:alpha="0.8"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<View
android:id="@+id/divider_line"
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="?neutralFaded"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>