Remove Pesky Alerts, Fix optional data & Fix Typo

Author: RudyB

Deluge Remote.xcodeproj/project.pbxproj

@@ -33,6 +33,7 @@
 		472AA9672593FE4200529B45 /* TorrentSortingPopup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472AA9662593FE4200529B45 /* TorrentSortingPopup.swift */; };
 		472AA96A25940AE600529B45 /* SlideInPresentationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472AA96925940AE600529B45 /* SlideInPresentationManager.swift */; };
 		472AA96D25940B8C00529B45 /* SlideInPresentationController .swift in Sources */ = {isa = PBXBuildFile; fileRef = 472AA96C25940B8C00529B45 /* SlideInPresentationController .swift */; };
+		473CB8BD2595C9B700A4B3EF /* NotificationBannerSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 473CB8BC2595C9B700A4B3EF /* NotificationBannerSwift */; };
 		473D1F75258AE16E00045DB0 /* ChevronTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473D1F74258AE16E00045DB0 /* ChevronTableViewCell.swift */; };
 		473D1F79258B1C6E00045DB0 /* PlainCircularProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473D1F78258B1C6E00045DB0 /* PlainCircularProgressBar.swift */; };
 		473D1F7C258B1F7000045DB0 /* TorrentConnectedClientCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473D1F7B258B1F6F00045DB0 /* TorrentConnectedClientCell.swift */; };
@@ -150,6 +151,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				47E68797259088AA008C2969 /* Houston in Frameworks */,
+				473CB8BD2595C9B700A4B3EF /* NotificationBannerSwift in Frameworks */,
 				47E685DF25907925008C2969 /* PromiseKit in Frameworks */,
 				47E685EB259079D0008C2969 /* IQKeyboardManagerSwift in Frameworks */,
 				47E685CF25907874008C2969 /* Alamofire in Frameworks */,
@@ -399,6 +401,7 @@
 				47C801262592D09100A01831 /* ActiveLabel */,
 				470F5CFD2594A0E700B7155D /* FirebaseCrashlytics */,
 				470F5D012594A14600B7155D /* FirebaseAnalytics */,
+				473CB8BC2595C9B700A4B3EF /* NotificationBannerSwift */,
 			);
 			productName = "Deluge Remote";
 			productReference = 4716022E1DD4305800727CBD /* Deluge Remote.app */;
@@ -448,6 +451,7 @@
 				47C8011A259280F000A01831 /* XCRemoteSwiftPackageReference "expandable-collection-view-kit" */,
 				47C801252592D09100A01831 /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */,
 				470F5CFC2594A0E700B7155D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
+				473CB8BB2595C9B700A4B3EF /* XCRemoteSwiftPackageReference "NotificationBanner" */,
 			);
 			productRefGroup = 4716022F1DD4305800727CBD /* Products */;
 			projectDirPath = "";
@@ -720,7 +724,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "";
-				MARKETING_VERSION = 1.5;
+				MARKETING_VERSION = 1.5.1;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.rudybermudez.Deluge-Remote";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -752,7 +756,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "";
-				MARKETING_VERSION = 1.5;
+				MARKETING_VERSION = 1.5.1;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.rudybermudez.Deluge-Remote";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -795,6 +799,14 @@
 				minimumVersion = 7.3.1;
 			};
 		};
+		473CB8BB2595C9B700A4B3EF /* XCRemoteSwiftPackageReference "NotificationBanner" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Daltron/NotificationBanner.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 3.0.6;
+			};
+		};
 		47C8011A259280F000A01831 /* XCRemoteSwiftPackageReference "expandable-collection-view-kit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/RudyB/expandable-collection-view-kit.git";
@@ -880,6 +892,11 @@
 			package = 470F5CFC2594A0E700B7155D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
 			productName = FirebaseAnalytics;
 		};
+		473CB8BC2595C9B700A4B3EF /* NotificationBannerSwift */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 473CB8BB2595C9B700A4B3EF /* XCRemoteSwiftPackageReference "NotificationBanner" */;
+			productName = NotificationBannerSwift;
+		};
 		47C8011B259280F000A01831 /* ExpandableCollectionViewKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 47C8011A259280F000A01831 /* XCRemoteSwiftPackageReference "expandable-collection-view-kit" */;

