- SDK update: fix duplicate/"ghost" activities visual issue

- ClientActivityViewController: fix Xcode 14 warnings - PopupButtonController: add themeing support - NSObject+ThemeApplication: add proper support for UISearchTextField, fixing #118 text color issue
owncloud · Oct 10, 2022 · 6d0530b · 6d0530b
1 parent 315404b
commit 6d0530b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/ios-sdk b/ios-sdk
diff --git a/ownCloud/Client/ClientActivityViewController.swift b/ownCloud/Client/ClientActivityViewController.swift
@@ -75,12 +75,16 @@ class ClientActivityViewController: UITableViewController, Themeable, MessageGro
 		}
 	}
 
-	deinit {
+	private func winddown() {
 		Theme.shared.unregister(client: self)
 		self.shouldPauseDisplaySleep = false
 		self.core = nil
 	}
 
+	deinit {
+		winddown()
+	}
+
 	@objc func handleActivityNotification(_ notification: Notification) {
 		if let activitiyUpdates = notification.userInfo?[OCActivityManagerNotificationUserInfoUpdatesKey] as? [ [ String : Any ] ] {
 			for activityUpdate in activitiyUpdates {

diff --git a/ownCloudAppShared/Client/User Interface/PopupButtonController.swift b/ownCloudAppShared/Client/User Interface/PopupButtonController.swift
@@ -38,7 +38,7 @@ open class PopupButtonChoice : NSObject {
 	}
 }
 
-open class PopupButtonController : NSObject {
+open class PopupButtonController : NSObject, Themeable {
 	typealias TitleCustomizer = (_ choice: PopupButtonChoice, _ isSelected: Bool) -> String
 	typealias SelectionCustomizer = (_ choice: PopupButtonChoice, _ isSelected: Bool) -> Bool
 	typealias ChoiceHandler = (_ choice: PopupButtonChoice, _ wasSelected: Bool) -> Void
@@ -148,6 +148,8 @@ open class PopupButtonController : NSObject {
 		])
 
 		_updateTitleFromSelectedChoice()
+
+		Theme.shared.register(client: self, applyImmediately: true)
 	}
 
 	private func _updateTitleFromSelectedChoice() {
@@ -188,4 +190,8 @@ open class PopupButtonController : NSObject {
 			button.sizeToFit()
 		}
 	}
+
+	open func applyThemeCollection(theme: Theme, collection: ThemeCollection, event: ThemeEvent) {
+		button.applyThemeCollection(collection)
+	}
 }
diff --git a/ownCloudAppShared/User Interface/Theme/NSObject+ThemeApplication.swift b/ownCloudAppShared/User Interface/Theme/NSObject+ThemeApplication.swift
@@ -247,7 +247,20 @@ public extension NSObject {
 			}
 		}
 
-		if let textField = self as? UITextField {
+		if let searchTextField = self as? UISearchTextField {
+			searchTextField.tintColor = collection.searchBarColors.tintColor
+			searchTextField.textColor = collection.searchBarColors.labelColor
+			searchTextField.overrideUserInterfaceStyle = collection.interfaceStyle.userInterfaceStyle
+
+			if let glassIconView = searchTextField.leftView as? UIImageView {
+				glassIconView.image = glassIconView.image?.withRenderingMode(.alwaysTemplate)
+				glassIconView.tintColor = collection.searchBarColors.secondaryLabelColor
+			}
+			if let clearButton = searchTextField.value(forKey: "clearButton") as? UIButton {
+				clearButton.setImage(UIImage(systemName: "xmark.circle.fill"), for: .normal)
+				clearButton.tintColor = collection.searchBarColors.secondaryLabelColor
+			}
+		} else if let textField = self as? UITextField {
 			textField.textColor = collection.tableRowColors.labelColor
 		}