Skip to content
This repository was archived by the owner on Jan 4, 2023. It is now read-only.

Commit f77b605

Browse files
committed
Make the project build on M1
1 parent 071ab0f commit f77b605

File tree

11 files changed

+38
-209
lines changed

11 files changed

+38
-209
lines changed

Kiosk.xcodeproj/project.pbxproj

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,21 +1140,18 @@
11401140
inputPaths = (
11411141
"${PODS_ROOT}/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh",
11421142
"${BUILT_PRODUCTS_DIR}/Keys/Keys.framework",
1143-
"${BUILT_PRODUCTS_DIR}/ARAnalytics/ARAnalytics.framework",
11441143
"${BUILT_PRODUCTS_DIR}/ARCollectionViewMasonryLayout/ARCollectionViewMasonryLayout.framework",
11451144
"${BUILT_PRODUCTS_DIR}/ARTiledImageView/ARTiledImageView.framework",
11461145
"${BUILT_PRODUCTS_DIR}/Action/Action.framework",
11471146
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
1148-
"${BUILT_PRODUCTS_DIR}/Analytics/Analytics.framework",
1147+
"${BUILT_PRODUCTS_DIR}/Artsy+OSSUIFonts/Artsy_UIFonts.framework",
11491148
"${BUILT_PRODUCTS_DIR}/Artsy+UIColors/Artsy_UIColors.framework",
11501149
"${BUILT_PRODUCTS_DIR}/Artsy+UIFonts/Artsy_UIFonts.framework",
11511150
"${BUILT_PRODUCTS_DIR}/Artsy+UILabels/Artsy_UILabels.framework",
11521151
"${BUILT_PRODUCTS_DIR}/Artsy-UIButtons/Artsy_UIButtons.framework",
1153-
"${PODS_ROOT}/CardFlight-v4/CardFlight.framework",
11541152
"${BUILT_PRODUCTS_DIR}/DZNWebViewController/DZNWebViewController.framework",
11551153
"${BUILT_PRODUCTS_DIR}/ECPhoneNumberFormatter/ECPhoneNumberFormatter.framework",
11561154
"${BUILT_PRODUCTS_DIR}/FLKAutoLayout/FLKAutoLayout.framework",
1157-
"${BUILT_PRODUCTS_DIR}/HockeySDK-Source/HockeySDK_Source.framework",
11581155
"${BUILT_PRODUCTS_DIR}/ISO8601DateFormatter/ISO8601DateFormatter.framework",
11591156
"${BUILT_PRODUCTS_DIR}/Moya/Moya.framework",
11601157
"${BUILT_PRODUCTS_DIR}/NJKWebViewProgress/NJKWebViewProgress.framework",
@@ -1176,21 +1173,17 @@
11761173
name = "[CP] Embed Pods Frameworks";
11771174
outputPaths = (
11781175
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Keys.framework",
1179-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARAnalytics.framework",
11801176
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARCollectionViewMasonryLayout.framework",
11811177
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARTiledImageView.framework",
11821178
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Action.framework",
11831179
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
1184-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Analytics.framework",
1185-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Artsy_UIColors.framework",
11861180
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Artsy_UIFonts.framework",
1181+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Artsy_UIColors.framework",
11871182
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Artsy_UILabels.framework",
11881183
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Artsy_UIButtons.framework",
1189-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CardFlight.framework",
11901184
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DZNWebViewController.framework",
11911185
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ECPhoneNumberFormatter.framework",
11921186
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FLKAutoLayout.framework",
1193-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HockeySDK_Source.framework",
11941187
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ISO8601DateFormatter.framework",
11951188
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Moya.framework",
11961189
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NJKWebViewProgress.framework",

Kiosk/App/AppDelegate+GlobalActions.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import UIKit
22
import QuartzCore
3-
import ARAnalytics
43
import RxSwift
54
import Action
65

@@ -145,7 +144,6 @@ private extension AppDelegate {
145144

146145
func showRegistration() -> Observable<Void> {
147146
return Observable.create { observer in
148-
ARAnalytics.event("Register To Bid Tapped")
149147

150148
let storyboard = UIStoryboard.fulfillment()
151149
let containerController = storyboard.instantiateInitialViewController() as! FulfillmentContainerViewController
@@ -212,7 +210,6 @@ private extension AppDelegate {
212210
let nav = UINavigationController(rootViewController: webController)
213211
nav.modalPresentationStyle = .formSheet
214212

215-
ARAnalytics.event("Show Web View", withProperties: ["url" : address])
216213
self.window?.rootViewController?.present(nav, animated: true) {
217214
sendDispatchCompleted(to: observer)
218215
}

Kiosk/App/AppDelegate.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import UIKit
2-
import ARAnalytics
32
import SDWebImage
43
import RxSwift
54
import Keys
@@ -53,17 +52,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
5352
Stripe.setDefaultPublishableKey(keys.stripeProductionPublishableKey)
5453
}
5554

56-
ARAnalytics.setup(withAnalytics: [
57-
ARHockeyAppBetaID: keys.hockeyBetaSecret,
58-
ARHockeyAppLiveID: keys.hockeyProductionSecret,
59-
ARSegmentioWriteKey: keys.segmentWriteKey
60-
])
61-
6255
setupHelpButton()
6356
setupUserAgent()
6457

6558
logger.log("App Started")
66-
ARAnalytics.event("Session Started")
6759
return true
6860
}
6961

Kiosk/App/CardHandler.swift

Lines changed: 25 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,34 @@
11
import UIKit
22
import RxSwift
3-
import CardFlight
43

5-
class CardHandler: NSObject, CFTTransactionDelegate {
4+
internal final class DummyCard: NSObject {
5+
6+
internal init(token: String, cardInfo: DummyCard.DummyCardInfo) {
7+
self.token = token
8+
self.cardInfo = cardInfo
9+
}
10+
11+
let token: String
12+
let cardInfo: DummyCardInfo
13+
14+
internal final class DummyCardInfo: NSObject {
15+
16+
internal init(cardholderName: String, lastFour: String) {
17+
self.cardholderName = cardholderName
18+
self.lastFour = lastFour
19+
}
20+
21+
let cardholderName: String
22+
let lastFour: String
23+
}
24+
}
25+
26+
class CardHandler: NSObject {
627

728
private let _cardStatus = PublishSubject<String>()
829
private let _userMessages = PublishSubject<String>()
9-
private var cardReader: CFTCardReaderInfo?
10-
11-
var transaction: CFTTransaction?
30+
31+
var card: DummyCard?
1232

1333
var cardStatus: Observable<String> {
1434
return _cardStatus.asObservable()
@@ -27,15 +47,6 @@ class CardHandler: NSObject, CFTTransactionDelegate {
2747
}
2848
}
2949

30-
var cardFlightCredentials: CFTCredentials {
31-
let credentials = CFTCredentials()
32-
credentials.setup(apiKey: self.APIKey, accountToken: self.APIToken, completion: nil)
33-
return credentials
34-
}
35-
36-
var card: (cardInfo: CFTCardInfo, token: String)?
37-
38-
3950
let APIKey: String
4051
let APIToken: String
4152

@@ -44,8 +55,6 @@ class CardHandler: NSObject, CFTTransactionDelegate {
4455
APIToken = accountToken
4556

4657
super.init()
47-
48-
self.transaction = CFTTransaction(delegate: self)
4958
}
5059

5160
deinit {
@@ -54,128 +63,8 @@ class CardHandler: NSObject, CFTTransactionDelegate {
5463

5564
func startSearching() {
5665
_cardStatus.onNext("Starting search...")
57-
let tokenizationParameters = CFTTokenizationParameters(customerId: nil, credentials: self.cardFlightCredentials)
58-
self.transaction?.beginTokenizing(tokenizationParameters: tokenizationParameters)
5966
}
6067

6168
func end() {
62-
transaction?.select(processOption: CFTProcessOption.abort)
63-
transaction = nil
64-
}
65-
66-
func transaction(_ transaction: CFTTransaction, didUpdate state: CFTTransactionState, error: Error?) {
67-
switch state {
68-
case .completed:
69-
_cardStatus.onNext("Transaction completed")
70-
case .processing:
71-
_cardStatus.onNext("Transaction processing")
72-
case .deferred:
73-
_cardStatus.onNext("Transaction deferred")
74-
case .pendingCardInput:
75-
_cardStatus.onNext("Pending card input")
76-
transaction.select(cardReaderInfo: cardReader, cardReaderModel: cardReader?.cardReaderModel ?? .unknown)
77-
case .pendingTransactionParameters:
78-
_cardStatus.onNext("Pending transaction parameters")
79-
case .unknown:
80-
_cardStatus.onNext("Unknown transactionstate")
81-
case .pendingProcessOption:
82-
break
83-
}
84-
}
85-
86-
func transaction(_ transaction: CFTTransaction, didComplete historicalTransaction: CFTHistoricalTransaction) {
87-
if let cardInfo = historicalTransaction.cardInfo, let token = historicalTransaction.cardToken {
88-
self.card = (cardInfo: cardInfo, token: token)
89-
_cardStatus.onNext("Got Card")
90-
_cardStatus.onCompleted()
91-
} else {
92-
_cardStatus.onNext("Card Flight Error – could not retrieve card data.");
93-
if let error = historicalTransaction.error {
94-
_cardStatus.onNext("response Error \(error)");
95-
logger.log("CardReader got a response it cannot handle")
96-
}
97-
startSearching()
98-
}
99-
}
100-
101-
func transaction(_ transaction: CFTTransaction, didReceive cardReaderEvent: CFTCardReaderEvent, cardReaderInfo: CFTCardReaderInfo?) {
102-
_cardStatus.onNext(cardReaderEvent.statusMessage)
103-
}
104-
105-
func transaction(_ transaction: CFTTransaction, didUpdate cardReaderArray: [CFTCardReaderInfo]) {
106-
self.cardReader = cardReaderArray.first
107-
_cardStatus.onNext("Received new card reader availability, number of readers: \(cardReaderArray.count)")
108-
}
109-
110-
func transaction(_ transaction: CFTTransaction, didRequestProcessOption cardInfo: CFTCardInfo) {
111-
logger.log("Received request for processing option, will process transaction.")
112-
_cardStatus.onNext("Request for process option, automatically processing...")
113-
// We auto-accept the process option on the user's behalf because the prompt doesn't make sense in a
114-
// tokenization flow. See comments in `userMessages` property above.
115-
transaction.select(processOption: .process)
116-
}
117-
118-
func transaction(_ transaction: CFTTransaction, didRequestDisplay message: CFTMessage) {
119-
let message = message.primary ?? message.secondary ?? ""
120-
_userMessages.onNext(message)
121-
logger.log("Received request to display message: \(message)")
122-
_cardStatus.onNext("Received message for user: \(message)")
123-
}
124-
}
125-
126-
typealias UnhandledDelegateCallbacks = CardHandler
127-
/// We don't expect any of these functions to be called, but they are required for the delegate protocol.
128-
extension UnhandledDelegateCallbacks {
129-
func transaction(_ transaction: CFTTransaction, didDefer transactionData: Data) {
130-
logger.log("Transaction has been deferred.")
131-
_cardStatus.onNext("Transaction deferred")
132-
}
133-
134-
public func transaction(_ transaction: CFTTransaction, didRequest cvm: CFTCVM) {
135-
if cvm == CFTCVM.signature {
136-
logger.log("Transaction requested signature from user, which should not occur for tokenization.")
137-
_cardStatus.onNext("Ignoring user signature request from CardFlight")
138-
}
139-
}
140-
}
141-
142-
extension CFTCardReaderEvent {
143-
var statusMessage: String {
144-
switch self {
145-
case .unknown:
146-
return "Unknown card event"
147-
case .disconnected:
148-
return "Reader is disconnected"
149-
case .connected:
150-
return "Reader is connected"
151-
case .connectionErrored:
152-
return "Connection error occurred"
153-
case .cardSwiped:
154-
return "Card swiped"
155-
case .cardSwipeErrored:
156-
return "Card swipe error"
157-
case .cardInserted:
158-
return "Card inserted"
159-
case .cardInsertErrored:
160-
return "Card insertion error"
161-
case .cardRemoved:
162-
return "Card removed"
163-
case .cardTapped:
164-
return "Card tapped"
165-
case .cardTapErrored:
166-
return "Card tap error"
167-
case .updateStarted:
168-
return "Update started"
169-
case .updateCompleted:
170-
return "Updated completed"
171-
case .audioRecordingPermissionNotGranted:
172-
return "iOS audio permissions no granted"
173-
case .fatalError:
174-
return "Fatal error"
175-
case .connecting:
176-
return "Connecting"
177-
case .batteryStatusUpdated:
178-
return "Battery status updated"
179-
}
18069
}
18170
}

Kiosk/Auction Listings/ListingsViewController.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import UIKit
22
import SystemConfiguration
3-
import ARAnalytics
43
import RxSwift
54
import ARCollectionViewMasonryLayout
65
import NSObject_Rx
@@ -133,7 +132,6 @@ class ListingsViewController: UIViewController {
133132
let detailsViewController = segue.destination as! SaleArtworkDetailsViewController
134133
detailsViewController.saleArtwork = saleArtwork
135134
detailsViewController.provider = provider
136-
ARAnalytics.event("Show Artwork Details", withProperties: ["id": saleArtwork?.artwork.id as Any])
137135
}
138136
}
139137

@@ -204,7 +202,6 @@ private extension ListingsViewController {
204202

205203
func showDetails(forSaleArtwork saleArtwork: SaleArtwork) {
206204

207-
ARAnalytics.event("Artwork Details Tapped", withProperties: ["id": saleArtwork.artwork.id])
208205
self.performSegue(withIdentifier: SegueIdentifier.ShowSaleArtworkDetails.rawValue, sender: saleArtwork)
209206
}
210207

Kiosk/Bid Fulfillment/LoadingViewController.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import UIKit
22
import Artsy_UILabels
3-
import ARAnalytics
43
import RxSwift
54

65
class LoadingViewController: UIViewController {
@@ -110,7 +109,6 @@ extension LoadingViewController {
110109
logger.log("Bidding process result: reserveNotMet \(reserveNotMet), isHighestBidder \(isHighestBidder), bidIsResolved \(bidIsResolved), createdNewbidder \(createdNewBidder)")
111110

112111
if placingBid {
113-
ARAnalytics.event("Placed a bid", withProperties: ["top_bidder" : isHighestBidder, "sale_artwork": viewModel.bidDetails.saleArtwork?.artwork.id ?? ""])
114112

115113
if bidIsResolved {
116114

Kiosk/Bid Fulfillment/LoadingViewModel.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Foundation
2-
import ARAnalytics
32
import RxSwift
43

54
protocol LoadingViewModelType {
@@ -66,13 +65,10 @@ class LoadingViewModel: NSObject, LoadingViewModelType {
6665
.flatMap { [weak self] provider -> Observable<(String, AuthorizedNetworking)> in
6766
guard let me = self else { return .empty() }
6867
guard me.placingBid else {
69-
ARAnalytics.event("Registered New User Only")
7068
// Skipping all further actions, since we're not placing a bid.
7169
return .empty()
7270
}
7371

74-
ARAnalytics.event("Started Placing Bid", withProperties: ["id": me.bidDetails.saleArtwork?.artwork.id ?? ""])
75-
7672
return me
7773
.placeBidNetworkModel
7874
.bid(provider)

Kiosk/Supporting Files/PodsBridgingHeader.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#import <ECPhoneNumberFormatter/ECPhoneNumberFormatter.h>
1313

14-
#import <ARAnalytics/ARAnalytics.h>
1514
#import <SDWebImage/UIImageView+WebCache.h>
1615

1716
// Fonts can come from one of two Pods, but each has the same module/header name.

Kiosk/UIViewController+Bidding.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import UIKit
2-
import ARAnalytics
32

43
extension UIViewController {
54
func bid(auctionID: String, saleArtwork: SaleArtwork, allowAnimations: Bool, provider: Networking) {
6-
ARAnalytics.event("Bid Button Tapped", withProperties: ["id": saleArtwork.artwork.id])
75

86
let storyboard = UIStoryboard.fulfillment()
97
let containerController = storyboard.instantiateInitialViewController() as! FulfillmentContainerViewController

Podfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,7 @@ target 'Kiosk' do
4242
pod 'ARCollectionViewMasonryLayout', '~> 2.0.0'
4343
pod 'SDWebImage', '~> 3.7'
4444
pod 'SVProgressHUD'
45-
46-
# Required as a workaround for https://github.com/bitstadium/HockeySDK-iOS/pull/421
47-
pod 'HockeySDK-Source', git: 'https://github.com/bitstadium/HockeySDK-iOS.git'
48-
pod 'ARAnalytics/Segmentio'
49-
pod 'ARAnalytics/HockeyApp'
5045

51-
pod 'CardFlight-v4'
5246
pod 'Stripe', '14.0.1'
5347
pod 'ECPhoneNumberFormatter'
5448
pod 'UIImageViewAligned', :git => 'https://github.com/ashfurrow/UIImageViewAligned.git'

0 commit comments

Comments
 (0)