Fixed for Twitter 10-94

Author: actuallyaridan

BHDownloadInlineButton.h

@@ -5,38 +5,70 @@
 //  Created by BandarHelal on 09/04/2022.
 //
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 #import "BHTManager.h"
 
+@class T1StatusInlineActionsView; // Forward declaration instead of assuming it's imported
+
+NS_ASSUME_NONNULL_BEGIN
+
 @interface BHDownloadInlineButton : UIButton
 {
     NSUInteger _displayType;
     NSUInteger _inlineActionType;
-    T1StatusInlineActionsView *_delegate;
+    __weak T1StatusInlineActionsView *_delegate; // Added weak reference
     id _buttonAnimator;
     id _viewModel;
 }
 
-+ (CGSize)buttonImageSizeUsingViewModel:(id)arg1 options:(NSUInteger)arg2 overrideButtonSize:(CGSize)arg3 account:(id)arg4;
-@property(retain, nonatomic) id buttonAnimator;
-@property(retain, nonatomic) T1StatusInlineActionsView *delegate;
-@property(nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
-@property (nonatomic, assign, readwrite) UIEdgeInsets touchInsets;
-@property(nonatomic) NSUInteger inlineActionType;
-@property(nonatomic) NSUInteger displayType;
-@property (nonatomic) id viewModel;
-- (void)setTouchInsets:(UIEdgeInsets)arg1;
-- (id)_t1_imageNamed:(id)arg1 fitSize:(CGSize)arg2 fillColor:(id)arg3;
-- (_Bool)shouldShowCount;
++ (CGSize)buttonImageSizeUsingViewModel:(id)viewModel 
+                               options:(NSUInteger)options 
+                    overrideButtonSize:(CGSize)overrideSize 
+                             account:(id)account;
+
+@property (nonatomic, weak) T1StatusInlineActionsView *delegate; // Changed to weak
+@property (nonatomic, strong, nullable) id buttonAnimator;
+@property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
+@property (nonatomic, assign) UIEdgeInsets touchInsets;
+@property (nonatomic, assign) NSUInteger inlineActionType;
+@property (nonatomic, assign) NSUInteger displayType;
+@property (nonatomic, strong, nullable) id viewModel;
+
+- (void)setTouchInsets:(UIEdgeInsets)touchInsets;
+- (nullable id)_t1_imageNamed:(NSString *)name 
+                     fitSize:(CGSize)fitSize 
+                   fillColor:(nullable id)fillColor;
+- (BOOL)shouldShowCount;
 - (double)extraWidth;
 - (CGFloat)trailingEdgeInset;
 - (NSUInteger)touchInsetPriority;
 - (NSUInteger)alternateInlineActionType;
 - (NSUInteger)visibility;
-- (NSString *)actionSheetTitle;
-- (_Bool)enabled;
-- (void)statusDidUpdate:(id)arg1 options:(NSUInteger)arg2 displayTextOptions:(NSUInteger)arg3 animated:(BOOL)arg4;
-- (void)statusDidUpdate:(id)arg1 options:(NSUInteger)arg2 displayTextOptions:(NSUInteger)arg3 animated:(BOOL)arg4 featureSwitches:(id)arg5;
-- (instancetype)initWithOptions:(NSUInteger)arg1 overrideSize:(id)arg2 account:(id)arg3;
-- (instancetype)initWithInlineActionType:(NSUInteger)arg1 options:(NSUInteger)arg2 overrideSize:(id)arg3 account:(id)arg4;
+- (nullable NSString *)actionSheetTitle;
+- (BOOL)enabled;
+
+// Status update methods
+- (void)statusDidUpdate:(id)status 
+                options:(NSUInteger)options 
+    displayTextOptions:(NSUInteger)displayTextOptions 
+             animated:(BOOL)animated;
+
+- (void)statusDidUpdate:(id)status 
+                options:(NSUInteger)options 
+    displayTextOptions:(NSUInteger)displayTextOptions 
+             animated:(BOOL)animated 
+      featureSwitches:(nullable id)featureSwitches;
+
+// Initializers
+- (instancetype)initWithOptions:(NSUInteger)options 
+                  overrideSize:(nullable id)overrideSize 
+                       account:(nullable id)account;
+
+- (instancetype)initWithInlineActionType:(NSUInteger)inlineActionType 
+                                options:(NSUInteger)options 
+                          overrideSize:(nullable id)overrideSize 
+                               account:(nullable id)account;
+
 @end
+
+NS_ASSUME_NONNULL_END

BHDownloadInlineButton.m

@@ -258,7 +258,7 @@ + (BOOL)customVoice {
 }
 + (UIViewController *)BHTSettingsWithAccount:(TFNTwitterAccount *)twAccount {
     SettingsViewController *pref = [[SettingsViewController alloc] initWithTwitterAccount:twAccount];
-    [pref.navigationItem setTitleView:[objc_getClass("TFNTitleView") titleViewWithTitle:@"BHTwitter" subtitle:twAccount.displayUsername]];
+    [pref.navigationItem setTitleView:[objc_getClass("TFNTitleView") titleViewWithTitle:@"NeoFreeBird" subtitle:twAccount.displayUsername]];
     return pref;
 }
 

BHTManager.m

@@ -95,7 +95,7 @@ - (void)getData {
                 [[BHCustomTabBarItem alloc] initWithTitle:[[BHTBundle sharedBundle] localizedStringForKey:@"CUSTOM_TAB_BAR_OPTION_5"] pageID:@"ntab"],
                 [[BHCustomTabBarItem alloc] initWithTitle:[[BHTBundle sharedBundle] localizedStringForKey:@"CUSTOM_TAB_BAR_OPTION_6"] pageID:@"messages"],
                 [[BHCustomTabBarItem alloc] initWithTitle:[[BHTBundle sharedBundle] localizedStringForKey:@"CUSTOM_TAB_BAR_OPTION_7"] pageID:@"grok"],
-
+                [[BHCustomTabBarItem alloc] initWithTitle:[[BHTBundle sharedBundle] localizedStringForKey:@"CUSTOM_TAB_BAR_OPTION_8"] pageID:@"media"],
             ]],
             [[BHCustomTabBarSection alloc] initWithTitle:[[BHTBundle sharedBundle] localizedStringForKey:@"CUSTOM_TAB_BAR_SECTION_2_TITLE"] items:@[]]
         ] mutableCopy];