Deluge Remote.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -49,13 +49,13 @@ enum ClientError: Error {
             case .unableToResumeTorrent(let errorMessage):
                 return "Unable to Resume Torrent. \(errorMessage.localizedDescription)"
             case .unableToParseTableViewTorrent:
-                return "The Data for Table View Torrent was unable to be parsed"
+                return "Unable to parse Torrent Overview"
             case .unableToDeleteTorrent:
                 return "The Torrent could not be deleted"
             case .unableToAddTorrent:
                 return "The Torrent could not be added"
             case .unableToParseTorrentInfo:
-                return "The Torrent Info could not be parsed"
+                return "The Torrent Metadata could not be parsed"
             case .unableToParseTorrentFiles:
                 return "The Torrent Files could not be parsed"
             case .failedToConvertTorrentToData:

Deluge Remote/Sources/API/DelugeClient.swift

@@ -91,7 +91,7 @@ struct PeerMetadata: Decodable {
 
 struct TrackerMetadata: Decodable {
     let send_stats: Bool?
-    let fails: Int
+    let fails: Int?
     let verified: Bool
     let scrape_incomplete: Int?
     let min_announce: Int?

Deluge Remote/Sources/Models/Deluge/TorrentMetadata.swift

@@ -79,7 +79,7 @@ class AboutSection: SettingsTableViewSection {
         let bugReports = MenuCell(label: "Bug Reports / Feature Requests", icon: UIImage(named: "menu/bug")!) {
             UIApplication.shared.open(URL(string: "https://github.com/RudyB/Deluge-Remote/issues/")!)
         }
-        let crashReporting = MenuCell(label: "Crash Reproting & Analytics", icon: UIImage(named: "menu/crash-reporting")!) { [weak self] in
+        let crashReporting = MenuCell(label: "Crash Reporting & Analytics", icon: UIImage(named: "menu/crash-reporting")!) { [weak self] in
             self?.delegate?.showCrashReportingView()
         }
         let logs = MenuCell(label: "Logs", icon: UIImage(named: "menu/logs")!) { [weak self] in

Deluge Remote/Sources/Models/View Models/SettingsTableViewModel.swift

@@ -68,6 +68,9 @@ fileprivate class MainSection: TableViewSection {
         cells.append(MenuCell(label: "MBProgressHUD", icon: UIImage(named: "menu/github")){
             UIApplication.shared.open(URL(string: "https://github.com/jdg/MBProgressHUD")!)
         })
+        cells.append(MenuCell(label: "NotificationBanner", icon: UIImage(named: "menu/github")){
+            UIApplication.shared.open(URL(string: "https://github.com/Daltron/NotificationBanner")!)
+        })
         cells.append(MenuCell(label: "PromiseKit", icon: UIImage(named: "menu/github")){
             UIApplication.shared.open(URL(string: "https://github.com/mxcl/PromiseKit")!)
         })

Deluge Remote/Sources/View Controllers/AcknowledgementsTableViewController.swift

@@ -9,6 +9,7 @@
 import Houston
 import PromiseKit
 import UIKit
+import NotificationBannerSwift
 
 protocol MainTableViewControllerDelegate: AnyObject {
     func torrentSelected(torrentHash: String)
@@ -485,7 +486,8 @@ class MainTableViewController: UITableViewController, Storyboarded {
 
             if let error = error as? ClientError {
                 Logger.error(error.domain())
-                showAlert(target: self, title: "Error", message: error.domain())
+                let banner = FloatingNotificationBanner(title: "Client Error", subtitle: error.domain(), style: .danger)
+                banner.show()
             } else {
                 Logger.error(error)
             }

Deluge Remote/Sources/View Controllers/MainTableViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import Houston
+import NotificationBannerSwift
 
 protocol TorrentDetailViewDelegate: AnyObject
 {
@@ -111,11 +112,11 @@ class TorrentDetailViewTabController: UITabBarController, Storyboarded {
                 Logger.verbose("New Data")
                 self?.torrentData = torrent
                 self?.title = torrent.name
-            }.catch { [weak self] error in
+            }.catch { error in
                 Logger.error(error)
-                if let self = self, let error = error as? ClientError {
-                    showAlert(target: self, title: "Error", message: error.domain(),
-                              style: .alert)
+                if let error = error as? ClientError {
+                    let banner = FloatingNotificationBanner(title: "Client Error", subtitle: error.domain(), style: .danger)
+                    banner.show()
                 }
             }
     }
@@ -134,8 +135,8 @@ class TorrentDetailViewTabController: UITabBarController, Storyboarded {
                 if case .torrentHasNoFiles = error {
                     self.filesVC.tabBarItem.isEnabled = false
                 } else {
-                    showAlert(target: self, title: "Error", message: error.domain(),
-                              style: .alert)
+                    let banner = FloatingNotificationBanner(title: "Client Error", subtitle: error.domain(), style: .danger)
+                    banner.show()
                 }
             }
     }