Develop 0.0.4 swift3

README.md

@@ -41,11 +41,11 @@ class LoginViewController: UIViewController {
     super.viewDidLoad()
 
     // bind the text in our username & password fields to their 
-    usernameField.b_text <-> username
-    passwordField.b_text <-> password
+    usernameField.b_text.bind(username)
+    passwordField.b_text.bind(password)
 
     // only enable the login button if they've entered an username and password
-    loginButton.b_enabled <-- inputIsValid
+    loginButton.b_enabled.bind(inputIsValid)
 
     // do the login when the user taps the login button 
     loginButton.b_onTap.subscribe { [weak self] in
@@ -107,50 +107,14 @@ event.fire("Hello, world")
 
 ### Subscribable
 
-As a side note, `Observable`, `Computed`, and `Event` all implement the same `Subscribable` protocol to provide a common interface to subscribing to changes/events.
+As a side note, `Observable`, `Computed`, and `Event` all inherit from `Subscribable` to provide a common interface to subscribing to changes/events.
 
 
 ## UI Bindings
 
-### Binding Setup
+### Property bindings
 
-UI binding are setup using the following operators:
-
-- `<--` / `-->`
-
-  One-way binding.  Data flows in the direction of the arrow.  For example:
-  ```swift
-  let messageLabel: UILabel = ...
-  let message = Observable("")
-  messageLabel.b_text <-- message
-
-  message.value = "Uh oh, an error has occurred"
-  // updates messageField's text automatically
-  ```
-
-- `<->`
-
-  Two-way binding.  Data flows both directions.  For example, a `UITextField`'s `text` property can be changed by the user or in code by the programmer.
-  ```swift
-  let nameField: UITextField = ...
-  let name = Observable("")
-  nameField.b_text <-> name
-
-  // `name` will stay in sync with `nameField`'s `text` property, whether we change the value of `name` or the user enters text into the text field
-  ```
-
-Or, if you prefer to avoid custom operators, you can use the provided `bind` method:
-
-```swift
-let messageLabel: UILabel = ...
-let message = Observable("")
-messageLabel.b_text.bind(message)
-```
-
-
-### Properties
-
-Generally, bindings for UIKit classes are the original property name prefixed with `b_`.  For example:
+Many of the `UIKit` classes have been extended to allow binding their properties to `Subscribables`.  These properties are generally to
 
 
 UIKit                | Fisticuffs       
@@ -161,6 +125,13 @@ UIKit                | Fisticuffs
 `UISwitch`.`on`      | `UISwitch`.`b_on`      
 *etc...*
 
+To bind a `Subscribable` (ie: `Observable`, `Computed`, etc...) to these, the `bind()` method can be used.
+
+```swift
+let messageLabel: UILabel = ...
+let message = Observable("")
+messageLabel.b_text.bind(message)
+```
 
 ### Events
 
@@ -174,16 +145,6 @@ button.b_onTap.subscribe {
 }
 ```
 
-Additionally, as syntactic sugar, a `+=` operator is provided for subscribing to events:
-
-```swift
-let button: UIButton = ...
-
-button.b_onTap += {
-  print("Pressed button!")
-}
-```
-
 ### UITableViews / UICollectionViews
 
 Fisticuffs provides support for easily binding data to UITableViews / UICollectionViews.  See example below:

Samples/AppDelegate.swift

@@ -28,30 +28,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
 
-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
     }
 
-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
 
-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
     }
 
-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
 
-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }