Merge pull request #8 from yonekawa/watchos_tvos

Add watchOS support
yonekawa · Nov 23, 2015 · 276aa7e · 276aa7e
2 parents 22bc0c0 + c88f4a3
commit 276aa7e
Show file tree

Hide file tree

Showing 10 changed files with 187 additions and 47 deletions.
diff --git a/DemoApp/TodoAction.swift b/DemoApp/TodoAction.swift
@@ -11,28 +11,33 @@ import SwiftFlux
 import Result
 
 class TodoAction {
-    class Fetch: Action {
+    struct Fetch: Action {
         typealias Payload = [Todo]
         func invoke(dispatcher: Dispatcher) {
             let todos = [
-                Todo(title: "Default ToDo 1"),
-                Todo(title: "Default ToDo 2"),
-                Todo(title: "Default ToDo 3")
+                Todo(title: "ToDo 1"),
+                Todo(title: "ToDo 2"),
+                Todo(title: "ToDo 3")
             ]
             dispatcher.dispatch(self, result: Result(value: todos))
         }
     }
 
-    class Create: Action {
+    struct Create: Action {
         typealias Payload = Todo
+        let title: String
 
-        private var title: String = ""
-        init(title: String) {
-            self.title = title
+        func invoke(dispatcher: Dispatcher) {
+            dispatcher.dispatch(self, result: Result(value: Todo(title: title)))
         }
+    }
 
+    struct Delete: Action {
+        typealias Payload = Int
+        let index: Int
+
         func invoke(dispatcher: Dispatcher) {
-            dispatcher.dispatch(self, result: Result(value: Todo(title: self.title)))
+            dispatcher.dispatch(self, result: Result(value: index))
         }
     }
 }
diff --git a/DemoApp/TodoListViewController.swift b/DemoApp/TodoListViewController.swift
@@ -15,15 +15,22 @@ class TodoListViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        self.todoStore.eventEmitter.listen(TodoStore.Event.Fetched) { () -> Void in
+        self.todoStore.eventEmitter.listen(TodoStore.Event.Fetched) { () in
             self.tableView.reloadData()
         }
-        self.todoStore.eventEmitter.listen(TodoStore.Event.Created) { () -> Void in
+        self.todoStore.eventEmitter.listen(TodoStore.Event.Created) { () in
+            self.tableView.reloadData()
+        }
+        self.todoStore.eventEmitter.listen(TodoStore.Event.Deleted) { () in
             self.tableView.reloadData()
         }
         ActionCreator.invoke(TodoAction.Fetch())
     }
 
+    @IBAction func createTodo() {
+        ActionCreator.invoke(TodoAction.Create(title: "New ToDo"))
+    }
+
     override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return self.todoStore.list.count
     }
@@ -34,8 +41,8 @@ class TodoListViewController: UITableViewController {
         return cell
     }
 
-    @IBAction func createTodo() {
-        ActionCreator.invoke(TodoAction.Create(title: "New ToDo"))
+    override func tableView(tableView: UITableView, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: NSIndexPath) {
+        ActionCreator.invoke(TodoAction.Delete(index: indexPath.row))
     }
 }
 
diff --git a/DemoApp/TodoStore.swift b/DemoApp/TodoStore.swift
@@ -14,6 +14,7 @@ class TodoStore : Store {
     enum TodoEvent {
         case Fetched
         case Created
+        case Deleted
     }
     typealias Event = TodoEvent
 
@@ -25,7 +26,7 @@ class TodoStore : Store {
     }
 
     init() {
-        ActionCreator.dispatcher.register(TodoAction.Fetch.self) { (result) -> Void in
+        ActionCreator.dispatcher.register(TodoAction.Fetch.self) { (result) in
             switch result {
             case .Success(let box):
                 self.todos = box
@@ -35,7 +36,7 @@ class TodoStore : Store {
             }
         }
 
-        ActionCreator.dispatcher.register(TodoAction.Create.self) { (result) -> Void in
+        ActionCreator.dispatcher.register(TodoAction.Create.self) { (result) in
             switch result {
             case .Success(let box):
                 self.todos.insert(box, atIndex: 0)
@@ -44,5 +45,15 @@ class TodoStore : Store {
                 break;
             }
         }
+
+        ActionCreator.dispatcher.register(TodoAction.Delete.self) { (result) in
+            switch result {
+            case .Success(let box):
+                self.todos.removeAtIndex(box)
+                self.eventEmitter.emit(TodoEvent.Deleted)
+            case .Failure(_):
+                break;
+            }
+        }
     }
 }
diff --git a/README.md b/README.md
@@ -13,9 +13,10 @@ It provides concept of "one-way data flow" with **type-safe** modules by Swift l
 
 # Requirements
 
-- Swift 2.0 (If you need to use with Swift 1.2, Use v0.0.3)
+- Swift 2.0 or later
 - iOS 8.0 or later
 - Mac OS 10.9 or later
+- watch OS 2.0 or later
 
 ## Installation
 

diff --git a/Rakefile b/Rakefile
@@ -5,7 +5,7 @@ end
 namespace :carthage do
   desc 'Update depndencies by carthage'
   task :update do |t|
-    run 'carthage update --use-submodules --platform Mac,iOS'
+    run 'carthage update --use-submodules --platform iOS,Mac,watchOS --verbose'
   end
 end
 

diff --git a/SwiftFlux.podspec b/SwiftFlux.podspec
@@ -7,6 +7,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.9"
+  s.watchos.deployment_target = "2.0"
 
   s.source = {
     git: "https://github.com/yonekawa/SwiftFlux.git",