diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj index 5c7022c..0fbfaf7 100644 --- a/AutoCat.xcodeproj/project.pbxproj +++ b/AutoCat.xcodeproj/project.pbxproj @@ -50,6 +50,8 @@ 7A6DD90A24329541009DE740 /* RoadNumbers2.0.otf in Resources */ = {isa = PBXBuildFile; fileRef = 7A6DD90924329541009DE740 /* RoadNumbers2.0.otf */; }; 7A6DD90C24335A6D009DE740 /* FlagLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6DD90B24335A6D009DE740 /* FlagLayer.swift */; }; 7A6E03282485951700DB22ED /* OwnersController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6E03272485951700DB22ED /* OwnersController.swift */; }; + 7A6F095E26DB9F85003A965D /* NotesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6F095D26DB9F85003A965D /* NotesController.swift */; }; + 7A6F096026DBF588003A965D /* VehicleNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6F095F26DBF588003A965D /* VehicleNote.swift */; }; 7A7547E024032CB6004E8406 /* VehiclePhotoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A7547DF24032CB6004E8406 /* VehiclePhotoCell.swift */; }; 7A761C042677F18E0005F28F /* Api.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A11474323FF06CA00B424AF /* Api.swift */; }; 7A761C052677F1BC0005F28F /* CocoaError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A27ADF824A09CAD0035F39E /* CocoaError.swift */; }; @@ -68,25 +70,21 @@ 7A8AB76B25A1D95500ECF2C1 /* SourceStatusRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A8AB76A25A1D95500ECF2C1 /* SourceStatusRow.swift */; }; 7A96AE2D246B2B7400297C33 /* GoogleSignInController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A96AE2C246B2B7400297C33 /* GoogleSignInController.swift */; }; 7A96AE2F246B2BCD00297C33 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A96AE2E246B2BCD00297C33 /* WebKit.framework */; }; + 7A99406426E4BFAE002E9CB6 /* VehicleNoteCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A99406326E4BFAE002E9CB6 /* VehicleNoteCell.swift */; }; 7A9FEEC82529AB23001CA50E /* RxRealmDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A9FEEC72529AB23001CA50E /* RxRealmDataSource.swift */; }; - 7AA7BC2C25A5DFB80053A5D5 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 7A11471C23FEA18700B424AF /* RxSwift */; }; - 7AA7BC2D25A5DFB80053A5D5 /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = 7A11471E23FEA18700B424AF /* RxRelay */; }; - 7AA7BC2E25A5DFB80053A5D5 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 7A11472023FEA18700B424AF /* RxCocoa */; }; - 7AA7BC2F25A5DFB80053A5D5 /* RxBlocking in Frameworks */ = {isa = PBXBuildFile; productRef = 7A11472223FEA18700B424AF /* RxBlocking */; }; - 7AA7BC3025A5DFB80053A5D5 /* Realm in Frameworks */ = {isa = PBXBuildFile; productRef = 7A11472523FEA1F400B424AF /* Realm */; }; - 7AA7BC3125A5DFB80053A5D5 /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 7A11472723FEA1F400B424AF /* RealmSwift */; }; - 7AA7BC3225A5DFB80053A5D5 /* RxRealm in Frameworks */ = {isa = PBXBuildFile; productRef = 7A530B8A240181F500CBFE6E /* RxRealm */; }; + 7AA54C1C26CD977A00F2BF28 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 7AA54C1B26CD977A00F2BF28 /* RxCocoa */; }; + 7AA54C1E26CD977A00F2BF28 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 7AA54C1D26CD977A00F2BF28 /* RxSwift */; settings = {ATTRIBUTES = (Required, ); }; }; + 7AA54C2026CD977A00F2BF28 /* RxRealm in Frameworks */ = {isa = PBXBuildFile; productRef = 7AA54C1F26CD977A00F2BF28 /* RxRealm */; }; 7AA7BC3325A5DFB80053A5D5 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 7AF58D332402A91C00CE01A0 /* Kingfisher */; }; - 7AA7BC3425A5DFB80053A5D5 /* SwiftDate in Frameworks */ = {isa = PBXBuildFile; productRef = 7A051610241412CA00FC55AC /* SwiftDate */; }; 7AA7BC3525A5DFB80053A5D5 /* ExceptionCatcher in Frameworks */ = {isa = PBXBuildFile; productRef = 7A813DC02508C4D900CC93B9 /* ExceptionCatcher */; }; 7AA7BC3625A5DFB80053A5D5 /* PKHUD in Frameworks */ = {isa = PBXBuildFile; productRef = 7AABDE1C2532F3EB0041AFC6 /* PKHUD */; }; - 7AA7BC3725A5DFB80053A5D5 /* DifferenceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7AABDE22253327F10041AFC6 /* DifferenceKit */; }; 7AA7BC3825A5DFB80053A5D5 /* Eureka in Frameworks */ = {isa = PBXBuildFile; productRef = 7AEF47A3253DC4D2001D6238 /* Eureka */; }; - 7AABB1F0267E9CAA00D7AB32 /* DifferenceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7AABB1EF267E9CAA00D7AB32 /* DifferenceKit */; }; + 7AABB1F0267E9CAA00D7AB32 /* DifferenceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7AABB1EF267E9CAA00D7AB32 /* DifferenceKit */; settings = {ATTRIBUTES = (Required, ); }; }; 7AABB1F2267E9CC800D7AB32 /* SwiftDate in Frameworks */ = {isa = PBXBuildFile; productRef = 7AABB1F1267E9CC800D7AB32 /* SwiftDate */; }; 7AABDE26253350C30041AFC6 /* RxSectionedDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AABDE25253350C30041AFC6 /* RxSectionedDataSource.swift */; }; 7AB67E8C2435C38700258F61 /* CustomTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AB67E8B2435C38700258F61 /* CustomTextField.swift */; }; 7AB67E8E2435D1A000258F61 /* CustomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AB67E8D2435D1A000258F61 /* CustomButton.swift */; }; + 7AC76D7B270083AE0084DB27 /* TextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC76D7A270083AE0084DB27 /* TextView.swift */; }; 7ADF6C93250B954900F237B2 /* Navigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ADF6C92250B954900F237B2 /* Navigation.swift */; }; 7ADF6C95250D037700F237B2 /* ShowEventController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ADF6C94250D037700F237B2 /* ShowEventController.swift */; }; 7ADF6C97250F41B000F237B2 /* PNKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ADF6C96250F41B000F237B2 /* PNKeyboard.swift */; }; @@ -104,8 +102,6 @@ 7AF6D1E92677A8410086EA64 /* FakeLocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AF6D1E82677A8410086EA64 /* FakeLocationManager.swift */; }; 7AF6D2042677C03B0086EA64 /* AutoCatCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AF6D1EF2677C03B0086EA64 /* AutoCatCore.framework */; }; 7AF6D2052677C03B0086EA64 /* AutoCatCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7AF6D1EF2677C03B0086EA64 /* AutoCatCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 7AF6D20F2677C0EA0086EA64 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 7AF6D20E2677C0EA0086EA64 /* RxCocoa */; }; - 7AF6D2112677C0EA0086EA64 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 7AF6D2102677C0EA0086EA64 /* RxSwift */; }; 7AF6D2122677C12E0086EA64 /* Location.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A000AA124C2EEDE001F5B00 /* Location.swift */; }; 7AF6D2132677C15A0086EA64 /* AudioRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A659B5824A2B1BA0043A0F2 /* AudioRecord.swift */; }; 7AF6D2142677C1680086EA64 /* VehicleEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AAE6AD224CDDF950023860B /* VehicleEvent.swift */; }; @@ -124,7 +120,6 @@ 7AF6D2212677C1680086EA64 /* PagedResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6841A913FABBB0AB20DEF4FC /* PagedResponse.swift */; }; 7AF6D2232677C2B40086EA64 /* Realm in Frameworks */ = {isa = PBXBuildFile; productRef = 7AF6D2222677C2B40086EA64 /* Realm */; }; 7AF6D2252677C2B40086EA64 /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 7AF6D2242677C2B40086EA64 /* RealmSwift */; }; - 7AF6D2272677C2B40086EA64 /* RxRealm in Frameworks */ = {isa = PBXBuildFile; productRef = 7AF6D2262677C2B40086EA64 /* RxRealm */; }; 7AF6D2282677C2DC0086EA64 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A96AE30246B2FE400297C33 /* Constants.swift */; }; 7AF6D22A2677C3AD0086EA64 /* Exportable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE8424D26109F78002F6B31 /* Exportable.swift */; }; /* End PBXBuildFile section */ @@ -230,6 +225,8 @@ 7A6DD90B24335A6D009DE740 /* FlagLayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlagLayer.swift; sourceTree = ""; }; 7A6DD90D24337930009DE740 /* PlateNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlateNumber.swift; sourceTree = ""; }; 7A6E03272485951700DB22ED /* OwnersController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OwnersController.swift; sourceTree = ""; }; + 7A6F095D26DB9F85003A965D /* NotesController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotesController.swift; sourceTree = ""; }; + 7A6F095F26DBF588003A965D /* VehicleNote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleNote.swift; sourceTree = ""; }; 7A7547DF24032CB6004E8406 /* VehiclePhotoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehiclePhotoCell.swift; sourceTree = ""; }; 7A761C0A267E8FF90005F28F /* Error.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Error.swift; sourceTree = ""; }; 7A813DBD2506A57100CC93B9 /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/AuthenticationServices.framework; sourceTree = DEVELOPER_DIR; }; @@ -247,12 +244,14 @@ 7A96AE2E246B2BCD00297C33 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; }; 7A96AE30246B2FE400297C33 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; 7A96AE32246C095700297C33 /* Base64FS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Base64FS.swift; sourceTree = ""; }; + 7A99406326E4BFAE002E9CB6 /* VehicleNoteCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleNoteCell.swift; sourceTree = ""; }; 7A9FEEC72529AB23001CA50E /* RxRealmDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxRealmDataSource.swift; sourceTree = ""; }; 7AABDE25253350C30041AFC6 /* RxSectionedDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxSectionedDataSource.swift; sourceTree = ""; }; 7AAE6AD224CDDF950023860B /* VehicleEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleEvent.swift; sourceTree = ""; }; 7AB562B9249C9E9B00473D53 /* VehicleRegion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleRegion.swift; sourceTree = ""; }; 7AB67E8B2435C38700258F61 /* CustomTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTextField.swift; sourceTree = ""; }; 7AB67E8D2435D1A000258F61 /* CustomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomButton.swift; sourceTree = ""; }; + 7AC76D7A270083AE0084DB27 /* TextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextView.swift; sourceTree = ""; }; 7ADF6C92250B954900F237B2 /* Navigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigation.swift; sourceTree = ""; }; 7ADF6C94250D037700F237B2 /* ShowEventController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowEventController.swift; sourceTree = ""; }; 7ADF6C96250F41B000F237B2 /* PNKeyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PNKeyboard.swift; sourceTree = ""; }; @@ -282,21 +281,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7AA7BC3125A5DFB80053A5D5 /* RealmSwift in Frameworks */, 7AA7BC3525A5DFB80053A5D5 /* ExceptionCatcher in Frameworks */, - 7AA7BC3025A5DFB80053A5D5 /* Realm in Frameworks */, - 7AA7BC2C25A5DFB80053A5D5 /* RxSwift in Frameworks */, - 7AA7BC2F25A5DFB80053A5D5 /* RxBlocking in Frameworks */, 7AA7BC3825A5DFB80053A5D5 /* Eureka in Frameworks */, 7AA7BC3325A5DFB80053A5D5 /* Kingfisher in Frameworks */, 7A813DBE2506A57100CC93B9 /* AuthenticationServices.framework in Frameworks */, 7AA7BC3625A5DFB80053A5D5 /* PKHUD in Frameworks */, - 7AA7BC2E25A5DFB80053A5D5 /* RxCocoa in Frameworks */, - 7AA7BC3425A5DFB80053A5D5 /* SwiftDate in Frameworks */, 7AF6D2042677C03B0086EA64 /* AutoCatCore.framework in Frameworks */, - 7AA7BC3725A5DFB80053A5D5 /* DifferenceKit in Frameworks */, - 7AA7BC3225A5DFB80053A5D5 /* RxRealm in Frameworks */, - 7AA7BC2D25A5DFB80053A5D5 /* RxRelay in Frameworks */, 7A96AE2F246B2BCD00297C33 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -312,13 +302,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7AA54C1E26CD977A00F2BF28 /* RxSwift in Frameworks */, 7AABB1F0267E9CAA00D7AB32 /* DifferenceKit in Frameworks */, 7AF6D2252677C2B40086EA64 /* RealmSwift in Frameworks */, + 7AA54C1C26CD977A00F2BF28 /* RxCocoa in Frameworks */, 7AF6D2232677C2B40086EA64 /* Realm in Frameworks */, - 7AF6D2112677C0EA0086EA64 /* RxSwift in Frameworks */, 7AABB1F2267E9CC800D7AB32 /* SwiftDate in Frameworks */, - 7AF6D20F2677C0EA0086EA64 /* RxCocoa in Frameworks */, - 7AF6D2272677C2B40086EA64 /* RxRealm in Frameworks */, + 7AA54C2026CD977A00F2BF28 /* RxRealm in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -417,6 +407,7 @@ 7A11471723FDEBFA00B424AF /* ReportController.swift */, 7A3F07AC2436350B00E59687 /* SearchController.swift */, 7AEFE727240455E200910EB7 /* SettingsController.swift */, + 7A6F095D26DB9F85003A965D /* NotesController.swift */, ); path = Controllers; sourceTree = ""; @@ -460,6 +451,7 @@ 7A2DE69725868AC800A113FC /* VehicleAd.swift */, 7AAE6AD224CDDF950023860B /* VehicleEvent.swift */, 7AB562B9249C9E9B00473D53 /* VehicleRegion.swift */, + 7A6F095F26DBF588003A965D /* VehicleNote.swift */, ); path = Models; sourceTree = ""; @@ -490,6 +482,7 @@ 7AE26A3224EEF9EC00625033 /* UIViewControllerExt.swift */, 7A8A220A248D67B60073DFD9 /* VehicleReportImage.swift */, 7A761C0A267E8FF90005F28F /* Error.swift */, + 7AC76D7A270083AE0084DB27 /* TextView.swift */, ); path = Extensions; sourceTree = ""; @@ -502,6 +495,7 @@ 7A1090E724A394F100B4F0B2 /* AudioRecordCell.swift */, 7A813DC22508EE4F00CC93B9 /* EventCell.swift */, 7AEFC3BD2529D3CC00BADFB2 /* ConfigurableCell.swift */, + 7A99406326E4BFAE002E9CB6 /* VehicleNoteCell.swift */, ); path = Cells; sourceTree = ""; @@ -644,18 +638,9 @@ ); name = AutoCat; packageProductDependencies = ( - 7A11471C23FEA18700B424AF /* RxSwift */, - 7A11471E23FEA18700B424AF /* RxRelay */, - 7A11472023FEA18700B424AF /* RxCocoa */, - 7A11472223FEA18700B424AF /* RxBlocking */, - 7A11472523FEA1F400B424AF /* Realm */, - 7A11472723FEA1F400B424AF /* RealmSwift */, - 7A530B8A240181F500CBFE6E /* RxRealm */, 7AF58D332402A91C00CE01A0 /* Kingfisher */, - 7A051610241412CA00FC55AC /* SwiftDate */, 7A813DC02508C4D900CC93B9 /* ExceptionCatcher */, 7AABDE1C2532F3EB0041AFC6 /* PKHUD */, - 7AABDE22253327F10041AFC6 /* DifferenceKit */, 7AEF47A3253DC4D2001D6238 /* Eureka */, ); productName = AutoCat; @@ -695,13 +680,13 @@ ); name = AutoCatCore; packageProductDependencies = ( - 7AF6D20E2677C0EA0086EA64 /* RxCocoa */, - 7AF6D2102677C0EA0086EA64 /* RxSwift */, 7AF6D2222677C2B40086EA64 /* Realm */, 7AF6D2242677C2B40086EA64 /* RealmSwift */, - 7AF6D2262677C2B40086EA64 /* RxRealm */, 7AABB1EF267E9CAA00D7AB32 /* DifferenceKit */, 7AABB1F1267E9CC800D7AB32 /* SwiftDate */, + 7AA54C1B26CD977A00F2BF28 /* RxCocoa */, + 7AA54C1D26CD977A00F2BF28 /* RxSwift */, + 7AA54C1F26CD977A00F2BF28 /* RxRealm */, ); productName = AutoCatCore; productReference = 7AF6D1EF2677C03B0086EA64 /* AutoCatCore.framework */; @@ -805,6 +790,7 @@ 7A813DC9250B5C9700CC93B9 /* LocationRow.swift in Sources */, 7A2DE69B25869ABD00A113FC /* AdsController.swift in Sources */, 7A6DD90824329144009DE740 /* CenterTextLayer.swift in Sources */, + 7A99406426E4BFAE002E9CB6 /* VehicleNoteCell.swift in Sources */, 7A8AB76B25A1D95500ECF2C1 /* SourceStatusRow.swift in Sources */, 7A813DC32508EE4F00CC93B9 /* EventCell.swift in Sources */, 7A3F07AD2436350B00E59687 /* SearchController.swift in Sources */, @@ -827,12 +813,14 @@ 7A27ADF7249FEF690035F39E /* Recorder.swift in Sources */, 7A3F07AB24360DC800E59687 /* Dated.swift in Sources */, 7A33381124990DAE00D878F1 /* FiltersController.swift in Sources */, + 7AC76D7B270083AE0084DB27 /* TextView.swift in Sources */, 7A1090E824A394F100B4F0B2 /* AudioRecordCell.swift in Sources */, 7A64AE762469DFB600ABE48E /* ContentTransformers.swift in Sources */, 7A11471823FDEBFA00B424AF /* ReportController.swift in Sources */, 7AE24C5F251F1B4E00758E39 /* Buttons.swift in Sources */, 7A11471A23FE839000B424AF /* AuthController.swift in Sources */, 7A530B7A24001D3300CBFE6E /* CheckController.swift in Sources */, + 7A6F095E26DB9F85003A965D /* NotesController.swift in Sources */, 7A6E03282485951700DB22ED /* OwnersController.swift in Sources */, 7A64AE742469DFB600ABE48E /* MediaContentView.swift in Sources */, 7A1090EC24A4E3E100B4F0B2 /* CellProgressView.swift in Sources */, @@ -887,6 +875,7 @@ 7AF6D2122677C12E0086EA64 /* Location.swift in Sources */, 7AF6D2142677C1680086EA64 /* VehicleEvent.swift in Sources */, 7AF6D2172677C1680086EA64 /* VehicleRegion.swift in Sources */, + 7A6F096026DBF588003A965D /* VehicleNote.swift in Sources */, 7AF6D21E2677C1680086EA64 /* PlateNumber.swift in Sources */, 7AF6D21F2677C1680086EA64 /* Response.swift in Sources */, 7A761C07267E8E7F0005F28F /* AnyEncodable.swift in Sources */, @@ -1091,7 +1080,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 78; + CURRENT_PROJECT_VERSION = 79; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -1116,7 +1105,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 78; + CURRENT_PROJECT_VERSION = 79; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -1351,51 +1340,26 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 7A051610241412CA00FC55AC /* SwiftDate */ = { - isa = XCSwiftPackageProductDependency; - package = 7A05160F241412CA00FC55AC /* XCRemoteSwiftPackageReference "SwiftDate" */; - productName = SwiftDate; - }; - 7A11471C23FEA18700B424AF /* RxSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 7A11471B23FEA18700B424AF /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxSwift; - }; - 7A11471E23FEA18700B424AF /* RxRelay */ = { - isa = XCSwiftPackageProductDependency; - package = 7A11471B23FEA18700B424AF /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxRelay; - }; - 7A11472023FEA18700B424AF /* RxCocoa */ = { - isa = XCSwiftPackageProductDependency; - package = 7A11471B23FEA18700B424AF /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxCocoa; - }; - 7A11472223FEA18700B424AF /* RxBlocking */ = { - isa = XCSwiftPackageProductDependency; - package = 7A11471B23FEA18700B424AF /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxBlocking; - }; - 7A11472523FEA1F400B424AF /* Realm */ = { - isa = XCSwiftPackageProductDependency; - package = 7A11472423FEA1F400B424AF /* XCRemoteSwiftPackageReference "realm-cocoa" */; - productName = Realm; - }; - 7A11472723FEA1F400B424AF /* RealmSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 7A11472423FEA1F400B424AF /* XCRemoteSwiftPackageReference "realm-cocoa" */; - productName = RealmSwift; - }; - 7A530B8A240181F500CBFE6E /* RxRealm */ = { - isa = XCSwiftPackageProductDependency; - package = 7A530B89240181F500CBFE6E /* XCRemoteSwiftPackageReference "RxRealm" */; - productName = RxRealm; - }; 7A813DC02508C4D900CC93B9 /* ExceptionCatcher */ = { isa = XCSwiftPackageProductDependency; package = 7A813DBF2508C4D900CC93B9 /* XCRemoteSwiftPackageReference "ExceptionCatcher" */; productName = ExceptionCatcher; }; + 7AA54C1B26CD977A00F2BF28 /* RxCocoa */ = { + isa = XCSwiftPackageProductDependency; + package = 7A11471B23FEA18700B424AF /* XCRemoteSwiftPackageReference "RxSwift" */; + productName = RxCocoa; + }; + 7AA54C1D26CD977A00F2BF28 /* RxSwift */ = { + isa = XCSwiftPackageProductDependency; + package = 7A11471B23FEA18700B424AF /* XCRemoteSwiftPackageReference "RxSwift" */; + productName = RxSwift; + }; + 7AA54C1F26CD977A00F2BF28 /* RxRealm */ = { + isa = XCSwiftPackageProductDependency; + package = 7A530B89240181F500CBFE6E /* XCRemoteSwiftPackageReference "RxRealm" */; + productName = RxRealm; + }; 7AABB1EF267E9CAA00D7AB32 /* DifferenceKit */ = { isa = XCSwiftPackageProductDependency; package = 7AABDE21253327F10041AFC6 /* XCRemoteSwiftPackageReference "DifferenceKit" */; @@ -1411,11 +1375,6 @@ package = 7AABDE1B2532F3EB0041AFC6 /* XCRemoteSwiftPackageReference "PKHUD" */; productName = PKHUD; }; - 7AABDE22253327F10041AFC6 /* DifferenceKit */ = { - isa = XCSwiftPackageProductDependency; - package = 7AABDE21253327F10041AFC6 /* XCRemoteSwiftPackageReference "DifferenceKit" */; - productName = DifferenceKit; - }; 7AEF47A3253DC4D2001D6238 /* Eureka */ = { isa = XCSwiftPackageProductDependency; package = 7AEF47A2253DC4D2001D6238 /* XCRemoteSwiftPackageReference "Eureka" */; @@ -1426,16 +1385,6 @@ package = 7AF58D322402A91C00CE01A0 /* XCRemoteSwiftPackageReference "Kingfisher" */; productName = Kingfisher; }; - 7AF6D20E2677C0EA0086EA64 /* RxCocoa */ = { - isa = XCSwiftPackageProductDependency; - package = 7A11471B23FEA18700B424AF /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxCocoa; - }; - 7AF6D2102677C0EA0086EA64 /* RxSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 7A11471B23FEA18700B424AF /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxSwift; - }; 7AF6D2222677C2B40086EA64 /* Realm */ = { isa = XCSwiftPackageProductDependency; package = 7A11472423FEA1F400B424AF /* XCRemoteSwiftPackageReference "realm-cocoa" */; @@ -1446,11 +1395,6 @@ package = 7A11472423FEA1F400B424AF /* XCRemoteSwiftPackageReference "realm-cocoa" */; productName = RealmSwift; }; - 7AF6D2262677C2B40086EA64 /* RxRealm */ = { - isa = XCSwiftPackageProductDependency; - package = 7A530B89240181F500CBFE6E /* XCRemoteSwiftPackageReference "RxRealm" */; - productName = RxRealm; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 7A1146F523FDE7E500B424AF /* Project object */; diff --git a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 1966bb6..6aca2f1 100644 --- a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -67,7 +67,7 @@ BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint"> @@ -76,7 +76,7 @@ BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint"> + + + + diff --git a/AutoCat/AppDelegate.swift b/AutoCat/AppDelegate.swift index bf47b13..bca5977 100644 --- a/AutoCat/AppDelegate.swift +++ b/AutoCat/AppDelegate.swift @@ -26,7 +26,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { let config = Realm.Configuration( - schemaVersion: 32, + schemaVersion: 35, migrationBlock: { migration, oldSchemaVersion in if oldSchemaVersion <= 3 { var numbers: [String] = [] @@ -140,7 +140,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { HUD.dimsBackground = true HUD.allowsInteraction = false - Logging.URLRequests = { _ in false }; + //Logging.URLRequests = { _ in false }; return true } diff --git a/AutoCat/Base.lproj/Main.storyboard b/AutoCat/Base.lproj/Main.storyboard index cc2746c..5b4460f 100644 --- a/AutoCat/Base.lproj/Main.storyboard +++ b/AutoCat/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -72,6 +72,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,14 +173,14 @@ - + - + - +