diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj index 93f5dd4..0d6c1b7 100644 --- a/AutoCat.xcodeproj/project.pbxproj +++ b/AutoCat.xcodeproj/project.pbxproj @@ -53,7 +53,6 @@ 7A2E11292CCE395300E5CA17 /* OptionalDatePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2E11282CCE395300E5CA17 /* OptionalDatePicker.swift */; }; 7A2E6FA72C42B3AD00C40DA7 /* AutoCatCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AF6D1EF2677C03B0086EA64 /* AutoCatCore.framework */; }; 7A3399AB299063370087DF98 /* SearchControllerExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3399AA299063370087DF98 /* SearchControllerExt.swift */; }; - 7A35177B27E23F8800DC538C /* Eureka in Frameworks */ = {isa = PBXBuildFile; productRef = 7A35177A27E23F8800DC538C /* Eureka */; }; 7A3E12D72C7B42B700EE710D /* UserDefaults+Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3E12D62C7B42B700EE710D /* UserDefaults+Settings.swift */; }; 7A3E30F32C18840600567704 /* ActivityItemSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3E30F22C18840600567704 /* ActivityItemSource.swift */; }; 7A3F07AB24360DC800E59687 /* Dated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F07AA24360DC800E59687 /* Dated.swift */; }; @@ -128,7 +127,6 @@ 7A8A2209248D10EC0073DFD9 /* ResizeImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A8A2208248D10EC0073DFD9 /* ResizeImage.swift */; }; 7A8A220B248D67B60073DFD9 /* VehicleReportImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A8A220A248D67B60073DFD9 /* VehicleReportImage.swift */; }; 7A8AB76525A0DB8F00ECF2C1 /* BundleVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A8AB76425A0DB8F00ECF2C1 /* BundleVersion.swift */; }; - 7A8AB76B25A1D95500ECF2C1 /* SourceStatusRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A8AB76A25A1D95500ECF2C1 /* SourceStatusRow.swift */; }; 7A91894F29A2BD8700519C74 /* GestureRecognizers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A91894E29A2BD8700519C74 /* GestureRecognizers.swift */; }; 7A961C6C2C4C3C8600CE2211 /* TextRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A961C6B2C4C3C8600CE2211 /* TextRowView.swift */; }; 7A961C6E2C4C3C9E00CE2211 /* LinkRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A961C6D2C4C3C9E00CE2211 /* LinkRowView.swift */; }; @@ -397,7 +395,6 @@ 7A8A220A248D67B60073DFD9 /* VehicleReportImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleReportImage.swift; sourceTree = ""; }; 7A8AB76425A0DB8F00ECF2C1 /* BundleVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleVersion.swift; sourceTree = ""; }; 7A8AB76725A0DC8200ECF2C1 /* DebugInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugInfo.swift; sourceTree = ""; }; - 7A8AB76A25A1D95500ECF2C1 /* SourceStatusRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceStatusRow.swift; sourceTree = ""; }; 7A91894E29A2BD8700519C74 /* GestureRecognizers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GestureRecognizers.swift; sourceTree = ""; }; 7A92D0AB240425B100EF3B77 /* ATGMediaBrowser.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ATGMediaBrowser.framework; path = Carthage/Build/iOS/ATGMediaBrowser.framework; sourceTree = ""; }; 7A961C6B2C4C3C8600CE2211 /* TextRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextRowView.swift; sourceTree = ""; }; @@ -473,7 +470,6 @@ 7AC3554A2969652F00889457 /* SwiftEntryKit in Frameworks */, 7ACBB91E2CB9B155005A5168 /* Mockable in Frameworks */, 7AF6D2042677C03B0086EA64 /* AutoCatCore.framework in Frameworks */, - 7A35177B27E23F8800DC538C /* Eureka in Frameworks */, 7A96AE2F246B2BCD00297C33 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -530,14 +526,6 @@ path = SettingsService; sourceTree = ""; }; - 7A0B969D257D6CB3000B39AD /* eureka */ = { - isa = PBXGroup; - children = ( - 7A8AB76A25A1D95500ECF2C1 /* SourceStatusRow.swift */, - ); - path = eureka; - sourceTree = ""; - }; 7A10226A2C551EA200B84627 /* LocationEditScreen */ = { isa = PBXGroup; children = ( @@ -869,7 +857,6 @@ 7A6DD901242BF48D009DE740 /* Views */ = { isa = PBXGroup; children = ( - 7A0B969D257D6CB3000B39AD /* eureka */, 7A6DD902242BF4A5009DE740 /* PlateView.swift */, 7A6DD90B24335A6D009DE740 /* FlagLayer.swift */, 7AB67E8B2435C38700258F61 /* CustomTextField.swift */, @@ -1125,7 +1112,6 @@ 7AF58D332402A91C00CE01A0 /* Kingfisher */, 7A813DC02508C4D900CC93B9 /* ExceptionCatcher */, 7AABDE1C2532F3EB0041AFC6 /* PKHUD */, - 7A35177A27E23F8800DC538C /* Eureka */, 7AC355492969652F00889457 /* SwiftEntryKit */, 7ADF23052C25B5BF002624FF /* RealmSwift */, 7ACBB91D2CB9B155005A5168 /* Mockable */, @@ -1248,7 +1234,6 @@ 7A05160F241412CA00FC55AC /* XCRemoteSwiftPackageReference "SwiftDate" */, 7A813DBF2508C4D900CC93B9 /* XCRemoteSwiftPackageReference "ExceptionCatcher" */, 7AABDE1B2532F3EB0041AFC6 /* XCRemoteSwiftPackageReference "PKHUD" */, - 7A35177927E23F8800DC538C /* XCRemoteSwiftPackageReference "Eureka" */, 7AC355482969652F00889457 /* XCRemoteSwiftPackageReference "SwiftEntryKit" */, 7A1CF7FD29A41C2F007962DA /* XCRemoteSwiftPackageReference "realm-swift" */, 7A6C4D9C2C56BCA600982597 /* XCRemoteSwiftPackageReference "SwiftLocation" */, @@ -1323,7 +1308,6 @@ 7A14416E2C297F7C00E79018 /* Coordinator.swift in Sources */, 7A6DD90824329144009DE740 /* CenterTextLayer.swift in Sources */, 7A99406426E4BFAE002E9CB6 /* VehicleNoteCell.swift in Sources */, - 7A8AB76B25A1D95500ECF2C1 /* SourceStatusRow.swift in Sources */, 7AC3554C29696A1C00889457 /* MainTabController.swift in Sources */, 7A813DC32508EE4F00CC93B9 /* EventCell.swift in Sources */, 7A1441682C297EFD00E79018 /* NotesViewModel.swift in Sources */, @@ -1975,14 +1959,6 @@ minimumVersion = 10.36.0; }; }; - 7A35177927E23F8800DC538C /* XCRemoteSwiftPackageReference "Eureka" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/xmartlabs/Eureka"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 5.0.0; - }; - }; 7A6C4D9C2C56BCA600982597 /* XCRemoteSwiftPackageReference "SwiftLocation" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/malcommac/SwiftLocation.git"; @@ -2039,11 +2015,6 @@ package = 7A1CF7FD29A41C2F007962DA /* XCRemoteSwiftPackageReference "realm-swift" */; productName = RealmSwift; }; - 7A35177A27E23F8800DC538C /* Eureka */ = { - isa = XCSwiftPackageProductDependency; - package = 7A35177927E23F8800DC538C /* XCRemoteSwiftPackageReference "Eureka" */; - productName = Eureka; - }; 7A6C4D9D2C56BCA600982597 /* SwiftLocation */ = { isa = XCSwiftPackageProductDependency; package = 7A6C4D9C2C56BCA600982597 /* XCRemoteSwiftPackageReference "SwiftLocation" */; diff --git a/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b8692ad..8f2148b 100644 --- a/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,15 +1,6 @@ { - "originHash" : "457694e6162dd513aa4b1f33a0e4319bbd6de88b35dc652bf9fa41e06ea431da", + "originHash" : "d6bab97967371dd248cd5b3fdb49293879398c897bea34714c48fd3d4cb90fb1", "pins" : [ - { - "identity" : "eureka", - "kind" : "remoteSourceControl", - "location" : "https://github.com/xmartlabs/Eureka", - "state" : { - "revision" : "028ef8e3191a256b8f6b8bb6b9496efcb0762dbc", - "version" : "5.5.0" - } - }, { "identity" : "exceptioncatcher", "kind" : "remoteSourceControl", diff --git a/AutoCat/Views/eureka/SourceStatusRow.swift b/AutoCat/Views/eureka/SourceStatusRow.swift deleted file mode 100644 index 520faeb..0000000 --- a/AutoCat/Views/eureka/SourceStatusRow.swift +++ /dev/null @@ -1,75 +0,0 @@ -import UIKit -import Eureka -import AutoCatCore - -extension DebugInfoStatus { - var color: UIColor { - switch self { - case .success: return .systemGreen - case .error: return .systemRed - case .warning: return .systemOrange - } - } -} - -class SourceStatusCell: Cell, CellType { - private var circle: UIImageView! - - required init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { - super.init(style: style, reuseIdentifier: reuseIdentifier) - } - - required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - } - - override func setup() { - super.setup() - - self.selectionStyle = .none - - self.circle = UIImageView(frame: .zero) - self.circle.translatesAutoresizingMaskIntoConstraints = false - self.circle.image = UIImage(systemName: "circle.fill") - self.contentView.addSubview(self.circle) - NSLayoutConstraint.activate([ - self.circle.trailingAnchor.constraint(equalTo: self.contentView.layoutMarginsGuide.trailingAnchor), - self.circle.centerYAnchor.constraint(equalTo: self.contentView.centerYAnchor) - ]) - } - - override func update() { - super.update() - - self.detailTextLabel?.text = nil - if let value = row.value { - self.circle.tintColor = value.status.color - self.accessoryType = value.error == nil ? .none : .disclosureIndicator - } else { - self.circle.tintColor = .systemGray - self.accessoryType = .none - } - } -} - -final class SourceStatusRow: Row, RowType { - required init(tag: String?) { - super.init(tag: tag) - cellProvider = CellProvider() - self.onCellSelection { cell, row in - guard let error = row.value?.error else { - return - } - - let title = row.title - - DispatchQueue.main.async { - if let controller = cell.parentViewController { - let alert = UIAlertController(title: title, message: error, preferredStyle: .alert) - alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil)) - controller.present(alert, animated: true) - } - } - } - } -}