UI fixes after migration to ios 26

Resources/Images.xcassets/Icons/ic_navbar_help.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_navbar_help@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_navbar_help@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Resources/Images.xcassets/Icons/ic_navbar_overflow_menu_stroke.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_navbar_overflow_menu_stroke@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_navbar_overflow_menu_stroke@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Resources/Images.xcassets/Icons/icon_direction.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_direction@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_direction@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Resources/Images.xcassets/Icons/icon_direction_active.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_direction_active@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_direction_active@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Sources/Controllers/Base/OABaseNavbarSubviewViewController.m

@@ -84,7 +84,10 @@ - (BOOL)isNavbarBlurring
 
 - (BOOL)isNavbarSeparatorVisible
 {
-    return _subviewHeight == 0;
+    if (@available(iOS 26.0, *))
+        return NO;
+    else
+        return _subviewHeight == 0;
 }
 
 - (BOOL)shouldShowSubviewSeparator

Sources/Controllers/Base/OABaseNavbarViewController.h

@@ -42,6 +42,8 @@ typedef NS_ENUM(NSInteger, EOABaseNavbarStyle)
 - (void)updateUIAnimated:(void (^)(BOOL finished))completion;
 - (void)updateWithoutData;
 - (void)reloadDataWithAnimated:(BOOL)animated completion:(void (^)(BOOL finished))completion;
+- (void)reloadDataWithDelay:(NSTimeInterval)delay animated:(BOOL)animated completion:(void (^)(BOOL finished))completion;
+- (void)reloadRowsWithDelay:(NSTimeInterval)delay atIndexPaths:(NSIndexPath *)indexPath withRowAnimation:(UITableViewRowAnimation)rowAnimation;
 
 - (UIBarButtonItem *)createRightNavbarButton:(NSString *)title
                                     iconName:(NSString *)iconName

Sources/Controllers/Base/OABaseNavbarViewController.m

@@ -16,9 +16,10 @@
 #import "Localization.h"
 #import "GeneratedAssetSymbols.h"
 
