From 3ee46a5b10e38b4e7452d0033d43bb4d18b0b304 Mon Sep 17 00:00:00 2001
From: Alan Maynard <alan.maynard@uconn.edu>
Date: Thu, 28 Mar 2019 22:36:04 -0400
Subject: [PATCH] SWF-21 move fetch transactions call

- we now fetch transactions when the Recents button is tapped from AccountDetails
- created convenience method to show/hide all interface objects when showing activity indicator
---
 .../Base.lproj/Interface.storyboard           |  7 +++--
 .../AccountDetailsInterfaceController.swift   | 31 +++++++++++++++++++
 .../AccountTableInterfaceController.swift     | 25 ++-------------
 3 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard
index 16caf3d..9fc1d3a 100644
--- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard	
+++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard	
@@ -91,7 +91,6 @@
             <objects>
                 <controller hidesWhenLoading="NO" id="Rpu-25-8st" customClass="AccountTableInterfaceController" customModule="SynchronyFinancial_WatchKit_Extension">
                     <items>
-                        <imageView alignment="left" hidden="YES" id="juz-bW-tJj"/>
                         <label width="1" alignment="center" text="Accounts" textAlignment="center" id="JYm-yy-xrH"/>
                         <table alignment="left" id="To8-Ze-tMX">
                             <items>
@@ -110,7 +109,6 @@
                     </items>
                     <connections>
                         <outlet property="accountTable" destination="To8-Ze-tMX" id="oJb-Ry-7xR"/>
-                        <outlet property="activityIndicator" destination="juz-bW-tJj" id="Coh-Qr-sk7"/>
                         <outlet property="titleLabel" destination="JYm-yy-xrH" id="V1g-ul-i8Y"/>
                     </connections>
                 </controller>
@@ -122,6 +120,7 @@
             <objects>
                 <controller identifier="AccountDetails" id="yrN-yp-gkH" customClass="AccountDetailsInterfaceController" customModule="SynchronyFinancial_WatchKit_Extension">
                     <items>
+                        <imageView alignment="left" hidden="YES" id="diX-Fh-Why"/>
                         <label width="1" alignment="left" text="Label" textAlignment="center" id="qzl-GE-bpZ">
                             <fontDescription key="font" style="UICTFontTextStyleHeadline"/>
                         </label>
@@ -139,7 +138,7 @@
                                 </button>
                                 <button width="64" alignment="right" title="Recent" id="0HI-HK-yDl">
                                     <connections>
-                                        <segue destination="Jfd-Hv-PHe" kind="push" identifier="showTransactions" id="bjb-v1-scE"/>
+                                        <action selector="recentButtonTapped" destination="yrN-yp-gkH" id="8Rp-SG-lGZ"/>
                                     </connections>
                                 </button>
                             </items>
@@ -147,9 +146,11 @@
                     </items>
                     <connections>
                         <outlet property="accountNameLabel" destination="qzl-GE-bpZ" id="6jA-KZ-quX"/>
+                        <outlet property="activityIndicator" destination="diX-Fh-Why" id="Syr-8v-cTP"/>
                         <outlet property="availableFundsLabel" destination="q0b-tb-dAb" id="rcl-Tl-bDh"/>
                         <outlet property="balanceLabel" destination="mdb-QX-GuO" id="2Dj-nO-AM8"/>
                         <outlet property="nextPaymentDueLabel" destination="CPc-qk-Z2y" id="AzY-pn-EMY"/>
+                        <outlet property="nextPaymentTitleLabel" destination="rxs-Zb-naU" id="IDH-8E-WWm"/>
                         <outlet property="payButton" destination="zeF-ky-mkm" id="v5U-Y5-shh"/>
                         <outlet property="transactionsButton" destination="0HI-HK-yDl" id="L5Z-M9-wgO"/>
                     </connections>
diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift
index 601f41c..9b17d72 100644
--- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift	
+++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift	
@@ -12,12 +12,15 @@ import Foundation
 class AccountDetailsInterfaceController: WKInterfaceController {
     var selectedAccount: Account?
     var dictForAcct: [String: Account] = [:]
+    var transactionDict: [String: [Transaction]] = [:]
 
+    @IBOutlet var activityIndicator: WKInterfaceImage!
     @IBOutlet weak var transactionsButton: WKInterfaceButton!
     @IBOutlet weak var payButton: WKInterfaceButton!
     @IBOutlet weak var balanceLabel: WKInterfaceLabel!
     @IBOutlet weak var availableFundsLabel: WKInterfaceLabel!
     @IBOutlet weak var accountNameLabel: WKInterfaceLabel!
+    @IBOutlet var nextPaymentTitleLabel: WKInterfaceLabel!
     @IBOutlet weak var nextPaymentDueLabel: WKInterfaceLabel!
 
     @IBAction func payBillTapped() {
@@ -27,6 +30,24 @@ class AccountDetailsInterfaceController: WKInterfaceController {
         pushController(withName: "PayMinimum", context: dictForAcct)
     }
 
+    @IBAction func recentButtonTapped() {
+        configureInterfaceObjects(false)
+        activityIndicator.configureForActivityIndicator()
+        if let alias = selectedAccount?.accountAlias {
+            FetchData.fetchTransactionsFor(accountAlias: alias) { transactions, error in
+                guard error == nil else {
+                    NSLog("Error retrieving transactions for account.")
+                    return
+                }
+
+                self.transactionDict.updateValue(transactions, forKey: "transactions")
+                self.pushController(withName: "Transactions", context: self.transactionDict)
+                self.configureInterfaceObjects(false)
+                self.activityIndicator.stopAnimatingAsIndicator()
+            }
+        }
+    }
+
     override func awake(withContext context: Any?) {
         super.awake(withContext: context)
         payButton.setWidth(self.contentFrame.width / 2)
@@ -76,4 +97,14 @@ class AccountDetailsInterfaceController: WKInterfaceController {
         availableFundsLabel.setText("Available: $\(availableFormatted)")
         nextPaymentDueLabel.setText(date)
     }
+
+    private func configureInterfaceObjects(_ hide: Bool) {
+        transactionsButton.setHidden(hide)
+        payButton.setHidden(hide)
+        balanceLabel.setHidden(hide)
+        availableFundsLabel.setHidden(hide)
+        accountNameLabel.setHidden(hide)
+        nextPaymentDueLabel.setHidden(hide)
+        nextPaymentTitleLabel.setHidden(hide)
+    }
 }
diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountTableInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountTableInterfaceController.swift
index c0fe1fd..6f06f1a 100644
--- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountTableInterfaceController.swift	
+++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountTableInterfaceController.swift	
@@ -15,8 +15,8 @@ class AccountTableInterfaceController: WKInterfaceController {
     var transactionDict: [String: [Transaction]] = [:]
 
     @IBOutlet var titleLabel: WKInterfaceLabel!
-    @IBOutlet var activityIndicator: WKInterfaceImage!
     @IBOutlet weak var accountTable: WKInterfaceTable!
+
     override func awake(withContext context: Any?) {
         super.awake(withContext: context)
 
@@ -37,30 +37,9 @@ class AccountTableInterfaceController: WKInterfaceController {
         super.didDeactivate()
     }
 
-    override func contextsForSegue(withIdentifier segueIdentifier: String, in table: WKInterfaceTable, rowIndex: Int) -> [Any]? {
-        if segueIdentifier == "showAccountDetails" {
-            // account data is passed to the first interface controller in our new navigation stack
-            // if we want to pass to subsequent interface controllers, we would add them in corresponding order
-//            acctDict.updateValue(accounts[rowIndex], forKey: "acct")
-//            acctDict.updateValue(transactions, forKey: "transactions")
-            return [acctDict]
-        }
-        return nil
-    }
-
     override func table(_ table: WKInterfaceTable, didSelectRowAt rowIndex: Int) {
-        accountTable.setHidden(true)
-        titleLabel.setHidden(true)
-        activityIndicator.configureForActivityIndicator()
         acctDict.updateValue(accounts[rowIndex], forKey: "acct")
-        FetchData.fetchTransactionsFor(accountAlias: accounts[rowIndex].accountAlias) { transactions, error in
-            guard error == nil else { return }
-            self.transactionDict.updateValue(transactions, forKey: "transactions")
-            self.presentController(withNames: ["AccountDetails", "Transactions"], contexts: [self.acctDict, self.transactionDict])
-            self.accountTable.setHidden(false)
-            self.titleLabel.setHidden(false)
-            self.activityIndicator.stopAnimatingAsIndicator()
-        }
+        pushController(withName: "AccountDetails", context: acctDict)
     }
 
     private func configureRows() {