oh my 5ga

Signed-off-by: 82Flex <82flex@gmail.com>

Author: Lessica

Makefile

@@ -1,4 +1,4 @@
-export PACKAGE_VERSION := 2.0
+export PACKAGE_VERSION := 2.1
 
 ifeq ($(THEOS_DEVICE_SIMULATOR),1)
 TARGET := simulator:clang:latest:14.0

SingleVPN.x

@@ -37,6 +37,7 @@
 @property (nonatomic, copy) UIColor *textColor;
 @property (nonatomic, copy) UIColor *imageDimmedTintColor;
 @property (nonatomic, copy) UIColor *imageTintColor;
+@property (nonatomic, copy) UIFont *font;
 @end
 
 @interface STUIStatusBarStringView : UIView
@@ -47,6 +48,7 @@
 
 @interface STUIStatusBarCellularNetworkTypeView : UIView
 @property (nonatomic, strong) STUIStatusBarStringView *stringView;
+@property (nonatomic, strong) NSLayoutConstraint *widthConstraint;
 @end
 
 @interface STUIStatusBarWifiSignalView : UIView
@@ -57,6 +59,8 @@
 static BOOL _isEnabled = NO;
 static BOOL _isVPNEnabled = NO;
 static BOOL _isEnabledReversed = NO;
+static BOOL _isForce5GAEnabled = NO;
+
 static UIColor *_darkReplacementColor = nil;
 static UIColor *_lightReplacementColor = nil;
 
