Merge pull request #9 from roberthein/master

Connected the counters to the cell.

Author: mennenia

CounterExample/Actions/Actions.swift

@@ -1,5 +1,9 @@
 import ReSwift
 
 // all of the actions that can be applied to the state
-struct CounterActionIncrease: Action {}
-struct CounterActionDecrease: Action {}
+struct CounterActionIncrease: Action {
+    let index: Int
+}
+struct CounterActionDecrease: Action {
+    let index: Int
+}

CounterExample/Base.lproj/Main.storyboard

@@ -25,16 +25,19 @@
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="68" id="nmG-E3-MuA" customClass="CounterCell" customModule="CounterExample" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CounterCell" rowHeight="68" id="nmG-E3-MuA" customClass="CounterCell" customModule="CounterExample" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="375" height="68"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nmG-E3-MuA" id="oKv-oX-TLv">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="67"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="pre-xb-w8s">
+                                                <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" autorepeat="NO" minimumValue="-100" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="pre-xb-w8s">
                                                     <rect key="frame" x="273" y="19" width="94" height="29"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <connections>
+                                                        <action selector="stepperPressed:" destination="nmG-E3-MuA" eventType="valueChanged" id="TZG-Kz-CkK"/>
+                                                    </connections>
                                                 </stepper>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rgj-3I-jgW">
                                                     <rect key="frame" x="8" y="23" width="42" height="21"/>
@@ -45,6 +48,10 @@
                                                 </label>
                                             </subviews>
                                         </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="label" destination="rgj-3I-jgW" id="PiX-ed-k3x"/>
+                                            <outlet property="stepper" destination="pre-xb-w8s" id="gjH-nk-iU8"/>
+                                        </connections>
                                     </tableViewCell>
                                 </prototypes>
                                 <connections>

CounterExample/CounterCell.swift

@@ -7,18 +7,23 @@
 //
 
 import UIKit
+import ReSwift
 
-class CounterCell: UITableViewCell {
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        // Initialization code
-    }
+typealias CellAction = (Bool) -> ()
 
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
+class CounterCell: UITableViewCell {
+    
+    var action: CellAction?
 
-        // Configure the view for the selected state
+    @IBOutlet weak var label: UILabel!
+    @IBOutlet weak var stepper: UIStepper!
+    
+    @IBAction func stepperPressed(_ sender: UIStepper) {
+        if sender.value > 0 {
+            self.action?(true)
+        } else {
+            self.action?(false)
+        }
+        sender.value = 0
     }
-
 }

CounterExample/Reducers/CounterReducer.swift

@@ -12,10 +12,10 @@ struct CounterReducer: Reducer {
         var state = state ?? AppState()
 
         switch action {
-        case _ as CounterActionIncrease:
-            state.counters[0] += 1
-        case _ as CounterActionDecrease:
-            state.counters[0] -= 1
+        case let increaseAction as CounterActionIncrease:
+            state.counters[increaseAction.index] += 1
+        case let decreaseAction as CounterActionDecrease:
+            state.counters[decreaseAction.index] -= 1
         default:
             break
         }

CounterExample/State/AppState.swift

@@ -3,5 +3,5 @@ import ReSwift
 typealias Counter = Int
 
 struct AppState: StateType {
-    var counters: [Counter] = []
+    var counters: [Counter] = [Counter(), Counter(), Counter()]
 }

CounterExample/ViewController.swift

@@ -9,49 +9,47 @@
 import UIKit
 import ReSwift
 
-
 class ViewController: UIViewController, StoreSubscriber {
+    
     typealias StoreSubscriberStateType = AppState
 
     @IBOutlet weak var tableView: UITableView!
 
-    
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        // subscribe to state changes
         mainStore.subscribe(self)
-        }
+    }
 
     func newState(state: AppState) {
-        // when the state changes, the UI is updated to reflect the current state
         tableView.reloadData()
     }
-    
-    // when either button is tapped, an action is dispatched to the store
-    // in order to update the application state
-    @IBAction func downTouch(_ sender: AnyObject) {
-        mainStore.dispatch(CounterActionDecrease());
-    }
-    @IBAction func upTouch(_ sender: AnyObject) {
-        mainStore.dispatch(CounterActionIncrease());
-    }
-
 }
 
 extension ViewController : UITableViewDelegate {
+    
     func numberOfSections(in tableView: UITableView) -> Int {
-        return 0
+        return 1
     }
 }
 
 extension ViewController : UITableViewDataSource {
+    
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 1
+        return mainStore.state.counters.count
     }
+    
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        //TODO: return actual cell
-        return UITableViewCell()
+        let cell = tableView.dequeueReusableCell(withIdentifier: "CounterCell", for: indexPath) as! CounterCell
+        cell.label.text = "\(mainStore.state.counters[indexPath.row])"
+        cell.action = { didIncrease in
+            if didIncrease {
+                mainStore.dispatch(CounterActionIncrease(index: indexPath.row))
+            } else {
+                mainStore.dispatch(CounterActionDecrease(index: indexPath.row))
+            }
+            
+        }
+        
+        return cell
     }
-    
 }