-#define kRightIconLargeTitleSmall 34.
-#define kRightIconLargeTitleLarge 40.
-#define kDefaultBarButtonSize 44.
+static const CGFloat kRightIconLargeTitleSmall = 34.;
+static const CGFloat kRightIconLargeTitleLarge = 40.;
+static const CGFloat kDefaultBarButtonSize = 44.;
+static const CGFloat kDefaultBarButtonSizeiOS26 = 30.;
 
 @implementation OABaseNavbarViewController
 {
@@ -240,8 +241,19 @@ - (void)updateAppearance
     BOOL isLargeTitle = [self getNavbarStyle] == EOABaseNavbarStyleLargeTitle;
 
     UINavigationBarAppearance *appearance = [[UINavigationBarAppearance alloc] init];
-    [appearance configureWithOpaqueBackground];
-    appearance.backgroundColor = [self getNavbarBackgroundColor];
+    if (@available(iOS 26.0, *))
+    {
+        if (!isLargeTitle)
+        {
+            [appearance configureWithOpaqueBackground];
+            appearance.backgroundColor = [self navbarBackgroundColor];
+        }
+    }
+    else
+    {
+        [appearance configureWithOpaqueBackground];
+        appearance.backgroundColor = [self navbarBackgroundColor];
+    }
     appearance.titleTextAttributes = @{
         NSFontAttributeName : [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline],
         NSForegroundColorAttributeName : [self getNavbarStyle] == EOABaseNavbarStyleCustomLargeTitle ? UIColor.clearColor : [self getTitleColor]
@@ -349,6 +361,39 @@ - (void)reloadDataWithAnimated:(BOOL)animated completion:(void (^)(BOOL finished
     }
 }
 
+- (void)reloadDataWithDelay:(NSTimeInterval)delay animated:(BOOL)animated completion:(void (^)(BOOL finished))completion
+{
+    if (delay > 0.)
+    {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self reloadDataWithAnimated:animated completion:completion];
+        });
+    }
+    else
+    {
+        [self reloadDataWithAnimated:animated completion:completion];
+    }
+}
+
+- (void)reloadRowsWithDelay:(NSTimeInterval)delay atIndexPaths:(NSIndexPath *)indexPath withRowAnimation:(UITableViewRowAnimation)rowAnimation
+{
+    if (delay > 0.)
+    {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self reloadRowsAtIndexPath:indexPath withRowAnimation:rowAnimation];
+        });
+    }
+    else
+    {
+        [self reloadRowsAtIndexPath:indexPath withRowAnimation:rowAnimation];
+    }
+}
+
+- (void)reloadRowsAtIndexPath:(NSIndexPath *)indexPath withRowAnimation:(UITableViewRowAnimation)rowAnimation
+{
+    [self.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:rowAnimation];
+}
+
 - (void)updateRightIconLargeTitle
 {
     if (_rightIconLargeTitle)
@@ -503,27 +548,35 @@ - (void)setupNavbarButtons
         NSArray<UIBarButtonItem *> *rightNavbarButtons = [self getRightNavbarButtons];
         if (rightNavbarButtons && rightNavbarButtons.count > 0)
         {
+            CGFloat barButtonSize = [self.class defaultBarButtonIconSize];
             NSMutableArray<UIBarButtonItem *> *rightNavbarButtonsWithSpaces = [NSMutableArray array];
             if (rightNavbarButtons.count > 1)
             {
                 freeSpaceForNavbarButton -= (rightNavbarButtons.count - 1) * 8.;
                 freeSpaceForNavbarButton /= rightNavbarButtons.count;
             }
-            if (freeSpaceForNavbarButton < kDefaultBarButtonSize)
-                freeSpaceForNavbarButton = kDefaultBarButtonSize;
+            if (freeSpaceForNavbarButton < barButtonSize)
+                freeSpaceForNavbarButton = barButtonSize;
+
+            UIControlContentHorizontalAlignment buttonAlignment;
+            if (@available(iOS 26.0, *))
+                buttonAlignment = UIControlContentHorizontalAlignmentCenter;
+            else
+                buttonAlignment = UIControlContentHorizontalAlignmentTrailing;
+
             for (NSInteger i = 0; i < rightNavbarButtons.count; i++)
             {
                 UIBarButtonItem *buttonItem = rightNavbarButtons[i];
                 [rightNavbarButtonsWithSpaces addObject:buttonItem];
                 UIButton *button = buttonItem.customView;
                 if (button)
                 {
-                    CGFloat buttonWidth = kDefaultBarButtonSize;
+                    CGFloat buttonWidth = barButtonSize;
                     NSString *buttonTitle = [button titleForState:UIControlStateNormal];
                     if (buttonTitle && buttonTitle.length > 0)
                         buttonWidth = [OAUtilities calculateTextBounds:buttonTitle width:freeSpaceForNavbarButton font:button.titleLabel.font].width;
                     [button.widthAnchor constraintEqualToConstant:buttonWidth].active = YES;
-                    button.contentHorizontalAlignment = i == 0 ? UIControlContentHorizontalAlignmentTrailing : UIControlContentHorizontalAlignmentCenter;
+                    button.contentHorizontalAlignment = i == 0 ? buttonAlignment : UIControlContentHorizontalAlignmentCenter;
                     button.titleLabel.textAlignment = i == 0 ? NSTextAlignmentRight : NSTextAlignmentCenter;
                 }
             }
@@ -567,7 +620,7 @@ + (UIBarButtonItem *)createRightNavbarButton:(NSString *)title
                                       target:(id)target
                                         menu:(UIMenu *)menu
 {
-    UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., kDefaultBarButtonSize, 30.)];
+    UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., [self defaultBarButtonIconSize], 30.)];
     button.titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
     button.titleLabel.numberOfLines = 1;
     button.titleLabel.adjustsFontForContentSizeCategory = YES;
@@ -591,6 +644,14 @@ + (UIBarButtonItem *)createRightNavbarButton:(NSString *)title
     return rightNavbarButton;
 }
 
++ (CGFloat)defaultBarButtonIconSize
+{
+    if (@available(iOS 26.0, *))
+        return kDefaultBarButtonSizeiOS26;
+    else
+        return kDefaultBarButtonSize;
+}
+
 - (UIBarButtonItem *)systemLeftBarButtonItem
 {
     return nil;
@@ -617,7 +678,7 @@ - (BOOL)isAnyLargeTitle
     return [self getNavbarStyle] == EOABaseNavbarStyleLargeTitle || [self getNavbarStyle] == EOABaseNavbarStyleCustomLargeTitle;
 }
 
