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

@orta: Transition largest VC to MVVM #503

Merged
merged 17 commits into from
Sep 4, 2015
Merged

@orta: Transition largest VC to MVVM #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9b6fce8
[MVVM] Initial push for listings VC.
ashfurrow Sep 1, 2015
8b40fc1
[MVVM] Makes ListingsViewController definition only override.
ashfurrow Sep 1, 2015
1e4ba52
[MVVM] Further abstracted things.
ashfurrow Sep 1, 2015
1150b87
[MVVM] Cut down listings VC even more.
ashfurrow Sep 1, 2015
871d99e
[Dependencies] Removes Dollar.
ashfurrow Sep 2, 2015
d5909bb
[MVVM] Swiftier code.
ashfurrow Sep 2, 2015
abb4ede
[MVVM] Removed access to sale artworks aray on VM.
ashfurrow Sep 2, 2015
709072d
[MVVM] Fixes intermittent crash.
ashfurrow Sep 2, 2015
41f6bb2
[MVVM] Created SaleArtworkViewModel.
ashfurrow Sep 2, 2015
c17a89f
[MVVM] Fixes SaleArtwork tests.
ashfurrow Sep 2, 2015
8333a8f
[MVVM] Getting existing tests working.
ashfurrow Sep 2, 2015
89f0a89
[MVVM] Concise syntax.
ashfurrow Sep 3, 2015
60985b7
[MVVM] Fixes typo.
ashfurrow Sep 3, 2015
8421eea
[MVVM] Clarifying function name.
ashfurrow Sep 3, 2015
a1382b9
[MVVM] Fixes intermittent test failures.
ashfurrow Sep 3, 2015
10b4f93
[MVVM] Removed unnecessary generics.
ashfurrow Sep 3, 2015
302c440
[MVVM] Added tests for new view model.
ashfurrow Sep 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Kiosk.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@
5EA637211A9E6AC60094A86E /* HelpViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA637201A9E6AC60094A86E /* HelpViewControllerTests.swift */; };
5EA6B1111B668F8300FEB3ED /* LoadingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA6B1101B668F8300FEB3ED /* LoadingViewModel.swift */; };
5EA6B1131B668F9300FEB3ED /* LoadingViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA6B1121B668F9300FEB3ED /* LoadingViewModelTests.swift */; };
5EA6CF771B96246800FE1122 /* ListingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA6CF761B96246800FE1122 /* ListingsViewModel.swift */; settings = {ASSET_TAGS = (); }; };
5EB0B71A1A5C410D00B7CBF2 /* ListingsCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EB0B7151A5C410D00B7CBF2 /* ListingsCollectionViewCell.swift */; };
5EB0B71B1A5C410D00B7CBF2 /* RACSignal+Kiosk.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EB0B7161A5C410D00B7CBF2 /* RACSignal+Kiosk.swift */; };
5EB0B71C1A5C410D00B7CBF2 /* UILabel+Fonts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EB0B7171A5C410D00B7CBF2 /* UILabel+Fonts.swift */; };
Expand All @@ -217,6 +218,8 @@
5EF71E871AE9B6EC0069A266 /* ManualCreditCardInputViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EF71E861AE9B6EC0069A266 /* ManualCreditCardInputViewModelTests.swift */; };
5EF71E891AE9B71C0069A266 /* ManualCreditCardInputViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EF71E881AE9B71C0069A266 /* ManualCreditCardInputViewModel.swift */; };
5EFA709C1A9674BD0082C916 /* BidderDetailsRetrieval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EFA709B1A9674BD0082C916 /* BidderDetailsRetrieval.swift */; };
5EFFE24E1B977DD3006BF64C /* SaleArtworkViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EFFE24D1B977DD3006BF64C /* SaleArtworkViewModel.swift */; settings = {ASSET_TAGS = (); }; };
5EFFE2501B978C3C006BF64C /* ListingsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EFFE24F1B978C3C006BF64C /* ListingsViewModelTests.swift */; settings = {ASSET_TAGS = (); }; };
D12607F71BF578705637C9A7 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5DFB9BD12B5173B74D620D7 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -402,6 +405,7 @@
5EA637201A9E6AC60094A86E /* HelpViewControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelpViewControllerTests.swift; sourceTree = "<group>"; };
5EA6B1101B668F8300FEB3ED /* LoadingViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoadingViewModel.swift; sourceTree = "<group>"; };
5EA6B1121B668F9300FEB3ED /* LoadingViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoadingViewModelTests.swift; sourceTree = "<group>"; };
5EA6CF761B96246800FE1122 /* ListingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListingsViewModel.swift; sourceTree = "<group>"; };
5EB0B6ED1A5C3E6800B7CBF2 /* Kiosk.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Kiosk.app; sourceTree = BUILT_PRODUCTS_DIR; };
5EB0B7021A5C3E6800B7CBF2 /* KioskTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KioskTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5EB0B7071A5C3E6800B7CBF2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -426,6 +430,8 @@
5EF71E861AE9B6EC0069A266 /* ManualCreditCardInputViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManualCreditCardInputViewModelTests.swift; sourceTree = "<group>"; };
5EF71E881AE9B71C0069A266 /* ManualCreditCardInputViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManualCreditCardInputViewModel.swift; sourceTree = "<group>"; };
5EFA709B1A9674BD0082C916 /* BidderDetailsRetrieval.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BidderDetailsRetrieval.swift; sourceTree = "<group>"; };
5EFFE24D1B977DD3006BF64C /* SaleArtworkViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SaleArtworkViewModel.swift; sourceTree = "<group>"; };
5EFFE24F1B978C3C006BF64C /* ListingsViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListingsViewModelTests.swift; sourceTree = "<group>"; };
B5DFB9BD12B5173B74D620D7 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BDA79D9FDF198B37A06B262F /* Pods-KioskTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KioskTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-KioskTests/Pods-KioskTests.release.xcconfig"; sourceTree = "<group>"; };
CB3EBEE2789DABF779E6EB67 /* Pods-KioskTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KioskTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-KioskTests/Pods-KioskTests.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -514,6 +520,7 @@
5E860FDD1A5C429C00456E41 /* Location.swift */,
5E860FDE1A5C429C00456E41 /* Sale.swift */,
5E860FDF1A5C429C00456E41 /* SaleArtwork.swift */,
5EFFE24D1B977DD3006BF64C /* SaleArtworkViewModel.swift */,
5E853EBD1A8BC9A200F91C0D /* BuyersPremium.swift */,
5E860FE01A5C429C00456E41 /* SystemTime.swift */,
5E860FE11A5C429C00456E41 /* User.swift */,
Expand Down Expand Up @@ -569,6 +576,7 @@
children = (
5E860FFC1A5C429C00456E41 /* ListingsCountdownManager.swift */,
5E860FFD1A5C429C00456E41 /* ListingsViewController.swift */,
5EA6CF761B96246800FE1122 /* ListingsViewModel.swift */,
5EB0B7151A5C410D00B7CBF2 /* ListingsCollectionViewCell.swift */,
5E860FFE1A5C429C00456E41 /* MasonryCollectionViewCell.swift */,
5E860FFF1A5C429C00456E41 /* TableCollectionViewCell.swift */,
Expand Down Expand Up @@ -806,6 +814,7 @@
5E8610D11A5C43EF00456E41 /* CardHandlerTests.swift */,
5E8610D21A5C43EF00456E41 /* KioskTests.swift */,
5E8610D31A5C43EF00456E41 /* ListingsViewControllerTests.swift */,
5EFFE24F1B978C3C006BF64C /* ListingsViewModelTests.swift */,
5E9F8AD31A8951C100CBEACE /* SaleArtworkDetailsViewControllerTests.swift */,
5E8610D41A5C43EF00456E41 /* Models */,
5E8610FD1A5C43EF00456E41 /* RegisterFlowViewTests.swift */,
Expand Down Expand Up @@ -1165,6 +1174,7 @@
5E86108D1A5C429C00456E41 /* KeypadContainerView.swift in Sources */,
5E86107E1A5C429C00456E41 /* MasonryCollectionViewCell.swift in Sources */,
5E86104F1A5C429C00456E41 /* ChooseAuctionViewController.swift in Sources */,
5EA6CF771B96246800FE1122 /* ListingsViewModel.swift in Sources */,
5E8610641A5C429C00456E41 /* Sale.swift in Sources */,
5E86104C1A5C429C00456E41 /* AdminLogViewController.swift in Sources */,
5E8610671A5C429C00456E41 /* User.swift in Sources */,
Expand Down Expand Up @@ -1211,6 +1221,7 @@
5EF71E891AE9B71C0069A266 /* ManualCreditCardInputViewModel.swift in Sources */,
5E86105B1A5C429C00456E41 /* Artwork.swift in Sources */,
5E8610971A5C429C00456E41 /* RACFunctions.swift in Sources */,
5EFFE24E1B977DD3006BF64C /* SaleArtworkViewModel.swift in Sources */,
5E86106B1A5C429C00456E41 /* UserCredentials.swift in Sources */,
5E8610781A5C429C00456E41 /* Spinner.swift in Sources */,
5E86109A1A5C429C00456E41 /* RegistrationMobileViewController.swift in Sources */,
Expand Down Expand Up @@ -1273,6 +1284,7 @@
5E8FABE81A5C49D800F6B913 /* StubResponses.m in Sources */,
5E8611071A5C43EF00456E41 /* ConfirmYourBidEnterYourEmailViewControllerTests.swift in Sources */,
5E8611061A5C43EF00456E41 /* ConfirmYourBidArtsyLoginViewControllerTests.swift in Sources */,
5EFFE2501B978C3C006BF64C /* ListingsViewModelTests.swift in Sources */,
5EBD314F1AE0563300648484 /* GenericFormValidationViewModelTests.swift in Sources */,
5E8611321A5C43EF00456E41 /* TestHelpers.swift in Sources */,
5E8611041A5C43EF00456E41 /* ArtsyAPISpec.swift in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions Kiosk/Admin/ChooseAuctionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class ChooseAuctionViewController: UIViewController {

override func viewDidLoad() {
super.viewDidLoad()
stackScrollView.backgroundColor = UIColor.whiteColor()
stackScrollView.backgroundColor = .whiteColor()
stackScrollView.bottomMarginHeight = CGFloat(NSNotFound)
stackScrollView.updateConstraints()

Expand All @@ -25,7 +25,7 @@ class ChooseAuctionViewController: UIViewController {

let button = ARFlatButton()
button.setTitle(title, forState: .Normal)
button.setTitleColor(UIColor.blackColor(), forState: .Normal)
button.setTitleColor(.blackColor(), forState: .Normal)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this

button.tag = i
button.rac_signalForControlEvents(.TouchUpInside).subscribeNext { (_) in
let defaults = NSUserDefaults.standardUserDefaults()
Expand Down
26 changes: 26 additions & 0 deletions Kiosk/App/GlobalFunctions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,29 @@ func responseIsOK(object: AnyObject!) -> AnyObject {
}
return false
}

// Adapted from https://github.com/FUKUZAWA-Tadashi/FHCCommander/blob/67c67757ee418a106e0ce0c0820459299b3d77bb/fhcc/Convenience.swift#L33-L44
func getSSID() -> String? {
let interfaces: CFArray! = CNCopySupportedInterfaces()
if interfaces == nil { return nil }

let if0: UnsafePointer<Void>? = CFArrayGetValueAtIndex(interfaces, 0)
if if0 == nil { return nil }

let interfaceName: CFStringRef = unsafeBitCast(if0!, CFStringRef.self)
let dictionary = CNCopyCurrentNetworkInfo(interfaceName) as NSDictionary?
if dictionary == nil { return nil }

return dictionary?[kCNNetworkInfoKeySSID as String] as? String
}

/// Looks for a connection to an Artsy WiFi network.
func detectDevelopmentEnvironment() -> Bool {
var developmentEnvironment = false
#if (arch(i386) || arch(x86_64)) && os(iOS)
developmentEnvironment = true
#else
developmentEnvironment = getSSID()?.lowercaseString.containsString("artsy") ?? false
#endif
return developmentEnvironment
}
101 changes: 4 additions & 97 deletions Kiosk/App/Models/SaleArtwork.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ struct SaleNumberFormatter {
static let dollarFormatter = createDollarFormatter()
}

private let kNoBidsString = "0 bids placed"

class SaleArtwork: JSONAble {

let id: String
Expand Down Expand Up @@ -52,6 +50,10 @@ class SaleArtwork: JSONAble {
self.artwork = artwork
}

lazy var viewModel: SaleArtworkViewModel = {
return SaleArtworkViewModel(saleArtwork: self)
}()

override class func fromJSON(json: [String: AnyObject]) -> JSONAble {
let json = JSON(json)
let id = json["id"].stringValue
Expand Down Expand Up @@ -94,101 +96,6 @@ class SaleArtwork: JSONAble {

artwork.updateWithValues(newSaleArtwork.artwork)
}

var estimateString: String {
// Default to estimateCents
if let estimateCents = estimateCents {
let dollars = NSNumberFormatter.currencyStringForCents(estimateCents)
return "Estimate: \(dollars)"
}

// Try to extract non-nil low/high estimates. Return a default otherwise.
switch (lowEstimateCents, highEstimateCents) {
case let (.Some(lowCents), .Some(highCents)):
let lowDollars = NSNumberFormatter.currencyStringForCents(lowCents)
let highDollars = NSNumberFormatter.currencyStringForCents(highCents)
return "Estimate: \(lowDollars)–\(highDollars)"
default:
return "No Estimate"
}
}

var numberOfBidsSignal: RACSignal {
return RACObserve(self, "bidCount").map { (optionalBidCount) -> AnyObject! in
// Technically, the bidCount is Int?, but the `as?` cast could fail (it never will, but the compiler doesn't know that)
// So we need to unwrap it as an optional optional. Yo dawg.
let bidCount = optionalBidCount as! Int?

if let bidCount = bidCount {
let suffix = bidCount == 1 ? "" : "s"
return "\(bidCount) bid\(suffix) placed"
} else {
return kNoBidsString
}
}
}

// The language used here is very specific – see https://github.com/artsy/eidolon/pull/325#issuecomment-64121996 for details
var numberOfBidsWithReserveSignal: RACSignal {
return RACSignal.combineLatest([numberOfBidsSignal, RACObserve(self, "reserveStatus"), RACObserve(self, "highestBidCents")]).map { (object) -> AnyObject! in
let tuple = object as! RACTuple // Ignoring highestBidCents; only there to trigger on bid update.

let numberOfBidsString = tuple.first as! String
let reserveStatus = ReserveStatus.initOrDefault(tuple.second as? String)

// if there is no reserve, just return the number of bids string.
if reserveStatus == .NoReserve {
return numberOfBidsString
} else {
if numberOfBidsString == kNoBidsString {
// If there are no bids, then return only this string.
return "This lot has a reserve"
} else if reserveStatus == .ReserveNotMet {
return "(\(numberOfBidsString), Reserve not met)"
} else { // implicitly, reserveStatus is .ReserveMet
return "(\(numberOfBidsString), Reserve met)"
}
}
}
}

var lotNumberSignal: RACSignal {
return RACObserve(self, "lotNumber").map({ (lotNumber) -> AnyObject! in
if let lotNumber = lotNumber as? Int {
return "Lot \(lotNumber)"
} else {
return nil
}
}).mapNilToEmptyString()
}

var forSaleSignal: RACSignal {
return RACObserve(self, "artwork").map { (artwork) -> AnyObject! in
let artwork = artwork as! Artwork

return Artwork.SoldStatus.fromString(artwork.soldStatus) == .NotSold
}
}

func currentBidSignal(prefix prefix: String = "", missingPrefix: String = "") -> RACSignal {
return RACObserve(self, "highestBidCents").map({ [weak self] (highestBidCents) -> AnyObject! in
if let currentBidCents = highestBidCents as? Int {
return "\(prefix)\(NSNumberFormatter.currencyStringForCents(currentBidCents))"
} else {
return "\(missingPrefix)\(NSNumberFormatter.currencyStringForCents(self?.openingBidCents ?? 0))"
}
})
}

override class func keyPathsForValuesAffectingValueForKey(key: String) -> Set<String> {
if key == "estimateString" {
return ["lowEstimateCents", "highEstimateCents"] as Set
} else if key == "lotNumberSignal" {
return ["lotNumber"] as Set
} else {
return super.keyPathsForValuesAffectingValueForKey(key)
}
}
}

func createDollarFormatter() -> NSNumberFormatter {
Expand Down
Loading