diff --git a/Limelight/Images.xcassets/arcade.stick.console.imageset/Contents.json b/Limelight/Images.xcassets/arcade.stick.console.imageset/Contents.json
new file mode 100644
index 00000000..9e025112
--- /dev/null
+++ b/Limelight/Images.xcassets/arcade.stick.console.imageset/Contents.json
@@ -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
+ }
+}
diff --git a/Limelight/Images.xcassets/arcade.stick.console.imageset/arcade.stick.console.svg b/Limelight/Images.xcassets/arcade.stick.console.imageset/arcade.stick.console.svg
new file mode 100644
index 00000000..f4e1f6d5
--- /dev/null
+++ b/Limelight/Images.xcassets/arcade.stick.console.imageset/arcade.stick.console.svg
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/Limelight/Images.xcassets/cable.connector.video.imageset/Contents.json b/Limelight/Images.xcassets/cable.connector.video.imageset/Contents.json
new file mode 100644
index 00000000..0276d0f6
--- /dev/null
+++ b/Limelight/Images.xcassets/cable.connector.video.imageset/Contents.json
@@ -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
+ }
+}
diff --git a/Limelight/Images.xcassets/cable.connector.video.imageset/cable.connector.video.svg b/Limelight/Images.xcassets/cable.connector.video.imageset/cable.connector.video.svg
new file mode 100644
index 00000000..3d507739
--- /dev/null
+++ b/Limelight/Images.xcassets/cable.connector.video.imageset/cable.connector.video.svg
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/Limelight/Images.xcassets/flask.imageset/Contents.json b/Limelight/Images.xcassets/flask.imageset/Contents.json
new file mode 100644
index 00000000..1ef51122
--- /dev/null
+++ b/Limelight/Images.xcassets/flask.imageset/Contents.json
@@ -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
+ }
+}
diff --git a/Limelight/Images.xcassets/flask.imageset/flask.svg b/Limelight/Images.xcassets/flask.imageset/flask.svg
new file mode 100644
index 00000000..c6188f99
--- /dev/null
+++ b/Limelight/Images.xcassets/flask.imageset/flask.svg
@@ -0,0 +1,11 @@
+
+
+
+
diff --git a/Limelight/MenuSectionView.m b/Limelight/MenuSectionView.m
index ff2a99b8..9def58e6 100644
--- a/Limelight/MenuSectionView.m
+++ b/Limelight/MenuSectionView.m
@@ -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];
}
diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m
index a5acf610..ff6a8376 100644
--- a/Limelight/ViewControllers/SettingsViewController.m
+++ b/Limelight/ViewControllers/SettingsViewController.m
@@ -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];