SameBoy | Accurate GB/GBC emulator |
| download: https://git.y1.nz/archives/sameboy.tar.gz | |
| README | Files | Log | Refs | LICENSE |
commit 062d44e0653110c1237534d5ded1954a539eafdb parent f33f3f695178a8a08603ba4cd0fab49b393602aa Author: Lior Halphon <LIJI32@gmail.com> Date: Fri, 20 Sep 2024 17:50:15 +0300 Allow import and export of palettes Diffstat:
| M | iOS/GBPalettePicker.h | 1 | + |
| M | iOS/GBPalettePicker.m | 218 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- |
| M | iOS/GBViewController.m | 67 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | iOS/Info.plist | 31 | +++++++++++++++++++++++++++++++ |
4 files changed, 295 insertions(+), 22 deletions(-)
diff --git a/iOS/GBPalettePicker.h b/iOS/GBPalettePicker.h @@ -3,5 +3,6 @@ @interface GBPalettePicker : UITableViewController + (const GB_palette_t *)paletteForTheme:(NSString *)theme; ++ (bool)importPalette:(NSString *)path; @end diff --git a/iOS/GBPalettePicker.m b/iOS/GBPalettePicker.m @@ -1,14 +1,30 @@ #import "GBPalettePicker.h" +#import <CoreServices/CoreServices.h> -@interface GBPalettePicker () -{ - NSArray <NSString *>* _cacheNames; - NSIndexPath *_renamingPath; -} +/* TODO: Unify with Cocoa? */ +#define MAGIC 'SBPL' + +typedef struct __attribute__ ((packed)) { + uint32_t magic; + bool manual:1; + bool disabled_lcd_color:1; + unsigned padding:6; + struct GB_color_s colors[5]; + int32_t brightness_bias; + uint32_t hue_bias; + uint32_t hue_bias_strength; +} theme_t; + +@interface GBPalettePicker () <UIDocumentPickerDelegate> @end @implementation GBPalettePicker +{ + NSArray <NSString *>* _cacheNames; + NSIndexPath *_renamingPath; + NSMutableSet *_tempFiles; +} + (const GB_palette_t *)paletteForTheme:(NSString *)theme { @@ -78,6 +94,7 @@ { self = [super initWithStyle:style]; self.navigationItem.rightBarButtonItem = self.editButtonItem; + _tempFiles = [NSMutableSet set]; return self; } @@ -89,7 +106,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { if (section == 0) return 4; - if (section == 2) return 1; + if (section == 2) return 2; _cacheNames = [[[NSUserDefaults standardUserDefaults] dictionaryForKey:@"GBThemes"].allKeys sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)]; return _cacheNames.count; } @@ -100,7 +117,15 @@ NSString *name = nil; if (indexPath.section == 2) { - cell.textLabel.text = @"Restore Defaults"; + switch (indexPath.row) { + case 0: + cell.textLabel.text = @"Import Palette"; + break; + case 1: + cell.textLabel.text = @"Restore Defaults"; + cell.textLabel.textColor = [UIColor systemRedColor]; + break; + } return cell; } else if (indexPath.section == 0) { @@ -125,23 +150,60 @@ } + +- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentAtURL:(NSURL *)url +{ + [url startAccessingSecurityScopedResource]; + if ([self.class importPalette:url.path]) { + [self.tableView reloadData]; + } + else { + UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Import Failed" + message:@"The imported palette file is invalid." + preferredStyle:UIAlertControllerStyleAlert]; + [alertController addAction:[UIAlertAction actionWithTitle:@"Close" style:UIAlertActionStyleDefault handler:nil]]; + [self presentViewController:alertController animated:true completion:nil]; + return; + } + [url stopAccessingSecurityScopedResource]; +} + - (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.section == 2) { - UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Restore default palettes?" - message: @"The defaults palettes will be restored, changes will be reverted, and created or imported palettes will be deleted. This change cannot be undone." - preferredStyle:UIAlertControllerStyleAlert]; - [alert addAction:[UIAlertAction actionWithTitle:@"Restore" - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *action) { - [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"GBCurrentTheme"]; - [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"GBThemes"]; - [self.tableView reloadData]; - }]]; - [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" - style:UIAlertActionStyleCancel - handler:nil]]; - [self presentViewController:alert animated:true completion:nil]; + switch (indexPath.row) { + case 0: { + [self setEditing:false animated:true]; + NSString *sbpUTI = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)@"sbp", NULL); + + + UIDocumentPickerViewController *picker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:@[sbpUTI] + inMode:UIDocumentPickerModeImport]; + if (@available(iOS 13.0, *)) { + picker.shouldShowFileExtensions = true; + } + picker.delegate = self; + [self presentViewController:picker animated:true completion:nil]; + break; + } + case 1: { + UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Restore default palettes?" + message: @"The defaults palettes will be restored, changes will be reverted, and created or imported palettes will be deleted. This change cannot be undone." + preferredStyle:UIAlertControllerStyleAlert]; + [alert addAction:[UIAlertAction actionWithTitle:@"Restore" + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *action) { + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"GBCurrentTheme"]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"GBThemes"]; + [self.tableView reloadData]; + }]]; + [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" + style:UIAlertActionStyleCancel + handler:nil]]; + [self presentViewController:alert animated:true completion:nil]; + break; + } + } } [[NSUserDefaults standardUserDefaults] setObject:[self.tableView cellForRowAtIndexPath:indexPath].textLabel.text @@ -251,7 +313,92 @@ return indexPath.section == 1; } -// Leave these ROM management to iOS 13.0 and up for now +- (NSString *)exportTheme:(NSString *)name +{ + theme_t theme = {0,}; + theme.magic = MAGIC; + + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSDictionary *themeDict = [defaults dictionaryForKey:@"GBThemes"][name]; + NSArray *colors = themeDict[@"Colors"]; + if (colors.count <= 5) { + unsigned i = 0; + for (NSNumber *color in colors) { + uint32_t c = [color unsignedIntValue]; + theme.colors[i++] = (struct GB_color_s){ + (c & 0xFF), + ((c >> 8) & 0xFF), + ((c >> 16) & 0xFF)}; + } + } + + theme.manual = [themeDict[@"Manual"] boolValue]; + theme.disabled_lcd_color = [themeDict[@"DisabledLCDColor"] boolValue]; + + theme.brightness_bias = ([themeDict[@"BrightnessBias"] doubleValue] * 0x40000000); + theme.hue_bias = round([themeDict[@"HueBias"] doubleValue] * 0x80000000); + theme.hue_bias_strength = round([themeDict[@"HueBiasStrength"] doubleValue] * 0x80000000); + + size_t size = sizeof(theme); + if (theme.manual) { + size = theme.disabled_lcd_color? 5 + 5 * sizeof(theme.colors[0]) : 5 + 4 * sizeof(theme.colors[0]); + } + + NSString *path = [[NSTemporaryDirectory() stringByAppendingPathComponent:name] stringByAppendingPathExtension:@"sbp"]; + [[NSData dataWithBytes:&theme length:size] writeToFile:path atomically:false]; + [_tempFiles addObject:path]; + return path; +} + ++ (bool)importPalette:(NSString *)path +{ + NSData *data = [NSData dataWithContentsOfFile:path]; + theme_t theme = {0,}; + memcpy(&theme, data.bytes, MIN(sizeof(theme), data.length)); + if (theme.magic != MAGIC) { + return false; + } + + NSMutableDictionary *themeDict = [NSMutableDictionary dictionary]; + themeDict[@"Manual"] = theme.manual? @YES : @NO; + themeDict[@"DisabledLCDColor"] = theme.disabled_lcd_color? @YES : @NO; + unsigned i = 0; + +#define COLOR_TO_INT(color) ((color.r << 0) | (color.g << 8) | (color.b << 16) | 0xFF000000) + themeDict[@"Colors"] = @[ + @(COLOR_TO_INT(theme.colors[0])), + @(COLOR_TO_INT(theme.colors[1])), + @(COLOR_TO_INT(theme.colors[2])), + @(COLOR_TO_INT(theme.colors[3])), + @(COLOR_TO_INT(theme.colors[theme.disabled_lcd_color? 4 : 3])), + ]; + + + themeDict[@"DisabledLCDColor"] = @(theme.brightness_bias / 0x40000000); + themeDict[@"HueBias"] = @(theme.hue_bias / 0x80000000); + themeDict[@"HueBiasStrength"] = @(theme.hue_bias_strength / 0x80000000); + + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSMutableDictionary *themes = [defaults dictionaryForKey:@"GBThemes"].mutableCopy; + NSString *baseName = path.lastPathComponent.stringByDeletingPathExtension; + NSString *newName = baseName; + i = 2; + NSArray *builtins = @[ + @"Greyscale", + @"Lime (Game Boy)", + @"Olive (Pocket)", + @"Teal (Light)", + ]; + + while (themes[newName] || [builtins containsObject:newName]) { + newName = [NSString stringWithFormat:@"%@ %d", baseName, i++]; + } + themes[newName] = themeDict; + [defaults setObject:themes forKey:@"GBThemes"]; + [defaults setObject:newName forKey:@"GBCurrentTheme"]; + return true; +} + - (UIContextMenuConfiguration *)tableView:(UITableView *)tableView contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath point:(CGPoint)point API_AVAILABLE(ios(13.0)) @@ -269,8 +416,28 @@ contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath commitEditingStyle:UITableViewCellEditingStyleDelete forRowAtIndexPath:indexPath]; }]; + deleteAction.attributes = UIMenuElementAttributesDestructive; return [UIMenu menuWithTitle:nil children:@[ + [UIAction actionWithTitle:@"Share" + image:[UIImage systemImageNamed:@"square.and.arrow.up"] + identifier:nil + handler:^(__kindof UIAction *action) { + [self setEditing:false animated:true]; + UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath]; + NSString *file = [self exportTheme:cell.textLabel.text]; + NSURL *url = [NSURL fileURLWithPath:file]; + UIActivityViewController *controller = [[UIActivityViewController alloc] initWithActivityItems:@[url] + applicationActivities:nil]; + + if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad) { + controller.popoverPresentationController.sourceView = cell.contentView; + } + + [self presentViewController:controller + animated:true + completion:nil]; + }], [UIAction actionWithTitle:@"Rename" image:[UIImage systemImageNamed:@"pencil"] identifier:nil @@ -282,4 +449,11 @@ contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath }]; } +- (void)dealloc +{ + for (NSString *file in _tempFiles) { + [[NSFileManager defaultManager] removeItemAtPath:file error:nil]; + } +} + @end diff --git a/iOS/GBViewController.m b/iOS/GBViewController.m @@ -1400,11 +1400,78 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response return validURLs.count; } +- (void)doImportedPaletteNotification +{ + UIVisualEffectView *effectView = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleProminent]]; + effectView.layer.cornerRadius = 8; + effectView.layer.masksToBounds = true; + [self.view addSubview:effectView]; + UILabel *tipLabel = [[UILabel alloc] init]; + tipLabel.text = [NSString stringWithFormat:@"Imported palette “%@”", [[NSUserDefaults standardUserDefaults] stringForKey:@"GBCurrentTheme"]]; + if (@available(iOS 13.0, *)) { + tipLabel.textColor = [UIColor labelColor]; + } + tipLabel.font = [UIFont systemFontOfSize:16]; + tipLabel.alpha = 0.8; + [effectView.contentView addSubview:tipLabel]; + + UIView *view = self.view; + CGSize outerSize = view.frame.size; + CGSize size = [tipLabel textRectForBounds:(CGRect){{0, 0}, + {outerSize.width - 32, + outerSize.height - 32}} + limitedToNumberOfLines:1].size; + size.width = ceil(size.width); + tipLabel.frame = (CGRect){{8, 8}, size}; + CGRect finalFrame = (CGRect) { + {round((outerSize.width - size.width - 16) / 2), view.window.safeAreaInsets.top + 12}, + {size.width + 16, size.height + 16} + }; + + CGRect initFrame = finalFrame; + initFrame.origin.y = -initFrame.size.height; + effectView.frame = initFrame; + + effectView.alpha = 0; + [UIView animateWithDuration:0.5 animations:^{ + effectView.alpha = 1.0; + effectView.frame = finalFrame; + }]; + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(NSEC_PER_SEC * 1.5)), dispatch_get_main_queue(), ^{ + [UIView animateWithDuration:0.5 animations:^{ + effectView.alpha = 0.0; + effectView.frame = initFrame; + } completion:^(BOOL finished) { + if (finished) { + [effectView removeFromSuperview]; + } + }]; + }); + +} + - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options { if (self.presentedViewController && ![self.presentedViewController isKindOfClass:[UIAlertController class]]) { [self dismissViewController]; } + if ([url.pathExtension.lowercaseString isEqual:@"sbp"]) { + [url startAccessingSecurityScopedResource]; + bool success = [GBPalettePicker importPalette:url.path]; + [url stopAccessingSecurityScopedResource]; + if (!success) { + UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Palette Import Failed" + message:@"The imported palette file is invalid." + preferredStyle:UIAlertControllerStyleAlert]; + [alertController addAction:[UIAlertAction actionWithTitle:@"Close" style:UIAlertActionStyleDefault handler:nil]]; + [self presentViewController:alertController animated:true completion:nil]; + } + else { + [self doImportedPaletteNotification]; + } + return success; + } NSString *potentialROM = [[url.path stringByDeletingLastPathComponent] lastPathComponent]; if ([[[GBROMManager sharedManager] romFileForROM:potentialROM].stringByStandardizingPath isEqualToString:url.path.stringByStandardizingPath]) { [self stop]; diff --git a/iOS/Info.plist b/iOS/Info.plist @@ -124,6 +124,20 @@ <key>LSHandlerRank</key> <string>Alternate</string> </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>sbp</string> + </array> + <key>CFBundleTypeName</key> + <string>SameBoy Palette</string> + <key>LSItemContentTypes</key> + <array> + <string>com.github.liji32.sameboy.sbp</string> + </array> + <key>LSHandlerRank</key> + <string>Owner</string> + </dict> </array> <key>UTExportedTypeDeclarations</key> <array> @@ -195,6 +209,23 @@ </array> </dict> </dict> + <dict> + <key>UTTypeConformsTo</key> + <array> + <string>public.data</string> + </array> + <key>UTTypeDescription</key> + <string>SameBoy Palette</string> + <key>UTTypeIdentifier</key> + <string>com.github.liji32.sameboy.sbp</string> + <key>UTTypeTagSpecification</key> + <dict> + <key>public.filename-extension</key> + <array> + <string>sbp</string> + </array> + </dict> + </dict> </array> <key>UIDeviceFamily</key> <array>
This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.