iOS: Simplify gold icon setup. Change name of the icon.

This commit is contained in:
Henrik Rydgård
2025-06-03 16:06:37 +02:00
parent 722d065417
commit 03dcd95d69
50 changed files with 55 additions and 521 deletions
+2 -1
View File
@@ -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"
+15 -7
View File
@@ -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);
-10
View File
@@ -39,16 +39,6 @@
<key>CFBundleIconName</key>
<string>AppIcon</string>
</dict>
<key>CFBundleAlternateIcons</key>
<dict>
<key>GoldIcon</key>
<dict>
<key>CFBundleIconName</key>
<string>GoldIcon</string>
<key>UIPrerenderedIcon</key>
<false/>
</dict>
</dict>
</dict>
<key>LSRequiresIPhoneOS</key>
<true/>
@@ -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"
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

@@ -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
}
}

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 96 KiB

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 134 KiB

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 71 KiB