mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-29 02:38:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12938 from nextcloud/chore/spdxLogoFix

Browse source 
Have correct SPDX license header for logo/trademarked items
This commit is contained in:
Andy Scherzinger 2024-04-25 18:25:53 +02:00 committed by GitHub
commit f58e7fc75a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.reuse/dep5
View file

@ -20,8 +20,8 @@ Copyright: 2015-2016 ownCloud Inc.
License: GPL-2.0-only License: GPL-2.0-only
Files: app/src/*/res/mipmap-*dpi/ic_launcher.png app/src/*/ic_launcher-web.png src/generic/fastlane/metadata/android/en-US/images/icon.png src/versionDev/fastlane/metadata/android/en-US/images/icon.png app/src/main/ic_launcher-web-round.png Files: app/src/*/res/mipmap-*dpi/ic_launcher.png app/src/*/ic_launcher-web.png src/generic/fastlane/metadata/android/en-US/images/icon.png src/versionDev/fastlane/metadata/android/en-US/images/icon.png app/src/main/ic_launcher-web-round.png
Copyright: 2017-2024 Nextcloud GmbH. All rights reserved. Trademarks apply, see https://nextcloud.com/trademarks/ Copyright: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
License: AGPL-3.0-or-later License: LicenseRef-NextcloudTrademarks
Files: .idea/* app/schemas/com.nextcloud.client.database.NextcloudDatabase/*.json app/screenshots/gplay/debug/*.png app/src/main/res/values-*/strings.xml src/*/fastlane/metadata/android/*/*.txt src/versionDev/fastlane/metadata/android/*/changelogs/*.txt app/src/androidTest/assets/* app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker app/src/*/google-services.json app/src/main/res/drawable-*dpi/checker_16_16.png app/src/main/res/raw/encryption_key_words.txt app/src/main/resources/ical4j.properties app/src/main/res/drawable-*dpi/apk.png app/src/main/res/drawable-*dpi/fdroid.png app/src/main/res/drawable-*dpi/playstore.png app/src/main/res/drawable-*dpi/background.png app/src/main/res/drawable-*dpi/background_nc18.png Files: .idea/* app/schemas/com.nextcloud.client.database.NextcloudDatabase/*.json app/screenshots/gplay/debug/*.png app/src/main/res/values-*/strings.xml src/*/fastlane/metadata/android/*/*.txt src/versionDev/fastlane/metadata/android/*/changelogs/*.txt app/src/androidTest/assets/* app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker app/src/*/google-services.json app/src/main/res/drawable-*dpi/checker_16_16.png app/src/main/res/raw/encryption_key_words.txt app/src/main/resources/ical4j.properties app/src/main/res/drawable-*dpi/apk.png app/src/main/res/drawable-*dpi/fdroid.png app/src/main/res/drawable-*dpi/playstore.png app/src/main/res/drawable-*dpi/background.png app/src/main/res/drawable-*dpi/background_nc18.png
Copyright: 2016-2024 Nextcloud GmbH and Nextcloud contributors Copyright: 2016-2024 Nextcloud GmbH and Nextcloud contributors

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 - Android Client ~ Nextcloud - Android Client
~ ~
~ SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH, all rights reserved ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
~ SPDX-FileCopyrightText: 2023-2024 Tobias Kaminsky <tobias@kaminsky.me> ~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
~ SPDX-License-Identifier: AGPL-3.0-or-later
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp" android:width="108dp"

5
app/src/main/res/drawable/logo.xml
View file

@ -1,9 +1,8 @@
<!-- <!--
~ Nextcloud - Android Client ~ Nextcloud - Android Client
~ ~
~ SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH, all rights reserved ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me> ~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
~ SPDX-License-Identifier: AGPL-3.0-or-later
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="200dp" android:width="200dp"