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 ae13f3b67..0039108be 100644 --- a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt +++ b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt @@ -38,12 +38,12 @@ class QuickActionSheet @JvmOverloads constructor( bounceSheet(quickActionSheetBehavior) } - bounceSheet(quickActionSheetBehavior, 600L) + bounceSheet(quickActionSheetBehavior, 500L) } private fun bounceSheet(quickActionSheetBehavior: QuickActionSheetBehavior, duration: Long = 400L) { val normalPeekHeight = quickActionSheetBehavior.peekHeight - val valueAnimator = ValueAnimator.ofFloat(normalPeekHeight.toFloat(), normalPeekHeight*6f) + val valueAnimator = ValueAnimator.ofFloat(normalPeekHeight.toFloat(), normalPeekHeight*5f) valueAnimator.addUpdateListener { quickActionSheetBehavior.peekHeight = (it.animatedValue as Float).toInt() diff --git a/app/src/main/res/drawable/library_icon_downloads_circle_background.xml b/app/src/main/res/drawable/library_icon_downloads_circle_background.xml index 553e34591..96ab514d0 100644 --- a/app/src/main/res/drawable/library_icon_downloads_circle_background.xml +++ b/app/src/main/res/drawable/library_icon_downloads_circle_background.xml @@ -6,8 +6,8 @@ + android:width="40dp" + android:height="40dp" /> diff --git a/app/src/main/res/drawable/library_icon_favorites_circle_background.xml b/app/src/main/res/drawable/library_icon_favorites_circle_background.xml index dd61ef685..808c57c52 100644 --- a/app/src/main/res/drawable/library_icon_favorites_circle_background.xml +++ b/app/src/main/res/drawable/library_icon_favorites_circle_background.xml @@ -6,8 +6,8 @@ + android:width="40dp" + android:height="40dp" /> diff --git a/app/src/main/res/drawable/library_icon_history_circle_background.xml b/app/src/main/res/drawable/library_icon_history_circle_background.xml index a4558638b..2ed3f1bac 100644 --- a/app/src/main/res/drawable/library_icon_history_circle_background.xml +++ b/app/src/main/res/drawable/library_icon_history_circle_background.xml @@ -6,8 +6,8 @@ + android:width="40dp" + android:height="40dp" /> diff --git a/app/src/main/res/drawable/library_icon_logins_circle_background.xml b/app/src/main/res/drawable/library_icon_logins_circle_background.xml index a1fd38699..99cb335e1 100644 --- a/app/src/main/res/drawable/library_icon_logins_circle_background.xml +++ b/app/src/main/res/drawable/library_icon_logins_circle_background.xml @@ -6,8 +6,8 @@ + android:width="40dp" + android:height="40dp" /> diff --git a/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml b/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml index 29b092107..b7c85d780 100644 --- a/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml +++ b/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml @@ -6,8 +6,8 @@ + android:width="40dp" + android:height="40dp" /> diff --git a/app/src/main/res/drawable/library_icon_send_circle_background.xml b/app/src/main/res/drawable/library_icon_send_circle_background.xml index 29b092107..b7c85d780 100644 --- a/app/src/main/res/drawable/library_icon_send_circle_background.xml +++ b/app/src/main/res/drawable/library_icon_send_circle_background.xml @@ -6,8 +6,8 @@ + android:width="40dp" + android:height="40dp" /> diff --git a/app/src/main/res/drawable/library_icon_sessions_circle_background.xml b/app/src/main/res/drawable/library_icon_sessions_circle_background.xml index 24a5eefee..a9765af93 100644 --- a/app/src/main/res/drawable/library_icon_sessions_circle_background.xml +++ b/app/src/main/res/drawable/library_icon_sessions_circle_background.xml @@ -6,8 +6,8 @@ + android:width="40dp" + android:height="40dp" /> diff --git a/app/src/main/res/drawable/quick_action_icon_read.xml b/app/src/main/res/drawable/quick_action_icon_read.xml new file mode 100644 index 000000000..c0a5c691d --- /dev/null +++ b/app/src/main/res/drawable/quick_action_icon_read.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/quick_action_icon_share.xml b/app/src/main/res/drawable/quick_action_icon_share.xml new file mode 100644 index 000000000..bee6382be --- /dev/null +++ b/app/src/main/res/drawable/quick_action_icon_share.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/component_quickactionsheet.xml b/app/src/main/res/layout/component_quickactionsheet.xml index e7474a4a9..3626b46ae 100644 --- a/app/src/main/res/layout/component_quickactionsheet.xml +++ b/app/src/main/res/layout/component_quickactionsheet.xml @@ -8,24 +8,39 @@ android:id="@+id/quick_action_sheet" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="80dp" + android:layout_height="wrap_content" android:background="@color/off_white"> + + + + + android:background="?android:attr/selectableItemBackgroundBorderless"/> - - + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2b8688976..b2483b2be 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -79,4 +79,10 @@ #45a1ff @color/photonGrey30 + + #174291 + #b9f0fd + + #8a201f + #fce98f