CustomTabBar/BHCustomTabBarViewController.m

@@ -24,4 +24,4 @@ typedef NS_ENUM(NSInteger, DynamicSpecifierOperatorType) {
 @end
 
 @interface BHSwitchTableCell : PSSwitchTableCell
-@end
+@end

SettingsViewController.h

@@ -5,13 +5,43 @@
 //  Created by BandarHelal
 //
 
+
 #import "SettingsViewController.h"
 #import "BHTBundle/BHTBundle.h"
 #import "Colours/Colours.h"
 #import "AppIcon/BHAppIconViewController.h"
 #import "ThemeColor/BHColorThemeViewController.h"
 #import "CustomTabBar/BHCustomTabBarViewController.h"
 
+typedef NS_ENUM(NSInteger, TwitterFontWeight) {
+    TwitterFontWeightRegular,
+    TwitterFontWeightMedium,
+    TwitterFontWeightSemibold,
+    TwitterFontWeightBold
+};
+
+typedef NS_ENUM(NSInteger, TwitterFontStyle) {
+    TwitterFontStyleRegular,
+    TwitterFontStyleSemibold,
+    TwitterFontStyleBold
+};
+
+static UIFont *TwitterChirpFont(TwitterFontStyle style) {
+    switch (style) {
+        case TwitterFontStyleBold:
+            return [UIFont fontWithName:@"ChirpUIVF_wght3200000_opsz150000" size:17] ?: 
+                   [UIFont systemFontOfSize:17 weight:UIFontWeightBold];
+            
+        case TwitterFontStyleSemibold:
+            return [UIFont fontWithName:@"ChirpUIVF_wght2BC0000_opszE0000" size:14] ?: 
+                   [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold];
+            
+        case TwitterFontStyleRegular:
+        default:
+            return [UIFont fontWithName:@"ChirpUIVF_wght1900000_opszE0000" size:12] ?: 
+                   [UIFont systemFontOfSize:12 weight:UIFontWeightRegular];
+    }
+}
 @interface SettingsViewController () <UIFontPickerViewControllerDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIColorPickerViewControllerDelegate>
 @property (nonatomic, strong) TFNTwitterAccount *twAccount;
 @property (nonatomic, assign) BOOL hasDynamicSpecifiers;
@@ -66,8 +96,112 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
     }
 }
 
