From c85312b715d8b83d3c908f27e2ca80122d476c00 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 21 Mar 2024 23:40:39 +0100 Subject: [PATCH] Add SPDX header Signed-off-by: Andy Scherzinger --- .../main/res/drawable-night/ic_contacts.xml | 17 +++---- app/src/main/res/drawable/accent_circle.xml | 25 ++-------- .../res/drawable/baseline_unfold_less_24.xml | 6 +++ .../res/drawable/baseline_unfold_more_24.xml | 6 +++ app/src/main/res/drawable/borderless_btn.xml | 29 +++-------- .../res/drawable/current_location_circle.xml | 7 ++- .../res/drawable/ic_av_timer_timer_24dp.xml | 36 ++++++-------- .../res/drawable/ic_avatar_background.xml | 23 ++------- .../main/res/drawable/ic_avatar_document.xml | 25 +++------- app/src/main/res/drawable/ic_avatar_group.xml | 22 ++------- app/src/main/res/drawable/ic_avatar_link.xml | 22 ++------- app/src/main/res/drawable/ic_avatar_mail.xml | 22 ++------- .../main/res/drawable/ic_baseline_deck_24.xml | 20 ++------ app/src/main/res/drawable/ic_comment.xml | 36 +++++--------- app/src/main/res/drawable/ic_contacts.xml | 17 +++---- .../drawable/ic_exit_to_app_black_24dp.xml | 22 ++------- .../res/drawable/ic_group_grey600_24px.xml | 29 ----------- .../res/drawable/ic_launcher_background.xml | 23 ++------- .../res/drawable/ic_launcher_foreground.xml | 44 +++++++---------- .../main/res/drawable/ic_link_black_24px.xml | 40 +++++++--------- .../res/drawable/ic_link_grey600_24px.xml | 40 +++++++--------- app/src/main/res/drawable/ic_logo.xml | 35 +++++--------- .../main/res/drawable/ic_mimetype_audio.xml | 22 ++------- .../main/res/drawable/ic_mimetype_file.xml | 24 ++-------- .../main/res/drawable/ic_mimetype_folder.xml | 18 ++----- .../drawable/ic_mimetype_folder_shared.xml | 23 ++------- .../main/res/drawable/ic_mimetype_link.xml | 22 ++------- .../res/drawable/ic_mimetype_location.xml | 41 +++++----------- .../ic_mimetype_package_x_generic.xml | 24 ++-------- .../drawable/ic_mimetype_text_calendar.xml | 43 +++++------------ .../res/drawable/ic_mimetype_text_code.xml | 32 ++++--------- .../res/drawable/ic_mimetype_text_vcard.xml | 48 +++++-------------- .../drawable/ic_people_group_black_24px.xml | 39 +++++---------- app/src/main/res/drawable/ic_talk.xml | 5 ++ .../main/res/drawable/ic_user_status_away.xml | 35 +++++--------- .../main/res/drawable/ic_user_status_dnd.xml | 39 +++++---------- .../res/drawable/ic_user_status_invisible.xml | 37 +++++--------- .../main/res/drawable/incoming_gradient.xml | 26 +++------- app/src/main/res/drawable/launch_screen.xml | 21 ++------ app/src/main/res/drawable/mention_chip.xml | 25 ++-------- app/src/main/res/drawable/online_status.xml | 36 +++++--------- .../drawable/online_status_with_border.xml | 29 ++++------- .../res/drawable/reaction_self_background.xml | 31 ++++-------- .../reaction_self_bottom_sheet_background.xml | 24 +++------- app/src/main/res/drawable/record_start.xml | 12 +++-- app/src/main/res/drawable/record_starting.xml | 12 +++-- app/src/main/res/drawable/record_stop.xml | 12 +++-- app/src/main/res/drawable/round_bgnd.xml | 25 +++------- app/src/main/res/drawable/round_corner.xml | 6 +++ .../shape_grouped_incoming_message.xml | 28 +++-------- .../shape_grouped_outcoming_message.xml | 28 +++-------- .../res/drawable/shape_incoming_message.xml | 28 +++-------- .../icon-background.svg.license | 2 + .../icon-foreground.svg.license | 2 + .../icon-foreground_qa.svg.license | 2 + ...cle.svg.txt => account-circle.svg.license} | 0 ....svg.txt => circular_document.svg.license} | 0 ...oup.svg.txt => circular_group.svg.license} | 0 ...link.svg.txt => circular_link.svg.license} | 0 ....svg.txt => circular_location.svg.license} | 0 ...lock.svg.txt => circular_lock.svg.license} | 0 ...mail.svg.txt => circular_mail.svg.license} | 0 ...vg.txt => file-icon-black-24h.svg.license} | 0 ...ile-icon.svg.txt => file-icon.svg.license} | 0 ....txt => file-password-request.svg.license} | 0 ..._16_9.svg.txt => ic_crop_16_9.svg.license} | 0 ...op_4_3.svg.txt => ic_crop_4_3.svg.license} | 0 ...ity.svg.txt => ic_low_quality.svg.license} | 0 scripts/hooks/pre-commit | 5 ++ scripts/hooks/pre-push | 5 ++ 70 files changed, 418 insertions(+), 939 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_group_grey600_24px.xml create mode 100644 drawable_resources/icon-background.svg.license create mode 100644 drawable_resources/icon-foreground.svg.license create mode 100644 drawable_resources/icon-foreground_qa.svg.license rename drawable_resources/other/{account-circle.svg.txt => account-circle.svg.license} (100%) rename drawable_resources/other/{circular_document.svg.txt => circular_document.svg.license} (100%) rename drawable_resources/other/{circular_group.svg.txt => circular_group.svg.license} (100%) rename drawable_resources/other/{circular_link.svg.txt => circular_link.svg.license} (100%) rename drawable_resources/other/{circular_location.svg.txt => circular_location.svg.license} (100%) rename drawable_resources/other/{circular_lock.svg.txt => circular_lock.svg.license} (100%) rename drawable_resources/other/{circular_mail.svg.txt => circular_mail.svg.license} (100%) rename drawable_resources/other/{file-icon-black-24h.svg.txt => file-icon-black-24h.svg.license} (100%) rename drawable_resources/other/{file-icon.svg.txt => file-icon.svg.license} (100%) rename drawable_resources/other/{file-password-request.svg.txt => file-password-request.svg.license} (100%) rename drawable_resources/other/{ic_crop_16_9.svg.txt => ic_crop_16_9.svg.license} (100%) rename drawable_resources/other/{ic_crop_4_3.svg.txt => ic_crop_4_3.svg.license} (100%) rename drawable_resources/other/{ic_low_quality.svg.txt => ic_low_quality.svg.license} (100%) diff --git a/app/src/main/res/drawable-night/ic_contacts.xml b/app/src/main/res/drawable-night/ic_contacts.xml index a4956ca0a..7c484b8eb 100644 --- a/app/src/main/res/drawable-night/ic_contacts.xml +++ b/app/src/main/res/drawable-night/ic_contacts.xml @@ -1,15 +1,16 @@ + android:width="24dp" + android:height="24dp" + android:tint="#FFFFFFFF" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M-19,861L-19,718Q-19,677 0.69,644.15Q20.38,611.29 53,594Q119,560 189.27,543Q259.54,526 332,526Q404.12,526 474.06,543Q544,560 610,594Q642.63,611.29 662.31,644.15Q682,677 682,718L682,861L-19,861ZM767,861L767,706Q767,664 744,614Q721,564 672,529Q735,535 790.5,551.5Q846,568 893,594Q934.84,617.77 956.92,646.88Q979,676 979,706L979,861L767,861ZM331,473Q253.45,473 198.23,417.78Q143,362.55 143,285Q143,207.45 198.23,152.22Q253.45,97 331,97Q408.55,97 463.77,152.22Q519,207.45 519,285Q519,362.55 463.77,417.78Q408.55,473 331,473ZM816,285Q816,362.55 760.78,417.78Q705.55,473 628,473Q613,473 587,469.5Q561,466 546,461Q575,423 589.5,378.15Q604,333.3 604,285Q604,236.7 589.5,191.85Q575,147 546,109Q566,102 587,99.5Q608,97 628,97Q705.55,97 760.78,152.22Q816,207.45 816,285Z" /> diff --git a/app/src/main/res/drawable/accent_circle.xml b/app/src/main/res/drawable/accent_circle.xml index 3c6519214..189321396 100644 --- a/app/src/main/res/drawable/accent_circle.xml +++ b/app/src/main/res/drawable/accent_circle.xml @@ -1,26 +1,11 @@ - + ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - + diff --git a/app/src/main/res/drawable/baseline_unfold_less_24.xml b/app/src/main/res/drawable/baseline_unfold_less_24.xml index 91209380d..fb51bec22 100644 --- a/app/src/main/res/drawable/baseline_unfold_less_24.xml +++ b/app/src/main/res/drawable/baseline_unfold_less_24.xml @@ -1,3 +1,9 @@ + - + + + - - \ No newline at end of file diff --git a/app/src/main/res/drawable/current_location_circle.xml b/app/src/main/res/drawable/current_location_circle.xml index 03f63da18..7863b6fa9 100644 --- a/app/src/main/res/drawable/current_location_circle.xml +++ b/app/src/main/res/drawable/current_location_circle.xml @@ -1,5 +1,10 @@ - + diff --git a/app/src/main/res/drawable/ic_av_timer_timer_24dp.xml b/app/src/main/res/drawable/ic_av_timer_timer_24dp.xml index 3b2fa89c9..128329300 100644 --- a/app/src/main/res/drawable/ic_av_timer_timer_24dp.xml +++ b/app/src/main/res/drawable/ic_av_timer_timer_24dp.xml @@ -1,25 +1,17 @@ - - - + ~ SPDX-FileCopyrightText: 2018-2024 Google LLC + ~ SPDX-License-Identifier: Apache-2.0 +--> + + diff --git a/app/src/main/res/drawable/ic_avatar_background.xml b/app/src/main/res/drawable/ic_avatar_background.xml index 84b02c9cb..7959dac3c 100644 --- a/app/src/main/res/drawable/ic_avatar_background.xml +++ b/app/src/main/res/drawable/ic_avatar_background.xml @@ -1,23 +1,8 @@ - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see . - --> - + ~ SPDX-FileCopyrightText: 2018-2024 Google LLC + ~ SPDX-FileCopyrightText: 2022 Andy Scherzinger + ~ SPDX-License-Identifier: Apache-2.0 +--> + android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z" /> diff --git a/app/src/main/res/drawable/ic_avatar_group.xml b/app/src/main/res/drawable/ic_avatar_group.xml index 3dcdb9e9b..5b57254fb 100644 --- a/app/src/main/res/drawable/ic_avatar_group.xml +++ b/app/src/main/res/drawable/ic_avatar_group.xml @@ -1,23 +1,9 @@ - + ~ SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see . - --> - + ~ SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see . - --> - + ~ SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> . - --> + ~ SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see . - --> - + ~ Nextcloud Talk - Android Client + ~ + ~ SPDX-FileCopyrightText: 2018-2024 Google LLC + ~ SPDX-License-Identifier: Apache-2.0 +--> - + android:autoMirrored="true" + android:tint="#FF000000" + android:viewportWidth="960" + android:viewportHeight="960"> + diff --git a/app/src/main/res/drawable/ic_contacts.xml b/app/src/main/res/drawable/ic_contacts.xml index 3ae24f45a..0ea322ae1 100644 --- a/app/src/main/res/drawable/ic_contacts.xml +++ b/app/src/main/res/drawable/ic_contacts.xml @@ -1,15 +1,16 @@ + android:width="24dp" + android:height="24dp" + android:tint="#FF000000" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M-19,861L-19,718Q-19,677 0.69,644.15Q20.38,611.29 53,594Q119,560 189.27,543Q259.54,526 332,526Q404.12,526 474.06,543Q544,560 610,594Q642.63,611.29 662.31,644.15Q682,677 682,718L682,861L-19,861ZM767,861L767,706Q767,664 744,614Q721,564 672,529Q735,535 790.5,551.5Q846,568 893,594Q934.84,617.77 956.92,646.88Q979,676 979,706L979,861L767,861ZM331,473Q253.45,473 198.23,417.78Q143,362.55 143,285Q143,207.45 198.23,152.22Q253.45,97 331,97Q408.55,97 463.77,152.22Q519,207.45 519,285Q519,362.55 463.77,417.78Q408.55,473 331,473ZM816,285Q816,362.55 760.78,417.78Q705.55,473 628,473Q613,473 587,469.5Q561,466 546,461Q575,423 589.5,378.15Q604,333.3 604,285Q604,236.7 589.5,191.85Q575,147 546,109Q566,102 587,99.5Q608,97 628,97Q705.55,97 760.78,152.22Q816,207.45 816,285Z" /> diff --git a/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml b/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml index ac4fbac98..d2fe7b8a5 100644 --- a/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml +++ b/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml @@ -1,23 +1,9 @@ - + ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> diff --git a/app/src/main/res/drawable/ic_group_grey600_24px.xml b/app/src/main/res/drawable/ic_group_grey600_24px.xml deleted file mode 100644 index 29c5577eb..000000000 --- a/app/src/main/res/drawable/ic_group_grey600_24px.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 84b02c9cb..7959dac3c 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,23 +1,8 @@ - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see . - --> - + ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - - - - - + + + + + diff --git a/app/src/main/res/drawable/ic_link_black_24px.xml b/app/src/main/res/drawable/ic_link_black_24px.xml index d1e8a70fa..62bde36d4 100644 --- a/app/src/main/res/drawable/ic_link_black_24px.xml +++ b/app/src/main/res/drawable/ic_link_black_24px.xml @@ -1,29 +1,21 @@ - - - + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> + + diff --git a/app/src/main/res/drawable/ic_link_grey600_24px.xml b/app/src/main/res/drawable/ic_link_grey600_24px.xml index 2c15eb899..d34cf64b6 100644 --- a/app/src/main/res/drawable/ic_link_grey600_24px.xml +++ b/app/src/main/res/drawable/ic_link_grey600_24px.xml @@ -1,29 +1,21 @@ - - - + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> + + diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml index 587dcae0a..ef4098dcb 100644 --- a/app/src/main/res/drawable/ic_logo.xml +++ b/app/src/main/res/drawable/ic_logo.xml @@ -1,22 +1,9 @@ + ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - + android:pivotY="64" + android:scaleX="0.88" + android:scaleY="0.88"> + diff --git a/app/src/main/res/drawable/ic_mimetype_audio.xml b/app/src/main/res/drawable/ic_mimetype_audio.xml index 1f6258828..fe90676d2 100755 --- a/app/src/main/res/drawable/ic_mimetype_audio.xml +++ b/app/src/main/res/drawable/ic_mimetype_audio.xml @@ -1,24 +1,10 @@ - + ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - + ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - \ No newline at end of file + diff --git a/app/src/main/res/drawable/ic_mimetype_folder.xml b/app/src/main/res/drawable/ic_mimetype_folder.xml index 0c3996eb3..0c9a423e4 100755 --- a/app/src/main/res/drawable/ic_mimetype_folder.xml +++ b/app/src/main/res/drawable/ic_mimetype_folder.xml @@ -1,18 +1,8 @@ - + ~ SPDX-FileCopyrightText: 2017-2024 Google LLC + ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic + ~ SPDX-License-Identifier: Apache-2.0 +--> - + ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - + ~ SPDX-FileCopyrightText: 2018-2024 Google LLC + ~ SPDX-License-Identifier: Apache-2.0 +--> - + android:width="24dp" + android:height="24dp" + android:tint="#969696" + android:viewportWidth="960" + android:viewportHeight="960"> - + android:fillColor="@android:color/white" + android:pathData="M479.91,490Q517,490 543.5,463.59Q570,437.18 570,400.09Q570,363 543.59,336.5Q517.18,310 480.09,310Q443,310 416.5,336.41Q390,362.82 390,399.91Q390,437 416.41,463.5Q442.82,490 479.91,490ZM480,913Q300,764 214,640.5Q128,517 128,405Q128,256 231,151.5Q334,47 480,47Q626,47 729,151.5Q832,256 832,405Q832,517 746,640.5Q660,764 480,913Z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_mimetype_package_x_generic.xml b/app/src/main/res/drawable/ic_mimetype_package_x_generic.xml index 0bc92e6c1..050231fc4 100755 --- a/app/src/main/res/drawable/ic_mimetype_package_x_generic.xml +++ b/app/src/main/res/drawable/ic_mimetype_package_x_generic.xml @@ -1,24 +1,10 @@ - + ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - \ No newline at end of file + diff --git a/app/src/main/res/drawable/ic_mimetype_text_calendar.xml b/app/src/main/res/drawable/ic_mimetype_text_calendar.xml index debdc69e6..508bedc2f 100755 --- a/app/src/main/res/drawable/ic_mimetype_text_calendar.xml +++ b/app/src/main/res/drawable/ic_mimetype_text_calendar.xml @@ -1,36 +1,17 @@ - + ~ SPDX-FileCopyrightText: 2018-2024 Google LLC + ~ SPDX-License-Identifier: Apache-2.0 +--> - + android:width="24dp" + android:height="24dp" + android:tint="#969696" + android:viewportWidth="960" + android:viewportHeight="960"> - \ No newline at end of file + android:fillColor="@android:color/white" + android:pathData="M194,910Q150.27,910 119.14,878.86Q88,847.72 88,804L88,232Q88,188.28 119.14,157.14Q150.27,126 194,126L202,126L202,50L308,50L308,126L652,126L652,50L758,50L758,126L766,126Q809.72,126 840.86,157.14Q872,188.28 872,232L872,804Q872,847.72 840.86,878.86Q809.72,910 766,910L194,910ZM194,804L766,804Q766,804 766,804Q766,804 766,804L766,380L194,380L194,804Q194,804 194,804Q194,804 194,804Z" /> + diff --git a/app/src/main/res/drawable/ic_mimetype_text_code.xml b/app/src/main/res/drawable/ic_mimetype_text_code.xml index 23009e0e4..86c6767ce 100755 --- a/app/src/main/res/drawable/ic_mimetype_text_code.xml +++ b/app/src/main/res/drawable/ic_mimetype_text_code.xml @@ -1,24 +1,10 @@ - + ~ SPDX-FileCopyrightText: 2018-2024 Google LLC + ~ SPDX-License-Identifier: Apache-2.0 +--> + android:strokeColor="#969696" /> - \ No newline at end of file + android:strokeColor="#969696" /> + diff --git a/app/src/main/res/drawable/ic_mimetype_text_vcard.xml b/app/src/main/res/drawable/ic_mimetype_text_vcard.xml index 4308c39f5..59fd6e2f6 100755 --- a/app/src/main/res/drawable/ic_mimetype_text_vcard.xml +++ b/app/src/main/res/drawable/ic_mimetype_text_vcard.xml @@ -1,43 +1,17 @@ - + ~ SPDX-FileCopyrightText: 2018-2024 Google LLC + ~ SPDX-License-Identifier: Apache-2.0 +--> - + android:width="24dp" + android:height="24dp" + android:tint="#969696" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M-19,861L-19,718Q-19,677 0.69,644.15Q20.38,611.29 53,594Q119,560 189.27,543Q259.54,526 332,526Q404.12,526 474.06,543Q544,560 610,594Q642.63,611.29 662.31,644.15Q682,677 682,718L682,861L-19,861ZM767,861L767,706Q767,664 744,614Q721,564 672,529Q735,535 790.5,551.5Q846,568 893,594Q934.84,617.77 956.92,646.88Q979,676 979,706L979,861L767,861ZM331,473Q253.45,473 198.23,417.78Q143,362.55 143,285Q143,207.45 198.23,152.22Q253.45,97 331,97Q408.55,97 463.77,152.22Q519,207.45 519,285Q519,362.55 463.77,417.78Q408.55,473 331,473ZM816,285Q816,362.55 760.78,417.78Q705.55,473 628,473Q613,473 587,469.5Q561,466 546,461Q575,423 589.5,378.15Q604,333.3 604,285Q604,236.7 589.5,191.85Q575,147 546,109Q566,102 587,99.5Q608,97 628,97Q705.55,97 760.78,152.22Q816,207.45 816,285Z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_people_group_black_24px.xml b/app/src/main/res/drawable/ic_people_group_black_24px.xml index da3d845e3..0ea322ae1 100644 --- a/app/src/main/res/drawable/ic_people_group_black_24px.xml +++ b/app/src/main/res/drawable/ic_people_group_black_24px.xml @@ -1,29 +1,16 @@ - - - + ~ SPDX-FileCopyrightText: 2018-2024 Google LLC + ~ SPDX-License-Identifier: Apache-2.0 +--> + + diff --git a/app/src/main/res/drawable/ic_talk.xml b/app/src/main/res/drawable/ic_talk.xml index c479856dc..7cf543e65 100644 --- a/app/src/main/res/drawable/ic_talk.xml +++ b/app/src/main/res/drawable/ic_talk.xml @@ -1,4 +1,9 @@ + . + ~ Nextcloud Talk - Android Client + ~ + ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH + ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky + ~ SPDX-License-Identifier: GPL-3.0-or-later --> - . + ~ Nextcloud Talk - Android Client + ~ + ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH + ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky + ~ SPDX-License-Identifier: GPL-3.0-or-later --> - + android:strokeLineJoin="round" /> diff --git a/app/src/main/res/drawable/ic_user_status_invisible.xml b/app/src/main/res/drawable/ic_user_status_invisible.xml index 18a35e8e1..f9afdb821 100644 --- a/app/src/main/res/drawable/ic_user_status_invisible.xml +++ b/app/src/main/res/drawable/ic_user_status_invisible.xml @@ -1,32 +1,17 @@ - - + - + ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> + android:shape="rectangle"> + android:startColor="#323232" /> diff --git a/app/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml index e941cf769..ad384240c 100644 --- a/app/src/main/res/drawable/launch_screen.xml +++ b/app/src/main/res/drawable/launch_screen.xml @@ -1,20 +1,9 @@ - diff --git a/app/src/main/res/drawable/mention_chip.xml b/app/src/main/res/drawable/mention_chip.xml index 354366deb..f367524fa 100644 --- a/app/src/main/res/drawable/mention_chip.xml +++ b/app/src/main/res/drawable/mention_chip.xml @@ -1,26 +1,11 @@ - + ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> - + diff --git a/app/src/main/res/drawable/online_status.xml b/app/src/main/res/drawable/online_status.xml index 6d627e81d..4d60e4778 100644 --- a/app/src/main/res/drawable/online_status.xml +++ b/app/src/main/res/drawable/online_status.xml @@ -1,29 +1,17 @@ - - - + diff --git a/app/src/main/res/drawable/reaction_self_background.xml b/app/src/main/res/drawable/reaction_self_background.xml index deaea7a6f..9e088caee 100644 --- a/app/src/main/res/drawable/reaction_self_background.xml +++ b/app/src/main/res/drawable/reaction_self_background.xml @@ -1,35 +1,22 @@ - - + - + diff --git a/app/src/main/res/drawable/reaction_self_bottom_sheet_background.xml b/app/src/main/res/drawable/reaction_self_bottom_sheet_background.xml index bc830ec62..bce1de811 100644 --- a/app/src/main/res/drawable/reaction_self_bottom_sheet_background.xml +++ b/app/src/main/res/drawable/reaction_self_bottom_sheet_background.xml @@ -1,22 +1,10 @@ - + ~ SPDX-FileCopyrightText: 2022 Andy Scherzinger + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> diff --git a/app/src/main/res/drawable/record_start.xml b/app/src/main/res/drawable/record_start.xml index 15f19b81e..2b0e5a199 100644 --- a/app/src/main/res/drawable/record_start.xml +++ b/app/src/main/res/drawable/record_start.xml @@ -1,9 +1,15 @@ + - + diff --git a/app/src/main/res/drawable/record_starting.xml b/app/src/main/res/drawable/record_starting.xml index 216ebb4ae..f63c3117f 100644 --- a/app/src/main/res/drawable/record_starting.xml +++ b/app/src/main/res/drawable/record_starting.xml @@ -1,9 +1,15 @@ + - + diff --git a/app/src/main/res/drawable/record_stop.xml b/app/src/main/res/drawable/record_stop.xml index 47795ee1c..d28fc1709 100644 --- a/app/src/main/res/drawable/record_stop.xml +++ b/app/src/main/res/drawable/record_stop.xml @@ -1,9 +1,15 @@ + - + diff --git a/app/src/main/res/drawable/round_bgnd.xml b/app/src/main/res/drawable/round_bgnd.xml index f4f807528..4f34c7d60 100644 --- a/app/src/main/res/drawable/round_bgnd.xml +++ b/app/src/main/res/drawable/round_bgnd.xml @@ -1,24 +1,11 @@ - + android:shape="oval"> + diff --git a/app/src/main/res/drawable/round_corner.xml b/app/src/main/res/drawable/round_corner.xml index 6888a97bf..0d70bb289 100644 --- a/app/src/main/res/drawable/round_corner.xml +++ b/app/src/main/res/drawable/round_corner.xml @@ -1,4 +1,10 @@ + diff --git a/app/src/main/res/drawable/shape_grouped_incoming_message.xml b/app/src/main/res/drawable/shape_grouped_incoming_message.xml index a6ee348b7..283a1e86d 100644 --- a/app/src/main/res/drawable/shape_grouped_incoming_message.xml +++ b/app/src/main/res/drawable/shape_grouped_incoming_message.xml @@ -1,31 +1,17 @@ - + ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> + android:shape="rectangle"> diff --git a/app/src/main/res/drawable/shape_grouped_outcoming_message.xml b/app/src/main/res/drawable/shape_grouped_outcoming_message.xml index 22852f946..98f212f38 100644 --- a/app/src/main/res/drawable/shape_grouped_outcoming_message.xml +++ b/app/src/main/res/drawable/shape_grouped_outcoming_message.xml @@ -1,32 +1,18 @@ - + ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> + android:shape="rectangle"> + android:topRightRadius="@dimen/message_bubble_corners_radius" /> diff --git a/app/src/main/res/drawable/shape_incoming_message.xml b/app/src/main/res/drawable/shape_incoming_message.xml index 69f37ed3a..c12234e86 100644 --- a/app/src/main/res/drawable/shape_incoming_message.xml +++ b/app/src/main/res/drawable/shape_incoming_message.xml @@ -1,31 +1,17 @@ - + ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic + ~ SPDX-License-Identifier: GPL-3.0-or-later +--> + android:shape="rectangle"> diff --git a/drawable_resources/icon-background.svg.license b/drawable_resources/icon-background.svg.license new file mode 100644 index 000000000..eb754075d --- /dev/null +++ b/drawable_resources/icon-background.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/drawable_resources/icon-foreground.svg.license b/drawable_resources/icon-foreground.svg.license new file mode 100644 index 000000000..d497300e4 --- /dev/null +++ b/drawable_resources/icon-foreground.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/drawable_resources/icon-foreground_qa.svg.license b/drawable_resources/icon-foreground_qa.svg.license new file mode 100644 index 000000000..d497300e4 --- /dev/null +++ b/drawable_resources/icon-foreground_qa.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/drawable_resources/other/account-circle.svg.txt b/drawable_resources/other/account-circle.svg.license similarity index 100% rename from drawable_resources/other/account-circle.svg.txt rename to drawable_resources/other/account-circle.svg.license diff --git a/drawable_resources/other/circular_document.svg.txt b/drawable_resources/other/circular_document.svg.license similarity index 100% rename from drawable_resources/other/circular_document.svg.txt rename to drawable_resources/other/circular_document.svg.license diff --git a/drawable_resources/other/circular_group.svg.txt b/drawable_resources/other/circular_group.svg.license similarity index 100% rename from drawable_resources/other/circular_group.svg.txt rename to drawable_resources/other/circular_group.svg.license diff --git a/drawable_resources/other/circular_link.svg.txt b/drawable_resources/other/circular_link.svg.license similarity index 100% rename from drawable_resources/other/circular_link.svg.txt rename to drawable_resources/other/circular_link.svg.license diff --git a/drawable_resources/other/circular_location.svg.txt b/drawable_resources/other/circular_location.svg.license similarity index 100% rename from drawable_resources/other/circular_location.svg.txt rename to drawable_resources/other/circular_location.svg.license diff --git a/drawable_resources/other/circular_lock.svg.txt b/drawable_resources/other/circular_lock.svg.license similarity index 100% rename from drawable_resources/other/circular_lock.svg.txt rename to drawable_resources/other/circular_lock.svg.license diff --git a/drawable_resources/other/circular_mail.svg.txt b/drawable_resources/other/circular_mail.svg.license similarity index 100% rename from drawable_resources/other/circular_mail.svg.txt rename to drawable_resources/other/circular_mail.svg.license diff --git a/drawable_resources/other/file-icon-black-24h.svg.txt b/drawable_resources/other/file-icon-black-24h.svg.license similarity index 100% rename from drawable_resources/other/file-icon-black-24h.svg.txt rename to drawable_resources/other/file-icon-black-24h.svg.license diff --git a/drawable_resources/other/file-icon.svg.txt b/drawable_resources/other/file-icon.svg.license similarity index 100% rename from drawable_resources/other/file-icon.svg.txt rename to drawable_resources/other/file-icon.svg.license diff --git a/drawable_resources/other/file-password-request.svg.txt b/drawable_resources/other/file-password-request.svg.license similarity index 100% rename from drawable_resources/other/file-password-request.svg.txt rename to drawable_resources/other/file-password-request.svg.license diff --git a/drawable_resources/other/ic_crop_16_9.svg.txt b/drawable_resources/other/ic_crop_16_9.svg.license similarity index 100% rename from drawable_resources/other/ic_crop_16_9.svg.txt rename to drawable_resources/other/ic_crop_16_9.svg.license diff --git a/drawable_resources/other/ic_crop_4_3.svg.txt b/drawable_resources/other/ic_crop_4_3.svg.license similarity index 100% rename from drawable_resources/other/ic_crop_4_3.svg.txt rename to drawable_resources/other/ic_crop_4_3.svg.license diff --git a/drawable_resources/other/ic_low_quality.svg.txt b/drawable_resources/other/ic_low_quality.svg.license similarity index 100% rename from drawable_resources/other/ic_low_quality.svg.txt rename to drawable_resources/other/ic_low_quality.svg.license diff --git a/scripts/hooks/pre-commit b/scripts/hooks/pre-commit index dad2ed4b7..5ab3572e5 100755 --- a/scripts/hooks/pre-commit +++ b/scripts/hooks/pre-commit @@ -1,5 +1,10 @@ #!/bin/bash # Pre-commit hook: don't allow commits if detekt or ktlint fail. Skip with "git commit --no-verify". + +# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2021 Álvaro Brey Vilas +# SPDX-License-Identifier: GPL-3.0-or-later + echo "Running pre-commit checks..." if ! ./gradlew --daemon ktlintCheck &>/dev/null; then diff --git a/scripts/hooks/pre-push b/scripts/hooks/pre-push index 628975cb2..91b9ed75d 100755 --- a/scripts/hooks/pre-push +++ b/scripts/hooks/pre-push @@ -1,5 +1,10 @@ #!/bin/bash # Pre-push: Don't allow commits without Signed-off-by. Skip with "git push --no-verify". + +# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2021 Álvaro Brey Vilas +# SPDX-License-Identifier: GPL-3.0-or-later + set -euo pipefail z40=0000000000000000000000000000000000000000 # magic deleted ref