Merge pull request #61918 from nextcloud/backport/61577/stable34

[stable34] fix(appstore): use proper app icon or adjust color if needed

Author: AndyScherzinger

apps/appstore/img/app-dark.svg

@@ -24,6 +24,10 @@ watch(() => app.icon, async () => {
 		const response = await fetch(app.icon)
 		if (response.ok) {
 			svgIcon.value = await response.text()
+			svgIcon.value = svgIcon.value
+				.replaceAll(/(?<=[";])fill:\s?(#fff(fff)?|white)(;|(?="))/gi, '')
+				.replaceAll(/(?<=\s)fill="[^"]+"/gi, '')
+				.replaceAll(/(?<=\s)color="[^"]+"/gi, '')
 		}
 	}
 }, { immediate: true })

apps/appstore/src/components/AppIcon.vue

@@ -437,22 +437,9 @@ public function listAllApps(): array {
 					$info['level'] = self::supportedApp;
 				}
 
-				try {
-					$appPath = $appManager->getAppPath($app);
-				} catch (AppPathNotFoundException) {
-					$appPath = false;
-				}
-				if ($appPath !== false) {
-					$appIcon = $appPath . '/img/' . $app . '.svg';
-					if (file_exists($appIcon)) {
-						$info['icon'] = $urlGenerator->imagePath($app, $app . '.svg');
-					} else {
-						$appIcon = $appPath . '/img/app.svg';
-						if (file_exists($appIcon)) {
-							$info['icon'] = $urlGenerator->imagePath($app, 'app.svg');
-						}
-					}
-				}
+				$info['icon'] = $appManager->getAppIcon($app, dark: true)
+					?? $appManager->getAppIcon($app);
+
 				// fix documentation
 				if (isset($info['documentation']) && is_array($info['documentation'])) {
 					foreach ($info['documentation'] as $key => $url) {