Merge pull request #12831 from nextcloud/chore/noid/spdxHeader18

Add SPDX header

app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt

@@ -152,7 +152,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         OCShare(file.decryptedRemotePath).apply {
             remoteId = 7
             shareType = ShareType.CIRCLE
-            sharedWithDisplayName = "Personal circle"
+            sharedWithDisplayName = "Personal team"
             permissions = SHARE_PERMISSION_FLAG
             userId = getUserId(user)
             activity.storageManager.saveShare(this)
@@ -161,7 +161,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         OCShare(file.decryptedRemotePath).apply {
             remoteId = 8
             shareType = ShareType.CIRCLE
-            sharedWithDisplayName = "Public circle"
+            sharedWithDisplayName = "Public team"
             permissions = SHARE_PERMISSION_FLAG
             userId = getUserId(user)
             activity.storageManager.saveShare(this)
@@ -170,7 +170,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         OCShare(file.decryptedRemotePath).apply {
             remoteId = 9
             shareType = ShareType.CIRCLE
-            sharedWithDisplayName = "Closed circle"
+            sharedWithDisplayName = "Closed team"
             permissions = SHARE_PERMISSION_FLAG
             userId = getUserId(user)
             activity.storageManager.saveShare(this)
@@ -179,7 +179,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         OCShare(file.decryptedRemotePath).apply {
             remoteId = 10
             shareType = ShareType.CIRCLE
-            sharedWithDisplayName = "Secret circle"
+            sharedWithDisplayName = "Secret team"
             permissions = SHARE_PERMISSION_FLAG
             userId = getUserId(user)
             activity.storageManager.saveShare(this)

app/src/main/res/drawable-night/round_bgnd.xml

@@ -1,24 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Nextcloud Android client application
-
-    @author Andy Scherzinger
-    Copyright (C) 2019 Andy Scherzinger
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="oval">
-    <solid android:color="#222222"/>
+    android:shape="oval">
+    <solid android:color="#222222" />
 </shape>

app/src/main/res/drawable-night/shared_via_link.xml

@@ -1,36 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  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 <http://www.gnu.org/licenses/>.
-
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16.0"
-        android:viewportHeight="16.0">
-	<path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="0.0"
-        android:strokeMiterLimit="4"
-        android:pathData="M5.99 5.318a3.332 3.332 0 0 0 0 4.693c 0.116 0.118 0.226 0.22 0.355 0.315l1.383-1.383A1.4 1.4 0 0 1 7.33 6.66l3.352-3.352c 0.568-0.57 1.442-0.57 2.01 0s 0.57 1.442 0 2.01l-1.13 1.132c 0.34 0.725 0.464 1.518 0.377 2.304l2.094-2.095c1.288-1.29 1.288-3.406 0-4.694s-3.405-1.288-4.693 0L5.99 5.318z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="0.0"
-        android:strokeMiterLimit="4"
-        android:pathData="M10.01 10.68a3.332 3.332 0 0 0 0-4.692 3.126 3.126 0 0 0-0.355-0.314L8.272 7.057A1.4 1.4 0 0 1 8.67 9.34l-3.35 3.35c-0.57 0.57-1.444 0.57-2.013 0.002s-0.568-1.442 0-2.01L4.44 9.55a4.288 4.288 0 0 1-0.38-2.305L1.967 9.34c-1.288 1.29-1.288 3.405 0 4.693s3.405 1.29 4.693 0l3.35-3.352z"/>
-</vector>
+        android:fillColor="@android:color/white"
+        android:pathData="M440,680L280,680Q197,680 138.5,621.5Q80,563 80,480Q80,397 138.5,338.5Q197,280 280,280L440,280L440,360L280,360Q230,360 195,395Q160,430 160,480Q160,530 195,565Q230,600 280,600L440,600L440,680ZM320,520L320,440L640,440L640,520L320,520ZM520,680L520,600L680,600Q730,600 765,565Q800,530 800,480Q800,430 765,395Q730,360 680,360L520,360L520,280L680,280Q763,280 821.5,338.5Q880,397 880,480Q880,563 821.5,621.5Q763,680 680,680L520,680Z" />
+</vector>

app/src/main/res/drawable-night/shared_via_users.xml

@@ -1,30 +1,17 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  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 <http://www.gnu.org/licenses/>.
-
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16.0"
-        android:viewportHeight="16.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="0.2"
-        android:strokeMiterLimit="4"
-        android:pathData="M12.228 1a2.457 2.457 0 0 0-2.46 2.454c0 0.075 0.01 0.15 0.016 0.224L5.05 6.092a2.445 2.445 0 0 0-1.596-0.586A2.453 2.453 0 0 0 1 7.96a2.453 2.453 0 0 0 2.454 2.455 2.45 2.45 0 0 0 1.46-0.477l4.865 2.474c-0.004 0.044-0.01 0.09-0.01 0.134a2.457 2.457 0 1 0 0.804-1.818l-4.696-2.4c 0.02-0.123 0.035-0.25 0.035-0.378 0-0.072-0.01-0.144-0.015-0.214l4.74-2.414A2.457 2.457 0 1 0 12.228 0.99z"/>
-</vector>
+        android:pathData="M720,880Q670,880 635,845Q600,810 600,760Q600,753 601,745.5Q602,738 604,732L322,568Q305,583 284,591.5Q263,600 240,600Q190,600 155,565Q120,530 120,480Q120,430 155,395Q190,360 240,360Q263,360 284,368.5Q305,377 322,392L604,228Q602,222 601,214.5Q600,207 600,200Q600,150 635,115Q670,80 720,80Q770,80 805,115Q840,150 840,200Q840,250 805,285Q770,320 720,320Q697,320 676,311.5Q655,303 638,288L356,452Q358,458 359,465.5Q360,473 360,480Q360,487 359,494.5Q358,502 356,508L638,672Q655,657 676,648.5Q697,640 720,640Q770,640 805,675Q840,710 840,760Q840,810 805,845Q770,880 720,880Z"
+        android:strokeWidth="8"
+        android:strokeColor="#FF000000" />
+</vector>

app/src/main/res/drawable/ic_circles.xml

@@ -1,34 +1,18 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH, all rights reserved
-  ~ SPDX-FileCopyrightText: 2020-2024 Tobias Kaminsky <[email protected]>
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:width="64dp"
-    android:height="64dp"
+    android:width="24dp"
+    android:height="24dp"
     android:autoMirrored="true"
-    android:viewportWidth="57"
-    android:viewportHeight="57"
-    tools:ignore="VectorRaster">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
     <path
-        android:fillAlpha="1"
-        android:fillColor="#00000000"
-        android:pathData="M7.1,28.5A21.4,21.4 0,0 1,28.5 7.1m10.7,40A21.4,21.4 0,0 1,10 39M39.2,10A21.4,21.4 0,0 1,47 39.2"
-        android:strokeWidth="3.99979687"
-        android:strokeAlpha="1"
-        android:strokeColor="#000000"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M28.5,7.1m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M10,39.2m-0,-6.5a6.5,6.5 0,1 1,-0 13a6.5,6.5 0,1 1,-0 -13" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M47,39.2m-0,-6.5a6.5,6.5 0,1 1,-0 13a6.5,6.5 0,1 1,-0 -13" />
+        android:fillColor="#FF000000"
+        android:fillType="nonZero"
+        android:pathData="M0.99,17.505L0.99,16.06C0.99,15.402 1.327,14.867 2,14.454C2.672,14.041 3.559,13.835 4.66,13.835C4.859,13.835 5.05,13.839 5.234,13.846C5.417,13.854 5.593,13.873 5.761,13.904C5.548,14.225 5.387,14.562 5.28,14.913C5.172,15.264 5.119,15.631 5.119,16.014L5.119,17.505L0.99,17.505ZM6.495,17.505L6.495,16.014C6.495,15.525 6.629,15.077 6.897,14.673C7.164,14.267 7.543,13.911 8.032,13.606C8.521,13.3 9.106,13.071 9.787,12.917C10.467,12.764 11.205,12.688 12,12.688C12.81,12.688 13.556,12.764 14.237,12.917C14.917,13.071 15.502,13.3 15.991,13.606C16.48,13.911 16.855,14.267 17.115,14.673C17.374,15.077 17.505,15.525 17.505,16.014L17.505,17.505L6.495,17.505ZM18.881,17.505L18.881,16.014C18.881,15.617 18.831,15.241 18.732,14.89C18.632,14.539 18.484,14.209 18.285,13.904C18.452,13.873 18.625,13.854 18.801,13.846C18.976,13.839 19.156,13.835 19.34,13.835C20.441,13.835 21.328,14.038 22,14.443C22.673,14.848 23.01,15.387 23.01,16.06L23.01,17.505L18.881,17.505ZM4.66,12.917C4.156,12.917 3.724,12.738 3.365,12.379C3.005,12.019 2.825,11.587 2.825,11.083C2.825,10.562 3.005,10.127 3.365,9.775C3.724,9.424 4.156,9.248 4.66,9.248C5.181,9.248 5.616,9.424 5.968,9.775C6.319,10.127 6.495,10.562 6.495,11.083C6.495,11.587 6.319,12.019 5.968,12.379C5.616,12.738 5.181,12.917 4.66,12.917ZM19.34,12.917C18.835,12.917 18.403,12.738 18.044,12.379C17.685,12.019 17.505,11.587 17.505,11.083C17.505,10.562 17.685,10.127 18.044,9.775C18.403,9.424 18.835,9.248 19.34,9.248C19.86,9.248 20.296,9.424 20.647,9.775C20.998,10.127 21.175,10.562 21.175,11.083C21.175,11.587 20.998,12.019 20.647,12.379C20.296,12.738 19.86,12.917 19.34,12.917ZM12,12C11.236,12 10.585,11.732 10.05,11.197C9.516,10.662 9.248,10.012 9.248,9.248C9.248,8.468 9.516,7.815 10.05,7.287C10.585,6.759 11.236,6.495 12,6.495C12.78,6.495 13.434,6.759 13.962,7.287C14.489,7.815 14.752,8.468 14.752,9.248C14.752,10.012 14.489,10.662 13.962,11.197C13.434,11.732 12.78,12 12,12Z" />
 </vector>

app/src/main/res/drawable/ic_edit.xml

@@ -5,13 +5,13 @@
   ~ SPDX-FileCopyrightText: 2019 Nextcloud GmbH
   ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
+    android:autoMirrored="true"
     android:viewportWidth="24"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportHeight="24"
     tools:ignore="VectorRaster">
     <path
         android:fillColor="#FF000000"

app/src/main/res/drawable/ic_folder_overlay_account_group.xml

@@ -1,30 +1,15 @@
 <!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,5.5A3.5,3.5 0,0 1,15.5 9A3.5,3.5 0,0 1,12 12.5A3.5,3.5 0,0 1,8.5 9A3.5,3.5 0,0 1,12 5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0,0 1,2 11A3,3 0,0 1,5 8M19,8A3,3 0,0 1,22 11A3,3 0,0 1,19 14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,5.5A3.5,3.5 0,0 1,15.5 9A3.5,3.5 0,0 1,12 12.5A3.5,3.5 0,0 1,8.5 9A3.5,3.5 0,0 1,12 5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0,0 1,2 11A3,3 0,0 1,5 8M19,8A3,3 0,0 1,22 11A3,3 0,0 1,19 14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z" />
 </vector>

app/src/main/res/drawable/ic_folder_overlay_external.xml

@@ -1,30 +1,15 @@
 <!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V12H19V19Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V12H19V19Z" />
 </vector>

app/src/main/res/drawable/ic_folder_overlay_key.xml

@@ -1,30 +1,15 @@
 <!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M7,14C5.9,14 5,13.1 5,12S5.9,10 7,10 9,10.9 9,12 8.1,14 7,14M12.6,10C11.8,7.7 9.6,6 7,6C3.7,6 1,8.7 1,12S3.7,18 7,18C9.6,18 11.8,16.3 12.6,14H16V18H20V14H23V10H12.6Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7,14C5.9,14 5,13.1 5,12S5.9,10 7,10 9,10.9 9,12 8.1,14 7,14M12.6,10C11.8,7.7 9.6,6 7,6C3.7,6 1,8.7 1,12S3.7,18 7,18C9.6,18 11.8,16.3 12.6,14H16V18H20V14H23V10H12.6Z" />
 </vector>