android/source/res/drawable/ic_add_black_24dp.xml | 2 +- android/source/res/drawable/ic_arrow_back_black_24dp.xml | 2 +- android/source/res/drawable/ic_content_copy_black_24dp.xml | 2 +- android/source/res/drawable/ic_content_cut_black_24dp.xml | 2 +- android/source/res/drawable/ic_content_paste_black_24dp.xml | 2 +- android/source/res/drawable/ic_filter_list_black_24dp.xml | 2 +- android/source/res/drawable/ic_folder_black_24dp.xml | 2 +- android/source/res/drawable/ic_format_clear_black_24dp.xml | 2 +- android/source/res/drawable/ic_grid_off_black_24dp.xml | 2 +- android/source/res/drawable/ic_grid_on_black_24dp.xml | 2 +- android/source/res/drawable/ic_insert_drive_file_black_24dp.xml | 7 ------- android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml | 9 --------- android/source/res/drawable/ic_line.xml | 2 +- android/source/res/drawable/ic_rect.xml | 2 +- android/source/res/drawable/ic_sd_card_black_24dp.xml | 9 --------- android/source/res/drawable/ic_settings_black_24dp.xml | 2 +- android/source/res/drawable/ic_sort_black_24dp.xml | 2 +- android/source/res/drawable/ic_storage_black_24dp.xml | 9 --------- android/source/res/drawable/ic_usb_black_24dp.xml | 7 ------- android/source/res/values-night/colors.xml | 4 ++++ dev/null |binary 21 files changed, 18 insertions(+), 55 deletions(-)
New commits: commit f37dcb43c0373e75e92fabd82b4f2a17b1fe6055 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 28 14:22:54 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 30 12:16:41 2023 +0100 tdf#124480 android: Use themed color for more icons These icons used in the toolbars were previously using a hard-coded fill color. Most of them were using black, but `ic_line` and `ic_rect` used in the "Insert" tab of the bottom toolbar, were previously using a lighter gray than the other items in there for no apparent reason. Switch all of them to use the themed `toolbar_foreground` color that other icons are also using. Together with Change-Id Ic699fd1cecc607bd5e748648113336fe045e72b1 Author: Michael Weghorn <[email protected]> Date: Tue Nov 28 13:13:12 2023 +0100 tdf#124480 android: Override icon color for dark theme , this makes these icons use a light color when using the dark system theme. Given the icons are no longer hard-coded to be black, the files with a "_black" suffix will be renamed in a follow-up commit. (Separate commit to keep the diff clearer.) Change-Id: I2061878067d21dcd743ad6ca8d1018db323755d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160073 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/res/drawable/ic_add_black_24dp.xml b/android/source/res/drawable/ic_add_black_24dp.xml index 0258249cc482..7f7afe05c114 100644 --- a/android/source/res/drawable/ic_add_black_24dp.xml +++ b/android/source/res/drawable/ic_add_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> </vector> diff --git a/android/source/res/drawable/ic_arrow_back_black_24dp.xml b/android/source/res/drawable/ic_arrow_back_black_24dp.xml index beafea3959eb..deb00257fb1d 100644 --- a/android/source/res/drawable/ic_arrow_back_black_24dp.xml +++ b/android/source/res/drawable/ic_arrow_back_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/> </vector> diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml b/android/source/res/drawable/ic_content_copy_black_24dp.xml index 8a894a3bcd73..26f2aefd40a2 100644 --- a/android/source/res/drawable/ic_content_copy_black_24dp.xml +++ b/android/source/res/drawable/ic_content_copy_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/> </vector> diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml b/android/source/res/drawable/ic_content_cut_black_24dp.xml index 1c0f96a37b42..6a6ba24f2b7f 100644 --- a/android/source/res/drawable/ic_content_cut_black_24dp.xml +++ b/android/source/res/drawable/ic_content_cut_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M9.64,7.64c0.23,-0.5 0.36,-1.05 0.36,-1.64 0,-2.21 -1.79,-4 -4,-4S2,3.79 2,6s1.79,4 4,4c0.59,0 1.14,-0.13 1.64,-0.36L10,12l-2.36,2.36C7.14,14.13 6.59,14 6,14c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4c0,-0.59 -0.13,-1.14 -0.36,-1.64L12,14l7,7h3v-1L9.64,7.64zM6,8c-1.1,0 -2,-0.89 -2,-2s0.9,-2 2,-2 2,0.89 2,2 -0.9,2 -2,2zM6,20c-1.1,0 -2,-0.89 -2,-2s0.9,-2 2,-2 2,0.89 2,2 -0.9,2 -2,2zM12,12.5c-0.28,0 -0.5,-0.22 -0.5,-0.5s0.22,-0.5 0.5,-0.5 0.5,0.22 0.5,0.5 -0.22,0.5 -0.5,0.5zM19,3l-6,6 2,2 7,-7L22,3z"/> </vector> diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml b/android/source/res/drawable/ic_content_paste_black_24dp.xml index a902d9a856a0..e01601364307 100644 --- a/android/source/res/drawable/ic_content_paste_black_24dp.xml +++ b/android/source/res/drawable/ic_content_paste_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/> </vector> diff --git a/android/source/res/drawable/ic_filter_list_black_24dp.xml b/android/source/res/drawable/ic_filter_list_black_24dp.xml index b99b672f4e62..87414cbed6b4 100644 --- a/android/source/res/drawable/ic_filter_list_black_24dp.xml +++ b/android/source/res/drawable/ic_filter_list_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/> </vector> diff --git a/android/source/res/drawable/ic_folder_black_24dp.xml b/android/source/res/drawable/ic_folder_black_24dp.xml index 1a9a16fb1704..0435c89afc5d 100644 --- a/android/source/res/drawable/ic_folder_black_24dp.xml +++ b/android/source/res/drawable/ic_folder_black_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android";> - <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/> + <path android:fillColor="@color/toolbar_foreground" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/> </vector> diff --git a/android/source/res/drawable/ic_format_clear_black_24dp.xml b/android/source/res/drawable/ic_format_clear_black_24dp.xml index 4c903c7163e0..eeb661b8c09a 100644 --- a/android/source/res/drawable/ic_format_clear_black_24dp.xml +++ b/android/source/res/drawable/ic_format_clear_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M3.27,5L2,6.27l6.97,6.97L6.5,19h3l1.57,-3.66L16.73,21 18,19.73 3.55,5.27 3.27,5zM6,5v0.18L8.82,8h2.4l-0.72,1.68 2.1,2.1L14.21,8H20V5H6z"/> </vector> diff --git a/android/source/res/drawable/ic_grid_off_black_24dp.xml b/android/source/res/drawable/ic_grid_off_black_24dp.xml index 7cf3c950cc4b..6d5df305e48a 100644 --- a/android/source/res/drawable/ic_grid_off_black_24dp.xml +++ b/android/source/res/drawable/ic_grid_off_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M8,4v1.45l2,2L10,4h4v4h-3.45l2,2L14,10v1.45l2,2L16,10h4v4h-3.45l2,2L20,16v1.45l2,2L22,4c0,-1.1 -0.9,-2 -2,-2L4.55,2l2,2L8,4zM16,4h4v4h-4L16,4zM1.27,1.27L0,2.55l2,2L2,20c0,1.1 0.9,2 2,2h15.46l2,2 1.27,-1.27L1.27,1.27zM10,12.55L11.45,14L10,14v-1.45zM4,6.55L5.45,8L4,8L4,6.55zM8,20L4,20v-4h4v4zM8,14L4,14v-4h3.45l0.55,0.55L8,14zM14,20h-4v-4h3.45l0.55,0.54L14,20zM16,20v-1.46L17.46,20L16,20z"/> </vector> diff --git a/android/source/res/drawable/ic_grid_on_black_24dp.xml b/android/source/res/drawable/ic_grid_on_black_24dp.xml index b2ff9e5be07b..3aec5d2840d6 100644 --- a/android/source/res/drawable/ic_grid_on_black_24dp.xml +++ b/android/source/res/drawable/ic_grid_on_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM8,20L4,20v-4h4v4zM8,14L4,14v-4h4v4zM8,8L4,8L4,4h4v4zM14,20h-4v-4h4v4zM14,14h-4v-4h4v4zM14,8h-4L10,4h4v4zM20,20h-4v-4h4v4zM20,14h-4v-4h4v4zM20,8h-4L16,4h4v4z"/> </vector> diff --git a/android/source/res/drawable/ic_line.xml b/android/source/res/drawable/ic_line.xml index 639ba2dbf690..ae33c2929c94 100644 --- a/android/source/res/drawable/ic_line.xml +++ b/android/source/res/drawable/ic_line.xml @@ -7,6 +7,6 @@ android:pathData="M4,11h16v2h-16z" android:fillAlpha="1" android:strokeColor="#00000000" - android:fillColor="#4d4d4d" + android:fillColor="@color/toolbar_foreground" android:strokeWidth="2"/> </vector> diff --git a/android/source/res/drawable/ic_rect.xml b/android/source/res/drawable/ic_rect.xml index 241759ff00c3..ac6db359f56e 100644 --- a/android/source/res/drawable/ic_rect.xml +++ b/android/source/res/drawable/ic_rect.xml @@ -7,7 +7,7 @@ android:pathData="M4,6h16v12h-16z" android:fillAlpha="0.99" android:strokeColor="#00000000" - android:fillColor="#4d4d4d" + android:fillColor="@color/toolbar_foreground" android:strokeWidth="4" android:strokeAlpha="0.99"/> </vector> diff --git a/android/source/res/drawable/ic_settings_black_24dp.xml b/android/source/res/drawable/ic_settings_black_24dp.xml index ace746c40eed..990ea6fb9c33 100644 --- a/android/source/res/drawable/ic_settings_black_24dp.xml +++ b/android/source/res/drawable/ic_settings_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="@color/toolbar_foreground" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/> </vector> diff --git a/android/source/res/drawable/ic_sort_black_24dp.xml b/android/source/res/drawable/ic_sort_black_24dp.xml index d582deea67ec..7f5f2d4e8702 100644 --- a/android/source/res/drawable/ic_sort_black_24dp.xml +++ b/android/source/res/drawable/ic_sort_black_24dp.xml @@ -9,5 +9,5 @@ <vector android:autoMirrored="true" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android";> - <path android:fillColor="#FF000000" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/> + <path android:fillColor="@color/toolbar_foreground" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/> </vector> commit fbca561b97e9669d6a2eaaf7db8c629036a393a0 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 28 14:29:06 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 30 12:16:34 2023 +0100 tdf#124480 android: Drop unused icons Change-Id: I811d9190c0c163db93ec981855f735d47e071cbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160071 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/res/drawable/ic_insert_drive_file_black_24dp.xml b/android/source/res/drawable/ic_insert_drive_file_black_24dp.xml deleted file mode 100644 index aaeb289d7060..000000000000 --- a/android/source/res/drawable/ic_insert_drive_file_black_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android"; - android:height="24dp" - android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > - <path android:fillColor="#FF000000" android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/> -</vector> diff --git a/android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml b/android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml deleted file mode 100644 index 827cde0056cd..000000000000 --- a/android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android"; - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M21,11H6.83l3.58,-3.59L9,6l-6,6 6,6 1.41,-1.41L6.83,13H21z"/> -</vector> diff --git a/android/source/res/drawable/ic_menu_back.png b/android/source/res/drawable/ic_menu_back.png deleted file mode 100644 index d3191caffd13..000000000000 Binary files a/android/source/res/drawable/ic_menu_back.png and /dev/null differ diff --git a/android/source/res/drawable/ic_sd_card_black_24dp.xml b/android/source/res/drawable/ic_sd_card_black_24dp.xml deleted file mode 100644 index f9ad72d482db..000000000000 --- a/android/source/res/drawable/ic_sd_card_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android"; - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/> -</vector> diff --git a/android/source/res/drawable/ic_storage_black_24dp.xml b/android/source/res/drawable/ic_storage_black_24dp.xml deleted file mode 100644 index 53c595cd7d1c..000000000000 --- a/android/source/res/drawable/ic_storage_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android"; - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/> -</vector> diff --git a/android/source/res/drawable/ic_usb_black_24dp.xml b/android/source/res/drawable/ic_usb_black_24dp.xml deleted file mode 100644 index d9b39bac1a86..000000000000 --- a/android/source/res/drawable/ic_usb_black_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android"; - android:height="24dp" - android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > - <path android:fillColor="#FF000000" android:pathData="M15,7v4h1v2h-3V5h2l-3,-4 -3,4h2v8H8v-2.07c0.7,-0.37 1.2,-1.08 1.2,-1.93 0,-1.21 -0.99,-2.2 -2.2,-2.2 -1.21,0 -2.2,0.99 -2.2,2.2 0,0.85 0.5,1.56 1.2,1.93V13c0,1.11 0.89,2 2,2h3v3.05c-0.71,0.37 -1.2,1.1 -1.2,1.95 0,1.22 0.99,2.2 2.2,2.2 1.21,0 2.2,-0.98 2.2,-2.2 0,-0.85 -0.49,-1.58 -1.2,-1.95V15h3c1.11,0 2,-0.89 2,-2v-2h1V7h-4z"/> -</vector> commit 26d06d6c881a0decb25b82eae1cee42fc6bc6a31 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 28 13:13:12 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 30 12:16:27 2023 +0100 tdf#124480 android: Override icon color for dark theme Add a `values-night/colors.xml` that can be used to override the colors specified in `values/colors.xml` specifically for the dark theme. Specify a light color for `toolbar_foreground`, which is the color used for (most) toolbar icons, both for the top-level as well as the bottom toolbar. This makes most icons show up in proper contrast when using dark mode. Others are not making use of the color defined here and will have to be looked into separately. Change-Id: Ic699fd1cecc607bd5e748648113336fe045e72b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160070 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/res/values-night/colors.xml b/android/source/res/values-night/colors.xml new file mode 100644 index 000000000000..e02863b10340 --- /dev/null +++ b/android/source/res/values-night/colors.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="toolbar_foreground">#efefef</color> +</resources>