@@ -80,6 +84,7 @@ static void ReloadPrefs() {
     NSDictionary *settings = [prefs dictionaryRepresentation];
     _isEnabled = settings[@"IsEnabled"] ? [settings[@"IsEnabled"] boolValue] : YES;
     _isEnabledReversed = settings[@"IsEnabledReversed"] ? [settings[@"IsEnabledReversed"] boolValue] : NO;
+    _isForce5GAEnabled = settings[@"IsForce5GAEnabled"] ? [settings[@"IsForce5GAEnabled"] boolValue] : NO;
 
     _lightReplacementColor = svpnColorWithHexString(settings[@"ForegroundColorLight"]) ?: [UIColor colorWithRed:0.19607843137254902 green:0.7803921568627451 blue:0.34901960784313724 alpha:1];
     _darkReplacementColor = svpnColorWithHexString(settings[@"ForegroundColorDark"]) ?: [UIColor colorWithRed:0.17254901960784313 green:0.8156862745098039 blue:0.3411764705882353 alpha:1];
@@ -230,7 +235,42 @@ static void ReloadPrefs() {
         [styleAttrs setTextColor:svpnColorWithTextColor(styleAttrs.textColor)];
     }
 
-    %orig;
+    if (![text hasPrefix:@"5G"] || !_isForce5GAEnabled) {
+        %orig;
+        return;
+    }
+
+    if (@available(iOS 16, *)) {
+        text = @"5GA";
+        prefixLength = 2;
+        %orig;
+
+        NSMutableAttributedString *attributedText = [self.stringView.attributedText mutableCopy];
+        UIFont *font = styleAttrs.font;
+
+        NSMutableDictionary *traits = [[font.fontDescriptor objectForKey:UIFontDescriptorTraitsAttribute] mutableCopy] ?: [NSMutableDictionary dictionary];
+        traits[UIFontWidthTrait] = @(UIFontWidthCondensed / 1.5);
+        traits[UIFontWeightTrait] = @(UIFontWeightSemibold);
+        UIFontDescriptor *condensedDescriptor = [font.fontDescriptor fontDescriptorByAddingAttributes:@{UIFontDescriptorTraitsAttribute: traits}];
+        UIFont *condensedFont = [UIFont fontWithDescriptor:condensedDescriptor size:0];
+        UIFont *smallerCondensedFont = [condensedFont fontWithSize:condensedFont.pointSize * 0.7];
+
+        [attributedText addAttribute:NSFontAttributeName value:condensedFont range:NSMakeRange(0, prefixLength)];
+        [attributedText addAttribute:NSFontAttributeName value:smallerCondensedFont range:NSMakeRange(prefixLength, attributedText.length - prefixLength)];
+
+        self.stringView.attributedText = attributedText;
+        self.widthConstraint.active = NO;
+
+        NSLayoutConstraint *newWidthConstraint = [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:0];
+        newWidthConstraint.constant = [attributedText size].width * 0.9;
+        newWidthConstraint.priority = UILayoutPriorityRequired;
+        newWidthConstraint.active = YES;
+
+        objc_setAssociatedObject(self, @selector(widthConstraint), newWidthConstraint, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    } else {
+        %orig;
+        return;
+    }
 }
 
 - (void)setAttributedText:(NSAttributedString *)attributedText prefixLength:(NSInteger)prefixLength forType:(NSInteger)type animated:(BOOL)animated {

SingleVPNPrefs/Resources/Root.plist

@@ -78,6 +78,20 @@
 			<key>PostNotification</key>
 			<string>com.82flex.singlevpnprefs/saved</string>
 		</dict>
+		<dict>
+			<key>cell</key>
+			<string>PSSwitchCell</string>
+			<key>default</key>
+			<false/>
+			<key>defaults</key>
+			<string>com.82flex.singlevpnprefs</string>
+			<key>key</key>
+			<string>IsForce5GAEnabled</string>
+			<key>label</key>
+			<string>Show 5G as 5G Advanced</string>
+			<key>PostNotification</key>
+			<string>com.82flex.singlevpnprefs/saved</string>
+		</dict>
 		<dict>
 			<key>cell</key>
 			<string>PSButtonCell</string>

SingleVPNPrefs/Resources/en.lproj/Root.strings

@@ -13,3 +13,4 @@
 "Made with ♥ by OwnGoal Studio" = "Made with ♥ by OwnGoal Studio";
 "Please support our paid works, thank you!" = "Please support our paid works, thank you!";
 "“Reverse Indicator” will change the appearance of the VPN indicator when the VPN is NOT connected." = "“Reverse Indicator” will change the appearance of the VPN indicator when the VPN is NOT connected.";
+"Show 5G as 5G Advanced" = "Show 5G as 5G Advanced";

SingleVPNPrefs/Resources/zh-Hans.lproj/Root.strings

@@ -13,3 +13,4 @@
 "Made with ♥ by OwnGoal Studio" = "「乌龙工作室」倾情献制";
 "Please support our paid works, thank you!" = "请支持我们的其他付费作品，谢谢！";
 "“Reverse Indicator” will change the appearance of the VPN indicator when the VPN is NOT connected." = "在 VPN 连接时改变网络状态指示器的外观。若打开 “反转指示”，将在未连接时改变其外观。";
+"Show 5G as 5G Advanced" = "将 5G 显示为 5G Advanced";

SingleVPNPrefs/SingleVPNRootListController.m

@@ -95,21 +95,31 @@ @implementation SingleVPNRootListController
 
 - (NSArray *)specifiers {
     if (!_specifiers) {
-        _specifiers = [self loadSpecifiersFromPlistName:@"Root" target:self];
-        for (PSSpecifier *specifier in _specifiers) {
-            NSString *cellClassName = [specifier propertyForKey:@"cellClass"];
+        NSArray *specs = [self loadSpecifiersFromPlistName:@"Root" target:self];
+        NSMutableArray *mSpecs = [NSMutableArray arrayWithCapacity:specs.count];
+        for (PSSpecifier *spec in specs) {
+            NSString *cellClassName = [spec propertyForKey:@"cellClass"];
             if ([cellClassName isKindOfClass:[NSString class]]) {
-                [specifier setProperty:NSClassFromString(cellClassName) forKey:@"cellClass"];
+                [spec setProperty:NSClassFromString(cellClassName) forKey:@"cellClass"];
             }
+            if (@available(iOS 17, *)) {
+            } else {
+                NSString *key = [spec propertyForKey:@"key"];
+                if ([key isEqualToString:@"IsForce5GAEnabled"]) {
+                    continue;
+                }
+            }
+            [mSpecs addObject:spec];
         }
+        _specifiers = mSpecs;
     }
     return _specifiers;
 }
 
 - (void)resetAppearance {
     for (PSSpecifier *specifier in self.specifiers) {
         NSString *key = [specifier propertyForKey:@"key"];
-        if ([key hasPrefix:@"ForegroundColor"]) {
+        if ([key hasPrefix:@"ForegroundColor"] || [key isEqualToString:@"IsForce5GAEnabled"]) {
             id defaultValue = [specifier propertyForKey:@"default"];
             [self setPreferenceValue:defaultValue specifier:specifier];
             [self reloadSpecifier:specifier animated:YES];