device-specific position and width

depending on the device corner radius and notch width;
keeping clear the camera/mic indicator;

Author: futuretap

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - FTLinearActivityIndicator (1.1)
+  - FTLinearActivityIndicator (1.4)
 
 DEPENDENCIES:
   - FTLinearActivityIndicator (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  FTLinearActivityIndicator: e044fb1ca7f9776a3058f64b5dfe02e1d56ba44b
+  FTLinearActivityIndicator: 572f5f623e357181d94731e63a406db683ec177b
 
 PODFILE CHECKSUM: d653595fcbe53f0d4160295f6c50f84621e4a209
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.10.1

FTLinearActivityIndicator.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name             = 'FTLinearActivityIndicator'
-  s.version          = '1.3.1'
+  s.version          = '1.4'
   s.summary          = 'Add the missing network activity indicator on iPhone X'
 
   s.description      = <<-DESC
 	 iPhones with a notch such as X, XS, XR, 11 (Pro), 12 (mini, Pro) don't display the
 	 network activity indicator anymore. This pod brings it back by placing an activity
-	 indicator in the upper left of the screen on top of the regular status bar items.
-	 Since a circular ndicator wouldn't fit, a rectangular "KITT scanner" like indicator
+	 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).
                        DESC

FTLinearActivityIndicator/Classes/UIApplication+LinearNetworkActivityIndicator.swift

@@ -12,7 +12,7 @@ extension UIApplication {
 	@objc final public class func configureLinearNetworkActivityIndicatorIfNeeded() {
 		#if !targetEnvironment(macCatalyst)
 		if #available(iOS 11.0, *) {
-			// detect iPhone X
+			// detect notch
 			if let window = shared.windows.first, window.safeAreaInsets.bottom > 0.0 {
 				if UIDevice.current.userInterfaceIdiom != .pad {
 					configureLinearNetworkActivityIndicator()
@@ -65,7 +65,30 @@ extension UIApplication {
 				indicatorWindow?.windowLevel = UIWindow.Level.statusBar + 1
 				indicatorWindow?.isUserInteractionEnabled = false
 
-				let indicator = FTLinearActivityIndicator(frame: CGRect(x: indicatorWindow!.frame.width - 74, y: 6, width: 44, height: 4))
+				// notched iPhones differ in corner radius and right notch width
+				// => lookup margin from right window edge, and width
+				let layout: [String: (CGFloat, CGFloat)] = [
+					"iPhone10,3": (74, 44), // iPhone X
+					"iPhone10,6": (74, 44), // iPhone X
+					"iPhone11,2": (74, 44), // Phone Xs
+					"iPhone11,4": (74, 44), // iPhone Xs Max
+					"iPhone11,6": (74, 44), // iPhone Xs Max
+					"iPhone11,8": (70, 40), // iPhone XR
+					"iPhone12,1": (70, 40), // iPhone 11
+					"iPhone12,3": (60, 34), // iPhone 11 Pro
+					"iPhone12,5": (74, 44), // iPhone 11 Pro Max
+					"iPhone13,1": (60, 30), // iPhone 12 Mini
+					"iPhone13,2": (72, 34), // iPhone 12
+					"iPhone13,3": (72, 34), // iPhone 12 Pro
+					"iPhone13,4": (80, 42), // iPhone 12 Pro Max
+				]
+				let modelName = UIDevice.current.ftModelName
+				let config = layout[modelName] ?? (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()

FTLinearActivityIndicator/Classes/UIDevice+Extension.swift

@@ -0,0 +1,21 @@
+//
+//  UIDevice+Extension.swift
+//  FTLinearActivityIndicator
+//
+//  Created by Ortwin Gentz on 15.03.21.
+//
+
+import Foundation
+
+public extension UIDevice {
+	var ftModelName: String {
+		var systemInfo = utsname()
+		uname(&systemInfo)
+		let machineMirror = Mirror(reflecting: systemInfo.machine)
+		let identifier = machineMirror.children.reduce("") { identifier, element in
+			guard let value = element.value as? Int8, value != 0 else { return identifier }
+			return identifier + String(UnicodeScalar(UInt8(value)))
+		}
+		return identifier
+	}
+}