Support iPhone SE @ iOS 18, support dynamic userInterfaceStyle

futuretap · futuretap · commit a1816858cfd2 · 2024-09-26T15:58:41.000+02:00
display a slim, centered indicator on top of the clock on iPhone SE if running iOS 18 or newer;
support dynamic dark/light mode change;
fix the isNetworkActivityIndicatorVisible getter property (always false on iOS 18+);
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+3.3.2
diff --git a/FTLinearActivityIndicator.podspec b/FTLinearActivityIndicator.podspec
@@ -1,15 +1,16 @@
 Pod::Spec.new do |s|
   s.name             = 'FTLinearActivityIndicator'
-  s.version          = '1.8'
+  s.version          = '2.0'
   s.summary          = 'Add the missing network activity indicator on newer iPhones'
 
   s.description      = <<-DESC
-	 iPhones with a notch such as X, XS, XR, 11 (Pro), 12-13 (mini, Pro) or Dynamic Island
-	 such as 14 Pro don't display the network activity indicator anymore. This pod brings it back
-	 by placing an activity indicator in the upper right of the screen on top of the regular
-	 status bar items. Since a circular indicator wouldn't fit, a rectangular "KITT scanner"
-	 like indicator with a gradient is shown. The indicator UI can be used standalone or as a
-	 "fix" for the iOS network activity indicator (using the existing API).
+	 Since iOS 18, network activity indicator is no longer displayed. iPhones with a notch
+	 or Dynamic Island never displayed it. This pod brings it back by placing an activity
+	 indicator in the upper right of the screen on top of the regular status bar items
+	 (on top of the clock on iPhone SE running iOS 18+).
+	 Since a circular indicator wouldn't fit, a rectangular "KITT scanner" like indicator
+	 with a gradient is shown. The indicator UI can be used standalone or as a "fix" for
+	 the iOS network activity indicator (using the existing API).
                        DESC
 
   s.homepage         = 'https://github.com/futuretap/FTLinearActivityIndicator'
