SWE-24 add activity indicator and embed screen contents in group

rrk12005 · Apr 9, 2019 · 3ef5a67 · 3ef5a67
1 parent 71e5caf
commit 3ef5a67
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard
@@ -289,27 +289,40 @@
             <objects>
                 <controller identifier="TransactionDetails" id="LeA-fL-4Wb" customClass="TransactionDetailsInterfaceController" customModule="SynchronyFinancial_WatchKit_App" customModuleProvider="target">
                     <items>
-                        <label width="1" alignment="center" text="Scheduled Online Payment Processing" textAlignment="center" numberOfLines="2" minimumScaleFactor="0.69999999999999996" id="z1i-je-74F">
-                            <fontDescription key="font" type="boldSystem" pointSize="15"/>
-                        </label>
-                        <separator alignment="left" id="HuQ-dl-7Ni"/>
-                        <group width="1" height="105" alignment="left" verticalAlignment="center" layout="vertical" id="EcM-m6-j4G">
+                        <imageView alignment="center" hidden="YES" id="GUu-D2-6Oc"/>
+                        <label width="136" alignment="center" hidden="YES" text="Cancelling..." textAlignment="center" id="SBS-c6-zvx"/>
+                        <group width="1" alignment="left" layout="vertical" id="w3k-a5-ZaU">
                             <items>
-                                <label width="1" alignment="center" verticalAlignment="center" text="Label" textAlignment="center" id="F4A-wp-ECw"/>
-                                <label width="1" alignment="center" verticalAlignment="center" text="Label" textAlignment="center" id="d4y-NP-GbP"/>
-                                <button width="1" alignment="center" verticalAlignment="bottom" title="Cancel Payment" id="4Rt-Xc-Vdh"/>
+                                <label width="1" alignment="center" text="Scheduled Online Payment Processing" textAlignment="center" numberOfLines="2" minimumScaleFactor="0.69999999999999996" id="z1i-je-74F">
+                                    <fontDescription key="font" type="boldSystem" pointSize="15"/>
+                                </label>
+                                <separator alignment="left" id="HuQ-dl-7Ni"/>
+                                <group width="1" height="105" alignment="left" verticalAlignment="center" layout="vertical" id="EcM-m6-j4G">
+                                    <items>
+                                        <label width="1" alignment="center" verticalAlignment="center" text="Label" textAlignment="center" id="F4A-wp-ECw"/>
+                                        <label width="1" alignment="center" verticalAlignment="center" text="Label" textAlignment="center" id="d4y-NP-GbP"/>
+                                        <button width="1" alignment="center" verticalAlignment="bottom" title="Cancel Payment" id="4Rt-Xc-Vdh">
+                                            <connections>
+                                                <action selector="cancelButtonTapped" destination="LeA-fL-4Wb" id="OZd-NZ-CFc"/>
+                                            </connections>
+                                        </button>
+                                    </items>
+                                </group>
                             </items>
                         </group>
                     </items>
                     <connections>
+                        <outlet property="activityIndicator" destination="GUu-D2-6Oc" id="EQW-cn-wV1"/>
+                        <outlet property="activityIndicatorLabel" destination="SBS-c6-zvx" id="f24-Cg-XrS"/>
                         <outlet property="amountLabel" destination="d4y-NP-GbP" id="WOU-uA-pCu"/>
                         <outlet property="cancelButton" destination="4Rt-Xc-Vdh" id="TLc-0k-RFv"/>
+                        <outlet property="contentGroup" destination="w3k-a5-ZaU" id="rQo-G8-l7A"/>
                         <outlet property="dateLabel" destination="F4A-wp-ECw" id="J5W-xg-g3R"/>
                         <outlet property="transactionName" destination="z1i-je-74F" id="i76-Qo-iL9"/>
                     </connections>
                 </controller>
             </objects>
-            <point key="canvasLocation" x="1420" y="-229"/>
+            <point key="canvasLocation" x="1420" y="-229.5"/>
         </scene>
         <!--Cancellation-->
         <scene sceneID="ZZZ-KP-exO">

diff --git a/...nancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift b/...nancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift
@@ -10,6 +10,9 @@ import WatchKit
 import Foundation
 
 class TransactionDetailsInterfaceController: WKInterfaceController {
+    @IBOutlet var contentGroup: WKInterfaceGroup!
+    @IBOutlet var activityIndicator: WKInterfaceImage!
+    @IBOutlet var activityIndicatorLabel: WKInterfaceLabel!
     @IBOutlet var transactionName: WKInterfaceLabel!
     @IBOutlet var dateLabel: WKInterfaceLabel!
     @IBOutlet var amountLabel: WKInterfaceLabel!