diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt index cb4b95520..3ddc2bf07 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt @@ -26,7 +26,7 @@ class DeleteBrowsingDataItem @JvmOverloads constructor( attrs.let { context.theme.obtainStyledAttributes( it, - R.styleable.LibraryListItem, + R.styleable.DeleteBrowsingDataItem, 0, 0 ).apply { try { diff --git a/app/src/main/res/drawable/ic_collections_circle_background.xml b/app/src/main/res/drawable/ic_collections_circle_background.xml new file mode 100644 index 000000000..7036de4b1 --- /dev/null +++ b/app/src/main/res/drawable/ic_collections_circle_background.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_tab_circle_background.xml b/app/src/main/res/drawable/ic_tab_circle_background.xml new file mode 100644 index 000000000..177b76f87 --- /dev/null +++ b/app/src/main/res/drawable/ic_tab_circle_background.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_delete_browsing_data.xml b/app/src/main/res/layout/fragment_delete_browsing_data.xml index 7d73cd991..3625492f4 100644 --- a/app/src/main/res/layout/fragment_delete_browsing_data.xml +++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml @@ -20,8 +20,9 @@ android:clickable="true" android:contentDescription="@string/library_bookmarks" android:focusable="true" - app:listItemIcon="@drawable/bookmarks_circle_background_outline" - app:listItemTitle="@string/library_bookmarks" /> + app:deleteBrowsingDataItemIcon="@drawable/ic_tab_circle_background" + app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_tabs_title" + app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_tabs_subtitle" /> + app:deleteBrowsingDataItemIcon="@drawable/library_icon_history_circle_background" + app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_browsing_data_title" + app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_browsing_data_subtitle" /> - - - + app:deleteBrowsingDataItemIcon="@drawable/ic_collections_circle_background" + app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_collections_title" + app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_collections_subtitle" /> - \ 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 e11bfc208..e3c413dac 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -102,6 +102,12 @@ #FCE98F #8A201F + #FFDDBD + #7C1504 + + #D1FFEE + #084036 + #174291 #b9f0fd diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7015ea7e2..01cd7ed84 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -565,4 +565,18 @@ Delete browsing data + + Open Tabs + + %s tabs + + Browsing history and site data + + %s addresses + + Collections + + %s collections