Skip to content

Commit

Permalink
Merge pull request #12688 from nextcloud/feature/12687/updateMimeType…
Browse files Browse the repository at this point in the history 
…Icons

Update mimetype icons
  • Loading branch information
@AndyScherzinger
AndyScherzinger authored Mar 21, 2024
2 parents fb24a1c + 61344b0 commit 818af1a
Show file tree
Hide file tree
Showing 13 changed files with 105 additions and 120 deletions.
Binary file modified .../debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepBoth.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepExisting.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...y/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepNew.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...owncloud.android.ui.activity.ConflictsResolveActivityIT_screenshotTextFiles.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testBottomSheet.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 10 additions & 23 deletions app/src/main/res/drawable/file_analytics.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
<!--
Nextcloud Android client application
Copyright (C) 2023 Nextcloud.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or 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: 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"
android:viewportHeight="16">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#49ABEA"
android:fillType="nonZero"
android:pathData="M2.5,1L11,1L14,4L14,14.5C14,14.78 13.78,15 13.5,15L2.5,15C2.22,15 2,14.78 2,14.5L2,1.5C2,1.22 2.22,1 2.5,1ZM5.126,8.72L6.698,6.972C6.751,6.987 6.808,6.996 6.866,6.996C6.966,6.996 7.06,6.971 7.143,6.927L8.562,7.992C8.554,8.03 8.55,8.07 8.55,8.11C8.55,8.439 8.821,8.71 9.15,8.71C9.479,8.71 9.75,8.439 9.75,8.11C9.75,8.071 9.746,8.032 9.738,7.995L11.166,6.932C11.246,6.973 11.338,6.996 11.434,6.996C11.763,6.996 12.034,6.725 12.034,6.396C12.032,6.068 11.762,5.798 11.434,5.796C11.105,5.796 10.834,6.067 10.834,6.396C10.834,6.417 10.835,6.438 10.837,6.458L9.391,7.562C9.317,7.529 9.235,7.511 9.15,7.511C9.063,7.511 8.981,7.529 8.906,7.563L7.459,6.483C7.464,6.454 7.466,6.426 7.466,6.396C7.464,6.068 7.194,5.798 6.866,5.796C6.537,5.796 6.266,6.067 6.266,6.396C6.266,6.459 6.276,6.52 6.294,6.577L4.696,8.38C4.659,8.372 4.621,8.368 4.582,8.368C4.253,8.368 3.982,8.639 3.982,8.968C3.982,9.296 4.253,9.567 4.582,9.567C4.911,9.567 5.182,9.296 5.182,8.968C5.181,8.879 5.161,8.796 5.126,8.72ZM8.58,9.852L8.58,12.993L9.722,12.993L9.722,9.852L8.58,9.852ZM6.294,8.71L6.294,12.993L7.436,12.993L7.436,8.71L6.294,8.71ZM4.01,10.709L4.01,12.993L5.152,12.993L5.152,10.709L4.01,10.709ZM10.864,8.71L10.864,12.993L12.006,12.993L12.006,8.71L10.864,8.71Z" />
android:fillColor="#b39114"
android:pathData="M18,18H12V12.21C11.34,12.82 10.47,13.2 9.5,13.2C7.46,13.2 5.8,11.54 5.8,9.5A3.7,3.7 0 0,1 9.5,5.8C11.54,5.8 13.2,7.46 13.2,9.5C13.2,10.47 12.82,11.34 12.21,12H18M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
</vector>
35 changes: 14 additions & 21 deletions app/src/main/res/drawable/file_doc.xml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
<!--
Nextcloud Android client application
Copyright (C) 2020 Nextcloud.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or 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/>.
Icon provided by Android Material Library in Apache License 2.0
~ Nextcloud - Android Client
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector android:height="72dp" android:viewportHeight="16"
android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#49abea" android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3h-8.5zM4,3h6v1h-6v-1zM4,6h5v1h-5v-1zM4,9h8v1h-8v-1zM4,12h4v1h-4v-1z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="#49abea"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#49abea"
android:pathData="M14,2L6,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,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z" />
</vector>
19 changes: 15 additions & 4 deletions app/src/main/res/drawable/file_image.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
<vector android:height="24dp" android:tint="#969696"
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="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
<!--
~ 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"
android:tint="#969696">
<path
android:fillColor="@android:color/white"
android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.9,13.98l2.1,2.53 3.1,-3.99c0.2,-0.26 0.6,-0.26 0.8,0.01l3.51,4.68c0.25,0.33 0.01,0.8 -0.4,0.8H6.02c-0.42,0 -0.65,-0.48 -0.39,-0.81L8.12,14c0.19,-0.26 0.57,-0.27 0.78,-0.02z"/>
</vector>
37 changes: 10 additions & 27 deletions app/src/main/res/drawable/file_movie.xml
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,16 @@
<!--
~ Nextcloud - Android Client
~
~ Nextcloud Android client application
~
~ @author Tobias Kaminsky
~ Copyright (C) 2022 Tobias Kaminsky
~ Copyright (C) 2022 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/>.
-->
<!-- downloaded from https://fonts.google.com/icons?selected=Material+Icons:videocam: -->
<vector android:autoMirrored="true"
~ 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:viewportHeight="24"
android:viewportWidth="24"
android:tint="#969696"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000000"
android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z" />
android:fillColor="#969696"
android:pathData="M18,4l2,4h-3l-2,-4h-2l2,4h-3l-2,-4H8l2,4H7L5,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,-2V4h-4z" />
</vector>
47 changes: 11 additions & 36 deletions app/src/main/res/drawable/file_pdf.xml
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,16 @@
<!--
~ Nextcloud - Android Client
~
~ Nextcloud Android client application
~
~ @author Tobias Kaminsky
~ Copyright (C) 2020 Tobias Kaminsky
~ Copyright (C) 2020 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/>.
-->

