From 8feeb33a55a5c95c27abd3ef8799801d6ddadf29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toni=20F=C3=B6rster?= Date: Tue, 27 Aug 2024 15:45:54 +0200 Subject: [PATCH] distinguish between iOS and macOS AppIcons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Toni Förster --- Yattee.xcodeproj/project.pbxproj | 8 ++++---- .../Contents.json | 0 .../Dark.png | Bin .../Light.png | Bin .../Tinted.png | Bin .../Contents.json | 0 .../icon_128x128.png | Bin .../icon_128x128@2x.png | Bin .../icon_16x16.png | Bin .../icon_16x16@2x.png | Bin .../icon_256x256.png | Bin .../icon_256x256@2x.png | Bin .../icon_32x32.png | Bin .../icon_32x32@2x.png | Bin .../icon_512x512.png | Bin .../icon_512x512@2x.png | Bin 16 files changed, 4 insertions(+), 4 deletions(-) rename iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon iOS.appiconset}/Contents.json (100%) rename iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon iOS.appiconset}/Dark.png (100%) rename iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon iOS.appiconset}/Light.png (100%) rename iOS/Assets.xcassets/{AppIcon.appiconset => AppIcon iOS.appiconset}/Tinted.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/Contents.json (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_128x128.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_128x128@2x.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_16x16.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_16x16@2x.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_256x256.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_256x256@2x.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_32x32.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_32x32@2x.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_512x512.png (100%) rename macOS/Assets.xcassets/{AppIcon.appiconset => AppIcon macOS.appiconset}/icon_512x512@2x.png (100%) diff --git a/Yattee.xcodeproj/project.pbxproj b/Yattee.xcodeproj/project.pbxproj index a3d8a1d3..a1e12fc1 100644 --- a/Yattee.xcodeproj/project.pbxproj +++ b/Yattee.xcodeproj/project.pbxproj @@ -4350,7 +4350,7 @@ 37D4B0ED2671614900C925CA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon iOS"; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CODE_SIGN_ENTITLEMENTS = "iOS/Yattee (iOS).entitlements"; @@ -4402,7 +4402,7 @@ 37D4B0EE2671614900C925CA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon iOS"; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS/Yattee (iOS).entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; @@ -4453,7 +4453,7 @@ 37D4B0F02671614900C925CA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon macOS"; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = Shared/Yattee.entitlements; @@ -4491,7 +4491,7 @@ 37D4B0F12671614900C925CA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon macOS"; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = Shared/Yattee.entitlements; diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/iOS/Assets.xcassets/AppIcon iOS.appiconset/Contents.json similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to iOS/Assets.xcassets/AppIcon iOS.appiconset/Contents.json diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/Dark.png b/iOS/Assets.xcassets/AppIcon iOS.appiconset/Dark.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/Dark.png rename to iOS/Assets.xcassets/AppIcon iOS.appiconset/Dark.png diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/Light.png b/iOS/Assets.xcassets/AppIcon iOS.appiconset/Light.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/Light.png rename to iOS/Assets.xcassets/AppIcon iOS.appiconset/Light.png diff --git a/iOS/Assets.xcassets/AppIcon.appiconset/Tinted.png b/iOS/Assets.xcassets/AppIcon iOS.appiconset/Tinted.png similarity index 100% rename from iOS/Assets.xcassets/AppIcon.appiconset/Tinted.png rename to iOS/Assets.xcassets/AppIcon iOS.appiconset/Tinted.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/macOS/Assets.xcassets/AppIcon macOS.appiconset/Contents.json similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/Contents.json diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_128x128.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_128x128.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_128x128.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_128x128@2x.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_128x128@2x.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_16x16.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_16x16.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_16x16.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_16x16@2x.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_16x16@2x.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_256x256.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_256x256.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_256x256.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_256x256@2x.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_256x256@2x.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_32x32.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_32x32.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_32x32.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_32x32@2x.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_32x32@2x.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_512x512.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_512x512.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_512x512.png diff --git a/macOS/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_512x512@2x.png similarity index 100% rename from macOS/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png rename to macOS/Assets.xcassets/AppIcon macOS.appiconset/icon_512x512@2x.png