Unify cells // dynamic font support

.github/workflows/uitests.yml

@@ -111,7 +111,7 @@ jobs:
         -test-iterations 3 \
         -retry-tests-on-failure \
         -resultBundlePath "testResult.xcresult" \
-        | xcpretty
+        | xcbeautify --quieter
 
     - name: Upload test results
       uses: actions/upload-artifact@v4

NextcloudTalk.xcodeproj/xcshareddata/xcschemes/NextcloudTalk.xcscheme

@@ -26,7 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "NO">
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-UIPreferredContentSizeCategoryName"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "UICTContentSizeCategoryS"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <Testables>
          <TestableReference
             skipped = "NO">

NextcloudTalk/AppDelegate.m

@@ -89,10 +89,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     [NCUserInterfaceController sharedInstance].mainViewController = (NCSplitViewController *) self.window.rootViewController;
     [NCUserInterfaceController sharedInstance].roomsTableViewController = [NCUserInterfaceController sharedInstance].mainViewController.viewControllers.firstObject.childViewControllers.firstObject;
-
-    if (@available(iOS 14.5, *)) {
-        [NCUserInterfaceController sharedInstance].mainViewController.displayModeButtonVisibility = UISplitViewControllerDisplayModeButtonVisibilityNever;
-    }
+    [NCUserInterfaceController sharedInstance].mainViewController.displayModeButtonVisibility = UISplitViewControllerDisplayModeButtonVisibilityNever;
 
     NSArray *arguments = [[NSProcessInfo processInfo] arguments];
 

NextcloudTalk/AutoCompletionTableViewCell.h

@@ -33,7 +33,6 @@ static NSString *AutoCompletionCellIdentifier   = @"AutoCompletionCellIdentifier
 @property (nonatomic, strong) AvatarButton *avatarButton;
 @property (nonatomic, strong) UIImageView *userStatusImageView;
 
-+ (CGFloat)defaultFontSize;
 - (void)setUserStatus:(NSString *)userStatus;
 
 @end

NextcloudTalk/AutoCompletionTableViewCell.m

@@ -21,6 +21,7 @@
  */
 
 #import "AutoCompletionTableViewCell.h"
+#import "ChatTableViewCell.h"
 
 #import "SLKUIConstants.h"
 
@@ -85,10 +86,8 @@ - (void)configureSubviews
 - (void)prepareForReuse
 {
     [super prepareForReuse];
-
-    CGFloat pointSize = [AutoCompletionTableViewCell defaultFontSize];
 
-    self.titleLabel.font = [UIFont systemFontOfSize:pointSize];
+    self.titleLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
     self.titleLabel.text = @"";
 
     [self.avatarButton cancelCurrentRequest];
@@ -108,7 +107,7 @@ - (UILabel *)titleLabel
         _titleLabel.backgroundColor = [UIColor clearColor];
         _titleLabel.userInteractionEnabled = NO;
         _titleLabel.numberOfLines = 1;
-        _titleLabel.font = [UIFont systemFontOfSize:[AutoCompletionTableViewCell defaultFontSize]];
+        _titleLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
         _titleLabel.textColor = [UIColor secondaryLabelColor];
     }
     return _titleLabel;
@@ -137,15 +136,4 @@ - (void)setUserStatus:(NSString *)userStatus
     }
 }
 
-+ (CGFloat)defaultFontSize
-{
-    CGFloat pointSize = 16.0;
-
-//    NSString *contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-//    pointSize += SLKPointSizeDifferenceForCategory(contentSizeCategory);
-
-    return pointSize;
-}
-
-
 @end

NextcloudTalk/AvatarButton.swift

@@ -43,10 +43,17 @@ import SDWebImage
     }
 
     private func commonInit() {
+        self.layer.masksToBounds = true
         self.imageView?.contentMode = .scaleToFill
         self.imageView?.frame = self.frame
         self.contentVerticalAlignment = .fill
         self.contentHorizontalAlignment = .fill
+        self.backgroundColor = .systemGray3
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        self.layer.cornerRadius = self.frame.width / 2.0
     }
 
     // MARK: - Conversation avatars