diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 912ab36f4..a378e9f41 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -52,7 +52,7 @@ import org.mozilla.fenix.settings.SupportUtils
import kotlin.coroutines.CoroutineContext
import kotlin.math.roundToInt
-@SuppressWarnings("TooManyFunctions")
+@SuppressWarnings("TooManyFunctions", "LargeClass")
class HomeFragment : Fragment(), CoroutineScope {
private val bus = ActionBusFactory.get(this)
private var sessionObserver: SessionManager.Observer? = null
@@ -125,7 +125,9 @@ class HomeFragment : Fragment(), CoroutineScope {
orientation = BrowserMenu.Orientation.DOWN)
}
- view.toolbar.setCompoundDrawablesWithIntrinsicBounds(searchIcon, null, null, null)
+ val iconSize = resources.getDimension(R.dimen.preference_icon_drawable_size).toInt()
+ searchIcon.setBounds(0, 0, iconSize, iconSize)
+ view.toolbar.setCompoundDrawables(searchIcon, null, null, null)
val roundToInt = (toolbarPaddingDp * Resources.getSystem().displayMetrics.density).roundToInt()
view.toolbar.compoundDrawablePadding = roundToInt
view.toolbar.setOnClickListener {
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 000000000..e7b40940e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/session_sheet_background.xml b/app/src/main/res/drawable/session_sheet_background.xml
new file mode 100644
index 000000000..43f91c6b7
--- /dev/null
+++ b/app/src/main/res/drawable/session_sheet_background.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/component_tabs.xml b/app/src/main/res/layout/component_tabs.xml
index 6425640cf..380733140 100644
--- a/app/src/main/res/layout/component_tabs.xml
+++ b/app/src/main/res/layout/component_tabs.xml
@@ -2,15 +2,15 @@
-
+
@@ -19,8 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tabs_header_title"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
- android:textColor="?attr/toolbarTextColor"
+ android:textAppearance="@style/headerText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -30,9 +29,9 @@
android:layout_width="@dimen/glyph_button_width"
android:layout_height="@dimen/glyph_button_height"
android:background="?android:attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/add_tab"
android:src="@drawable/ic_new"
android:tint="?attr/toolbarTextColor"
- android:contentDescription="@string/add_tab"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tabs_overflow_button"
app:layout_constraintTop_toTopOf="parent" />
@@ -42,72 +41,75 @@
android:layout_width="@dimen/glyph_button_width"
android:layout_height="@dimen/glyph_button_height"
android:background="?android:attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/tab_menu"
android:src="@drawable/ic_menu"
android:tint="?attr/toolbarTextColor"
- android:contentDescription="@string/tab_menu"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
+ android:clipToPadding="false"
+ android:padding="12dp"/>
+ android:foreground="?android:attr/selectableItemBackground"
+ android:padding="6dp"
+ android:visibility="gone">
+
+ android:gravity="center"
+ android:textStyle="bold"
+ android:text="@string/session_save"
+ android:textColor="@color/photonWhite" />
+ android:foreground="?android:attr/selectableItemBackground"
+ android:padding="6dp"
+ android:visibility="gone">
+
+ android:textStyle="bold"
+ android:gravity="center"
+ android:text="@string/session_delete"
+ android:textColor="@color/color_primary_dark"
+ android:textSize="16sp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/session_bottom_sheet.xml b/app/src/main/res/layout/session_bottom_sheet.xml
index 2bb109701..1165d6667 100644
--- a/app/src/main/res/layout/session_bottom_sheet.xml
+++ b/app/src/main/res/layout/session_bottom_sheet.xml
@@ -2,101 +2,121 @@
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ app:layout_behavior="@string/bottom_sheet_behavior">
+ android:id="@+id/current_session_card"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="16dp"
+ android:background="?android:attr/colorBackground"
+ android:elevation="5dp"
+ android:padding="10dp"
+ app:cardCornerRadius="10dp">
+
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ android:id="@+id/current_session_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="12dp"
+ android:contentDescription="@string/current_session_image"
+ android:paddingBottom="20dp"
+ android:src="@drawable/ic_session_thumbnail_placeholder_blue"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ android:id="@+id/current_session_card_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:layout_marginStart="12dp"
+ android:layout_marginEnd="12dp"
+ android:layout_marginBottom="8dp"
+ android:text="@string/tabs_header_title"
+ android:textAppearance="@style/headerText"
+ app:layout_constraintStart_toEndOf="@id/current_session_image"
+ app:layout_constraintTop_toTopOf="parent" />
+ android:id="@+id/current_session_card_tab_list"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginStart="12dp"
+ android:layout_marginEnd="10dp"
+ android:layout_marginBottom="10dp"
+ android:fadingEdgeLength="48dp"
+ android:requiresFadingEdge="vertical"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0"
+ app:layout_constraintStart_toEndOf="@id/current_session_image"
+ app:layout_constraintTop_toBottomOf="@id/current_session_card_title"
+ app:layout_constraintVertical_bias="0"
+ tools:text="@tools:sample/lorem/random" />
-
+
+
+
+
+
-
+
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/session_list_header.xml b/app/src/main/res/layout/session_list_header.xml
index 8e8a421bb..5a120a0fb 100644
--- a/app/src/main/res/layout/session_list_header.xml
+++ b/app/src/main/res/layout/session_list_header.xml
@@ -5,8 +5,7 @@
diff --git a/app/src/main/res/layout/tab_list_row.xml b/app/src/main/res/layout/tab_list_row.xml
index c3cabaa51..dd4f758da 100644
--- a/app/src/main/res/layout/tab_list_row.xml
+++ b/app/src/main/res/layout/tab_list_row.xml
@@ -21,8 +21,8 @@
android:id="@+id/favicon_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:contentDescription="@string/favicon_content_description"
android:layout_margin="10dp"
+ android:contentDescription="@string/favicon_content_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -30,12 +30,13 @@
android:id="@+id/text_url"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:textColor="?attr/toolbarTextColor"
- android:textSize="18sp"
+ android:layout_marginStart="12dp"
android:layout_marginTop="4dp"
- android:layout_marginStart="10dp"
+ android:ellipsize="none"
+ android:requiresFadingEdge="horizontal"
+ android:singleLine="true"
+ android:textColor="?attr/toolbarTextColor"
+ android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/close_tab_button"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/favicon_image"
@@ -45,21 +46,22 @@
android:id="@+id/close_tab_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="1dp"
android:contentDescription="@string/close_tab"
+ android:paddingStart="12dp"
android:paddingEnd="10dp"
android:src="@drawable/ic_close"
- android:layout_marginTop="1dp"
- app:layout_constraintTop_toTopOf="@id/text_url"
app:layout_constraintBottom_toBottomOf="@id/text_url"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@id/text_url" />
+ app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f38c7b041..2b8688976 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,6 +8,7 @@
#D81B60
#F2F2F5
+ #20123A
#212121
#6b6b6b
@@ -22,9 +23,11 @@
#0C0C0D
#f9f9fa
#E9E9ED
- @color/photonInk70
+ #592ACB
+ #352F65
+ #232749
- #20233E
+ #20123A
#8020233E
@color/off_white
@@ -67,7 +70,7 @@
#C13905
#696A6A
- #000000
+ @color/light_mode_text_color
#696A6A
@color/photonGrey40
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 236298c0f..2582b4b92 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -192,10 +192,10 @@
Bookmark
Delete
-
- Archive
+
+ Save
- Send and Share
+ Share
Current session image
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2002b29fe..5188e79e5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
-
-
+
+