-- (UIColor *)getNavbarBackgroundColor
+- (UIColor *)navbarBackgroundColor
 {
     if ([self isAnyLargeTitle])
         return self.tableView.backgroundColor;
@@ -636,7 +697,12 @@ - (UIColor *)getNavbarBackgroundColor
 
 - (UIColor *)navbarButtonsTintColor
 {
-    return [self getNavbarColorScheme] == EOABaseNavbarColorSchemeOrange ? [UIColor colorNamed:ACColorNameNavBarTextColorPrimary] : [UIColor colorNamed:ACColorNameIconColorActive];
+    UIColor *navbarSchemeOrangeColor;
+    if (@available(iOS 26.0, *))
+        navbarSchemeOrangeColor = UIColor.labelColor;
+    else
+        navbarSchemeOrangeColor = [UIColor colorNamed:ACColorNameNavBarTextColorPrimary];
+    return [self getNavbarColorScheme] == EOABaseNavbarColorSchemeOrange ? navbarSchemeOrangeColor : [UIColor colorNamed:ACColorNameIconColorActive];
 }
 
 - (UIColor *)getTitleColor
@@ -698,7 +764,10 @@ - (BOOL)isNavbarBlurring
 
 - (BOOL)isNavbarSeparatorVisible
 {
-    return [self getNavbarColorScheme] != EOABaseNavbarColorSchemeOrange;
+    if (@available(iOS 26.0, *))
+        return NO;
+    else
+        return [self getNavbarColorScheme] != EOABaseNavbarColorSchemeOrange;
 }
 
 - (UIImage *)getCenterIconAboveTitle

Sources/Controllers/Base/OACompoundViewController.h

@@ -15,6 +15,7 @@
 -(UIView *) getBottomView;
 -(CGFloat) getNavBarHeight;
 -(CGFloat) getToolBarHeight;
+- (CGFloat)statusBarHeight;
 -(void) applySafeAreaMargins;
 -(void) viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator;
 

Sources/Controllers/Base/OACompoundViewController.m

@@ -49,6 +49,11 @@ -(CGFloat) getToolBarHeight
     return 0;
 }
 
+- (CGFloat)statusBarHeight
+{
+    return [OAUtilities getStatusBarHeight];
+}
+
 -(void) applySafeAreaMargins
 {
     [self applySafeAreaMargins:self.view.frame.size];
@@ -58,7 +63,7 @@ -(void) applySafeAreaMargins:(CGSize)screenSize
 {
     CGFloat toolBarHeight = [self getToolBarHeight];
     [OAUtilities adjustViewsToNotch:screenSize topView:[self getTopView] middleView:[self getMiddleView]
-                         bottomView:toolBarHeight == 0 ? nil : [self getBottomView] navigationBarHeight:[self getNavBarHeight] toolBarHeight:toolBarHeight];
+                         bottomView:toolBarHeight == 0 ? nil : [self getBottomView] navigationBarHeight:[self getNavBarHeight] toolBarHeight:toolBarHeight statusBarHeight:[self statusBarHeight]];
 }
 
 -(void) viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator

Sources/Controllers/Cells/OACardButtonCell.mm

@@ -37,6 +37,7 @@ - (void)layoutSubviews
     configuration.contentInsets = NSDirectionalEdgeInsetsMake(0., horizontalInset, 0., horizontalInset);
     configuration.imagePadding = imagePadding;
     self.buttonView.configuration = configuration;
+    self.buttonView.titleLabel.numberOfLines = 1;
 }
 
 - (void) updateConstraints

Sources/Controllers/Cells/OAColorsPaletteCell.m

@@ -34,7 +34,7 @@ - (void) awakeFromNib
 - (void) setupViews
 {
     self.separatorInset = UIEdgeInsetsZero;
-    self.separatorHeight.constant = 1.0 / [UIScreen mainScreen].scale;
+    self.separatorHeight.constant = 1.0;
     self.topTitleOffset.constant = 20;
     self.bottomTitleOffset.constant = 8;
     [self.rightActionButton removeTarget:nil action:nil forControlEvents:UIControlEventAllEvents];

Sources/Controllers/Cells/OAIconsPaletteCell.m

@@ -35,7 +35,7 @@ - (void) awakeFromNib
 - (void) setupViews
 {
     self.separatorInset = UIEdgeInsetsZero;
-    self.separatorHeight.constant = 1.0 / [UIScreen mainScreen].scale;
+    self.separatorHeight.constant = 1.0;
     self.topTitleOffset.constant = 20;
     self.bottomTitleOffset.constant = 8;
 }

Sources/Controllers/Cells/Xibs/OAColorsPaletteCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -143,7 +143,7 @@
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fki-YG-97m">
                                                 <rect key="frame" x="0.0" y="0.0" width="393" height="1"/>
-                                                <color key="backgroundColor" systemColor="separatorColor"/>
+                                                <color key="backgroundColor" name="customSeparator"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="1" id="Ezj-p8-v0I"/>
                                                 </constraints>
@@ -259,6 +259,9 @@
         <namedColor name="buttonBgColorTertiary">
             <color red="0.3411764705882353" green="0.078431372549019607" blue="0.80000000000000004" alpha="0.15000000596046448" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="customSeparator">
+            <color red="0.79607843137254897" green="0.7803921568627451" blue="0.81960784313725488" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="groupBg">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
@@ -274,9 +277,6 @@
         <namedColor name="textColorSecondary">
             <color red="0.49019607843137253" green="0.45098039215686275" blue="0.5490196078431373" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
-        <systemColor name="separatorColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>