13.8.3

Author: relatedcode

ProgressHUD.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'ProgressHUD'
-  s.version = '13.8.2'
+  s.version = '13.8.3'
   s.license = 'MIT'
 
   s.summary = 'A lightweight and easy-to-use Progress HUD for iOS.'

ProgressHUD/Sources/ProgressHUD+Enums.swift

@@ -9,7 +9,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import UIKit
+import Foundation
 
 // MARK: - AnimationType
 public enum AnimationType: CaseIterable {
@@ -33,52 +33,3 @@ public enum AnimatedIcon {
 	case failed
 	case added
 }
-
-// MARK: - AlertIcon
-public enum AlertIcon: CaseIterable {
-	case heart
-	case doc
-	case bookmark
-	case moon
-	case star
-	case exclamation
-	case flag
-	case message
-	case question
-	case bolt
-	case shuffle
-	case eject
-	case card
-	case rotate
-	case like
-	case dislike
-	case privacy
-	case cart
-	case search
-}
-
-extension AlertIcon {
-	var image: UIImage? {
-		switch self {
-		case .heart:		return UIImage(systemName: "heart.fill")
-		case .doc:			return UIImage(systemName: "doc.fill")
-		case .bookmark:		return UIImage(systemName: "bookmark.fill")
-		case .moon:			return UIImage(systemName: "moon.fill")
-		case .star:			return UIImage(systemName: "star.fill")
-		case .exclamation:	return UIImage(systemName: "exclamationmark.triangle.fill")
-		case .flag:			return UIImage(systemName: "flag.fill")
-		case .message:		return UIImage(systemName: "envelope.fill")
-		case .question:		return UIImage(systemName: "questionmark.diamond.fill")
-		case .bolt:			return UIImage(systemName: "bolt.fill")
-		case .shuffle:		return UIImage(systemName: "shuffle")
-		case .eject:		return UIImage(systemName: "eject.fill")
-		case .card:			return UIImage(systemName: "creditcard.fill")
-		case .rotate:		return UIImage(systemName: "rotate.right.fill")
-		case .like:			return UIImage(systemName: "hand.thumbsup.fill")
-		case .dislike:		return UIImage(systemName: "hand.thumbsdown.fill")
-		case .privacy:		return UIImage(systemName: "hand.raised.fill")
-		case .cart:			return UIImage(systemName: "cart.fill")
-		case .search:		return UIImage(systemName: "magnifyingglass")
-		}
-	}
-}

ProgressHUD/Sources/ProgressHUD+Public.swift

@@ -163,17 +163,11 @@ public extension ProgressHUD {
 // MARK: - Static Image
 public extension ProgressHUD {
 
-	class func show(_ text: String? = nil, icon: AlertIcon, interaction: Bool = true, delay: TimeInterval? = nil) {
-		DispatchQueue.main.async {
-			let image = icon.image?.withTintColor(shared.colorAnimation, renderingMode: .alwaysOriginal)
-			shared.setup(text: text, staticImage: image, interaction: interaction, delay: delay)
-		}
-	}
-
 	class func show(_ text: String? = nil, symbol: String, interaction: Bool = true, delay: TimeInterval? = nil) {
 		DispatchQueue.main.async {
-			let image = UIImage(systemName: symbol)?.withTintColor(shared.colorAnimation, renderingMode: .alwaysOriginal)
-			shared.setup(text: text, staticImage: image, interaction: interaction, delay: delay)
+			let image = UIImage(systemName: symbol) ?? UIImage(systemName: "questionmark")
+			let colored = image?.withTintColor(shared.colorAnimation, renderingMode: .alwaysOriginal)
+			shared.setup(text: text, staticImage: colored, interaction: interaction, delay: delay)
 		}
 	}
 

ProgressHUD/app.xcodeproj/project.pbxproj

@@ -337,7 +337,7 @@
 				INFOPLIST_FILE = app/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 13.8.2;
+				MARKETING_VERSION = 13.8.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.relatedcode.progresshud;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -367,7 +367,7 @@
 				INFOPLIST_FILE = app/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 13.8.2;
+				MARKETING_VERSION = 13.8.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.relatedcode.progresshud;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

ProgressHUD/app/ViewController.swift

@@ -31,40 +31,13 @@ extension AnimationType {
 	}
 }
 
-// MARK: - AlertIcon
-extension AlertIcon {
-	var text: String {
-		switch self {
-		case .heart:		return "Heart"
-		case .doc:			return "Doc"
-		case .bookmark:		return "Bookmark"
-		case .moon:			return "Moon"
-		case .star:			return "Star"
-		case .exclamation:	return "Exclamation"
-		case .flag:			return "Flag"
-		case .message:		return "Message"
-		case .question:		return "Question"
-		case .bolt:			return "Bolt"
-		case .shuffle:		return "Shuffle"
-		case .eject:		return "Eject"
-		case .card:			return "Card"
-		case .rotate:		return "Rotate"
-		case .like:			return "Like"
-		case .dislike:		return "Dislike"
-		case .privacy:		return "Privacy"
-		case .cart:			return "Cart"
-		case .search:		return "Search"
-		}
-	}
-}
-
 // MARK: - ViewController
 class ViewController: UITableViewController {
 
 	@IBOutlet var cellText: UITableViewCell!
 
 	var animations = AnimationType.allCases
-	var alerticons = AlertIcon.allCases
+	var symbols: [String] = []
 
 	var actions1: [String] = []
 	var actions2: [String] = []
@@ -92,6 +65,10 @@ class ViewController: UITableViewController {
 		super.viewDidLoad()
 		title = "ProgressHUD"
 
+		DispatchQueue.main.async {
+			self.loadSymbols()
+		}
+
 		actions1.append("Animation - No text")
 		actions1.append("Animation - Short text")
 		actions1.append("Animation - Longer text")
@@ -105,6 +82,8 @@ class ViewController: UITableViewController {
 		actions3.append("Progress - 60%")
 		actions3.append("Progress - 90%")
 
+		actions4.append("Symbol - No text")
+		actions4.append("Symbol - Short text")
 		actions4.append("Success - No text")
 		actions4.append("Success - Short text")
 		actions4.append("Error - No text")
@@ -158,7 +137,7 @@ extension ViewController {
 extension ViewController {
 
 	override func numberOfSections(in tableView: UITableView) -> Int {
-		return 9
+		return 8
 	}
 
 	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -171,32 +150,30 @@ extension ViewController {
 		if (section == 5) { return actions3.count	}
 		if (section == 6) { return actions4.count	}
 		if (section == 7) { return actions5.count	}
-		if (section == 8) { return alerticons.count	}
 
 		return 0
 	}
 
 	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-		if (indexPath.section == 0) && (indexPath.row == 0) { return self.tableView(tableView, cellWithText: "Show Banner")	}
-		if (indexPath.section == 0) && (indexPath.row == 1) { return self.tableView(tableView, cellWithText: "Hide Banner")	}
-
-		if (indexPath.section == 1) && (indexPath.row == 0) { return cellText	}
-		if (indexPath.section == 1) && (indexPath.row == 1) { return self.tableView(tableView, cellWithText: "Dismiss Keyboard") }
-		if (indexPath.section == 1) && (indexPath.row == 2) { return self.tableView(tableView, cellWithText: "Dismiss HUD")	}
-		if (indexPath.section == 1) && (indexPath.row == 3) { return self.tableView(tableView, cellWithText: "Remove HUD")	}
-
-		if (indexPath.section == 2) { return self.tableView(tableView, cellWithText: animations[indexPath.row].text)	}
-		if (indexPath.section == 3) { return self.tableView(tableView, cellWithText: actions1[indexPath.row])			}
-		if (indexPath.section == 4) { return self.tableView(tableView, cellWithText: actions2[indexPath.row])			}
-		if (indexPath.section == 5) { return self.tableView(tableView, cellWithText: actions3[indexPath.row])			}
-		if (indexPath.section == 6) { return self.tableView(tableView, cellWithText: actions4[indexPath.row])			}
-		if (indexPath.section == 7) { return self.tableView(tableView, cellWithText: actions5[indexPath.row])			}
-		if (indexPath.section == 8) { return self.tableView(tableView, cellWithText: alerticons[indexPath.row].text)	}
+		if (indexPath.section == 0) && (indexPath.row == 0) { return cellWithText(tableView, "Show Banner") }
+		if (indexPath.section == 0) && (indexPath.row == 1) { return cellWithText(tableView, "Hide Banner") }
+
+		if (indexPath.section == 1) && (indexPath.row == 0) { return cellText }
+		if (indexPath.section == 1) && (indexPath.row == 1) { return cellWithText(tableView, "Dismiss Keyboard") }
+		if (indexPath.section == 1) && (indexPath.row == 2) { return cellWithText(tableView, "Dismiss HUD") }
+		if (indexPath.section == 1) && (indexPath.row == 3) { return cellWithText(tableView, "Remove HUD") }
+
+		if (indexPath.section == 2) { return cellWithText(tableView, animations[indexPath.row].text) }
+		if (indexPath.section == 3) { return cellWithText(tableView, actions1[indexPath.row]) }
+		if (indexPath.section == 4) { return cellWithText(tableView, actions2[indexPath.row]) }
+		if (indexPath.section == 5) { return cellWithText(tableView, actions3[indexPath.row]) }
+		if (indexPath.section == 6) { return cellWithText(tableView, actions4[indexPath.row]) }
+		if (indexPath.section == 7) { return cellWithText(tableView, actions5[indexPath.row]) }
 
 		return UITableViewCell()
 	}
 
-	func tableView(_ tableView: UITableView, cellWithText text: String) -> UITableViewCell {
+	func cellWithText(_ tableView: UITableView, _ text: String) -> UITableViewCell {
 		var cell: UITableViewCell! = tableView.dequeueReusableCell(withIdentifier: "cell")
 		if (cell == nil) { cell = UITableViewCell(style: .default, reuseIdentifier: "cell") }
 		cell.textLabel?.text = text
@@ -212,7 +189,6 @@ extension ViewController {
 		if (section == 5) { return "Progress"			}
 		if (section == 6) { return "Action - Static"	}
 		if (section == 7) { return "Action - Animated"	}
-		if (section == 8) { return "Alert Icons"		}
 		return nil
 	}
 }
@@ -259,10 +235,12 @@ extension ViewController {
 		}
 
 		if (indexPath.section == 6) {
-			if (indexPath.row == 0) { ProgressHUD.showSuccess()				}
-			if (indexPath.row == 1) { ProgressHUD.showSuccess(textSuccess)	}
-			if (indexPath.row == 2) { ProgressHUD.showError()				}
-			if (indexPath.row == 3) { ProgressHUD.showError(textError)		}
+			if (indexPath.row == 0) { ProgressHUD.show(symbol: symbol())			}
+			if (indexPath.row == 1) { ProgressHUD.show(textAdded, symbol: symbol())	}
+			if (indexPath.row == 2) { ProgressHUD.showSuccess()						}
+			if (indexPath.row == 3) { ProgressHUD.showSuccess(textSuccess)			}
+			if (indexPath.row == 4) { ProgressHUD.showError()						}
+			if (indexPath.row == 5) { ProgressHUD.showError(textError)				}
 		}
 
 		if (indexPath.section == 7) {
@@ -273,21 +251,26 @@ extension ViewController {
 			if (indexPath.row == 4) { ProgressHUD.showAdded()				}
 			if (indexPath.row == 5) { ProgressHUD.showAdded(textAdded)		}
 		}
-
-		if (indexPath.section == 8) {
-			let alerticon = alerticons[indexPath.row]
-			ProgressHUD.show(randomText(), icon: alerticon)
-		}
 	}
 }
 
-// MARK: - Text Methods
+// MARK: - Helper Methods
 extension ViewController {
 
-	func randomText() -> String? {
-		let array = [textShort, textLong, textSucceed, textFailed, textAdded, nil]
-		let index = Int.random(in: 0..<array.count)
-		return array[index]
+	func loadSymbols() {
+		if let bundle = Bundle(identifier: "com.apple.CoreGlyphs") {
+		if let path = bundle.path(forResource: "symbol_search", ofType: "plist") {
+				if let temp = NSDictionary(contentsOfFile: path) {
+					if let values = temp as? [String: [String]] {
+						symbols = Array(values.keys)
+					}
+				}
+			}
+		}
+	}
+
+	func symbol() -> String {
+		symbols.randomElement() ?? "questionmark"
 	}
 
 	func toggleText() -> String {

README.md

@@ -2,6 +2,11 @@
 
 ## WHAT'S NEW
 
+### Version: 13.8.3
+
+- Removed the `AlertIcon` feature. Please use the `symbol:` parameter for similar functionality.
+- The `questionmark` symbol will be displayed when the specified symbol name does not exist.
+
 ### Version: 13.8.2
 
 - Refactored internal code architecture.
@@ -122,14 +127,6 @@ ProgressHUD.showProgress(0.15)
 ProgressHUD.showProgress("Loading...", 0.42)
 ```
 
-```swift
-ProgressHUD.show(icon: .heart)
-```
-
-```swift
-ProgressHUD.show("Some text...", icon: .privacy, delay: 2.0)
-```
-
 ```swift
 ProgressHUD.show(symbol: "box.truck")
 ```
@@ -189,13 +186,10 @@ ProgressHUD.fontStatus = .boldSystemFont(ofSize: 24)
 
 ```swift
 ProgressHUD.imageSuccess = UIImage(named: "success.png")
-```
-
-```swift
 ProgressHUD.imageError = UIImage(named: "error.png")
 ```
 
-A comprehensive list of the predefined animation and icon types:
+A comprehensive list of the predefined animation types:
 
 ```swift
 public enum AnimationType {
@@ -222,30 +216,6 @@ public enum AnimatedIcon {
 }
 ```
 
-```swift
-public enum AlertIcon {
-	case heart
-	case doc
-	case bookmark
-	case moon
-	case star
-	case exclamation
-	case flag
-	case message
-	case question
-	case bolt
-	case shuffle
-	case eject
-	case card
-	case rotate
-	case like
-	case dislike
-	case privacy
-	case cart
-	case search
-}
-```
-
 ## LICENSE
 
 MIT License

VERSION.txt

@@ -1 +1 @@
-13.8.2
+13.8.3