menuSection icon image compatibility
This commit is contained in:
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"filename" : "arcade.stick.console.svg",
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--Generator: Apple Native CoreSVG 341-->
|
||||
<!DOCTYPE svg
|
||||
PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 29.6836 18.877">
|
||||
<g>
|
||||
<rect height="18.877" opacity="0" width="29.6836" x="0" y="0"/>
|
||||
<path d="M4.72218 18.877L24.6001 18.877C28.0523 18.877 29.6831 16.8262 29.2485 13.2324L28.1792 4.37988C27.8374 1.50391 26.27 0 23.6235 0L5.69874 0C3.05226 0 1.47999 1.50391 1.13819 4.37988L0.068857 13.2324C-0.365713 16.8262 1.26515 18.877 4.72218 18.877ZM4.72218 16.3574C3.11573 16.3574 2.3589 15.2393 2.58351 13.3594L3.63819 4.68262C3.80909 3.2666 4.5171 2.51953 5.69874 2.51953L23.6235 2.51953C24.8052 2.51953 25.5083 3.2666 25.6792 4.68262L26.729 13.3594C26.9634 15.2441 26.2017 16.3574 24.6001 16.3574Z" fill="white" fill-opacity="0.85"/>
|
||||
<path d="M8.1255 12.0996C8.60401 12.0996 8.95558 11.8799 8.95558 11.5527L8.95558 8.9502C9.88331 8.62305 10.5523 7.72949 10.5523 6.67969C10.5523 5.3418 9.46339 4.24805 8.1255 4.24805C6.78272 4.24805 5.68897 5.34668 5.68897 6.67969C5.68897 7.73438 6.3628 8.62793 7.3003 8.95996L7.3003 11.5527C7.3003 11.8799 7.65186 12.0996 8.1255 12.0996ZM8.13038 14.375C10.2153 14.375 11.6753 13.2471 11.6753 11.665C11.6753 10.5908 10.9966 9.73145 9.92726 9.28223L9.92726 10.8252C10.1763 11.04 10.3228 11.3281 10.3228 11.665C10.3228 12.5537 9.42921 13.1689 8.13038 13.1689C6.82667 13.1689 5.92335 12.5537 5.92335 11.665C5.92335 11.3232 6.06983 11.0303 6.32862 10.8154L6.32862 9.28711C5.2544 9.72168 4.57569 10.5908 4.57569 11.665C4.57569 13.2471 6.04542 14.375 8.13038 14.375ZM13.8384 8.8623C14.6929 8.8623 15.3618 8.19824 15.3618 7.34863C15.3618 6.49902 14.6929 5.8252 13.8384 5.8252C12.9985 5.8252 12.3198 6.49902 12.3198 7.34863C12.3198 8.19824 12.9985 8.8623 13.8384 8.8623ZM18.0669 8.8623C18.9116 8.8623 19.5903 8.19824 19.5903 7.34863C19.5903 6.49902 18.9116 5.8252 18.0669 5.8252C17.2173 5.8252 16.5435 6.49902 16.5435 7.34863C16.5435 8.19824 17.2173 8.8623 18.0669 8.8623ZM22.2661 8.8623C23.1157 8.8623 23.7896 8.19824 23.7896 7.34863C23.7896 6.49902 23.1157 5.8252 22.2661 5.8252C21.4263 5.8252 20.7427 6.49902 20.7427 7.34863C20.7427 8.19824 21.4263 8.8623 22.2661 8.8623ZM15.1372 13.0664C15.9868 13.0664 16.6558 12.4023 16.6558 11.5527C16.6558 10.7031 15.9868 10.0293 15.1372 10.0293C14.2925 10.0293 13.6138 10.7031 13.6138 11.5527C13.6138 12.4023 14.2925 13.0664 15.1372 13.0664ZM19.3608 13.0664C20.2105 13.0664 20.8843 12.4023 20.8843 11.5527C20.8843 10.7031 20.2105 10.0293 19.3608 10.0293C18.5161 10.0293 17.8423 10.7031 17.8423 11.5527C17.8423 12.4023 18.5161 13.0664 19.3608 13.0664ZM23.5698 13.0664C24.4194 13.0664 25.0933 12.4023 25.0933 11.5527C25.0933 10.7031 24.4194 10.0293 23.5698 10.0293C22.7251 10.0293 22.0513 10.7031 22.0513 11.5527C22.0513 12.4023 22.7251 13.0664 23.5698 13.0664Z" fill="white" fill-opacity="0.85"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.9 KiB |
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"filename" : "cable.connector.video.svg",
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--Generator: Apple Native CoreSVG 341-->
|
||||
<!DOCTYPE svg
|
||||
PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24.0283 24.3945">
|
||||
<g>
|
||||
<rect height="24.3945" opacity="0" width="24.0283" x="0" y="0"/>
|
||||
<path d="M10.2734 5.60547L6.15234 5.60547C4.63867 5.60547 3.48145 6.74805 3.48145 8.2666C3.48145 9.79004 4.63379 10.9277 6.15234 10.9277L17.5098 10.9277C20.498 10.9277 22.6904 13.125 22.6904 16.1182C22.6904 19.0967 20.498 21.2842 17.5098 21.2842L14.0234 21.2842L14.0234 18.7744L17.5098 18.7744C19.0283 18.7744 20.1758 17.6318 20.1758 16.1182C20.1758 14.5947 19.0332 13.4473 17.5098 13.4473L6.15234 13.4473C3.16406 13.4473 0.966797 11.2549 0.966797 8.2666C0.966797 5.2832 3.16406 3.09082 6.15234 3.09082L10.2734 3.09082Z" fill="white" fill-opacity="0.85"/>
|
||||
<path d="M13.0518 18.7256L13.0518 21.3379C13.0518 22.2852 12.6562 22.6855 11.709 22.6855L6.15723 22.6855C5.20996 22.6855 4.81934 22.2852 4.81934 21.3379L4.81934 18.7256C4.81934 17.7783 5.21484 17.373 6.15723 17.373L11.709 17.373C12.6514 17.373 13.0518 17.7783 13.0518 18.7256ZM3.85254 21.4404L1.85059 21.4404C1.27441 21.4404 0.966797 21.1328 0.966797 20.5469L0.966797 19.5166C0.966797 18.9355 1.27441 18.6279 1.85059 18.6279L3.85254 18.6279Z" fill="white" fill-opacity="0.85"/>
|
||||
<path d="M12.6611 7.72949L16.958 7.72949C17.8662 7.72949 18.374 7.23145 18.374 6.3623L18.374 2.34375C18.374 1.47461 17.8857 0.97168 16.9824 0.97168L12.6611 0.97168C11.7676 0.97168 11.2451 1.47461 11.2451 2.34375L11.2451 6.41113C11.2451 7.28027 11.7529 7.72949 12.6611 7.72949ZM19.3652 5.67383L20.6689 6.77246C20.8643 6.93848 21.0449 7.06055 21.25 7.06055C21.5918 7.06055 21.8262 6.82129 21.8262 6.45508L21.8262 2.29004C21.8262 1.92871 21.5918 1.68945 21.25 1.68945C21.0449 1.68945 20.8691 1.80664 20.6689 1.96777L19.3652 3.07617Z" fill="white" fill-opacity="0.85"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.0 KiB |
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"filename" : "flask.svg",
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--Generator: Apple Native CoreSVG 341-->
|
||||
<!DOCTYPE svg
|
||||
PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 20.1758 21.7578">
|
||||
<g>
|
||||
<rect height="21.7578" opacity="0" width="20.1758" x="0" y="0"/>
|
||||
<path d="M2.88086 21.7188L16.9336 21.7188C18.6816 21.7188 19.8145 20.4199 19.8145 18.8428C19.8145 18.335 19.6289 17.7393 19.248 17.1484L13.7354 8.39844L12.0166 9.80957L17.2412 18.0762C17.3633 18.2666 17.373 18.4619 17.373 18.5938C17.373 19.0723 17.0264 19.5068 16.4893 19.5068L3.3252 19.5068C2.77832 19.5068 2.44141 19.0723 2.44141 18.5938C2.44141 18.4619 2.45117 18.2666 2.57324 18.0762L7.79297 9.80957L6.0791 8.39844L0.517578 17.2168C0.166016 17.7588 0 18.335 0 18.8428C0 20.4199 1.12793 21.7188 2.88086 21.7188ZM5.56641 9.80957L7.79297 9.80957L7.79297 1.09863L5.56641 1.09863ZM14.248 9.80957L14.248 1.09863L12.0166 1.09863L12.0166 9.80957ZM5.81543 2.2998L13.9941 2.2998C14.6533 2.2998 15.1514 1.78223 15.1514 1.14258C15.1514 0.498047 14.6631 0 13.9941 0L5.81543 0C5.14648 0 4.66309 0.498047 4.66309 1.14258C4.66309 1.78223 5.15137 2.2998 5.81543 2.2998ZM6.75781 5.02441L9.54102 5.02441C9.91699 5.02441 10.2002 4.73633 10.2002 4.35547C10.2002 3.99902 9.90723 3.70605 9.53613 3.70605L6.75781 3.70605ZM6.76758 7.68555L9.5459 7.68555C9.92188 7.68555 10.2051 7.39258 10.2051 7.01172C10.2051 6.65527 9.91211 6.36719 9.54102 6.36719L6.76758 6.36719ZM6.76758 10.3418L9.5459 10.3418C9.92188 10.3418 10.2051 10.0537 10.2051 9.67285C10.2051 9.31641 9.91699 9.02344 9.5459 9.02344L6.76758 9.02344Z" fill="white" fill-opacity="0.85"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
@@ -200,13 +200,17 @@
|
||||
|
||||
- (void)setSectionWithIcon:(UIImage *)icon andSize:(CGFloat)size{
|
||||
if (@available(iOS 13.0, *)) {
|
||||
UIImageSymbolConfiguration *config = [UIImageSymbolConfiguration configurationWithPointSize:size weight:UIImageSymbolWeightBold];
|
||||
UIImageSymbolConfiguration *config;
|
||||
if(icon.isSymbolImage) config = [UIImageSymbolConfiguration configurationWithPointSize:size weight:UIImageSymbolWeightBold];
|
||||
else{
|
||||
config = [UIImageSymbolConfiguration configurationWithPointSize:size];
|
||||
icon = [icon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
|
||||
}
|
||||
_iconImageView.image = [icon imageWithConfiguration:config];
|
||||
|
||||
} else {
|
||||
_iconImageView.image = icon;
|
||||
}
|
||||
|
||||
_iconImageView.tintColor = [ThemeManager textColor];
|
||||
_iconImageView.hidden = (icon == nil);
|
||||
[self updateLayout];
|
||||
}
|
||||
|
||||
@@ -407,7 +407,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
MenuSectionView *videoSection = [[MenuSectionView alloc] init];
|
||||
videoSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Video"];
|
||||
if (@available(iOS 13.0, *)) {
|
||||
[videoSection setSectionWithIcon:[UIImage systemImageNamed:@"video.and.waveform"] andSize:20.5];
|
||||
[videoSection setSectionWithIcon:[UIImage systemImageNamed:@"waveform"] andSize:20];
|
||||
}
|
||||
[self addSetting:self.resolutionStack ofId:@"resolutionStack" withInfoTag:YES to:videoSection];
|
||||
[self addSetting:self.fpsStack ofId:@"fpsStack" withInfoTag:NO to:videoSection];
|
||||
@@ -419,19 +419,19 @@ BOOL isCustomResolution(CGSize res) {
|
||||
[videoSection addToParentStack:parentStack];
|
||||
[videoSection setExpanded:NO];
|
||||
|
||||
MenuSectionView *touchInputSection = [[MenuSectionView alloc] init];
|
||||
touchInputSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Touch Input"];
|
||||
MenuSectionView *touchControlSection = [[MenuSectionView alloc] init];
|
||||
touchControlSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Touch Control"];
|
||||
if (@available(iOS 13.0, *)) {
|
||||
[touchInputSection setSectionWithIcon:[UIImage systemImageNamed:@"viewfinder.circle"] andSize:21.5];
|
||||
[touchControlSection setSectionWithIcon:[UIImage imageNamed:@"arcade.stick.console"] andSize:20.5];
|
||||
}
|
||||
[self addSetting:self.touchModeStack ofId:@"touchModeStack" withInfoTag:YES to:touchInputSection];
|
||||
[self addSetting:self.pointerVelocityDividerStack ofId:@"pointerVelocityDividerStack" withInfoTag:YES to:touchInputSection];
|
||||
[self addSetting:self.pointerVelocityFactorStack ofId:@"pointerVelocityFactorStack" withInfoTag:YES to:touchInputSection];
|
||||
[self addSetting:self.mousePointerVelocityStack ofId:@"mousePointerVelocityStack" withInfoTag:YES to:touchInputSection];
|
||||
[self addSetting:self.onScreenWidgetStack ofId:@"onScreenWidgetStack" withInfoTag:YES to:touchInputSection];
|
||||
[self addSetting:self.swapAbaxyStack ofId:@"swapAbaxyStack" withInfoTag:NO to:touchInputSection];
|
||||
[touchInputSection addToParentStack:parentStack];
|
||||
[touchInputSection setExpanded:NO];
|
||||
[self addSetting:self.touchModeStack ofId:@"touchModeStack" withInfoTag:YES to:touchControlSection];
|
||||
[self addSetting:self.pointerVelocityDividerStack ofId:@"pointerVelocityDividerStack" withInfoTag:YES to:touchControlSection];
|
||||
[self addSetting:self.pointerVelocityFactorStack ofId:@"pointerVelocityFactorStack" withInfoTag:YES to:touchControlSection];
|
||||
[self addSetting:self.mousePointerVelocityStack ofId:@"mousePointerVelocityStack" withInfoTag:YES to:touchControlSection];
|
||||
[self addSetting:self.onScreenWidgetStack ofId:@"onScreenWidgetStack" withInfoTag:YES to:touchControlSection];
|
||||
[self addSetting:self.swapAbaxyStack ofId:@"swapAbaxyStack" withInfoTag:NO to:touchControlSection];
|
||||
[touchControlSection addToParentStack:parentStack];
|
||||
[touchControlSection setExpanded:NO];
|
||||
|
||||
|
||||
|
||||
@@ -454,7 +454,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
MenuSectionView *peripheralSection = [[MenuSectionView alloc] init];
|
||||
peripheralSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Peripherals"];
|
||||
if (@available(iOS 13.0, *)) {
|
||||
[peripheralSection setSectionWithIcon:[UIImage systemImageNamed:@"airplayvideo"] andSize:20.5];
|
||||
[peripheralSection setSectionWithIcon:[UIImage imageNamed:@"cable.connector.video"] andSize:20];
|
||||
}
|
||||
[self addSetting:self.externalDisplayModeStack ofId:@"externalDisplayModeStack" withInfoTag:NO to:peripheralSection];
|
||||
[self addSetting:self.localMousePointerModeStack ofId:@"localMousePointerModeStack" withInfoTag:NO to:peripheralSection];
|
||||
@@ -482,7 +482,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
MenuSectionView *experimentalSection = [[MenuSectionView alloc] init];
|
||||
experimentalSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Experimental"];
|
||||
if (@available(iOS 13.0, *)) {
|
||||
[experimentalSection setSectionWithIcon:[UIImage systemImageNamed:@"flask"] andSize:20];
|
||||
[experimentalSection setSectionWithIcon:[UIImage imageNamed:@"flask"] andSize:20];
|
||||
}
|
||||
[self addSetting:self.asyncTouchStack ofId:@"asyncTouchStack" withInfoTag:YES to:experimentalSection];
|
||||
[self addSetting:self.touchMoveEventIntervalStack ofId:@"touchMoveEventIntervalStack" withInfoTag:YES to:experimentalSection];
|
||||
|
||||
Reference in New Issue
Block a user