+
+// Add this method to configure the table view appearance
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+
+    
+    
+    // Set the background color to match system background
+    self.view.backgroundColor = [UIColor systemBackgroundColor];
+    
+    // Configure the table view to blend with background
+    self.table.backgroundColor = [UIColor systemBackgroundColor];
+    self.table.separatorColor = [UIColor separatorColor];
+    
+    // Remove extra separators below content
+    self.table.tableFooterView = [UIView new];
+    self.table.separatorStyle = UITableViewCellSeparatorStyleNone;
+
+    if (@available(iOS 15.0, *)) {
+        self.table.sectionHeaderTopPadding = 8; 
+    }
+    
+    // These ensure cells align with headers
+    self.table.separatorInset = UIEdgeInsetsMake(0, 16, 0, 0);
+    self.table.layoutMargins = UIEdgeInsetsMake(0, 16, 0, 16);
+
+
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    NSString *title = [self tableView:tableView titleForHeaderInSection:section];
+    if (!title) {
+        return nil;
+    }
+    
+    UIView *headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, 52)];
+    
+    // Top separator - modified to extend full width
+    UIView *topSeparator = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, 0.5)];
+    topSeparator.backgroundColor = [UIColor separatorColor];
+    topSeparator.autoresizingMask = UIViewAutoresizingFlexibleWidth; // Ensure it stays full width
+    [headerView addSubview:topSeparator];
+    
+    // Header label
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(16, 16, tableView.frame.size.width - 32, 28)];
+    label.text = title; 
+    label.font = TwitterChirpFont(TwitterFontStyleBold); // 17pt bold
+    label.textColor = [UIColor labelColor];
+    [headerView addSubview:label];
+    
+    return headerView;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+    return 52; // Increased from 44 to accommodate larger text
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+    NSString *footerText = [self tableView:tableView titleForFooterInSection:section];
+    if (!footerText) {
+        return nil;
+    }
+    
+    UIView *footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, 44)];
+    
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(16, 8, tableView.frame.size.width - 32, 36)];
+    label.text = footerText;
+    label.font = TwitterChirpFont(TwitterFontStyleRegular); // 12pt regular
+    label.textColor = [UIColor secondaryLabelColor];
+    label.numberOfLines = 0;
+    [footerView addSubview:label];
+    
+    return footerView;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+    NSString *footerText = [self tableView:tableView titleForFooterInSection:section];
+    if (!footerText) {
+        return CGFLOAT_MIN; // Use minimal height when no footer
+    }
+    
+    // Calculate dynamic height
+    CGFloat width = tableView.frame.size.width - 32;
+    CGRect rect = [footerText boundingRectWithSize:CGSizeMake(width, CGFLOAT_MAX)
+                                         options:NSStringDrawingUsesLineFragmentOrigin
+                                        attributes:@{NSFontAttributeName: TwitterChirpFont(TwitterFontStyleRegular)}
+                                         context:nil];
+    
+    return ceil(rect.size.height) + 24; // Top/bottom padding
+}
+
+// And replace with this single implementation:
+- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Remove any default separator insets
+    cell.separatorInset = UIEdgeInsetsMake(0, 0, 0, CGRectGetWidth(tableView.bounds));
+    
+    // Set cell background
+    cell.backgroundColor = [UIColor systemBackgroundColor];
+    
+    // Remove selection highlight if needed
+    cell.selectionStyle = UITableViewCellSelectionStyleDefault;
+}
+
+
 - (UITableViewStyle)tableViewStyle {
-    return UITableViewStyleInsetGrouped;
+    return UITableViewStyleGrouped;
 }
 
 - (PSSpecifier *)newSectionWithTitle:(NSString *)header footer:(NSString *)footer {
@@ -226,24 +360,22 @@ - (NSArray *)specifiers {
         PSSpecifier *acknowledgements = [self newButtonCellWithTitle:[[BHTBundle sharedBundle] localizedStringForKey:@"LEGAL_BUTTON_TITLE"] detailTitle:nil dynamicRule:nil action:@selector(showAcknowledgements:)];
 
         // dvelopers section
+    
+        PSSpecifier *actuallyaridan = [self newHBTwitterCellWithTitle:@"aridan" twitterUsername:@"actuallyaridan" customAvatarURL:@"https://avatars.githubusercontent.com/u/96298432?v=4"];
+        PSSpecifier *timi2506 = [self newHBTwitterCellWithTitle:@"timi2506" twitterUsername:@"timi2506" customAvatarURL:@"https://avatars.githubusercontent.com/u/172171055?v=4"];
+        PSSpecifier *nyathea = [self newHBTwitterCellWithTitle:@"nyathea" twitterUsername:@"nyaathea" customAvatarURL:@"https://avatars.githubusercontent.com/u/108613931?v=4"];
         PSSpecifier *bandarHL = [self newHBTwitterCellWithTitle:@"BandarHelal" twitterUsername:@"BandarHL" customAvatarURL:@"https://unavatar.io/twitter/BandarHL"];
-        PSSpecifier *tipJar = [self newHBLinkCellWithTitle:@"Tip Jar" detailTitle:@"Donate Via Paypal" url:@"https://www.paypal.me/BandarHL"];
-        PSSpecifier *buymecoffee = [self newHBLinkCellWithTitle:@"Buy Me A Coffee" detailTitle:nil url:@"https://www.buymeacoffee.com/bandarHL"];
-        PSSpecifier *sourceCode = [self newHBLinkCellWithTitle:@"BHTwitter" detailTitle:@"Code source of BHTwitter" url:@"https://github.com/BandarHL/BHTwitter/"];
 
         _specifiers = [NSMutableArray arrayWithArray:@[
 
             mainSection, // 0
-            download,
-            hideAds,
             customVoice,
             hideTopics,
             hideWhoToFollow,
             hideTopicsToFollow,
-            hidePremiumOffer,
             hideTrendVideos,
+            hideSpace,
             videoLayerCaption,
-            directSave,
             noHistory,
             bioTranslate,
             likeConfrim,
@@ -254,14 +386,17 @@ - (NSArray *)specifiers {
             disableSensitiveTweetWarnings,
             copyProfileInfo,
             tweetToImage,
-            hideSpace,
             disableRTL,
             alwaysOpenSafari,
             stripTrackingParams,
             urlHost,
 
             twitterBlueSection, // 1
             undoTweet,
+            download,
+            directSave,
+            hideAds,
+            hidePremiumOffer,
             appTheme,
             appIcon,
             customTabBarVC,
@@ -285,10 +420,10 @@ - (NSArray *)specifiers {
             flex,
 
             developer, // 5
-            bandarHL,
-            tipJar,
-            buymecoffee,
-            sourceCode
+            actuallyaridan,
+            timi2506,
+            nyathea,
+            bandarHL
         ]];
 
         [self collectDynamicSpecifiersFromArray:_specifiers];
@@ -503,7 +638,7 @@ - (void)showURLHostSelectionViewController:(PSSpecifier *)specifier {
     UITableViewCell *specifierCell = [specifier propertyForKey:PSTableCellKey];
     PSSpecifier *selectionSpecifier = [self specifierForID:@"Select URL host"];
 
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"BHTwitter" message:@"plaese select what host you prefre" preferredStyle:UIAlertControllerStyleActionSheet];
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"NeoFreeBird" message:@"URL" preferredStyle:UIAlertControllerStyleActionSheet];
 
     if (alert.popoverPresentationController != nil) {
         CGFloat midX = CGRectGetMidX(specifierCell.frame);
@@ -612,7 +747,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
 
     if ([manager fileExistsAtPath:newImgPath.path]) {
         [manager removeItemAtURL:newImgPath error:nil];
-    }
+    } 
 
     [manager copyItemAtURL:oldImgPath toURL:newImgPath error:nil];
 
@@ -633,23 +768,38 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
     if (self) {
         NSString *subTitle = [specifier.properties[@"subtitle"] copy];
         BOOL isBig = specifier.properties[@"big"] ? ((NSNumber *)specifier.properties[@"big"]).boolValue : NO;
+        
+        // Get the default font size and make it bold
+        UIFont *defaultFont = self.textLabel.font;
+        self.textLabel.font = TwitterChirpFont(TwitterFontStyleSemibold); // 14pt semibold
+        
+        // Keep subtitle style exactly as before
         self.detailTextLabel.text = subTitle;
         self.detailTextLabel.numberOfLines = isBig ? 0 : 1;
         self.detailTextLabel.textColor = [UIColor secondaryLabelColor];
+        self.detailTextLabel.font = TwitterChirpFont(TwitterFontStyleRegular); // Match footer font
+        self.selectionStyle = UITableViewCellSelectionStyleDefault; // or .None if you don't want selection highlight
     }
     return self;
 }
-
 @end
 
 @implementation BHSwitchTableCell
 - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier specifier:(PSSpecifier *)specifier {
     if ((self = [super initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:reuseIdentifier specifier:specifier])) {
         NSString *subTitle = [specifier.properties[@"subtitle"] copy];
         BOOL isBig = specifier.properties[@"big"] ? ((NSNumber *)specifier.properties[@"big"]).boolValue : NO;
+        
+        // Get the default font size and make it bold
+        UIFont *defaultFont = self.textLabel.font;
+        self.textLabel.font = TwitterChirpFont(TwitterFontStyleSemibold); // 14pt semibold
+
+        // Keep subtitle style exactly as before
         self.detailTextLabel.text = subTitle;
         self.detailTextLabel.numberOfLines = isBig ? 0 : 1;
         self.detailTextLabel.textColor = [UIColor secondaryLabelColor];
+        self.detailTextLabel.font = TwitterChirpFont(TwitterFontStyleRegular); // Match footer font
+        self.selectionStyle = UITableViewCellSelectionStyleDefault; // or .None if you don't want selection highlight
 
         if (specifier.properties[@"switchAction"]) {
             UISwitch *targetSwitch = ((UISwitch *)[self control]);