From bf42a1786e33d9ce89356783587d243c9c769f35 Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Tue, 11 May 2021 18:06:41 -0400 Subject: [PATCH] For issue AC#10231 update proton icons third batch --- .../components/toolbar/DefaultToolbarMenu.kt | 2 +- app/src/main/res/animator/fill_disable.xml | 13 -------- app/src/main/res/animator/fill_enable.xml | 13 -------- .../res/animator/strike_thru_mask_disable.xml | 13 -------- .../res/animator/strike_thru_mask_enable.xml | 13 -------- .../res/animator/strike_thru_path_disable.xml | 22 ------------- .../res/animator/strike_thru_path_enable.xml | 22 ------------- .../res/drawable/ic_add_to_homescreen.xml | 7 +++-- .../res/drawable/ic_autoplay_disabled.xml | 7 ++--- .../main/res/drawable/ic_autoplay_enabled.xml | 7 ++++- app/src/main/res/drawable/ic_camera.xml | 9 ------ .../res/drawable/ic_camera_anim_disable.xml | 11 ------- .../res/drawable/ic_camera_anim_enable.xml | 11 ------- .../main/res/drawable/ic_camera_disabled.xml | 29 +++++------------ .../main/res/drawable/ic_camera_enabled.xml | 21 +++---------- app/src/main/res/drawable/ic_cookies.xml | 2 +- app/src/main/res/drawable/ic_cryptominers.xml | 3 +- app/src/main/res/drawable/ic_fab_sync.xml | 2 +- .../main/res/drawable/ic_fingerprinters.xml | 10 ++++-- app/src/main/res/drawable/ic_folder_icon.xml | 6 ++-- app/src/main/res/drawable/ic_folder_new.xml | 6 +++- app/src/main/res/drawable/ic_help.xml | 5 ++- app/src/main/res/drawable/ic_internet.xml | 2 +- .../main/res/drawable/ic_link_disabled.xml | 9 +++++- app/src/main/res/drawable/ic_location.xml | 9 ------ .../res/drawable/ic_location_anim_disable.xml | 11 ------- .../res/drawable/ic_location_anim_enable.xml | 11 ------- .../res/drawable/ic_location_disabled.xml | 31 ++++++------------- .../main/res/drawable/ic_location_enabled.xml | 31 ++++++------------- app/src/main/res/drawable/ic_login.xml | 10 +++--- app/src/main/res/drawable/ic_microphone.xml | 10 +----- .../drawable/ic_microphone_anim_disable.xml | 11 ------- .../drawable/ic_microphone_anim_enable.xml | 11 ------- .../res/drawable/ic_microphone_disabled.xml | 28 +++++------------ .../res/drawable/ic_microphone_enabled.xml | 23 ++++---------- .../main/res/drawable/ic_notifications.xml | 9 ------ .../ic_notifications_anim_disable.xml | 11 ------- .../drawable/ic_notifications_anim_enable.xml | 11 ------- .../drawable/ic_notifications_disabled.xml | 25 +++++---------- .../res/drawable/ic_notifications_enabled.xml | 23 ++++---------- app/src/main/res/drawable/ic_share.xml | 13 ++++++++ app/src/main/res/drawable/ic_share_filled.xml | 12 ------- .../res/drawable/ic_social_media_trackers.xml | 2 +- .../main/res/drawable/ic_storage_disabled.xml | 9 ++++-- .../main/res/drawable/ic_storage_enabled.xml | 7 +++-- .../main/res/drawable/ic_tab_collection.xml | 6 ++-- .../res/layout/collection_home_list_row.xml | 2 +- .../res/layout/onboarding_privacy_notice.xml | 2 +- app/src/main/res/layout/tab_header.xml | 2 +- .../res/layout/tabstray_multiselect_items.xml | 2 +- .../main/res/menu/bookmarks_select_multi.xml | 2 +- .../main/res/menu/history_select_multi.xml | 2 +- 52 files changed, 144 insertions(+), 427 deletions(-) delete mode 100644 app/src/main/res/animator/fill_disable.xml delete mode 100644 app/src/main/res/animator/fill_enable.xml delete mode 100644 app/src/main/res/animator/strike_thru_mask_disable.xml delete mode 100644 app/src/main/res/animator/strike_thru_mask_enable.xml delete mode 100644 app/src/main/res/animator/strike_thru_path_disable.xml delete mode 100644 app/src/main/res/animator/strike_thru_path_enable.xml delete mode 100644 app/src/main/res/drawable/ic_camera_anim_disable.xml delete mode 100644 app/src/main/res/drawable/ic_camera_anim_enable.xml delete mode 100644 app/src/main/res/drawable/ic_location_anim_disable.xml delete mode 100644 app/src/main/res/drawable/ic_location_anim_enable.xml delete mode 100644 app/src/main/res/drawable/ic_microphone_anim_disable.xml delete mode 100644 app/src/main/res/drawable/ic_microphone_anim_enable.xml delete mode 100644 app/src/main/res/drawable/ic_notifications_anim_disable.xml delete mode 100644 app/src/main/res/drawable/ic_notifications_anim_enable.xml create mode 100644 app/src/main/res/drawable/ic_share.xml delete mode 100644 app/src/main/res/drawable/ic_share_filled.xml diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index fc8fc48b1..a4b4737b8 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -151,7 +151,7 @@ open class DefaultToolbarMenu( } val share = BrowserMenuItemToolbar.Button( - imageResource = R.drawable.ic_share_filled, + imageResource = R.drawable.ic_share, contentDescription = context.getString(R.string.browser_menu_share), iconTintColorResource = primaryTextColor(), listener = { diff --git a/app/src/main/res/animator/fill_disable.xml b/app/src/main/res/animator/fill_disable.xml deleted file mode 100644 index c0887a6ac..000000000 --- a/app/src/main/res/animator/fill_disable.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/animator/fill_enable.xml b/app/src/main/res/animator/fill_enable.xml deleted file mode 100644 index 52d745f77..000000000 --- a/app/src/main/res/animator/fill_enable.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/animator/strike_thru_mask_disable.xml b/app/src/main/res/animator/strike_thru_mask_disable.xml deleted file mode 100644 index 09049a7b6..000000000 --- a/app/src/main/res/animator/strike_thru_mask_disable.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/animator/strike_thru_mask_enable.xml b/app/src/main/res/animator/strike_thru_mask_enable.xml deleted file mode 100644 index e45b8c676..000000000 --- a/app/src/main/res/animator/strike_thru_mask_enable.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/animator/strike_thru_path_disable.xml b/app/src/main/res/animator/strike_thru_path_disable.xml deleted file mode 100644 index b56cca0e2..000000000 --- a/app/src/main/res/animator/strike_thru_path_disable.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/app/src/main/res/animator/strike_thru_path_enable.xml b/app/src/main/res/animator/strike_thru_path_enable.xml deleted file mode 100644 index 8ea41146c..000000000 --- a/app/src/main/res/animator/strike_thru_path_enable.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_add_to_homescreen.xml b/app/src/main/res/drawable/ic_add_to_homescreen.xml index 282453f17..2d07502bf 100644 --- a/app/src/main/res/drawable/ic_add_to_homescreen.xml +++ b/app/src/main/res/drawable/ic_add_to_homescreen.xml @@ -8,6 +8,9 @@ android:viewportWidth="24" android:viewportHeight="24"> + android:pathData="m15.535,10.526 l1.6,1.6a0.5,0.5 0,0 1,-0.351 0.854l-4.233,0.02 -0.551,-0.551 0.021,-4.232a0.5,0.5 0,0 1,0.854 -0.351l1.596,1.596L19.72,4.22a0.75,0.75 0,1 1,1.061 1.061l-5.246,5.245zM7.6,14H6.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM10.6,14H9.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM13.6,14h-1.2l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM10.6,11H9.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4z" + android:fillColor="?primaryText"/> + diff --git a/app/src/main/res/drawable/ic_autoplay_disabled.xml b/app/src/main/res/drawable/ic_autoplay_disabled.xml index d4416eefb..4d069cf50 100644 --- a/app/src/main/res/drawable/ic_autoplay_disabled.xml +++ b/app/src/main/res/drawable/ic_autoplay_disabled.xml @@ -9,11 +9,8 @@ android:viewportHeight="24"> + android:pathData="M3.326 4.265A0.83 0.83 0 0 1 3.225 4h-0.36C2.842 4 2.822 4.008 2.8 4.01a0.737 0.737 0 0 0-0.58 0.21 0.75 0.75 0 0 0 0 1.061l1.847 1.847A9.441 9.441 0 0 0 2.7 12c0 5.238 4.262 9.5 9.5 9.5a9.42 9.42 0 0 0 4.879-1.36l1.64 1.64a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.326 4.265zM12.2 20c-4.411 0-8-3.589-8-8 0-1.328 0.352-2.609 0.975-3.764l4.301 4.301v3.026a0.89 0.89 0 0 0 1.333 0.773l1.569-0.897 3.601 3.601A7.918 7.918 0 0 1 12.2 20zM8 4.364L7.636 4H5.14L8 6.86V4.364zM12.2 4c2.137 0 4.146 0.832 5.657 2.343A7.948 7.948 0 0 1 20.2 12a7.964 7.964 0 0 1-1.898 5.162l1.06 1.06A9.45 9.45 0 0 0 21.7 12a9.442 9.442 0 0 0-2.782-6.718A9.442 9.442 0 0 0 12.2 2.5a0.75 0.75 0 0 0 0 1.5z" /> - + android:pathData="M17.046 12.773a0.89 0.89 0 0 0 0-1.547L10.81 7.664a0.887 0.887 0 0 0-1.322 0.685l5.564 5.564 1.994-1.14z" /> diff --git a/app/src/main/res/drawable/ic_autoplay_enabled.xml b/app/src/main/res/drawable/ic_autoplay_enabled.xml index 424118209..fa534a57c 100644 --- a/app/src/main/res/drawable/ic_autoplay_enabled.xml +++ b/app/src/main/res/drawable/ic_autoplay_enabled.xml @@ -5,5 +5,10 @@ - + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 00ef35e6a..9c5bca788 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -10,13 +10,4 @@ - - - diff --git a/app/src/main/res/drawable/ic_camera_anim_disable.xml b/app/src/main/res/drawable/ic_camera_anim_disable.xml deleted file mode 100644 index 8cf218a7d..000000000 --- a/app/src/main/res/drawable/ic_camera_anim_disable.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_camera_anim_enable.xml b/app/src/main/res/drawable/ic_camera_anim_enable.xml deleted file mode 100644 index 4cf33171a..000000000 --- a/app/src/main/res/drawable/ic_camera_anim_enable.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_camera_disabled.xml b/app/src/main/res/drawable/ic_camera_disabled.xml index ce49afbc2..6802c51fa 100644 --- a/app/src/main/res/drawable/ic_camera_disabled.xml +++ b/app/src/main/res/drawable/ic_camera_disabled.xml @@ -3,25 +3,12 @@ - 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/. --> - - - - - - - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_camera_enabled.xml b/app/src/main/res/drawable/ic_camera_enabled.xml index 7eead7c05..3818f98e4 100644 --- a/app/src/main/res/drawable/ic_camera_enabled.xml +++ b/app/src/main/res/drawable/ic_camera_enabled.xml @@ -7,21 +7,8 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - - - - - - - + diff --git a/app/src/main/res/drawable/ic_cookies.xml b/app/src/main/res/drawable/ic_cookies.xml index 553f16518..5c2e0c053 100644 --- a/app/src/main/res/drawable/ic_cookies.xml +++ b/app/src/main/res/drawable/ic_cookies.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:pathData="M20.862,11.69a7.886,7.886 0,0 1,-1.856 0.244L19,11.934v0.817l-0.5,0.5L17,13.251l-0.5,-0.5L16.5,11.53c-3.193,-1.052 -5.501,-4.055 -5.501,-7.6 0,-0.296 0.023,-0.585 0.055,-0.87l-0.565,-0.499c-4.531,0.725 -7.997,4.64 -7.997,9.375A9.508,9.508 0,0 0,12 21.443c5.146,0 9.327,-4.09 9.492,-9.198l-0.63,-0.556zM5,12.75v-1.5l0.5,-0.5L7,10.75l0.5,0.5v1.5l-0.5,0.5L5.5,13.25l-0.5,-0.5zM9.5,18l-0.5,0.5L7.5,18.5L7,18v-1.5l0.5,-0.5L9,16l0.5,0.5L9.5,18zM9.5,7.5L9,8L7.5,8L7,7.5L7,6l0.5,-0.5L9,5.5l0.5,0.5v1.5zM13.25,12.75 L12.75,13.25h-1.5l-0.5,-0.5v-1.5l0.5,-0.5h1.5l0.5,0.5v1.5zM17,18l-0.5,0.5L15,18.5l-0.5,-0.5v-1.5l0.5,-0.5h1.5l0.5,0.5L17,18z" /> diff --git a/app/src/main/res/drawable/ic_cryptominers.xml b/app/src/main/res/drawable/ic_cryptominers.xml index 9d0aba381..9764b05a1 100644 --- a/app/src/main/res/drawable/ic_cryptominers.xml +++ b/app/src/main/res/drawable/ic_cryptominers.xml @@ -9,6 +9,5 @@ android:viewportHeight="24"> + android:pathData="M16.5 4h-3V2.75a0.75 0.75 0 0 0-1.5 0V4H9.039C8.631 4 8.24 4.167 7.957 4.461L6.418 6.065A1.499 1.499 0 0 0 6 7.103V7.5A1.5 1.5 0 0 0 7.5 9H12v11.25a0.75 0.75 0 0 0 1.5 0V9h3A1.5 1.5 0 0 0 18 7.5v-2A1.5 1.5 0 0 0 16.5 4z" /> diff --git a/app/src/main/res/drawable/ic_fab_sync.xml b/app/src/main/res/drawable/ic_fab_sync.xml index 59fbc439f..52ac21e97 100644 --- a/app/src/main/res/drawable/ic_fab_sync.xml +++ b/app/src/main/res/drawable/ic_fab_sync.xml @@ -8,6 +8,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_fingerprinters.xml b/app/src/main/res/drawable/ic_fingerprinters.xml index 9a4652791..14dd24df1 100644 --- a/app/src/main/res/drawable/ic_fingerprinters.xml +++ b/app/src/main/res/drawable/ic_fingerprinters.xml @@ -9,5 +9,11 @@ android:viewportHeight="24"> - + android:pathData="M6.688 18H2.75a0.75 0.75 0 0 1 0-1.5h3.938c3.392 0 6.15-2.76 6.15-6.151V9.722a0.75 0.75 0 0 1 1.5 0v0.627C14.339 14.567 10.907 18 6.688 18z" /> + + + diff --git a/app/src/main/res/drawable/ic_folder_icon.xml b/app/src/main/res/drawable/ic_folder_icon.xml index 437fe48e0..ea7cea353 100644 --- a/app/src/main/res/drawable/ic_folder_icon.xml +++ b/app/src/main/res/drawable/ic_folder_icon.xml @@ -6,8 +6,8 @@ android:autoMirrored="true" android:width="24dp" android:height="24dp" - android:viewportWidth="20" - android:viewportHeight="17"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M18.5 6h-6.354l-2.039-2.199A2.503 2.503 0 0 0 8.274 3H4.5A2.502 2.502 0 0 0 2 5.5v12C2 18.879 3.121 20 4.5 20h14c1.379 0 2.5-1.121 2.5-2.5v-9C21 7.121 19.879 6 18.5 6zm1 11.7l-0.8 0.8H4.3l-0.8-0.8V5.3l0.8-0.8h3.974c0.277 0 0.545 0.117 0.733 0.32l2.146 2.315 0.869 0.365H18.7l0.8 0.8v9.4z" /> diff --git a/app/src/main/res/drawable/ic_folder_new.xml b/app/src/main/res/drawable/ic_folder_new.xml index a8de11332..fc41e1d89 100644 --- a/app/src/main/res/drawable/ic_folder_new.xml +++ b/app/src/main/res/drawable/ic_folder_new.xml @@ -9,5 +9,9 @@ android:viewportHeight="24"> + android:pathData="M21 18.5a0.745 0.745 0 0 0 0.53-0.22A0.75 0.75 0 0 0 21 17h-1.7l-0.8-0.8v-1.7a0.75 0.75 0 0 0-1.5 0v1.7L16.2 17h-1.7a0.75 0.75 0 0 0 0 1.5h1.7l0.8 0.8V21a0.75 0.75 0 0 0 1.5 0v-1.7l0.8-0.8H21z" /> + + diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index ca731897c..e15b9ed93 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -9,5 +9,8 @@ android:viewportHeight="24"> + android:pathData="M11.75 14A0.75 0.75 0 0 1 11 13.25v-0.959c0-0.645 0.452-1.206 1.074-1.336a1.6 1.6 0 0 0 1.27-1.561 1.596 1.596 0 0 0-3.101-0.522 0.75 0.75 0 1 1-1.418-0.49A3.097 3.097 0 0 1 11.75 6.3a3.098 3.098 0 0 1 3.094 3.094c0 1.418-0.979 2.661-2.344 3.002v0.854A0.75 0.75 0 0 1 11.75 14zm0.45 3h-0.9L11 16.7v-0.9l0.3-0.3h0.9l0.3 0.3v0.9L12.2 17z" /> + diff --git a/app/src/main/res/drawable/ic_internet.xml b/app/src/main/res/drawable/ic_internet.xml index 7aea69447..f6276035e 100644 --- a/app/src/main/res/drawable/ic_internet.xml +++ b/app/src/main/res/drawable/ic_internet.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:pathData="M12 2.5A9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5zm7.962 8.75h-3.008a11.503 11.503 0 0 0-2.666-6.65h0.742a8.014 8.014 0 0 1 4.932 6.65zm-7.749 8.15h-0.429a9.988 9.988 0 0 1-3.238-6.65h6.908a9.978 9.978 0 0 1-3.241 6.65zm-3.667-8.15a10.007 10.007 0 0 1 3.232-6.65h0.446a10.015 10.015 0 0 1 3.231 6.65H8.546zM8.97 4.6h0.743a11.499 11.499 0 0 0-2.667 6.65H4.038A8.014 8.014 0 0 1 8.97 4.6zm-4.932 8.15h3.008a11.476 11.476 0 0 0 2.67 6.65H8.97a8.014 8.014 0 0 1-4.932-6.65zM15.03 19.4h-0.733a11.465 11.465 0 0 0 2.658-6.65h3.007a8.014 8.014 0 0 1-4.932 6.65z" /> diff --git a/app/src/main/res/drawable/ic_link_disabled.xml b/app/src/main/res/drawable/ic_link_disabled.xml index 083c07dc6..b0084eee8 100644 --- a/app/src/main/res/drawable/ic_link_disabled.xml +++ b/app/src/main/res/drawable/ic_link_disabled.xml @@ -7,7 +7,14 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + + android:pathData="M10.08 15.526l4.324 4.324h1.13l3.815-3.815v-1.13l-4.324-4.324a1.5 1.5 0 0 1 2.12 0l3.123 3.123a2.498 2.498 0 0 1 0 3.533l-3.533 3.533a2.498 2.498 0 0 1-3.533 0l-3.123-3.123a1.5 1.5 0 0 1 0.001-2.121z" /> + + diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml index a6fbc4b6d..13454f7f2 100644 --- a/app/src/main/res/drawable/ic_location.xml +++ b/app/src/main/res/drawable/ic_location.xml @@ -10,13 +10,4 @@ - - - diff --git a/app/src/main/res/drawable/ic_location_anim_disable.xml b/app/src/main/res/drawable/ic_location_anim_disable.xml deleted file mode 100644 index 4664906a7..000000000 --- a/app/src/main/res/drawable/ic_location_anim_disable.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_location_anim_enable.xml b/app/src/main/res/drawable/ic_location_anim_enable.xml deleted file mode 100644 index 89b92fd4a..000000000 --- a/app/src/main/res/drawable/ic_location_anim_enable.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_location_disabled.xml b/app/src/main/res/drawable/ic_location_disabled.xml index b7f85fa0a..9b0e5fb95 100644 --- a/app/src/main/res/drawable/ic_location_disabled.xml +++ b/app/src/main/res/drawable/ic_location_disabled.xml @@ -3,25 +3,14 @@ - 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/. --> - - - - - - - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + diff --git a/app/src/main/res/drawable/ic_location_enabled.xml b/app/src/main/res/drawable/ic_location_enabled.xml index 41270ef01..785b356ab 100644 --- a/app/src/main/res/drawable/ic_location_enabled.xml +++ b/app/src/main/res/drawable/ic_location_enabled.xml @@ -3,25 +3,14 @@ - 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/. --> - - - - - - - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml index e95281678..a61455db0 100644 --- a/app/src/main/res/drawable/ic_login.xml +++ b/app/src/main/res/drawable/ic_login.xml @@ -3,11 +3,11 @@ - 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/. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_microphone.xml b/app/src/main/res/drawable/ic_microphone.xml index e3d9712f5..69a5db52e 100644 --- a/app/src/main/res/drawable/ic_microphone.xml +++ b/app/src/main/res/drawable/ic_microphone.xml @@ -11,12 +11,4 @@ android:id="@+id/disabled" android:drawable="@drawable/ic_microphone_disabled" /> - - - + diff --git a/app/src/main/res/drawable/ic_microphone_anim_disable.xml b/app/src/main/res/drawable/ic_microphone_anim_disable.xml deleted file mode 100644 index 556580d5b..000000000 --- a/app/src/main/res/drawable/ic_microphone_anim_disable.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_microphone_anim_enable.xml b/app/src/main/res/drawable/ic_microphone_anim_enable.xml deleted file mode 100644 index bccb4de81..000000000 --- a/app/src/main/res/drawable/ic_microphone_anim_enable.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_microphone_disabled.xml b/app/src/main/res/drawable/ic_microphone_disabled.xml index ffe797fc9..929cb80a0 100644 --- a/app/src/main/res/drawable/ic_microphone_disabled.xml +++ b/app/src/main/res/drawable/ic_microphone_disabled.xml @@ -3,25 +3,11 @@ - 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/. --> - - - - - - - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_microphone_enabled.xml b/app/src/main/res/drawable/ic_microphone_enabled.xml index 148a6695d..e639d9faa 100644 --- a/app/src/main/res/drawable/ic_microphone_enabled.xml +++ b/app/src/main/res/drawable/ic_microphone_enabled.xml @@ -7,21 +7,10 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - - - - - - - + + diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml index 23fd8c1d0..813693ef5 100644 --- a/app/src/main/res/drawable/ic_notifications.xml +++ b/app/src/main/res/drawable/ic_notifications.xml @@ -10,13 +10,4 @@ - - - diff --git a/app/src/main/res/drawable/ic_notifications_anim_disable.xml b/app/src/main/res/drawable/ic_notifications_anim_disable.xml deleted file mode 100644 index b54382c08..000000000 --- a/app/src/main/res/drawable/ic_notifications_anim_disable.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_notifications_anim_enable.xml b/app/src/main/res/drawable/ic_notifications_anim_enable.xml deleted file mode 100644 index 8f4aa3bda..000000000 --- a/app/src/main/res/drawable/ic_notifications_anim_enable.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_notifications_disabled.xml b/app/src/main/res/drawable/ic_notifications_disabled.xml index 9c30ac7bd..dcce0b521 100644 --- a/app/src/main/res/drawable/ic_notifications_disabled.xml +++ b/app/src/main/res/drawable/ic_notifications_disabled.xml @@ -7,21 +7,10 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - - - - - - - - + + + diff --git a/app/src/main/res/drawable/ic_notifications_enabled.xml b/app/src/main/res/drawable/ic_notifications_enabled.xml index 86447ec03..8fcc4d39d 100644 --- a/app/src/main/res/drawable/ic_notifications_enabled.xml +++ b/app/src/main/res/drawable/ic_notifications_enabled.xml @@ -7,21 +7,10 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - - - - - - - + + 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..c36e1839d --- /dev/null +++ b/app/src/main/res/drawable/ic_share.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_share_filled.xml b/app/src/main/res/drawable/ic_share_filled.xml deleted file mode 100644 index d8b6ccbf8..000000000 --- a/app/src/main/res/drawable/ic_share_filled.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_social_media_trackers.xml b/app/src/main/res/drawable/ic_social_media_trackers.xml index fe473248a..a1c78bd68 100644 --- a/app/src/main/res/drawable/ic_social_media_trackers.xml +++ b/app/src/main/res/drawable/ic_social_media_trackers.xml @@ -9,5 +9,5 @@ android:viewportHeight="24"> + android:pathData="M4.5,15h-1A1.5,1.5 0,0 1,2 13.5v-8A1.5,1.5 0,0 1,3.5 4h1A1.5,1.5 0,0 1,6 5.5v8A1.5,1.5 0,0 1,4.5 15zM18.767,16.077a2.461,2.461 0,0 0,2.335 -3.24l-2.051,-6.154A2.46,2.46 0,0 0,16.716 5H8v9.023l2.154,3.285 1.037,3.112a0.85,0.85 0,0 0,0.806 0.58H12c1.02,0 1.846,-0.827 1.846,-1.846v-2.708l0.369,-0.369h4.552z" /> diff --git a/app/src/main/res/drawable/ic_storage_disabled.xml b/app/src/main/res/drawable/ic_storage_disabled.xml index 6efaaac62..e9608e862 100644 --- a/app/src/main/res/drawable/ic_storage_disabled.xml +++ b/app/src/main/res/drawable/ic_storage_disabled.xml @@ -8,6 +8,9 @@ android:viewportHeight="24" android:autoMirrored="true"> - + android:pathData="M7.2,11h-0.9l-0.3,0.3v0.9l0.3,0.3h0.9l0.3,-0.3v-0.9l-0.3,-0.3z" + android:fillColor="@color/disabled_text"/> + + diff --git a/app/src/main/res/drawable/ic_storage_enabled.xml b/app/src/main/res/drawable/ic_storage_enabled.xml index dc941e619..b5d2f7b4a 100644 --- a/app/src/main/res/drawable/ic_storage_enabled.xml +++ b/app/src/main/res/drawable/ic_storage_enabled.xml @@ -11,5 +11,8 @@ android:autoMirrored="true"> - + android:pathData="M7.2 11H6.3L6 11.3v0.9l0.3 0.3h0.9l0.3-0.3v-0.9L7.2 11z" /> + + diff --git a/app/src/main/res/drawable/ic_tab_collection.xml b/app/src/main/res/drawable/ic_tab_collection.xml index b78a92c35..df421740c 100644 --- a/app/src/main/res/drawable/ic_tab_collection.xml +++ b/app/src/main/res/drawable/ic_tab_collection.xml @@ -9,8 +9,8 @@ android:viewportHeight="24"> + android:pathData="M8.75 12.5h6.5a0.75 0.75 0 0 0 0-1.5h-6.5a0.75 0.75 0 0 0 0 1.5zm0 4h6.5a0.75 0.75 0 0 0 0-1.5h-6.5a0.75 0.75 0 0 0 0 1.5z" /> - + android:pathData="M19.962 7.811l0.018-0.005-0.788-2.951A2.504 2.504 0 0 0 16.776 3H7.22a2.502 2.502 0 0 0-2.419 1.868L4.088 7.596C4.072 7.632 4.07 7.673 4.058 7.711L4.041 7.777l0.004 0.001C4.028 7.852 4 7.921 4 8v10.5A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5V8c0-0.067-0.026-0.125-0.038-0.189zM7.12 4.5h9.756l0.858 0.713L18.212 7H5.794l0.484-1.787L7.12 4.5zM18.5 18.7l-0.8 0.8H6.3l-0.8-0.8V8.5h13v10.2z" /> + 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 46ce31c8a..d37675e47 100644 --- a/app/src/main/res/layout/collection_home_list_row.xml +++ b/app/src/main/res/layout/collection_home_list_row.xml @@ -68,7 +68,7 @@ app:layout_constraintBottom_toBottomOf="@id/collection_icon" app:layout_constraintEnd_toStartOf="@id/collection_overflow_button" app:layout_constraintTop_toTopOf="@id/collection_icon" - app:srcCompat="@drawable/ic_share_filled" + app:srcCompat="@drawable/ic_share" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/tabstray_multiselect_items.xml b/app/src/main/res/layout/tabstray_multiselect_items.xml index 795753f94..22d325a1a 100644 --- a/app/src/main/res/layout/tabstray_multiselect_items.xml +++ b/app/src/main/res/layout/tabstray_multiselect_items.xml @@ -32,7 +32,7 @@ app:layout_constraintBottom_toBottomOf="@id/topBar" app:layout_constraintEnd_toStartOf="@id/menu_multi_select" app:layout_constraintTop_toTopOf="@id/topBar" - app:srcCompat="@drawable/ic_share_filled" + app:srcCompat="@drawable/ic_share" app:tint="@color/contrast_text_normal_theme" /> diff --git a/app/src/main/res/menu/history_select_multi.xml b/app/src/main/res/menu/history_select_multi.xml index 52f7aed44..344b19c44 100644 --- a/app/src/main/res/menu/history_select_multi.xml +++ b/app/src/main/res/menu/history_select_multi.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto">