Fix user search provider icon

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

3 files changed, 8 insertions, 1 deletions

diff --git a/apps/settings/img/users-white.svg b/apps/settings/img/users-white.svg
new file mode 100644
index 00000000000..91d2a38c1a3
--- /dev/null
+++ b/apps/settings/img/users-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M10 1C8.25 1 7 2.43 7 3.8c0 1.4.1 2.4.8 3.5.2.29.5.35.7.6.135.5.24 1 .1 1.5-.28.1-.525.22-.8.33-.085-.15-.23-.2-.47-.4C6.6 8.89 5.77 8.58 5 8.29c-.1-.37-.1-.65 0-1 .156-.166.37-.27.5-.43.46-.6.5-1.654.5-2.37 0-1.06-.954-1.9-2-1.9-1.17 0-2 1-2 1.9 0 .93.034 1.64.5 2.37.13.2.367.26.5.43.1.33.1.654 0 1-.85.3-1.6.64-2.34 1.04-.57.4-.52.205-.66 1.53-.11 1.06 2.335 1.13 4 1.13h.17c-.054.274-.1.63-.17 1.3-.16 1.59 3.5 1.7 6 1.7s6.16-.1 6-1.7c-.215-2-.23-1.71-1-2.3-1.1-.654-2.45-1.17-3.6-1.6-.15-.56-.04-.97.1-1.5.235-.25.5-.36.7-.6.7-.885.8-2.425.8-3.5 0-1.6-1.43-2.8-3-2.8z" style="fill:#fff"/></svg>
\ No newline at end of file
diff --git a/apps/settings/img/users.svg b/apps/settings/img/users.svg
index c961c86207e..247f595bdbe 100644
--- a/apps/settings/img/users.svg
+++ b/apps/settings/img/users.svg
@@ -1 +1 @@
-<svg width="16" height="16" version="1.1" viewbox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m10 1c-1.75 0-3 1.43-3 2.8 0 1.4 0.1 2.4 0.8 3.5 0.2 0.29 0.5 0.35 0.7 0.6 0.135 0.5 0.24 1 0.1 1.5-0.28 0.1-0.525 0.22-0.8 0.33-0.085-0.15-0.23-0.2-0.47-0.4-0.73-0.44-1.56-0.75-2.33-1.04-0.1-0.37-0.1-0.65 0-1 0.156-0.166 0.37-0.27 0.5-0.43 0.46-0.6 0.5-1.654 0.5-2.37 0-1.06-0.954-1.9-2-1.9-1.17 0-2 1-2 1.9 0 0.93 0.034 1.64 0.5 2.37 0.13 0.2 0.367 0.26 0.5 0.43 0.1 0.33 0.1 0.654 0 1-0.85 0.3-1.6 0.64-2.34 1.04-0.57 0.4-0.52 0.205-0.66 1.53-0.11 1.06 2.335 1.13 4 1.13h0.17c-0.054 0.274-0.1 0.63-0.17 1.3-0.16 1.59 3.5 1.7 6 1.7s6.16-0.1 6-1.7c-0.215-2-0.23-1.71-1-2.3-1.1-0.654-2.45-1.17-3.6-1.6-0.15-0.56-0.04-0.97 0.1-1.5 0.235-0.25 0.5-0.36 0.7-0.6 0.7-0.885 0.8-2.425 0.8-3.5 0-1.6-1.43-2.8-3-2.8z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M10 1C8.25 1 7 2.43 7 3.8c0 1.4.1 2.4.8 3.5.2.29.5.35.7.6.135.5.24 1 .1 1.5-.28.1-.525.22-.8.33-.085-.15-.23-.2-.47-.4C6.6 8.89 5.77 8.58 5 8.29c-.1-.37-.1-.65 0-1 .156-.166.37-.27.5-.43.46-.6.5-1.654.5-2.37 0-1.06-.954-1.9-2-1.9-1.17 0-2 1-2 1.9 0 .93.034 1.64.5 2.37.13.2.367.26.5.43.1.33.1.654 0 1-.85.3-1.6.64-2.34 1.04-.57.4-.52.205-.66 1.53-.11 1.06 2.335 1.13 4 1.13h.17c-.054.274-.1.63-.17 1.3-.16 1.59 3.5 1.7 6 1.7s6.16-.1 6-1.7c-.215-2-.23-1.71-1-2.3-1.1-.654-2.45-1.17-3.6-1.6-.15-.56-.04-.97.1-1.5.235-.25.5-.36.7-.6.7-.885.8-2.425.8-3.5 0-1.6-1.43-2.8-3-2.8z"/></svg>
\ No newline at end of file
diff --git a/lib/private/Search/SearchComposer.php b/lib/private/Search/SearchComposer.php
index 0c465385a8c..b92fdd250d8 100644
--- a/lib/private/Search/SearchComposer.php
+++ b/lib/private/Search/SearchComposer.php
@@ -223,6 +223,12 @@ class SearchComposer {
 			[$appId, 'app.svg'],
 			['core', 'places/default-app-icon.svg'],
 		];
+		if ($appId === 'settings' && $providerId === 'users') {
+			// Conflict:
+			// the file /apps/settings/users.svg is already used in black version by top right user menu
+			// Override icon name here
+			$icons = [['settings', 'users-white.svg']];
+		}
 		foreach ($icons as $i => $icon) {
 			try {
 				return $this->urlGenerator->imagePath(... $icon);