Zweite Megaupload

src/Desktop/AppIconResolver.php

@@ -36,25 +36,25 @@ final class AppIconResolver
     {
         return match ($skin) {
             'windows' => [
-                'welcome-center' => '/assets/desktop/skins/windows/vendor/windows-icons-merged/devices/monitors/monitor.ico',
-                'public-dashboard' => '/assets/desktop/skins/windows/vendor/windows-icons-merged/interface/symbols/internet.ico',
-                'workspace-manager' => '/assets/desktop/skins/windows/vendor/windows-icons-merged/folders/desktop.ico',
-                'admin-apps' => '/assets/desktop/skins/windows/vendor/windows-icons-merged/applications/settings.ico',
-                'desktop-login' => '/assets/desktop/skins/windows/vendor/windows-icons-merged/emblems/user.ico',
+                'welcome-center' => '/assets/desktop/skin-icons/windows/welcome-center.ico',
+                'public-dashboard' => '/assets/desktop/skin-icons/windows/public-dashboard.ico',
+                'workspace-manager' => '/assets/desktop/skin-icons/windows/workspace-manager.ico',
+                'admin-apps' => '/assets/desktop/skin-icons/windows/admin-apps.ico',
+                'desktop-login' => '/assets/desktop/skin-icons/windows/desktop-login.ico',
             ],
             'apple' => [
-                'welcome-center' => '/assets/desktop/skins/apple/vendor/MacTahoe/preferences/32/desktop.svg',
-                'public-dashboard' => '/assets/desktop/skins/apple/vendor/MacTahoe/preferences/32/applications-internet.svg',
-                'workspace-manager' => '/assets/desktop/skins/apple/vendor/MacTahoe/preferences/32/desktop.svg',
-                'admin-apps' => '/assets/desktop/skins/apple/vendor/MacTahoe/preferences/32/preferences-desktop.svg',
-                'desktop-login' => '/assets/desktop/skins/apple/vendor/MacTahoe/actions/24/im-user.svg',
+                'welcome-center' => '/assets/desktop/skin-icons/apple/welcome-center.svg',
+                'public-dashboard' => '/assets/desktop/skin-icons/apple/public-dashboard.svg',
+                'workspace-manager' => '/assets/desktop/skin-icons/apple/workspace-manager.svg',
+                'admin-apps' => '/assets/desktop/skin-icons/apple/admin-apps.svg',
+                'desktop-login' => '/assets/desktop/skin-icons/apple/desktop-login.svg',
             ],
             'linux' => [
-                'welcome-center' => '/assets/desktop/skins/linux/vendor/Mint-Relaxed-Icons/devices/64/computer.svg',
-                'public-dashboard' => '/assets/desktop/skins/linux/vendor/Mint-Relaxed-Icons/apps/48/applications-internet.svg',
-                'workspace-manager' => '/assets/desktop/skins/linux/vendor/Mint-Relaxed-Icons/places/16/folder-desktop.svg',
-                'admin-apps' => '/assets/desktop/skins/linux/vendor/Mint-Relaxed-Icons/apps/48/systemsettings.svg',
-                'desktop-login' => '/assets/desktop/skins/linux/vendor/Mint-Relaxed-Icons/actions/32/system-switch-user.svg',
+                'welcome-center' => '/assets/desktop/skin-icons/linux/welcome-center.svg',
+                'public-dashboard' => '/assets/desktop/skin-icons/linux/public-dashboard.svg',
+                'workspace-manager' => '/assets/desktop/skin-icons/linux/workspace-manager.svg',
+                'admin-apps' => '/assets/desktop/skin-icons/linux/admin-apps.svg',
+                'desktop-login' => '/assets/desktop/skin-icons/linux/desktop-login.svg',
             ],
             default => [],
         };

src/Desktop/SkinResolver.php

@@ -121,7 +121,7 @@ final class SkinResolver
 
     private static function skinsPath(): string
     {
-        return dirname(__DIR__, 2) . '/public/assets/desktop/skins';
+        return dirname(__DIR__, 2) . '/skins';
     }
 
     /**
@@ -129,12 +129,17 @@ final class SkinResolver
      */
     private static function assetManifest(string $skin): array
     {
-        $basePath = self::skinsPath() . '/' . $skin;
+        $publicBaseFsPath = self::publicSkinsPath() . '/' . $skin;
         $publicBasePath = '/assets/desktop/skins/' . $skin;
 
         return [
-            'css_path' => is_file($basePath . '/skin.css') ? $publicBasePath . '/skin.css' : null,
-            'js_path' => is_file($basePath . '/skin.js') ? $publicBasePath . '/skin.js' : null,
+            'css_path' => is_file($publicBaseFsPath . '/skin.css') ? $publicBasePath . '/skin.css' : null,
+            'js_path' => is_file($publicBaseFsPath . '/skin.js') ? $publicBasePath . '/skin.js' : null,
         ];
     }
+
+    private static function publicSkinsPath(): string
+    {
+        return dirname(__DIR__, 2) . '/public/assets/desktop/skins';
+    }
 }