@@ -11,17 +11,16 @@ import Foundation
1111import WatchConnectivity
1212
1313
14- class InterfaceController : WKInterfaceController , WCSessionDelegate , WKCrownDelegate {
14+ class InterfaceController : WKInterfaceController , WCSessionDelegate {
1515
1616
1717 var tipAmount : Int = 10
1818 var splitBetween : Int = 1
1919 var billTotal = Double ( 0 )
2020 var focusButton : Int = 0
21- var accumulatedCrownDelta = 0.0
2221
23- @IBOutlet weak var currentSplit : WKInterfaceButton !
24- @IBOutlet weak var currentTip : WKInterfaceButton !
22+ @IBOutlet var currentSplit : WKInterfaceLabel !
23+ @IBOutlet var currentTip : WKInterfaceLabel !
2524 @IBOutlet weak var billButton : WKInterfaceButton !
2625 @IBOutlet weak var currentTotal : WKInterfaceLabel !
2726 @IBOutlet weak var costEach : WKInterfaceLabel !
@@ -33,59 +32,9 @@ class InterfaceController: WKInterfaceController, WCSessionDelegate, WKCrownDele
3332 }
3433
3534
36-
37- func crownDidBecomeIdle( _ crownSequencer: WKCrownSequencer ? ) {
38- accumulatedCrownDelta = 0.0
39- }
40-
41- func crownDidRotate( _ crownSequencer: WKCrownSequencer ? , rotationalDelta: Double ) {
42- accumulatedCrownDelta += rotationalDelta
43- let threshold = 0.05
44-
45- // do nothing if delta is less that threshold
46- guard abs ( accumulatedCrownDelta) > threshold else {
47- return
48- }
49-
50- if focusButton == 1 {
51- if accumulatedCrownDelta > 0 {
52- splitBetween += 1
53- } else {
54- splitBetween -= 1
55- }
56- if splitBetween < 1 {
57- splitBetween = 1
58- }
59- if splitBetween > 50 {
60- splitBetween = 50
61- }
62- }
63-
64- if focusButton == 2 {
65- if accumulatedCrownDelta > 0 {
66- tipAmount += 1
67- } else {
68- tipAmount -= 1
69- }
70- if tipAmount < 0 {
71- tipAmount = 0
72- }
73- if tipAmount > 100 {
74- tipAmount = 100
75- }
76- }
77-
78- accumulatedCrownDelta = 0
79- updateCalc ( )
80-
81- }
82-
83-
8435 override func awake( withContext context: Any ? ) {
8536 super. awake ( withContext: context)
86-
8737 // Configure interface objects here.
88- crownSequencer. delegate = self
8938 updateCalc ( )
9039 }
9140
@@ -97,7 +46,6 @@ class InterfaceController: WKInterfaceController, WCSessionDelegate, WKCrownDele
9746 session. delegate = self
9847 session. activate ( )
9948 }
100- crownSequencer. focus ( )
10149 updateCalc ( )
10250 }
10351
@@ -106,36 +54,38 @@ class InterfaceController: WKInterfaceController, WCSessionDelegate, WKCrownDele
10654 super. didDeactivate ( )
10755 }
10856
109-
110- // chnage how many the bill is split between
111- @IBAction func showSplitController( ) {
112- resetButtonFocus ( )
113- currentSplit? . setBackgroundColor ( UIColor ( red: 0 / 255 , green: 128 / 255 , blue: 255 / 255 , alpha: 1.0 ) )
114- focusButton = 1
115- //presentController(withName: "SplitController", context: self)
57+ @IBAction func splitDecrease( ) {
58+ if ( splitBetween > 1 ) {
59+ splitBetween -= 1
60+ }
61+ updateCalc ( )
11662 }
11763
64+ @IBAction func splitIncrease( ) {
65+ if ( splitBetween < 99 ) {
66+ splitBetween += 1
67+ }
68+ updateCalc ( )
69+ }
11870
119- @IBAction func showTipController ( ) {
120- resetButtonFocus ( )
121- currentTip ? . setBackgroundColor ( UIColor ( red : 0 / 255 , green : 128 / 255 , blue : 255 / 255 , alpha : 1.0 ) )
122- focusButton = 2
123- //presentController(withName: "TipController", context: self )
71+ @IBAction func tipPercentReduce ( ) {
72+ if ( tipAmount > 0 ) {
73+ tipAmount -= 1
74+ }
75+ updateCalc ( )
12476 }
12577
78+ @IBAction func tipPercentIncrease( ) {
79+ if ( tipAmount< 100 ) {
80+ tipAmount += 1
81+ }
82+ updateCalc ( )
83+ }
12684
12785 @IBAction func showBillController( ) {
128- resetButtonFocus ( )
12986 presentController ( withName: " BillController " , context: self )
13087 }
13188
132- // reset the focus to the currently selected button
133- func resetButtonFocus( ) {
134- focusButton = 0
135- currentSplit? . setBackgroundColor ( UIColor . darkGray)
136- currentTip? . setBackgroundColor ( UIColor . darkGray)
137- billButton? . setBackgroundColor ( UIColor . darkGray)
138- }
13989
14090 // Update the actual calculations
14191 func updateCalc( ) {
@@ -146,8 +96,8 @@ class InterfaceController: WKInterfaceController, WCSessionDelegate, WKCrownDele
14696 let perPerson = billWithTip / Double( splitBetween)
14797
14898 // update display
149- currentTip. setTitle ( " \( tipAmount) % " )
150- currentSplit. setTitle ( " \( splitBetween) " )
99+ currentTip. setText ( " \( tipAmount) % " )
100+ currentSplit. setText ( " \( splitBetween) " )
151101 currentTotal. setText ( String ( format: " %.2f " , billTotal) )
152102 withTip. setText ( String ( format: " %.2f " , billWithTip) )
153103 costEach. setText ( String ( format: " %.2f " , perPerson) )
0 commit comments