<vector
android:height="16dp"
android:viewportHeight="16"
android:viewportWidth="16"
android:width="16dp"
xmlns:android="http://schemas.android.com/apk/res/android">
~ 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:tint="#dc5047"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#dc5047"
android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3z" />
<path
android:fillColor="#fff"
android:pathData="m4.9093,8.443v1.057h-0.6181v-3h1.1703q0.3379,0 0.5934,0.1236 0.2576,0.1236 0.3956,0.3523 0.1381,0.2266 0.1381,0.5172 0,0.4409 -0.3029,0.6964 -0.3008,0.2534 -0.8345,0.2534zM4.9093,7.9423h0.5522q0.2452,0 0.3729,-0.1154 0.1298,-0.1154 0.1298,-0.3297 0,-0.2205 -0.1298,-0.3565t-0.3585,-0.1401h-0.5666z" />
<path
android:fillColor="#fff"
android:pathData="m7.011,9.5v-3h0.9231q0.3956,0 0.7067,0.1793 0.3132,0.1772 0.4883,0.5069 0.1751,0.3276 0.1751,0.7459v0.1381q0,0.4183 -0.1731,0.7438 -0.171,0.3255 -0.4842,0.5048 -0.3132,0.1793 -0.7067,0.1813zM7.6291,7.0007v2.0027h0.2988q0.3626,0 0.5543,-0.2369 0.1916,-0.2369 0.1957,-0.6779v-0.1586q0,-0.4574 -0.1896,-0.6923 -0.1896,-0.2369 -0.5543,-0.2369z" />
<path
android:fillColor="#fff"
android:pathData="m11.56,8.274h-1.1868v1.226h-0.6181v-3h1.9533v0.5007h-1.3352v0.7747h1.1868z" />
android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM11.5,9.5c0,0.83 -0.67,1.5 -1.5,1.5L9,11v1.25c0,0.41 -0.34,0.75 -0.75,0.75s-0.75,-0.34 -0.75,-0.75L7.5,8c0,-0.55 0.45,-1 1,-1L10,7c0.83,0 1.5,0.67 1.5,1.5v1zM16.5,11.5c0,0.83 -0.67,1.5 -1.5,1.5h-2c-0.28,0 -0.5,-0.22 -0.5,-0.5v-5c0,-0.28 0.22,-0.5 0.5,-0.5h2c0.83,0 1.5,0.67 1.5,1.5v3zM20.5,7.75c0,0.41 -0.34,0.75 -0.75,0.75L19,8.5v1h0.75c0.41,0 0.75,0.34 0.75,0.75s-0.34,0.75 -0.75,0.75L19,11v1.25c0,0.41 -0.34,0.75 -0.75,0.75s-0.75,-0.34 -0.75,-0.75L17.5,8c0,-0.55 0.45,-1 1,-1h1.25c0.41,0 0.75,0.34 0.75,0.75zM9,9.5h1v-1L9,8.5v1zM3,6c-0.55,0 -1,0.45 -1,1v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,20c-0.55,0 -1,-0.45 -1,-1L4,7c0,-0.55 -0.45,-1 -1,-1zM14,11.5h1v-3h-1v3z" />
</vector>
17 changes: 14 additions & 3 deletions app/src/main/res/drawable/file_ppt.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<vector android:height="72dp" android:viewportHeight="16"
android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#f0965f" android:pathData="m1.5,2c-0.25,0 -0.5,0.25 -0.5,0.5v11c0,0.25 0.25,0.5 0.5,0.5h13c0.25,0 0.5,-0.25 0.5,-0.5v-11c0,-0.25 -0.25,-0.5 -0.5,-0.5zM2,5h12v6h-12z"/>
<!--
~ 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="#f0965f"
android:pathData="M19,16H5V8H19M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
</vector>
19 changes: 16 additions & 3 deletions app/src/main/res/drawable/file_text.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
<vector android:height="72dp" android:viewportHeight="16"
android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#969696" android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3h-8.5zM4,3h6v1h-6v-1zM4,6h5v1h-5v-1zM4,9h8v1h-8v-1zM4,12h4v1h-4v-1z"/>
<!--
~ 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:autoMirrored="true"
android:tint="#969696"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/text_color"
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" />
</vector>
18 changes: 15 additions & 3 deletions app/src/main/res/drawable/file_xls.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
<vector android:height="72dp" android:viewportHeight="16"
android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#9abd4e" android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3h-8.5zM4,4h2v2h-2v-2zM7,4h5v2h-5v-2zM4,7h2v2h-2v-2zM7,7h5v2h-5v-2zM4,10h2v2h-2v-2zM7,10h5v2h-5v-2z"/>
<!--
~ Nextcloud - Android Client
~
~ SPDX-FileCopyrightText: 2024 Michael Irigoyen
~ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#9abd4e"
android:pathData="M19 3H5C3.89 3 3 3.89 3 5V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.89 20.1 3 19 3M9 18H6V16H9V18M9 15H6V13H9V15M9 12H6V10H9V12M13 18H10V16H13V18M13 15H10V13H13V15M13 12H10V10H13V12Z" />
</vector>

0 comments on commit 818af1a

Please sign in to comment.