gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 06:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3871 from nextcloud/bugfix/noid/spdxLogo

Browse Source 
fix: Have correct SPDX license header for logo/trademarked items
This commit is contained in:
Andy Scherzinger 2024-04-25 18:31:26 +02:00 committed by GitHub
commit dfb79da6a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LICENSES/LicenseRef-NextcloudTrademarks.txt Normal file
View File

@ -0,0 +1,9 @@
The Nextcloud marks
Nextcloud and the Nextcloud logo is a registered trademark of Nextcloud GmbH in Germany and/or other countries.
These guidelines cover the following marks pertaining both to the product names and the logo: “Nextcloud”
and the blue/white cloud logo with or without the word Nextcloud; the service “Nextcloud Enterprise”;
and our products: “Nextcloud Files”; “Nextcloud Groupware” and “Nextcloud Talk”.
This set of marks is collectively referred to as the “Nextcloud marks.”
Use of Nextcloud logos and other marks is only permitted under the guidelines provided by the Nextcloud GmbH.
A copy can be found at https://nextcloud.com/trademarks/

5
app/src/main/res/drawable/ic_launcher_foreground.xml
View File

@ -1,9 +1,8 @@
<!--
~ Nextcloud Talk - Android Client
~
~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors~
~ SPDX-FileCopyrightText: 2017-2019 Mario Danic <mario@lovelyhq.com>
~ SPDX-License-Identifier: GPL-3.0-or-later
~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"

4
app/src/main/res/drawable/ic_logo.xml
View File

@ -1,8 +1,8 @@
<!--
~ Nextcloud Talk - Android Client
~
~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH
~ SPDX-License-Identifier: GPL-3.0-or-later
~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"

4
app/src/main/res/drawable/ic_talk.xml
View File

@ -2,8 +2,8 @@
<!--
~ Nextcloud Talk - Android Client
~
~ SPDX-FileCopyrightText: Nextcloud GmbH. All rights reserved.
~ SPDX-License-Identifier: GPL-3.0-or-later
~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
-->
<vector android:autoMirrored="true"
android:height="24dp"

5
app/src/qa/res/drawable/ic_launcher_foreground.xml
View File

@ -1,9 +1,8 @@
<!--
~ Nextcloud Talk - Android Client
~
~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors~
~ SPDX-FileCopyrightText: 2017-2019 Mario Danic <mario@lovelyhq.com>
~ SPDX-License-Identifier: GPL-3.0-or-later
~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"