diff --git a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt
index cb3657ba6c..f294a8646a 100644
--- a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt
+++ b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt
@@ -10,7 +10,7 @@ import android.util.AttributeSet
import android.view.View
import android.view.accessibility.AccessibilityEvent
import android.view.accessibility.AccessibilityNodeInfo
-import android.widget.LinearLayout
+import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.widget.NestedScrollView
import com.google.android.material.bottomsheet.BottomSheetBehavior
import kotlinx.android.synthetic.main.layout_quick_action_sheet.view.*
@@ -29,7 +29,7 @@ class QuickActionSheet @JvmOverloads constructor(
attrs: AttributeSet? = null,
defStyle: Int = 0,
defStyleRes: Int = 0
-) : LinearLayout(context, attrs, defStyle, defStyleRes) {
+) : ConstraintLayout(context, attrs, defStyle, defStyleRes) {
private val scope = MainScope()
diff --git a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetView.kt b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetView.kt
index a9003e4650..2c1869a150 100644
--- a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetView.kt
+++ b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetView.kt
@@ -66,12 +66,12 @@ class QuickActionSheetView(
updateImportantForAccessibility(quickActionSheetBehavior.state)
- view.quick_action_share.setOnClickListener(this)
- view.quick_action_downloads.setOnClickListener(this)
- view.quick_action_bookmark.setOnClickListener(this)
- view.quick_action_read.setOnClickListener(this)
- view.quick_action_appearance.setOnClickListener(this)
- view.quick_action_open_app_link.setOnClickListener(this)
+ quick_action_share.setOnClickListener(this)
+ quick_action_downloads.setOnClickListener(this)
+ quick_action_bookmark.setOnClickListener(this)
+ quick_action_read.setOnClickListener(this)
+ quick_action_appearance.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.
*/
private fun animateOverlay(offset: Float) {
- overlay.alpha = (1 - offset)
+ quick_action_overlay.alpha = (1 - offset)
}
/**
diff --git a/app/src/main/res/layout/collection_home_list_row.xml b/app/src/main/res/layout/collection_home_list_row.xml
index e61b0ab21e..36834b5f4c 100644
--- a/app/src/main/res/layout/collection_home_list_row.xml
+++ b/app/src/main/res/layout/collection_home_list_row.xml
@@ -2,116 +2,111 @@
-
+
+
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="16dp"
+ android:importantForAccessibility="no"
+ android:src="@drawable/ic_tab_collection"
+ android:tint="@null"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
+
+
diff --git a/app/src/main/res/layout/component_share.xml b/app/src/main/res/layout/component_share.xml
index 8c62134c72..7b317a973d 100644
--- a/app/src/main/res/layout/component_share.xml
+++ b/app/src/main/res/layout/component_share.xml
@@ -26,103 +26,97 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
+
+
+
+
+ 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" />
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/fenix_snackbar.xml b/app/src/main/res/layout/fenix_snackbar.xml
index bbe4ab97c8..a643f5b801 100644
--- a/app/src/main/res/layout/fenix_snackbar.xml
+++ b/app/src/main/res/layout/fenix_snackbar.xml
@@ -2,63 +2,65 @@
-
+ android:layout_height="match_parent">
+
+ android:orientation="horizontal"
+ android:paddingStart="16dp"
+ android:paddingTop="8dp"
+ android:paddingEnd="16dp"
+ android:paddingBottom="8dp">
+ tools:text="This is a custom Snackbar text" />
+ tools:text="Action text" />
diff --git a/app/src/main/res/layout/layout_quick_action_sheet.xml b/app/src/main/res/layout/layout_quick_action_sheet.xml
index 1bc5277194..a0bc1a400f 100644
--- a/app/src/main/res/layout/layout_quick_action_sheet.xml
+++ b/app/src/main/res/layout/layout_quick_action_sheet.xml
@@ -2,18 +2,23 @@
-
+ android:background="?foundation">
+ android:focusable="false"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ 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" />
-
+ 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">
-
+ android:layout_weight="1"
+ android:background="?selectableItemBackgroundBorderless"
+ android:drawableTop="@drawable/quick_action_icon_share"
+ android:drawablePadding="5dp"
+ android:text="@string/quick_action_share"
+ android:textAllCaps="false"
+ android:textColor="?primaryText"
+ android:textSize="12sp" />
-
+
-
+
-
+
-
+
-
+
+
-
-
-
-
-
-
+
+
diff --git a/app/src/main/res/layout/tab_header.xml b/app/src/main/res/layout/tab_header.xml
index 08f644fa60..833dbf6010 100644
--- a/app/src/main/res/layout/tab_header.xml
+++ b/app/src/main/res/layout/tab_header.xml
@@ -6,58 +6,68 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tabs_header"
- android:layout_marginBottom="8dp"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp">
-
-
+ app:layout_constraintEnd_toStartOf="@+id/share_tabs_button"
+ app:layout_constraintStart_toEndOf="@id/header_text"
+ app:layout_constraintTop_toTopOf="parent" />
-
+
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/app/src/main/res/layout/tab_in_collection.xml b/app/src/main/res/layout/tab_in_collection.xml
index d5dfd9d8cb..190820822e 100644
--- a/app/src/main/res/layout/tab_in_collection.xml
+++ b/app/src/main/res/layout/tab_in_collection.xml
@@ -2,84 +2,79 @@
-
+
+
+
+
+ android:layout_marginStart="14dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="74dp"
+ android:ellipsize="end"
+ android:maxLines="1"
+ 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" />
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+