ShuriZma
/
SameBoy
mirror of https://github.com/LIJI32/SameBoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow building against iOS ≥15 SDKs

This commit is contained in:
Lior Halphon 2023-01-28 23:34:11 +02:00
parent bbf6b66251
commit 0cf3aec939
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/GBSlotButton.h
View File

@ -3,6 +3,6 @@
@interface GBSlotButton : UIButton
+ (instancetype)buttonWithLabelText:(NSString *)label;
@property (readonly) UILabel *label;
@property (readonly) UILabel *subtitleLabel;
@property (readonly) UILabel *slotSubtitleLabel;
@property (nonatomic, getter=isShowingMenu) bool showingMenu;
@end

28
iOS/GBSlotButton.m
View File

@ -11,23 +11,23 @@
if (!ret) return nil;
ret.frame = CGRectMake(0, 0, 0x100, 0x100);
ret->_subtitleLabel = [[UILabel alloc] init];
ret->_subtitleLabel.text = @"Empty";
ret->_subtitleLabel.font = [UIFont systemFontOfSize:UIFont.smallSystemFontSize];
ret->_slotSubtitleLabel = [[UILabel alloc] init];
ret->_slotSubtitleLabel.text = @"Empty";
ret->_slotSubtitleLabel.font = [UIFont systemFontOfSize:UIFont.smallSystemFontSize];
if (@available(iOS 13.0, *)) {
ret->_subtitleLabel.textColor = [UIColor secondaryLabelColor];
ret->_slotSubtitleLabel.textColor = [UIColor secondaryLabelColor];
}
else {
ret->_subtitleLabel.textColor = [UIColor systemGrayColor];
ret->_slotSubtitleLabel.textColor = [UIColor systemGrayColor];
}
[ret->_subtitleLabel sizeToFit];
ret->_subtitleLabel.textAlignment = NSTextAlignmentCenter;
CGRect subtitleLabelRect = ret->_subtitleLabel.frame;
subtitleLabelRect.size.width = 0x100;
subtitleLabelRect.origin.y = 0x100 - subtitleLabelRect.size.height - 8;
ret->_subtitleLabel.frame = subtitleLabelRect;
ret->_subtitleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
[ret addSubview:ret->_subtitleLabel];
[ret->_slotSubtitleLabel sizeToFit];
ret->_slotSubtitleLabel.textAlignment = NSTextAlignmentCenter;
CGRect slotSubtitleLabelRect = ret->_slotSubtitleLabel.frame;
slotSubtitleLabelRect.size.width = 0x100;
slotSubtitleLabelRect.origin.y = 0x100 - slotSubtitleLabelRect.size.height - 8;
ret->_slotSubtitleLabel.frame = slotSubtitleLabelRect;
ret->_slotSubtitleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
[ret addSubview:ret->_slotSubtitleLabel];
ret->_label = [[UILabel alloc] init];
ret->_label.text = labelText;
@ -35,7 +35,7 @@
ret->_label.textAlignment = NSTextAlignmentCenter;
CGRect labelRect = ret->_label.frame;
labelRect.size.width = 0x100;
labelRect.origin.y = subtitleLabelRect.origin.y - labelRect.size.height - 4;
labelRect.origin.y = slotSubtitleLabelRect.origin.y - labelRect.size.height - 4;
ret->_label.frame = labelRect;
ret->_label.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
[ret addSubview:ret->_label];

8
iOS/GBStatesViewController.m
View File

@ -16,11 +16,11 @@
NSDate *date = [[[NSFileManager defaultManager] attributesOfItemAtPath:stateFile error:nil] fileModificationDate];
if (@available(iOS 13.0, *)) {
if ((uint64_t)(date.timeIntervalSince1970) == (uint64_t)([NSDate now].timeIntervalSince1970)) {
view.subtitleLabel.text = @"Just now";
view.slotSubtitleLabel.text = @"Just now";
}
else {
NSRelativeDateTimeFormatter *formatter = [[NSRelativeDateTimeFormatter alloc] init];
view.subtitleLabel.text = [formatter localizedStringForDate:date relativeToDate:[NSDate now]];
view.slotSubtitleLabel.text = [formatter localizedStringForDate:date relativeToDate:[NSDate now]];
}
}
else {
@ -28,13 +28,13 @@
formatter.timeStyle = kCFDateFormatterShortStyle;
formatter.dateStyle = NSDateFormatterShortStyle;
formatter.doesRelativeDateFormatting = true;
view.subtitleLabel.text = [formatter stringFromDate:date];
view.slotSubtitleLabel.text = [formatter stringFromDate:date];
}
view.imageView.image = [UIImage imageWithContentsOfFile:[stateFile stringByAppendingPathExtension:@"png"]];
}
else {
view.subtitleLabel.text = @"Empty";
view.slotSubtitleLabel.text = @"Empty";
view.imageView.image = nil;
}
}