diff --git a/FTLinearActivityIndicator/Classes/UIApplication+LinearNetworkActivityIndicator.swift b/FTLinearActivityIndicator/Classes/UIApplication+LinearNetworkActivityIndicator.swift
@@ -12,12 +12,13 @@ import UIKit
 extension UIApplication {
 	@objc final public class func configureLinearNetworkActivityIndicatorIfNeeded() {
 #if !targetEnvironment(macCatalyst) && (swift(<5.9) || !os(visionOS))
-		if #available(iOS 11.0, *) {
+		if UIDevice.current.userInterfaceIdiom != .pad {
+			if #available(iOS 18.0, *) {
+				configureLinearNetworkActivityIndicator()
+			}
 			// detect notch
 			if let window = shared.windows.first, window.safeAreaInsets.bottom > 0.0 {
-				if UIDevice.current.userInterfaceIdiom != .pad {
-					configureLinearNetworkActivityIndicator()
-				}
+				configureLinearNetworkActivityIndicator()
 			}
 		}
 		#endif
@@ -26,26 +27,26 @@ extension UIApplication {
 #if !targetEnvironment(macCatalyst) && (swift(<5.9) || !os(visionOS))
 	class func configureLinearNetworkActivityIndicator() {
 		DispatchQueue.once {
-			let originalSelector = #selector(setter: UIApplication.isNetworkActivityIndicatorVisible)
-			let swizzledSelector = #selector(ft_setNetworkActivityIndicatorVisible(visible:))
-			let originalMethod = class_getInstanceMethod(self, originalSelector)
-			let swizzledMethod = class_getInstanceMethod(self, swizzledSelector)
-			method_exchangeImplementations(originalMethod!, swizzledMethod!)
+			swizzle(original: #selector(setter: UIApplication.isNetworkActivityIndicatorVisible),
+					swizzled:  #selector(setter: ft_networkActivityIndicatorVisible))
+			swizzle(original: #selector(getter: UIApplication.isNetworkActivityIndicatorVisible),
+					swizzled:  #selector(getter: ft_networkActivityIndicatorVisible))
 		}
 		UIViewController.configureLinearNetworkActivityIndicator()
 	}
 
 	private struct AssociatedKeys {
 		static var indicatorWindowKey: UInt8 = 0
+		static var indicatorVisibleKey: UInt8 = 0
 	}
 
 	var indicatorWindow: UIWindow? {
 		get {
-			return objc_getAssociatedObject(self, &AssociatedKeys.indicatorWindowKey) as? UIWindow
+			objc_getAssociatedObject(self, &AssociatedKeys.indicatorWindowKey) as? UIWindow
 		}
 
 		set {
-			if let newValue = newValue {
+			if let newValue {
 				objc_setAssociatedObject(
 					self,
 					&AssociatedKeys.indicatorWindowKey,
@@ -57,86 +58,107 @@ extension UIApplication {
 	}
 
 
-	@objc func ft_setNetworkActivityIndicatorVisible(visible: Bool) {
-		self.ft_setNetworkActivityIndicatorVisible(visible: visible) // original implementation
-
-		if visible {
-			if indicatorWindow == nil {
-				let frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 12)
-				indicatorWindow = UIWindow(frame: frame)
-				indicatorWindow?.windowLevel = UIWindow.Level.statusBar + 1
-				indicatorWindow?.isUserInteractionEnabled = false
-
-				// notched iPhones differ in corner radius and right notch width
-				// => lookup margin from right window edge, and width
-				let layout: [ModelName: (CGFloat, CGFloat)] = [
-					.iPhoneX1: (74, 44),
-					.iPhoneX2: (74, 44),
-					.iPhoneXs: (74, 44),
-					.iPhoneXsMax1: (74, 44),
-					.iPhoneXsMax2: (74, 44),
-					.iPhoneXR: (70, 40),
-					.iPhone11: (70, 40),
-					.iPhone11Pro: (60, 34),
-					.iPhone11ProMax: (74, 44),
-					.iPhone12Mini: (60, 30),
-					.iPhone12: (72, 34),
-					.iPhone12Pro: (72, 34),
-					.iPhone12ProMax: (80, 42),
-					.iPhone13Mini: (60, 30),
-					.iPhone13: (72, 34),
-					.iPhone13Pro: (72, 34),
-					.iPhone13ProMax: (80, 42),
-					.iPhone14: (72, 34),
-					.iPhone14Plus: (80, 42),
-					.iPhone14Pro: (72, 34),
-					.iPhone14ProMax: (80, 42),
-					.iPhone15: (72, 34),
-					.iPhone15Plus: (80, 42),
-					.iPhone15Pro: (72, 34),
-					.iPhone15ProMax: (80, 42),
-					.iPhone16: (84, 36),
-					.iPhone16Plus: (96, 42),
-					.iPhone16Pro: (86, 38),
-					.iPhone16ProMax: (96, 42),
-				]
-				let modelName = UIDevice.current.ftModelName
-				let config = modelName.flatMap { layout[$0] } ?? (74, 44)
-				
-				let x = indicatorWindow!.frame.width - config.0
-				let width = config.1
-				
-				let indicator = FTLinearActivityIndicator(frame: CGRect(x: x, y: 7, width: width, height: 4.5))
-				indicator.isUserInteractionEnabled = false
-				indicator.hidesWhenStopped = false
-				indicator.startAnimating()
-				indicatorWindow?.addSubview(indicator)
-			}
+	@objc var ft_networkActivityIndicatorVisible: Bool {
+		get {
+			objc_getAssociatedObject(self, &AssociatedKeys.indicatorVisibleKey) as? Bool ?? false
 		}
-		guard let indicator = indicatorWindow?.subviews.first as? FTLinearActivityIndicator else {return}
-        if #available(iOS 13.0, *) {
-            indicator.tintColor = indicatorWindow?.windowScene?.statusBarManager?.statusBarStyle == .lightContent ? .white : .black
-        } else {
-            indicator.tintColor = statusBarStyle == .default ? UIColor.black : UIColor.white
-        }
-		if visible {
-			indicatorWindow?.isHidden = self.isStatusBarHidden
-			indicator.isHidden = false
-			indicator.alpha = 1
-		} else {
-			UIView.animate(withDuration: 0.5, animations: {
-				indicator.alpha = 0
-			}) { (finished) in
-				if (finished) {
-					indicator.isHidden = !self.isNetworkActivityIndicatorVisible  // might have changed in the meantime
-					self.indicatorWindow?.isHidden = !self.isNetworkActivityIndicatorVisible || self.isStatusBarHidden
+		set {
+			self.ft_networkActivityIndicatorVisible = newValue // original implementation
+			objc_setAssociatedObject(self, &AssociatedKeys.indicatorVisibleKey, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_ASSIGN)
+			
+			if newValue {
+				if indicatorWindow == nil {
+					let frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 12)
+					indicatorWindow = UIWindow(frame: frame)
+					indicatorWindow?.windowLevel = UIWindow.Level.statusBar + 1
+					indicatorWindow?.isUserInteractionEnabled = false
+					if #available(iOS 17.0, *) {
+						indicatorWindow?.registerForTraitChanges([UITraitUserInterfaceStyle.self], handler: { (newTC: UITraitEnvironment, previousTraitCollection: UITraitCollection) in
+							self.ftUpdateNetworkActivityIndicatorAppearance()
+						})
+					}
+					// notched iPhones differ in corner radius and right notch width
+					// => lookup margin from right window edge, and width
+					let layout: [ModelName: (CGFloat, CGFloat)] = [
+						.iPhoneX1: (74, 44),
+						.iPhoneX2: (74, 44),
+						.iPhoneXs: (74, 44),
+						.iPhoneXsMax1: (74, 44),
+						.iPhoneXsMax2: (74, 44),
+						.iPhoneXR: (70, 40),
+						.iPhone11: (70, 40),
+						.iPhone11Pro: (60, 34),
+						.iPhone11ProMax: (74, 44),
+						.iPhone12Mini: (60, 30),
+						.iPhone12: (72, 34),
+						.iPhone12Pro: (72, 34),
+						.iPhone12ProMax: (80, 42),
+						.iPhone13Mini: (60, 30),
+						.iPhone13: (72, 34),
+						.iPhone13Pro: (72, 34),
+						.iPhone13ProMax: (80, 42),
+						.iPhone14: (72, 34),
+						.iPhone14Plus: (80, 42),
+						.iPhone14Pro: (72, 34),
+						.iPhone14ProMax: (80, 42),
+						.iPhone15: (72, 34),
+						.iPhone15Plus: (80, 42),
+						.iPhone15Pro: (72, 34),
+						.iPhone15ProMax: (80, 42),
+						.iPhone16: (84, 36),
+						.iPhone16Plus: (96, 42),
+						.iPhone16Pro: (86, 38),
+						.iPhone16ProMax: (96, 42),
+						.iPhoneSE2: (177, 40),
+						.iPhoneSE3: (177, 40),
+					]
+					let modelName = UIDevice.current.ftModelName
+					let config = modelName.flatMap { layout[$0] } ?? (74, 44)
+					
+					let x = indicatorWindow!.frame.width - config.0
+					let width = config.1
+					
+					let indicator = FTLinearActivityIndicator(frame: CGRect(x: x, y: 7, width: width, height: 4.5))
+					if [.iPhoneSE2, .iPhoneSE3].contains(modelName) {
+						indicator.frame = CGRect(x: 172, y: 1.5, width: 31, height: 3)
+					}
+					indicator.isUserInteractionEnabled = false
+					indicator.hidesWhenStopped = false
+					indicator.startAnimating()
+					indicatorWindow?.addSubview(indicator)
+				}
+			}
+			guard let indicator = indicatorWindow?.subviews.first as? FTLinearActivityIndicator else {return}
+			if #available(iOS 13.0, *) {
+				let style = indicatorWindow?.windowScene?.statusBarManager?.statusBarStyle ?? .default
+				indicator.tintColor = switch style {
+				case .lightContent: .white
+				case .darkContent: .black
+				default: indicatorWindow?.traitCollection.userInterfaceStyle == .dark ? .white : .black
+				}
+			} else {
+				indicator.tintColor = statusBarStyle == .default ? UIColor.black : UIColor.white
+			}
+			if newValue {
+				indicatorWindow?.isHidden = self.isStatusBarHidden
+				indicator.isHidden = false
+				indicator.alpha = 1
+			} else {
+				UIView.animate(withDuration: 0.5, animations: {
+					indicator.alpha = 0
+				}) { (finished) in
+					if (finished) {
+						indicator.isHidden = !self.isNetworkActivityIndicatorVisible  // might have changed in the meantime
+						self.indicatorWindow?.isHidden = !self.isNetworkActivityIndicatorVisible || self.isStatusBarHidden
+					}
 				}
 			}
 		}
 	}
 
 	func ftUpdateNetworkActivityIndicatorAppearance() {
 		self.indicatorWindow?.isHidden = !self.isNetworkActivityIndicatorVisible || self.isStatusBarHidden
+		isNetworkActivityIndicatorVisible = isNetworkActivityIndicatorVisible
 	}
 	#endif
 }
@@ -146,11 +168,8 @@ extension UIApplication {
 extension UIViewController {
 	@objc final public class func configureLinearNetworkActivityIndicator() {
 		DispatchQueue.once {
-			let originalSelector = #selector(setNeedsStatusBarAppearanceUpdate)
-			let swizzledSelector = #selector(ftSetNeedsStatusBarAppearanceUpdate)
-			let originalMethod = class_getInstanceMethod(self, originalSelector)
-			let swizzledMethod = class_getInstanceMethod(self, swizzledSelector)
-			method_exchangeImplementations(originalMethod!, swizzledMethod!)
+			swizzle(original: #selector(setNeedsStatusBarAppearanceUpdate),
+					swizzled: #selector(ftSetNeedsStatusBarAppearanceUpdate))
 		}
 	}
 
@@ -190,4 +209,13 @@ extension DispatchQueue {
 		block()
 	}
 }
+
+@available(iOSApplicationExtension, unavailable)
+extension NSObject {
+	fileprivate class func swizzle(original: Selector, swizzled: Selector) {
+		let originalMethod = class_getInstanceMethod(self as AnyClass, original)
+		let swizzledMethod = class_getInstanceMethod(self as AnyClass, swizzled)
+		method_exchangeImplementations(originalMethod!, swizzledMethod!)
+	}
+}
 #endif
diff --git a/FTLinearActivityIndicator/Classes/UIDevice+Extension.swift b/FTLinearActivityIndicator/Classes/UIDevice+Extension.swift
@@ -37,6 +37,8 @@ public enum ModelName: String {
 	case iPhone16Plus = "iPhone17,4"
 	case iPhone16Pro = "iPhone17,1"
 	case iPhone16ProMax = "iPhone17,2"
+	case iPhoneSE2 = "iPhone12,8"
+	case iPhoneSE3 = "iPhone14,6"
 }
 
 public extension UIDevice {
diff --git a/README.md b/README.md
@@ -7,37 +7,10 @@
 [![Sponsor](https://img.shields.io/badge/Sponsor-ff40a0)](https://github.com/sponsors/futuretap)
 [![Mastodon](https://img.shields.io/mastodon/follow/000010558?domain=https%3A%2F%2Fmastodon.cloud)](https://mastodon.cloud/@ortwingentz)
 
-iPhones with a notch or Dynamic Island don't display the network activity indicator [anymore](http://www.futuretap.com/blog/fix-for-the-missing-network-activity-indicator-on-iphone-x). This framework brings it
-back by placing an activity indicator in the upper right of the screen on top of the
-regular status bar items on the following devices:
-
-- iPhone X
-- iPhone Xs
-- iPhone Xs Max
-- iPhone Xʀ
-- iPhone 11
-- iPhone 11 Pro
-- iPhone 11 Pro Max
-- iPhone 12
-- iPhone 12 mini
-- iPhone 12 Pro
-- iPhone 12 Pro Max
-- iPhone 13
-- iPhone 13 mini
-- iPhone 13 Pro
-- iPhone 13 Pro Max
-- iPhone 14
-- iPhone 14 Plus
-- iPhone 14 Pro
-- iPhone 14 Pro Max
-- iPhone 15
-- iPhone 15 Plus
-- iPhone 15 Pro
-- iPhone 15 Pro Max
-- iPhone 16
-- iPhone 16 Plus
-- iPhone 16 Pro
-- iPhone 16 Pro Max
+Since iOS 18, network activity indicator is no longer displayed. iPhones with a notch or Dynamic Island 
+[never displayed it](http://www.futuretap.com/blog/fix-for-the-missing-network-activity-indicator-on-iphone-x).
+This framework brings it back by placing an activity indicator in the upper right of the screen on top of the
+regular status bar items (on top of the clock on iPhone SE running iOS 18+).
 
 Since a circular indicator wouldn't fit, a rectangular [KITT scanner](https://giphy.com/gifs/80s-nbc-knight-rider-Bo2WsocASVBm0)-like indicator with a gradient is shown. The indicator UI can be used standalone or as a "fix" for the iOS network activity indicator (using the existing API).
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ public enum ModelName: String {`
`37`	`37`	`case iPhone16Plus = "iPhone17,4"`
`38`	`38`	`case iPhone16Pro = "iPhone17,1"`
`39`	`39`	`case iPhone16ProMax = "iPhone17,2"`
	`40`	`+ case iPhoneSE2 = "iPhone12,8"`
	`41`	`+ case iPhoneSE3 = "iPhone14,6"`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`public extension UIDevice {`