diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard
index 5cbe21d..64ade48 100644
--- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard
+++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard
@@ -127,7 +127,7 @@
@@ -142,24 +142,24 @@
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift
index 8c50b12..a33a0f7 100644
--- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift
+++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift
@@ -11,6 +11,7 @@ import Foundation
class AccountDetailsInterfaceController: WKInterfaceController {
var selectedAccount: Account?
+ var dictForAcct: [String: Account] = [:]
@IBOutlet weak var balanceLabel: WKInterfaceLabel!
@IBOutlet weak var availableFundsLabel: WKInterfaceLabel!
@@ -41,9 +42,12 @@ class AccountDetailsInterfaceController: WKInterfaceController {
override func contextForSegue(withIdentifier segueIdentifier: String) -> Any? {
if segueIdentifier == "payBill" {
- print("button was tapped")
+ if let acct = selectedAccount {
+ dictForAcct.updateValue(acct, forKey: "acct")
+ return dictForAcct
+ }
}
-
+
return nil
}
diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PayBillInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PayBillInterfaceController.swift
index 9ef1d8b..c20d261 100644
--- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PayBillInterfaceController.swift
+++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PayBillInterfaceController.swift
@@ -9,8 +9,8 @@
import WatchKit
import Foundation
-
class PayBillInterfaceController: WKInterfaceController {
+ var acct: Account?
@IBOutlet weak var balanceLabel: WKInterfaceLabel!
@IBOutlet weak var payBalanceButton: WKInterfaceButton!
@@ -19,8 +19,15 @@ class PayBillInterfaceController: WKInterfaceController {
override func awake(withContext context: Any?) {
super.awake(withContext: context)
-
+
// Configure interface objects here.
+ guard let data = context as? [String: Account] else {
+ NSLog("Error receiving context containing selected account in AccountDetailInterfaceController")
+ return
+ }
+
+ acct = data["acct"]
+ configure()
}
override func willActivate() {
@@ -33,4 +40,15 @@ class PayBillInterfaceController: WKInterfaceController {
super.didDeactivate()
}
+ private func configure() {
+ if let valid = acct {
+ let balanceFormatted = String(format: "%.2f", valid.balance)
+ balanceLabel.setText("Balance: \(balanceFormatted)")
+ payBalanceButton.setTitle("Pay \(balanceFormatted)")
+
+ let minimumFormatted = String(format: "%.2f", valid.minimumPayment)
+ minimumLabel.setText("Minimum Payment: \(minimumFormatted)")
+ payMinimumButton.setTitle("Pay \(minimumFormatted)")
+ }
+ }
}
diff --git a/SynchronyFinancial/SynchronyFinancial/Account.swift b/SynchronyFinancial/SynchronyFinancial/Account.swift
index 3aa4941..4dbf388 100644
--- a/SynchronyFinancial/SynchronyFinancial/Account.swift
+++ b/SynchronyFinancial/SynchronyFinancial/Account.swift
@@ -14,6 +14,7 @@ class Account: NSObject {
var transactions: [Transaction]
var paymentDueDate: Date
var cycleEndDate: Date
+ var minimumPayment: Double
init(accountNumber: String, limit: Double, transactions: [Transaction], paymentDueDate: Date, cycleEndDate: Date) {
self.accountNumber = accountNumber
@@ -22,5 +23,6 @@ class Account: NSObject {
self.balance = transactions.map { $0.amount }.reduce(0.0, +)
self.paymentDueDate = paymentDueDate
self.cycleEndDate = cycleEndDate
+ self.minimumPayment = 25.00
}
}