Skip to content

Commit edea276

Browse files
author
guillaumedebavelaere
authored
Merge pull request #384 from tradingticket/develop
merge develop into master
2 parents 0d34d0b + 58735c3 commit edea276

File tree

342 files changed

+2457
-6020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

342 files changed

+2457
-6020
lines changed

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1
1+
4.2

Cartfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github "Boris-Em/BEMCheckBox" ~> 1.4.1
2-
github "JSONModel/JSONModel" ~> 1.7.0
32
github "jdg/MBProgressHUD" ~> 1.0.0
4-
github "mxcl/PromiseKit" ~> 6.2.8
3+
github "mxcl/PromiseKit" ~> 6.8.4

Cartfile.resolved

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github "Boris-Em/BEMCheckBox" "1.4.1"
2-
github "JSONModel/JSONModel" "1.7.0"
32
github "jdg/MBProgressHUD" "1.1.0"
4-
github "mxcl/PromiseKit" "6.3.3"
3+
github "mxcl/PromiseKit" "6.8.4"

ExampleApp/AppDelegate.swift

+16-13
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import TradeItIosTicketSDK2
44
@UIApplicationMain
55
class AppDelegate: UIResponder, UIApplicationDelegate {
66
static let API_KEY = "exampleapp-test-api-key" // "tradeit-test-api-key"
7-
static let ENVIRONMENT = TradeItEmsTestEnv
7+
static let ENVIRONMENT = TradeitEmsEnvironments.tradeItEmsTestEnv
88
var window: UIWindow?
99

1010
override init() {
@@ -20,12 +20,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2020
// To set a custom API base URL/host (only if you need the app to connect through a proxy/middle-tier):
2121
// TradeItSDK.set(host: "https://example.com:1234/myAPI/", forEnvironment: AppDelegate.ENVIRONMENT)
2222

23+
// Enable helpful development features like request/response logging
24+
TradeItSDK.debug = true
25+
2326
super.init()
2427
}
2528

2629
func application(
2730
_ application: UIApplication,
28-
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?
31+
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
2932
) -> Bool {
3033
if ProcessInfo.processInfo.arguments.contains("isUITesting") {
3134
UIView.setAnimationsEnabled(false)
@@ -40,7 +43,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4043
_ application: UIApplication,
4144
open url: URL,
4245
sourceApplication: String?,
43-
annotation: Any?
46+
annotation: Any
4447
) -> Bool {
4548
print("=====> Received OAuth callback URL: \(url.absoluteString)")
4649

@@ -223,9 +226,9 @@ class DummyMarketDataService: MarketDataService {
223226
// Get market data and populate TradeItQuote
224227
let quote = TradeItQuote()
225228
quote.companyName = "LOL"
226-
quote.lastPrice = 1337.42 as NSNumber
227-
quote.change = 42.1337 as NSNumber
228-
quote.pctChange = -123.456 as NSNumber
229+
quote.lastPrice = 1337.42
230+
quote.change = 42.1337
231+
quote.pctChange = -123.456
229232
quote.dateTime = "12:34:56"
230233
onSuccess(quote)
231234

@@ -239,7 +242,7 @@ class DummyMarketDataService: MarketDataService {
239242
class DummyStreamingMarketDataService: StreamingMarketDataService {
240243
private var timer: Timer?
241244
private var onUpdate: ((TradeItQuote) -> Void)?
242-
private var price = 500
245+
private var price = 500.0 as Double
243246

244247
func startUpdatingQuote(forSymbol symbol: String, onUpdate: @escaping (TradeItQuote) -> Void, onFailure: @escaping () -> Void) {
245248
self.onUpdate = onUpdate
@@ -258,16 +261,16 @@ class DummyStreamingMarketDataService: StreamingMarketDataService {
258261
}
259262

260263
@objc private func timerDidFire() {
261-
let priceChange = generateRandomValue(lowerBound: -25, upperBound: 25)
264+
let priceChange = Double(generateRandomValue(lowerBound: -25, upperBound: 25))
262265
self.price = self.price + priceChange
263266

264267
let quote = TradeItQuote()
265268
quote.companyName = "LOL"
266-
quote.lastPrice = NSNumber(value: price)
267-
quote.bidPrice = NSNumber(value: price - 1)
268-
quote.askPrice = NSNumber(value: price + 1)
269-
quote.change = NSNumber(value: priceChange)
270-
quote.pctChange = NSNumber(value: -123.456)
269+
quote.lastPrice = price
270+
quote.bidPrice = price - 1
271+
quote.askPrice = price + 1
272+
quote.change = priceChange
273+
quote.pctChange = -123.456
271274
quote.dateTime = "12:34:56"
272275

273276
onUpdate?(quote)

ExampleApp/ExampleViewController.swift

+2-8
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,6 @@ class ExampleViewController: UIViewController, UITableViewDataSource, UITableVie
102102
TradeItSDK.launcher.launchTrading(fromViewController: self, withOrder: TradeItOrder())
103103
}
104104
),
105-
Action(
106-
label: "FX Trading",
107-
action: {
108-
TradeItSDK.launcher.launchFxTrading(fromViewController: self)
109-
}
110-
),
111105
Action(
112106
label: "Manage accounts",
113107
action: {
@@ -580,7 +574,7 @@ class ExampleViewController: UIViewController, UITableViewDataSource, UITableVie
580574
var cell = tableView.dequeueReusableCell(withIdentifier: cellIdentifier)
581575

582576
if cell == nil {
583-
cell = UITableViewCell.init(style: UITableViewCellStyle.default, reuseIdentifier: cellIdentifier)
577+
cell = UITableViewCell.init(style: UITableViewCell.CellStyle.default, reuseIdentifier: cellIdentifier)
584578
}
585579

586580
cell?.textLabel?.text = sections?[indexPath.section].actions[indexPath.row].label
@@ -828,7 +822,7 @@ class ExampleViewController: UIViewController, UITableViewDataSource, UITableVie
828822
brokersUnlinked += 1
829823
},
830824
onFailure: { errorResult in
831-
print("=====> Error unlinking broker(\(linkedBroker.userId)): \(errorResult.code ?? 0 as NSNumber), \(errorResult.shortMessage ?? ""), \(errorResult.longMessages?.first ?? "")")
825+
print("=====> Error unlinking broker(\(linkedBroker.userId)): \(errorResult.code ?? 0), \(errorResult.shortMessage ?? ""), \(errorResult.longMessages?.first ?? "")")
832826
}
833827
)
834828
}

ExampleAppObjC/Info.plist

+11-11
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
1818
<string>2.0.12</string>
19+
<key>CFBundleURLTypes</key>
20+
<array>
21+
<dict>
22+
<key>CFBundleURLName</key>
23+
<string>tradeItExampleIdentifier</string>
24+
<key>CFBundleURLSchemes</key>
25+
<array>
26+
<string>tradeItExampleObjCScheme</string>
27+
</array>
28+
</dict>
29+
</array>
1930
<key>CFBundleVersion</key>
2031
<string>2.0.12</string>
2132
<key>LSRequiresIPhoneOS</key>
@@ -34,16 +45,5 @@
3445
<string>UIInterfaceOrientationLandscapeLeft</string>
3546
<string>UIInterfaceOrientationLandscapeRight</string>
3647
</array>
37-
<key>CFBundleURLTypes</key>
38-
<array>
39-
<dict>
40-
<key>CFBundleURLName</key>
41-
<string>tradeItExampleIdentifier</string>
42-
<key>CFBundleURLSchemes</key>
43-
<array>
44-
<string>tradeItExampleObjCScheme</string>
45-
</array>
46-
</dict>
47-
</array>
4848
</dict>
4949
</plist>

ExampleAppUITests/UITestHelper.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ extension XCTestCase {
238238
waitForElementToDisappear(ezLoadingActivity)
239239
let tableView = app.tables.element(boundBy: 0)
240240
XCTAssertTrue(tableView.cells.count > 0)
241-
let cell = tableView.cells.element(boundBy: UInt(rowNum)) // index 0 is header
241+
let cell = tableView.cells.element(boundBy: rowNum) // index 0 is header
242242
cell.tap()
243243
}
244244

LICENSE

+200-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,201 @@
1-
Copyright (c) 2016 Trading Ticket Inc.
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
24

3-
http://www.apache.org/licenses/LICENSE-2.0
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2018 TradeIt Inc.
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

Podfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ def testing_pods
1010
end
1111

1212
def app_pods
13-
pod 'PromiseKit', '~> 6.2.8'
13+
pod 'PromiseKit/CorePromise', '~> 6.8.4'
1414
pod 'MBProgressHUD', '~> 1.1.0'
15-
pod 'JSONModel', '~> 1.7.0'
1615
pod 'BEMCheckBox', '~> 1.4.1'
1716
end
1817

0 commit comments

Comments
 (0)