Finish 2.0.0(56)

.gitignore

@@ -1,2 +1,3 @@
 /*.sqlite
 *.DS_Store
+/Neocom/Neocom.xcodeproj/xcuserdata/

.gitmodules

@@ -1,15 +1,9 @@
 [submodule "ThirdParty/EVEOnlineAPI"]
 	path = ThirdParty/EVEOnlineAPI
 	url = https://github.com/mrdepth/EVEOnlineAPI.git
-[submodule "ThirdParty/tools"]
-	path = ThirdParty/tools
-	url = https://github.com/mrdepth/tools.git
 [submodule "ThirdParty/dgmpp"]
 	path = ThirdParty/dgmpp
 	url = https://github.com/mrdepth/libdgmpp.git
-[submodule "ThirdParty/flurry-ios-sdk"]
-	path = ThirdParty/flurry-ios-sdk
-	url = https://github.com/flurry/flurry-ios-sdk.git
 [submodule "ThirdParty/TreeController"]
 	path = ThirdParty/TreeController
 	url = https://github.com/mrdepth/TreeController.git
@@ -25,3 +19,9 @@
 [submodule "ThirdParty/ASReceipt"]
 	path = ThirdParty/ASReceipt
 	url = ../ASReceipt.git
+[submodule "ThirdParty/Expressible"]
+	path = ThirdParty/Expressible
+	url = https://github.com/mrdepth/Expressible.git
+[submodule "ThirdParty/SheetPresentation"]
+	path = ThirdParty/SheetPresentation
+	url = ../SheetPresentation.git

Old/Neocom/db/NCDatabase.xcdatamodeld/.xccurrentversion → Legacy/Develop/Develop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>_XCCurrentVersionName</key>
-	<string>NCDatabase.xcdatamodel</string>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
 </dict>
 </plist>

Old/Neocom/db/NCDatabase.xcdatamodeld/NCDatabase.xcdatamodel/.xccurrentversion → Legacy/Neocom.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>_XCCurrentVersionName</key>
-	<string>NCDatabase.xcdatamodel</string>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
 </dict>
 </plist>

Legacy/Neocom.xcworkspace/xcshareddata/Neocom.xcscmblueprint

@@ -0,0 +1,121 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "CBD3C72D1EC244FEC895CDE83582355773BC1B4F+++3DE7941",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "CE59D664C95604646A8898B717A20F0AFC1A609F+++C9B12BA" : 9223372036854775807,
+    "DA631F8342550455B5A2680DD706737CD895F617+++D72D75E" : 9223372036854775807,
+    "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++7A13655" : 9223372036854775807,
+    "CBD3C72D1EC244FEC895CDE83582355773BC1B4F+++3DE7941" : 9223372036854775807,
+    "0CFE9E88F22EAA7CB8181BCF8804EC4A2A59AFE8+++DD082C7" : 9223372036854775807,
+    "CAF619736A3A2301C2960592037A61156FDAC9EF+++92DAFE1" : 9223372036854775807,
+    "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++E85DA45" : 9223372036854775807,
+    "67620B5EFA902936DF04070AF595B76AB0333747+++AEACF36" : 9223372036854775807,
+    "BDDB80E32D86B8E2E7D04724D0619FC68FCBB3C1+++B67B998" : 9223372036854775807,
+    "75224C288D14A799245F99223249EF48FF5DC280+++87C16DD" : 9223372036854775807,
+    "DD20A1A48C66B5213E0FEBB87A95EF51D6C6F3E8+++6594EDE" : 9223372036854775807,
+    "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++403E559" : 9223372036854775807,
+    "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++1D027FA" : 9223372036854775807,
+    "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++53FAF8C" : 9223372036854775807,
+    "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++41EBCEE" : 9223372036854775807
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "0D2C24DF-B5D9-420F-8F43-3E98C3ED1725",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "CE59D664C95604646A8898B717A20F0AFC1A609F+++C9B12BA" : "EVEUniverse\/ThirdParty\/dgmpp\/",
+    "DA631F8342550455B5A2680DD706737CD895F617+++D72D75E" : "EVEUniverse\/ThirdParty\/CloudData\/",
+    "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++7A13655" : "OSXNeocom\/ThirdParty\/EVEOnlineAPI\/",
+    "CBD3C72D1EC244FEC895CDE83582355773BC1B4F+++3DE7941" : "EVEUniverse\/",
+    "0CFE9E88F22EAA7CB8181BCF8804EC4A2A59AFE8+++DD082C7" : "EVEUniverse\/ThirdParty\/TreeController\/",
+    "CAF619736A3A2301C2960592037A61156FDAC9EF+++92DAFE1" : "EVEUniverse\/ThirdParty\/clrconvert\/",
+    "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++E85DA45" : "EVEUniverse\/ThirdParty\/tools\/",
+    "67620B5EFA902936DF04070AF595B76AB0333747+++AEACF36" : "EVEUniverse\/ThirdParty\/EVEOnlineAPI\/ThirdParty\/Alamofire\/",
+    "BDDB80E32D86B8E2E7D04724D0619FC68FCBB3C1+++B67B998" : "EVEUniverse\/ThirdParty\/flurry-ios-sdk\/",
+    "75224C288D14A799245F99223249EF48FF5DC280+++87C16DD" : "EVEUniverse\/ThirdParty\/swifter\/",
+    "DD20A1A48C66B5213E0FEBB87A95EF51D6C6F3E8+++6594EDE" : "EVEUniverse\/ThirdParty\/EVEOnlineAPI\/ThirdParty\/AFNetworking\/",
+    "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++403E559" : "OSXNeocom\/ThirdParty\/EVEOnlineAPI\/",
+    "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++1D027FA" : "EVEUniverse\/ThirdParty\/EVEOnlineAPI\/ThirdParty\/tools\/",
+    "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++53FAF8C" : "EVEUniverse\/ThirdParty\/EVEOnlineAPI\/",
+    "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++41EBCEE" : "EVEUniverse\/ThirdParty\/EVEOnlineAPI\/ThirdParty\/tools\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "Neocom",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Neocom.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mrdepth\/TreeController.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0CFE9E88F22EAA7CB8181BCF8804EC4A2A59AFE8+++DD082C7"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:mrdepth\/EVEOnlineAPI.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++403E559"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:mrdepth\/EVEOnlineAPI.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++53FAF8C"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mrdepth\/EVEOnlineAPI.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0F0B6FB3121415B4BFE652B8CA72F270CA803FB0+++7A13655"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Alamofire\/Alamofire.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "67620B5EFA902936DF04070AF595B76AB0333747+++AEACF36"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:mrdepth\/tools.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++1D027FA"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mrdepth\/tools.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++41EBCEE"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mrdepth\/tools.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "6D9709A6DF3DEDD6CB8E68BBA8342CBFDF252195+++E85DA45"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/httpswift\/swifter.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "75224C288D14A799245F99223249EF48FF5DC280+++87C16DD"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/flurry\/flurry-ios-sdk.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "BDDB80E32D86B8E2E7D04724D0619FC68FCBB3C1+++B67B998"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mrdepth\/clrconvert.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CAF619736A3A2301C2960592037A61156FDAC9EF+++92DAFE1"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mrdepth\/Neocom.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CBD3C72D1EC244FEC895CDE83582355773BC1B4F+++3DE7941"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mrdepth\/libdgmpp.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CE59D664C95604646A8898B717A20F0AFC1A609F+++C9B12BA"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mrdepth\/CloudData.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "DA631F8342550455B5A2680DD706737CD895F617+++D72D75E"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/AFNetworking\/AFNetworking.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "DD20A1A48C66B5213E0FEBB87A95EF51D6C6F3E8+++6594EDE"
+    }
+  ]
+}

Legacy/Neocom.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

Legacy/Neocom/.gitignore

@@ -0,0 +1,2 @@
+*.sqlite
+/Pods/

Legacy/Neocom/NCDatabaseVersion.swift

@@ -0,0 +1 @@
+extension NCDatabase { static let version = "April2019Release_1.0" }

Legacy/Neocom/Neocom II Tests/API_Tests.swift

@@ -0,0 +1,46 @@
+//
+//  API_Tests.swift
+//  Neocom II Tests
+//
+//  Created by Artem Shimanski on 23.08.2018.
+//  Copyright © 2018 Artem Shimanski. All rights reserved.
+//
+
+import XCTest
+import Expressible
+@testable import EVEAPI
+@testable import Neocom
+import Futures
+
+class API_Tests: TestCase {
+
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+	func testCharacter() {
+		let account: Account? = Services.storage.viewContext.currentAccount
+		XCTAssertNotNil(account)
+
+		var api: API! = Services.api.make(for: account)
+		let exp = expectation(description: "Wait")
+
+		api.character(cachePolicy: .useProtocolCachePolicy).then { result in
+			XCTAssertFalse(result.value.trainedSkills.isEmpty)
+
+			exp.fulfill()
+		}.catch { error in
+			XCTFail(error.localizedDescription)
+		}
+
+		wait(for: [exp], timeout: 10)
+		api = nil
+
+	}
+}

Legacy/Neocom/Neocom II Tests/Business_Tests.swift

@@ -0,0 +1,70 @@
+//
+//  Business_Tests.swift
+//  Neocom II Tests
+//
+//  Created by Artem Shimanski on 11/9/18.
+//  Copyright © 2018 Artem Shimanski. All rights reserved.
+//
+
+import XCTest
+@testable import Neocom
+import Futures
+import EVEAPI
+
+class Business_Tests: TestCase {
+
+    func testAssets() {
+		let controller = try! Assets.default.instantiate().get()
+		wait(for: [test(controller)], timeout: 20)
+
+		controller.treeController.tableView(controller.tableView, didSelectRowAt: IndexPath(row: 0, section: 0))
+
+		let exp = expectation(description: "end")
+
+		DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+			self.add(controller.screenshot())
+			exp.fulfill()
+    	}
+
+		wait(for: [exp], timeout: 1)
+	}
+
+	func testMarketOrders() {
+		let controller = try! MarketOrders.default.instantiate().get()
+		wait(for: [test(controller)], timeout: 10)
+	}
+
+	func testIndustryJobs() {
+		let controller = try! IndustryJobs.default.instantiate().get()
+		wait(for: [test(controller)], timeout: 10)
+	}
+
+	func testContracts() {
+		let controller = try! Contracts.default.instantiate().get()
+
+		wait(for: [test(controller)], timeout: 10)
+	}
+
+	func testContractInfo() {
+		let contract = try! Services.api.current.contracts(cachePolicy: .useProtocolCachePolicy).get()
+		XCTAssertFalse(contract.value.isEmpty)
+		let controller = try! ContractInfo.default.instantiate(contract.value[0]).get()
+
+		wait(for: [test(controller)], timeout: 10)
+	}
+
+	func testWalletJournal() {
+		let controller = try! WalletJournalPage.default.instantiate().get()
+		let nc = NavigationController(rootViewController: controller)
+		wait(for: [test(controller, takeScreenshot: false)], timeout: 10)
+		add(nc.screenshot())
+	}
+
+	func testWalletTransactions() {
+		let controller = try! WalletTransactionsPage.default.instantiate().get()
+		let nc = NavigationController(rootViewController: controller)
+		wait(for: [test(controller, takeScreenshot: false)], timeout: 10)
+		add(nc.screenshot())
+	}
+
+}

Legacy/Neocom/Neocom II Tests/Cache_Tests.swift

@@ -0,0 +1,24 @@
+//
+//  Cache_Tests.swift
+//  Neocom II Tests
+//
+//  Created by Artem Shimanski on 22.08.2018.
+//  Copyright © 2018 Artem Shimanski. All rights reserved.
+//
+
+import XCTest
+@testable import Neocom
+import CoreData
+import Futures
+import Expressible
+
+class Cache_Tests: TestCase {
+
+    override func setUp() {
+        super.setUp()
+    }
+
+    override func tearDown() {
+        super.tearDown()
+    }
+}