diff --git a/CMakeLists.txt b/CMakeLists.txt index 39dcd106e6..e3bf616845 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2975,7 +2975,7 @@ if(IOS AND NOT LIBRETRO) else() set(BUNDLE_IDENTIFIER "org.ppsspp.ppssppgold") endif() - set(ICON_NAME "GoldIcon") + set(ICON_NAME "PPSSPPGold") set(DISPLAY_NAME "PPSSPP Gold") else() if(IOS_APP_STORE) @@ -3039,6 +3039,7 @@ if(IOS AND NOT LIBRETRO) XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID} XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Development" XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic" + XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS YES XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym" XCODE_ATTRIBUTE_DEPLOYMENT_POSTPROCESSING[variant=Release] "YES" diff --git a/Core/System.cpp b/Core/System.cpp index c5871176ee..7d2ae4904b 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -717,6 +717,7 @@ void PSP_Shutdown(bool success) { IncrementDebugCounter(DebugCounter::GAME_SHUTDOWN); } +// Do not use. Currently only used from the websocket debugger BootState PSP_Reboot(std::string *error_string) { if (g_bootState != BootState::Complete) { return g_bootState; diff --git a/ios/IAPManager.mm b/ios/IAPManager.mm index 6cf6c2c27f..505cb2c3a9 100644 --- a/ios/IAPManager.mm +++ b/ios/IAPManager.mm @@ -56,6 +56,7 @@ _pendingRequestID = requestID; if ([SKPaymentQueue canMakePayments]) { + NSLog(@"[IAPManager] Starting buy request (requestID: %d)", requestID); NSSet *productIds = [NSSet setWithObject:@"org.ppsspp.gold"]; SKProductsRequest *request = [[SKProductsRequest alloc] initWithProductIdentifiers:productIds]; request.delegate = self; @@ -77,7 +78,8 @@ return; } _pendingRequestID = requestID; - INFO_LOG(Log::IAP, "Restoring purchases (id=%d)", requestID); + + NSLog(@"Restoring purchases (id=%d)", requestID); // NOTE: This is deprecated, but StoreKit 2 is swift only. We'll keep using it until // there's a replacement. [[SKPaymentQueue defaultQueue] restoreCompletedTransactions]; @@ -90,16 +92,22 @@ - (void)paymentQueueRestoreCompletedTransactionsFinished:(SKPaymentQueue *)queue { NSLog(@"Restore completed successfully (requestID: %d)", _pendingRequestID); - g_requestManager.PostSystemSuccess(_pendingRequestID, "", 0); - _pendingRequestID = 0; + // Probably not necessary, we already got the updatedTransactions notification + // and posted success. Though maybe we shouldn't do it there, but here instead. + if (_pendingRequestID != 0) { + g_requestManager.PostSystemSuccess(_pendingRequestID, "", 0); + _pendingRequestID = 0; + } // Notify your app/UI here } - (void)paymentQueue:(SKPaymentQueue *)queue restoreCompletedTransactionsFailedWithError:(NSError *)error { NSLog(@"Restore failed (requestID: %d): %@", _pendingRequestID, error.localizedDescription); // Notify failure to game layer - g_requestManager.PostSystemFailure(_pendingRequestID); - _pendingRequestID = 0; + if (_pendingRequestID != 0) { + g_requestManager.PostSystemFailure(_pendingRequestID); + _pendingRequestID = 0; + } } - (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response { @@ -120,7 +128,7 @@ switch (transaction.transactionState) { case SKPaymentTransactionStatePurchased: case SKPaymentTransactionStateRestored: - INFO_LOG(Log::IAP, transaction.transactionState == SKPaymentTransactionStatePurchased ? "IAP Purchase" : "IAP Restore"); + NSLog(transaction.transactionState == SKPaymentTransactionStatePurchased ? @"IAP Purchase" : @"IAP Restore"); // Perform the unlock (updaing the variable and switching the icon). [self unlockGold]; [[SKPaymentQueue defaultQueue] finishTransaction:transaction]; @@ -165,7 +173,7 @@ static bool SafeStringEqual(NSString *a, NSString *b) { - (void)updateIcon:(bool)force { NSString *desiredIcon = nil; if ([self isGoldUnlocked]) { - desiredIcon = @"GoldIcon"; + desiredIcon = @"PPSSPPGold"; } NSLog(@"updateIcon called with %@", desiredIcon); diff --git a/ios/PPSSPP-Info.plist b/ios/PPSSPP-Info.plist index fa346e5a9f..bbc2f42837 100644 --- a/ios/PPSSPP-Info.plist +++ b/ios/PPSSPP-Info.plist @@ -39,16 +39,6 @@ CFBundleIconName AppIcon - CFBundleAlternateIcons - - GoldIcon - - CFBundleIconName - GoldIcon - UIPrerenderedIcon - - - LSRequiresIPhoneOS diff --git a/ios/assets.xcassets/GoldIcon.appiconset/Contents.json b/ios/assets.xcassets/GoldIcon.appiconset/Contents.json deleted file mode 100644 index fa8ed8d8b2..0000000000 --- a/ios/assets.xcassets/GoldIcon.appiconset/Contents.json +++ /dev/null @@ -1,503 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "size": "20x20", - "scale": "1x", - "filename": "icon_20x20@1x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "20x20", - "scale": "2x", - "filename": "icon_20x20@2x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "20x20", - "scale": "3x", - "filename": "icon_20x20@3x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "1x", - "filename": "icon_29x29@1x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "2x", - "filename": "icon_29x29@2x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "3x", - "filename": "icon_29x29@3x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "1x", - "filename": "icon_40x40@1x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "2x", - "filename": "icon_40x40@2x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "3x", - "filename": "icon_40x40@3x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "60x60", - "scale": "2x", - "filename": "icon_60x60@2x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "60x60", - "scale": "3x", - "filename": "icon_60x60@3x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "76x76", - "scale": "1x", - "filename": "icon_76x76@1x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "76x76", - "scale": "2x", - "filename": "icon_76x76@2x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "83.5x83.5", - "scale": "2x", - "filename": "icon_83x83@2x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "1024x1024", - "scale": "1x", - "filename": "icon_1024x1024@1x_light.png", - "platform": "ios" - }, - { - "idiom": "universal", - "size": "20x20", - "scale": "1x", - "filename": "icon_20x20@1x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "20x20", - "scale": "2x", - "filename": "icon_20x20@2x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "20x20", - "scale": "3x", - "filename": "icon_20x20@3x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "1x", - "filename": "icon_29x29@1x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "2x", - "filename": "icon_29x29@2x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "3x", - "filename": "icon_29x29@3x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "1x", - "filename": "icon_40x40@1x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "2x", - "filename": "icon_40x40@2x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "3x", - "filename": "icon_40x40@3x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "60x60", - "scale": "2x", - "filename": "icon_60x60@2x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "60x60", - "scale": "3x", - "filename": "icon_60x60@3x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "76x76", - "scale": "1x", - "filename": "icon_76x76@1x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "76x76", - "scale": "2x", - "filename": "icon_76x76@2x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "83.5x83.5", - "scale": "2x", - "filename": "icon_83x83@2x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "1024x1024", - "scale": "1x", - "filename": "icon_1024x1024@1x_dark.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ] - }, - { - "idiom": "universal", - "size": "20x20", - "scale": "1x", - "filename": "icon_20x20@1x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "20x20", - "scale": "2x", - "filename": "icon_20x20@2x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "20x20", - "scale": "3x", - "filename": "icon_20x20@3x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "1x", - "filename": "icon_29x29@1x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "2x", - "filename": "icon_29x29@2x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "29x29", - "scale": "3x", - "filename": "icon_29x29@3x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "1x", - "filename": "icon_40x40@1x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "2x", - "filename": "icon_40x40@2x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "40x40", - "scale": "3x", - "filename": "icon_40x40@3x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "60x60", - "scale": "2x", - "filename": "icon_60x60@2x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "60x60", - "scale": "3x", - "filename": "icon_60x60@3x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "76x76", - "scale": "1x", - "filename": "icon_76x76@1x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "76x76", - "scale": "2x", - "filename": "icon_76x76@2x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "83.5x83.5", - "scale": "2x", - "filename": "icon_83x83@2x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - }, - { - "idiom": "universal", - "size": "1024x1024", - "scale": "1x", - "filename": "icon_1024x1024@1x_tinted.png", - "platform": "ios", - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ] - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_dark.png deleted file mode 100644 index 4bf45d12c1..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_light.png deleted file mode 100644 index 81d9d4f14f..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_tinted.png deleted file mode 100644 index 82a06d89a0..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@1x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_dark.png deleted file mode 100644 index 566faa70ab..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_light.png deleted file mode 100644 index 4d9df51fd7..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_tinted.png deleted file mode 100644 index 1f5b97a86a..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@2x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_dark.png deleted file mode 100644 index 56e48fc0bb..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_light.png deleted file mode 100644 index dbed09331a..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_tinted.png deleted file mode 100644 index 2ecb96a5fe..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_20x20@3x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_dark.png deleted file mode 100644 index 6899f1df39..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_light.png deleted file mode 100644 index 11ed2c937f..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_tinted.png deleted file mode 100644 index 3a975c89f8..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@1x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_dark.png deleted file mode 100644 index 12323de9b9..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_light.png deleted file mode 100644 index f6f5d8626d..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_tinted.png deleted file mode 100644 index 9acc6e084b..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@2x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_dark.png deleted file mode 100644 index e5185b1d72..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_light.png deleted file mode 100644 index f23fa1312a..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_tinted.png deleted file mode 100644 index c8a66acffc..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_29x29@3x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_dark.png deleted file mode 100644 index 566faa70ab..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_light.png deleted file mode 100644 index 4d9df51fd7..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_tinted.png deleted file mode 100644 index 1f5b97a86a..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@1x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_dark.png deleted file mode 100644 index a6b0f3d604..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_light.png deleted file mode 100644 index 033fac200d..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_tinted.png deleted file mode 100644 index aecce34a9c..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@2x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_dark.png deleted file mode 100644 index 29736c4e85..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_light.png deleted file mode 100644 index f34aaea10e..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_tinted.png deleted file mode 100644 index 1db5139b9f..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_40x40@3x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_dark.png deleted file mode 100644 index 29736c4e85..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_light.png deleted file mode 100644 index f34aaea10e..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_tinted.png deleted file mode 100644 index 1db5139b9f..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@2x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_dark.png deleted file mode 100644 index dfeba6b4bb..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_light.png deleted file mode 100644 index d7eaa6cfd0..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_tinted.png deleted file mode 100644 index db87615992..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_60x60@3x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_dark.png deleted file mode 100644 index 603844630c..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_light.png deleted file mode 100644 index 0d267b8d81..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_tinted.png deleted file mode 100644 index e2da6633d3..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@1x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_dark.png deleted file mode 100644 index ec4a03b9d4..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_light.png deleted file mode 100644 index 971289c5e4..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_tinted.png deleted file mode 100644 index 33d8000273..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_76x76@2x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_dark.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_dark.png deleted file mode 100644 index 52e87eafc4..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_dark.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_light.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_light.png deleted file mode 100644 index 6e5b6db891..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_light.png and /dev/null differ diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_tinted.png b/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_tinted.png deleted file mode 100644 index daa43542c0..0000000000 Binary files a/ios/assets.xcassets/GoldIcon.appiconset/icon_83x83@2x_tinted.png and /dev/null differ diff --git a/ios/assets.xcassets/PPSSPPGold.appiconset/Contents.json b/ios/assets.xcassets/PPSSPPGold.appiconset/Contents.json new file mode 100644 index 0000000000..e7caf13b0d --- /dev/null +++ b/ios/assets.xcassets/PPSSPPGold.appiconset/Contents.json @@ -0,0 +1,38 @@ +{ + "images" : [ + { + "filename" : "icon_1024x1024@1x_light.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icon_1024x1024@1x_dark.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "filename" : "icon_1024x1024@1x_tinted.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_1024x1024@1x_dark.png b/ios/assets.xcassets/PPSSPPGold.appiconset/icon_1024x1024@1x_dark.png similarity index 100% rename from ios/assets.xcassets/GoldIcon.appiconset/icon_1024x1024@1x_dark.png rename to ios/assets.xcassets/PPSSPPGold.appiconset/icon_1024x1024@1x_dark.png diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_1024x1024@1x_light.png b/ios/assets.xcassets/PPSSPPGold.appiconset/icon_1024x1024@1x_light.png similarity index 100% rename from ios/assets.xcassets/GoldIcon.appiconset/icon_1024x1024@1x_light.png rename to ios/assets.xcassets/PPSSPPGold.appiconset/icon_1024x1024@1x_light.png diff --git a/ios/assets.xcassets/GoldIcon.appiconset/icon_1024x1024@1x_tinted.png b/ios/assets.xcassets/PPSSPPGold.appiconset/icon_1024x1024@1x_tinted.png similarity index 100% rename from ios/assets.xcassets/GoldIcon.appiconset/icon_1024x1024@1x_tinted.png rename to ios/assets.xcassets/PPSSPPGold.appiconset/icon_1024x1024@1x_tinted.png diff --git a/ios/generate_icons.py b/ios/generate_icons.py index 7db9f315f2..66a5e5d325 100644 --- a/ios/generate_icons.py +++ b/ios/generate_icons.py @@ -9,7 +9,7 @@ icons = { "tinted": "tinted.png" } -output_dir = "AppIconGold.appiconset" +output_dir = "IconGold.appiconset" os.makedirs(output_dir, exist_ok=True) # Sizes and scales required by iOS @@ -74,4 +74,4 @@ contents = { with open(os.path.join(output_dir, "Contents.json"), "w") as f: json.dump(contents, f, indent=4) -print("✅ AppIconGold asset catalog with light, dark and tinted appearances generated.") +print("✅ IconGold asset catalog with light, dark and tinted appearances generated.")