Merge pull request #2256 from nextcloud/fix/noid/colors-on-ios-26

fix: Colors of some elements on iOS 26

Author: SystemKeeper

NextcloudTalk/Chat/Chat views/Polls/PollCreationViewController.swift

@@ -51,7 +51,9 @@ import UIKit
         super.viewDidLoad()
 
         self.creatingPollIndicatorView = UIActivityIndicatorView()
-        self.creatingPollIndicatorView.color = NCAppBranding.themeTextColor()
+        if #unavailable(iOS 26.0) {
+            self.creatingPollIndicatorView.color = NCAppBranding.themeTextColor()
+        }
 
         self.setMoreOptionsButton()
 

NextcloudTalk/Chat/Chat views/Polls/PollVotingView.swift

@@ -48,7 +48,9 @@ import UIKit
         super.viewDidLoad()
 
         self.activityIndicatorView = UIActivityIndicatorView()
-        self.activityIndicatorView.color = NCAppBranding.themeTextColor()
+        if #unavailable(iOS 26.0) {
+            self.activityIndicatorView.color = NCAppBranding.themeTextColor()
+        }
 
         self.setMoreOptionsButton()
 

NextcloudTalk/Chat/ChatViewController.swift

@@ -2411,7 +2411,7 @@ import SwiftUI
             if #unavailable(iOS 26.0) {
                 cancelButton.tintColor = NCAppBranding.themeTextColor()
             }
-            
+
             roomInfo.modalPresentationStyle = .pageSheet
 
             let navController = UINavigationController(rootViewController: roomInfo)

NextcloudTalk/Chat/MessageTranslationViewController.swift

@@ -69,7 +69,9 @@ import UIKit
         self.translateTextView.layer.cornerRadius = 8
 
         self.modifyingProfileView = UIActivityIndicatorView()
-        self.modifyingProfileView.color = NCAppBranding.themeTextColor()
+        if #unavailable(iOS 26.0) {
+            self.modifyingProfileView.color = NCAppBranding.themeTextColor()
+        }
 
         self.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(self.cancelButtonPressed))
         if #unavailable(iOS 26.0) {

NextcloudTalk/Federation/FederationInvitationTableViewController.swift

@@ -46,7 +46,9 @@ class FederationInvitationTableViewController: UITableViewController, Federation
         self.backgroundView.placeholderView.isHidden = true
         self.backgroundView.loadingView.startAnimating()
 
-        self.modifyingViewIndicator.color = NCAppBranding.themeTextColor()
+        if #unavailable(iOS 26.0) {
+            self.modifyingViewIndicator.color = NCAppBranding.themeTextColor()
+        }
     }
 
     override func viewWillAppear(_ animated: Bool) {

NextcloudTalk/Rooms/Banned Actors/BannedActorTableViewController.swift

@@ -36,7 +36,9 @@
         self.backgroundView.setImage(UIImage(systemName: "person.badge.minus"))
         self.backgroundView.loadingView.startAnimating()
 
-        self.modifyingViewIndicator.color = NCAppBranding.themeTextColor()
+        if #unavailable(iOS 26.0) {
+            self.modifyingViewIndicator.color = NCAppBranding.themeTextColor()
+        }
     }
 
     override func viewWillAppear(_ animated: Bool) {

NextcloudTalk/Rooms/RoomAvatarInfoTableViewController.swift

@@ -65,7 +65,9 @@ enum RoomAvatarInfoSection: Int {
         self.tableView.register(TextViewTableViewCell.self, forCellReuseIdentifier: TextViewTableViewCell.identifier)
         self.tableView.tableHeaderView = self.headerView
 
-        self.modifyingView.color = NCAppBranding.themeTextColor()
+        if #unavailable(iOS 26.0) {
+            self.modifyingView.color = NCAppBranding.themeTextColor()
+        }
 
         if let serverCapabilities = NCDatabaseManager.sharedInstance().serverCapabilities(forAccountId: self.room.accountId) {
             self.descriptionMaxLength = serverCapabilities.descriptionLength
@@ -207,6 +209,7 @@ enum RoomAvatarInfoSection: Int {
     func removeModifyingView() {
         modifyingView.stopAnimating()
         self.headerView.changeButtonState(to: true)
+        self.navigationItem.rightBarButtonItem = nil
         self.tableView.isUserInteractionEnabled = true
     }
 

NextcloudTalk/Rooms/RoomCreationTableViewController.swift

@@ -97,7 +97,9 @@ enum RoomVisibilityOption: Int {
         self.createButton.isEnabled = false
         self.navigationItem.rightBarButtonItem = self.createButton
 
-        self.modifyingView.color = NCAppBranding.themeTextColor()
+        if #unavailable(iOS 26.0) {
+            self.modifyingView.color = NCAppBranding.themeTextColor()
+        }
 
         self.headerView.editView.isHidden = !NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityConversationAvatars, forAccountId: self.account.accountId)
         // Need to have an explicit size here for the header view

NextcloudTalk/Rooms/RoomSharedItemsTableViewController.swift

@@ -141,6 +141,11 @@ import QuickLook
         itemTypeSelectorButton.setTitle(buttonTitle, for: .normal)
         itemTypeSelectorButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .medium)
         itemTypeSelectorButton.setTitleColor(NCAppBranding.themeTextColor(), for: .normal)
+        if #available(iOS 26.0, *) {
+            itemTypeSelectorButton.setTitleColor(.label, for: .normal)
+        } else {
+            itemTypeSelectorButton.setTitleColor(NCAppBranding.themeTextColor(), for: .normal)
+        }
         self.navigationItem.titleView = itemTypeSelectorButton
 
         var menuActions: [UIAction] = []

NextcloudTalk/Settings/UserProfileTableViewController.swift

@@ -66,7 +66,10 @@ class UserProfileTableViewController: UITableViewController, DetailedOptionsSele
         }
 
         modifyingProfileView = UIActivityIndicatorView()
-        modifyingProfileView.color = NCAppBranding.themeTextColor()
+        if #unavailable(iOS 26.0) {
+            modifyingProfileView.color = NCAppBranding.themeTextColor()
+        }
+
         tableView.keyboardDismissMode = UIScrollView.KeyboardDismissMode.onDrag
         tableView.register(TextFieldTableViewCell.self, forCellReuseIdentifier: TextFieldTableViewCell.identifier)
         NotificationCenter.default.addObserver(self, selector: #selector(userProfileImageUpdated), name: NSNotification.Name.NCUserProfileImageUpdated, object: nil)