Merge pull request #785 from xmartlabs/fix/buttonDisabled

fix button cell disabled state.

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode6.4
+osx_image: xcode7.2
 before_install:
     - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
     - gem install xcpretty --no-rdoc --no-ri --no-document --quiet

CHANGELOG.md

@@ -0,0 +1,126 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+### Latest:
+* Update row in `cellForRowAtIndexPath` instead of `willDisplayCell`
+* Added cancel action to image selector (by koenpunt)
+* Other minor fixes
+
+### Version 3.1.1
+* Allow setting width percentage on UITextView
+* Added custom inline row example
+* Fixed bug where XLFormImageCell was not added to project
+* Add ability to `end editing` on scroll
+* Other bugs and refactor
+
+### Version 3.1.0
+* Added Carthage support
+* Added NSCoding protocol
+* Allowed HTTP connections
+* Several bugfixes and improvements.
+
+### Version 3.0.2
+* Fix issue when inline pickers expand beyond table.
+
+### Version 3.0.1
+
+* Improvements and bug fixes.
+* Ability to left, right align textfields. Ability to set up a minimum textField width.
+* If form is being shown, assigning a new form automatically reload the tableview.
+* Update objective-c and swift example projects.
+* Swift compatibility fixes.
+* Long email validation added.
+* Fixed row copy issue, now valueTransformer value is copied.
+* Fixed step counter row layout issues.
+* Fixed issue "Last form field hides beneath enabled navigation controller's toolbar".
+* Fixed issue "Navigating between cells using bottom navigation buttons causes table cell dividers to disappear".
+* Use UIAlertController instead UIActionSheet/UIAlertView if possible.
+* Hidden and disabled rows resign first responder before changing state.
+* onChangeBlock added to rowDescriptor.
+* use tintColor as default button row color.
+* By default accessoryView is no longer shown for inline rows.
+* Fix NSBundle issues to use XLForm as dynamic framework.
+
+### Version 3.0.0
+
+* `hidden`, `disable` properties added to `XLFormRowDescriptor`. `@YES` `@NO` or a `NSPredicate` can be used to hide, disable de row.
+* `hidden` property added to `XLFormSectionDescriptor`. `@YES` `@NO` or a `NSPredicate` can be used to hide the section.
+* Added `XLFormRowDescriptorTypeCountDownTimerInline` and `XLFormRowDescriptorTypeCountDownTimer` row type with an example.
+* Deleted `dateFormatter` property and added support to use the `NSValueTransformer` to convert the selected object to a NSString in the XLFormDateCell class.
+
+* Added `XLFormRowDescriptorTypeCountDownTimerInline` and `XLFormRowDescriptorTypeCountDownTimer` row type with an example.
+* Deleted `dateFormatter` property and added support to use the `NSValueTransformer` to convert the selected object to a NSString in the XLFormDateCell class.
+
+
+### Version 2.2.0
+
+* Fixed "(null)" caption when `XLFormRowDescriptorTypeSelectorLeftRight` row required error message is shown.
+* Refresh the cell content instead of recreating one, when the form get back from a selection.
+* Added XLFormRowDescriptor to validations error to easily show an error mask.
+* Use row tag in validation error message if row does not have a title. It is also possible to set up a custom message if needed
+* Added a convenience method to add a XLFormRowDescriptor instance before another one.
+* Allow nil values in cellConfig and cellConfigAtConfigure.
+* Fix constraints for textFieldCell when it is configured to be right aligned.
+* Add asterisk to required segmentedCells if needed.
+* Fail validation for empty strings and NSNull on required rows.
+* Segue support added to buttons and selectors.
+* Ability to configure a storyboardId or a viewController nibName to by used by button and selector rows as presented view controller.
+* Fix scrolling to top when status bar is tapped.
+* Fix wrong type of XLFormRowDescriptorTypeDecimal row. Now it's converted to NSNumber.
+* Fix issue: XLFormRegexValidator only checks regex validation for NSStrings, not working for number.
+* Callconfigure method from awakeFromNib on XLFormBaseCell.
+* Assign form.delegate from inside setForm: method.
+* Added custom cell, validation, reordering, can insert, can delete examples.
+* Added support for inputAccessoryView. Default input accessory view allows to navigate among rows. Fully optionally and customizable.
+* Added suport for row navigation. Fully optionally and customizable.
+* beginEditing: endEditing: methods added. These method are called each time a row gains / loses firstResponder. They bring the ability to do UI changes.
+* Read Only mode added. `disable` property added to XLFormDescriptor class.
+* Rename `label` XLFormTextViewCell property as `textLabel`.
+* fix position of multivalued section accessory view.
+* Can delete, can delete, can reorder section mode added. it's possible to enable some of them, don't need to enable all modes.
+
+### Version 2.1.0
+
+* Change `XLFormRowDescriptorTypeText`, `XLFormRowDescriptorTypeName` and `XLFormRowDescriptorTypeTextView` keyboard type to `UIKeyboardTypeDefault`.
+* Added `XLFormRowDescriptorTypeInfo` row type and example.
+* Added `XLFormRowDescriptorTypeSelectorPopover` row type and example.
+* CI added. Created Test project into Tests folder and set up Travis.
+* Documented how to customize UI. Added an example.
+* Now XLFormViewController extends from UIViewController instead of UITableViewController.
+* Added tableView property as a XLFormViewController IBOutlet.
+* Added support for storyboard reuse identifier and nib file.
+* Button selection can be handled using a selector or block.
+* Added addAsteriskToRequiredRowsTitle property to XLFormDescriptor. NO is used as value by default.
+* Image cell has been removed because it depends on AFNetworking and now needs to be implemented as a custom cell. You can find the image custom cell in Examples/Others/CustomCells.
+
+### Version 2.0.0
+
+* Added `XLFormRowDescriptorTypeMultipleSelector` row type and example.
+* Added `XLFormRowDescriptorTypeSelectorPickerView` row type and example.
+* Added `XLFormRowDescriptorTypeSelectorPickerViewInline` row type and example.
+* Added generic way to create inline selector rows.
+* Ability to customize row animations.
+* `(NSDictionary *)formValues;` XLFormViewController method added in order to get raw form data.
+* Added `XLFormRowDescriptorTypeSelectorSegmentedControl` row type and example.
+* AFNetworking dependency removed.
+* Added `XLFormRowDescriptorTypeStepCounter` row type and related example.
+
+
+### Version 1.0.1
+
+* Added storyboard example.
+* Added button `XLFormRowDescriptorTypeButton` example.
+* Documented how to add a custom row.
+* Fixed issues: [#2](https://github.com/xmartlabs/XLForm/issues/2 "#2"), [#3](https://github.com/xmartlabs/XLForm/issues/3 "#3"), [#27](https://github.com/xmartlabs/XLForm/issues/27 "#27"), [#38](https://github.com/xmartlabs/XLForm/issues/38 "#38").
+* Fixed crash caused by inline date rows. [#6](https://github.com/xmartlabs/XLForm/issues/6 "#6")
+* Fixed ipad issue *invalid cell layout*. [#10](https://github.com/xmartlabs/XLForm/issues/10 "#10")
+* New convenience methods to insert sections dinamically. [#13](https://github.com/xmartlabs/XLForm/pull/13 "#13")
+* Change default label style to `UIFontTextStyleBody`. [#18](https://github.com/xmartlabs/XLForm/issues/18 "#18")
+* Added step counter row, `XLFormRowDescriptorTypeStepCounter`.
+* Added `initWithCoder` initializer to `XLFormViewController`. [#32](https://github.com/xmartlabs/XLForm/issues/32 "#32").
+* Added a convenience method to deselect a `XLFormRowDescriptor`. `-(void)deselectFormRow:(XLFormRowDescriptor *)row;`. [#33](https://github.com/xmartlabs/XLForm/issues/33 "#33").
+
+
+### Version 1.0.0 
+
+* Initial release

Examples/Objective-C/Examples/CustomRows/CustomRowsViewController.m

@@ -28,11 +28,13 @@
 #import "XLFormRatingCell.h"
 #import "FloatLabeledTextFieldCell.h"
 #import "XLFormCustomCell.h"
+#import "XLFormInlineSegmentedCell.h"
 
 static NSString * const kCustomRowFirstRatingTag = @"CustomRowFirstRatingTag";
 static NSString * const kCustomRowSecondRatingTag = @"CustomRowSecondRatingTag";
 static NSString * const kCustomRowFloatLabeledTextFieldTag = @"CustomRowFloatLabeledTextFieldTag";
 static NSString * const kCustomRowWeekdays = @"CustomRowWeekdays";
+static NSString * const kCustomInline = @"kCustomInline";
 static NSString * const kCustomRowText = @"kCustomText";
 
 @implementation CustomRowsViewController
@@ -94,6 +96,16 @@ static NSString * const kCustomRowText = @"kCustomText";
                    };
     [section addFormRow:row];
     
+    // Custom Inline Segmented row
+    section = [XLFormSectionDescriptor formSectionWithTitle:@"Custom Inline"];
+    [form addFormSection:section];
+    
+    // Inline segmented
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomInline rowType:XLFormRowDescriptorTypeSegmentedInline];
+    row.title = @"You support...";
+    row.selectorOptions = @[@"Uruguay", @"Brazil", @"Argentina", @"Chile"];
+    row.value = @"Uruguay";
+    [section addFormRow:row];
     
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];

Examples/Objective-C/Examples/CustomRows/FloatLabeledTextField/FloatLabeledTextFieldCell.m

@@ -31,7 +31,6 @@
 
 NSString * const XLFormRowDescriptorTypeFloatLabeledTextField = @"XLFormRowDescriptorTypeFloatLabeledTextField";
 
-const static CGFloat kHMargin = 15.0f;
 const static CGFloat kVMargin = 8.0f;
 const static CGFloat kFloatingLabelFontSize = 11.0f;
 
@@ -155,10 +154,9 @@ const static CGFloat kFloatingLabelFontSize = 11.0f;
     NSMutableArray * result = [[NSMutableArray alloc] init];
 
     NSDictionary * views = @{@"floatLabeledTextField": self.floatLabeledTextField};
-    NSDictionary *metrics = @{@"hMargin":@(kHMargin),
-                              @"vMargin":@(kVMargin)};
+    NSDictionary *metrics = @{@"vMargin":@(kVMargin)};
     
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(hMargin)-[floatLabeledTextField]-(hMargin)-|"
+    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[floatLabeledTextField]-|"
                                                                                                options:0
                                                                                                metrics:metrics
                                                                                                  views:views]];

Examples/Objective-C/Examples/CustomRows/Rating/XLFormRatingCell.xib

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,11 +11,12 @@
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="OGo-4x-YLf" customClass="XLFormRatingCell">
             <rect key="frame" x="0.0" y="0.0" width="478" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OGo-4x-YLf" id="hV6-xt-6pq">
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" tableViewCell="OGo-4x-YLf" id="hV6-xt-6pq">
+                <rect key="frame" x="0.0" y="0.0" width="478" height="43"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yhI-dj-sRk" customClass="XLRatingView">
-                        <rect key="frame" x="353" y="11" width="115" height="22"/>
+                        <rect key="frame" x="355" y="11" width="115" height="22"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="22" id="85e-Ov-qM7"/>
@@ -22,28 +24,21 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vxp-gw-YTt">
-                        <rect key="frame" x="15" y="11" width="338" height="21"/>
+                        <rect key="frame" x="8" y="11" width="347" height="21"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="21" id="IK4-8e-SFs"/>
-                            <constraint firstAttribute="width" constant="150" id="hNG-F9-1wj"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                         <nil key="highlightedColor"/>
-                        <variation key="default">
-                            <mask key="constraints">
-                                <exclude reference="hNG-F9-1wj"/>
-                            </mask>
-                        </variation>
                     </label>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="Vxp-gw-YTt" secondAttribute="bottom" constant="11" id="0Qz-iR-Tzb"/>
                     <constraint firstAttribute="centerY" secondItem="Vxp-gw-YTt" secondAttribute="centerY" id="4Vh-2e-m2p"/>
-                    <constraint firstAttribute="trailing" secondItem="yhI-dj-sRk" secondAttribute="trailing" constant="10" id="NPC-r7-JFl"/>
                     <constraint firstAttribute="centerY" secondItem="yhI-dj-sRk" secondAttribute="centerY" id="Vw4-h8-wId"/>
-                    <constraint firstItem="Vxp-gw-YTt" firstAttribute="leading" secondItem="hV6-xt-6pq" secondAttribute="leading" constant="15" id="Xgq-Cy-zLQ"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="yhI-dj-sRk" secondAttribute="trailing" id="W8E-PI-peE"/>
                     <constraint firstItem="Vxp-gw-YTt" firstAttribute="top" secondItem="hV6-xt-6pq" secondAttribute="top" constant="11" id="bgO-t8-Rjz"/>
+                    <constraint firstItem="Vxp-gw-YTt" firstAttribute="leading" secondItem="hV6-xt-6pq" secondAttribute="leadingMargin" id="mVS-0p-p0O"/>
                     <constraint firstItem="yhI-dj-sRk" firstAttribute="leading" secondItem="Vxp-gw-YTt" secondAttribute="trailing" id="n0B-tg-Pik"/>
                 </constraints>
             </tableViewCellContentView>

Examples/Objective-C/Examples/CustomRows/Weekdays/XLFormWeekDaysCell.xib

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,11 +11,12 @@
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="60" id="piA-L5-eiN" customClass="XLFormWeekDaysCell">
             <rect key="frame" x="0.0" y="0.0" width="382" height="50"/>
             <autoresizingMask key="autoresizingMask"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="piA-L5-eiN" id="Yr6-3E-keb">
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" tableViewCell="piA-L5-eiN" id="Yr6-3E-keb">
+                <rect key="frame" x="0.0" y="0.0" width="382" height="49"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZAg-Me-yKR">
-                        <rect key="frame" x="5" y="0.0" width="53" height="49"/>
+                        <rect key="frame" x="8" y="0.0" width="52" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="S">
                             <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -28,14 +30,14 @@
                         </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UjQ-Cw-7wH" userLabel="separator 1">
-                        <rect key="frame" x="58" y="10" width="1" height="29"/>
+                        <rect key="frame" x="60" y="10" width="1" height="29"/>
                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="K3N-3h-MZr"/>
                         </constraints>
                     </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N3w-qP-kRZ">
-                        <rect key="frame" x="58" y="0.0" width="53" height="49"/>
+                        <rect key="frame" x="60" y="0.0" width="53" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="M">
                             <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -46,14 +48,14 @@
                         </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kwc-0w-V51" userLabel="separator 2">
-                        <rect key="frame" x="111" y="10" width="1" height="29"/>
+                        <rect key="frame" x="113" y="10" width="1" height="29"/>
                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="3mE-sT-ql1"/>
                         </constraints>
                     </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cPl-47-rS8">
-                        <rect key="frame" x="111" y="0.0" width="53" height="49"/>
+                        <rect key="frame" x="113" y="0.0" width="52" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="T">
                             <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -64,14 +66,14 @@
                         </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EiN-2p-Oig" userLabel="separator 3">
-                        <rect key="frame" x="164" y="10" width="1" height="29"/>
+                        <rect key="frame" x="165" y="10" width="1" height="29"/>
                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="JyW-GC-0A7"/>
                         </constraints>
                     </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6iC-Cl-RyI">
-                        <rect key="frame" x="164" y="0.0" width="54" height="49"/>
+                        <rect key="frame" x="165" y="0.0" width="52" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="W">
                             <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -82,14 +84,14 @@
                         </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bRc-5e-QAH" userLabel="separator 4">
-                        <rect key="frame" x="218" y="10" width="1" height="29"/>
+                        <rect key="frame" x="217" y="10" width="1" height="29"/>
                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="W9F-iR-Leh"/>
                         </constraints>
                     </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eTo-Ip-reh">
-                        <rect key="frame" x="218" y="0.0" width="53" height="49"/>
+                        <rect key="frame" x="217" y="0.0" width="52" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="T">
                             <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -100,14 +102,14 @@
                         </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dHj-rj-mjh" userLabel="separator 5">
-                        <rect key="frame" x="271" y="10" width="1" height="29"/>
+                        <rect key="frame" x="269" y="10" width="1" height="29"/>
                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="h5U-x0-9nJ"/>
                         </constraints>
                     </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wjb-tu-QEo">
-                        <rect key="frame" x="271" y="0.0" width="53" height="49"/>
+                        <rect key="frame" x="269" y="0.0" width="53" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="F">
                             <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -118,14 +120,14 @@
                         </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L7g-lu-boa" userLabel="separator 6">
-                        <rect key="frame" x="324" y="10" width="1" height="29"/>
+                        <rect key="frame" x="322" y="10" width="1" height="29"/>
                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="81t-Xh-wZT"/>
                         </constraints>
                     </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LNf-b4-GYP">
-                        <rect key="frame" x="324" y="0.0" width="53" height="49"/>
+                        <rect key="frame" x="322" y="0.0" width="52" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="S">
                             <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -137,15 +139,9 @@
                     </button>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="ZAg-Me-yKR" firstAttribute="leading" secondItem="Yr6-3E-keb" secondAttribute="leading" constant="5" id="0EB-cP-ogn"/>
                     <constraint firstItem="6iC-Cl-RyI" firstAttribute="width" secondItem="cPl-47-rS8" secondAttribute="width" id="1ZI-HN-9ew"/>
-                    <constraint firstItem="cPl-47-rS8" firstAttribute="leading" secondItem="N3w-qP-kRZ" secondAttribute="trailing" id="1pQ-h0-SEG"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="leading" secondItem="6iC-Cl-RyI" secondAttribute="trailing" constant="1" id="2UA-Ao-KZF"/>
-                    <constraint firstItem="dHj-rj-mjh" firstAttribute="height" secondItem="L7g-lu-boa" secondAttribute="height" id="4dj-Xx-ksP"/>
                     <constraint firstAttribute="bottom" secondItem="EiN-2p-Oig" secondAttribute="bottom" constant="10" id="5eK-Bu-wpU"/>
-                    <constraint firstItem="N3w-qP-kRZ" firstAttribute="leading" secondItem="ZAg-Me-yKR" secondAttribute="trailing" id="67F-sV-r6W"/>
-                    <constraint firstItem="Wjb-tu-QEo" firstAttribute="leading" secondItem="dHj-rj-mjh" secondAttribute="trailing" id="6ZX-Ub-2vw"/>
-                    <constraint firstItem="EiN-2p-Oig" firstAttribute="height" secondItem="bRc-5e-QAH" secondAttribute="height" id="7Um-cV-f7p"/>
+                    <constraint firstItem="LNf-b4-GYP" firstAttribute="trailing" secondItem="Yr6-3E-keb" secondAttribute="trailingMargin" id="7Kc-RO-8KK"/>
                     <constraint firstItem="LNf-b4-GYP" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="7YT-x4-m88"/>
                     <constraint firstItem="6iC-Cl-RyI" firstAttribute="trailing" secondItem="bRc-5e-QAH" secondAttribute="leading" id="ABd-MQ-9sp"/>
                     <constraint firstAttribute="bottom" secondItem="UjQ-Cw-7wH" secondAttribute="bottom" constant="10" id="ASC-xR-Yxa"/>
@@ -153,87 +149,43 @@
                     <constraint firstItem="6iC-Cl-RyI" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="Aac-10-vTs"/>
                     <constraint firstItem="eTo-Ip-reh" firstAttribute="leading" secondItem="6iC-Cl-RyI" secondAttribute="trailing" id="BL5-PL-pac"/>
                     <constraint firstAttribute="bottom" secondItem="ZAg-Me-yKR" secondAttribute="bottom" id="BeZ-ar-qMN"/>
-                    <constraint firstItem="dHj-rj-mjh" firstAttribute="height" secondItem="bRc-5e-QAH" secondAttribute="height" id="DYn-Cd-g5H"/>
                     <constraint firstAttribute="bottom" secondItem="kwc-0w-V51" secondAttribute="bottom" constant="10" id="EXu-BP-ftM"/>
                     <constraint firstAttribute="bottom" secondItem="LNf-b4-GYP" secondAttribute="bottom" id="EYe-ne-rqO"/>
                     <constraint firstItem="cPl-47-rS8" firstAttribute="leading" secondItem="N3w-qP-kRZ" secondAttribute="trailing" id="Fo8-Tp-bkn"/>
                     <constraint firstItem="dHj-rj-mjh" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="GYq-pf-vR0"/>
-                    <constraint firstItem="cPl-47-rS8" firstAttribute="leading" secondItem="UjQ-Cw-7wH" secondAttribute="trailing" constant="72" id="HQ2-jA-X9g"/>
                     <constraint firstItem="Wjb-tu-QEo" firstAttribute="leading" secondItem="eTo-Ip-reh" secondAttribute="trailing" id="I0s-Ze-pwV"/>
                     <constraint firstAttribute="bottom" secondItem="bRc-5e-QAH" secondAttribute="bottom" constant="10" id="InL-Hk-twg"/>
                     <constraint firstItem="UjQ-Cw-7wH" firstAttribute="leading" secondItem="ZAg-Me-yKR" secondAttribute="trailing" id="Jj4-jg-rdr"/>
-                    <constraint firstItem="6iC-Cl-RyI" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" id="KQe-Ei-8jY"/>
                     <constraint firstItem="cPl-47-rS8" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="Kw5-3R-qXs"/>
                     <constraint firstItem="bRc-5e-QAH" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="MXG-vB-U8F"/>
                     <constraint firstItem="ZAg-Me-yKR" firstAttribute="width" secondItem="N3w-qP-kRZ" secondAttribute="width" id="Mem-UJ-5Js"/>
                     <constraint firstItem="L7g-lu-boa" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="OVT-GJ-zq8"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" constant="25" id="OYQ-8o-3j8"/>
                     <constraint firstItem="N3w-qP-kRZ" firstAttribute="width" secondItem="cPl-47-rS8" secondAttribute="width" id="Pl6-Xd-Krq"/>
                     <constraint firstItem="Wjb-tu-QEo" firstAttribute="width" secondItem="LNf-b4-GYP" secondAttribute="width" id="Pro-fg-wBA"/>
                     <constraint firstAttribute="bottom" secondItem="6iC-Cl-RyI" secondAttribute="bottom" id="Q5M-8N-hIh"/>
                     <constraint firstItem="UjQ-Cw-7wH" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="RGn-ja-FRD"/>
-                    <constraint firstAttribute="trailing" secondItem="LNf-b4-GYP" secondAttribute="trailing" constant="5" id="RlS-d5-rIx"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="trailing" secondItem="cPl-47-rS8" secondAttribute="leading" id="Rs4-Pl-R8X"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="leading" secondItem="bRc-5e-QAH" secondAttribute="trailing" id="SO9-U6-cVO"/>
                     <constraint firstAttribute="bottom" secondItem="N3w-qP-kRZ" secondAttribute="bottom" id="STf-aE-Y2E"/>
-                    <constraint firstAttribute="bottom" secondItem="kwc-0w-V51" secondAttribute="bottom" constant="10" id="SWG-oy-aZJ"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="TAb-IV-m7A"/>
                     <constraint firstAttribute="bottom" secondItem="cPl-47-rS8" secondAttribute="bottom" id="Tmp-md-564"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="height" secondItem="UjQ-Cw-7wH" secondAttribute="height" id="Uli-Qb-6Om"/>
                     <constraint firstItem="6iC-Cl-RyI" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" id="VcV-kz-XBb"/>
                     <constraint firstItem="eTo-Ip-reh" firstAttribute="width" secondItem="6iC-Cl-RyI" secondAttribute="width" id="X0k-jG-o63"/>
-                    <constraint firstItem="Wjb-tu-QEo" firstAttribute="leading" secondItem="eTo-Ip-reh" secondAttribute="trailing" id="cOc-P1-ZhU"/>
-                    <constraint firstItem="LNf-b4-GYP" firstAttribute="leading" secondItem="Wjb-tu-QEo" secondAttribute="trailing" id="dSr-cr-ebR"/>
                     <constraint firstItem="EiN-2p-Oig" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="fgT-6k-CaP"/>
                     <constraint firstItem="LNf-b4-GYP" firstAttribute="leading" secondItem="Wjb-tu-QEo" secondAttribute="trailing" id="gNl-wJ-ujY"/>
                     <constraint firstItem="ZAg-Me-yKR" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="glN-lT-q1z"/>
                     <constraint firstItem="eTo-Ip-reh" firstAttribute="width" secondItem="Wjb-tu-QEo" secondAttribute="width" id="hEH-9C-pGZ"/>
-                    <constraint firstItem="EiN-2p-Oig" firstAttribute="height" secondItem="kwc-0w-V51" secondAttribute="height" id="hOI-fd-H7m"/>
                     <constraint firstItem="eTo-Ip-reh" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="i5C-wG-rRN"/>
                     <constraint firstItem="eTo-Ip-reh" firstAttribute="trailing" secondItem="dHj-rj-mjh" secondAttribute="leading" id="jsw-H6-2gQ"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" id="lQE-r9-9JT"/>
                     <constraint firstAttribute="bottom" secondItem="L7g-lu-boa" secondAttribute="bottom" constant="10" id="lv1-xB-0zR"/>
                     <constraint firstItem="kwc-0w-V51" firstAttribute="leading" secondItem="N3w-qP-kRZ" secondAttribute="trailing" id="oQe-Qf-9ZO"/>
                     <constraint firstItem="Wjb-tu-QEo" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="pn7-s8-fDj"/>
                     <constraint firstItem="EiN-2p-Oig" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" id="qIf-aB-2ZY"/>
-                    <constraint firstItem="6iC-Cl-RyI" firstAttribute="leading" secondItem="EiN-2p-Oig" secondAttribute="trailing" id="sAE-Nl-Puc"/>
-                    <constraint firstItem="LNf-b4-GYP" firstAttribute="leading" secondItem="L7g-lu-boa" secondAttribute="trailing" id="t1q-Nc-vbg"/>
                     <constraint firstItem="kwc-0w-V51" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="tVL-uj-6Ma"/>
                     <constraint firstItem="Wjb-tu-QEo" firstAttribute="trailing" secondItem="L7g-lu-boa" secondAttribute="leading" id="u3Q-pF-E3A"/>
                     <constraint firstAttribute="bottom" secondItem="Wjb-tu-QEo" secondAttribute="bottom" id="uh4-LM-Ieo"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" constant="25" id="vrx-0B-GOB"/>
+                    <constraint firstItem="ZAg-Me-yKR" firstAttribute="leading" secondItem="Yr6-3E-keb" secondAttribute="leadingMargin" id="w9K-VP-JpE"/>
                     <constraint firstAttribute="bottom" secondItem="eTo-Ip-reh" secondAttribute="bottom" id="xIu-Vy-Nff"/>
-                    <constraint firstItem="N3w-qP-kRZ" firstAttribute="leading" secondItem="UjQ-Cw-7wH" secondAttribute="trailing" id="xWy-Uf-QEm"/>
                     <constraint firstItem="N3w-qP-kRZ" firstAttribute="leading" secondItem="ZAg-Me-yKR" secondAttribute="trailing" id="xsx-BM-yQ5"/>
                     <constraint firstItem="N3w-qP-kRZ" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="yEX-Wv-CZQ"/>
                 </constraints>
-                <variation key="default">
-                    <mask key="constraints">
-                        <exclude reference="67F-sV-r6W"/>
-                        <exclude reference="xWy-Uf-QEm"/>
-                        <exclude reference="1pQ-h0-SEG"/>
-                        <exclude reference="HQ2-jA-X9g"/>
-                        <exclude reference="OYQ-8o-3j8"/>
-                        <exclude reference="Rs4-Pl-R8X"/>
-                        <exclude reference="SWG-oy-aZJ"/>
-                        <exclude reference="TAb-IV-m7A"/>
-                        <exclude reference="Uli-Qb-6Om"/>
-                        <exclude reference="lQE-r9-9JT"/>
-                        <exclude reference="vrx-0B-GOB"/>
-                        <exclude reference="KQe-Ei-8jY"/>
-                        <exclude reference="sAE-Nl-Puc"/>
-                        <exclude reference="7Um-cV-f7p"/>
-                        <exclude reference="hOI-fd-H7m"/>
-                        <exclude reference="2UA-Ao-KZF"/>
-                        <exclude reference="SO9-U6-cVO"/>
-                        <exclude reference="6ZX-Ub-2vw"/>
-                        <exclude reference="cOc-P1-ZhU"/>
-                        <exclude reference="4dj-Xx-ksP"/>
-                        <exclude reference="DYn-Cd-g5H"/>
-                        <exclude reference="dSr-cr-ebR"/>
-                        <exclude reference="t1q-Nc-vbg"/>
-                    </mask>
-                </variation>
             </tableViewCellContentView>
             <connections>
                 <outlet property="fridayButton" destination="Wjb-tu-QEo" id="AcP-Qg-i9P"/>
@@ -244,7 +196,7 @@
                 <outlet property="tuesdayButton" destination="cPl-47-rS8" id="wIn-mO-cUx"/>
                 <outlet property="wednesdayButton" destination="6iC-Cl-RyI" id="GQe-Oy-pcd"/>
             </connections>
-            <point key="canvasLocation" x="296" y="222"/>
+            <point key="canvasLocation" x="443" y="197"/>
         </tableViewCell>
     </objects>
 </document>

Examples/Objective-C/Examples/ExamplesFormViewController.m

@@ -89,7 +89,7 @@ NSString * const kValidations= @"Validations";
     
     // NativeEventFormViewController
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"realExamples" rowType:XLFormRowDescriptorTypeButton title:@"iOS Calendar Event Form"];
-    row.action.formSegueIdenfifier = @"NativeEventNavigationViewControllerSegue";
+    row.action.formSegueIdentifier = @"NativeEventNavigationViewControllerSegue";
     [section addFormRow:row];
     
     
@@ -105,7 +105,7 @@ NSString * const kValidations= @"Validations";
     
     // Selectors
     row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectors rowType:XLFormRowDescriptorTypeButton title:@"Selectors"];
-    row.action.formSegueIdenfifier = @"SelectorsFormViewControllerSegue";
+    row.action.formSegueIdentifier = @"SelectorsFormViewControllerSegue";
     [section addFormRow:row];
     
     // Dates
@@ -115,7 +115,7 @@ NSString * const kValidations= @"Validations";
     
     // Others
     row = [XLFormRowDescriptor formRowDescriptorWithTag:kOthes rowType:XLFormRowDescriptorTypeButton title:@"Other Rows"];
-    row.action.formSegueIdenfifier = @"OthersFormViewControllerSegue";
+    row.action.formSegueIdentifier = @"OthersFormViewControllerSegue";
     [section addFormRow:row];
     
     section = [XLFormSectionDescriptor formSectionWithTitle:@"Multivalued example"];
@@ -166,22 +166,22 @@ NSString * const kValidations= @"Validations";
     [form addFormSection:section];
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:kValidations rowType:XLFormRowDescriptorTypeButton title:@"Validation Examples"];
-    row.action.formSegueIdenfifier = @"ValidationExamplesFormViewControllerSegue";
+    row.action.formSegueIdentifier = @"ValidationExamplesFormViewControllerSegue";
     [section addFormRow:row];
     
     section = [XLFormSectionDescriptor formSectionWithTitle:@"Using Predicates"];
     [form addFormSection:section];
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:kPredicates rowType:XLFormRowDescriptorTypeButton title:@"Very basic predicates"];
-    row.action.formSegueIdenfifier = @"BasicPredicateViewControllerSegue";
+    row.action.formSegueIdentifier = @"BasicPredicateViewControllerSegue";
     [section addFormRow:row];
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:kPredicates rowType:XLFormRowDescriptorTypeButton title:@"Blog Example Hide predicates"];
-    row.action.formSegueIdenfifier = @"BlogExampleViewSegue";
+    row.action.formSegueIdentifier = @"BlogExampleViewSegue";
     [section addFormRow:row];
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:kPredicates rowType:XLFormRowDescriptorTypeButton title:@"Another example"];
-    row.action.formSegueIdenfifier = @"PredicateFormViewControllerSegue";
+    row.action.formSegueIdentifier = @"PredicateFormViewControllerSegue";
     [section addFormRow:row];
     
     self.form = form;

Examples/Objective-C/Examples/Inputs/InputsFormViewController.m

@@ -30,6 +30,7 @@
 NSString *const kName = @"name";
 NSString *const kEmail = @"email";
 NSString *const kTwitter = @"twitter";
+NSString *const kZipCode = @"zipCode";
 NSString *const kNumber = @"number";
 NSString *const kInteger = @"integer";
 NSString *const kDecimal = @"decimal";
@@ -72,6 +73,10 @@ NSString *const kNotes = @"notes";
     row.value = @"@no_editable";
     [section addFormRow:row];
     
+    // Zip Code
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:kZipCode rowType:XLFormRowDescriptorTypeZipCode title:@"Zip Code"];
+    [section addFormRow:row];
+
     // Number
     row = [XLFormRowDescriptor formRowDescriptorWithTag:kNumber rowType:XLFormRowDescriptorTypeNumber title:@"Number"];
     [section addFormRow:row];

Examples/Objective-C/Examples/MultiValuedSections/MultivaluedFormViewController.m

@@ -88,7 +88,7 @@
 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 80000
     UIActionSheet * actionSheet = [[UIActionSheet alloc] initWithTitle:nil
                                                               delegate:self
-                                                     cancelButtonTitle:@"Cancel"
+                                                     cancelButtonTitle:NSLocalizedString(@"Cancel")
                                                 destructiveButtonTitle:@"Remove Last Section"
                                                      otherButtonTitles:@"Add a section at the end", self.form.isDisabled ? @"Enable Form" : @"Disable Form", nil];
     [actionSheet showInView:self.view];
@@ -97,7 +97,7 @@
         UIAlertController * alertController = [UIAlertController alertControllerWithTitle:nil
                                                                                   message:nil
                                                                            preferredStyle:UIAlertControllerStyleActionSheet];
-        [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel"
+        [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
                                                             style:UIAlertActionStyleCancel
                                                           handler:nil]];
         __weak __typeof(self)weakSelf = self;
@@ -135,7 +135,7 @@
     else{
         UIActionSheet * actionSheet = [[UIActionSheet alloc] initWithTitle:nil
                                                                   delegate:self
-                                                         cancelButtonTitle:@"Cancel"
+                                                         cancelButtonTitle:NSLocalizedString(@"Cancel", nil)
                                                     destructiveButtonTitle:@"Remove Last Section"
                                                          otherButtonTitles:@"Add a section at the end", self.form.isDisabled ? @"Enable Form" : @"Disable Form", nil];
         [actionSheet showInView:self.view];
@@ -165,7 +165,7 @@
         [newSection addFormRow:newRow];
         [self.form addFormSection:newSection];
     }
-    else if (![[actionSheet buttonTitleAtIndex:buttonIndex] isEqualToString:@"Cancel"]){
+    else if (![[actionSheet buttonTitleAtIndex:buttonIndex] isEqualToString:NSLocalizedString(@"Cancel")]){
         self.form.disabled = !self.form.disabled;
         [self.tableView endEditing:YES];
         [self.tableView reloadData];

Examples/Objective-C/Examples/Others/CustomCells/XLFormImageSelectorCell.m

@@ -105,7 +105,7 @@ NSString *const kFormImageSelectorCellImageRequest = @"imageRequest";
         UIAlertController * alertController = [UIAlertController alertControllerWithTitle:self.rowDescriptor.selectorTitle
                                                                                   message:nil
                                                                            preferredStyle:UIAlertControllerStyleActionSheet];
-        [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel"
+        [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
                                                             style:UIAlertActionStyleCancel
                                                           handler:nil]];
         __weak __typeof(self)weakSelf = self;
@@ -154,7 +154,7 @@ NSString *const kFormImageSelectorCellImageRequest = @"imageRequest";
     
     NSDictionary *metrics = @{@"margin":@5.0};
     
-    [self.contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(margin)-[text]" options:0 metrics:metrics views:uiComponents]];
+    [self.contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[text]" options:0 metrics:metrics views:uiComponents]];
     [self.contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(margin)-[text]" options:0 metrics:metrics views:uiComponents]];
     
     

Examples/Objective-C/Examples/Others/OthersFormViewController.m

@@ -34,6 +34,7 @@ NSString *const kSegmentedControl = @"segmentedControl";
 NSString *const kCustom = @"custom";
 NSString *const kInfo = @"info";
 NSString *const kButton = @"button";
+NSString *const kImage = @"image";
 NSString *const kButtonLeftAligned = @"buttonLeftAligned";
 NSString *const kButtonWithSegueId = @"buttonWithSegueId";
 NSString *const kButtonWithSegueClass = @"buttonWithSegueClass";
@@ -73,13 +74,14 @@ NSString *const kButtonWithStoryboardId = @"buttonWithStoryboardId";
     [form addFormSection:section];
     
     // Switch
-    [section addFormRow:[XLFormRowDescriptor formRowDescriptorWithTag:kSwitchBool rowType:XLFormRowDescriptorTypeBooleanSwitch title:@"Switch"]];
-    
+    XLFormRowDescriptor * row = [XLFormRowDescriptor formRowDescriptorWithTag:kSwitchBool rowType:XLFormRowDescriptorTypeBooleanSwitch title:@"Switch"];
+    [row.cellConfigAtConfigure setObject:[UIColor redColor] forKey:@"switchControl.onTintColor"];
+    [section addFormRow:row];
     // check
     [section addFormRow:[XLFormRowDescriptor formRowDescriptorWithTag:kSwitchCheck rowType:XLFormRowDescriptorTypeBooleanCheck title:@"Check"]];
     
     // step counter
-    XLFormRowDescriptor * row = [XLFormRowDescriptor formRowDescriptorWithTag:kStepCounter rowType:XLFormRowDescriptorTypeStepCounter title:@"Step counter"];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:kStepCounter rowType:XLFormRowDescriptorTypeStepCounter title:@"Step counter"];
     row.value = @50;
     [row.cellConfigAtConfigure setObject:@YES forKey:@"stepControl.wraps"];
     [row.cellConfigAtConfigure setObject:@10 forKey:@"stepControl.stepValue"];
@@ -102,6 +104,10 @@ NSString *const kButtonWithStoryboardId = @"buttonWithStoryboardId";
     [row.cellConfigAtConfigure setObject:@(4) forKey:@"steps"];
     [section addFormRow:row];
     
+    // Image
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:kImage rowType:XLFormRowDescriptorTypeImage title:@"Image"];
+    row.value = [UIImage imageNamed:@"default_avatar"];
+    [section addFormRow:row];
 
     // Info cell
     XLFormRowDescriptor *infoRowDescriptor = [XLFormRowDescriptor formRowDescriptorWithTag:kInfo rowType:XLFormRowDescriptorTypeInfo];
@@ -122,7 +128,7 @@ NSString *const kButtonWithStoryboardId = @"buttonWithStoryboardId";
     
     // Left Button
     XLFormRowDescriptor * buttonLeftAlignedRow = [XLFormRowDescriptor formRowDescriptorWithTag:kButtonLeftAligned rowType:XLFormRowDescriptorTypeButton title:@"Button with Block"];
-    [buttonLeftAlignedRow.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
+    [buttonLeftAlignedRow.cellConfig setObject:@(NSTextAlignmentNatural) forKey:@"textLabel.textAlignment"];
     [buttonLeftAlignedRow.cellConfig setObject:@(UITableViewCellAccessoryDisclosureIndicator) forKey:@"accessoryType"];
     
     __typeof(self) __weak weakSelf = self;
@@ -168,7 +174,7 @@ NSString *const kButtonWithStoryboardId = @"buttonWithStoryboardId";
     
     // Button with SegueId
     XLFormRowDescriptor * buttonWithSegueId = [XLFormRowDescriptor formRowDescriptorWithTag:kButtonWithSegueClass rowType:XLFormRowDescriptorTypeButton title:@"Button with Segue Idenfifier"];
-    buttonWithSegueId.action.formSegueIdenfifier = @"MapViewControllerSegue";
+    buttonWithSegueId.action.formSegueIdentifier = @"MapViewControllerSegue";
     [section addFormRow:buttonWithSegueId];
     
     

Examples/Objective-C/Examples/PredicateExamples/PredicateFormViewController.m

@@ -106,7 +106,7 @@ NSString *const kPredDep2 = @"preddep2";
     typeof(self) __weak weakself = self;
     row.onChangeBlock = ^(id oldValue, id newValue, XLFormRowDescriptor* __unused rowDescriptor){
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Account Field changed" message:[NSString stringWithFormat:@"Old value: %@\nNew value: %@", oldValue, newValue ] preferredStyle:UIAlertControllerStyleActionSheet];
-        [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
+        [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleCancel handler:nil]];
         [weakself.navigationController presentViewController:alert animated:YES completion:nil];
     };
     

Examples/Objective-C/Examples/Selectors/DynamicSelector/UsersTableViewController.m

@@ -98,7 +98,7 @@
     NSDictionary *metrics = @{@"imgSize":@50.0,
                               @"margin" :@12.0};
     
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(margin)-[image(imgSize)]-[name]"
+    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[image(imgSize)]-[name]"
                                                                         options:NSLayoutFormatAlignAllTop
                                                                         metrics:metrics
                                                                           views:views]];

Examples/Objective-C/Examples/Selectors/SelectorsFormViewController.m

@@ -212,11 +212,13 @@ NSString *const kSelectorWithStoryboardId = @"selectorWithStoryboardId";
     mutableRightOptions = [rightOptions mutableCopy];
     [mutableRightOptions removeObjectAtIndex:1];
     leftRightSelectorOption = [XLFormLeftRightSelectorOption formLeftRightSelectorOptionWithLeftValue:[XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"] httpParameterKey:@"option_2" rightOptions:mutableRightOptions];
+    leftRightSelectorOption.leftValueChangePolicy = XLFormLeftRightSelectorOptionLeftValueChangePolicyChooseFirstOption;
     [leftRightSelectorOptions addObject:leftRightSelectorOption];
     
     mutableRightOptions = [rightOptions mutableCopy];
     [mutableRightOptions removeObjectAtIndex:2];
     leftRightSelectorOption = [XLFormLeftRightSelectorOption formLeftRightSelectorOptionWithLeftValue:[XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"]  httpParameterKey:@"option_3" rightOptions:mutableRightOptions];
+    leftRightSelectorOption.leftValueChangePolicy = XLFormLeftRightSelectorOptionLeftValueChangePolicyChooseLastOption;
     [leftRightSelectorOptions addObject:leftRightSelectorOption];
     
     mutableRightOptions = [rightOptions mutableCopy];
@@ -332,8 +334,8 @@ NSString *const kSelectorWithStoryboardId = @"selectorWithStoryboardId";
     [section addFormRow:row];
     
     // selector with SegueId
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorWithSegueId rowType:XLFormRowDescriptorTypeSelectorPush title:@"Selector with Segue Idenfifier"];
-    row.action.formSegueIdenfifier = @"MapViewControllerSegue";
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorWithSegueId rowType:XLFormRowDescriptorTypeSelectorPush title:@"Selector with Segue Identifier"];
+    row.action.formSegueIdentifier = @"MapViewControllerSegue";
     row.valueTransformer = [CLLocationValueTrasformer class];
     row.value = [[CLLocation alloc] initWithLatitude:-33 longitude:-56];
     [section addFormRow:row];

Examples/Objective-C/Examples/StoryboardExample/iPhoneStoryboard.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="p4n-1v-pzo">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="p4n-1v-pzo">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->
@@ -13,6 +13,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="SNt-hk-N3V">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -34,6 +35,7 @@
                     <view key="view" contentMode="scaleToFill" id="wpr-wE-9nj">
                         <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
@@ -60,9 +62,11 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="JY7-WL-SnH">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                <animations/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                             </tableView>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="JY7-WL-SnH" firstAttribute="leading" secondItem="tun-QW-CGC" secondAttribute="leading" id="bSe-SV-rx6"/>
@@ -94,9 +98,11 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="Lxj-Sb-kC6">
                                 <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                                <animations/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                             </tableView>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="Lxj-Sb-kC6" firstAttribute="top" secondItem="kOR-67-djF" secondAttribute="bottom" id="PT1-Xo-3Ql"/>
@@ -132,6 +138,7 @@
                     <view key="view" contentMode="scaleToFill" id="hrV-fb-58s">
                         <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
@@ -155,9 +162,11 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="Fty-3j-BeF">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                <animations/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                             </tableView>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="xtJ-Wo-mhU" firstAttribute="top" secondItem="Fty-3j-BeF" secondAttribute="bottom" id="CbV-4f-RzP"/>
@@ -188,6 +197,7 @@
                     <view key="view" contentMode="scaleToFill" id="6EZ-O7-FjX">
                         <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
@@ -208,6 +218,7 @@
                     <view key="view" contentMode="scaleToFill" id="bNj-SD-83w">
                         <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
@@ -231,6 +242,7 @@
                     <view key="view" contentMode="scaleToFill" id="JjC-E5-SyY">
                         <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
@@ -248,6 +260,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="fO3-V7-XXu">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -269,6 +282,7 @@
                     <view key="view" contentMode="scaleToFill" id="NZg-t1-g19">
                         <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
@@ -292,9 +306,11 @@
                         <subviews>
                             <tableView autoresizesSubviews="NO" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="fLo-Gu-rqr">
                                 <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+                                <animations/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                             </tableView>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="uVG-bI-IMr" firstAttribute="top" secondItem="fLo-Gu-rqr" secondAttribute="bottom" id="25A-HG-wek"/>
@@ -313,11 +329,6 @@
             <point key="canvasLocation" x="1346" y="1178"/>
         </scene>
     </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
         <segue reference="Mtw-x2-E0b"/>
     </inferredMetricsTieBreakers>

Examples/Objective-C/Inline Segmented/XLFormInlineSegmentedCell.h

@@ -0,0 +1,22 @@
+//
+//  XLFormInlineSegmentedCell.h
+//  XLForm
+//
+//  Created by mathias Claassen on 16/12/15.
+//  Copyright © 2015 Xmartlabs. All rights reserved.
+//
+
+#import <XLForm/XLForm.h>
+
+extern NSString * const XLFormRowDescriptorTypeSegmentedInline;
+extern NSString * const XLFormRowDescriptorTypeSegmentedControl;
+
+@interface XLFormInlineSegmentedCell : XLFormBaseCell
+
+@end
+
+
+@interface XLFormInlineSegmentedControl : XLFormBaseCell<XLFormInlineRowDescriptorCell>
+
+@property (strong, nonatomic) UISegmentedControl* segmentedControl;
+@end

Examples/Objective-C/Inline Segmented/XLFormInlineSegmentedCell.m

@@ -0,0 +1,194 @@
+//
+//  XLFormInlineSegmentedCell.m
+//  XLForm
+//
+//  Created by mathias Claassen on 16/12/15.
+//  Copyright © 2015 Xmartlabs. All rights reserved.
+//
+
+#import "XLFormInlineSegmentedCell.h"
+
+NSString * const XLFormRowDescriptorTypeSegmentedInline = @"XLFormRowDescriptorTypeSegmentedInline";
+NSString * const XLFormRowDescriptorTypeSegmentedControl = @"XLFormRowDescriptorTypeSegmentedControl";
+
+@implementation XLFormInlineSegmentedCell
+
++(void)load
+{
+    [XLFormViewController.cellClassesForRowDescriptorTypes setObject:[XLFormInlineSegmentedCell class] forKey:XLFormRowDescriptorTypeSegmentedInline];
+    [XLFormViewController.inlineRowDescriptorTypesForRowDescriptorTypes setObject:XLFormRowDescriptorTypeSegmentedControl forKey:XLFormRowDescriptorTypeSegmentedInline];
+}
+
+- (BOOL)canBecomeFirstResponder
+{
+    return YES;
+}
+
+-(BOOL)becomeFirstResponder
+{
+    if (self.isFirstResponder){
+        return [super becomeFirstResponder];
+    }
+    BOOL result = [super becomeFirstResponder];
+    if (result){
+        XLFormRowDescriptor * inlineRowDescriptor = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:[XLFormViewController inlineRowDescriptorTypesForRowDescriptorTypes][self.rowDescriptor.rowType]];
+        UITableViewCell<XLFormDescriptorCell> * cell = [inlineRowDescriptor cellForFormController:self.formViewController];
+        NSAssert([cell conformsToProtocol:@protocol(XLFormInlineRowDescriptorCell)], @"inline cell must conform to XLFormInlineRowDescriptorCell");
+        UITableViewCell<XLFormInlineRowDescriptorCell> * inlineCell = (UITableViewCell<XLFormInlineRowDescriptorCell> *)cell;
+        inlineCell.inlineRowDescriptor = self.rowDescriptor;
+        [self.rowDescriptor.sectionDescriptor addFormRow:inlineRowDescriptor afterRow:self.rowDescriptor];
+        [self.formViewController ensureRowIsVisible:inlineRowDescriptor];
+    }
+    return result;
+}
+
+-(BOOL)resignFirstResponder
+{
+    if (![self isFirstResponder]) {
+        return [super resignFirstResponder];
+    }
+    NSIndexPath * selectedRowPath = [self.formViewController.form indexPathOfFormRow:self.rowDescriptor];
+    NSIndexPath * nextRowPath = [NSIndexPath indexPathForRow:selectedRowPath.row + 1 inSection:selectedRowPath.section];
+    XLFormRowDescriptor * nextFormRow = [self.formViewController.form formRowAtIndex:nextRowPath];
+    XLFormSectionDescriptor * formSection = [self.formViewController.form.formSections objectAtIndex:nextRowPath.section];
+    BOOL result = [super resignFirstResponder];
+    if (result) {
+        [formSection removeFormRow:nextFormRow];
+    }
+    return result;
+}
+
+
+#pragma mark - XLFormDescriptorCell
+
+-(void)configure
+{
+    [super configure];
+}
+
+-(void)update
+{
+    [super update];
+    self.accessoryType = UITableViewCellAccessoryNone;
+    self.editingAccessoryType = UITableViewCellAccessoryNone;
+    [self.textLabel setText:self.rowDescriptor.title];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
+    self.detailTextLabel.text = [self valueDisplayText];
+}
+
+-(BOOL)formDescriptorCellCanBecomeFirstResponder
+{
+    return !(self.rowDescriptor.isDisabled);
+}
+
+-(BOOL)formDescriptorCellBecomeFirstResponder
+{
+    
+    if ([self isFirstResponder]){
+        [self resignFirstResponder];
+        return NO;
+    }
+    return [self becomeFirstResponder];
+}
+
+-(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)controller
+{
+    [controller.tableView deselectRowAtIndexPath:[controller.form indexPathOfFormRow:self.rowDescriptor] animated:YES];
+}
+
+#pragma mark - Helpers
+
+-(NSString *)valueDisplayText
+{
+    return (self.rowDescriptor.value ? [self.rowDescriptor.value displayText] : self.rowDescriptor.noValueDisplayText);
+}
+
+
+
+@end
+
+
+
+
+@implementation XLFormInlineSegmentedControl
+
+@synthesize segmentedControl = _segmentedControl;
+@synthesize inlineRowDescriptor = _inlineRowDescriptor;
+
+
++(void)load
+{
+    [XLFormViewController.cellClassesForRowDescriptorTypes setObject:[XLFormInlineSegmentedControl class] forKey:XLFormRowDescriptorTypeSegmentedControl];
+}
+
+-(void)configure
+{
+    [super configure];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
+    [self.contentView addSubview:self.segmentedControl];
+    [self.contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[segmentedControl]-|"
+                                                                           options:NSLayoutFormatAlignAllCenterY
+                                                                           metrics:0
+                                                                              views:@{@"segmentedControl": self.segmentedControl}]];
+    [self.segmentedControl addTarget:self action:@selector(valueChanged) forControlEvents:UIControlEventValueChanged];
+}
+
+-(void)update
+{
+    [super update];
+    [self updateSegmentedControl];
+    self.segmentedControl.selectedSegmentIndex = [self selectedIndex];
+    self.segmentedControl.enabled = !self.rowDescriptor.isDisabled;
+}
+
+-(UISegmentedControl *)segmentedControl
+{
+    if (_segmentedControl) return _segmentedControl;
+    
+    _segmentedControl = [UISegmentedControl autolayoutView];
+    [_segmentedControl setContentHuggingPriority:500 forAxis:UILayoutConstraintAxisHorizontal];
+    return _segmentedControl;
+}
+
+
+#pragma mark - Action
+
+-(void)valueChanged
+{
+    self.inlineRowDescriptor.value = [self.inlineRowDescriptor.selectorOptions objectAtIndex:self.segmentedControl.selectedSegmentIndex];
+    [self.formViewController updateFormRow:self.inlineRowDescriptor];
+}
+
+#pragma mark - Helper
+
+-(NSArray *)getItems
+{
+    NSMutableArray * result = [[NSMutableArray alloc] init];
+    for (id option in self.inlineRowDescriptor.selectorOptions)
+        [result addObject:[option displayText]];
+    return result;
+}
+
+-(void)updateSegmentedControl
+{
+    [self.segmentedControl removeAllSegments];
+    
+    [[self getItems] enumerateObjectsUsingBlock:^(id object, NSUInteger idex, __unused BOOL *stop){
+        [self.segmentedControl insertSegmentWithTitle:[object displayText] atIndex:idex animated:NO];
+    }];
+}
+
+-(NSInteger)selectedIndex
+{
+    XLFormRowDescriptor * formRow = self.inlineRowDescriptor ?: self.rowDescriptor;
+    if (formRow.value){
+        for (id option in formRow.selectorOptions){
+            if ([[option valueData] isEqual:[formRow.value valueData]]){
+                return [formRow.selectorOptions indexOfObject:option];
+            }
+        }
+    }
+    return -1;
+}
+
+@end

Examples/Objective-C/XLForm.xcodeproj/project.pbxproj

@@ -36,15 +36,16 @@
 		2CA9A3FC06E94345A2FDE415 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6DF43B7BBF44F72A4493E8E /* libPods.a */; };
 		3C0357F01AB0D82300200C8A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3C0357EF1AB0D82300200C8A /* Images.xcassets */; };
 		3C3B01D51AB741EF0027CD45 /* XLFormRatingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3B01D31AB741EF0027CD45 /* XLFormRatingCell.m */; };
-		3C3B01D61AB741EF0027CD45 /* XLFormRatingCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C3B01D41AB741EF0027CD45 /* XLFormRatingCell.xib */; };
 		3C3B01DA1AB7497D0027CD45 /* XLFormWeekDaysCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3B01D81AB7497D0027CD45 /* XLFormWeekDaysCell.m */; };
 		3C3B01DB1AB7497D0027CD45 /* XLFormWeekDaysCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C3B01D91AB7497D0027CD45 /* XLFormWeekDaysCell.xib */; };
 		3C3B01E21AB7499A0027CD45 /* XLRatingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3B01E01AB7499A0027CD45 /* XLRatingView.m */; };
 		3C3B01F01AB74BDC0027CD45 /* FloatLabeledTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3B01EF1AB74BDC0027CD45 /* FloatLabeledTextFieldCell.m */; };
 		3CDAFC7A1AB0AFA4000F75B6 /* CustomRowsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CDAFC791AB0AFA4000F75B6 /* CustomRowsViewController.m */; };
 		66B6266E1AE0055100007886 /* DateAndTimeValueTrasformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 66B6266D1AE0055100007886 /* DateAndTimeValueTrasformer.m */; };
+		BF01E9281C21F0BB00BDE045 /* XLFormInlineSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BF01E9271C21F0BB00BDE045 /* XLFormInlineSegmentedCell.m */; };
 		BF9DB1D51AE0436600B985E7 /* BlogExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF9DB1D21AE0436600B985E7 /* BlogExampleViewController.m */; };
 		BF9DB1D61AE0436600B985E7 /* PredicateFormViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF9DB1D41AE0436600B985E7 /* PredicateFormViewController.m */; };
+		BFA5F4B11BB48F8E00D045BD /* XLFormRatingCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C3B01D41AB741EF0027CD45 /* XLFormRatingCell.xib */; };
 		BFE91AFB1AE159B200DE5231 /* BasicPredicateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BFE91AFA1AE159B200DE5231 /* BasicPredicateViewController.m */; };
 		D51B8B2C19126664008C0478 /* XLFormCustomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D51B8B2B19126664008C0478 /* XLFormCustomCell.m */; };
 		DEA6EF911B57D6CC000F4893 /* HTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DEA6EF901B57D6CC000F4893 /* HTTPSessionManager.m */; };
@@ -114,6 +115,8 @@
 		66B6266D1AE0055100007886 /* DateAndTimeValueTrasformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DateAndTimeValueTrasformer.m; path = Examples/Dates/DateAndTimeValueTrasformer.m; sourceTree = "<group>"; };
 		7B0D2D6A86E2A41ED22E8A35 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
 		976A33EE62A018A7257B4878 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
+		BF01E9261C21F0BB00BDE045 /* XLFormInlineSegmentedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XLFormInlineSegmentedCell.h; path = "Inline Segmented/XLFormInlineSegmentedCell.h"; sourceTree = "<group>"; };
+		BF01E9271C21F0BB00BDE045 /* XLFormInlineSegmentedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XLFormInlineSegmentedCell.m; path = "Inline Segmented/XLFormInlineSegmentedCell.m"; sourceTree = "<group>"; };
 		BF9DB1D11AE0436600B985E7 /* BlogExampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BlogExampleViewController.h; path = Examples/PredicateExamples/BlogExampleViewController.h; sourceTree = SOURCE_ROOT; };
 		BF9DB1D21AE0436600B985E7 /* BlogExampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BlogExampleViewController.m; path = Examples/PredicateExamples/BlogExampleViewController.m; sourceTree = SOURCE_ROOT; };
 		BF9DB1D31AE0436600B985E7 /* PredicateFormViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PredicateFormViewController.h; path = Examples/PredicateExamples/PredicateFormViewController.h; sourceTree = SOURCE_ROOT; };
@@ -416,6 +419,7 @@
 		3CDAFC741AB0AEE5000F75B6 /* CustomRows */ = {
 			isa = PBXGroup;
 			children = (
+				BF01E9251C21F02D00BDE045 /* Inline Segmented */,
 				3C3B01D01AB741C40027CD45 /* Rating */,
 				3C3B01E31AB74AC10027CD45 /* FloatLabeledTextField */,
 				3C3B01D11AB741CC0027CD45 /* Weekdays */,
@@ -425,6 +429,15 @@
 			name = CustomRows;
 			sourceTree = "<group>";
 		};
+		BF01E9251C21F02D00BDE045 /* Inline Segmented */ = {
+			isa = PBXGroup;
+			children = (
+				BF01E9261C21F0BB00BDE045 /* XLFormInlineSegmentedCell.h */,
+				BF01E9271C21F0BB00BDE045 /* XLFormInlineSegmentedCell.m */,
+			);
+			name = "Inline Segmented";
+			sourceTree = "<group>";
+		};
 		BFD5D6F41AD2FFC1006F04FA /* PredicateExamples */ = {
 			isa = PBXGroup;
 			children = (
@@ -460,6 +473,7 @@
 				2850C5F518D0F706002B7D0A /* Frameworks */,
 				2850C5F618D0F706002B7D0A /* Resources */,
 				CFE72E068B5F4D9BB45FB757 /* Copy Pods Resources */,
+				734CC62A7A974D37CC982576 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -476,7 +490,7 @@
 		2850C5F018D0F706002B7D0A /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = Xmartlabs;
 			};
 			buildConfigurationList = 2850C5F318D0F706002B7D0A /* Build configuration list for PBXProject "XLForm" */;
@@ -503,10 +517,10 @@
 			files = (
 				28468EA718EF594900DBB015 /* Localizable.strings in Resources */,
 				2850C60618D0F706002B7D0A /* InfoPlist.strings in Resources */,
+				BFA5F4B11BB48F8E00D045BD /* XLFormRatingCell.xib in Resources */,
 				28815E2E1A8589F600B674D2 /* MapViewController.xib in Resources */,
 				3C0357F01AB0D82300200C8A /* Images.xcassets in Resources */,
 				3C3B01DB1AB7497D0027CD45 /* XLFormWeekDaysCell.xib in Resources */,
-				3C3B01D61AB741EF0027CD45 /* XLFormRatingCell.xib in Resources */,
 				28A8083E190D9083009D77F8 /* iPhoneStoryboard.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -529,6 +543,21 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		734CC62A7A974D37CC982576 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		CFE72E068B5F4D9BB45FB757 /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -574,6 +603,7 @@
 				3C3B01E21AB7499A0027CD45 /* XLRatingView.m in Sources */,
 				283B59B219532415000828CD /* MapViewController.m in Sources */,
 				2843EB4718D4915800F13E2B /* ExamplesFormViewController.m in Sources */,
+				BF01E9281C21F0BB00BDE045 /* XLFormInlineSegmentedCell.m in Sources */,
 				BF9DB1D61AE0436600B985E7 /* PredicateFormViewController.m in Sources */,
 				BFE91AFB1AE159B200DE5231 /* BasicPredicateViewController.m in Sources */,
 				2843EB5218D4CFC700F13E2B /* OthersFormViewController.m in Sources */,
@@ -623,6 +653,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -685,6 +716,7 @@
 				GCC_PREFIX_HEADER = "XLForm/XLForm-Prefix.pch";
 				INFOPLIST_FILE = "XLForm/XLForm-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.xmartlabs.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
@@ -701,6 +733,7 @@
 				GCC_PREFIX_HEADER = "XLForm/XLForm-Prefix.pch";
 				INFOPLIST_FILE = "XLForm/XLForm-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.xmartlabs.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;

Examples/Objective-C/XLForm/XLForm-Info.plist

@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -9,7 +14,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.xmartlabs.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Examples/Swift/Examples/AccessoryViews/AccessoryViewFormViewController.swift

@@ -1,250 +0,0 @@
-//
-//  AccessoryViewFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLForm.h"
-#import "AccessoryViewFormViewController.h"
-
-//This macro defines if we use predicates to hide rows or do it manually the old way.
-//Just comment out if you want it to run without predicates.
-#define USE_PREDICATES_FOR_HIDING
-
-@interface AccessoryViewFormViewController ()
-
-@end
-
-@implementation AccessoryViewFormViewController
-{
-#ifndef USE_PREDICATES_FOR_HIDING
-    XLFormRowDescriptor * _rowShowAccessoryView;
-    XLFormRowDescriptor * _rowStopDisableRow;
-    XLFormRowDescriptor * _rowStopInlineRow;
-    XLFormRowDescriptor * _rowSkipCanNotBecomeFirstResponderRow;
-#endif
-}
-
-
-NSString * kAccessoryViewRowNavigationEnabled               = @"kRowNavigationEnabled";
-NSString * kAccessoryViewRowNavigationShowAccessoryView     = @"kRowNavigationShowAccessoryView";
-NSString * kAccessoryViewRowNavigationStopDisableRow        = @"rowNavigationStopDisableRow";
-NSString * kAccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow = @"rowNavigationSkipCanNotBecomeFirstResponderRow";
-NSString * kAccessoryViewRowNavigationStopInlineRow = @"rowNavigationStopInlineRow";
-NSString * kAccessoryViewName = @"name";
-NSString * kAccessoryViewEmail = @"email";
-NSString * kAccessoryViewTwitter = @"twitter";
-NSString * kAccessoryViewUrl = @"url";
-NSString * kAccessoryViewDate = @"date";
-NSString * kAccessoryViewTextView = @"textView";
-NSString * kAccessoryViewCheck = @"check";
-NSString * kAccessoryViewNotes = @"notes";
-
-
-
-
--(id)init
-{
-    self = [super init];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
--(void)initializeForm
-{
-    XLFormDescriptor * formDescriptor = [XLFormDescriptor formDescriptorWithTitle:@"Accessory View"];
-    formDescriptor.rowNavigationOptions = XLFormRowNavigationOptionEnabled;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    XLFormRowDescriptor * switchRow;
-    
-    // Configuration section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Row Navigation Settings"];
-    section.footerTitle = @"Changing the Settings values you will navigate differently";
-    [formDescriptor addFormSection:section];
-    
-    // RowNavigationEnabled
-    switchRow = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewRowNavigationEnabled rowType:XLFormRowDescriptorTypeBooleanSwitch title:@"Row Navigation Enabled?"];
-    switchRow.value = @YES;
-    [section addFormRow:switchRow];
-    
-    // RowNavigationShowAccessoryView
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewRowNavigationShowAccessoryView rowType:XLFormRowDescriptorTypeBooleanCheck title:@"Show input accessory row?"];
-    row.value = @((formDescriptor.rowNavigationOptions & XLFormRowNavigationOptionEnabled) == XLFormRowNavigationOptionEnabled);
-    [section addFormRow:row];
-#ifdef USE_PREDICATES_FOR_HIDING
-    row.hidden = [NSString stringWithFormat:@"$%@ == 0", switchRow];
-#else
-    _rowShowAccessoryView = row;
-#endif
-    
-    // RowNavigationStopDisableRow
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewRowNavigationStopDisableRow rowType:XLFormRowDescriptorTypeBooleanCheck title:@"Stop when reach disabled row?"];
-    row.value = @((formDescriptor.rowNavigationOptions & XLFormRowNavigationOptionStopDisableRow) == XLFormRowNavigationOptionStopDisableRow);
-    [section addFormRow:row];
-#ifdef USE_PREDICATES_FOR_HIDING
-    row.hidden = [NSString stringWithFormat:@"$%@ == 0", switchRow];
-#else
-    _rowStopDisableRow = row;
-#endif
-    
-    // RowNavigationStopInlineRow
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewRowNavigationStopInlineRow rowType:XLFormRowDescriptorTypeBooleanCheck title:@"Stop when reach inline row?"];
-    row.value = @((formDescriptor.rowNavigationOptions & XLFormRowNavigationOptionStopInlineRow) == XLFormRowNavigationOptionStopInlineRow);
-    [section addFormRow:row];
-#ifdef USE_PREDICATES_FOR_HIDING
-    row.hidden = [NSString stringWithFormat:@"$%@ == 0", switchRow];
-#else
-    _rowStopInlineRow = row;
-#endif
-    
-    // RowNavigationSkipCanNotBecomeFirstResponderRow
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow rowType:XLFormRowDescriptorTypeBooleanCheck title:@"Skip Can Not Become First Responder Row?"];
-    row.value = @((formDescriptor.rowNavigationOptions & XLFormRowNavigationOptionSkipCanNotBecomeFirstResponderRow) == XLFormRowNavigationOptionSkipCanNotBecomeFirstResponderRow);
-    [section addFormRow:row];
-#ifdef USE_PREDICATES_FOR_HIDING
-    row.hidden = [NSString stringWithFormat:@"$%@ == 0", switchRow];
-#else
-    _rowSkipCanNotBecomeFirstResponderRow = row;
-#endif
-    
-
-    
-    // Basic Information - Section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"TextField Types"];
-    section.footerTitle = @"This is a long text that will appear on section footer";
-    [formDescriptor addFormSection:section];
-    
-    // Name
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewName rowType:XLFormRowDescriptorTypeText title:@"Name"];
-    row.required = YES;
-    [section addFormRow:row];
-    
-    // Email
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewEmail rowType:XLFormRowDescriptorTypeEmail title:@"Email"];
-    // validate the email
-    [row addValidator:[XLFormValidator emailValidator]];
-    [section addFormRow:row];
-    
-    // Twitter
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewTwitter rowType:XLFormRowDescriptorTypeTwitter title:@"Twitter"];
-    row.disabled = @YES;
-    row.value = @"@no_editable";
-    [section addFormRow:row];
-    
-    // Url
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewUrl rowType:XLFormRowDescriptorTypeURL title:@"Url"];
-    [section addFormRow:row];
-    
-    // Url
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewDate rowType:XLFormRowDescriptorTypeDateInline title:@"Date Inline"];
-    row.value = [NSDate new];
-    [section addFormRow:row];
-    
-    
-    section = [XLFormSectionDescriptor formSection];
-    [formDescriptor addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewTextView rowType:XLFormRowDescriptorTypeTextView];
-    [row.cellConfigAtConfigure setObject:@"TEXT VIEW EXAMPLE" forKey:@"textView.placeholder"];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewCheck rowType:XLFormRowDescriptorTypeBooleanCheck title:@"Check"];
-    [section addFormRow:row];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"TextView With Label Example"];
-    [formDescriptor addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kAccessoryViewNotes rowType:XLFormRowDescriptorTypeTextView title:@"Notes"];
-    [section addFormRow:row];
-    
-    self.form = formDescriptor;
-}
-
-
-
-#pragma mark - XLFormDescriptorDelegate
-
--(void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor oldValue:(id)oldValue newValue:(id)newValue
-{
-    [super formRowDescriptorValueHasChanged:rowDescriptor oldValue:oldValue newValue:newValue];
-#ifndef USE_PREDICATES_FOR_HIDING
-    NSString * kRowNavigationEnabled        = @"kRowNavigationEnabled";
-    if ([rowDescriptor.tag isEqualToString:kRowNavigationEnabled]){
-        if ([[rowDescriptor.value valueData] isEqual:@NO]){
-            self.form.rowNavigationOptions = XLFormRowNavigationOptionNone;
-            [self.form removeFormRowWithTag:kAccessoryViewRowNavigationShowAccessoryView];
-            [self.form removeFormRowWithTag:kAccessoryViewRowNavigationStopDisableRow];
-            [self.form removeFormRowWithTag:kAccessoryViewRowNavigationStopInlineRow];
-            [self.form removeFormRowWithTag:kAccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow];
-        }
-        else{
-            self.form.rowNavigationOptions = XLFormRowNavigationOptionEnabled;
-            _rowShowAccessoryView.value = @YES;
-            _rowStopDisableRow.value = @NO;
-            _rowStopInlineRow.value = @NO;
-            _rowSkipCanNotBecomeFirstResponderRow.value = @NO;
-            [self.form addFormRow:_rowShowAccessoryView afterRow:rowDescriptor];
-            [self.form addFormRow:_rowStopDisableRow afterRow:_rowShowAccessoryView];
-            [self.form addFormRow:_rowStopInlineRow afterRow:_rowStopDisableRow];
-            [self.form addFormRow:_rowSkipCanNotBecomeFirstResponderRow afterRow:_rowStopInlineRow];
-            
-        }
-    }
-    else
-#endif
-    if ([rowDescriptor.tag isEqualToString:kAccessoryViewRowNavigationStopDisableRow]){
-        if ([[rowDescriptor.value valueData] isEqual:@(YES)]){
-            self.form.rowNavigationOptions = self.form.rowNavigationOptions | XLFormRowNavigationOptionStopDisableRow;
-        }
-        else{
-            self.form.rowNavigationOptions = self.form.rowNavigationOptions & (~XLFormRowNavigationOptionStopDisableRow);
-        }
-    }
-    else if ([rowDescriptor.tag isEqualToString:kAccessoryViewRowNavigationStopInlineRow]){
-        if ([[rowDescriptor.value valueData] isEqual:@(YES)]){
-            self.form.rowNavigationOptions = self.form.rowNavigationOptions | XLFormRowNavigationOptionStopInlineRow;
-        }
-        else{
-            self.form.rowNavigationOptions = self.form.rowNavigationOptions & (~XLFormRowNavigationOptionStopInlineRow);
-        }
-    }
-    else if ([rowDescriptor.tag isEqualToString:kAccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow]){
-        if ([[rowDescriptor.value valueData] isEqual:@(YES)]){
-            self.form.rowNavigationOptions = self.form.rowNavigationOptions | XLFormRowNavigationOptionSkipCanNotBecomeFirstResponderRow;
-        }
-        else{
-            self.form.rowNavigationOptions = self.form.rowNavigationOptions & (~XLFormRowNavigationOptionSkipCanNotBecomeFirstResponderRow);
-        }
-    }
-}
-
--(UIView *)inputAccessoryViewForRowDescriptor:(XLFormRowDescriptor *)rowDescriptor
-{
-    if ([[[self.form formRowWithTag:kAccessoryViewRowNavigationShowAccessoryView].value valueData] isEqual:@NO]){
-        return nil;
-    }
-    return [super inputAccessoryViewForRowDescriptor:rowDescriptor];
-}
-
-@end

Examples/Swift/Examples/CustomRows/Rating/XLFormRatingCell.xib

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7531" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="OGo-4x-YLf" customClass="XLFormRatingCell" customModule="SwiftExample" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="478" height="44"/>
-            <autoresizingMask key="autoresizingMask"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OGo-4x-YLf" id="hV6-xt-6pq">
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yhI-dj-sRk" customClass="XLRatingView" customModule="SwiftExample" customModuleProvider="target">
-                        <rect key="frame" x="353" y="11" width="115" height="22"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="22" id="85e-Ov-qM7"/>
-                            <constraint firstAttribute="width" constant="115" id="kOb-W4-HPs"/>
-                        </constraints>
-                    </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vxp-gw-YTt">
-                        <rect key="frame" x="15" y="11" width="338" height="21"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="21" id="IK4-8e-SFs"/>
-                            <constraint firstAttribute="width" constant="150" id="hNG-F9-1wj"/>
-                        </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                        <nil key="highlightedColor"/>
-                        <variation key="default">
-                            <mask key="constraints">
-                                <exclude reference="hNG-F9-1wj"/>
-                            </mask>
-                        </variation>
-                    </label>
-                </subviews>
-                <constraints>
-                    <constraint firstAttribute="bottom" secondItem="Vxp-gw-YTt" secondAttribute="bottom" constant="11" id="0Qz-iR-Tzb"/>
-                    <constraint firstAttribute="centerY" secondItem="Vxp-gw-YTt" secondAttribute="centerY" id="4Vh-2e-m2p"/>
-                    <constraint firstAttribute="trailing" secondItem="yhI-dj-sRk" secondAttribute="trailing" constant="10" id="NPC-r7-JFl"/>
-                    <constraint firstAttribute="centerY" secondItem="yhI-dj-sRk" secondAttribute="centerY" id="Vw4-h8-wId"/>
-                    <constraint firstItem="Vxp-gw-YTt" firstAttribute="leading" secondItem="hV6-xt-6pq" secondAttribute="leading" constant="15" id="Xgq-Cy-zLQ"/>
-                    <constraint firstItem="Vxp-gw-YTt" firstAttribute="top" secondItem="hV6-xt-6pq" secondAttribute="top" constant="11" id="bgO-t8-Rjz"/>
-                    <constraint firstItem="yhI-dj-sRk" firstAttribute="leading" secondItem="Vxp-gw-YTt" secondAttribute="trailing" id="n0B-tg-Pik"/>
-                </constraints>
-            </tableViewCellContentView>
-            <connections>
-                <outlet property="rateTitle" destination="Vxp-gw-YTt" id="0Qh-NC-yq5"/>
-                <outlet property="ratingView" destination="yhI-dj-sRk" id="BKM-pX-m9F"/>
-            </connections>
-            <point key="canvasLocation" x="301" y="260"/>
-        </tableViewCell>
-    </objects>
-</document>

Examples/Swift/Examples/CustomRows/Weekdays/XLFormWeekDaysCell.xib

@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7531" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="60" id="piA-L5-eiN" customClass="XLFormWeekDaysCell" customModule="SwiftExample" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="382" height="50"/>
-            <autoresizingMask key="autoresizingMask"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="piA-L5-eiN" id="Yr6-3E-keb">
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZAg-Me-yKR">
-                        <rect key="frame" x="5" y="0.0" width="53" height="49"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                        <state key="normal" title="S">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                        <state key="selected">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                        </state>
-                        <connections>
-                            <action selector="dayTapped:" destination="piA-L5-eiN" eventType="touchUpInside" id="K4V-Xd-Bak"/>
-                        </connections>
-                    </button>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UjQ-Cw-7wH" userLabel="separator 1">
-                        <rect key="frame" x="58" y="10" width="1" height="29"/>
-                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="1" id="K3N-3h-MZr"/>
-                        </constraints>
-                    </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N3w-qP-kRZ">
-                        <rect key="frame" x="58" y="0.0" width="53" height="49"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                        <state key="normal" title="M">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                        <connections>
-                            <action selector="dayTapped:" destination="piA-L5-eiN" eventType="touchUpInside" id="FaQ-oB-Nkl"/>
-                        </connections>
-                    </button>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kwc-0w-V51" userLabel="separator 2">
-                        <rect key="frame" x="111" y="10" width="1" height="29"/>
-                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="1" id="3mE-sT-ql1"/>
-                        </constraints>
-                    </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cPl-47-rS8">
-                        <rect key="frame" x="111" y="0.0" width="53" height="49"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                        <state key="normal" title="T">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                        <connections>
-                            <action selector="dayTapped:" destination="piA-L5-eiN" eventType="touchUpInside" id="4vk-5n-jge"/>
-                        </connections>
-                    </button>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EiN-2p-Oig" userLabel="separator 3">
-                        <rect key="frame" x="164" y="10" width="1" height="29"/>
-                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="1" id="JyW-GC-0A7"/>
-                        </constraints>
-                    </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6iC-Cl-RyI">
-                        <rect key="frame" x="164" y="0.0" width="54" height="49"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                        <state key="normal" title="W">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                        <connections>
-                            <action selector="dayTapped:" destination="piA-L5-eiN" eventType="touchUpInside" id="oO1-zj-XRv"/>
-                        </connections>
-                    </button>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bRc-5e-QAH" userLabel="separator 4">
-                        <rect key="frame" x="218" y="10" width="1" height="29"/>
-                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="1" id="W9F-iR-Leh"/>
-                        </constraints>
-                    </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eTo-Ip-reh">
-                        <rect key="frame" x="218" y="0.0" width="53" height="49"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                        <state key="normal" title="T">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                        <connections>
-                            <action selector="dayTapped:" destination="piA-L5-eiN" eventType="touchUpInside" id="SkQ-0a-9Fy"/>
-                        </connections>
-                    </button>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dHj-rj-mjh" userLabel="separator 5">
-                        <rect key="frame" x="271" y="10" width="1" height="29"/>
-                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="1" id="h5U-x0-9nJ"/>
-                        </constraints>
-                    </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wjb-tu-QEo">
-                        <rect key="frame" x="271" y="0.0" width="53" height="49"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                        <state key="normal" title="F">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                        <connections>
-                            <action selector="dayTapped:" destination="piA-L5-eiN" eventType="touchUpInside" id="9A8-9a-SGG"/>
-                        </connections>
-                    </button>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L7g-lu-boa" userLabel="separator 6">
-                        <rect key="frame" x="324" y="10" width="1" height="29"/>
-                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="1" id="81t-Xh-wZT"/>
-                        </constraints>
-                    </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LNf-b4-GYP">
-                        <rect key="frame" x="324" y="0.0" width="53" height="49"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                        <state key="normal" title="S">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                        <connections>
-                            <action selector="dayTapped:" destination="piA-L5-eiN" eventType="touchUpInside" id="I4k-Ho-KxE"/>
-                        </connections>
-                    </button>
-                </subviews>
-                <constraints>
-                    <constraint firstItem="ZAg-Me-yKR" firstAttribute="leading" secondItem="Yr6-3E-keb" secondAttribute="leading" constant="5" id="0EB-cP-ogn"/>
-                    <constraint firstItem="6iC-Cl-RyI" firstAttribute="width" secondItem="cPl-47-rS8" secondAttribute="width" id="1ZI-HN-9ew"/>
-                    <constraint firstItem="cPl-47-rS8" firstAttribute="leading" secondItem="N3w-qP-kRZ" secondAttribute="trailing" id="1pQ-h0-SEG"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="leading" secondItem="6iC-Cl-RyI" secondAttribute="trailing" constant="1" id="2UA-Ao-KZF"/>
-                    <constraint firstItem="dHj-rj-mjh" firstAttribute="height" secondItem="L7g-lu-boa" secondAttribute="height" id="4dj-Xx-ksP"/>
-                    <constraint firstAttribute="bottom" secondItem="EiN-2p-Oig" secondAttribute="bottom" constant="10" id="5eK-Bu-wpU"/>
-                    <constraint firstItem="N3w-qP-kRZ" firstAttribute="leading" secondItem="ZAg-Me-yKR" secondAttribute="trailing" id="67F-sV-r6W"/>
-                    <constraint firstItem="Wjb-tu-QEo" firstAttribute="leading" secondItem="dHj-rj-mjh" secondAttribute="trailing" id="6ZX-Ub-2vw"/>
-                    <constraint firstItem="EiN-2p-Oig" firstAttribute="height" secondItem="bRc-5e-QAH" secondAttribute="height" id="7Um-cV-f7p"/>
-                    <constraint firstItem="LNf-b4-GYP" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="7YT-x4-m88"/>
-                    <constraint firstItem="6iC-Cl-RyI" firstAttribute="trailing" secondItem="bRc-5e-QAH" secondAttribute="leading" id="ABd-MQ-9sp"/>
-                    <constraint firstAttribute="bottom" secondItem="UjQ-Cw-7wH" secondAttribute="bottom" constant="10" id="ASC-xR-Yxa"/>
-                    <constraint firstAttribute="bottom" secondItem="dHj-rj-mjh" secondAttribute="bottom" constant="10" id="ASP-um-b8o"/>
-                    <constraint firstItem="6iC-Cl-RyI" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="Aac-10-vTs"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="leading" secondItem="6iC-Cl-RyI" secondAttribute="trailing" id="BL5-PL-pac"/>
-                    <constraint firstAttribute="bottom" secondItem="ZAg-Me-yKR" secondAttribute="bottom" id="BeZ-ar-qMN"/>
-                    <constraint firstItem="dHj-rj-mjh" firstAttribute="height" secondItem="bRc-5e-QAH" secondAttribute="height" id="DYn-Cd-g5H"/>
-                    <constraint firstAttribute="bottom" secondItem="kwc-0w-V51" secondAttribute="bottom" constant="10" id="EXu-BP-ftM"/>
-                    <constraint firstAttribute="bottom" secondItem="LNf-b4-GYP" secondAttribute="bottom" id="EYe-ne-rqO"/>
-                    <constraint firstItem="cPl-47-rS8" firstAttribute="leading" secondItem="N3w-qP-kRZ" secondAttribute="trailing" id="Fo8-Tp-bkn"/>
-                    <constraint firstItem="dHj-rj-mjh" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="GYq-pf-vR0"/>
-                    <constraint firstItem="cPl-47-rS8" firstAttribute="leading" secondItem="UjQ-Cw-7wH" secondAttribute="trailing" constant="72" id="HQ2-jA-X9g"/>
-                    <constraint firstItem="Wjb-tu-QEo" firstAttribute="leading" secondItem="eTo-Ip-reh" secondAttribute="trailing" id="I0s-Ze-pwV"/>
-                    <constraint firstAttribute="bottom" secondItem="bRc-5e-QAH" secondAttribute="bottom" constant="10" id="InL-Hk-twg"/>
-                    <constraint firstItem="UjQ-Cw-7wH" firstAttribute="leading" secondItem="ZAg-Me-yKR" secondAttribute="trailing" id="Jj4-jg-rdr"/>
-                    <constraint firstItem="6iC-Cl-RyI" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" id="KQe-Ei-8jY"/>
-                    <constraint firstItem="cPl-47-rS8" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="Kw5-3R-qXs"/>
-                    <constraint firstItem="bRc-5e-QAH" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="MXG-vB-U8F"/>
-                    <constraint firstItem="ZAg-Me-yKR" firstAttribute="width" secondItem="N3w-qP-kRZ" secondAttribute="width" id="Mem-UJ-5Js"/>
-                    <constraint firstItem="L7g-lu-boa" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="OVT-GJ-zq8"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" constant="25" id="OYQ-8o-3j8"/>
-                    <constraint firstItem="N3w-qP-kRZ" firstAttribute="width" secondItem="cPl-47-rS8" secondAttribute="width" id="Pl6-Xd-Krq"/>
-                    <constraint firstItem="Wjb-tu-QEo" firstAttribute="width" secondItem="LNf-b4-GYP" secondAttribute="width" id="Pro-fg-wBA"/>
-                    <constraint firstAttribute="bottom" secondItem="6iC-Cl-RyI" secondAttribute="bottom" id="Q5M-8N-hIh"/>
-                    <constraint firstItem="UjQ-Cw-7wH" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="RGn-ja-FRD"/>
-                    <constraint firstAttribute="trailing" secondItem="LNf-b4-GYP" secondAttribute="trailing" constant="5" id="RlS-d5-rIx"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="trailing" secondItem="cPl-47-rS8" secondAttribute="leading" id="Rs4-Pl-R8X"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="leading" secondItem="bRc-5e-QAH" secondAttribute="trailing" id="SO9-U6-cVO"/>
-                    <constraint firstAttribute="bottom" secondItem="N3w-qP-kRZ" secondAttribute="bottom" id="STf-aE-Y2E"/>
-                    <constraint firstAttribute="bottom" secondItem="kwc-0w-V51" secondAttribute="bottom" constant="10" id="SWG-oy-aZJ"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="TAb-IV-m7A"/>
-                    <constraint firstAttribute="bottom" secondItem="cPl-47-rS8" secondAttribute="bottom" id="Tmp-md-564"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="height" secondItem="UjQ-Cw-7wH" secondAttribute="height" id="Uli-Qb-6Om"/>
-                    <constraint firstItem="6iC-Cl-RyI" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" id="VcV-kz-XBb"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="width" secondItem="6iC-Cl-RyI" secondAttribute="width" id="X0k-jG-o63"/>
-                    <constraint firstItem="Wjb-tu-QEo" firstAttribute="leading" secondItem="eTo-Ip-reh" secondAttribute="trailing" id="cOc-P1-ZhU"/>
-                    <constraint firstItem="LNf-b4-GYP" firstAttribute="leading" secondItem="Wjb-tu-QEo" secondAttribute="trailing" id="dSr-cr-ebR"/>
-                    <constraint firstItem="EiN-2p-Oig" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="fgT-6k-CaP"/>
-                    <constraint firstItem="LNf-b4-GYP" firstAttribute="leading" secondItem="Wjb-tu-QEo" secondAttribute="trailing" id="gNl-wJ-ujY"/>
-                    <constraint firstItem="ZAg-Me-yKR" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="glN-lT-q1z"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="width" secondItem="Wjb-tu-QEo" secondAttribute="width" id="hEH-9C-pGZ"/>
-                    <constraint firstItem="EiN-2p-Oig" firstAttribute="height" secondItem="kwc-0w-V51" secondAttribute="height" id="hOI-fd-H7m"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="i5C-wG-rRN"/>
-                    <constraint firstItem="eTo-Ip-reh" firstAttribute="trailing" secondItem="dHj-rj-mjh" secondAttribute="leading" id="jsw-H6-2gQ"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" id="lQE-r9-9JT"/>
-                    <constraint firstAttribute="bottom" secondItem="L7g-lu-boa" secondAttribute="bottom" constant="10" id="lv1-xB-0zR"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="leading" secondItem="N3w-qP-kRZ" secondAttribute="trailing" id="oQe-Qf-9ZO"/>
-                    <constraint firstItem="Wjb-tu-QEo" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="pn7-s8-fDj"/>
-                    <constraint firstItem="EiN-2p-Oig" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" id="qIf-aB-2ZY"/>
-                    <constraint firstItem="6iC-Cl-RyI" firstAttribute="leading" secondItem="EiN-2p-Oig" secondAttribute="trailing" id="sAE-Nl-Puc"/>
-                    <constraint firstItem="LNf-b4-GYP" firstAttribute="leading" secondItem="L7g-lu-boa" secondAttribute="trailing" id="t1q-Nc-vbg"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" constant="10" id="tVL-uj-6Ma"/>
-                    <constraint firstItem="Wjb-tu-QEo" firstAttribute="trailing" secondItem="L7g-lu-boa" secondAttribute="leading" id="u3Q-pF-E3A"/>
-                    <constraint firstAttribute="bottom" secondItem="Wjb-tu-QEo" secondAttribute="bottom" id="uh4-LM-Ieo"/>
-                    <constraint firstItem="kwc-0w-V51" firstAttribute="leading" secondItem="cPl-47-rS8" secondAttribute="trailing" constant="25" id="vrx-0B-GOB"/>
-                    <constraint firstAttribute="bottom" secondItem="eTo-Ip-reh" secondAttribute="bottom" id="xIu-Vy-Nff"/>
-                    <constraint firstItem="N3w-qP-kRZ" firstAttribute="leading" secondItem="UjQ-Cw-7wH" secondAttribute="trailing" id="xWy-Uf-QEm"/>
-                    <constraint firstItem="N3w-qP-kRZ" firstAttribute="leading" secondItem="ZAg-Me-yKR" secondAttribute="trailing" id="xsx-BM-yQ5"/>
-                    <constraint firstItem="N3w-qP-kRZ" firstAttribute="top" secondItem="Yr6-3E-keb" secondAttribute="top" id="yEX-Wv-CZQ"/>
-                </constraints>
-                <variation key="default">
-                    <mask key="constraints">
-                        <exclude reference="67F-sV-r6W"/>
-                        <exclude reference="xWy-Uf-QEm"/>
-                        <exclude reference="1pQ-h0-SEG"/>
-                        <exclude reference="HQ2-jA-X9g"/>
-                        <exclude reference="OYQ-8o-3j8"/>
-                        <exclude reference="Rs4-Pl-R8X"/>
-                        <exclude reference="SWG-oy-aZJ"/>
-                        <exclude reference="TAb-IV-m7A"/>
-                        <exclude reference="Uli-Qb-6Om"/>
-                        <exclude reference="lQE-r9-9JT"/>
-                        <exclude reference="vrx-0B-GOB"/>
-                        <exclude reference="KQe-Ei-8jY"/>
-                        <exclude reference="sAE-Nl-Puc"/>
-                        <exclude reference="7Um-cV-f7p"/>
-                        <exclude reference="hOI-fd-H7m"/>
-                        <exclude reference="2UA-Ao-KZF"/>
-                        <exclude reference="SO9-U6-cVO"/>
-                        <exclude reference="6ZX-Ub-2vw"/>
-                        <exclude reference="cOc-P1-ZhU"/>
-                        <exclude reference="4dj-Xx-ksP"/>
-                        <exclude reference="DYn-Cd-g5H"/>
-                        <exclude reference="dSr-cr-ebR"/>
-                        <exclude reference="t1q-Nc-vbg"/>
-                    </mask>
-                </variation>
-            </tableViewCellContentView>
-            <connections>
-                <outlet property="fridayButton" destination="Wjb-tu-QEo" id="AcP-Qg-i9P"/>
-                <outlet property="mondayButton" destination="N3w-qP-kRZ" id="u3A-mt-EKd"/>
-                <outlet property="saturdayButton" destination="LNf-b4-GYP" id="TeM-3b-B1Z"/>
-                <outlet property="sundayButton" destination="ZAg-Me-yKR" id="GUI-ry-Hm1"/>
-                <outlet property="thursdayButton" destination="eTo-Ip-reh" id="Dxi-hi-oBK"/>
-                <outlet property="tuesdayButton" destination="cPl-47-rS8" id="wIn-mO-cUx"/>
-                <outlet property="wednesdayButton" destination="6iC-Cl-RyI" id="GQe-Oy-pcd"/>
-            </connections>
-            <point key="canvasLocation" x="296" y="222"/>
-        </tableViewCell>
-    </objects>
-</document>

Examples/Swift/Examples/ExamplesFormViewController.swift

@@ -1,193 +0,0 @@
-//
-//  ExamplesFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "InputsFormViewController.h"
-#import "SelectorsFormViewController.h"
-#import "OthersFormViewController.h"
-#import "DatesFormViewController.h"
-#import "MultiValuedFormViewController.h"
-#import "ExamplesFormViewController.h"
-#import "NativeEventFormViewController.h"
-#import "UICustomizationFormViewController.h"
-#import "CustomRowsViewController.h"
-#import "AccessoryViewFormViewController.h"
-#import "PredicateFormViewController.h"
-
-NSString * const kTextFieldAndTextView = @"TextFieldAndTextView";
-NSString * const kSelectors = @"Selectors";
-NSString * const kOthes = @"Others";
-NSString * const kDates = @"Dates";
-NSString * const kPredicates = @"BasicPredicates";
-NSString * const kBlogExample = @"BlogPredicates";
-NSString * const kMultivalued = @"Multivalued";
-NSString * const kMultivaluedOnlyReorder = @"MultivaluedOnlyReorder";
-NSString * const kMultivaluedOnlyInsert = @"MultivaluedOnlyInsert";
-NSString * const kMultivaluedOnlyDelete = @"MultivaluedOnlyDelete";
-NSString * const kValidations= @"Validations";
-
-@interface ExamplesFormViewController ()
-
-@end
-
-@implementation ExamplesFormViewController
-
-
--(instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self){
-        [self initializeForm];
-    }
-    return self;
-}
-
-
--(id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self){
-        [self initializeForm];
-    }
-    return self;
-}
-
-
-#pragma mark - Helper
-
--(void)initializeForm
-{
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    form = [XLFormDescriptor formDescriptor];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Real examples"];
-    [form addFormSection:section];
-    
-    // NativeEventFormViewController
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"realExamples" rowType:XLFormRowDescriptorTypeButton title:@"iOS Calendar Event Form"];
-    row.action.formSegueIdenfifier = @"NativeEventNavigationViewControllerSegue";
-    [section addFormRow:row];
-    
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"This form is actually an example"];
-    section.footerTitle = @"ExamplesFormViewController.h, Select an option to view another example";
-    [form addFormSection:section];
-    
-    
-    // TextFieldAndTextView
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kTextFieldAndTextView rowType:XLFormRowDescriptorTypeButton title:@"Text Fields"];
-    row.action.viewControllerClass = [InputsFormViewController class];
-    [section addFormRow:row];
-    
-    // Selectors
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectors rowType:XLFormRowDescriptorTypeButton title:@"Selectors"];
-    row.action.formSegueIdenfifier = @"SelectorsFormViewControllerSegue";
-    [section addFormRow:row];
-    
-    // Dates
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kDates rowType:XLFormRowDescriptorTypeButton title:@"Date & Time"];
-    row.action.viewControllerClass = [DatesFormViewController class];
-    [section addFormRow:row];
-    
-    // Others
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kOthes rowType:XLFormRowDescriptorTypeButton title:@"Other Rows"];
-    row.action.formSegueIdenfifier = @"OthersFormViewControllerSegue";
-    [section addFormRow:row];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Multivalued example"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultivalued rowType:XLFormRowDescriptorTypeButton title:@"Multivalued Sections"];
-    row.action.viewControllerClass = [MultivaluedFormViewController class];
-    [section addFormRow:row];
-    
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultivaluedOnlyReorder rowType:XLFormRowDescriptorTypeButton title:@"Multivalued Only Reorder"];
-    row.action.viewControllerClass = [MultivaluedOnlyReorderViewController class];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultivaluedOnlyInsert rowType:XLFormRowDescriptorTypeButton title:@"Multivalued Only Insert"];
-    row.action.viewControllerClass = [MultivaluedOnlyInserViewController class];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultivaluedOnlyDelete rowType:XLFormRowDescriptorTypeButton title:@"Multivalued Only Delete"];
-    row.action.viewControllerClass = [MultivaluedOnlyDeleteViewController class];
-    [section addFormRow:row];
-    
-
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"UI Customization"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultivalued rowType:XLFormRowDescriptorTypeButton title:@"UI Customization"];
-    row.action.viewControllerClass = [UICustomizationFormViewController class];
-    [section addFormRow:row];
-    
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Custom Rows"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultivalued rowType:XLFormRowDescriptorTypeButton title:@"Custom Rows"];
-    row.action.viewControllerClass = [CustomRowsViewController class];
-    [section addFormRow:row];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Accessory View"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultivalued rowType:XLFormRowDescriptorTypeButton title:@"Accessory Views"];
-    row.action.viewControllerClass = [AccessoryViewFormViewController class];
-    [section addFormRow:row];
-
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Validation Examples"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kValidations rowType:XLFormRowDescriptorTypeButton title:@"Validation Examples"];
-    row.action.formSegueIdenfifier = @"ValidationExamplesFormViewControllerSegue";
-    [section addFormRow:row];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Using Predicates"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kPredicates rowType:XLFormRowDescriptorTypeButton title:@"Very basic predicates"];
-    row.action.formSegueIdenfifier = @"BasicPredicateViewControllerSegue";
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kPredicates rowType:XLFormRowDescriptorTypeButton title:@"Blog Example Hide predicates"];
-    row.action.formSegueIdenfifier = @"BlogExampleViewSegue";
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kPredicates rowType:XLFormRowDescriptorTypeButton title:@"Another example"];
-    row.action.formSegueIdenfifier = @"PredicateFormViewControllerSegue";
-    [section addFormRow:row];
-    
-    self.form = form;
-
-}
-
-
-
-@end

Examples/Swift/Examples/Inputs/InputsFormViewController.swift

@@ -1,148 +0,0 @@
-//
-//  InputsFormViewController.swift
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-class InputsFormViewController : XLFormViewController {
-
-    
-    private enum Tags : String {
-        case Name = "name"
-        case Email = "email"
-        case Twitter = "twitter"
-        case Number = "number"
-        case Integer = "integer"
-        case Decimal = "decimal"
-        case Password = "password"
-        case Phone = "phone"
-        case Url = "url"
-        case TextView = "textView"
-        case Notes = "notes"
-    }
-    
-    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
-        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
-    }
-    
-    required init(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        self.initializeForm()
-    }
-
-    func initializeForm() {
-        
-        let form : XLFormDescriptor
-        var section : XLFormSectionDescriptor
-        var row : XLFormRowDescriptor
-        
-        form = XLFormDescriptor(title: "Text Fields")
-        form.assignFirstResponderOnShow = true
-        
-        section = XLFormSectionDescriptor.formSectionWithTitle("TextField Types")
-        section.footerTitle = "This is a long text that will appear on section footer"
-        form.addFormSection(section)
-        
-        
-        // Name
-        row = XLFormRowDescriptor(tag: Tags.Name.rawValue, rowType: XLFormRowDescriptorTypeText, title: "Name")
-        row.required = true
-        section.addFormRow(row)
-        
-        // Email
-        row = XLFormRowDescriptor(tag: Tags.Email.rawValue, rowType: XLFormRowDescriptorTypeEmail, title: "Email")
-        // validate the email
-        row.addValidator(XLFormValidator.emailValidator())
-        section.addFormRow(row)
-        
-        // Twitter
-        row = XLFormRowDescriptor(tag: Tags.Name.rawValue, rowType: XLFormRowDescriptorTypeTwitter, title: "Twitter")
-        row.disabled = NSNumber(bool: true)
-        row.value = "@no_editable"
-        section.addFormRow(row)
-        
-        // Number
-        row = XLFormRowDescriptor(tag: Tags.Number.rawValue, rowType: XLFormRowDescriptorTypeNumber, title: "Number")
-        section.addFormRow(row)
-        
-        // Integer
-        row = XLFormRowDescriptor(tag: Tags.Integer.rawValue, rowType: XLFormRowDescriptorTypeInteger, title: "Integer")
-        section.addFormRow(row)
-        
-        // Decimal
-        row = XLFormRowDescriptor(tag: Tags.Decimal.rawValue, rowType: XLFormRowDescriptorTypeDecimal, title: "Decimal")
-        section.addFormRow(row)
-        
-        // Password
-        row = XLFormRowDescriptor(tag: Tags.Password.rawValue, rowType: XLFormRowDescriptorTypePassword, title: "Password")
-        section.addFormRow(row)
-        
-        // Phone
-        row = XLFormRowDescriptor(tag: Tags.Phone.rawValue, rowType: XLFormRowDescriptorTypePhone, title: "Phone")
-        section.addFormRow(row)
-        
-        // Url
-        row = XLFormRowDescriptor(tag: Tags.Url.rawValue, rowType: XLFormRowDescriptorTypeURL, title: "Url")
-        section.addFormRow(row)
-        
-        
-        section = XLFormSectionDescriptor.formSection()
-        form.addFormSection(section)
-        
-        
-        // TextView
-        row = XLFormRowDescriptor(tag: Tags.TextView.rawValue, rowType: XLFormRowDescriptorTypeTextView)
-        row.cellConfigAtConfigure["textView.placeholder"] = "TEXT VIEW EXAMPLE"
-        section.addFormRow(row)
-        
-
-        section = XLFormSectionDescriptor.formSectionWithTitle("TextView With Label Example")
-        form.addFormSection(section)
-        
-        row = XLFormRowDescriptor(tag: Tags.Number.rawValue, rowType: XLFormRowDescriptorTypeTextView, title: "Notes")
-        section.addFormRow(row)
-        
-        self.form = form
-        
-    }
-
-    override func viewDidLoad()
-    {
-        super.viewDidLoad()
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Save, target: self, action: "savePressed:")
-    }
-    
-    func savePressed(button: UIBarButtonItem)
-    {
-        let validationErrors : Array<NSError> = self.formValidationErrors() as! Array<NSError>
-        if (validationErrors.count > 0){
-            self.showFormValidationError(validationErrors.first)
-            return
-        }
-        self.tableView.endEditing(true)
-        let alertView = UIAlertView(title: "Valid Form", message: "No errors found", delegate: self, cancelButtonTitle: "OK")
-        alertView.show()
-    }
-
-}

Examples/Swift/Examples/MultiValuedSections/MultivaluedFormViewController.swift

@@ -1,278 +0,0 @@
-//
-//  MultiValuedFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLForm.h"
-#import "SelectorsFormViewController.h"
-#import "MultiValuedFormViewController.h"
-
-
-@implementation MultivaluedFormViewController
-
-- (id)init
-{
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    form = [XLFormDescriptor formDescriptorWithTitle:@"Multivalued Examples"];
-    
-    // Multivalued section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Multivalued TextField"
-                                             sectionOptions:XLFormSectionOptionCanReorder | XLFormSectionOptionCanInsert | XLFormSectionOptionCanDelete
-                                          sectionInsertMode:XLFormSectionInsertModeButton];
-    section.multivaluedAddButton.title = @"Add New Tag";
-    section.footerTitle = @"XLFormSectionInsertModeButton sectionType adds a 'Add Item' (Add New Tag) button row as last cell.";
-    // set up the row template
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeName];
-    [[row cellConfig] setObject:@"Tag Name" forKey:@"textField.placeholder"];
-    section.multivaluedRowTemplate = row;
-    [form addFormSection:section];
-    
-    
-    // Another Multivalued section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Multivalued ActionSheet Selector example"
-                                             sectionOptions:XLFormSectionOptionCanInsert | XLFormSectionOptionCanDelete];
-    section.footerTitle = @"XLFormSectionInsertModeLastRow sectionType adds a '+' icon inside last table view cell allowing us to add a new row.";
-    [form addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeSelectorActionSheet title:@"Tap to select.."];
-    row.selectorOptions = @[@"Option 1", @"Option 2", @"Option 3", @"Option 4", @"Option 5"];
-    [section addFormRow:row];
-    
-    
-    // Another one
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Multivalued Push Selector example"
-                                             sectionOptions:XLFormSectionOptionCanInsert | XLFormSectionOptionCanDelete | XLFormSectionOptionCanReorder
-                                          sectionInsertMode:XLFormSectionInsertModeButton];
-    section.footerTitle = @"MultivaluedFormViewController.h";
-    [form addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeSelectorPush title:@"Tap to select ;).."];
-    row.selectorOptions = @[@"Option 1", @"Option 2", @"Option 3"];
-    section.multivaluedRowTemplate = [row copy];
-    [section addFormRow:row];
-    return [super initWithForm:form];
-}
-
-
--(void)viewDidLoad
-{
-    [super viewDidLoad];
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemEdit target:self action:@selector(addDidTouch:)];
-}
-
-#pragma mark - Actions
-
--(void)addDidTouch:(UIBarButtonItem * __unused)sender
-{
-    UIActionSheet * actionSheet = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:@"Remove Last Section" otherButtonTitles:@"Add a section at the end", self.form.isDisabled ? @"Enable Form" : @"Disable Form", nil];
-    [actionSheet showInView:self.view];
-    
-}
-
-#pragma mark - UIActionSheetDelegate
-
-- (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex
-{
-    if ([actionSheet destructiveButtonIndex] == buttonIndex){
-        if (self.form.formSections.count > 0){
-            // remove last section
-            [self.form removeFormSectionAtIndex:(self.form.formSections.count - 1)];
-        }
-    }
-    else if ([[actionSheet buttonTitleAtIndex:buttonIndex] isEqualToString:@"Add a section at the end"]){
-        // add a new section
-        XLFormSectionDescriptor * newSection = [XLFormSectionDescriptor formSectionWithTitle:[NSString stringWithFormat:@"Section created at %@", [NSDateFormatter localizedStringFromDate:[NSDate new] dateStyle:NSDateFormatterShortStyle timeStyle:NSDateFormatterShortStyle]] sectionOptions:XLFormSectionOptionCanInsert | XLFormSectionOptionCanDelete];
-        newSection.multivaluedTag = [NSString stringWithFormat:@"multivaluedPushSelector_%@", @(self.form.formSections.count)];
-        XLFormRowDescriptor * newRow = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeSelectorPush title:@"Tap to select ;).."];
-        newRow.selectorOptions = @[@"Option 1", @"Option 2", @"Option 3"];
-        [newSection addFormRow:newRow];
-        [self.form addFormSection:newSection];
-    }
-    else {
-        self.form.disabled = !self.form.disabled;
-        [self.tableView endEditing:YES];
-        [self.tableView reloadData];
-    }
-}
-
-@end
-
-
-@implementation MultivaluedOnlyReorderViewController
-
-- (id)init
-{
-    NSTimeInterval secondsPerDay = 24 * 60 * 60;
-    NSArray * list = @[@"Today", @"Yesterday", @"Before Yesterday"];
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    
-    
-    form = [XLFormDescriptor formDescriptorWithTitle:@"Only Reorder Examples"];
-    
-    
-    // Multivalued Section with inline rows - section set up to support only reordering
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Reordering Inline Rows"
-                                             sectionOptions:XLFormSectionOptionCanReorder];
-    section.footerTitle = @"XLFormRowDescriptorTypeDateInline row type";
-    [form addFormSection:section];
-    
-    [list enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        XLFormRowDescriptor * row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeDateInline];
-        row.value = [NSDate dateWithTimeIntervalSinceNow:(-secondsPerDay * idx)];
-        row.title = obj;
-        [section addFormRow:row];
-    }];
-    
-    
-    // Multivalued Section with common rows - section set up to support only reordering
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Reordering Rows"
-                                             sectionOptions:XLFormSectionOptionCanReorder];
-    section.footerTitle = @"XLFormRowDescriptorTypeInfo row type";
-    [form addFormSection:section];
-    
-    
-    [list enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        XLFormRowDescriptor * row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeInfo];
-        row.value = [NSDateFormatter localizedStringFromDate:[NSDate dateWithTimeIntervalSinceNow:(-secondsPerDay * idx)] dateStyle:NSDateFormatterMediumStyle timeStyle:NSDateFormatterNoStyle];
-        row.title = obj;
-        [section addFormRow:row];
-    }];
-    
-    return [super initWithForm:form];
-}
-
-@end
-
-
-@implementation MultivaluedOnlyInserViewController
-
-- (id)init
-{
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    NSArray * nameList = @[@"family", @"male", @"female", @"client"];
-    
-    
-    form = [XLFormDescriptor formDescriptorWithTitle:@"Multivalued Only Insert"];
-    
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"XLFormSectionInsertModeButton"
-                                             sectionOptions:XLFormSectionOptionCanInsert
-                                          sectionInsertMode:XLFormSectionInsertModeButton];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeText];
-    [[row cellConfig] setObject:@"Add a new tag" forKey:@"textField.placeholder"];
-    section.multivaluedRowTemplate = row;
-    
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"XLFormSectionInsertModeButton With Inline Cells"
-                                             sectionOptions:XLFormSectionOptionCanInsert
-                                          sectionInsertMode:XLFormSectionInsertModeButton];
-    [form addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeDateInline];
-    row.value = [NSDate new];
-    row.title = @"Date";
-    section.multivaluedRowTemplate = row;
-    
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"XLFormSectionInsertModeLastRow"
-                                             sectionOptions:XLFormSectionOptionCanInsert
-                                          sectionInsertMode:XLFormSectionInsertModeLastRow];
-    [form addFormSection:section];
-    for (NSString * tag in nameList) {
-        // add a row to the section, the row will be used to crete new rows.
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeText];
-        [[row cellConfig] setObject:@"Add a new tag" forKey:@"textField.placeholder"];
-        row.value = tag;
-        [section addFormRow:row];
-    }
-    
-    return [super initWithForm:form];
-}
-
-@end
-
-
-@implementation MultivaluedOnlyDeleteViewController
-
-- (id)init
-{
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    NSArray * nameList = @[@"family", @"male", @"female", @"client"];
-    
-    
-    form = [XLFormDescriptor formDescriptor];
-    
-    // MultivaluedSection section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@""
-                                             sectionOptions:XLFormSectionOptionCanDelete];
-    section.footerTitle = @"you can swipe to delete when table.editing = NO (Not Editing)";
-    [form addFormSection:section];
-    
-    for (NSString * tag in nameList) {
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeText];
-        [[row cellConfig] setObject:@"Add a new tag" forKey:@"textField.placeholder"];
-        row.value = [tag copy];
-        [section addFormRow:row];
-    }
-    
-    // Multivalued Section with inline row.
-    section = [XLFormSectionDescriptor formSectionWithTitle:@""
-                                             sectionOptions:XLFormSectionOptionCanDelete];
-    section.footerTitle = @"you can swipe to delete when table.editing = NO (Not Editing)";
-    [form addFormSection:section];
-    for (NSUInteger i = 0; i < 4; i++) {
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:nil rowType:XLFormRowDescriptorTypeSelectorPickerViewInline];
-        row.title = @"Tap to select";
-        row.value = @"client";
-        row.selectorOptions = nameList;
-        [section addFormRow:row];
-    }
-    
-    return [super initWithForm:form];
-}
-
-
--(void)viewDidLoad
-{
-    [super viewDidLoad];
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Editing" style:UIBarButtonItemStylePlain target:self action:@selector(toggleEditing:)];
-}
-
-
--(void)toggleEditing:(UIBarButtonItem *)barButtonItem
-{
-    [self.tableView setEditing:!self.tableView.editing animated:YES];
-    [barButtonItem setTitle:(self.tableView.editing ? @"Editing" : @"Not Editing")];
-}
-
-@end
-

Examples/Swift/Examples/Others/CustomCells/XLFormCustomCell.swift

@@ -1,60 +0,0 @@
-//
-//  XLFormCustomCell.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLFormCustomCell.h"
-
-@implementation XLFormCustomCell
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
-    if (self) {
-        // Initialization code        
-    }
-    return self;
-}
-
-- (void)configure
-{
-    [super configure];
-    //override
-}
-
-- (void)update
-{
-    [super update];
-    // override
-    self.textLabel.text = @"Am a custom cell, select me!";
-}
-
--(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)controller
-{
-    // custom code here
-    // i.e new behaviour when cell has been selected
-    self.textLabel.text = [self.textLabel.text isEqualToString:@"I can do any custom behaviour..."] ? @"Am a custom cell, select me!" : @"I can do any custom behaviour...";
-    self.rowDescriptor.value = self.textLabel.text;
-    [self.formViewController.tableView selectRowAtIndexPath:nil animated:YES scrollPosition:UITableViewScrollPositionNone];
-}
-
-@end

Examples/Swift/Examples/Others/OthersFormViewController.swift

@@ -1,188 +0,0 @@
-//
-//  OthersFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "MapViewController.h"
-#import "OthersFormViewController.h"
-
-NSString *const kSwitchBool = @"switchBool";
-NSString *const kSwitchCheck = @"switchBool";
-NSString *const kStepCounter = @"stepCounter";
-NSString *const kSlider = @"slider";
-NSString *const kSegmentedControl = @"segmentedControl";
-NSString *const kCustom = @"custom";
-NSString *const kInfo = @"info";
-NSString *const kButton = @"button";
-NSString *const kButtonLeftAligned = @"buttonLeftAligned";
-NSString *const kButtonWithSegueId = @"buttonWithSegueId";
-NSString *const kButtonWithSegueClass = @"buttonWithSegueClass";
-NSString *const kButtonWithNibName = @"buttonWithNibName";
-NSString *const kButtonWithStoryboardId = @"buttonWithStoryboardId";
-
-
-@implementation OthersFormViewController
-
-
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
-- (id)init
-{
-    self = [super init];
-    if (self){
-        [self initializeForm];
-    }
-    return self;
-}
-
--(void)initializeForm
-{
-    XLFormDescriptor * form = [XLFormDescriptor formDescriptorWithTitle:@"Other Cells"];
-    XLFormSectionDescriptor * section;
-    
-    // Basic Information
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Other Cells"];
-    section.footerTitle = @"OthersFormViewController.h";
-    [form addFormSection:section];
-    
-    // Switch
-    [section addFormRow:[XLFormRowDescriptor formRowDescriptorWithTag:kSwitchBool rowType:XLFormRowDescriptorTypeBooleanSwitch title:@"Switch"]];
-    
-    // check
-    [section addFormRow:[XLFormRowDescriptor formRowDescriptorWithTag:kSwitchCheck rowType:XLFormRowDescriptorTypeBooleanCheck title:@"Check"]];
-    
-    // step counter
-    [section addFormRow:[XLFormRowDescriptor formRowDescriptorWithTag:kStepCounter rowType:XLFormRowDescriptorTypeStepCounter title:@"Step counter"]];
-    
-    // Segmented Control
-    XLFormRowDescriptor * row = [XLFormRowDescriptor formRowDescriptorWithTag:kSegmentedControl rowType:XLFormRowDescriptorTypeSelectorSegmentedControl title:@"Fruits"];
-    row.selectorOptions = @[@"Apple", @"Orange", @"Pear"];
-    row.value = @"Pear";
-    [section addFormRow:row];
-    
-    
-    // Slider
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSlider rowType:XLFormRowDescriptorTypeSlider title:@"Slider"];
-    row.value = @(30);
-    [row.cellConfigAtConfigure setObject:@(100) forKey:@"slider.maximumValue"];
-    [row.cellConfigAtConfigure setObject:@(10) forKey:@"slider.minimumValue"];
-    [row.cellConfigAtConfigure setObject:@(4) forKey:@"steps"];
-    [section addFormRow:row];
-    
-
-    // Info cell
-    XLFormRowDescriptor *infoRowDescriptor = [XLFormRowDescriptor formRowDescriptorWithTag:kInfo rowType:XLFormRowDescriptorTypeInfo];
-    infoRowDescriptor.title = @"Version";
-    infoRowDescriptor.value = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
-    [section addFormRow:infoRowDescriptor];
-    
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Buttons"];
-    section.footerTitle = @"Blue buttons will show a message when Switch is ON";
-    [form addFormSection:section];
-    
-    // Button
-    XLFormRowDescriptor * buttonRow = [XLFormRowDescriptor formRowDescriptorWithTag:kButton rowType:XLFormRowDescriptorTypeButton title:@"Button"];
-    [buttonRow.cellConfig setObject:[UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0] forKey:@"textLabel.textColor"];
-    buttonRow.action.formSelector = @selector(didTouchButton:);
-    [section addFormRow:buttonRow];
-    
-    
-    // Left Button
-    XLFormRowDescriptor * buttonLeftAlignedRow = [XLFormRowDescriptor formRowDescriptorWithTag:kButtonLeftAligned rowType:XLFormRowDescriptorTypeButton title:@"Button with Block"];
-    [buttonLeftAlignedRow.cellConfig setObject:[UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0] forKey:@"textLabel.textColor"];
-    [buttonLeftAlignedRow.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    [buttonLeftAlignedRow.cellConfig setObject:@(UITableViewCellAccessoryDisclosureIndicator) forKey:@"accessoryType"];
-    buttonLeftAlignedRow.action.formBlock = ^(XLFormRowDescriptor * sender){
-        if ([[sender.sectionDescriptor.formDescriptor formRowWithTag:kSwitchBool].value boolValue]){
-            UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Switch is ON", nil) message:@"Button has checked the switch value..." delegate:self cancelButtonTitle:NSLocalizedString(@"OK", nil) otherButtonTitles:nil];
-            [alertView show];
-        }
-        [self deselectFormRow:sender];
-    };
-    [section addFormRow:buttonLeftAlignedRow];
-    
-    // Another Left Button with segue
-    XLFormRowDescriptor * buttonLeftAlignedWithSegueRow = [XLFormRowDescriptor formRowDescriptorWithTag:kButtonWithSegueClass rowType:XLFormRowDescriptorTypeButton title:@"Button with Segue Class"];
-    buttonLeftAlignedWithSegueRow.action.formSegueClass = NSClassFromString(@"UIStoryboardPushSegue");
-    buttonLeftAlignedWithSegueRow.action.viewControllerClass = [MapViewController class];
-    [section addFormRow:buttonLeftAlignedWithSegueRow];
-    
-    
-    // Button with SegueId
-    XLFormRowDescriptor * buttonWithSegueId = [XLFormRowDescriptor formRowDescriptorWithTag:kButtonWithSegueClass rowType:XLFormRowDescriptorTypeButton title:@"Button with Segue Idenfifier"];
-    buttonWithSegueId.action.formSegueIdenfifier = @"MapViewControllerSegue";
-    [section addFormRow:buttonWithSegueId];
-    
-    
-    // Another Button using Segue
-    XLFormRowDescriptor * buttonWithStoryboardId = [XLFormRowDescriptor formRowDescriptorWithTag:kButtonWithStoryboardId rowType:XLFormRowDescriptorTypeButton title:@"Button with StoryboardId"];
-    buttonWithStoryboardId.action.viewControllerStoryboardId = @"MapViewController";
-    [section addFormRow:buttonWithStoryboardId];
-    
-    // Another Left Button with segue
-    XLFormRowDescriptor * buttonWithNibName = [XLFormRowDescriptor formRowDescriptorWithTag:kButtonWithNibName
-                                                                                    rowType:XLFormRowDescriptorTypeButton
-                                                                                      title:@"Button with NibName"];
-    buttonWithNibName.action.viewControllerNibName = @"MapViewController";
-    [section addFormRow:buttonWithNibName];
-    
-    self.form = form;
-}
-
--(void)didTouchButton:(XLFormRowDescriptor *)sender
-{
-    if ([[sender.sectionDescriptor.formDescriptor formRowWithTag:kSwitchBool].value boolValue]){
-        UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Switch is ON", nil) message:@"Button has checked the switch value..." delegate:self cancelButtonTitle:NSLocalizedString(@"OK", nil) otherButtonTitles:nil];
-        [alertView show];
-    }
-    [self deselectFormRow:sender];
-}
-
--(void)viewDidLoad
-{
-    [super viewDidLoad];
-    UIBarButtonItem * barButton = [[UIBarButtonItem alloc] initWithTitle:@"Disable" style:UIBarButtonItemStylePlain
-                                                target:self
-                                                action:@selector(disableEnable:)];
-    barButton.possibleTitles = [NSSet setWithObjects:@"Disable", @"Enable", nil];
-    self.navigationItem.rightBarButtonItem = barButton;
-}
-
--(void)disableEnable:(UIBarButtonItem *)button
-{
-    self.form.disabled = !self.form.disabled;
-    [button setTitle:(self.form.disabled ? @"Enable" : @"Disable")];
-    [self.tableView endEditing:YES];
-    [self.tableView reloadData];
-}
-
-
-@end

Examples/Swift/Examples/PredicateExamples/BasicPredicateViewController.swift

@@ -1,84 +0,0 @@
-//
-//  BasicPredicateViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "BasicPredicateViewController.h"
-
-NSString *const khiderow = @"tag1";
-NSString *const khidesection = @"tag2";
-NSString *const ktext = @"tag3";
-
-@implementation BasicPredicateViewController
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
-
-- (void)initializeForm
-{
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    form = [XLFormDescriptor formDescriptorWithTitle:@"Basic Predicates"];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"A Section"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:khiderow rowType:XLFormRowDescriptorTypeBooleanSwitch title:@"Show next row"];
-    row.value = @0;
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:khidesection rowType:XLFormRowDescriptorTypeBooleanSwitch title:@"Show B Section"];
-    row.hidden = [NSString stringWithFormat:@"$%@==0", khiderow];
-    row.value = @0;
-    [section addFormRow:row];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"B Section"];
-    section.footerTitle = @"BasicPredicateViewController";
-    section.hidden = [NSString stringWithFormat:@"$%@==0", khidesection];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:ktext rowType:XLFormRowDescriptorTypeText title:@""];
-    [row.cellConfigAtConfigure setObject:@"Gonna disappear soon!!" forKey:@"textField.placeholder"];
-    [section addFormRow:row];
-    
-    self.form = form;
-}
-
-@end

Examples/Swift/Examples/PredicateExamples/BlogExampleViewController.swift

@@ -1,92 +0,0 @@
-//
-//  BlogExampleViewController.swift
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-
-
-class BlogExampleViewController : XLFormViewController {
-
-    private enum Tags : String {
-        case Hobbies = "hobbies"
-        case Sport = "sport"
-        case Film = "films1"
-        case Film2 = "films2"
-        case Music = "music"
-    }
-    
-    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
-        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
-    }
-    
-    required init(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        self.initializeForm()
-    }
-    
-    func initializeForm() {
-        
-        let form : XLFormDescriptor
-        var section : XLFormSectionDescriptor
-        var row : XLFormRowDescriptor
-        
-        form = XLFormDescriptor(title: "Blog Example: Hobbies")
-        
-        section = XLFormSectionDescriptor()
-        section.title = "Hobbies"
-        form.addFormSection(section)
-        
-        
-        row = XLFormRowDescriptor(tag: Tags.Hobbies.rawValue, rowType: XLFormRowDescriptorTypeMultipleSelector, title:"Select Hobbies")
-        row.selectorOptions = ["Sport", "Music", "Films"]
-        row.value = []
-        section.addFormRow(row)
-        
-        section = XLFormSectionDescriptor()
-        section.title = "Some more questions"
-        section.hidden = NSPredicate(format: "$\(row.description).value.@count == 0")
-        section.footerTitle = "BlogExampleViewController.swift"
-        form.addFormSection(section)
-        
-        row = XLFormRowDescriptor(tag: Tags.Sport.rawValue, rowType: XLFormRowDescriptorTypeTextView, title:"Your favourite sportsman?")
-        row.hidden = "NOT $\(Tags.Hobbies.rawValue).value contains 'Sport'"
-        section.addFormRow(row)
-        
-        row = XLFormRowDescriptor(tag: Tags.Film.rawValue, rowType:XLFormRowDescriptorTypeTextView, title: "Your favourite film?")
-        row.hidden = "NOT $\(Tags.Hobbies.rawValue) contains 'Films'"
-        section.addFormRow(row)
-        
-        row = XLFormRowDescriptor(tag: Tags.Film2.rawValue, rowType:XLFormRowDescriptorTypeTextView, title:"Your favourite actor?")
-        row.hidden = "NOT $\(Tags.Hobbies.rawValue) contains 'Films'"
-        section.addFormRow(row)
-        
-        row = XLFormRowDescriptor(tag: Tags.Music.rawValue, rowType:XLFormRowDescriptorTypeTextView, title:"Your favourite singer?")
-        row.hidden = "NOT $\(Tags.Hobbies.rawValue) contains 'Music'"
-        section.addFormRow(row)
-        
-        self.form = form
-    }
-    
-}

Examples/Swift/Examples/PredicateExamples/PredicateFormViewController.swift

@@ -1,122 +0,0 @@
-//
-//  PredicateFormViewController.swift
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-// 
-//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-class PredicateFormViewController : XLFormViewController {
-
-    private enum Tags : String {
-        case Text = "text"
-        case Integer = "integer"
-        case Switch = "switch"
-        case Date = "date"
-        case Account = "account"
-    }
-    
-    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
-        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
-    }
-    
-    required init(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        self.initializeForm()
-    }
-    
-    func initializeForm() {
-        
-        let form : XLFormDescriptor
-        var section : XLFormSectionDescriptor
-        var row : XLFormRowDescriptor
-
-        form = XLFormDescriptor(title: "Predicates example")
-        
-        section = XLFormSectionDescriptor()
-        section.title = "Independent rows"
-        form.addFormSection(section)
-        
-        row = XLFormRowDescriptor(tag: Tags.Text.rawValue, rowType: XLFormRowDescriptorTypeAccount, title:"Text")
-        row.cellConfigAtConfigure["textField.placeholder"] = "Type disable"
-        section.addFormRow(row)
-        
-        row = XLFormRowDescriptor(tag: Tags.Integer.rawValue, rowType: XLFormRowDescriptorTypeInteger, title:"Integer")
-        row.hidden = NSPredicate(format: "$\(Tags.Switch.rawValue).value==0")
-        section.addFormRow(row)
-        
-        row = XLFormRowDescriptor(tag: Tags.Switch.rawValue, rowType: XLFormRowDescriptorTypeBooleanSwitch, title:"Boolean")
-        row.value = true
-        section.addFormRow(row)
-        
-        form.addFormSection(section)
-        
-        section = XLFormSectionDescriptor()
-        section.title = "Dependent section"
-        section.footerTitle = "Type disable in the textfield, a number between 18 and 60 in the integer field or use the switch to disable the last row. By doing all three the last section will hide.\nThe integer field hides when the boolean switch is set to 0."
-        form.addFormSection(section)
-        
-        // Predicate Disabling
-        row = XLFormRowDescriptor(tag: Tags.Date.rawValue, rowType: XLFormRowDescriptorTypeDateInline, title:"Disabled")
-        row.value = NSDate.new()
-        section.addFormRow(row)
-        row.disabled = NSPredicate(format: "$\(Tags.Text.rawValue).value contains[c] 'disable' OR ($\(Tags.Integer.rawValue).value between {18, 60}) OR ($\(Tags.Switch.rawValue).value == 0)")
-        section.hidden = NSPredicate(format: "($\(Tags.Text.rawValue).value contains[c] 'disable') AND ($\(Tags.Integer.rawValue).value between {18, 60}) AND ($\(Tags.Switch.rawValue).value == 0)")
-        
-        
-        
-        section = XLFormSectionDescriptor()
-        section.title = "More predicates..."
-        section.footerTitle = "This row hides when the row of the previous section is disabled and the textfield in the first section contains \"out\"\n\nPredicateFormViewController.swift"
-        form.addFormSection(section)
-        
-        
-        
-        row = XLFormRowDescriptor(tag: "thirds", rowType:XLFormRowDescriptorTypeAccount, title:"Account")
-        section.addFormRow(row)
-        row.hidden =  NSPredicate(format: "$\(Tags.Date.rawValue).isDisabled == 1 AND $\(Tags.Text.rawValue).value contains[c] 'Out'")
-        
-        
-        row.onChangeBlock = {
-            let noValue = "No Value"
-            let message = "Old value: \($0 ?? noValue), New value: \($1 ?? noValue)"
-            let alertView = UIAlertController(title: "Account Field changed", message: message, preferredStyle: UIAlertControllerStyle.ActionSheet)
-            alertView.addAction(UIAlertAction(title: "Cancel", style: UIAlertActionStyle.Cancel, handler: nil))
-            let row = $2
-            self.navigationController?.presentViewController(alertView, animated: true, completion: nil)
-        }
-        
-        self.form = form
-    }
-    
-}
-
-
-
-
-
-
-
-
-
-
-

Examples/Swift/Examples/RealExamples/NativeEventFormViewController.swift

@@ -1,263 +0,0 @@
-//
-//  NativeEventNavigationViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLForm.h"
-#import "DateAndTimeValueTrasformer.h"
-#import "NativeEventFormViewController.h"
-
-
-@implementation NativeEventNavigationViewController
-
--(id)init
-{
-    self = [super initWithRootViewController:[[NativeEventFormViewController alloc] init]];
-    return  self;
-}
-
--(void)viewDidLoad
-{
-    [super viewDidLoad];
-    [self.view setTintColor:[UIColor redColor]];
-}
-
-@end
-
-@interface NativeEventFormViewController ()
-
-@end
-
-@implementation NativeEventFormViewController
-
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
-
-- (void)initializeForm
-{
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    form = [XLFormDescriptor formDescriptorWithTitle:@"Add Event"];
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    
-    // Title
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"Title" rowType:XLFormRowDescriptorTypeText];
-    [row.cellConfigAtConfigure setObject:@"Title" forKey:@"textField.placeholder"];
-    row.required = YES;
-    [section addFormRow:row];
-    
-    // Location
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"location" rowType:XLFormRowDescriptorTypeText];
-    [row.cellConfigAtConfigure setObject:@"Location" forKey:@"textField.placeholder"];
-    [section addFormRow:row];
-    
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    
-    // All-day
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"all-day" rowType:XLFormRowDescriptorTypeBooleanSwitch title:@"All-day"];
-    [section addFormRow:row];
-    
-    // Starts
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"starts" rowType:XLFormRowDescriptorTypeDateTimeInline title:@"Starts"];
-    row.value = [NSDate dateWithTimeIntervalSinceNow:60*60*24];
-    [section addFormRow:row];
-    
-    // Ends
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"ends" rowType:XLFormRowDescriptorTypeDateTimeInline title:@"Ends"];
-    row.value = [NSDate dateWithTimeIntervalSinceNow:60*60*25];
-    [section addFormRow:row];
-
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-
-    // Repeat
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"repeat" rowType:XLFormRowDescriptorTypeSelectorPush title:@"Repeat"];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Never"];
-    row.selectorTitle = @"Repeat";
-    row.selectorOptions = @[[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Never"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Every Day"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Every Week"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Every 2 Weeks"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(4) displayText:@"Every Month"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(5) displayText:@"Every Year"],
-                            ];
-    [section addFormRow:row];
-
-
-
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    
-    // Alert
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"alert" rowType:XLFormRowDescriptorTypeSelectorPush title:@"Alert"];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"None"];
-    row.selectorTitle = @"Event Alert";
-    row.selectorOptions = @[[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"None"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"At time of event"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"5 minutes before"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"15 minutes before"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(4) displayText:@"30 minutes before"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(5) displayText:@"1 hour before"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(6) displayText:@"2 hours before"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(7) displayText:@"1 day before"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(8) displayText:@"2 days before"],
-                            ];
-    [section addFormRow:row];
-
-
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    
-    // Show As
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"showAs" rowType:XLFormRowDescriptorTypeSelectorPush title:@"Show As"];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Busy"];
-    row.selectorTitle = @"Show As";
-    row.selectorOptions = @[[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Busy"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Free"]];
-    [section addFormRow:row];
-
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-
-    // URL
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"url" rowType:XLFormRowDescriptorTypeURL];
-    [row.cellConfigAtConfigure setObject:@"URL" forKey:@"textField.placeholder"];
-    [section addFormRow:row];
-    
-    // Notes
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"notes" rowType:XLFormRowDescriptorTypeTextView];
-    [row.cellConfigAtConfigure setObject:@"Notes" forKey:@"textView.placeholder"];
-    [section addFormRow:row];
-    
-    
-    self.form = form;
-}
-
--(void)viewDidLoad
-{
-    [super viewDidLoad];
-    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelPressed:)];
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(savePressed:)];
-}
-
-
-#pragma mark - XLFormDescriptorDelegate
-
--(void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor oldValue:(id)oldValue newValue:(id)newValue
-{
-    [super formRowDescriptorValueHasChanged:rowDescriptor oldValue:oldValue newValue:newValue];
-    if ([rowDescriptor.tag isEqualToString:@"alert"]){
-        if ([[rowDescriptor.value valueData] isEqualToNumber:@(0)] == NO && [[oldValue valueData] isEqualToNumber:@(0)]){
-        
-            XLFormRowDescriptor * newRow = [rowDescriptor copy];
-            newRow.tag = @"secondAlert";
-            newRow.title = @"Second Alert";
-            [self.form addFormRow:newRow afterRow:rowDescriptor];
-        }
-        else if ([[oldValue valueData] isEqualToNumber:@(0)] == NO && [[newValue valueData] isEqualToNumber:@(0)]){
-            [self.form removeFormRowWithTag:@"secondAlert"];
-        }
-    }
-    else if ([rowDescriptor.tag isEqualToString:@"all-day"]){
-        XLFormRowDescriptor * startDateDescriptor = [self.form formRowWithTag:@"starts"];
-        XLFormRowDescriptor * endDateDescriptor = [self.form formRowWithTag:@"ends"];
-        XLFormDateCell * dateStartCell = (XLFormDateCell *)[[self.form formRowWithTag:@"starts"] cellForFormController:self];
-        XLFormDateCell * dateEndCell = (XLFormDateCell *)[[self.form formRowWithTag:@"ends"] cellForFormController:self];
-        if ([[rowDescriptor.value valueData] boolValue] == YES){
-            startDateDescriptor.valueTransformer = [DateValueTrasformer class];
-            endDateDescriptor.valueTransformer = [DateValueTrasformer class];
-            [dateStartCell setFormDatePickerMode:XLFormDateDatePickerModeDate];
-            [dateEndCell setFormDatePickerMode:XLFormDateDatePickerModeDate];
-        }
-        else{
-            startDateDescriptor.valueTransformer = [DateTimeValueTrasformer class];
-            endDateDescriptor.valueTransformer = [DateTimeValueTrasformer class];
-            [dateStartCell setFormDatePickerMode:XLFormDateDatePickerModeDateTime];
-            [dateEndCell setFormDatePickerMode:XLFormDateDatePickerModeDateTime];
-        }
-        [dateStartCell update];
-        [dateEndCell update];
-    }
-    else if ([rowDescriptor.tag isEqualToString:@"starts"]){
-        XLFormRowDescriptor * startDateDescriptor = [self.form formRowWithTag:@"starts"];
-        XLFormRowDescriptor * endDateDescriptor = [self.form formRowWithTag:@"ends"];
-        XLFormDateCell * dateEndCell = (XLFormDateCell *)[endDateDescriptor cellForFormController:self];
-        if ([startDateDescriptor.value compare:endDateDescriptor.value] == NSOrderedDescending) {
-            // startDateDescriptor is later than endDateDescriptor
-            endDateDescriptor.value =  [[NSDate alloc] initWithTimeInterval:(60*60*24) sinceDate:startDateDescriptor.value];
-            [dateEndCell update];
-        }
-    }
-    else if ([rowDescriptor.tag isEqualToString:@"ends"]){
-        XLFormRowDescriptor * startDateDescriptor = [self.form formRowWithTag:@"starts"];
-        XLFormRowDescriptor * endDateDescriptor = [self.form formRowWithTag:@"ends"];
-        XLFormDateCell * dateEndCell = (XLFormDateCell *)[endDateDescriptor cellForFormController:self];
-        if ([startDateDescriptor.value compare:endDateDescriptor.value] == NSOrderedDescending) {
-            // startDateDescriptor is later than endDateDescriptor
-            NSDictionary *strikeThroughAttribute = [NSDictionary dictionaryWithObject:@1
-                                                                               forKey:NSStrikethroughStyleAttributeName];
-            NSAttributedString* strikeThroughText = [[NSAttributedString alloc] initWithString:dateEndCell.detailTextLabel.text attributes:strikeThroughAttribute];
-            dateEndCell.detailTextLabel.attributedText = strikeThroughText;
-        }
-    }
-}
-
--(void)cancelPressed:(UIBarButtonItem * __unused)button
-{
-    [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-
--(void)savePressed:(UIBarButtonItem * __unused)button
-{
-    NSArray * validationErrors = [self formValidationErrors];
-    if (validationErrors.count > 0){
-        [self showFormValidationError:[validationErrors firstObject]];
-        return;
-    }
-    [self.tableView endEditing:YES];
-}
-
-
-
-@end

Examples/Swift/Examples/RealExamples/UIFormViewCotroller+NativeEvetFormViewController.swift

@@ -1,13 +0,0 @@
-//
-//  UIFormViewCotroller+NativeEvetFormViewController.m
-//  XLForm
-//
-//  Created by Martin Barreto on 4/2/14.
-//  Copyright (c) 2014 Xmartlabs. All rights reserved.
-//
-
-#import "UIFormViewCotroller+NativeEvetFormViewController.h"
-
-@implementation UIFormViewCotroller (NativeEvetFormViewController)
-
-@end

Examples/Swift/Examples/Selectors/CustomSelectors/CustomSelectorsFormViewController.swift

@@ -1,73 +0,0 @@
-//
-//  CustomSelectorsFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import <MapKit/MapKit.h>
-#import "CLLocationValueTrasformer.h"
-#import "MapViewController.h"
-
-#import "CustomSelectorsFormViewController.h"
-
-NSString *const kSelectorMap = @"selectorMap";
-NSString *const kSelectorMapPopover = @"selectorMapPopover";
-
-@implementation CustomSelectorsFormViewController
-
--(id)init
-{
-    self = [super init];
-    if (self) {
-        XLFormDescriptor * form = [XLFormDescriptor formDescriptorWithTitle:@"Custom Selectors"];
-        XLFormSectionDescriptor * section;
-        XLFormRowDescriptor * row;
-        
-        // Basic Information
-        section = [XLFormSectionDescriptor formSection];
-        section.footerTitle = @"CustomSelectorsFormViewController.h";
-        [form addFormSection:section];
-        
-        
-        // Selector Push
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorMap rowType:XLFormRowDescriptorTypeSelectorPush title:@"Coordinate"];
-        row.action.viewControllerClass = [MapViewController class];
-        row.valueTransformer = [CLLocationValueTrasformer class];
-        row.value = [[CLLocation alloc] initWithLatitude:-33 longitude:-56];
-        [section addFormRow:row];
-        
-        if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad){
-            // Selector PopOver
-            row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorMapPopover rowType:XLFormRowDescriptorTypeSelectorPopover title:@"Coordinate PopOver"];
-            row.action.viewControllerClass = [MapViewController class];
-            row.valueTransformer = [CLLocationValueTrasformer class];
-            row.value = [[CLLocation alloc] initWithLatitude:-33 longitude:-56];
-            [section addFormRow:row];
-        }
-        
-        self.form = form;
-        
-    }
-    return self;
-}
-
-@end

Examples/Swift/Examples/Selectors/CustomSelectors/XLFormRowViewController/CLLocationValueTrasformer.swift

@@ -1,48 +0,0 @@
-//
-//  CLLocationValueTrasformer.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import <MapKit/MapKit.h>
-#import "CLLocationValueTrasformer.h"
-
-@implementation CLLocationValueTrasformer
-
-+ (Class)transformedValueClass
-{
-    return [NSString class];
-}
-
-+ (BOOL)allowsReverseTransformation
-{
-    return NO;
-}
-
-- (id)transformedValue:(id)value
-{
-    if (!value) return nil;
-    CLLocation * location = (CLLocation *)value;
-    return [NSString stringWithFormat:@"%0.4f, %0.4f", location.coordinate.latitude, location.coordinate.longitude];
-}
-
-@end

Examples/Swift/Examples/Selectors/CustomSelectors/XLFormRowViewController/MapViewController.swift

@@ -1,108 +0,0 @@
-//
-//  MapViewController.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "UIView+XLFormAdditions.h"
-#import <MapKit/MapKit.h>
-
-#import "MapViewController.h"
-
-
-@interface MapAnnotation : NSObject  <MKAnnotation>
-@end
-
-@implementation MapAnnotation
-@synthesize coordinate = _coordinate;
--(void)setCoordinate:(CLLocationCoordinate2D)newCoordinate
-{
-    _coordinate = newCoordinate;
-}
-@end
-
-@interface MapViewController () <MKMapViewDelegate>
-
-@property (nonatomic) MKMapView * mapView;
-
-@end
-
-@implementation MapViewController
-
-@synthesize rowDescriptor = _rowDescriptor;
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    [self.view addSubview:self.mapView];
-    self.mapView.delegate = self;
-    if (self.rowDescriptor.value){
-        [self.mapView setCenterCoordinate:((CLLocation *)self.rowDescriptor.value).coordinate];
-        self.title = [NSString stringWithFormat:@"%0.4f, %0.4f", self.mapView.centerCoordinate.latitude, self.mapView.centerCoordinate.longitude];
-        MapAnnotation *annotation = [[MapAnnotation alloc] init];
-        annotation.coordinate = self.mapView.centerCoordinate;
-        [self.mapView addAnnotation:annotation];
-    }
-}
-
--(MKMapView *)mapView
-{
-    if (_mapView) return _mapView;
-    _mapView = [[MKMapView alloc] initWithFrame:self.view.bounds];
-    _mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    return _mapView;
-}
-
-#pragma mark - MKMapViewDelegate
-
-- (MKAnnotationView *)mapView:(MKMapView *)mapView
-            viewForAnnotation:(id <MKAnnotation>)annotation {
-    
-    MKPinAnnotationView *pinAnnotationView = [[MKPinAnnotationView alloc] initWithAnnotation:annotation
-                                                                             reuseIdentifier:@"annotation"];
-    pinAnnotationView.pinColor = MKPinAnnotationColorRed;
-    pinAnnotationView.draggable = YES;
-    pinAnnotationView.animatesDrop = YES;
-    return pinAnnotationView;
-}
-
-- (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)view didChangeDragState:(MKAnnotationViewDragState)newState
-   fromOldState:(MKAnnotationViewDragState)oldState
-{
-    if (newState == MKAnnotationViewDragStateEnding){
-        self.rowDescriptor.value = [[CLLocation alloc] initWithLatitude:view.annotation.coordinate.latitude longitude:view.annotation.coordinate.longitude];
-        self.title = [NSString stringWithFormat:@"%0.4f, %0.4f", view.annotation.coordinate.latitude, view.annotation.coordinate.longitude];
-    }
-}
-
-
-@end

Examples/Swift/Examples/Selectors/CustomSelectors/XLFormRowViewController/MapViewController.xib

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MapViewController">
-            <connections>
-                <outlet property="view" destination="iN0-l3-epB" id="O5R-PM-tsI"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-        </view>
-    </objects>
-</document>

Examples/Swift/Examples/Selectors/DynamicSelector/DynamicSelectorsFormViewController.swift

@@ -1,66 +0,0 @@
-//
-//  DynamicSelectorsFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "UsersTableViewController.h"
-#import "DynamicSelectorsFormViewController.h"
-
-NSString *const kSelectorUser = @"selectorUser";
-NSString *const kSelectorUserPopover = @"kSelectorUserPopover";
-
-@implementation DynamicSelectorsFormViewController
-
-
--(id)init
-{
-    self = [super init];
-    if (self) {
-        XLFormDescriptor * form = [XLFormDescriptor formDescriptorWithTitle:@"Selectors"];
-        XLFormSectionDescriptor * section;
-        XLFormRowDescriptor * row;
-        
-        // Basic Information
-        section = [XLFormSectionDescriptor formSectionWithTitle:@"Dynamic Selectors"];
-        section.footerTitle = @"DynamicSelectorsFormViewController.h";
-        [form addFormSection:section];
-        
-        
-        // Selector Push
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorUser rowType:XLFormRowDescriptorTypeSelectorPush title:@"User"];
-        row.action.viewControllerClass = [UsersTableViewController class];
-        [section addFormRow:row];
-        
-        if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad){
-            // Selector PopOver
-            row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorUserPopover rowType:XLFormRowDescriptorTypeSelectorPopover title:@"User Popover"];
-            row.action.viewControllerClass = [UsersTableViewController class];
-            [section addFormRow:row];
-        }
-        self.form = form;
-    }
-    return self;
-}
-
-
-@end

Examples/Swift/Examples/Selectors/DynamicSelector/UsersTableViewController.swift

@@ -1,204 +0,0 @@
-//
-//  UsersTableViewController.swift
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-class UserCell : UITableViewCell {
-
-    lazy var userImage : UIImageView = {
-        let tempUserImage = UIImageView()
-        tempUserImage.setTranslatesAutoresizingMaskIntoConstraints(false)
-        tempUserImage.layer.masksToBounds = true
-        tempUserImage.layer.cornerRadius = 10.0
-        return tempUserImage
-    }()
-
-    
-    lazy var userName : UILabel = {
-        let tempUserName = UILabel()
-        tempUserName.setTranslatesAutoresizingMaskIntoConstraints(false)
-        tempUserName.font = UIFont.systemFontOfSize(15.0)
-        return tempUserName
-    }()
-
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
-        super.init(style: style, reuseIdentifier: reuseIdentifier)
-        // Initialization code
-    
-        self.contentView.addSubview(self.userImage)
-        self.contentView.addSubview(self.userName)
-    
-        self.contentView.addConstraints(self.layoutConstraints())
-    }
-
-    required init(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    override func setSelected(selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-        
-    }
-    
-// MARK: - Layout Constraints
-
-    func layoutConstraints() -> [AnyObject]{
-        let views = ["image": self.userImage, "name": self.userName ]
-        let metrics = [ "imgSize": 50.0, "margin": 12.0]
-        
-        var result = NSLayoutConstraint.constraintsWithVisualFormat("H:|-(margin)-[image(imgSize)]-[name]", options:NSLayoutFormatOptions.AlignAllTop, metrics: metrics, views: views)
-        result += NSLayoutConstraint.constraintsWithVisualFormat("V:|-(margin)-[image(imgSize)]", options:NSLayoutFormatOptions.allZeros, metrics:metrics, views: views)
-        return result
-    }
-    
-    
-}
-
-
-private let _UsersJSONSerializationSharedInstance = UsersJSONSerialization()
-
-class UsersJSONSerialization {
-    
-    lazy var userData : Array<AnyObject>? = {
-        let dataString =
-        "[" +
-        "{\"id\":1,\"name\":\"Apu Nahasapeemapetilon\",\"imageName\":\"Apu_Nahasapeemapetilon.png\"}," +
-        "{\"id\":7,\"name\":\"Bart Simpsons\",\"imageName\":\"Bart_Simpsons.png\"}," +
-        "{\"id\":8,\"name\":\"Homer Simpsons\",\"imageName\":\"Homer_Simpsons.png\"}," +
-        "{\"id\":9,\"name\":\"Lisa Simpsons\",\"imageName\":\"Lisa_Simpsons.png\"}," +
-        "{\"id\":2,\"name\":\"Maggie Simpsons\",\"imageName\":\"Maggie_Simpsons.png\"}," +
-        "{\"id\":3,\"name\":\"Marge Simpsons\",\"imageName\":\"Marge_Simpsons.png\"}," +
-        "{\"id\":4,\"name\":\"Montgomery Burns\",\"imageName\":\"Montgomery_Burns.png\"}," +
-        "{\"id\":5,\"name\":\"Ned Flanders\",\"imageName\":\"Ned_Flanders.png\"}," +
-        "{\"id\":6,\"name\":\"Otto Mann\",\"imageName\":\"Otto_Mann.png\"}]"
-        let jsonData = dataString.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: true)
-        return NSJSONSerialization.JSONObjectWithData(jsonData!, options: NSJSONReadingOptions.allZeros, error: nil) as! Array<AnyObject>?
-    }()
-    
-    class var sharedInstance: UsersJSONSerialization {
-        return _UsersJSONSerializationSharedInstance
-    }
-
-    
-}
-
-class User: NSObject,  XLFormOptionObject {
-    
-    let userId: Int
-    let userName : String
-    let userImage: String
-    
-    init(userId: Int,  userName: String, userImage: String){
-        self.userId = userId
-        self.userImage = userImage
-        self.userName = userName
-    }
-    
-    func formDisplayText() -> String {
-        return self.userName
-    }
-    
-    func formValue() -> AnyObject {
-        return self.userId
-    }
-    
-}
-
-class UsersTableViewController : UITableViewController, XLFormRowDescriptorViewController, XLFormRowDescriptorPopoverViewController {
-
-    
-    var rowDescriptor : XLFormRowDescriptor?
-    var popoverController : UIPopoverController?
-    
-    var userCell : UserCell?
-    
-    private let kUserCellIdentifier = "UserCell"
-    
-    
-    override init(style: UITableViewStyle) {
-        super.init(style: style);
-    }
-    
-    override init!(nibName nibNameOrNil: String!, bundle nibBundleOrNil: NSBundle!) {
-        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-    }
-    
-    required init(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.tableView.registerClass(UserCell.self, forCellReuseIdentifier: self.kUserCellIdentifier)
-        self.tableView.tableFooterView = UIView(frame: CGRect.zeroRect)
-    }
-    
-// MARK: UITableViewDataSource
-    
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
-        return 1
-    }
-    
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return UsersJSONSerialization.sharedInstance.userData!.count
-    }
-    
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
-        let cell: UserCell = tableView.dequeueReusableCellWithIdentifier(self.kUserCellIdentifier, forIndexPath: indexPath) as! UserCell
-        let usersData = UsersJSONSerialization.sharedInstance.userData! as! Array<Dictionary<String, AnyObject>>
-        let userData = usersData[indexPath.row] as Dictionary<String, AnyObject>
-        let userId = userData["id"] as! Int
-        cell.userName.text = userData["name"] as? String
-        cell.userImage.image = UIImage(named: (userData["imageName"] as? String)!)
-        if self.rowDescriptor?.value != nil {
-            cell.accessoryType = self.rowDescriptor!.value!.formValue().isEqual(userId) ? .Checkmark : .None
-        }
-        return cell;
-
-    }
-    
-    override func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
-        return 73.0
-    }
-    
-
-//MARK: UITableViewDelegate
-
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
-        
-        let usersData = UsersJSONSerialization.sharedInstance.userData! as! Array<Dictionary<String, AnyObject>>
-        let userData = usersData[indexPath.row] as Dictionary<String, AnyObject>
-        let user = User(userId: (userData["id"] as! Int), userName: userData["name"] as! String, userImage: userData["imageName"] as! String)
-        self.rowDescriptor!.value = user;
-        if let porpOver = self.popoverController {
-            porpOver.dismissPopoverAnimated(true)
-            porpOver.delegate?.popoverControllerDidDismissPopover!(porpOver)
-        }
-        else if self.parentViewController is UINavigationController {
-            self.navigationController?.popViewControllerAnimated(true)
-        }
-    }
-    
-    
-}

Examples/Swift/Examples/Selectors/Helpers/Data/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="5064" systemVersion="13C1021" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
-    <entity name="User" representedClassName="User" syncable="YES">
-        <attribute name="userId" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
-        <attribute name="userImageURL" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="userName" optional="YES" attributeType="String" syncable="YES"/>
-    </entity>
-    <elements>
-        <element name="User" positionX="-63" positionY="-18" width="128" height="88"/>
-    </elements>
-</model>

Examples/Swift/Examples/Selectors/Helpers/Data/Store/CoreDataStore.h

@@ -1,53 +0,0 @@
-//
-//  CoreDataStore.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-#import <CoreData/CoreData.h>
-#import <Foundation/Foundation.h>
-
-@interface CoreDataStore : NSObject
-
-+(id)defaultStore;
-
-+ (NSManagedObjectContext *)mainQueueContext;
-+ (NSManagedObjectContext *)privateQueueContext;
-
-+ (void)savePrivateQueueContext;
-+ (void)saveMainQueueContext;
-
-+ (NSManagedObjectID *)managedObjectIDFromString:(NSString *)managedObjectIDString;
-
-@end
-
-
-@interface NSManagedObject (Additions)
-
-+(instancetype)findFirstByAttribute:(NSString *)attribute withValue:(id)value inContext:(NSManagedObjectContext *)context;
-
-+(NSFetchRequest*)fetchRequest;
-
-+(instancetype)insert:(NSManagedObjectContext *)context;
-
-@end

Examples/Swift/Examples/Selectors/Helpers/Data/Store/CoreDataStore.m

@@ -1,227 +0,0 @@
-//
-//  CoreDataStore.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "CoreDataStore.h"
-
-static NSString *const TBCoreDataModelFileName = @"Model";
-
-@interface CoreDataStore ()
-
-@property (strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
-@property (strong, nonatomic) NSManagedObjectModel *managedObjectModel;
-
-@property (strong, nonatomic) NSManagedObjectContext *mainQueueContext;
-@property (strong, nonatomic) NSManagedObjectContext *privateQueueContext;
-
-@end
-
-@implementation CoreDataStore
-
-
-+ (instancetype)defaultStore {
-    static CoreDataStore *_defaultStore = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        _defaultStore = [[self alloc] init];
-    });
-    return _defaultStore;
-}
-
-#pragma mark - Singleton Access
-
-+ (NSManagedObjectContext *)mainQueueContext
-{
-    return [[self defaultStore] mainQueueContext];
-}
-
-+ (NSManagedObjectContext *)privateQueueContext
-{
-    return [[self defaultStore] privateQueueContext];
-}
-
-+(void)savePrivateQueueContext
-{
-    NSError * error;
-    [[self privateQueueContext] save:&error];
-    NSAssert(!error, [error localizedDescription]);
-}
-
-+ (void)saveMainQueueContext
-{
-    NSError * error;
-    [[self mainQueueContext] save:&error];
-    NSAssert(!error, [error localizedDescription]);
-}
-
-+ (NSManagedObjectID *)managedObjectIDFromString:(NSString *)managedObjectIDString
-{
-    return [[[self defaultStore] persistentStoreCoordinator] managedObjectIDForURIRepresentation:[NSURL URLWithString:managedObjectIDString]];
-}
-
-#pragma mark - Lifecycle
-
-- (id)init
-{
-    self = [super init];
-    if (self) {
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(contextDidSavePrivateQueueContext:)name:NSManagedObjectContextDidSaveNotification object:[self privateQueueContext]];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(contextDidSaveMainQueueContext:) name:NSManagedObjectContextDidSaveNotification object:[self mainQueueContext]];
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-#pragma mark - Notifications
-
-- (void)contextDidSavePrivateQueueContext:(NSNotification *)notification
-{
-    @synchronized(self) {
-        [self.mainQueueContext performBlock:^{
-            for(NSManagedObject *object in [[notification userInfo] objectForKey:NSUpdatedObjectsKey]) {
-                [[self.mainQueueContext objectWithID:[object objectID]] willAccessValueForKey:nil];
-            }
-            [self.mainQueueContext mergeChangesFromContextDidSaveNotification:notification];
-        }];
-    }
-}
-
-- (void)contextDidSaveMainQueueContext:(NSNotification *)notification
-{
-    @synchronized(self) {
-        [self.privateQueueContext performBlock:^{
-            [self.privateQueueContext mergeChangesFromContextDidSaveNotification:notification];
-        }];
-    }
-}
-
-#pragma mark - Getters
-
-- (NSManagedObjectContext *)mainQueueContext
-{
-    if (!_mainQueueContext) {
-        _mainQueueContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
-        _mainQueueContext.persistentStoreCoordinator = self.persistentStoreCoordinator;
-    }
-    
-    return _mainQueueContext;
-}
-
-- (NSManagedObjectContext *)privateQueueContext
-{
-    if (!_privateQueueContext) {
-        _privateQueueContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
-        _privateQueueContext.persistentStoreCoordinator = self.persistentStoreCoordinator;
-    }
-    
-    return _privateQueueContext;
-}
-
-#pragma mark - Stack Setup
-
-- (NSPersistentStoreCoordinator *)persistentStoreCoordinator
-{
-    if (!_persistentStoreCoordinator) {
-        _persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:self.managedObjectModel];
-        NSError *error = nil;
-        
-        if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:[self persistentStoreURL] options:[self persistentStoreOptions] error:&error]) {
-            NSLog(@"Error adding persistent store. %@, %@", error, error.userInfo);
-        }
-    }
-    
-    return _persistentStoreCoordinator;
-}
-
-- (NSManagedObjectModel *)managedObjectModel
-{
-    if (!_managedObjectModel) {
-        NSURL *modelURL = [[NSBundle mainBundle] URLForResource:TBCoreDataModelFileName withExtension:@"momd"];
-        _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
-    }
-    
-    return _managedObjectModel;
-}
-
-- (NSURL *)persistentStoreURL
-{
-    return [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"Model.sqlite"];
-}
-
-- (NSDictionary *)persistentStoreOptions
-{
-    return @{NSInferMappingModelAutomaticallyOption: @YES, NSMigratePersistentStoresAutomaticallyOption: @YES, NSSQLitePragmasOption: @{@"synchronous": @"OFF"}};
-}
-
-#pragma mark - Application's Documents directory
-
-// Returns the URL to the application's Documents directory.
-- (NSURL *)applicationDocumentsDirectory
-{
-    return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
-}
-
-
-
-
-@end
-
-
-@implementation NSManagedObject (Additions)
-
-
-+(instancetype)findFirstByAttribute:(NSString *)attribute withValue:(id)value inContext:(NSManagedObjectContext *)context
-{
-    NSString * predicateStr = [NSString stringWithFormat:@"%@ = %%@", attribute];
-    NSPredicate * searchByAttValue = [NSPredicate predicateWithFormat:predicateStr argumentArray:@[value]];
-    NSFetchRequest * fetchRequest = [self fetchRequest];
-    fetchRequest.predicate = searchByAttValue;
-    fetchRequest.fetchLimit = 1;
-    NSArray *result = [context executeFetchRequest:fetchRequest error:nil];
-    return [result lastObject];
-}
-
-+(NSFetchRequest*)fetchRequest
-{
-    return [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass(self)];
-}
-
-+(NSEntityDescription*)entityDescriptor:(NSManagedObjectContext *)context
-{
-    return [NSEntityDescription entityForName:NSStringFromClass(self) inManagedObjectContext:context];
-}
-
-+(instancetype)insert:(NSManagedObjectContext *)context
-{
-    return [[NSManagedObject alloc] initWithEntity:[self entityDescriptor:context] insertIntoManagedObjectContext:context];
-}
-
-@end
-
-
-

Examples/Swift/Examples/Selectors/Helpers/Data/User+Additions.h

@@ -1,41 +0,0 @@
-//
-//  User+Additions.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLForm.h"
-#import "User.h"
-
-@interface User (Additions) <XLFormOptionObject>
-
-+ (User *)createOrUpdateWithServiceResult:(NSDictionary *)data inContext:(NSManagedObjectContext *)context;
-
-+ (UIImage *)defaultProfileImage;
-
-+ (NSPredicate *)getPredicateBySearchInput:(NSString *)search;
-
-+ (NSFetchRequest *)getFetchRequest;
-
-+ (NSFetchRequest *)getFetchRequestBySearchInput:(NSString *)search;
-
-@end

Examples/Swift/Examples/Selectors/Helpers/Data/User+Additions.m

@@ -1,87 +0,0 @@
-//
-//  User+Additions.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-#import "CoreDataStore.h"
-#import "User+Additions.h"
-
-#define USER_ID                        @"id"
-#define USER_IMAGE_URL                 @"imageURL"
-#define USER_NAME                      @"name"
-
-
-@implementation User (Additions)
-
-+ (User *)createOrUpdateWithServiceResult:(NSDictionary *)data inContext:(NSManagedObjectContext *)context;
-{
-    User *user = [User findFirstByAttribute:@"userId" withValue:data[USER_ID] inContext:context];
-    if (!user)
-    {
-        user = [User insert:context];
-    }
-    user.userId = data[USER_ID];
-    user.userImageURL = data[USER_IMAGE_URL] ;
-    user.userName = data[USER_NAME];
-    return user;
-}
-
-+ (UIImage *)defaultProfileImage
-{
-    return [UIImage imageNamed:@"default-avatar"];
-}
-
-+ (NSPredicate *)getPredicateBySearchInput:(NSString *)search {
-
-    if (search && ![search isEqualToString:@""]) {
-        return [NSPredicate predicateWithFormat:@"userName CONTAINS[cd] %@" , search];
-    }
-    return nil;
-}
-
-+ (NSFetchRequest *)getFetchRequest {
-    return [User getFetchRequestBySearchInput:nil];
-}
-
-+ (NSFetchRequest *)getFetchRequestBySearchInput:(NSString *)search {
-    NSFetchRequest * fetchRequest = [User fetchRequest];
-    fetchRequest.predicate = [User getPredicateBySearchInput:search];
-    fetchRequest.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"userName" ascending:YES selector:@selector(caseInsensitiveCompare:)]];
-    return fetchRequest;
-}
-
-#pragma mark - XLFormOptionObject
-
--(NSString *)formDisplayText
-{
-    return self.userName;
-}
-
--(id)formValue
-{
-    return self.userId;
-}
-
-
-@end

Examples/Swift/Examples/Selectors/Helpers/Data/User.h

@@ -1,36 +0,0 @@
-//
-//  User.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-
-@interface User : NSManagedObject
-
-@property (nonatomic, retain) NSNumber * userId;
-@property (nonatomic, retain) NSString * userName;
-@property (nonatomic, retain) NSString * userImageURL;
-
-@end

Examples/Swift/Examples/Selectors/Helpers/Data/User.m

@@ -1,35 +0,0 @@
-//
-//  User.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "User.h"
-
-
-@implementation User
-
-@dynamic userId;
-@dynamic userName;
-@dynamic userImageURL;
-
-@end

Examples/Swift/Examples/Selectors/Helpers/DataLoaders/UserLocalDataLoader.h

@@ -1,30 +0,0 @@
-//
-//  UserLocalDataLoader.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLLocalDataLoader.h"
-
-@interface UserLocalDataLoader : XLLocalDataLoader
-
-@end

Examples/Swift/Examples/Selectors/Helpers/DataLoaders/UserLocalDataLoader.m

@@ -1,60 +0,0 @@
-//
-//  UserLocalDataLoader.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "UserLocalDataLoader.h"
-#import "User+Additions.h"
-#import "CoreDataStore.h"
-
-@implementation UserLocalDataLoader
-{
-    NSString *_searchString;
-}
-
-- (id)init {
-    self = [super init];
-    if (self) {
-        NSFetchedResultsController * fetchResultController = [[NSFetchedResultsController alloc] initWithFetchRequest:[User getFetchRequest]
-                                                                                                 managedObjectContext:[CoreDataStore mainQueueContext]
-                                                                                                   sectionNameKeyPath:nil
-                                                                                                            cacheName:nil];
-        [self setFetchedResultsController:fetchResultController];
-        
-    }
-    return self;
-}
-
--(void)changeSearchString:(NSString *)searchString
-{
-    _searchString = searchString;
-    [self refreshPredicate];
-}
-
-- (void)refreshPredicate
-{
-    [self setPredicate:[User getPredicateBySearchInput:_searchString]];
-    
-}
-
-@end

Examples/Swift/Examples/Selectors/Helpers/DataLoaders/UserRemoteDataLoader.h

@@ -1,30 +0,0 @@
-//
-//  UserRemoteDataLoader.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLRemoteDataLoader.h"
-
-@interface UserRemoteDataLoader : XLRemoteDataLoader
-
-@end

Examples/Swift/Examples/Selectors/Helpers/DataLoaders/UserRemoteDataLoader.m

@@ -1,107 +0,0 @@
-//
-//  UserRemoteDataLoader.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-
-#import "UserRemoteDataLoader.h"
-#import "HTTPSessionManager.h"
-#import "CoreDataStore.h"
-#import "User+Additions.h"
-
-@implementation UserRemoteDataLoader
-
--(NSString *)URLString
-{
-    return @"/mobile/users.json";
-}
-
--(NSDictionary *)parameters
-{
-    NSString *filterParam = self.searchString ?: @"";
-    return @{@"filter" : filterParam,
-             @"offset" : @(self.offset),
-             @"limit"  : @(self.limit)};
-}
-
--(AFHTTPSessionManager *)sessionManager
-{
-    return [HTTPSessionManager sharedClient];
-}
-
--(void)successulDataLoad {
-    // change flags
-    // [self fetchedData] contains the data coming from the server
-    NSArray * itemsArray = [[self fetchedData] objectForKey:kXLRemoteDataLoaderDefaultKeyForNonDictionaryResponse];
-
-    // This flag indicates if there is more data to load
-    _hasMoreToLoad = !((itemsArray.count == 0) || (itemsArray.count < _limit && itemsArray.count != 0));
-    [[CoreDataStore privateQueueContext] performBlock:^{
-        for (NSDictionary *item in itemsArray) {
-            // Creates or updates the User and the user who created it with the data that came from the server
-            [User createOrUpdateWithServiceResult:item[@"user"] inContext:[CoreDataStore privateQueueContext]];
-        }
-        [self removeOutdatedData:itemsArray inContext:[CoreDataStore privateQueueContext]];
-        [CoreDataStore savePrivateQueueContext];
-    }];
-    [super successulDataLoad];
-}
-
-
-#pragma mark - Auxiliary Functions
-
-- (void)removeOutdatedData:(NSArray *)data inContext:(NSManagedObjectContext *)context
-{
-    // First, remove older data
-    NSFetchRequest * fetchRequest = [User getFetchRequestBySearchInput:self.searchString];
-
-    fetchRequest.fetchLimit = self.limit;
-    fetchRequest.fetchOffset = self.offset;
-    
-    NSError *error;
-    NSArray * oldObjects = [context executeFetchRequest:fetchRequest error:&error];
-    
-    NSArray * arrayToIterate = [oldObjects copy];
-    
-    if (error) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:@"Error"
-                                                                message:error.localizedFailureReason ?: error.localizedDescription
-                                                               delegate:nil
-                                                      cancelButtonTitle:NSLocalizedString(@"OK", nil) otherButtonTitles:nil, nil];
-            [alertView show];
-        });
-        return;
-    }
-    
-    for (User *user in arrayToIterate)
-    {
-        NSArray *filteredArray = [data filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"user.id == %@" argumentArray:@[user.userId]]];
-        if (filteredArray.count == 0) {
-            // This User no longer exists
-            [context deleteObject:user];
-        }
-    }
-}
-
-@end

Examples/Swift/Examples/Selectors/Helpers/HTTPSessionManager.h

@@ -1,32 +0,0 @@
-//
-//  HTTPSessionManager.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "AFHTTPSessionManager.h"
-
-@interface HTTPSessionManager : AFHTTPSessionManager
-
-+ (HTTPSessionManager *)sharedClient;
-
-@end

Examples/Swift/Examples/Selectors/Helpers/HTTPSessionManager.m

@@ -1,45 +0,0 @@
-//
-//  HTTPSessionManager.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "HTTPSessionManager.h"
-
-@implementation HTTPSessionManager
-
-// Server Base URL
-static NSString * const APIBaseURLString = @"http://obscure-refuge-3149.herokuapp.com";
-
-+ (instancetype)sharedClient {
-    static HTTPSessionManager *_sharedClient = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        _sharedClient = [[HTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:APIBaseURLString]];
-        [_sharedClient.reachabilityManager startMonitoring];
-        _sharedClient.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
-    });
-    
-    return _sharedClient;
-}
-
-@end

Examples/Swift/Examples/Selectors/SelectorsFormViewController.swift

@@ -1,415 +0,0 @@
-//
-//  SelectorsFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import <MapKit/MapKit.h>
-#import "CLLocationValueTrasformer.h"
-#import "MapViewController.h"
-#import "CustomSelectorsFormViewController.h"
-#import "DynamicSelectorsFormViewController.h"
-#import "SelectorsFormViewController.h"
-
-NSString *const kSelectorPush = @"selectorPush";
-NSString *const kSelectorPopover = @"selectorPopover";
-NSString *const kSelectorActionSheet = @"selectorActionSheet";
-NSString *const kSelectorAlertView = @"selectorAlertView";
-NSString *const kSelectorLeftRight = @"selectorLeftRight";
-NSString *const kSelectorPushDisabled = @"selectorPushDisabled";
-NSString *const kSelectorActionSheetDisabled = @"selectorActionSheetDisabled";
-NSString *const kSelectorLeftRightDisabled = @"selectorLeftRightDisabled";
-NSString *const kSelectorPickerView = @"selectorPickerView";
-NSString *const kSelectorPickerViewInline = @"selectorPickerViewInline";
-NSString *const kMultipleSelector = @"multipleSelector";
-NSString *const kMultipleSelectorPopover = @"multipleSelectorPopover";
-NSString *const kDynamicSelectors = @"dynamicSelectors";
-NSString *const kCustomSelectors = @"customSelectors";
-NSString *const kPickerView = @"pickerView";
-NSString *const kSelectorWithSegueId = @"selectorWithSegueId";
-NSString *const kSelectorWithSegueClass = @"selectorWithSegueClass";
-NSString *const kSelectorWithNibName = @"selectorWithNibName";
-NSString *const kSelectorWithStoryboardId = @"selectorWithStoryboardId";
-
-#pragma mark - NSValueTransformer
-
-@interface NSArrayValueTrasformer : NSValueTransformer
-@end
-
-@implementation NSArrayValueTrasformer
-
-+ (Class)transformedValueClass
-{
-    return [NSString class];
-}
-
-+ (BOOL)allowsReverseTransformation
-{
-    return NO;
-}
-
-- (id)transformedValue:(id)value
-{
-    if (!value) return nil;
-    if ([value isKindOfClass:[NSArray class]]){
-        NSArray * array = (NSArray *)value;
-        return [NSString stringWithFormat:@"%@ Item%@", @(array.count), array.count > 1 ? @"s" : @""];
-    }
-    if ([value isKindOfClass:[NSString class]])
-    {
-        return [NSString stringWithFormat:@"%@ - ;) - Transformed", value];
-    }
-    return nil;
-}
-
-@end
-
-
-@interface ISOLanguageCodesValueTranformer : NSValueTransformer
-@end
-
-@implementation ISOLanguageCodesValueTranformer
-
-+ (Class)transformedValueClass
-{
-    return [NSString class];
-}
-
-+ (BOOL)allowsReverseTransformation
-{
-    return NO;
-}
-
-- (id)transformedValue:(id)value
-{
-    if (!value) return nil;
-    if ([value isKindOfClass:[NSString class]]){
-        return [[NSLocale currentLocale] displayNameForKey:NSLocaleLanguageCode value:value];
-    }
-    return nil;
-}
-
-@end
-
-
-#pragma mark - SelectorsFormViewController
-
-@implementation SelectorsFormViewController
-
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
-- (void)initializeForm
-{
-    XLFormDescriptor * form = [XLFormDescriptor formDescriptorWithTitle:@"Selectors"];
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    // Basic Information
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Selectors"];
-    section.footerTitle = @"SelectorsFormViewController.h";
-    [form addFormSection:section];
-    
-    
-    // Selector Push
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorPush rowType:XLFormRowDescriptorTypeSelectorPush title:@"Push"];
-    row.selectorOptions = @[[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Option 1"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Option 4"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(4) displayText:@"Option 5"]
-                            ];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"];
-    [section addFormRow:row];
-    
-    // Selector Popover
-    if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad){
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorPopover rowType:XLFormRowDescriptorTypeSelectorPopover title:@"PopOver"];
-        row.selectorOptions = @[@"Option 1", @"Option 2", @"Option 3", @"Option 4", @"Option 5", @"Option 6"];
-        row.value = @"Option 2";
-        [section addFormRow:row];
-    }
-    
-    // Selector Action Sheet
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorActionSheet rowType:XLFormRowDescriptorTypeSelectorActionSheet title:@"Sheet"];
-    row.selectorOptions = @[[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Option 1"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Option 4"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(4) displayText:@"Option 5"]
-                            ];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"];
-    [section addFormRow:row];
-    
-    
-    
-    
-    // Selector Alert View
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorAlertView rowType:XLFormRowDescriptorTypeSelectorAlertView title:@"Alert View"];
-    row.selectorOptions = @[[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Option 1"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Option 4"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(4) displayText:@"Option 5"]
-                            ];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"];
-    [section addFormRow:row];
-    
-    
-    
-    // Selector Left Right
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorLeftRight rowType:XLFormRowDescriptorTypeSelectorLeftRight title:@"Left Right"];
-    row.leftRightSelectorLeftOptionSelected = [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"];
-    
-    NSArray * rightOptions =  @[[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Right Option 1"],
-                                [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Right Option 2"],
-                                [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Right Option 3"],
-                                [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Right Option 4"],
-                                [XLFormOptionsObject formOptionsObjectWithValue:@(4) displayText:@"Right Option 5"]
-                                ];
-    
-    // create right selectors
-    NSMutableArray * leftRightSelectorOptions = [[NSMutableArray alloc] init];
-    NSMutableArray * mutableRightOptions = [rightOptions mutableCopy];
-    [mutableRightOptions removeObjectAtIndex:0];
-    XLFormLeftRightSelectorOption * leftRightSelectorOption = [XLFormLeftRightSelectorOption formLeftRightSelectorOptionWithLeftValue:[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Option 1"] httpParameterKey:@"option_1" rightOptions:mutableRightOptions];
-    [leftRightSelectorOptions addObject:leftRightSelectorOption];
-    
-    mutableRightOptions = [rightOptions mutableCopy];
-    [mutableRightOptions removeObjectAtIndex:1];
-    leftRightSelectorOption = [XLFormLeftRightSelectorOption formLeftRightSelectorOptionWithLeftValue:[XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"] httpParameterKey:@"option_2" rightOptions:mutableRightOptions];
-    [leftRightSelectorOptions addObject:leftRightSelectorOption];
-    
-    mutableRightOptions = [rightOptions mutableCopy];
-    [mutableRightOptions removeObjectAtIndex:2];
-    leftRightSelectorOption = [XLFormLeftRightSelectorOption formLeftRightSelectorOptionWithLeftValue:[XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"]  httpParameterKey:@"option_3" rightOptions:mutableRightOptions];
-    [leftRightSelectorOptions addObject:leftRightSelectorOption];
-    
-    mutableRightOptions = [rightOptions mutableCopy];
-    [mutableRightOptions removeObjectAtIndex:3];
-    leftRightSelectorOption = [XLFormLeftRightSelectorOption formLeftRightSelectorOptionWithLeftValue:[XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Option 4"] httpParameterKey:@"option_4" rightOptions:mutableRightOptions];
-    [leftRightSelectorOptions addObject:leftRightSelectorOption];
-    
-    mutableRightOptions = [rightOptions mutableCopy];
-    [mutableRightOptions removeObjectAtIndex:4];
-    leftRightSelectorOption = [XLFormLeftRightSelectorOption formLeftRightSelectorOptionWithLeftValue:[XLFormOptionsObject formOptionsObjectWithValue:@(4) displayText:@"Option 5"] httpParameterKey:@"option_5" rightOptions:mutableRightOptions];
-    [leftRightSelectorOptions addObject:leftRightSelectorOption];
-    
-    row.selectorOptions  = leftRightSelectorOptions;
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Right Option 4"];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorPickerView rowType:XLFormRowDescriptorTypeSelectorPickerView title:@"Picker View"];
-    row.selectorOptions = @[[XLFormOptionsObject formOptionsObjectWithValue:@(0) displayText:@"Option 1"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Option 4"],
-                            [XLFormOptionsObject formOptionsObjectWithValue:@(4) displayText:@"Option 5"]
-                            ];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Option 4"];
-    [section addFormRow:row];
-    
-    
-    
-    // --------- Fixed Controls
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Fixed Controls"];
-    [form addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kPickerView rowType:XLFormRowDescriptorTypePicker];
-    row.selectorOptions = @[@"Option 1", @"Option 2", @"Option 3", @"Option 4", @"Option 5", @"Option 6"];
-    row.value = @"Option 1";
-    [section addFormRow:row];
-    
-    
-    
-    // --------- Inline Selectors
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Inline Selectors"];
-    [form addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultipleSelector rowType:XLFormRowDescriptorTypeSelectorPickerViewInline title:@"Inline Picker View"];
-    row.selectorOptions = @[@"Option 1", @"Option 2", @"Option 3", @"Option 4", @"Option 5", @"Option 6"];
-    row.value = @"Option 6";
-    [section addFormRow:row];
-    
-    // --------- MultipleSelector
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Multiple Selectors"];
-    [form addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultipleSelector rowType:XLFormRowDescriptorTypeMultipleSelector title:@"Multiple Selector"];
-    row.selectorOptions = @[@"Option 1", @"Option 2", @"Option 3", @"Option 4", @"Option 5", @"Option 6"];
-    row.value = @[@"Option 1", @"Option 3", @"Option 4", @"Option 5", @"Option 6"];
-    [section addFormRow:row];
-    
-    
-    // Multiple selector with value tranformer
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultipleSelector rowType:XLFormRowDescriptorTypeMultipleSelector title:@"Multiple Selector"];
-    row.selectorOptions = @[@"Option 1", @"Option 2", @"Option 3", @"Option 4", @"Option 5", @"Option 6"];
-    row.value = @[@"Option 1", @"Option 3", @"Option 4", @"Option 5", @"Option 6"];
-    row.valueTransformer = [NSArrayValueTrasformer class];
-    [section addFormRow:row];
-    
-    
-    // Language multiple selector
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultipleSelector rowType:XLFormRowDescriptorTypeMultipleSelector title:@"Multiple Selector"];
-    row.selectorOptions = [NSLocale ISOLanguageCodes];
-    row.selectorTitle = @"Languages";
-    row.valueTransformer = [ISOLanguageCodesValueTranformer class];
-    row.value = [NSLocale preferredLanguages];
-    [section addFormRow:row];
-    
-    if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad){
-        // Language multiple selector popover
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:kMultipleSelectorPopover rowType:XLFormRowDescriptorTypeMultipleSelectorPopover title:@"Multiple Selector PopOver"];
-        row.selectorOptions = [NSLocale ISOLanguageCodes];
-        row.valueTransformer = [ISOLanguageCodesValueTranformer class];
-        row.value = [NSLocale preferredLanguages];
-        [section addFormRow:row];
-    }
-    
-    
-    // --------- Dynamic Selectors
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Dynamic Selectors"];
-    [form addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kDynamicSelectors rowType:XLFormRowDescriptorTypeButton title:@"Dynamic Selectors"];
-    row.action.viewControllerClass = [DynamicSelectorsFormViewController class];
-    [section addFormRow:row];
-    
-    // --------- Custom Selectors
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Custom Selectors"];
-    [form addFormSection:section];
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomSelectors rowType:XLFormRowDescriptorTypeButton title:@"Custom Selectors"];
-    row.action.viewControllerClass = [CustomSelectorsFormViewController class];
-    [section addFormRow:row];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Disabled & Required Selectors"];
-    [form addFormSection:section];
-    
-    
-    
-    // Disabled Selector Push
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorPushDisabled rowType:XLFormRowDescriptorTypeSelectorPush title:@"Push"];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"];
-    row.disabled = @YES;
-    [section addFormRow:row];
-    
-    
-    
-    // --------- Disabled Selector Action Sheet
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorActionSheetDisabled rowType:XLFormRowDescriptorTypeSelectorActionSheet title:@"Sheet"];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(2) displayText:@"Option 3"];
-    row.disabled = @YES;
-    [section addFormRow:row];
-    
-    // --------- Disabled Selector Left Right
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorLeftRightDisabled rowType:XLFormRowDescriptorTypeSelectorLeftRight title:@"Left Right"];
-    row.leftRightSelectorLeftOptionSelected = [XLFormOptionsObject formOptionsObjectWithValue:@(1) displayText:@"Option 2"];
-    row.value = [XLFormOptionsObject formOptionsObjectWithValue:@(3) displayText:@"Right Option 4"];
-    row.disabled = @YES;
-    [section addFormRow:row];
-    
-    
-    // --------- Selector definition types
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Selectors"];
-    [form addFormSection:section];
-    
-    // selector with segue class
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorWithSegueClass rowType:XLFormRowDescriptorTypeSelectorPush title:@"Selector with Segue Class"];
-    row.action.formSegueClass = NSClassFromString(@"UIStoryboardPushSegue");
-    row.action.viewControllerClass = [MapViewController class];
-    row.valueTransformer = [CLLocationValueTrasformer class];
-    row.value = [[CLLocation alloc] initWithLatitude:-33 longitude:-56];
-    [section addFormRow:row];
-    
-    // selector with SegueId
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorWithSegueClass rowType:XLFormRowDescriptorTypeSelectorPush title:@"Selector with Segue Idenfifier"];
-    row.action.formSegueIdenfifier = @"MapViewControllerSegue";
-    row.valueTransformer = [CLLocationValueTrasformer class];
-    row.value = [[CLLocation alloc] initWithLatitude:-33 longitude:-56];
-    [section addFormRow:row];
-    
-    // selector using StoryboardId
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorWithStoryboardId rowType:XLFormRowDescriptorTypeSelectorPush title:@"Selector with StoryboardId"];
-    row.action.viewControllerStoryboardId = @"MapViewController";
-    row.valueTransformer = [CLLocationValueTrasformer class];
-    row.value = [[CLLocation alloc] initWithLatitude:-33 longitude:-56];
-    [section addFormRow:row];
-    
-    // selector with NibName
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorWithNibName rowType:XLFormRowDescriptorTypeSelectorPush title:@"Selector with NibName"];
-    row.action.viewControllerNibName = @"MapViewController";
-    row.valueTransformer = [CLLocationValueTrasformer class];
-    row.value = [[CLLocation alloc] initWithLatitude:-33 longitude:-56];
-    [section addFormRow:row];
-    
-    
-    
-    self.form = form;
-}
-
-
--(UIStoryboard *)storyboardForRow:(XLFormRowDescriptor *)formRow
-{
-    return [UIStoryboard storyboardWithName:@"iPhoneStoryboard" bundle:nil];
-}
-
-
--(void)viewDidLoad
-{
-    [super viewDidLoad];
-    UIBarButtonItem * barButton = [[UIBarButtonItem alloc] initWithTitle:@"Disable" style:UIBarButtonItemStylePlain
-                                                                  target:self
-                                                                  action:@selector(disableEnable:)];
-    barButton.possibleTitles = [NSSet setWithObjects:@"Disable", @"Enable", nil];
-    self.navigationItem.rightBarButtonItem = barButton;
-}
-
--(void)disableEnable:(UIBarButtonItem *)button
-{
-    self.form.disabled = !self.form.disabled;
-    [button setTitle:(self.form.disabled ? @"Enable" : @"Disable")];
-    [self.tableView endEditing:YES];
-    [self.tableView reloadData];
-}
-
-
-
-@end

Examples/Swift/Examples/StoryboardExample/iPhoneStoryboard.storyboard

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="p4n-1v-pzo">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
-    </dependencies>
-    <scenes>
-        <!--Navigation Controller-->
-        <scene sceneID="hSO-iI-kK3">
-            <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="p4n-1v-pzo" sceneMemberID="viewController">
-                    <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="SNt-hk-N3V">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <nil name="viewControllers"/>
-                    <connections>
-                        <segue destination="cUg-F9-RF7" kind="relationship" relationship="rootViewController" id="Dli-gX-3ei"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="jqF-cF-u4f" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="117" y="56"/>
-        </scene>
-        <!--Others Form View Controller-->
-        <scene sceneID="dyJ-7m-RaD">
-            <objects>
-                <viewController storyboardIdentifier="OthersFormViewController" id="oQO-1z-ESS" customClass="OthersFormViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="oOp-1u-3hE"/>
-                        <viewControllerLayoutGuide type="bottom" id="HPb-Nx-E1G"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="wpr-wE-9nj">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="Hf0-cB-ORN"/>
-                    <connections>
-                        <segue destination="WMh-VN-FWi" kind="push" identifier="MapViewControllerSegue" id="wAD-tS-AFZ"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="7YZ-ZR-X81" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1533" y="-233"/>
-        </scene>
-        <!--Native Event Form View Controller-->
-        <scene sceneID="EjT-rm-U3h">
-            <objects>
-                <viewController id="vx5-lN-WwK" customClass="NativeEventFormViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Fbw-im-bwR"/>
-                        <viewControllerLayoutGuide type="bottom" id="QuR-kY-o5R"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="tun-QW-CGC">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="JY7-WL-SnH">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                            </tableView>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="JY7-WL-SnH" firstAttribute="leading" secondItem="tun-QW-CGC" secondAttribute="leading" id="bSe-SV-rx6"/>
-                            <constraint firstAttribute="trailing" secondItem="JY7-WL-SnH" secondAttribute="trailing" id="jLI-68-pSq"/>
-                            <constraint firstItem="QuR-kY-o5R" firstAttribute="top" secondItem="JY7-WL-SnH" secondAttribute="bottom" id="lUW-qG-LqV"/>
-                            <constraint firstItem="JY7-WL-SnH" firstAttribute="top" secondItem="tun-QW-CGC" secondAttribute="top" id="tu2-ah-L2P"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" id="Xti-ay-J1u"/>
-                    <connections>
-                        <outlet property="tableView" destination="JY7-WL-SnH" id="kPy-NX-IyW"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="zV0-mq-irv" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1120" y="-635"/>
-        </scene>
-        <!--Examples-->
-        <scene sceneID="wf7-ha-lXx">
-            <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" id="cUg-F9-RF7" customClass="ExamplesFormViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="kOR-67-djF"/>
-                        <viewControllerLayoutGuide type="bottom" id="0bE-2H-tqE"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="PO9-pF-A7O">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="Lxj-Sb-kC6">
-                                <rect key="frame" x="0.0" y="64" width="320" height="504"/>
-                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                            </tableView>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="Lxj-Sb-kC6" firstAttribute="top" secondItem="kOR-67-djF" secondAttribute="bottom" id="PT1-Xo-3Ql"/>
-                            <constraint firstAttribute="trailing" secondItem="Lxj-Sb-kC6" secondAttribute="trailing" id="brq-yF-WM8"/>
-                            <constraint firstItem="Lxj-Sb-kC6" firstAttribute="leading" secondItem="PO9-pF-A7O" secondAttribute="leading" id="d73-kq-kX4"/>
-                            <constraint firstItem="0bE-2H-tqE" firstAttribute="top" secondItem="Lxj-Sb-kC6" secondAttribute="bottom" id="ltM-g9-Dgm"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" title="Examples" id="sEr-D1-cU5"/>
-                    <connections>
-                        <outlet property="tableView" destination="Lxj-Sb-kC6" id="IS5-OZ-KBo"/>
-                        <segue destination="oQO-1z-ESS" kind="push" identifier="OthersFormViewControllerSegue" id="ulP-FP-rk3"/>
-                        <segue destination="G68-Ra-1fb" kind="push" identifier="SelectorsFormViewControllerSegue" id="vhA-cV-A02"/>
-                        <segue destination="K9D-4c-9eZ" kind="modal" identifier="NativeEventNavigationViewControllerSegue" id="Iie-Js-Izx"/>
-                        <segue destination="Kiw-nF-jv7" kind="push" identifier="ValidationExamplesFormViewControllerSegue" id="VKe-Ir-Fiu"/>
-                        <segue destination="OG6-Tc-1SC" kind="push" identifier="PredicateFormViewControllerSegue" id="Wwg-e9-gLq"/>
-                        <segue destination="pO0-sS-Tes" kind="push" identifier="BlogExampleViewSegue" id="a28-Gm-Iku"/>
-                        <segue destination="JL7-uU-kWK" kind="push" identifier="BasicPredicateViewControllerSegue" id="SGg-Ve-bng"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="1V5-DZ-WfF" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="527" y="56"/>
-        </scene>
-        <!--Blog Example View Controller-->
-        <scene sceneID="Vn0-9y-5bc">
-            <objects>
-                <viewController id="pO0-sS-Tes" customClass="BlogExampleViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="gjZ-Jv-Awa"/>
-                        <viewControllerLayoutGuide type="bottom" id="scM-da-Sg0"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="hrV-fb-58s">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="RJB-cz-SnF"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Fvo-wr-5Ca" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="167" y="1151"/>
-        </scene>
-        <!--Validation Examples-->
-        <scene sceneID="z2I-Nk-y9W">
-            <objects>
-                <viewController id="Kiw-nF-jv7" customClass="ValidationExamplesFormViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="AG9-N9-2qp"/>
-                        <viewControllerLayoutGuide type="bottom" id="xtJ-Wo-mhU"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="1Ol-Ra-Ysg">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="Fty-3j-BeF">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                            </tableView>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="xtJ-Wo-mhU" firstAttribute="top" secondItem="Fty-3j-BeF" secondAttribute="bottom" id="CbV-4f-RzP"/>
-                            <constraint firstItem="Fty-3j-BeF" firstAttribute="top" secondItem="AG9-N9-2qp" secondAttribute="bottom" constant="-64" id="Pdw-VG-qcc"/>
-                            <constraint firstAttribute="trailing" secondItem="Fty-3j-BeF" secondAttribute="trailing" id="nPd-m1-CWF"/>
-                            <constraint firstItem="Fty-3j-BeF" firstAttribute="leading" secondItem="1Ol-Ra-Ysg" secondAttribute="leading" id="qUB-l2-4IG"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" title="Validation Examples" id="apf-4a-VpV">
-                        <barButtonItem key="rightBarButtonItem" title="Validate" id="Thm-OY-hsk"/>
-                    </navigationItem>
-                    <connections>
-                        <outlet property="tableView" destination="Fty-3j-BeF" id="Rck-sk-OHi"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="VFT-Og-STO" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="566" y="938"/>
-        </scene>
-        <!--Predicate Form View Controller-->
-        <scene sceneID="a9p-C8-g8y">
-            <objects>
-                <viewController id="OG6-Tc-1SC" customClass="PredicateFormViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="2YH-dK-JXQ"/>
-                        <viewControllerLayoutGuide type="bottom" id="Lsg-dH-McH"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="6EZ-O7-FjX">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="Lsd-xH-7IN"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="rZL-10-YZn" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="956" y="924"/>
-        </scene>
-        <!--Selectors Form View Controller-->
-        <scene sceneID="KYK-TX-8rm">
-            <objects>
-                <viewController id="G68-Ra-1fb" customClass="SelectorsFormViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Z21-Qr-DQ8"/>
-                        <viewControllerLayoutGuide type="bottom" id="CTu-Y5-7Qw"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="bNj-SD-83w">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="Buo-Af-6Q1"/>
-                    <connections>
-                        <segue destination="WMh-VN-FWi" kind="push" identifier="MapViewControllerSegue" id="Mtw-x2-E0b"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="8fu-YK-6qz" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1346" y="533"/>
-        </scene>
-        <!--Map View Controller-->
-        <scene sceneID="tAS-lK-35t">
-            <objects>
-                <viewController storyboardIdentifier="MapViewController" id="WMh-VN-FWi" customClass="MapViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="9jO-04-Lp1"/>
-                        <viewControllerLayoutGuide type="bottom" id="cgQ-Vs-ICN"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="JjC-E5-SyY">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="BjG-Bq-0lD"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="LmS-YR-mFY" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1789" y="533"/>
-        </scene>
-        <!--Native Event Navigation View Controller-->
-        <scene sceneID="mNb-be-ApA">
-            <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="K9D-4c-9eZ" customClass="NativeEventNavigationViewController" sceneMemberID="viewController">
-                    <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="fO3-V7-XXu">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <nil name="viewControllers"/>
-                    <connections>
-                        <segue destination="vx5-lN-WwK" kind="relationship" relationship="rootViewController" id="gie-et-cUW"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="eqB-vl-BzH" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="588" y="-635"/>
-        </scene>
-        <!--Basic Predicate View Controller-->
-        <scene sceneID="pD4-sm-x3a">
-            <objects>
-                <viewController id="JL7-uU-kWK" customClass="BasicPredicateViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="OQP-pW-kNp"/>
-                        <viewControllerLayoutGuide type="bottom" id="2b4-gN-85p"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="NZg-t1-g19">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="1lh-jZ-lIV"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Tlw-q2-pcu" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-159" y="1151"/>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-    <inferredMetricsTieBreakers>
-        <segue reference="wAD-tS-AFZ"/>
-    </inferredMetricsTieBreakers>
-</document>

Examples/Swift/Examples/UICustomization/UICustomizationFormViewController.swift

@@ -1,90 +0,0 @@
-//
-//  UICustomizationFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLForm.h"
-#import "UICustomizationFormViewController.h"
-
-@implementation UICustomizationFormViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-        
-        XLFormDescriptor * form = [XLFormDescriptor formDescriptorWithTitle:@"UI Customization"];
-        XLFormSectionDescriptor * section;
-        XLFormRowDescriptor * row;
-        
-        
-        // Section
-        section = [XLFormSectionDescriptor formSection];
-        [form addFormSection:section];
-        
-        // Name
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:@"Name" rowType:XLFormRowDescriptorTypeText title:@"Name"];
-        // change the background color
-        [row.cellConfigAtConfigure setObject:[UIColor greenColor] forKey:@"backgroundColor"];
-        // font
-        [row.cellConfig setObject:[UIFont fontWithName:@"Helvetica" size:30] forKey:@"textLabel.font"];
-        // background color
-        [row.cellConfig setObject:[UIColor grayColor] forKey:@"textField.backgroundColor"];
-        // font
-        [row.cellConfig setObject:[UIFont fontWithName:@"Helvetica" size:25] forKey:@"textField.font"];
-        // alignment
-        [row.cellConfig setObject:@(NSTextAlignmentRight) forKey:@"textField.textAlignment"];
-        [section addFormRow:row];
-        
-        
-        // Section
-        section = [XLFormSectionDescriptor formSection];
-        [form addFormSection:section];
-        
-        //Button
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:@"Button" rowType:XLFormRowDescriptorTypeButton title:@"Button"];
-        [row.cellConfigAtConfigure setObject:[UIColor purpleColor] forKey:@"backgroundColor"];
-        [row.cellConfig setObject:[UIColor whiteColor] forKey:@"textLabel.color"];
-        [row.cellConfig setObject:[UIFont fontWithName:@"Helvetica" size:40] forKey:@"textLabel.font"];
-        [section addFormRow:row];
-        
-        self.form = form;
-    }
-    return self;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    // change cell height of a particular cell
-    if ([[self.form formRowAtIndex:indexPath].tag isEqualToString:@"Name"]){
-        return 60.0;
-    }
-    else if ([[self.form formRowAtIndex:indexPath].tag isEqualToString:@"Button"]){
-        return 100.0;
-    }
-    return [super tableView:tableView heightForRowAtIndexPath:indexPath];
-}
-
-@end

Examples/Swift/Examples/Validations/ValidationExamplesFormViewController.swift

@@ -1,164 +0,0 @@
-//
-//  ValidationExamplesFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLForm.h"
-#import "ValidationExamplesFormViewController.h"
-
-@interface ValidationExamplesFormViewController ()
-
-@end
-
-@implementation ValidationExamplesFormViewController
-
-NSString * const kValidationName = @"kName";
-NSString * const kValidationEmail = @"kEmail";
-NSString * const kValidationPassword = @"kPassword";
-NSString * const kValidationInteger = @"kInteger";
-
-
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
-
--(void)initializeForm
-{
-    XLFormDescriptor * formDescriptor = [XLFormDescriptor formDescriptorWithTitle:@"Text Fields"];
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    // Name Section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Validation Required"];
-    [formDescriptor addFormSection:section];
-    
-    // Name
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kValidationName rowType:XLFormRowDescriptorTypeText title:@"Name"];
-    [row.cellConfigAtConfigure setObject:@"Required..." forKey:@"textField.placeholder"];
-    [row.cellConfigAtConfigure setObject:@(NSTextAlignmentRight) forKey:@"textField.textAlignment"];
-    row.required = YES;
-    row.value = @"Martin";
-    [section addFormRow:row];
-    
-    // Email Section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Validation Email"];
-    [formDescriptor addFormSection:section];
-
-    // Email
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kValidationEmail rowType:XLFormRowDescriptorTypeText title:@"Email"];
-    [row.cellConfigAtConfigure setObject:@(NSTextAlignmentRight) forKey:@"textField.textAlignment"];
-    row.required = NO;
-    row.value = @"not valid email";
-    [row addValidator:[XLFormValidator emailValidator]];
-    [section addFormRow:row];
-    
-    // password Section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Validation Password"];
-    section.footerTitle = @"between 6 and 32 charachers, 1 alphanumeric and 1 numeric";
-    [formDescriptor addFormSection:section];
-    
-    // Password
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kValidationPassword rowType:XLFormRowDescriptorTypePassword title:@"Password"];
-    [row.cellConfigAtConfigure setObject:@"Required..." forKey:@"textField.placeholder"];
-    [row.cellConfigAtConfigure setObject:@(NSTextAlignmentRight) forKey:@"textField.textAlignment"];
-    row.required = YES;
-    [row addValidator:[XLFormRegexValidator formRegexValidatorWithMsg:@"At least 6, max 32 characters" regex:@"^(?=.*\\d)(?=.*[A-Za-z]).{6,32}$"]];
-    [section addFormRow:row];
-    
-    // number Section
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Validation Numbers"];
-    section.footerTitle = @"greater than 50 and less than 100";
-    [formDescriptor addFormSection:section];
-    
-    // Integer
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kValidationInteger rowType:XLFormRowDescriptorTypeInteger title:@"Integer"];
-    [row.cellConfigAtConfigure setObject:@"Required..." forKey:@"textField.placeholder"];
-    [row.cellConfigAtConfigure setObject:@(NSTextAlignmentRight) forKey:@"textField.textAlignment"];
-    row.required = YES;
-    [row addValidator:[XLFormRegexValidator formRegexValidatorWithMsg:@"greater than 50 and less than 100" regex:@"^([5-9][0-9]|100)$"]];
-    [section addFormRow:row];
-    
-    self.form = formDescriptor;
-}
-
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    [self.navigationItem.rightBarButtonItem setTarget:self];
-    [self.navigationItem.rightBarButtonItem setAction:@selector(validateForm:)];
-}
-
-#pragma mark - actions
-
--(void)validateForm:(UIBarButtonItem *)buttonItem
-{
-    NSArray * array = [self formValidationErrors];
-    [array enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        XLFormValidationStatus * validationStatus = [[obj userInfo] objectForKey:XLValidationStatusErrorKey];
-        if ([validationStatus.rowDescriptor.tag isEqualToString:kValidationName]){
-            UITableViewCell * cell = [self.tableView cellForRowAtIndexPath:[self.form indexPathOfFormRow:validationStatus.rowDescriptor]];
-            cell.backgroundColor = [UIColor orangeColor];
-            [UIView animateWithDuration:0.3 animations:^{
-                cell.backgroundColor = [UIColor whiteColor];
-            }];
-        }
-        else if ([validationStatus.rowDescriptor.tag isEqualToString:kValidationEmail]){
-            UITableViewCell * cell = [self.tableView cellForRowAtIndexPath:[self.form indexPathOfFormRow:validationStatus.rowDescriptor]];
-            [self animateCell:cell];
-        }
-        else if ([validationStatus.rowDescriptor.tag isEqualToString:kValidationPassword]){
-            UITableViewCell * cell = [self.tableView cellForRowAtIndexPath:[self.form indexPathOfFormRow:validationStatus.rowDescriptor]];
-            [self animateCell:cell];
-        }
-        else if ([validationStatus.rowDescriptor.tag isEqualToString:kValidationInteger]){
-            UITableViewCell * cell = [self.tableView cellForRowAtIndexPath:[self.form indexPathOfFormRow:validationStatus.rowDescriptor]];
-            [self animateCell:cell];
-        }
-    }];
-}
-
-
-#pragma mark - Helper
-
--(void)animateCell:(UITableViewCell *)cell
-{
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animation];
-    animation.keyPath = @"position.x";
-    animation.values =  @[ @0, @20, @-20, @10, @0];
-    animation.keyTimes = @[@0, @(1 / 6.0), @(3 / 6.0), @(5 / 6.0), @1];
-    animation.duration = 0.3;
-    animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
-    animation.additive = YES;
-    
-    [cell.layer addAnimation:animation forKey:@"shake"];
-}
-
-
-@end

Examples/Swift/SwiftExample.xcodeproj/project.pbxproj

@@ -38,6 +38,7 @@
 		28D8326C1AEC177E009E3B3F /* ValidationExamplesFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28D8326B1AEC177E009E3B3F /* ValidationExamplesFormViewController.swift */; };
 		28D8326F1AEC2D1B009E3B3F /* UICustomizationFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28D8326E1AEC2D1B009E3B3F /* UICustomizationFormViewController.swift */; };
 		28F490221AAFBBC600C8E0CC /* DatesFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28F490211AAFBBC600C8E0CC /* DatesFormViewController.swift */; };
+		BF01E92B1C21FF2800BDE045 /* InlineSegmentedCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF01E92A1C21FF2800BDE045 /* InlineSegmentedCell.swift */; };
 		DD7B43598E698717584375E9 /* libPods-SwiftExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CFB9BA3A82D5F6FE7CCE5A5 /* libPods-SwiftExample.a */; };
 /* End PBXBuildFile section */
 
@@ -55,7 +56,7 @@
 		2860673D1AEDBD4A002F1E04 /* XLFormWeekDaysCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = XLFormWeekDaysCell.xib; sourceTree = "<group>"; };
 		286067451AEDC3D7002F1E04 /* XLRatingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XLRatingView.swift; sourceTree = "<group>"; };
 		286E8B731AE809EF00F2767A /* DynamicSelectorsFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = DynamicSelectorsFormViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
-		286E8B771AE80C4300F2767A /* UsersTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UsersTableViewController.swift; path = Examples/Selectors/DynamicSelector/UsersTableViewController.swift; sourceTree = SOURCE_ROOT; };
+		286E8B771AE80C4300F2767A /* UsersTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UsersTableViewController.swift; path = SwiftExample/DynamicSelector/UsersTableViewController.swift; sourceTree = SOURCE_ROOT; };
 		286E8B7C1AE86C8900F2767A /* XLFormCustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XLFormCustomCell.swift; sourceTree = "<group>"; };
 		286E8B7D1AE86C8900F2767A /* OthersFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = OthersFormViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		286E8B811AE9286B00F2767A /* CustomSelectorsFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CustomSelectorsFormViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -67,18 +68,19 @@
 		288646171AE5C7EA007A8B9B /* iPhoneStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPhoneStoryboard.storyboard; sourceTree = "<group>"; };
 		2886461A1AE5C958007A8B9B /* NativeEventFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NativeEventFormViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		2886461E1AE5FEB5007A8B9B /* DateAndTimeValueTrasformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateAndTimeValueTrasformer.swift; sourceTree = "<group>"; };
-		28B920741AE6F02F00BD6382 /* InputsFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = InputsFormViewController.swift; path = Examples/Inputs/InputsFormViewController.swift; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		28B920741AE6F02F00BD6382 /* InputsFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = InputsFormViewController.swift; path = SwiftExample/Inputs/InputsFormViewController.swift; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		28B920771AE73AA600BD6382 /* SelectorsFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectorsFormViewController.swift; sourceTree = "<group>"; };
 		28D832561AEBC4A7009E3B3F /* AccessoryViewFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AccessoryViewFormViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		28D832601AEBE4E4009E3B3F /* BasicPredicateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicPredicateViewController.swift; sourceTree = "<group>"; };
-		28D832661AEBEAA0009E3B3F /* BlogExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BlogExampleViewController.swift; path = Examples/PredicateExamples/BlogExampleViewController.swift; sourceTree = SOURCE_ROOT; };
-		28D832681AEBFE9F009E3B3F /* PredicateFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PredicateFormViewController.swift; path = Examples/PredicateExamples/PredicateFormViewController.swift; sourceTree = SOURCE_ROOT; };
+		28D832661AEBEAA0009E3B3F /* BlogExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BlogExampleViewController.swift; path = SwiftExample/PredicateExamples/BlogExampleViewController.swift; sourceTree = SOURCE_ROOT; };
+		28D832681AEBFE9F009E3B3F /* PredicateFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PredicateFormViewController.swift; path = SwiftExample/PredicateExamples/PredicateFormViewController.swift; sourceTree = SOURCE_ROOT; };
 		28D8326B1AEC177E009E3B3F /* ValidationExamplesFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidationExamplesFormViewController.swift; sourceTree = "<group>"; };
 		28D8326E1AEC2D1B009E3B3F /* UICustomizationFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UICustomizationFormViewController.swift; sourceTree = "<group>"; };
 		28F490211AAFBBC600C8E0CC /* DatesFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = DatesFormViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		2EB9C638FC2450A0B9786D1E /* Pods-SwiftExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftExample/Pods-SwiftExample.release.xcconfig"; sourceTree = "<group>"; };
 		420D9BAB7B0D2AF9487DD060 /* Pods-SwiftExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftExample/Pods-SwiftExample.debug.xcconfig"; sourceTree = "<group>"; };
 		9CFB9BA3A82D5F6FE7CCE5A5 /* libPods-SwiftExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SwiftExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		BF01E92A1C21FF2800BDE045 /* InlineSegmentedCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = InlineSegmentedCell.swift; path = InlineSegmentedCell/InlineSegmentedCell.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -114,19 +116,19 @@
 		2847A6A01AAF2679000A2ABE /* SwiftExample */ = {
 			isa = PBXGroup;
 			children = (
-				286067311AEDBD4A002F1E04 /* CustomRows */,
-				28D8326D1AEC2D1B009E3B3F /* UICustomization */,
-				28D8326A1AEC177E009E3B3F /* Validations */,
-				28D8325F1AEBE4E4009E3B3F /* PredicateExamples */,
 				28D832551AEBC4A7009E3B3F /* AccessoryViews */,
+				286067311AEDBD4A002F1E04 /* CustomRows */,
+				28F490201AAFBBC600C8E0CC /* Dates */,
+				28B920711AE6EB6100BD6382 /* Inputs */,
 				286E8B8A1AE9993F00F2767A /* MultiValuedSections */,
 				286E8B7A1AE86C8900F2767A /* Others */,
-				28B920761AE7378400BD6382 /* Selectors */,
-				28B920711AE6EB6100BD6382 /* Inputs */,
+				28D8325F1AEBE4E4009E3B3F /* PredicateExamples */,
 				288646191AE5C958007A8B9B /* RealExamples */,
+				28B920761AE7378400BD6382 /* Selectors */,
 				288646161AE5C7EA007A8B9B /* StoryboardExample */,
+				28D8326D1AEC2D1B009E3B3F /* UICustomization */,
+				28D8326A1AEC177E009E3B3F /* Validations */,
 				288646141AE59474007A8B9B /* ExamplesFormViewController.swift */,
-				28F490201AAFBBC600C8E0CC /* Dates */,
 				2847A6A31AAF2679000A2ABE /* AppDelegate.swift */,
 				2847A6A11AAF2679000A2ABE /* Supporting Files */,
 			);
@@ -146,13 +148,14 @@
 		286067311AEDBD4A002F1E04 /* CustomRows */ = {
 			isa = PBXGroup;
 			children = (
+				BF01E9291C21FEF700BDE045 /* Inline Segmented */,
 				286067321AEDBD4A002F1E04 /* CustomRowsViewController.swift */,
 				286067331AEDBD4A002F1E04 /* FloatLabeledTextField */,
 				286067351AEDBD4A002F1E04 /* Rating */,
 				2860673B1AEDBD4A002F1E04 /* Weekdays */,
 			);
 			name = CustomRows;
-			path = Examples/CustomRows;
+			path = SwiftExample/CustomRows;
 			sourceTree = SOURCE_ROOT;
 		};
 		286067331AEDBD4A002F1E04 /* FloatLabeledTextField */ = {
@@ -318,7 +321,7 @@
 				28F490211AAFBBC600C8E0CC /* DatesFormViewController.swift */,
 			);
 			name = Dates;
-			path = Examples/Dates;
+			path = SwiftExample/Dates;
 			sourceTree = SOURCE_ROOT;
 		};
 		402AE3EC1FACD058DCF0A2D3 /* Frameworks */ = {
@@ -338,6 +341,14 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		BF01E9291C21FEF700BDE045 /* Inline Segmented */ = {
+			isa = PBXGroup;
+			children = (
+				BF01E92A1C21FF2800BDE045 /* InlineSegmentedCell.swift */,
+			);
+			name = "Inline Segmented";
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -366,7 +377,9 @@
 		2847A6961AAF2679000A2ABE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0620;
+				LastSwiftMigration = 0700;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = Xmartlabs;
 				TargetAttributes = {
 					2847A69D1AAF2679000A2ABE = {
@@ -447,6 +460,7 @@
 			files = (
 				28B920781AE73AA600BD6382 /* SelectorsFormViewController.swift in Sources */,
 				28D832671AEBEAA0009E3B3F /* BlogExampleViewController.swift in Sources */,
+				BF01E92B1C21FF2800BDE045 /* InlineSegmentedCell.swift in Sources */,
 				28D8326C1AEC177E009E3B3F /* ValidationExamplesFormViewController.swift in Sources */,
 				286067411AEDBD4A002F1E04 /* XLFormRatingCell.swift in Sources */,
 				28F490221AAFBBC600C8E0CC /* DatesFormViewController.swift in Sources */,
@@ -497,6 +511,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -564,6 +579,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				INFOPLIST_FILE = SwiftExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.xmartlabs.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SwiftExample/SwiftExample-Bridging-Header.h";
 			};
@@ -577,6 +593,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				INFOPLIST_FILE = SwiftExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.xmartlabs.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SwiftExample/SwiftExample-Bridging-Header.h";
 			};

Examples/Swift/SwiftExample/AccessoryViews/AccessoryViewFormViewController.swift

@@ -28,30 +28,30 @@
 class AccessoryViewFormViewController : XLFormViewController {
 
 
-    private enum Tags : String {
-        case AccessoryViewRowNavigationEnabled = "RowNavigationEnabled"
-        case AccessoryViewRowNavigationShowAccessoryView     = "RowNavigationShowAccessoryView"
-        case AccessoryViewRowNavigationStopDisableRow        = "rowNavigationStopDisableRow"
-        case AccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow = "rowNavigationSkipCanNotBecomeFirstResponderRow"
-        case AccessoryViewRowNavigationStopInlineRow = "rowNavigationStopInlineRow"
-        case AccessoryViewName = "name"
-        case AccessoryViewEmail = "email"
-        case AccessoryViewTwitter = "twitter"
-        case AccessoryViewUrl = "url"
-        case AccessoryViewDate = "date"
-        case AccessoryViewTextView = "textView"
-        case AccessoryViewCheck = "check"
-        case AccessoryViewNotes = "notes"
+    private struct Tags {
+        static let AccessoryViewRowNavigationEnabled = "RowNavigationEnabled"
+        static let AccessoryViewRowNavigationShowAccessoryView     = "RowNavigationShowAccessoryView"
+        static let AccessoryViewRowNavigationStopDisableRow        = "rowNavigationStopDisableRow"
+        static let AccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow = "rowNavigationSkipCanNotBecomeFirstResponderRow"
+        static let AccessoryViewRowNavigationStopInlineRow = "rowNavigationStopInlineRow"
+        static let AccessoryViewName = "name"
+        static let AccessoryViewEmail = "email"
+        static let AccessoryViewTwitter = "twitter"
+        static let AccessoryViewUrl = "url"
+        static let AccessoryViewDate = "date"
+        static let AccessoryViewTextView = "textView"
+        static let AccessoryViewCheck = "check"
+        static let AccessoryViewNotes = "notes"
     }
 
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
 
     func initializeForm() {
@@ -61,7 +61,7 @@ class AccessoryViewFormViewController : XLFormViewController {
         var row : XLFormRowDescriptor
         
         form = XLFormDescriptor(title: "Accessory View")
-        form.rowNavigationOptions = XLFormRowNavigationOptions.Enabled
+        form.rowNavigationOptions = .Enabled
     
         // Configuration section
         section = XLFormSectionDescriptor()
@@ -70,65 +70,62 @@ class AccessoryViewFormViewController : XLFormViewController {
         form.addFormSection(section)
     
         // RowNavigationEnabled
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationEnabled.rawValue, rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "Row Navigation Enabled?")
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationEnabled, rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "Row Navigation Enabled?")
         row.value = true
         section.addFormRow(row)
     
         // RowNavigationShowAccessoryView
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationShowAccessoryView.rawValue, rowType:XLFormRowDescriptorTypeBooleanCheck, title:"Show input accessory row?")
-        row.value = (form.rowNavigationOptions & XLFormRowNavigationOptions.Enabled) == XLFormRowNavigationOptions.Enabled
-        row.hidden = "$\(Tags.AccessoryViewRowNavigationEnabled.rawValue) == 0"
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationShowAccessoryView, rowType:XLFormRowDescriptorTypeBooleanCheck, title:"Show input accessory row?")
+        row.value = form.rowNavigationOptions.contains(.Enabled)
+        row.hidden = "$\(Tags.AccessoryViewRowNavigationEnabled) == 0"
         section.addFormRow(row)
 
         // RowNavigationStopDisableRow
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationStopDisableRow.rawValue, rowType: XLFormRowDescriptorTypeBooleanCheck, title:"Stop when reach disabled row?")
-        row.value = (form.rowNavigationOptions & XLFormRowNavigationOptions.StopDisableRow) == XLFormRowNavigationOptions.StopDisableRow
-        row.hidden = "$\(Tags.AccessoryViewRowNavigationEnabled.rawValue) == 0"
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationStopDisableRow, rowType: XLFormRowDescriptorTypeBooleanCheck, title:"Stop when reach disabled row?")
+        row.value = form.rowNavigationOptions.contains(.StopDisableRow)
+        row.hidden = "$\(Tags.AccessoryViewRowNavigationEnabled) == 0"
         section.addFormRow(row)
     
         // RowNavigationStopInlineRow
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationStopInlineRow.rawValue, rowType: XLFormRowDescriptorTypeBooleanCheck, title: "Stop when reach inline row?")
-        row.value = (form.rowNavigationOptions & XLFormRowNavigationOptions.StopInlineRow) == XLFormRowNavigationOptions.StopInlineRow
-        row.hidden = "$\(Tags.AccessoryViewRowNavigationEnabled.rawValue) == 0"
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationStopInlineRow, rowType: XLFormRowDescriptorTypeBooleanCheck, title: "Stop when reach inline row?")
+        row.value = form.rowNavigationOptions.contains(.StopInlineRow)
+        row.hidden = "$\(Tags.AccessoryViewRowNavigationEnabled) == 0"
         section.addFormRow(row)
         
         // RowNavigationSkipCanNotBecomeFirstResponderRow
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow.rawValue, rowType:XLFormRowDescriptorTypeBooleanCheck, title:"Skip Can Not Become First Responder Row?")
-        row.value = (form.rowNavigationOptions & XLFormRowNavigationOptions.SkipCanNotBecomeFirstResponderRow) == XLFormRowNavigationOptions.SkipCanNotBecomeFirstResponderRow
-        row.hidden = "$\(Tags.AccessoryViewRowNavigationEnabled.rawValue) == 0"
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow, rowType:XLFormRowDescriptorTypeBooleanCheck, title:"Skip Can Not Become First Responder Row?")
+        row.value = form.rowNavigationOptions.contains(XLFormRowNavigationOptions.SkipCanNotBecomeFirstResponderRow)
+        row.hidden = "$\(Tags.AccessoryViewRowNavigationEnabled) == 0"
         section.addFormRow(row)
         
-        
-        
         section = XLFormSectionDescriptor()
         form.addFormSection(section)
         
-        
         // Name
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewName.rawValue, rowType: XLFormRowDescriptorTypeText, title: "Name")
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewName, rowType: XLFormRowDescriptorTypeText, title: "Name")
         row.required = true
         section.addFormRow(row)
         
         // Email
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewEmail.rawValue, rowType: XLFormRowDescriptorTypeEmail, title: "Email")
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewEmail, rowType: XLFormRowDescriptorTypeEmail, title: "Email")
         // validate the email
         row.addValidator(XLFormValidator.emailValidator())
         section.addFormRow(row)
         
         // Twitter
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewTwitter.rawValue, rowType: XLFormRowDescriptorTypeTwitter, title: "Twitter")
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewTwitter, rowType: XLFormRowDescriptorTypeTwitter, title: "Twitter")
         row.disabled = NSNumber(bool: true)
         row.value = "@no_editable"
         section.addFormRow(row)
     
         // Url
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewUrl.rawValue, rowType: XLFormRowDescriptorTypeURL, title: "Url")
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewUrl, rowType: XLFormRowDescriptorTypeURL, title: "Url")
         section.addFormRow(row)
         
     
         // Date
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewDate.rawValue, rowType:XLFormRowDescriptorTypeDateInline, title:"Date Inline")
-        row.value = NSDate.new()
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewDate, rowType:XLFormRowDescriptorTypeDateInline, title:"Date Inline")
+        row.value = NSDate()
         section.addFormRow(row)
 
         
@@ -138,17 +135,17 @@ class AccessoryViewFormViewController : XLFormViewController {
         
         
         
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewTextView.rawValue, rowType:XLFormRowDescriptorTypeTextView)
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewTextView, rowType:XLFormRowDescriptorTypeTextView)
         row.cellConfigAtConfigure["textView.placeholder"] = "TEXT VIEW EXAMPLE"
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewCheck.rawValue, rowType:XLFormRowDescriptorTypeBooleanCheck, title:"Check")
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewCheck, rowType:XLFormRowDescriptorTypeBooleanCheck, title:"Check")
         section.addFormRow(row)
 
         section = XLFormSectionDescriptor()
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.AccessoryViewNotes.rawValue, rowType:XLFormRowDescriptorTypeTextView, title:"Notes")
+        row = XLFormRowDescriptor(tag: Tags.AccessoryViewNotes, rowType:XLFormRowDescriptorTypeTextView, title:"Notes")
         section.addFormRow(row)
     
         self.form = form
@@ -156,7 +153,7 @@ class AccessoryViewFormViewController : XLFormViewController {
 
     
     override func inputAccessoryViewForRowDescriptor(rowDescriptor: XLFormRowDescriptor!) -> UIView! {
-        if self.form.formRowWithTag(Tags.AccessoryViewRowNavigationShowAccessoryView.rawValue)!.value!.boolValue == false {
+        if form.formRowWithTag(Tags.AccessoryViewRowNavigationShowAccessoryView)!.value!.boolValue == false {
             return nil
         }
         return super.inputAccessoryViewForRowDescriptor(rowDescriptor)
@@ -167,28 +164,32 @@ class AccessoryViewFormViewController : XLFormViewController {
     
     override func formRowDescriptorValueHasChanged(formRow: XLFormRowDescriptor!, oldValue: AnyObject!, newValue: AnyObject!) {
         super.formRowDescriptorValueHasChanged(formRow, oldValue: oldValue, newValue: newValue)
-        if formRow.tag == Tags.AccessoryViewRowNavigationStopDisableRow.rawValue {
+        if formRow.tag == Tags.AccessoryViewRowNavigationStopDisableRow {
             if formRow.value!.boolValue  == true {
-                self.form.rowNavigationOptions = self.form.rowNavigationOptions | XLFormRowNavigationOptions.StopDisableRow
+                form.rowNavigationOptions = form.rowNavigationOptions.union(.StopDisableRow)
             }
             else{
-                self.form.rowNavigationOptions = self.form.rowNavigationOptions & (~XLFormRowNavigationOptions.StopDisableRow)
+                form.rowNavigationOptions = form.rowNavigationOptions.subtract(.StopDisableRow)
             }
         }
-        else if formRow.tag == Tags.AccessoryViewRowNavigationStopInlineRow.rawValue {
+        else if formRow.tag == Tags.AccessoryViewRowNavigationStopInlineRow {
             if formRow.value!.boolValue  == true {
-                self.form.rowNavigationOptions = self.form.rowNavigationOptions | XLFormRowNavigationOptions.StopInlineRow
+                form.rowNavigationOptions = form.rowNavigationOptions.union(.StopInlineRow)
             }
             else{
-                self.form.rowNavigationOptions = self.form.rowNavigationOptions & (~XLFormRowNavigationOptions.StopInlineRow)
+                var options = form.rowNavigationOptions
+                options = options.subtract(XLFormRowNavigationOptions.StopInlineRow)
+                form.rowNavigationOptions = options
             }
         }
-        else if formRow.tag == Tags.AccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow.rawValue {
+        else if formRow.tag == Tags.AccessoryViewRowNavigationSkipCanNotBecomeFirstResponderRow {
             if formRow.value!.boolValue  == true {
-                self.form.rowNavigationOptions = self.form.rowNavigationOptions | XLFormRowNavigationOptions.SkipCanNotBecomeFirstResponderRow
+                form.rowNavigationOptions = form.rowNavigationOptions.union(.SkipCanNotBecomeFirstResponderRow)
             }
             else{
-                self.form.rowNavigationOptions = self.form.rowNavigationOptions & (~XLFormRowNavigationOptions.SkipCanNotBecomeFirstResponderRow)
+                var options = form.rowNavigationOptions
+                options = options.subtract(.SkipCanNotBecomeFirstResponderRow)
+                form.rowNavigationOptions = options
             }
         }
         

Examples/Swift/SwiftExample/AppDelegate.swift

@@ -20,15 +20,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         XLFormViewController.cellClassesForRowDescriptorTypes()[XLFormRowDescriptorTypeRate] =  "XLFormRatingCell"
         XLFormViewController.cellClassesForRowDescriptorTypes()[XLFormRowDescriptorTypeFloatLabeledTextField] = FloatLabeledTextFieldCell.self
         XLFormViewController.cellClassesForRowDescriptorTypes()[XLFormRowDescriptorTypeWeekDays] = "XLFormWeekDaysCell"
+        XLFormViewController.cellClassesForRowDescriptorTypes()[XLFormRowDescriptorTypeSegmentedInline] = InlineSegmentedCell.self
+        XLFormViewController.cellClassesForRowDescriptorTypes()[XLFormRowDescriptorTypeSegmentedControl] = InlineSegmentedControl.self
+        XLFormViewController.inlineRowDescriptorTypesForRowDescriptorTypes()[XLFormRowDescriptorTypeSegmentedInline] = XLFormRowDescriptorTypeSegmentedControl
         
         // Override point for customization after application launch.
         self.window = UIWindow.init(frame: UIScreen.mainScreen().bounds)
         // Override point for customization after application launch.
-        self.window!.backgroundColor = UIColor.whiteColor()
+        self.window!.backgroundColor = .whiteColor()
     
         // load the initial form form Storybiard
         let storyboard = UIStoryboard.init(name:"iPhoneStoryboard", bundle:nil)
-        self.window!.rootViewController = storyboard.instantiateInitialViewController() as? UIViewController
+        self.window!.rootViewController = storyboard.instantiateInitialViewController()
         self.window!.makeKeyAndVisible()
         return true
     }

Examples/Swift/SwiftExample/CustomRows/CustomRowsViewController.m

@@ -1,109 +0,0 @@
-//  CustomRowsViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "CustomRowsViewController.h"
-#import "XLForm.h"
-#import "XLFormWeekDaysCell.h"
-#import "XLFormRatingCell.h"
-#import "FloatLabeledTextFieldCell.h"
-#import "XLFormCustomCell.h"
-
-static NSString * const kCustomRowFirstRatingTag = @"CustomRowFirstRatingTag";
-static NSString * const kCustomRowSecondRatingTag = @"CustomRowSecondRatingTag";
-static NSString * const kCustomRowFloatLabeledTextFieldTag = @"CustomRowFloatLabeledTextFieldTag";
-static NSString * const kCustomRowWeekdays = @"CustomRowWeekdays";
-static NSString * const kCustomRowText = @"kCustomText";
-
-@implementation CustomRowsViewController
-
--(id)init
-{
-    self = [super init];
-    if (self) {
-        [self initializeForm];
-    }
-    return self;
-}
-
--(void)initializeForm
-{
-    XLFormDescriptor * form = [XLFormDescriptor formDescriptorWithTitle:@"Custom Rows"];
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    // Section Ratings
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Ratings"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomRowFirstRatingTag rowType:XLFormRowDescriptorTypeRate title:@"First Rating"];
-    row.value = @(3);
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomRowSecondRatingTag rowType:XLFormRowDescriptorTypeRate title:@"Second Rating"];
-    row.value = @(1);
-    [section addFormRow:row];
-    
-    // Section Float Labeled Text Field
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Float Labeled Text Field"];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomRowFloatLabeledTextFieldTag rowType:XLFormRowDescriptorTypeFloatLabeledTextField title:@"Title"];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomRowFloatLabeledTextFieldTag rowType:XLFormRowDescriptorTypeFloatLabeledTextField title:@"First Name"];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomRowFloatLabeledTextFieldTag rowType:XLFormRowDescriptorTypeFloatLabeledTextField title:@"Last Name"];
-    [section addFormRow:row];
-    
-    // Section Weekdays
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Weekdays"];
-    [form addFormSection:section];
-    
-    // WeekDays
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomRowWeekdays rowType:XLFormRowDescriptorTypeWeekDays];
-    row.value =  @{
-                   kSunday: @(NO),
-                   kMonday: @(YES),
-                   kTuesday: @(YES),
-                   kWednesday: @(NO),
-                   kThursday: @(NO),
-                   kFriday: @(NO),
-                   kSaturday: @(NO)
-                   };
-    [section addFormRow:row];
-    
-    
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    
-    XLFormRowDescriptor *customRowDescriptor = [XLFormRowDescriptor formRowDescriptorWithTag:kCustomRowText rowType:@"XLFormRowDescriptorTypeCustom"];
-    // Must set custom cell or add custom cell to cellClassesForRowDescriptorTypes dictionary before XLFormViewController loaded
-    customRowDescriptor.cellClass = [XLFormCustomCell class];
-    [section addFormRow:customRowDescriptor];
-    
-    self.form = form;
-}
-
-@end

Examples/Swift/SwiftExample/CustomRows/CustomRowsViewController.swift

@@ -24,12 +24,13 @@
 
 class CustomRowsViewController : XLFormViewController {
     
-    private enum Tags : String {
-        case CustomRowFirstRatingTag = "CustomRowFirstRatingTag"
-        case CustomRowSecondRatingTag = "CustomRowSecondRatingTag"
-        case CustomRowFloatLabeledTextFieldTag = "CustomRowFloatLabeledTextFieldTag"
-        case CustomRowWeekdays = "CustomRowWeekdays"
-        case CustomRowText = "CustomText"
+    private struct Tags {
+        static let CustomRowFirstRatingTag = "CustomRowFirstRatingTag"
+        static let CustomRowSecondRatingTag = "CustomRowSecondRatingTag"
+        static let CustomRowFloatLabeledTextFieldTag = "CustomRowFloatLabeledTextFieldTag"
+        static let CustomRowWeekdays = "CustomRowWeekdays"
+        static let CustomRowText = "CustomText"
+        static let CustomRowInline = "CustomRowInline"
     }
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
@@ -37,7 +38,7 @@ class CustomRowsViewController : XLFormViewController {
         self.initializeForm()
     }
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         self.initializeForm()
     }
@@ -54,11 +55,11 @@ class CustomRowsViewController : XLFormViewController {
         section.title = "Ratings"
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.CustomRowFirstRatingTag.rawValue, rowType: XLFormRowDescriptorTypeRate, title: "First Rating")
+        row = XLFormRowDescriptor(tag: Tags.CustomRowFirstRatingTag, rowType: XLFormRowDescriptorTypeRate, title: "First Rating")
         row.value = 3
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.CustomRowSecondRatingTag.rawValue, rowType: XLFormRowDescriptorTypeRate, title: "First Rating")
+        row = XLFormRowDescriptor(tag: Tags.CustomRowSecondRatingTag, rowType: XLFormRowDescriptorTypeRate, title: "First Rating")
         row.value = 1
         section.addFormRow(row)
         
@@ -66,13 +67,13 @@ class CustomRowsViewController : XLFormViewController {
         section = XLFormSectionDescriptor.formSectionWithTitle("Float Labeled Text Field")
         form.addFormSection(section)
 
-        row = XLFormRowDescriptor(tag: Tags.CustomRowFloatLabeledTextFieldTag.rawValue, rowType: XLFormRowDescriptorTypeFloatLabeledTextField, title: "Title")
+        row = XLFormRowDescriptor(tag: Tags.CustomRowFloatLabeledTextFieldTag, rowType: XLFormRowDescriptorTypeFloatLabeledTextField, title: "Title")
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.CustomRowFloatLabeledTextFieldTag.rawValue, rowType: XLFormRowDescriptorTypeFloatLabeledTextField, title: "First Name")
+        row = XLFormRowDescriptor(tag: Tags.CustomRowFloatLabeledTextFieldTag, rowType: XLFormRowDescriptorTypeFloatLabeledTextField, title: "First Name")
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.CustomRowFloatLabeledTextFieldTag.rawValue, rowType: XLFormRowDescriptorTypeFloatLabeledTextField, title: "Last Name")
+        row = XLFormRowDescriptor(tag: Tags.CustomRowFloatLabeledTextFieldTag, rowType: XLFormRowDescriptorTypeFloatLabeledTextField, title: "Last Name")
         section.addFormRow(row)
         
 
@@ -80,7 +81,7 @@ class CustomRowsViewController : XLFormViewController {
         form.addFormSection(section)
 
         // WeekDays
-        row = XLFormRowDescriptor(tag: Tags.CustomRowWeekdays.rawValue, rowType: XLFormRowDescriptorTypeWeekDays)
+        row = XLFormRowDescriptor(tag: Tags.CustomRowWeekdays, rowType: XLFormRowDescriptorTypeWeekDays)
         row.value =  [
             XLFormWeekDaysCell.kWeekDay.Sunday.description(): false,
             XLFormWeekDaysCell.kWeekDay.Monday.description(): true,
@@ -92,12 +93,21 @@ class CustomRowsViewController : XLFormViewController {
         ]
         section.addFormRow(row)
 
+        section = XLFormSectionDescriptor.formSectionWithTitle("Custom inline row")
+        form.addFormSection(section)
+        
+        // Inline
+        row = XLFormRowDescriptor(tag: Tags.CustomRowInline, rowType: XLFormRowDescriptorTypeSegmentedInline)
+        row.title = "You support..."
+        row.selectorOptions = ["Uruguay", "Brazil", "Argentina", "Chile"]
+        row.value = "Uruguay"
+        section.addFormRow(row)
         
         section = XLFormSectionDescriptor()
         form.addFormSection(section)
         
         
-        row = XLFormRowDescriptor(tag: Tags.CustomRowText.rawValue, rowType: XLFormRowDescriptorTypeCustom)
+        row = XLFormRowDescriptor(tag: Tags.CustomRowText, rowType: XLFormRowDescriptorTypeCustom)
         // Must set custom cell or add custom cell to cellClassesForRowDescriptorTypes dictionary before XLFormViewController loaded
         row.cellClass = XLFormCustomCell.self
         section.addFormRow(row)

Examples/Swift/SwiftExample/CustomRows/FloatLabeledTextField/FloatLabeledTextFieldCell.m

@@ -1,187 +0,0 @@
-//  FloatLabeledTextFieldCell.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "FloatLabeledTextFieldCell.h"
-#import "UIView+XLFormAdditions.h"
-#import "JVFloatLabeledTextField.h"
-#import "NSObject+XLFormAdditions.h"
-
-#import <JVFloatLabeledTextField/JVFloatLabeledTextField.h>
-
-NSString * const XLFormRowDescriptorTypeFloatLabeledTextField = @"XLFormRowDescriptorTypeFloatLabeledTextField";
-
-const static CGFloat kHMargin = 15.0f;
-const static CGFloat kVMargin = 8.0f;
-const static CGFloat kFloatingLabelFontSize = 11.0f;
-
-@interface FloatLabeledTextFieldCell () <UITextFieldDelegate>
-@property (nonatomic) JVFloatLabeledTextField * floatLabeledTextField;
-@end
-
-@implementation FloatLabeledTextFieldCell
-
-@synthesize floatLabeledTextField =_floatLabeledTextField;
-
-+(void)load
-{
-    [XLFormViewController.cellClassesForRowDescriptorTypes setObject:[FloatLabeledTextFieldCell class] forKey:XLFormRowDescriptorTypeFloatLabeledTextField];
-}
-
--(JVFloatLabeledTextField *)floatLabeledTextField
-{
-    if (_floatLabeledTextField) return _floatLabeledTextField;
-    
-    _floatLabeledTextField = [JVFloatLabeledTextField autolayoutView];
-    _floatLabeledTextField.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
-    _floatLabeledTextField.floatingLabel.font = [UIFont boldSystemFontOfSize:kFloatingLabelFontSize];
-
-    _floatLabeledTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
-    return _floatLabeledTextField;
-}
-
-#pragma mark - XLFormDescriptorCell
-
--(void)configure
-{
-    [super configure];
-    [self setSelectionStyle:UITableViewCellSelectionStyleNone];
-    [self.contentView addSubview:self.floatLabeledTextField];
-    [self.floatLabeledTextField setDelegate:self];
-    [self.contentView addConstraints:[self layoutConstraints]];
-}
-
--(void)update
-{
-    [super update];
-    
-    self.floatLabeledTextField.attributedPlaceholder =
-    [[NSAttributedString alloc] initWithString:self.rowDescriptor.title
-                                    attributes:@{NSForegroundColorAttributeName: [UIColor lightGrayColor]}];
-    
-    self.floatLabeledTextField.text = self.rowDescriptor.value ? [self.rowDescriptor.value displayText] : self.rowDescriptor.noValueDisplayText;
-    [self.floatLabeledTextField setEnabled:!self.rowDescriptor.isDisabled];
-    
-    self.floatLabeledTextField.floatingLabelTextColor = [UIColor lightGrayColor];
-    
-    [self.floatLabeledTextField setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-}
-
--(BOOL)formDescriptorCellCanBecomeFirstResponder
-{
-    return !self.rowDescriptor.isDisabled;
-}
-
--(BOOL)formDescriptorCellBecomeFirstResponder
-{
-    return [self.floatLabeledTextField becomeFirstResponder];
-}
-
-#pragma mark - UITextFieldDelegate
-
-- (BOOL)textFieldShouldClear:(UITextField *)textField
-{
-    return [self.formViewController textFieldShouldClear:textField];
-}
-
-- (BOOL)textFieldShouldReturn:(UITextField *)textField
-{
-    return [self.formViewController textFieldShouldReturn:textField];
-}
-
-- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
-{
-    return [self.formViewController textFieldShouldBeginEditing:textField];
-}
-
-- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
-{
-    return [self.formViewController textFieldShouldEndEditing:textField];
-}
-
-- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
-    return [self.formViewController textField:textField shouldChangeCharactersInRange:range replacementString:string];
-}
-
-- (void)textFieldDidBeginEditing:(UITextField *)textField
-{
-    [self.formViewController textFieldDidBeginEditing:textField];
-}
-
-- (void)textFieldDidEndEditing:(UITextField *)textField
-{
-    [self textFieldDidChange:textField];
-    [self.formViewController textFieldDidEndEditing:textField];
-}
-
--(void)setReturnKeyType:(UIReturnKeyType)returnKeyType
-{
-    self.floatLabeledTextField.returnKeyType = returnKeyType;
-}
-
--(UIReturnKeyType)returnKeyType
-{
-    return self.floatLabeledTextField.returnKeyType;
-}
-
-+(CGFloat)formDescriptorCellHeightForRowDescriptor:(XLFormRowDescriptor *)rowDescriptor {
-    return 55;
-}
-
-
-
--(NSArray *)layoutConstraints
-{
-    NSMutableArray * result = [[NSMutableArray alloc] init];
-
-    NSDictionary * views = @{@"floatLabeledTextField": self.floatLabeledTextField};
-    NSDictionary *metrics = @{@"hMargin":@(kHMargin),
-                              @"vMargin":@(kVMargin)};
-    
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(hMargin)-[floatLabeledTextField]-(hMargin)-|"
-                                                                                               options:0
-                                                                                               metrics:metrics
-                                                                                                 views:views]];
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(vMargin)-[floatLabeledTextField]-(vMargin)-|"
-                                                                                               options:0
-                                                                                               metrics:metrics
-                                                                                                 views:views]];
-    return result;
-}
-
-#pragma mark - Helpers
-
-- (void)textFieldDidChange:(UITextField *)textField
-{
-    if (self.floatLabeledTextField == textField) {
-        if ([self.floatLabeledTextField.text length] > 0) {
-            self.rowDescriptor.value = self.floatLabeledTextField.text;
-        } else {
-            self.rowDescriptor.value = nil;
-        }
-    }
-}
-
-
-
-@end

Examples/Swift/SwiftExample/CustomRows/FloatLabeledTextField/FloatLabeledTextFieldCell.swift

@@ -33,11 +33,11 @@ class FloatLabeledTextFieldCell : XLFormBaseCell, UITextFieldDelegate {
     
     
     lazy var floatLabeledTextField: JVFloatLabeledTextField  = {
-        let result  = JVFloatLabeledTextField(frame: CGRect.zeroRect)
-        result.setTranslatesAutoresizingMaskIntoConstraints(false)
+        let result  = JVFloatLabeledTextField(frame: CGRect.zero)
+        result.translatesAutoresizingMaskIntoConstraints = false
         result.font = UIFont.systemFontOfSize(kFontSize)
-        result.floatingLabel.font = UIFont.boldSystemFontOfSize(kFontSize)
-        result.clearButtonMode = UITextFieldViewMode.WhileEditing
+        result.floatingLabel.font = .boldSystemFontOfSize(kFontSize)
+        result.clearButtonMode = .WhileEditing
         return result
     }()
 
@@ -45,29 +45,30 @@ class FloatLabeledTextFieldCell : XLFormBaseCell, UITextFieldDelegate {
     
     override func configure() {
         super.configure()
-        self.selectionStyle = UITableViewCellSelectionStyle.None
-        self.contentView.addSubview(self.floatLabeledTextField)
-        self.floatLabeledTextField.delegate = self
-        self.contentView.addConstraints(self.layoutConstraints())
+        selectionStyle = .None
+        contentView.addSubview(self.floatLabeledTextField)
+        floatLabeledTextField.delegate = self
+        contentView.addConstraints(layoutConstraints())
     }
     
     override func update() {
         super.update()
-        self.floatLabeledTextField.attributedPlaceholder = NSAttributedString(string: self.rowDescriptor.title ?? "" , attributes: [NSForegroundColorAttributeName: UIColor.lightGrayColor()])
-    
-        if let value: AnyObject = self.rowDescriptor.value {
-            self.floatLabeledTextField.text = value.displayText()
+        if let rowDescriptor = rowDescriptor {
+            floatLabeledTextField.attributedPlaceholder = NSAttributedString(string: rowDescriptor.title ?? "" , attributes: [NSForegroundColorAttributeName: UIColor.lightGrayColor()])
+            if let value = rowDescriptor.value {
+                floatLabeledTextField.text = value.displayText()
+            }
+            else {
+                floatLabeledTextField.text = rowDescriptor.noValueDisplayText
+            }
+            floatLabeledTextField.enabled = !rowDescriptor.isDisabled()
+            floatLabeledTextField.floatingLabelTextColor = .lightGrayColor()
+            floatLabeledTextField.alpha = rowDescriptor.isDisabled() ? 0.6 : 1.0
         }
-        else {
-            self.floatLabeledTextField.text = self.rowDescriptor.noValueDisplayText
-        }
-        self.floatLabeledTextField.enabled = !self.rowDescriptor.isDisabled()
-        self.floatLabeledTextField.floatingLabelTextColor = UIColor.lightGrayColor()
-        self.floatLabeledTextField.alpha = self.rowDescriptor.isDisabled() ? 0.6 : 1.0
     }
     
     override func formDescriptorCellCanBecomeFirstResponder() -> Bool {
-        return !self.rowDescriptor.isDisabled()
+        return rowDescriptor?.isDisabled() == false
     }
     
     
@@ -82,23 +83,22 @@ class FloatLabeledTextFieldCell : XLFormBaseCell, UITextFieldDelegate {
     
 //MARK: Helpers
     
-    func layoutConstraints() -> [AnyObject]{
-        let views = ["floatLabeledTextField" : self.floatLabeledTextField]
+    func layoutConstraints() -> [NSLayoutConstraint]{
+        let views = ["floatLabeledTextField" : floatLabeledTextField]
         let metrics = ["hMargin": 15.0, "vMargin": 8.0]
-        var result =  NSLayoutConstraint.constraintsWithVisualFormat("H:|-(hMargin)-[floatLabeledTextField]-(hMargin)-|", options:NSLayoutFormatOptions.AlignAllCenterY, metrics:metrics, views:views)
-        result += NSLayoutConstraint.constraintsWithVisualFormat("V:|-(vMargin)-[floatLabeledTextField]-(vMargin)-|", options:NSLayoutFormatOptions.AlignAllCenterX, metrics:metrics, views:views)
+        var result =  NSLayoutConstraint.constraintsWithVisualFormat("H:|-(hMargin)-[floatLabeledTextField]-(hMargin)-|", options:.AlignAllCenterY, metrics:metrics, views:views)
+        result += NSLayoutConstraint.constraintsWithVisualFormat("V:|-(vMargin)-[floatLabeledTextField]-(vMargin)-|", options:.AlignAllCenterX, metrics:metrics, views:views)
         return result
     }
 
-    
-    
-    
     func textFieldDidChange(textField : UITextField) {
-        if self.floatLabeledTextField == textField {
-            if self.floatLabeledTextField.text.isEmpty == false {
-                self.rowDescriptor.value = self.floatLabeledTextField.text
-            } else {
-                self.rowDescriptor.value = nil
+        if floatLabeledTextField == textField {
+            if let rowDescriptor = rowDescriptor, let text = self.floatLabeledTextField.text {
+                if text.isEmpty == false {
+                    rowDescriptor.value = self.floatLabeledTextField.text
+                } else {
+                    rowDescriptor.value = nil
+                }
             }
         }
     }

Examples/Swift/SwiftExample/CustomRows/InlineSegmentedCell/InlineSegmentedCell.swift

@@ -0,0 +1,144 @@
+//
+//  InlineSegmentedCell.swift
+//  SwiftExample
+//
+//  Created by mathias Claassen on 16/12/15.
+//  Copyright © 2015 Xmartlabs. All rights reserved.
+//
+
+import Foundation
+
+let XLFormRowDescriptorTypeSegmentedInline = "XLFormRowDescriptorTypeSegmentedInline"
+let XLFormRowDescriptorTypeSegmentedControl = "XLFormRowDescriptorTypeSegmentedControl"
+
+
+class InlineSegmentedCell : XLFormBaseCell {
+    
+    override func canBecomeFirstResponder() -> Bool {
+        return true
+    }
+    
+    override func becomeFirstResponder() -> Bool {
+        if isFirstResponder() {
+            return super.becomeFirstResponder()
+        }
+        let result = super.becomeFirstResponder()
+        if result {
+            let inlineRowDescriptor : XLFormRowDescriptor = XLFormRowDescriptor(tag: nil, rowType: XLFormViewController.inlineRowDescriptorTypesForRowDescriptorTypes()![rowDescriptor!.rowType] as! String)
+            let cell = inlineRowDescriptor.cellForFormController(formViewController())
+            let inlineCell = cell as? XLFormInlineRowDescriptorCell
+            inlineCell?.inlineRowDescriptor = rowDescriptor
+            rowDescriptor?.sectionDescriptor.addFormRow(inlineRowDescriptor, afterRow: rowDescriptor!)
+            formViewController().ensureRowIsVisible(inlineRowDescriptor)
+        }
+        return result
+    }
+    
+    override func resignFirstResponder() -> Bool {
+        if isFirstResponder() {
+            return super.resignFirstResponder()
+        }
+        let selectedRowPath : NSIndexPath = formViewController().form.indexPathOfFormRow(rowDescriptor!)!
+        let nextRowPath = NSIndexPath(forRow: selectedRowPath.row + 1, inSection: selectedRowPath.section)
+        let nextFormRow = formViewController().form.formRowAtIndex(nextRowPath)
+        let section : XLFormSectionDescriptor = formViewController().form.formSectionAtIndex(UInt(nextRowPath.section))!
+        let result = super.resignFirstResponder()
+        if result {
+            section.removeFormRow(nextFormRow!)
+        }
+        return result
+    }
+    
+    //Mark: - XLFormDescriptorCell
+    
+    override func formDescriptorCellCanBecomeFirstResponder() -> Bool {
+        return rowDescriptor?.isDisabled() == false
+    }
+    
+    override func formDescriptorCellBecomeFirstResponder() -> Bool {
+        if isFirstResponder() {
+            resignFirstResponder()
+            return false
+        }
+        return becomeFirstResponder()
+    }
+    
+    override func update() {
+        super.update()
+        accessoryType = .None
+        editingAccessoryType = .None
+        selectionStyle = .None
+        textLabel?.text = rowDescriptor?.title
+        detailTextLabel?.text = valueDisplayText()
+    }
+
+    override  func formDescriptorCellDidSelectedWithFormController(controller: XLFormViewController!) {
+        controller.tableView.deselectRowAtIndexPath(controller.form.indexPathOfFormRow(rowDescriptor!)!, animated: true)
+    }
+    
+    func valueDisplayText() -> String? {
+        if let value = rowDescriptor?.value {
+            return value.displayText()
+        }
+        return rowDescriptor?.noValueDisplayText
+    }
+}
+
+class InlineSegmentedControl : XLFormBaseCell, XLFormInlineRowDescriptorCell {
+    
+    var inlineRowDescriptor : XLFormRowDescriptor?
+    lazy var segmentedControl : UISegmentedControl = {
+        return UISegmentedControl.autolayoutView() as! UISegmentedControl
+    }()
+    
+    override func configure() {
+        super.configure()
+        selectionStyle = .None
+        contentView.addSubview(segmentedControl)
+        contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:|-[segmentedControl]-|", options: .AlignAllCenterY, metrics: nil, views: ["segmentedControl": segmentedControl]))
+        segmentedControl.addTarget(self, action: "valueChanged", forControlEvents: .ValueChanged)
+    }
+    
+    override func update() {
+        super.update()
+        updateSegmentedControl()
+        segmentedControl.selectedSegmentIndex = selectedIndex()
+        segmentedControl.enabled = rowDescriptor?.isDisabled() == false
+    }
+    
+    //MARK: Actions
+    
+    func valueChanged() {
+        inlineRowDescriptor!.value = inlineRowDescriptor!.selectorOptions![segmentedControl.selectedSegmentIndex]
+        formViewController().updateFormRow(inlineRowDescriptor)
+    }
+    
+    //MARK: Helpers
+    
+    func getItems() -> NSMutableArray {
+        let result = NSMutableArray()
+        for option in inlineRowDescriptor!.selectorOptions! {
+            result.addObject(option.displayText())
+        }
+        return result
+    }
+    
+    func updateSegmentedControl() {
+        segmentedControl.removeAllSegments()
+        getItems().enumerateObjectsUsingBlock { [weak self] object, index, stop in
+            self?.segmentedControl.insertSegmentWithTitle(object.displayText(), atIndex: index, animated: false)
+        }
+    }
+    
+    func selectedIndex() -> Int {
+        let formRow = inlineRowDescriptor ?? rowDescriptor
+        if let value = formRow?.value {
+            for option in (formRow?.selectorOptions)! {
+                if option.valueData().isEqual(value.valueData()){
+                    return formRow?.selectorOptions?.indexOf({ $0.isEqual(option) }) ?? -1
+                }
+            }
+        }
+        return -1
+    }
+}

Examples/Swift/SwiftExample/CustomRows/Rating/RatingView/XLRatingView.m

@@ -1,69 +0,0 @@
-//  XLRatingView.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLRatingView.h"
-
-@implementation XLRatingView
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        [self customize];
-    }
-    return self;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self customize];
-    }
-    return self;
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self) {
-        [self customize];
-    }
-    return self;
-}
-
-- (void)customize
-{
-    UIColor * grayColor = [UIColor colorWithRed:(205/255.0) green:(201/255.0) blue:(201/255.0) alpha:1];
-    self.baseColor = grayColor;
-
-    UIColor * goldColor = [UIColor colorWithRed:(255/255.0) green:(215/255.0) blue:0 alpha:1];
-    self.highlightColor = goldColor;
-    self.markFont = [UIFont systemFontOfSize:23.0f];
-    self.translatesAutoresizingMaskIntoConstraints = NO;
-    self.stepInterval = 1.0f;
-}
-
-@end
-

Examples/Swift/SwiftExample/CustomRows/Rating/RatingView/XLRatingView.swift

@@ -27,12 +27,12 @@ class XLRatingView : AXRatingView {
     
     override init(frame: CGRect) {
         super.init(frame: frame)
-        setTranslatesAutoresizingMaskIntoConstraints(false)
+        translatesAutoresizingMaskIntoConstraints = false
     }
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        setTranslatesAutoresizingMaskIntoConstraints(false)
+        translatesAutoresizingMaskIntoConstraints = false
     }
     
     

Examples/Swift/SwiftExample/CustomRows/Rating/XLFormRatingCell.m

@@ -1,62 +0,0 @@
-//  XLFormRatingCell.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLFormRatingCell.h"
-
-NSString * const XLFormRowDescriptorTypeRate = @"XLFormRowDescriptorTypeRate";
-
-@implementation XLFormRatingCell
-
-+(void)load
-{
-    [XLFormViewController.cellClassesForRowDescriptorTypes setObject:NSStringFromClass([XLFormRatingCell class]) forKey:XLFormRowDescriptorTypeRate];
-}
-
-- (void)configure
-{
-    [super configure];
-    
-    self.selectionStyle = UITableViewCellSelectionStyleNone;
-    [self.ratingView addTarget:self action:@selector(rateChanged:) forControlEvents:UIControlEventValueChanged];
-}
-
-- (void)update
-{
-    [super update];
-    
-    self.ratingView.value = [self.rowDescriptor.value floatValue];
-    self.rateTitle.text = self.rowDescriptor.title;
-    
-    [self.ratingView setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-    [self.rateTitle setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-}
-
-#pragma mark - Events
-
--(void)rateChanged:(AXRatingView *)ratingView
-{
-    self.rowDescriptor.value = [NSNumber numberWithFloat:ratingView.value];
-}
-
-@end

Examples/Swift/SwiftExample/CustomRows/Rating/XLFormRatingCell.swift

@@ -25,7 +25,7 @@
 
 let XLFormRowDescriptorTypeRate = "XLFormRowDescriptorTypeRate"
 
-@objc
+
 class XLFormRatingCell : XLFormBaseCell {
     
     @IBOutlet weak var rateTitle: UILabel!
@@ -34,23 +34,23 @@ class XLFormRatingCell : XLFormBaseCell {
         
     override func configure() {
         super.configure()
-        self.selectionStyle = UITableViewCellSelectionStyle.None
-        self.ratingView.addTarget(self, action: "rateChanged:", forControlEvents:UIControlEvents.ValueChanged)
+        selectionStyle = .None
+        ratingView.addTarget(self, action: "rateChanged:", forControlEvents:.ValueChanged)
     }
     
     
     override func update() {
         super.update()
-        self.ratingView.value = self.rowDescriptor!.value!.floatValue
-        self.rateTitle.text = self.rowDescriptor!.title
-        self.ratingView.alpha = self.rowDescriptor!.isDisabled() ? 0.6 : 1
-        self.rateTitle.alpha = self.rowDescriptor!.isDisabled() ? 0.6 : 1
+        ratingView.value = rowDescriptor!.value!.floatValue
+        rateTitle.text = rowDescriptor!.title
+        ratingView.alpha = rowDescriptor!.isDisabled() ? 0.6 : 1
+        rateTitle.alpha = rowDescriptor!.isDisabled() ? 0.6 : 1
     }
     
 //MARK: Events
     
     func rateChanged(ratingView : XLRatingView){
-        self.rowDescriptor!.value = ratingView.value
+        rowDescriptor!.value = ratingView.value
     }
     
 }

Examples/Swift/SwiftExample/CustomRows/Rating/XLFormRatingCell.xib

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="OGo-4x-YLf" customClass="XLFormRatingCell">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="OGo-4x-YLf" customClass="XLFormRatingCell" customModule="SwiftExample" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="478" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OGo-4x-YLf" id="hV6-xt-6pq">
+                <rect key="frame" x="0.0" y="0.0" width="478" height="43"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yhI-dj-sRk" customClass="XLRatingView">
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yhI-dj-sRk" customClass="XLRatingView" customModule="SwiftExample" customModuleProvider="target">
                         <rect key="frame" x="353" y="11" width="115" height="22"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
@@ -28,7 +29,7 @@
                             <constraint firstAttribute="width" constant="150" id="hNG-F9-1wj"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                         <variation key="default">
                             <mask key="constraints">
@@ -48,8 +49,8 @@
                 </constraints>
             </tableViewCellContentView>
             <connections>
-                <outlet property="rateTitle" destination="Vxp-gw-YTt" id="KRL-Lg-C7F"/>
-                <outlet property="ratingView" destination="yhI-dj-sRk" id="QBD-SA-AlI"/>
+                <outlet property="rateTitle" destination="Vxp-gw-YTt" id="0Qh-NC-yq5"/>
+                <outlet property="ratingView" destination="yhI-dj-sRk" id="BKM-pX-m9F"/>
             </connections>
             <point key="canvasLocation" x="301" y="260"/>
         </tableViewCell>

Examples/Swift/SwiftExample/CustomRows/Weekdays/XLFormWeekDaysCell.m

@@ -1,154 +0,0 @@
-//  XLFormWeekDaysCell.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLFormWeekDaysCell.h"
-
-NSString * const XLFormRowDescriptorTypeWeekDays = @"XLFormRowDescriptorTypeWeekDays";
-
-NSString *const kSunday= @"sunday";
-NSString *const kMonday = @"monday";
-NSString *const kTuesday = @"tuesday";
-NSString *const kWednesday = @"wednesday";
-NSString *const kThursday = @"thursday";
-NSString *const kFriday = @"friday";
-NSString *const kSaturday = @"saturday";
-
-@interface XLFormWeekDaysCell()
-@property (weak, nonatomic) IBOutlet UIButton *sundayButton;
-@property (weak, nonatomic) IBOutlet UIButton *mondayButton;
-@property (weak, nonatomic) IBOutlet UIButton *tuesdayButton;
-@property (weak, nonatomic) IBOutlet UIButton *wednesdayButton;
-@property (weak, nonatomic) IBOutlet UIButton *thursdayButton;
-@property (weak, nonatomic) IBOutlet UIButton *fridayButton;
-@property (weak, nonatomic) IBOutlet UIButton *saturdayButton;
-@end
-
-@implementation XLFormWeekDaysCell
-
-+(void)load
-{
-    [XLFormViewController.cellClassesForRowDescriptorTypes setObject:NSStringFromClass([XLFormWeekDaysCell class]) forKey:XLFormRowDescriptorTypeWeekDays];
-}
-
-#pragma mark - XLFormDescriptorCell
-
-- (void)configure
-{
-    [super configure];
-    
-    self.selectionStyle = UITableViewCellSelectionStyleNone;
-    [self configureButtons];
-}
-
--(void)update
-{
-    [super update];
-    [self updateButtons];
-}
-
-#pragma mark - Action
-
-- (IBAction)dayTapped:(id)sender {
-    [self dayTapped:sender day:[self getDayFormButton:sender]];
-}
-
-#pragma mark - Helpers
-
--(void)configureButtons
-{
-    for (UIView *subview in self.contentView.subviews)
-    {
-        if ([subview isKindOfClass:[UIButton class]])
-        {
-            UIButton * button = (UIButton *)subview;
-            [button setImage:[UIImage imageNamed:@"uncheckedDay"] forState:UIControlStateNormal];
-            [button setImage:[UIImage imageNamed:@"checkedDay"] forState:UIControlStateSelected];
-            button.adjustsImageWhenHighlighted = NO;
-            [self imageTopTitleBottom:button];
-        }
-    }
-}
-
--(void)updateButtons
-{
-    NSDictionary * value = self.rowDescriptor.value;
-    self.sundayButton.selected = [[value objectForKey:kSunday] boolValue];
-    self.mondayButton.selected = [[value objectForKey:kMonday] boolValue];
-    self.tuesdayButton.selected = [[value objectForKey:kTuesday] boolValue];
-    self.wednesdayButton.selected = [[value objectForKey:kWednesday] boolValue];
-    self.thursdayButton.selected = [[value objectForKey:kThursday] boolValue];
-    self.fridayButton.selected = [[value objectForKey:kFriday] boolValue];
-    self.saturdayButton.selected = [[value objectForKey:kSaturday] boolValue];
-    
-    [self.sundayButton setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-    [self.mondayButton setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-    [self.tuesdayButton setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-    [self.wednesdayButton setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-    [self.thursdayButton setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-    [self.fridayButton setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-    [self.saturdayButton setAlpha:((self.rowDescriptor.isDisabled) ? .6 : 1)];
-}
-
--(NSString *)getDayFormButton:(id)sender
-{
-    if (sender == self.sundayButton) return kSunday;
-    if (sender == self.mondayButton) return kMonday;
-    if (sender == self.tuesdayButton) return kTuesday;
-    if (sender == self.wednesdayButton) return kWednesday;
-    if (sender == self.thursdayButton) return kThursday;
-    if (sender == self.fridayButton) return kFriday;
-    return kSaturday;
-}
-
--(void)dayTapped:(UIButton *)button day:(NSString *)day
-{
-    button.selected = !button.selected;
-    NSMutableDictionary * value = [self.rowDescriptor.value mutableCopy];
-    [value setObject:@(button.selected) forKey:day];
-    self.rowDescriptor.value = value;
-}
-
--(void)imageTopTitleBottom:(UIButton *)button
-{
-    // the space between the image and text
-    CGFloat spacing = 3.0;
-    
-    // lower the text and push it left so it appears centered
-    //  below the image
-    CGSize imageSize = button.imageView.image.size;
-    button.titleEdgeInsets = UIEdgeInsetsMake(0.0, - imageSize.width, - (imageSize.height + spacing), 0.0);
-    
-    // raise the image and push it right so it appears centered
-    //  above the text
-    CGSize titleSize = [button.titleLabel.text sizeWithAttributes:@{NSFontAttributeName: button.titleLabel.font}];
-    button.imageEdgeInsets = UIEdgeInsetsMake(- (titleSize.height + spacing), 0.0, 0.0, - titleSize.width);
-}
-
-+(CGFloat)formDescriptorCellHeightForRowDescriptor:(XLFormRowDescriptor *)rowDescriptor
-{
-    return 60;
-}
-
-
-@end

Examples/Swift/SwiftExample/CustomRows/Weekdays/XLFormWeekDaysCell.swift

@@ -81,7 +81,7 @@ class XLFormWeekDaysCell : XLFormBaseCell {
     
     override func configure() {
         super.configure()
-        selectionStyle = UITableViewCellSelectionStyle.None
+        selectionStyle = .None
         configureButtons()
     }
     
@@ -109,9 +109,9 @@ class XLFormWeekDaysCell : XLFormBaseCell {
     
     func configureButtons() {
         for subview in contentView.subviews {
-            if let button : UIButton = subview as? UIButton {
-                button.setImage(UIImage(named: "uncheckedDay"), forState: UIControlState.Normal)
-                button.setImage(UIImage(named: "checkedDay"), forState: UIControlState.Selected)
+            if let button = subview as? UIButton {
+                button.setImage(UIImage(named: "uncheckedDay"), forState: .Normal)
+                button.setImage(UIImage(named: "checkedDay"), forState: .Selected)
                 button.adjustsImageWhenHighlighted = false
                 imageTopTitleBottom(button)
             }
@@ -122,13 +122,13 @@ class XLFormWeekDaysCell : XLFormBaseCell {
     func updateButtons() {
 		var value = rowDescriptor!.value as! Dictionary<String, Bool>
 
-        sundayButton.selected = value[XLFormWeekDaysCell.kWeekDay.Sunday.description()]!
-        mondayButton.selected = value[XLFormWeekDaysCell.kWeekDay.Monday.description()]!
-        tuesdayButton.selected = value[XLFormWeekDaysCell.kWeekDay.Tuesday.description()]!
-        wednesdayButton.selected = value[XLFormWeekDaysCell.kWeekDay.Wednesday.description()]!
-        thursdayButton.selected = value[XLFormWeekDaysCell.kWeekDay.Thursday.description()]!
-        fridayButton.selected = value[XLFormWeekDaysCell.kWeekDay.Friday.description()]!
-        saturdayButton.selected = value[XLFormWeekDaysCell.kWeekDay.Saturday.description()]!
+        sundayButton.selected = value[kWeekDay.Sunday.description()]!
+        mondayButton.selected = value[kWeekDay.Monday.description()]!
+        tuesdayButton.selected = value[kWeekDay.Tuesday.description()]!
+        wednesdayButton.selected = value[kWeekDay.Wednesday.description()]!
+        thursdayButton.selected = value[kWeekDay.Thursday.description()]!
+        fridayButton.selected = value[kWeekDay.Friday.description()]!
+        saturdayButton.selected = value[kWeekDay.Saturday.description()]!
         
         sundayButton.alpha = rowDescriptor!.isDisabled() ? 0.6 : 1
         mondayButton.alpha = mondayButton.alpha
@@ -157,19 +157,19 @@ class XLFormWeekDaysCell : XLFormBaseCell {
     func getDayFormButton(button: UIButton) -> String {
         switch button {
         case sundayButton:
-            return XLFormWeekDaysCell.kWeekDay.Sunday.description()
+            return kWeekDay.Sunday.description()
         case mondayButton:
-            return XLFormWeekDaysCell.kWeekDay.Monday.description()
+            return kWeekDay.Monday.description()
         case tuesdayButton:
-            return XLFormWeekDaysCell.kWeekDay.Tuesday.description()
+            return kWeekDay.Tuesday.description()
         case wednesdayButton:
-            return XLFormWeekDaysCell.kWeekDay.Wednesday.description()
+            return kWeekDay.Wednesday.description()
         case thursdayButton:
-            return XLFormWeekDaysCell.kWeekDay.Thursday.description()
+            return kWeekDay.Thursday.description()
         case fridayButton:
-            return XLFormWeekDaysCell.kWeekDay.Friday.description()
+            return kWeekDay.Friday.description()
         default:
-            return XLFormWeekDaysCell.kWeekDay.Saturday.description()
+            return kWeekDay.Saturday.description()
         }
     }
     

Examples/Swift/SwiftExample/CustomRows/Weekdays/XLFormWeekDaysCell.xib

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="60" id="piA-L5-eiN" customClass="XLFormWeekDaysCell">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="60" id="piA-L5-eiN" customClass="XLFormWeekDaysCell" customModule="SwiftExample" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="382" height="50"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="piA-L5-eiN" id="Yr6-3E-keb">
+                <rect key="frame" x="0.0" y="0.0" width="382" height="49"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZAg-Me-yKR">
                         <rect key="frame" x="5" y="0.0" width="53" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="S">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
                         <state key="selected">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         </state>
                         <connections>
                             <action selector="dayTapped:" destination="piA-L5-eiN" eventType="touchUpInside" id="K4V-Xd-Bak"/>
@@ -38,7 +39,7 @@
                         <rect key="frame" x="58" y="0.0" width="53" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="M">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
                         <connections>
@@ -56,7 +57,7 @@
                         <rect key="frame" x="111" y="0.0" width="53" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="T">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
                         <connections>
@@ -74,7 +75,7 @@
                         <rect key="frame" x="164" y="0.0" width="54" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="W">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
                         <connections>
@@ -92,7 +93,7 @@
                         <rect key="frame" x="218" y="0.0" width="53" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="T">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
                         <connections>
@@ -110,7 +111,7 @@
                         <rect key="frame" x="271" y="0.0" width="53" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="F">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
                         <connections>
@@ -128,7 +129,7 @@
                         <rect key="frame" x="324" y="0.0" width="53" height="49"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <state key="normal" title="S">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
                         <connections>

Examples/Swift/SwiftExample/CustomSelectors/CustomSelectorsFormViewController.swift

@@ -28,19 +28,19 @@ import MapKit
 
 class CustomSelectorsFormViewController : XLFormViewController {
 
-    private enum Tags : String {
-        case SelectorMap = "selectorMap"
-        case SelectorMapPopover = "selectorMapPopover"
+    private struct Tags {
+        static let SelectorMap = "selectorMap"
+        static let SelectorMapPopover = "selectorMapPopover"
     }
 
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
     func initializeForm() {
@@ -56,15 +56,15 @@ class CustomSelectorsFormViewController : XLFormViewController {
         form.addFormSection(section)
     
         // Selector Push
-        row = XLFormRowDescriptor(tag: Tags.SelectorMap.rawValue, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Coordinate")
+        row = XLFormRowDescriptor(tag: Tags.SelectorMap, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Coordinate")
         row.action.viewControllerClass = MapViewController.self
         row.valueTransformer = CLLocationValueTrasformer.self
         row.value = CLLocation(latitude: -33, longitude: -56)
         section.addFormRow(row)
         
-        if UIDevice.currentDevice().userInterfaceIdiom == UIUserInterfaceIdiom.Pad {
+        if UIDevice.currentDevice().userInterfaceIdiom == .Pad {
             // Selector PopOver
-            row = XLFormRowDescriptor(tag: Tags.SelectorMapPopover.rawValue, rowType: XLFormRowDescriptorTypeSelectorPopover, title: "Coordinate PopOver")
+            row = XLFormRowDescriptor(tag: Tags.SelectorMapPopover, rowType: XLFormRowDescriptorTypeSelectorPopover, title: "Coordinate PopOver")
             row.action.viewControllerClass = MapViewController.self
             row.valueTransformer = CLLocationValueTrasformer.self
             row.value = CLLocation(latitude: -33, longitude: -56)

Examples/Swift/SwiftExample/CustomSelectors/XLFormRowViewController/CLLocationValueTrasformer.swift

@@ -37,13 +37,10 @@ class CLLocationValueTrasformer : NSValueTransformer {
         return false
     }
     
-    
     override func transformedValue(value: AnyObject?) -> AnyObject? {
-        if let valueData: AnyObject = value {
-            let location = valueData as! CLLocation
+        if let valueData = value, let location = valueData as? CLLocation{
             return String(format: "%0.4f, %0.4f", location.coordinate.latitude, location.coordinate.longitude)
         }
         return nil
     }
-
 }

Examples/Swift/SwiftExample/CustomSelectors/XLFormRowViewController/MapViewController.swift

@@ -31,7 +31,7 @@ class MapAnnotation : NSObject, MKAnnotation {
     @objc var coordinate : CLLocationCoordinate2D
     
     override init() {
-        self.coordinate = CLLocationCoordinate2D(latitude: -33.0, longitude: -56.0)
+        coordinate = CLLocationCoordinate2D(latitude: -33.0, longitude: -56.0)
         super.init()
     }
 }
@@ -40,43 +40,37 @@ class MapAnnotation : NSObject, MKAnnotation {
 class MapViewController : UIViewController, XLFormRowDescriptorViewController, MKMapViewDelegate {
 
     var rowDescriptor: XLFormRowDescriptor?
-    lazy var mapView : MKMapView = {
+    lazy var mapView : MKMapView = { [unowned self] in
         let mapView = MKMapView(frame: self.view.frame)
-        mapView.autoresizingMask = UIViewAutoresizing.FlexibleHeight | UIViewAutoresizing.FlexibleWidth
+        mapView.autoresizingMask = [UIViewAutoresizing.FlexibleHeight, UIViewAutoresizing.FlexibleWidth]
         return mapView
     }()
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
-
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
     }
 
-    required init(coder aDecoder: NSCoder) {
-
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do any additional setup after loading the view.
-        self.view.addSubview(self.mapView)
-        self.mapView.delegate = self
-        if let rowDesc = self.rowDescriptor {
-            if rowDesc.value != nil {
-                let coordinate = (self.rowDescriptor!.value as! CLLocation).coordinate
-                self.mapView.setCenterCoordinate(coordinate, animated: false)
-                self.title = String(format: "%0.4f, %0.4f", self.mapView.centerCoordinate.latitude, self.mapView.centerCoordinate.longitude)
-                let annotation = MapAnnotation()
-                annotation.coordinate = coordinate
-                self.mapView.addAnnotation(annotation)
-            }
+        view.addSubview(mapView)
+        mapView.delegate = self
+        if let value = rowDescriptor?.value as? CLLocation {
+            mapView.setCenterCoordinate(value.coordinate, animated: false)
+            title = String(format: "%0.4f, %0.4f", mapView.centerCoordinate.latitude, mapView.centerCoordinate.longitude)
+            let annotation = MapAnnotation()
+            annotation.coordinate = value.coordinate
+            self.mapView.addAnnotation(annotation)
         }
     }
     
-    
 //MARK - - MKMapViewDelegate
     
-    func mapView(mapView: MKMapView!, viewForAnnotation annotation: MKAnnotation!) -> MKAnnotationView! {
+    func mapView(mapView: MKMapView, viewForAnnotation annotation: MKAnnotation) -> MKAnnotationView? {
 
         let pinAnnotationView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: "annotation")
         pinAnnotationView.pinColor =  MKPinAnnotationColor.Red
@@ -84,12 +78,14 @@ class MapViewController : UIViewController, XLFormRowDescriptorViewController, M
         pinAnnotationView.animatesDrop = true
         return pinAnnotationView
     }
-  
     
-    func mapView(mapView: MKMapView!, annotationView view: MKAnnotationView!, didChangeDragState newState: MKAnnotationViewDragState, fromOldState oldState: MKAnnotationViewDragState) {
-        if (newState == MKAnnotationViewDragState.Ending){
-            self.rowDescriptor!.value = CLLocation(latitude:view.annotation.coordinate.latitude, longitude:view.annotation.coordinate.longitude)
-            self.title = String(format: "%0.4f, %0.4f", view.annotation.coordinate.latitude, view.annotation.coordinate.longitude)
+    
+    func mapView(mapView: MKMapView, annotationView view: MKAnnotationView, didChangeDragState newState: MKAnnotationViewDragState, fromOldState oldState: MKAnnotationViewDragState) {
+        if (newState == .Ending){
+            if let rowDescriptor = rowDescriptor, let annotation = view.annotation {
+                rowDescriptor.value = CLLocation(latitude:annotation.coordinate.latitude, longitude:annotation.coordinate.longitude)
+                self.title = String(format: "%0.4f, %0.4f", annotation.coordinate.latitude, annotation.coordinate.longitude)
+            }
         }
     }
     

Examples/Swift/SwiftExample/CustomSelectors/XLFormRowViewController/MapViewController.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7531" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A279b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MapViewController" customModule="SwiftExample" customModuleProvider="target">
@@ -13,6 +14,7 @@
         <view contentMode="scaleToFill" id="iN0-l3-epB">
             <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <animations/>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
         </view>
     </objects>

Examples/Swift/SwiftExample/Dates/DateAndTimeValueTrasformer.swift

@@ -23,8 +23,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-
-
 class DateValueTrasformer : NSValueTransformer {
 
     override class func transformedValueClass() -> AnyClass {
@@ -36,22 +34,17 @@ class DateValueTrasformer : NSValueTransformer {
         return false
     }
     
-    
     override func transformedValue(value: AnyObject?) -> AnyObject? {
-        if let valueData: AnyObject = value {
-            if valueData.isKindOfClass(NSDate) {
-                let date = valueData as! NSDate
-                let dateFormatter = NSDateFormatter()
-                dateFormatter.dateStyle = NSDateFormatterStyle.FullStyle
-                dateFormatter.timeStyle = NSDateFormatterStyle.NoStyle
-                return dateFormatter.stringFromDate(date)
-            }
+        if let date = value as? NSDate {
+            let dateFormatter = NSDateFormatter()
+            dateFormatter.dateStyle = .FullStyle
+            dateFormatter.timeStyle = .NoStyle
+            return dateFormatter.stringFromDate(date)
         }
         return nil
     }
 }
 
-
 class DateTimeValueTrasformer: NSValueTransformer {
 
     override class func transformedValueClass() -> AnyClass {
@@ -64,14 +57,11 @@ class DateTimeValueTrasformer: NSValueTransformer {
     }
 
     override func transformedValue(value: AnyObject?) -> AnyObject? {
-        if let valueData: AnyObject = value {
-            if valueData.isKindOfClass(NSDate) {
-                let date = valueData as! NSDate
-                let dateFormatter = NSDateFormatter()
-                dateFormatter.dateStyle = NSDateFormatterStyle.MediumStyle
-                dateFormatter.timeStyle = NSDateFormatterStyle.ShortStyle
-                return dateFormatter.stringFromDate(date)
-            }
+        if let date = value as? NSDate {
+            let dateFormatter = NSDateFormatter()
+            dateFormatter.dateStyle = .MediumStyle
+            dateFormatter.timeStyle = .ShortStyle
+            return dateFormatter.stringFromDate(date)
         }
         return nil
     }

Examples/Swift/SwiftExample/Dates/DatesFormViewController.swift

@@ -2,7 +2,7 @@
 //  DatesFormViewController.swift
 //  XLForm ( https://github.com/xmartlabs/XLForm )
 // 
-//  Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
+//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,42 +26,41 @@
 
 class DatesFormViewController: XLFormViewController {
 
-    private enum Tags : String {
-        case DateInline = "dateInline"
-        case TimeInline = "timeInline"
-        case DateTimeInline = "dateTimeInline"
-        case CountDownTimerInline = "countDownTimerInline"
-        case DatePicker = "datePicker"
-        case Date = "date"
-        case Time = "time"
-        case DateTime = "dateTime"
-        case CountDownTimer = "countDownTimer"
+    private struct Tags {
+        static let DateInline = "dateInline"
+        static let TimeInline = "timeInline"
+        static let DateTimeInline = "dateTimeInline"
+        static let CountDownTimerInline = "countDownTimerInline"
+        static let DatePicker = "datePicker"
+        static let Date = "date"
+        static let Time = "time"
+        static let DateTime = "dateTime"
+        static let CountDownTimer = "countDownTimer"
     }
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        let barButton = UIBarButtonItem(title: "Disable", style: UIBarButtonItemStyle.Plain, target: self, action: "disableEnable:")
+        let barButton = UIBarButtonItem(title: "Disable", style: .Plain, target: self, action: "disableEnable:")
         barButton.possibleTitles = Set(["Disable", "Enable"])
-        self.navigationItem.rightBarButtonItem = barButton
+        navigationItem.rightBarButtonItem = barButton
     }
     
     
-    func disableEnable(button : UIBarButtonItem)
-    {
-        self.form.disabled = !self.form.disabled
-        button.title = self.form.disabled ? "Enable" : "Disable"
-        self.tableView.endEditing(true)
-        self.tableView.reloadData()
+    func disableEnable(button : UIBarButtonItem){
+        form.disabled = !form.disabled
+        button.title = form.disabled ? "Enable" : "Disable"
+        tableView.endEditing(true)
+        tableView.reloadData()
     }
     
     func initializeForm() {
@@ -75,22 +74,22 @@ class DatesFormViewController: XLFormViewController {
         form.addFormSection(section)
         
         // Date
-        row = XLFormRowDescriptor(tag: Tags.DateInline.rawValue, rowType: XLFormRowDescriptorTypeDateInline, title:"Date")
+        row = XLFormRowDescriptor(tag: Tags.DateInline, rowType: XLFormRowDescriptorTypeDateInline, title:"Date")
         row.value = NSDate()
         section.addFormRow(row)
         
         // Time
-        row = XLFormRowDescriptor(tag: Tags.TimeInline.rawValue, rowType: XLFormRowDescriptorTypeTimeInline, title: "Time")
+        row = XLFormRowDescriptor(tag: Tags.TimeInline, rowType: XLFormRowDescriptorTypeTimeInline, title: "Time")
         row.value = NSDate()
         section.addFormRow(row)
         
         // DateTime
-        row = XLFormRowDescriptor(tag: Tags.DateTimeInline.rawValue, rowType: XLFormRowDescriptorTypeDateTimeInline, title: "Date Time")
+        row = XLFormRowDescriptor(tag: Tags.DateTimeInline, rowType: XLFormRowDescriptorTypeDateTimeInline, title: "Date Time")
         row.value = NSDate()
         section.addFormRow(row)
         
         // CountDownTimer
-        row = XLFormRowDescriptor(tag: Tags.CountDownTimerInline.rawValue, rowType:XLFormRowDescriptorTypeCountDownTimerInline, title:"Countdown Timer")
+        row = XLFormRowDescriptor(tag: Tags.CountDownTimerInline, rowType:XLFormRowDescriptorTypeCountDownTimerInline, title:"Countdown Timer")
         row.value = NSDate()
         section.addFormRow(row)
         
@@ -100,25 +99,25 @@ class DatesFormViewController: XLFormViewController {
 
         
         // Date
-        row = XLFormRowDescriptor(tag: Tags.Date.rawValue, rowType:XLFormRowDescriptorTypeDate, title:"Date")
+        row = XLFormRowDescriptor(tag: Tags.Date, rowType:XLFormRowDescriptorTypeDate, title:"Date")
         row.value = NSDate()
         row.cellConfigAtConfigure["minimumDate"] = NSDate()
         row.cellConfigAtConfigure["maximumDate"] = NSDate(timeIntervalSinceNow: 60*60*24*3)
         section.addFormRow(row)
         
         // Time
-        row = XLFormRowDescriptor(tag: Tags.Time.rawValue, rowType: XLFormRowDescriptorTypeTime, title: "Time")
+        row = XLFormRowDescriptor(tag: Tags.Time, rowType: XLFormRowDescriptorTypeTime, title: "Time")
         row.cellConfigAtConfigure["minuteInterval"] = 10
         row.value = NSDate()
         section.addFormRow(row)
         
         // DateTime
-        row = XLFormRowDescriptor(tag: Tags.DateTime.rawValue, rowType: XLFormRowDescriptorTypeDateTime, title: "Date Time")
+        row = XLFormRowDescriptor(tag: Tags.DateTime, rowType: XLFormRowDescriptorTypeDateTime, title: "Date Time")
         row.value = NSDate()
         section.addFormRow(row)
         
         // CountDownTimer
-        row = XLFormRowDescriptor(tag: Tags.CountDownTimer.rawValue, rowType: XLFormRowDescriptorTypeCountDownTimer, title: "Countdown Timer")
+        row = XLFormRowDescriptor(tag: Tags.CountDownTimer, rowType: XLFormRowDescriptorTypeCountDownTimer, title: "Countdown Timer")
         row.value = NSDate()
         section.addFormRow(row)
         
@@ -140,7 +139,7 @@ class DatesFormViewController: XLFormViewController {
         form.addFormSection(section)
 
         // DatePicker
-        row = XLFormRowDescriptor(tag: Tags.DatePicker.rawValue, rowType:XLFormRowDescriptorTypeDatePicker)
+        row = XLFormRowDescriptor(tag: Tags.DatePicker, rowType:XLFormRowDescriptorTypeDatePicker)
         row.cellConfigAtConfigure["datePicker.datePickerMode"] = UIDatePickerMode.Date.rawValue
         row.value = NSDate()
         section.addFormRow(row)
@@ -154,7 +153,7 @@ class DatesFormViewController: XLFormViewController {
     
     override func formRowDescriptorValueHasChanged(formRow: XLFormRowDescriptor!, oldValue: AnyObject!, newValue: AnyObject!) {
         super.formRowDescriptorValueHasChanged(formRow, oldValue: oldValue, newValue: newValue)
-        if  formRow.tag ==  Tags.DatePicker.rawValue {
+        if formRow.tag ==  Tags.DatePicker {
             let alertView = UIAlertView(title: "DatePicker", message: "Value Has changed!", delegate: self, cancelButtonTitle: "OK")
             alertView.show()
         }

Examples/Swift/SwiftExample/DynamicSelector/DynamicSelectorsFormViewController.h

@@ -1,31 +0,0 @@
-//
-//  DynamicSelectorsFormViewController.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLForm.h"
-#import "XLFormViewController.h"
-
-@interface DynamicSelectorsFormViewController : XLFormViewController
-
-@end

Examples/Swift/SwiftExample/DynamicSelector/DynamicSelectorsFormViewController.m

@@ -1,66 +0,0 @@
-//
-//  DynamicSelectorsFormViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "UsersTableViewController.h"
-#import "DynamicSelectorsFormViewController.h"
-
-NSString *const kSelectorUser = @"selectorUser";
-NSString *const kSelectorUserPopover = @"kSelectorUserPopover";
-
-@implementation DynamicSelectorsFormViewController
-
-
--(id)init
-{
-    self = [super init];
-    if (self) {
-        XLFormDescriptor * form = [XLFormDescriptor formDescriptorWithTitle:@"Selectors"];
-        XLFormSectionDescriptor * section;
-        XLFormRowDescriptor * row;
-        
-        // Basic Information
-        section = [XLFormSectionDescriptor formSectionWithTitle:@"Dynamic Selectors"];
-        section.footerTitle = @"DynamicSelectorsFormViewController.h";
-        [form addFormSection:section];
-        
-        
-        // Selector Push
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorUser rowType:XLFormRowDescriptorTypeSelectorPush title:@"User"];
-        row.action.viewControllerClass = [UsersTableViewController class];
-        [section addFormRow:row];
-        
-        if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad){
-            // Selector PopOver
-            row = [XLFormRowDescriptor formRowDescriptorWithTag:kSelectorUserPopover rowType:XLFormRowDescriptorTypeSelectorPopover title:@"User Popover"];
-            row.action.viewControllerClass = [UsersTableViewController class];
-            [section addFormRow:row];
-        }
-        self.form = form;
-    }
-    return self;
-}
-
-
-@end

Examples/Swift/SwiftExample/DynamicSelector/DynamicSelectorsFormViewController.swift

@@ -27,12 +27,12 @@ class DynamicSelectorsFormViewController : XLFormViewController {
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
     func initializeForm() {
@@ -51,7 +51,7 @@ class DynamicSelectorsFormViewController : XLFormViewController {
         row.action.viewControllerClass = UsersTableViewController.self
         section.addFormRow(row)
         
-        if UIDevice.currentDevice().userInterfaceIdiom == UIUserInterfaceIdiom.Pad {
+        if UIDevice.currentDevice().userInterfaceIdiom == .Pad {
             // Selector PopOver
             row = XLFormRowDescriptor(tag: "selectorUserPopover", rowType:XLFormRowDescriptorTypeSelectorPopover, title:"User Popover")
             row.action.viewControllerClass = UsersTableViewController.self

Examples/Swift/SwiftExample/DynamicSelector/UsersTableViewController.h

@@ -1,31 +0,0 @@
-//
-//  UsersTableViewController.h
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "XLFormRowDescriptor.h"
-#import "XLTableViewController.h"
-
-@interface UsersTableViewController : XLTableViewController <XLFormRowDescriptorViewController, XLFormRowDescriptorPopoverViewController>
-
-@end

Examples/Swift/SwiftExample/DynamicSelector/UsersTableViewController.m

@@ -1,245 +0,0 @@
-//
-//  UsersTableViewController.m
-//  XLForm ( https://github.com/xmartlabs/XLForm )
-//
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "UsersTableViewController.h"
-#import "UserLocalDataLoader.h"
-#import "UserRemoteDataLoader.h"
-#import "User+Additions.h"
-
-// AFNetworking
-#import <AFNetworking/UIImageView+AFNetworking.h>
-
-
-@interface UserCell : UITableViewCell
-
-@property (nonatomic) UIImageView * userImage;
-@property (nonatomic) UILabel * userName;
-
-@end
-
-@implementation UserCell
-
-@synthesize userImage = _userImage;
-@synthesize userName  = _userName;
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
-{
-    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
-    if (self) {
-        // Initialization code
-        
-        [self.contentView addSubview:self.userImage];
-        [self.contentView addSubview:self.userName];
-        
-        [self.contentView addConstraints:[self layoutConstraints]];
-    }
-    return self;
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated
-{
-    [super setSelected:selected animated:animated];
-    
-    // Configure the view for the selected state
-}
-
-
-#pragma mark - Views
-
--(UIImageView *)userImage
-{
-    if (_userImage) return _userImage;
-    _userImage = [UIImageView new];
-    [_userImage setTranslatesAutoresizingMaskIntoConstraints:NO];
-    _userImage.layer.masksToBounds = YES;
-    _userImage.layer.cornerRadius = 10.0f;
-    return _userImage;
-}
-
--(UILabel *)userName
-{
-    if (_userName) return _userName;
-    _userName = [UILabel new];
-    [_userName setTranslatesAutoresizingMaskIntoConstraints:NO];
-    _userName.font = [UIFont fontWithName:@"HelveticaNeue" size:15.f];
-    
-    return _userName;
-}
-
-#pragma mark - Layout Constraints
-
--(NSArray *)layoutConstraints{
-    
-    NSMutableArray * result = [NSMutableArray array];
-    
-    NSDictionary * views = @{ @"image": self.userImage,
-                              @"name": self.userName};
-    
-    
-    NSDictionary *metrics = @{@"imgSize":@50.0,
-                              @"margin" :@12.0};
-    
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(margin)-[image(imgSize)]-[name]"
-                                                                        options:NSLayoutFormatAlignAllTop
-                                                                        metrics:metrics
-                                                                          views:views]];
-    
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(margin)-[image(imgSize)]"
-                                                                        options:0
-                                                                        metrics:metrics
-                                                                          views:views]];
-    return result;
-}
-
-
-@end
-
-
-@interface UsersTableViewController ()
-
-@end
-
-@implementation UsersTableViewController
-
-@synthesize rowDescriptor = _rowDescriptor;
-@synthesize popoverController = __popoverController;
-
-static NSString *const kCellIdentifier = @"CellIdentifier";
-
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-        [self initialize];
-    }
-    return self;
-}
-
--(void)initialize
-{
-    // Enable the pagination
-    self.loadingPagingEnabled = YES;
-    
-    // Support Search Controller
-    self.supportSearchController = YES;
-    
-    [self setLocalDataLoader:[[UserLocalDataLoader alloc] init]];
-    [self setRemoteDataLoader:[[UserRemoteDataLoader alloc] init]];
-    
-    // Search
-    [self setSearchLocalDataLoader:[[UserLocalDataLoader alloc] init]];
-    [self setSearchRemoteDataLoader:[[UserRemoteDataLoader alloc] init]];
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-	// Do any additional setup after loading the view.
-    
-    // SearchBar
-    self.tableView.tableHeaderView = self.searchDisplayController.searchBar;
-    
-    // register cells
-    [self.searchDisplayController.searchResultsTableView registerClass:[UserCell class] forCellReuseIdentifier:kCellIdentifier];
-    [self.tableView registerClass:[UserCell class] forCellReuseIdentifier:kCellIdentifier];
-    
-    [self customizeAppearance];
-}
-
-#pragma mark - UITableViewDataSource
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UserCell *cell = (UserCell *) [tableView dequeueReusableCellWithIdentifier:kCellIdentifier forIndexPath:indexPath];;
-    
-    User * user = nil;
-    if (tableView == self.tableView){
-        user = (User *)[self.localDataLoader objectAtIndexPath:indexPath];
-    }
-    else{
-        user = (User *)[self.searchLocalDataLoader objectAtIndexPath:indexPath];
-    }
-    
-    cell.userName.text = user.userName;
-    NSMutableURLRequest* imageRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:user.userImageURL]];
-    [imageRequest setValue:@"image/*" forHTTPHeaderField:@"Accept"];
-    __typeof__(cell) __weak weakCell = cell;
-    [cell.userImage setImageWithURLRequest: imageRequest
-                          placeholderImage:[User defaultProfileImage]
-                                   success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
-                                       if (image) {
-                                           [weakCell.userImage setImage:image];
-                                       }
-                                   }
-                                   failure:^(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error) {
-                                   }];
-    cell.accessoryType = [[self.rowDescriptor.value formValue] isEqual:user.userId] ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
-    return cell;
-}
-
-- (CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    return 73.0f;
-}
-
-
-#pragma mark - UITableViewDelegate
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    User * user = nil;
-    if (tableView == self.tableView){
-        user = (User *)[self.localDataLoader objectAtIndexPath:indexPath];
-    }
-    else{
-        user = (User *)[self.searchLocalDataLoader objectAtIndexPath:indexPath];
-    }
-    self.rowDescriptor.value = user;
-    
-    if (self.popoverController){
-        [self.popoverController dismissPopoverAnimated:YES];
-        [self.popoverController.delegate popoverControllerDidDismissPopover:self.popoverController];
-    }
-    else if ([self.parentViewController isKindOfClass:[UINavigationController class]]){
-        [self.navigationController popViewControllerAnimated:YES];
-    }
-}
-
-
-#pragma mark - Helpers
-
--(void)customizeAppearance
-{
-    [[self navigationItem] setTitle:@"Select a User"];
-    
-    [self.tableView setBackgroundColor:[UIColor colorWithWhite:0.9 alpha:1.0]];
-    [self.tableView setTableFooterView:[[UIView alloc] initWithFrame:CGRectZero]];
-    
-    [self.searchDisplayController.searchResultsTableView setBackgroundColor:[UIColor colorWithWhite:0.9 alpha:1.0]];
-    [self.searchDisplayController.searchResultsTableView setTableFooterView:[[UIView alloc] initWithFrame:CGRectZero]];
-}
-
-
-@end

Examples/Swift/SwiftExample/DynamicSelector/UsersTableViewController.swift

@@ -1,8 +1,8 @@
 //
-//  UsersTableViewController.m
+//  UsersTableViewController.swift
 //  XLForm ( https://github.com/xmartlabs/XLForm )
 //
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
+//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,223 +23,188 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import "UsersTableViewController.h"
-#import "UserLocalDataLoader.h"
-#import "UserRemoteDataLoader.h"
-#import "User+Additions.h"
 
-// AFNetworking
-#import <AFNetworking/UIImageView+AFNetworking.h>
+class UserCell : UITableViewCell {
 
+    lazy var userImage : UIImageView = {
+        let tempUserImage = UIImageView()
+        tempUserImage.translatesAutoresizingMaskIntoConstraints = false
+        tempUserImage.layer.masksToBounds = true
+        tempUserImage.layer.cornerRadius = 10.0
+        return tempUserImage
+    }()
 
-@interface UserCell : UITableViewCell
+    
+    lazy var userName : UILabel = {
+        let tempUserName = UILabel()
+        tempUserName.translatesAutoresizingMaskIntoConstraints = false
+        tempUserName.font = UIFont.systemFontOfSize(15.0)
+        return tempUserName
+    }()
 
-@property (nonatomic) UIImageView * userImage;
-@property (nonatomic) UILabel * userName;
-
-@end
-
-@implementation UserCell
-
-@synthesize userImage = _userImage;
-@synthesize userName  = _userName;
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
-{
-    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
-    if (self) {
+    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
         // Initialization code
+    
+        contentView.addSubview(userImage)
+        contentView.addSubview(userName)
+        contentView.addConstraints(layoutConstraints())
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func setSelected(selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
         
-        [self.contentView addSubview:self.userImage];
-        [self.contentView addSubview:self.userName];
+    }
+    
+// MARK: - Layout Constraints
+
+    func layoutConstraints() -> [NSLayoutConstraint]{
+        let views = ["image": self.userImage, "name": self.userName ]
+        let metrics = [ "imgSize": 50.0, "margin": 12.0]
         
-        [self.contentView addConstraints:[self layoutConstraints]];
-    }
-    return self;
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated
-{
-    [super setSelected:selected animated:animated];
-    
-    // Configure the view for the selected state
-}
-
-
-#pragma mark - Views
-
--(UIImageView *)userImage
-{
-    if (_userImage) return _userImage;
-    _userImage = [UIImageView new];
-    [_userImage setTranslatesAutoresizingMaskIntoConstraints:NO];
-    _userImage.layer.masksToBounds = YES;
-    _userImage.layer.cornerRadius = 10.0f;
-    return _userImage;
-}
-
--(UILabel *)userName
-{
-    if (_userName) return _userName;
-    _userName = [UILabel new];
-    [_userName setTranslatesAutoresizingMaskIntoConstraints:NO];
-    _userName.font = [UIFont fontWithName:@"HelveticaNeue" size:15.f];
-    
-    return _userName;
-}
-
-#pragma mark - Layout Constraints
-
--(NSArray *)layoutConstraints{
-    
-    NSMutableArray * result = [NSMutableArray array];
-    
-    NSDictionary * views = @{ @"image": self.userImage,
-                              @"name": self.userName};
-    
-    
-    NSDictionary *metrics = @{@"imgSize":@50.0,
-                              @"margin" :@12.0};
-    
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(margin)-[image(imgSize)]-[name]"
-                                                                        options:NSLayoutFormatAlignAllTop
-                                                                        metrics:metrics
-                                                                          views:views]];
-    
-    [result addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(margin)-[image(imgSize)]"
-                                                                        options:0
-                                                                        metrics:metrics
-                                                                          views:views]];
-    return result;
-}
-
-
-@end
-
-
-@interface UsersTableViewController ()
-
-@end
-
-@implementation UsersTableViewController
-
-@synthesize rowDescriptor = _rowDescriptor;
-@synthesize popoverController = __popoverController;
-
-static NSString *const kCellIdentifier = @"CellIdentifier";
-
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-        [self initialize];
-    }
-    return self;
-}
-
--(void)initialize
-{
-    // Enable the pagination
-    self.loadingPagingEnabled = YES;
-    
-    // Support Search Controller
-    self.supportSearchController = YES;
-    
-    [self setLocalDataLoader:[[UserLocalDataLoader alloc] init]];
-    [self setRemoteDataLoader:[[UserRemoteDataLoader alloc] init]];
-    
-    // Search
-    [self setSearchLocalDataLoader:[[UserLocalDataLoader alloc] init]];
-    [self setSearchRemoteDataLoader:[[UserRemoteDataLoader alloc] init]];
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-	// Do any additional setup after loading the view.
-    
-    // SearchBar
-    self.tableView.tableHeaderView = self.searchDisplayController.searchBar;
-    
-    // register cells
-    [self.searchDisplayController.searchResultsTableView registerClass:[UserCell class] forCellReuseIdentifier:kCellIdentifier];
-    [self.tableView registerClass:[UserCell class] forCellReuseIdentifier:kCellIdentifier];
-    
-    [self customizeAppearance];
-}
-
-#pragma mark - UITableViewDataSource
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UserCell *cell = (UserCell *) [tableView dequeueReusableCellWithIdentifier:kCellIdentifier forIndexPath:indexPath];;
-    
-    User * user = nil;
-    if (tableView == self.tableView){
-        user = (User *)[self.localDataLoader objectAtIndexPath:indexPath];
-    }
-    else{
-        user = (User *)[self.searchLocalDataLoader objectAtIndexPath:indexPath];
+        var result = NSLayoutConstraint.constraintsWithVisualFormat("H:|-(margin)-[image(imgSize)]-[name]", options:.AlignAllTop, metrics: metrics, views: views)
+        result += NSLayoutConstraint.constraintsWithVisualFormat("V:|-(margin)-[image(imgSize)]", options:NSLayoutFormatOptions(), metrics:metrics, views: views)
+        return result
     }
     
-    cell.userName.text = user.userName;
-    NSMutableURLRequest* imageRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:user.userImageURL]];
-    [imageRequest setValue:@"image/*" forHTTPHeaderField:@"Accept"];
-    __typeof__(cell) __weak weakCell = cell;
-    [cell.userImage setImageWithURLRequest: imageRequest
-                          placeholderImage:[User defaultProfileImage]
-                                   success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
-                                       if (image) {
-                                           [weakCell.userImage setImage:image];
-                                       }
-                                   }
-                                   failure:^(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error) {
-                                   }];
-    cell.accessoryType = [[self.rowDescriptor.value formValue] isEqual:user.userId] ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
-    return cell;
-}
-
-- (CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    return 73.0f;
-}
-
-
-#pragma mark - UITableViewDelegate
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    User * user = nil;
-    if (tableView == self.tableView){
-        user = (User *)[self.localDataLoader objectAtIndexPath:indexPath];
-    }
-    else{
-        user = (User *)[self.searchLocalDataLoader objectAtIndexPath:indexPath];
-    }
-    self.rowDescriptor.value = user;
     
-    if (self.popoverController){
-        [self.popoverController dismissPopoverAnimated:YES];
-        [self.popoverController.delegate popoverControllerDidDismissPopover:self.popoverController];
-    }
-    else if ([self.parentViewController isKindOfClass:[UINavigationController class]]){
-        [self.navigationController popViewControllerAnimated:YES];
-    }
 }
 
 
-#pragma mark - Helpers
+private let _UsersJSONSerializationSharedInstance = UsersJSONSerialization()
 
--(void)customizeAppearance
-{
-    [[self navigationItem] setTitle:@"Select a User"];
+class UsersJSONSerialization {
     
-    [self.tableView setBackgroundColor:[UIColor colorWithWhite:0.9 alpha:1.0]];
-    [self.tableView setTableFooterView:[[UIView alloc] initWithFrame:CGRectZero]];
+    lazy var userData : Array<AnyObject>? = {
+        let dataString =
+        "[" +
+        "{\"id\":1,\"name\":\"Apu Nahasapeemapetilon\",\"imageName\":\"Apu_Nahasapeemapetilon.png\"}," +
+        "{\"id\":7,\"name\":\"Bart Simpsons\",\"imageName\":\"Bart_Simpsons.png\"}," +
+        "{\"id\":8,\"name\":\"Homer Simpsons\",\"imageName\":\"Homer_Simpsons.png\"}," +
+        "{\"id\":9,\"name\":\"Lisa Simpsons\",\"imageName\":\"Lisa_Simpsons.png\"}," +
+        "{\"id\":2,\"name\":\"Maggie Simpsons\",\"imageName\":\"Maggie_Simpsons.png\"}," +
+        "{\"id\":3,\"name\":\"Marge Simpsons\",\"imageName\":\"Marge_Simpsons.png\"}," +
+        "{\"id\":4,\"name\":\"Montgomery Burns\",\"imageName\":\"Montgomery_Burns.png\"}," +
+        "{\"id\":5,\"name\":\"Ned Flanders\",\"imageName\":\"Ned_Flanders.png\"}," +
+        "{\"id\":6,\"name\":\"Otto Mann\",\"imageName\":\"Otto_Mann.png\"}]"
+        let jsonData = dataString.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: true)
+        do {
+            let result = try NSJSONSerialization.JSONObjectWithData(jsonData!, options: NSJSONReadingOptions()) as! Array<AnyObject>
+            return result
+        }
+        catch let error as NSError {
+            print("\(error)")
+        }
+        return nil
+    }()
+    
+    class var sharedInstance: UsersJSONSerialization {
+        return _UsersJSONSerializationSharedInstance
+    }
+
     
-    [self.searchDisplayController.searchResultsTableView setBackgroundColor:[UIColor colorWithWhite:0.9 alpha:1.0]];
-    [self.searchDisplayController.searchResultsTableView setTableFooterView:[[UIView alloc] initWithFrame:CGRectZero]];
 }
 
+class User: NSObject,  XLFormOptionObject {
+    
+    let userId: Int
+    let userName : String
+    let userImage: String
+    
+    init(userId: Int,  userName: String, userImage: String){
+        self.userId = userId
+        self.userImage = userImage
+        self.userName = userName
+    }
+    
+    func formDisplayText() -> String {
+        return self.userName
+    }
+    
+    func formValue() -> AnyObject {
+        return self.userId
+    }
+    
+}
 
-@end
+class UsersTableViewController : UITableViewController, XLFormRowDescriptorViewController, XLFormRowDescriptorPopoverViewController {
+
+    
+    var rowDescriptor : XLFormRowDescriptor?
+    var popoverController : UIPopoverController?
+    
+    var userCell : UserCell?
+    
+    private let kUserCellIdentifier = "UserCell"
+    
+    
+    override init(style: UITableViewStyle) {
+        super.init(style: style);
+    }
+    
+    override init(nibName nibNameOrNil: String!, bundle nibBundleOrNil: NSBundle!) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        tableView.registerClass(UserCell.self, forCellReuseIdentifier: kUserCellIdentifier)
+        tableView.tableFooterView = UIView(frame: CGRect.zero)
+    }
+    
+// MARK: UITableViewDataSource
+    
+    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return UsersJSONSerialization.sharedInstance.userData!.count
+    }
+    
+    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+        let cell: UserCell = tableView.dequeueReusableCellWithIdentifier(self.kUserCellIdentifier, forIndexPath: indexPath) as! UserCell
+        let usersData = UsersJSONSerialization.sharedInstance.userData! as! Array<Dictionary<String, AnyObject>>
+        let userData = usersData[indexPath.row] as Dictionary<String, AnyObject>
+        let userId = userData["id"] as! Int
+        cell.userName.text = userData["name"] as? String
+        cell.userImage.image = UIImage(named: (userData["imageName"] as? String)!)
+        if let value = rowDescriptor?.value {
+            cell.accessoryType = value.formValue().isEqual(userId) ? .Checkmark : .None
+        }
+        return cell;
+
+    }
+    
+    override func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+        return 73.0
+    }
+    
+
+//MARK: UITableViewDelegate
+
+    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+        
+        let usersData = UsersJSONSerialization.sharedInstance.userData! as! Array<Dictionary<String, AnyObject>>
+        let userData = usersData[indexPath.row] as Dictionary<String, AnyObject>
+        let user = User(userId: (userData["id"] as! Int), userName: userData["name"] as! String, userImage: userData["imageName"] as! String)
+        self.rowDescriptor!.value = user;
+        if let porpOver = self.popoverController {
+            porpOver.dismissPopoverAnimated(true)
+            porpOver.delegate?.popoverControllerDidDismissPopover!(porpOver)
+        }
+        else if parentViewController is UINavigationController {
+            navigationController?.popViewControllerAnimated(true)
+        }
+    }
+    
+    
+}

Examples/Swift/SwiftExample/ExamplesFormViewController.swift

@@ -28,32 +28,32 @@
 
 class ExamplesFormViewController : XLFormViewController {
 
-    private enum Tags : String {
-        case RealExample = "RealExamples"
-        case TextFieldAndTextView = "TextFieldAndTextView"
-        case Selectors = "Selectors"
-        case Othes = "Others"
-        case Dates = "Dates"
-        case Predicates = "BasicPredicates"
-        case BlogExample = "BlogPredicates"
-        case Multivalued = "Multivalued"
-        case MultivaluedOnlyReorder = "MultivaluedOnlyReorder"
-        case MultivaluedOnlyInsert = "MultivaluedOnlyInsert"
-        case MultivaluedOnlyDelete = "MultivaluedOnlyDelete"
-        case Validations = "Validations"
-        case UICusomization = "Customization"
-        case Custom = "Custom"
-        case AccessoryView = "Accessory View"
+    private struct Tags {
+        static let RealExample = "RealExamples"
+        static let TextFieldAndTextView = "TextFieldAndTextView"
+        static let Selectors = "Selectors"
+        static let Othes = "Others"
+        static let Dates = "Dates"
+        static let Predicates = "BasicPredicates"
+        static let BlogExample = "BlogPredicates"
+        static let Multivalued = "Multivalued"
+        static let MultivaluedOnlyReorder = "MultivaluedOnlyReorder"
+        static let MultivaluedOnlyInsert = "MultivaluedOnlyInsert"
+        static let MultivaluedOnlyDelete = "MultivaluedOnlyDelete"
+        static let Validations = "Validations"
+        static let UICusomization = "Customization"
+        static let Custom = "Custom"
+        static let AccessoryView = "Accessory View"
     }
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
     
@@ -70,8 +70,8 @@ class ExamplesFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         // NativeEventFormViewController
-        row = XLFormRowDescriptor(tag: Tags.RealExample.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "iOS Calendar Event Form")
-        row.action.formSegueIdenfifier = "NativeEventNavigationViewControllerSegue"
+        row = XLFormRowDescriptor(tag: Tags.RealExample, rowType: XLFormRowDescriptorTypeButton, title: "iOS Calendar Event Form")
+        row.action.formSegueIdentifier = "NativeEventNavigationViewControllerSegue"
         section.addFormRow(row)
 
         section = XLFormSectionDescriptor.formSectionWithTitle("This form is actually an example")
@@ -80,25 +80,25 @@ class ExamplesFormViewController : XLFormViewController {
         
 
         // TextFieldAndTextView
-        row = XLFormRowDescriptor(tag: Tags.TextFieldAndTextView.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Text Fields")
+        row = XLFormRowDescriptor(tag: Tags.TextFieldAndTextView, rowType: XLFormRowDescriptorTypeButton, title: "Text Fields")
         row.action.viewControllerClass = InputsFormViewController.self
         section.addFormRow(row)
         
     
         // Selectors
-        row = XLFormRowDescriptor(tag: Tags.Selectors.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Selectors")
-        row.action.formSegueIdenfifier = "SelectorsFormViewControllerSegue"
+        row = XLFormRowDescriptor(tag: Tags.Selectors, rowType: XLFormRowDescriptorTypeButton, title: "Selectors")
+        row.action.formSegueIdentifier = "SelectorsFormViewControllerSegue"
         section.addFormRow(row)
         
     
         // Dates
-        row = XLFormRowDescriptor(tag: Tags.Dates.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Date & Time")
+        row = XLFormRowDescriptor(tag: Tags.Dates, rowType: XLFormRowDescriptorTypeButton, title: "Date & Time")
         row.action.viewControllerClass = DatesFormViewController.self
         section.addFormRow(row)
         
         // Others
-        row = XLFormRowDescriptor(tag: Tags.Othes.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Other Rows")
-        row.action.formSegueIdenfifier = "OthersFormViewControllerSegue"
+        row = XLFormRowDescriptor(tag: Tags.Othes, rowType: XLFormRowDescriptorTypeButton, title: "Other Rows")
+        row.action.formSegueIdentifier = "OthersFormViewControllerSegue"
         section.addFormRow(row)
         
         
@@ -106,19 +106,19 @@ class ExamplesFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         
-        row = XLFormRowDescriptor(tag: Tags.Multivalued.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Multivalued Sections")
+        row = XLFormRowDescriptor(tag: Tags.Multivalued, rowType: XLFormRowDescriptorTypeButton, title: "Multivalued Sections")
         row.action.viewControllerClass = MultivaluedFormViewController.self
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.MultivaluedOnlyReorder.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Multivalued Only Reorder")
+        row = XLFormRowDescriptor(tag: Tags.MultivaluedOnlyReorder, rowType: XLFormRowDescriptorTypeButton, title: "Multivalued Only Reorder")
         row.action.viewControllerClass = MultivaluedOnlyReorderViewController.self
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.MultivaluedOnlyInsert.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Multivalued Only Insert")
+        row = XLFormRowDescriptor(tag: Tags.MultivaluedOnlyInsert, rowType: XLFormRowDescriptorTypeButton, title: "Multivalued Only Insert")
         row.action.viewControllerClass = MultivaluedOnlyInserViewController.self
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.MultivaluedOnlyDelete.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Multivalued Only Delete")
+        row = XLFormRowDescriptor(tag: Tags.MultivaluedOnlyDelete, rowType: XLFormRowDescriptorTypeButton, title: "Multivalued Only Delete")
         row.action.viewControllerClass = MultivaluedOnlyDeleteViewController.self
         section.addFormRow(row)
         
@@ -126,7 +126,7 @@ class ExamplesFormViewController : XLFormViewController {
         section = XLFormSectionDescriptor.formSectionWithTitle("UI Customization")
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.UICusomization.rawValue, rowType: XLFormRowDescriptorTypeButton, title:"UI Customization")
+        row = XLFormRowDescriptor(tag: Tags.UICusomization, rowType: XLFormRowDescriptorTypeButton, title:"UI Customization")
         row.action.viewControllerClass = UICustomizationFormViewController.self
         section.addFormRow(row)
         
@@ -134,14 +134,14 @@ class ExamplesFormViewController : XLFormViewController {
         form.addFormSection(section)
 
         
-        row = XLFormRowDescriptor(tag: Tags.Custom.rawValue, rowType: XLFormRowDescriptorTypeButton, title:"Custom Rows")
+        row = XLFormRowDescriptor(tag: Tags.Custom, rowType: XLFormRowDescriptorTypeButton, title:"Custom Rows")
         row.action.viewControllerClass = CustomRowsViewController.self
         section.addFormRow(row)
         
         section = XLFormSectionDescriptor.formSectionWithTitle("Accessory View")
         form.addFormSection(section)
 
-        row = XLFormRowDescriptor(tag: Tags.AccessoryView.rawValue, rowType: XLFormRowDescriptorTypeButton, title:"Accessory Views")
+        row = XLFormRowDescriptor(tag: Tags.AccessoryView, rowType: XLFormRowDescriptorTypeButton, title:"Accessory Views")
         row.action.viewControllerClass = AccessoryViewFormViewController.self
         section.addFormRow(row)
         
@@ -150,26 +150,26 @@ class ExamplesFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         
-        row = XLFormRowDescriptor(tag: Tags.Validations.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Validation Examples")
-        row.action.formSegueIdenfifier = "ValidationExamplesFormViewControllerSegue"
+        row = XLFormRowDescriptor(tag: Tags.Validations, rowType: XLFormRowDescriptorTypeButton, title: "Validation Examples")
+        row.action.formSegueIdentifier = "ValidationExamplesFormViewControllerSegue"
         section.addFormRow(row)
 
         section = XLFormSectionDescriptor.formSectionWithTitle("Using Predicates")
         form.addFormSection(section)
         
         
-        row = XLFormRowDescriptor(tag: Tags.Predicates.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Very basic predicates")
-        row.action.formSegueIdenfifier = "BasicPredicateViewControllerSegue"
+        row = XLFormRowDescriptor(tag: Tags.Predicates, rowType: XLFormRowDescriptorTypeButton, title: "Very basic predicates")
+        row.action.formSegueIdentifier = "BasicPredicateViewControllerSegue"
         section.addFormRow(row)
         
         
-        row = XLFormRowDescriptor(tag: Tags.Predicates.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Blog Example Hide predicates")
-        row.action.formSegueIdenfifier = "BlogExampleViewSegue"
+        row = XLFormRowDescriptor(tag: Tags.Predicates, rowType: XLFormRowDescriptorTypeButton, title: "Blog Example Hide predicates")
+        row.action.formSegueIdentifier = "BlogExampleViewSegue"
         section.addFormRow(row)
         
         
-        row = XLFormRowDescriptor(tag: Tags.Predicates.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Another example")
-        row.action.formSegueIdenfifier = "PredicateFormViewControllerSegue"
+        row = XLFormRowDescriptor(tag: Tags.Predicates, rowType: XLFormRowDescriptorTypeButton, title: "Another example")
+        row.action.formSegueIdentifier = "PredicateFormViewControllerSegue"
         section.addFormRow(row)
         
         self.form = form

Examples/Swift/SwiftExample/Images.xcassets/default_avatar.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "default-avatar@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Examples/Swift/SwiftExample/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.xmartlabs.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Examples/Swift/SwiftExample/Inputs/InputsFormViewController.swift

@@ -2,7 +2,7 @@
 //  InputsFormViewController.swift
 //  XLForm ( https://github.com/xmartlabs/XLForm )
 //
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
+//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,133 +25,128 @@
 
 
 class InputsFormViewController : XLFormViewController {
+
+    private struct Tags {
+        static let Name = "name"
+        static let Email = "email"
+        static let Twitter = "twitter"
+        static let Number = "number"
+        static let Integer = "integer"
+        static let Decimal = "decimal"
+        static let Password = "password"
+        static let Phone = "phone"
+        static let Url = "url"
+        static let ZipCode = "zipCode"
+        static let TextView = "textView"
+        static let Notes = "notes"
+    }
     
-    required init(coder aDecoder: NSCoder) {
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+        initializeForm()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
 
-    
     func initializeForm() {
         
         let form : XLFormDescriptor
         var section : XLFormSectionDescriptor
         var row : XLFormRowDescriptor
         
+        form = XLFormDescriptor(title: "Text Fields")
+        form.assignFirstResponderOnShow = true
         
-        form = XLFormDescriptor.formDescriptorWithTitle("Text Fields") as! XLFormDescriptor;
-        form.assignFirstResponderOnShow = true;
+        section = XLFormSectionDescriptor.formSectionWithTitle("TextField Types")
+        section.footerTitle = "This is a long text that will appear on section footer"
+        form.addFormSection(section)
         
-        section = XLFormSectionDescriptor.formSection () as! XLFormSectionDescriptor
-        form.addFormSection(section);
         
-        // Title
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("title", rowType: XLFormRowDescriptorTypeText) as! XLFormRowDescriptor
-        row.cellConfigAtConfigure["textField.placeholder"] = "Title"
+        // Name
+        row = XLFormRowDescriptor(tag: Tags.Name, rowType: XLFormRowDescriptorTypeText, title: "Name")
         row.required = true
         section.addFormRow(row)
         
-        // Location
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("location", rowType: XLFormRowDescriptorTypeText) as! XLFormRowDescriptor
-        row.cellConfigAtConfigure["textField.placeholder"] = "Location"
+        // Email
+        row = XLFormRowDescriptor(tag: Tags.Email, rowType: XLFormRowDescriptorTypeEmail, title: "Email")
+        // validate the email
+        row.addValidator(XLFormValidator.emailValidator())
         section.addFormRow(row)
         
-        section = XLFormSectionDescriptor.formSection() as! XLFormSectionDescriptor
+        // Twitter
+        row = XLFormRowDescriptor(tag: Tags.Name, rowType: XLFormRowDescriptorTypeTwitter, title: "Twitter")
+        row.disabled = NSNumber(bool: true)
+        row.value = "@no_editable"
+        section.addFormRow(row)
+        
+        // Zip Code
+        row = XLFormRowDescriptor(tag: Tags.ZipCode, rowType: XLFormRowDescriptorTypeZipCode, title: "Zip Code")
+        section.addFormRow(row)
+
+        // Number
+        row = XLFormRowDescriptor(tag: Tags.Number, rowType: XLFormRowDescriptorTypeNumber, title: "Number")
+        section.addFormRow(row)
+        
+        // Integer
+        row = XLFormRowDescriptor(tag: Tags.Integer, rowType: XLFormRowDescriptorTypeInteger, title: "Integer")
+        section.addFormRow(row)
+        
+        // Decimal
+        row = XLFormRowDescriptor(tag: Tags.Decimal, rowType: XLFormRowDescriptorTypeDecimal, title: "Decimal")
+        section.addFormRow(row)
+        
+        // Password
+        row = XLFormRowDescriptor(tag: Tags.Password, rowType: XLFormRowDescriptorTypePassword, title: "Password")
+        section.addFormRow(row)
+        
+        // Phone
+        row = XLFormRowDescriptor(tag: Tags.Phone, rowType: XLFormRowDescriptorTypePhone, title: "Phone")
+        section.addFormRow(row)
+        
+        // Url
+        row = XLFormRowDescriptor(tag: Tags.Url, rowType: XLFormRowDescriptorTypeURL, title: "Url")
+        section.addFormRow(row)
+        
+        
+        section = XLFormSectionDescriptor.formSection()
         form.addFormSection(section)
         
-        // All-day
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("all-day", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "All-day") as! XLFormRowDescriptor
+        
+        // TextView
+        row = XLFormRowDescriptor(tag: Tags.TextView, rowType: XLFormRowDescriptorTypeTextView)
+        row.cellConfigAtConfigure["textView.placeholder"] = "TEXT VIEW EXAMPLE"
         section.addFormRow(row)
         
-        // Starts
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("starts", rowType: XLFormRowDescriptorTypeDateTimeInline, title: "Starts") as! XLFormRowDescriptor
-        row.value = NSDate(timeIntervalSinceNow: 60*60*24)
-        section.addFormRow(row)
-        
-        // Ends
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("ends", rowType: XLFormRowDescriptorTypeDateTimeInline, title: "Ends") as! XLFormRowDescriptor
-        row.value = NSDate(timeIntervalSinceNow: 60*60*25)
-        section.addFormRow(row)
-        
-        section = XLFormSectionDescriptor.formSection() as! XLFormSectionDescriptor
+
+        section = XLFormSectionDescriptor.formSectionWithTitle("TextView With Label Example")
         form.addFormSection(section)
         
-        // Repeat
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("repeat", rowType:XLFormRowDescriptorTypeSelectorPush, title:"Repeat") as! XLFormRowDescriptor
-        row.value = XLFormOptionsObject(value: 0, displayText: "Never")
-        row.selectorTitle = "Repeat"
-        row.selectorOptions = [XLFormOptionsObject(value: 0, displayText: "Never"),
-                               XLFormOptionsObject(value: 1, displayText: "Every Day"),
-                               XLFormOptionsObject(value: 2, displayText: "Every Week"),
-                               XLFormOptionsObject(value: 3, displayText: "Every 2 Weeks"),
-                               XLFormOptionsObject(value: 4, displayText: "Every Month"),
-                               XLFormOptionsObject(value: 5, displayText: "Every Year")]
+        row = XLFormRowDescriptor(tag: Tags.Number, rowType: XLFormRowDescriptorTypeTextView, title: "Notes")
         section.addFormRow(row)
         
-        section = XLFormSectionDescriptor.formSection() as! XLFormSectionDescriptor
-        form.addFormSection(section)
+        self.form = form
         
-        // Alert
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("alert", rowType:XLFormRowDescriptorTypeSelectorPush, title:"Alert") as! XLFormRowDescriptor
-        row.value = XLFormOptionsObject(value: 0, displayText: "None")
-        row.selectorTitle = "Event Alert"
-        row.selectorOptions = [
-                               XLFormOptionsObject(value: 0, displayText: "None"),
-                               XLFormOptionsObject(value: 1, displayText: "At time of event"),
-                               XLFormOptionsObject(value: 2, displayText: "5 minutes before"),
-                               XLFormOptionsObject(value: 3, displayText: "15 minutes before"),
-                               XLFormOptionsObject(value: 4, displayText: "30 minutes before"),
-                               XLFormOptionsObject(value: 5, displayText: "1 hour before"),
-                               XLFormOptionsObject(value: 6, displayText: "2 hours before"),
-                               XLFormOptionsObject(value: 7, displayText: "1 day before"),
-                               XLFormOptionsObject(value: 8, displayText: "2 days before")]
-        section.addFormRow(row)
-        
-        
-        section = XLFormSectionDescriptor.formSection() as! XLFormSectionDescriptor
-        form.addFormSection(section)
-        
-        // Show As
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("showAs", rowType:XLFormRowDescriptorTypeSelectorPush, title:"Show As") as! XLFormRowDescriptor
-        row.value = XLFormOptionsObject(value: 0, displayText: "Busy")
-        row.selectorTitle = "Show As"
-        row.selectorOptions = [XLFormOptionsObject(value: 0, displayText:"Busy"),
-                               XLFormOptionsObject(value: 1, displayText:"Free")]
-        section.addFormRow(row)
-        
-        section = XLFormSectionDescriptor.formSection() as! XLFormSectionDescriptor
-        form.addFormSection(section)
-        
-        // URL
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("url", rowType:XLFormRowDescriptorTypeURL) as! XLFormRowDescriptor
-        row.cellConfigAtConfigure["textField.placeholder"] = "URL"
-        section.addFormRow(row)
-        
-        // Notes
-        row = XLFormRowDescriptor.formRowDescriptorWithTag("notes", rowType:XLFormRowDescriptorTypeTextView) as! XLFormRowDescriptor
-        row.cellConfigAtConfigure["textView.placeholder"] = "Notes"
-        section.addFormRow(row)
-        
-        self.form = form;
     }
 
-    
-    
-    override func viewDidLoad() {
+    override func viewDidLoad()
+    {
         super.viewDidLoad()
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Save, target: self, action: "savePressed:")
+        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Save, target: self, action: "savePressed:")
     }
-
-
-    func savePressed(button: UIBarButtonItem){
+    
+    func savePressed(button: UIBarButtonItem)
+    {
         let validationErrors : Array<NSError> = self.formValidationErrors() as! Array<NSError>
         if (validationErrors.count > 0){
-            self.showFormValidationError(validationErrors.first);
-            return;
+            self.showFormValidationError(validationErrors.first)
+            return
         }
         self.tableView.endEditing(true)
-    //    let alertView = UIAlertView(  alloc] initWithTitle:NSLocalizedString(@"Valid Form", nil) message:@"No errors found" delegate:self cancelButtonTitle:NSLocalizedString(@"OK", nil) otherButtonTitles:nil];
-    //    [alertView show];
+        let alertView = UIAlertView(title: "Valid Form", message: "No errors found", delegate: self, cancelButtonTitle: "OK")
+        alertView.show()
     }
 
 }

Examples/Swift/SwiftExample/MultiValuedSections/MultivaluedFormViewController.swift

@@ -25,17 +25,15 @@
 
 
 class MultivaluedFormViewController : XLFormViewController {
-
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
-    
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
 
     func initializeForm() {
@@ -47,7 +45,7 @@ class MultivaluedFormViewController : XLFormViewController {
         form = XLFormDescriptor(title: "Multivalued Examples")
         
         // Multivalued section
-        section = XLFormSectionDescriptor.formSectionWithTitle("Multivalued TextField", sectionOptions:XLFormSectionOptions.CanReorder | XLFormSectionOptions.CanInsert | XLFormSectionOptions.CanDelete, sectionInsertMode:XLFormSectionInsertMode.Button)
+        section = XLFormSectionDescriptor.formSectionWithTitle("Multivalued TextField", sectionOptions:XLFormSectionOptions.CanReorder.union(.CanInsert).union(.CanDelete), sectionInsertMode:.Button)
         section.multivaluedAddButton!.title = "Add New Tag"
         section.footerTitle = "XLFormSectionInsertModeButton sectionType adds a 'Add Item' (Add New Tag) button row as last cell."
         // set up the row template
@@ -57,12 +55,8 @@ class MultivaluedFormViewController : XLFormViewController {
         
         form.addFormSection(section)
         
-        
-        
-        
-    
         // Another Multivalued section
-        section = XLFormSectionDescriptor.formSectionWithTitle("Multivalued ActionSheet Selector example", sectionOptions:XLFormSectionOptions.CanInsert | XLFormSectionOptions.CanDelete)
+        section = XLFormSectionDescriptor.formSectionWithTitle("Multivalued ActionSheet Selector example", sectionOptions:XLFormSectionOptions.CanInsert.union(.CanDelete))
         section.footerTitle = "XLFormSectionInsertModeLastRow sectionType adds a '+' icon inside last table view cell allowing us to add a new row."
         form.addFormSection(section)
         row = XLFormRowDescriptor(tag: nil, rowType: XLFormRowDescriptorTypeSelectorActionSheet, title: "Tap to select..")
@@ -71,7 +65,7 @@ class MultivaluedFormViewController : XLFormViewController {
     
     
         // Another one
-        section = XLFormSectionDescriptor.formSectionWithTitle("Multivalued Push Selector example", sectionOptions: XLFormSectionOptions.CanInsert | XLFormSectionOptions.CanDelete | XLFormSectionOptions.CanReorder, sectionInsertMode:XLFormSectionInsertMode.Button)
+        section = XLFormSectionDescriptor.formSectionWithTitle("Multivalued Push Selector example", sectionOptions: XLFormSectionOptions.CanInsert.union(.CanDelete).union(.CanReorder), sectionInsertMode: .Button)
         section.footerTitle = "MultivaluedFormViewController.swift"
         form.addFormSection(section)
         row = XLFormRowDescriptor(tag: nil, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Tap to select )..")
@@ -84,14 +78,14 @@ class MultivaluedFormViewController : XLFormViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Edit, target: self, action: "addDidTouch:")
+        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Edit, target: self, action: "addDidTouch:")
     }
     
 //MARK: - Actions
     
     func addDidTouch(sender: UIBarButtonItem) {
         let actionSheet = UIActionSheet(title: nil, delegate: self, cancelButtonTitle: "Cancel", destructiveButtonTitle: "Remove Last Section", otherButtonTitles: "Add a section at the end", self.form!.disabled ? "Enable Form" : "Disable Form")
-        actionSheet.showInView(self.view)
+        actionSheet.showInView(view)
     }
 
 //MARK: - UIActionSheetDelegate
@@ -99,25 +93,25 @@ class MultivaluedFormViewController : XLFormViewController {
 
     override func actionSheet(actionSheet: UIActionSheet, clickedButtonAtIndex buttonIndex: Int) {
         if actionSheet.destructiveButtonIndex == buttonIndex {
-            if self.form.formSections.count > 0 {
+            if form.formSections.count > 0 {
                 // remove last section
-                self.form.removeFormSectionAtIndex(UInt(self.form.formSections.count - 1))
+                form.removeFormSectionAtIndex(UInt(form.formSections.count - 1))
             }
         }
         else if actionSheet.buttonTitleAtIndex(buttonIndex) == "Add a section at the end" {
             // add a new section
-//            let dateString = NSDateFormatter.localizedStringFromDate(NSDate.new(), dateStyle: NSDateFormatterStyle.ShortStyle, timeStyle: NSDateFormatterStyle.ShortStyle)
-            let newSection  = XLFormSectionDescriptor.formSectionWithTitle("Section created at \(NSDateFormatter.localizedStringFromDate(NSDate.new(), dateStyle: NSDateFormatterStyle.ShortStyle, timeStyle: NSDateFormatterStyle.ShortStyle))", sectionOptions:XLFormSectionOptions.CanInsert | XLFormSectionOptions.CanDelete)
+//            let dateString = NSDateFormatter.localizedStringFromDate(NSDate(), dateStyle: NSDateFormatterStyle.ShortStyle, timeStyle: NSDateFormatterStyle.ShortStyle)
+            let newSection  = XLFormSectionDescriptor.formSectionWithTitle("Section created at \(NSDateFormatter.localizedStringFromDate(NSDate(), dateStyle: NSDateFormatterStyle.ShortStyle, timeStyle: NSDateFormatterStyle.ShortStyle))", sectionOptions:XLFormSectionOptions.CanInsert.union(.CanDelete))
             newSection.multivaluedTag = "multivaluedPushSelector_\(self.form.formSections.count)"
             let newRow = XLFormRowDescriptor(tag: nil, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Tap to select )..")
             newRow.selectorOptions = ["Option 1", "Option 2", "Option 3"]
             newSection.addFormRow(newRow)
-            self.form.addFormSection(newSection)
+            form.addFormSection(newSection)
         }
         else {
-            self.form.disabled = !self.form.disabled
-            self.tableView.endEditing(true)
-            self.tableView.reloadData()
+            form.disabled = !self.form.disabled
+            tableView.endEditing(true)
+            tableView.reloadData()
         }
     }
 }
@@ -127,12 +121,11 @@ class MultivaluedFormViewController : XLFormViewController {
 
 class MultivaluedOnlyReorderViewController : XLFormViewController {
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         self.initializeForm()
     }
     
-    
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
         self.initializeForm()
@@ -151,28 +144,28 @@ class MultivaluedOnlyReorderViewController : XLFormViewController {
         
         // Multivalued Section with inline rows - section set up to support only reordering
         section = XLFormSectionDescriptor.formSectionWithTitle("Reordering Inline Rows",
-                                                 sectionOptions:XLFormSectionOptions.CanReorder)
+                                                 sectionOptions:.CanReorder)
         section.footerTitle = "XLFormRowDescriptorTypeDateInline row type"
         form.addFormSection(section)
         var idx = 0
         for listItem in list {
-            let timeIntervalSinceNow : NSTimeInterval = NSTimeInterval(secondsPerDay * ++idx)
+            let timeIntervalSinceNow = NSTimeInterval(secondsPerDay * ++idx)
             row = XLFormRowDescriptor(tag: nil, rowType:XLFormRowDescriptorTypeDateInline, title: listItem)
             row.value = NSDate(timeIntervalSinceNow:timeIntervalSinceNow)
             section.addFormRow(row)
         }
     
         // Multivalued Section with common rows - section set up to support only reordering
-        section = XLFormSectionDescriptor.formSectionWithTitle("Reordering Rows", sectionOptions:XLFormSectionOptions.CanReorder)
+        section = XLFormSectionDescriptor.formSectionWithTitle("Reordering Rows", sectionOptions:.CanReorder)
         section.footerTitle = "XLFormRowDescriptorTypeInfo row type"
         form.addFormSection(section)
     
         
         idx = 0
         for listItem in list {
-            let timeIntervalSinceNow : NSTimeInterval = NSTimeInterval(secondsPerDay * ++idx)
+            let timeIntervalSinceNow  = NSTimeInterval(secondsPerDay * ++idx)
             row = XLFormRowDescriptor(tag: nil, rowType:XLFormRowDescriptorTypeInfo, title: listItem)
-            row.value = NSDateFormatter.localizedStringFromDate(NSDate(timeIntervalSinceNow:timeIntervalSinceNow), dateStyle: NSDateFormatterStyle.MediumStyle, timeStyle: NSDateFormatterStyle.NoStyle)
+            row.value = NSDateFormatter.localizedStringFromDate(NSDate(timeIntervalSinceNow:timeIntervalSinceNow), dateStyle: .MediumStyle, timeStyle: .NoStyle)
             section.addFormRow(row)
         }
         
@@ -183,7 +176,7 @@ class MultivaluedOnlyReorderViewController : XLFormViewController {
 
 class MultivaluedOnlyInserViewController : XLFormViewController {
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         self.initializeForm()
     }
@@ -204,7 +197,7 @@ class MultivaluedOnlyInserViewController : XLFormViewController {
         
         form = XLFormDescriptor(title: "Multivalued Only Insert")
     
-        section = XLFormSectionDescriptor.formSectionWithTitle("XLFormSectionInsertModeButton", sectionOptions:XLFormSectionOptions.CanInsert, sectionInsertMode:XLFormSectionInsertMode.Button)
+        section = XLFormSectionDescriptor.formSectionWithTitle("XLFormSectionInsertModeButton", sectionOptions:.CanInsert, sectionInsertMode:.Button)
         form.addFormSection(section)
         
         
@@ -212,15 +205,15 @@ class MultivaluedOnlyInserViewController : XLFormViewController {
         row.cellConfig["textField.placeholder"] = "Add a new tag"
         section.multivaluedRowTemplate = row
         
-        section = XLFormSectionDescriptor.formSectionWithTitle("XLFormSectionInsertModeButton With Inline Cells", sectionOptions:XLFormSectionOptions.CanInsert, sectionInsertMode:XLFormSectionInsertMode.Button)
+        section = XLFormSectionDescriptor.formSectionWithTitle("XLFormSectionInsertModeButton With Inline Cells", sectionOptions:.CanInsert, sectionInsertMode:.Button)
         row = XLFormRowDescriptor(tag: nil, rowType:XLFormRowDescriptorTypeDateInline)
-        row.value = NSDate.new()
+        row.value = NSDate()
         row.title = "Date"
         section.multivaluedRowTemplate = row
         form.addFormSection(section)
 
         section = XLFormSectionDescriptor.formSectionWithTitle("XLFormSectionInsertModeLastRow",
-                                                 sectionOptions:XLFormSectionOptions.CanInsert, sectionInsertMode:XLFormSectionInsertMode.LastRow)
+                                                 sectionOptions:.CanInsert, sectionInsertMode:.LastRow)
         form.addFormSection(section)
         for tag in nameList {
             // add a row to the section, the row will be used to crete new rows.
@@ -233,28 +226,26 @@ class MultivaluedOnlyInserViewController : XLFormViewController {
     }
 }
 
-
 class MultivaluedOnlyDeleteViewController : XLFormViewController {
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
-    
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Editing", style: UIBarButtonItemStyle.Plain, target: self, action: "toggleEditing:")
+        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Editing", style: .Plain, target: self, action: "toggleEditing:")
     }
     
     func toggleEditing(sender : UIBarButtonItem) {
-        self.tableView.setEditing(!self.tableView.editing, animated: true)
-        sender.title = self.tableView.editing ? "Editing" : "Not Editing"
+        tableView.setEditing(!tableView.editing, animated: true)
+        sender.title = tableView.editing ? "Editing" : "Not Editing"
     }
     
     func initializeForm() {
@@ -267,7 +258,7 @@ class MultivaluedOnlyDeleteViewController : XLFormViewController {
         
         form = XLFormDescriptor(title: "Multivalued Only Delete")
         
-        section = XLFormSectionDescriptor.formSectionWithTitle("", sectionOptions:XLFormSectionOptions.CanDelete)
+        section = XLFormSectionDescriptor.formSectionWithTitle("", sectionOptions:.CanDelete)
         section.footerTitle = "you can swipe to delete when table.editing = NO (Not Editing)"
         form.addFormSection(section)
       
@@ -280,7 +271,7 @@ class MultivaluedOnlyDeleteViewController : XLFormViewController {
         }
     
         // Multivalued Section with inline row.
-        section = XLFormSectionDescriptor.formSectionWithTitle("", sectionOptions:XLFormSectionOptions.CanDelete)
+        section = XLFormSectionDescriptor.formSectionWithTitle("", sectionOptions:.CanDelete)
         section.footerTitle = "you can swipe to delete when table.editing = NO (Not Editing)"
         form.addFormSection(section)
         

Examples/Swift/SwiftExample/Others/CustomCells/XLFormCustomCell.swift

@@ -31,7 +31,7 @@ class XLFormCustomCell : XLFormBaseCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
     
@@ -42,16 +42,26 @@ class XLFormCustomCell : XLFormBaseCell {
     override func update() {
         super.update()
         // override
-        self.textLabel!.text = self.rowDescriptor.value != nil ? self.rowDescriptor.value as? String : "Am a custom cell, select me!"
+        if let string = rowDescriptor?.value as? String {
+            textLabel?.text = string
+        }
+        else {
+            textLabel?.text = "Am a custom cell, select me!"
+        }
     }
    
-    
     override func formDescriptorCellDidSelectedWithFormController(controller: XLFormViewController!) {
         // custom code here
         // i.e new behaviour when cell has been selected
-        self.rowDescriptor.value = self.rowDescriptor.value as? String == "I can do any custom behaviour..." ? "Am a custom cell, select me!" : "I can do any custom behaviour..."
-        self.update()
-        controller.tableView .selectRowAtIndexPath(nil, animated: true, scrollPosition: UITableViewScrollPosition.None)
+        if let string = rowDescriptor?.value as? String where string == "Am a custom cell, select me!" {
+            self.rowDescriptor?.value = string
+        }
+        else {
+            self.rowDescriptor?.value = "I can do any custom behaviour..."
+        }
+        
+        update()
+        controller.tableView.selectRowAtIndexPath(nil, animated: true, scrollPosition: .None)
     }
     
 }

Examples/Swift/SwiftExample/Others/OthersFormViewController.swift

@@ -27,23 +27,24 @@ import MapKit
 
 class OthersFormViewController : XLFormViewController {
 
-    private enum Tags : String {
-        case SwitchBool = "switchBool"
-        case SwitchCheck = "switchCheck"
-        case StepCounter = "stepCounter"
-        case Slider = "slider"
-        case SegmentedControl = "segmentedControl"
-        case Custom = "custom"
-        case Info = "info"
-        case Button = "button"
-        case ButtonLeftAligned = "buttonLeftAligned"
-        case ButtonWithSegueId = "buttonWithSegueId"
-        case ButtonWithSegueClass = "buttonWithSegueClass"
-        case ButtonWithNibName = "buttonWithNibName"
-        case ButtonWithStoryboardId = "buttonWithStoryboardId"
+    private struct Tags {
+        static let SwitchBool = "switchBool"
+        static let SwitchCheck = "switchCheck"
+        static let StepCounter = "stepCounter"
+        static let Slider = "slider"
+        static let SegmentedControl = "segmentedControl"
+        static let Custom = "custom"
+        static let Info = "info"
+        static let Button = "button"
+		static let Image = "image"
+        static let ButtonLeftAligned = "buttonLeftAligned"
+        static let ButtonWithSegueId = "buttonWithSegueId"
+        static let ButtonWithSegueClass = "buttonWithSegueClass"
+        static let ButtonWithNibName = "buttonWithNibName"
+        static let ButtonWithStoryboardId = "buttonWithStoryboardId"
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         self.initializeForm()
     }
@@ -67,32 +68,36 @@ class OthersFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         // Switch
-        section.addFormRow(XLFormRowDescriptor(tag: Tags.SwitchBool.rawValue, rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "Switch"))
+        section.addFormRow(XLFormRowDescriptor(tag: Tags.SwitchBool, rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "Switch"))
         
         // Check
-        section.addFormRow(XLFormRowDescriptor(tag: Tags.SwitchCheck.rawValue, rowType: XLFormRowDescriptorTypeBooleanCheck, title: "Check"))
+        section.addFormRow(XLFormRowDescriptor(tag: Tags.SwitchCheck, rowType: XLFormRowDescriptorTypeBooleanCheck, title: "Check"))
         
         // Step counter
-        section.addFormRow(XLFormRowDescriptor(tag: Tags.StepCounter.rawValue, rowType: XLFormRowDescriptorTypeStepCounter, title: "Step counter"))
+        section.addFormRow(XLFormRowDescriptor(tag: Tags.StepCounter, rowType: XLFormRowDescriptorTypeStepCounter, title: "Step counter"))
         
         // Segmented Control
-        row = XLFormRowDescriptor(tag: Tags.SegmentedControl.rawValue, rowType: XLFormRowDescriptorTypeSelectorSegmentedControl, title: "Fruits")
+        row = XLFormRowDescriptor(tag: Tags.SegmentedControl, rowType: XLFormRowDescriptorTypeSelectorSegmentedControl, title: "Fruits")
         row.selectorOptions = ["Apple", "Orange", "Pear"]
         row.value = "Pear"
         section.addFormRow(row)
         
         
         // Slider
-        row = XLFormRowDescriptor(tag: Tags.Slider.rawValue, rowType: XLFormRowDescriptorTypeSlider, title: "Slider")
+        row = XLFormRowDescriptor(tag: Tags.Slider, rowType: XLFormRowDescriptorTypeSlider, title: "Slider")
         row.value = 30
         row.cellConfigAtConfigure["slider.maximumValue"] = 100
         row.cellConfigAtConfigure["slider.minimumValue"] = 10
         row.cellConfigAtConfigure["steps"] = 4
         section.addFormRow(row)
-        
+		
+		// Image
+		row = XLFormRowDescriptor(tag: Tags.Image, rowType: XLFormRowDescriptorTypeImage, title: "Image")
+		row.value = UIImage(named: "default_avatar")
+		section.addFormRow(row)
 
         // Info cell
-        row = XLFormRowDescriptor(tag: Tags.Info.rawValue, rowType: XLFormRowDescriptorTypeInfo)
+        row = XLFormRowDescriptor(tag: Tags.Info, rowType: XLFormRowDescriptorTypeInfo)
         row.title = "Version"
         row.value = NSBundle.mainBundle().infoDictionary!["CFBundleShortVersionString"]
         section.addFormRow(row)
@@ -103,30 +108,30 @@ class OthersFormViewController : XLFormViewController {
         form.addFormSection(section)
     
         // Button
-        row = XLFormRowDescriptor(tag: Tags.Button.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Button")
+        row = XLFormRowDescriptor(tag: Tags.Button, rowType: XLFormRowDescriptorTypeButton, title: "Button")
         row.cellConfig["textLabel.textColor"] = UIColor(red: 0.0, green: 122.0/255.0, blue: 1.0, alpha: 1.0)
         row.action.formSelector = "didTouchButton:"
         section.addFormRow(row)
         
         
         // Left Button
-        row = XLFormRowDescriptor(tag: Tags.ButtonLeftAligned.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Button with Block")
+        row = XLFormRowDescriptor(tag: Tags.ButtonLeftAligned, rowType: XLFormRowDescriptorTypeButton, title: "Button with Block")
         row.cellConfig["textLabel.textColor"] = UIColor(red: 0.0, green: 122.0/255.0, blue: 1.0, alpha: 1.0)
         row.cellConfig["textLabel.textAlignment"] = NSTextAlignment.Left.rawValue
         row.cellConfig["accessoryType"] = UITableViewCellAccessoryType.DisclosureIndicator.rawValue
-        row.action.formBlock = { (sender: XLFormRowDescriptor!) -> Void in
-            let switchRow = sender.sectionDescriptor.formDescriptor!.formRowWithTag(Tags.SwitchBool.rawValue)!
-            if switchRow.value != nil && switchRow.value!.boolValue == true {
+        row.action.formBlock = { [weak self] (sender: XLFormRowDescriptor!) -> Void in
+            let switchRow = sender.sectionDescriptor.formDescriptor!.formRowWithTag(Tags.SwitchBool)!
+            if let value = switchRow.value where value.boolValue == true {
                 let alertView = UIAlertView(title: "Switch is ON", message: "Button has checked the switch value...", delegate: self, cancelButtonTitle: "OK")
                 alertView.show()
             }
-            self.deselectFormRow(sender)
+            self?.deselectFormRow(sender)
         }
         section.addFormRow(row)
         
     
         // Another Left Button with segue
-        row = XLFormRowDescriptor(tag: Tags.ButtonWithSegueClass.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Button with Segue Class")
+        row = XLFormRowDescriptor(tag: Tags.ButtonWithSegueClass, rowType: XLFormRowDescriptorTypeButton, title: "Button with Segue Class")
         row.action.formSegueClass = NSClassFromString("UIStoryboardPushSegue")
         row.action.viewControllerClass = MapViewController.self
         row.value = CLLocation(latitude: -33.0, longitude: -56.0)
@@ -134,20 +139,20 @@ class OthersFormViewController : XLFormViewController {
         
         
         // Button with SegueId
-        row = XLFormRowDescriptor(tag: Tags.ButtonWithSegueId.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Button with Segue Idenfifier")
-        row.action.formSegueIdenfifier = "MapViewControllerSegue"
+        row = XLFormRowDescriptor(tag: Tags.ButtonWithSegueId, rowType: XLFormRowDescriptorTypeButton, title: "Button with Segue Idenfifier")
+        row.action.formSegueIdentifier = "MapViewControllerSegue"
         row.value = CLLocation(latitude: -33, longitude: -56)
         section.addFormRow(row)
         
         
         // Another Button using StoryboardId
-        row = XLFormRowDescriptor(tag: Tags.ButtonWithStoryboardId.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Button with StoryboardId")
+        row = XLFormRowDescriptor(tag: Tags.ButtonWithStoryboardId, rowType: XLFormRowDescriptorTypeButton, title: "Button with StoryboardId")
         row.action.viewControllerStoryboardId = "MapViewController"
         row.value = CLLocation(latitude: -33, longitude: -56)
         section.addFormRow(row)
         
         // Button using NibName
-        row = XLFormRowDescriptor(tag: Tags.ButtonWithNibName.rawValue, rowType: XLFormRowDescriptorTypeButton, title: "Button with NibName")
+        row = XLFormRowDescriptor(tag: Tags.ButtonWithNibName, rowType: XLFormRowDescriptorTypeButton, title: "Button with NibName")
         row.action.viewControllerNibName = "MapViewController"
         row.value = CLLocation(latitude: -33, longitude: -56)
         section.addFormRow(row)
@@ -157,7 +162,7 @@ class OthersFormViewController : XLFormViewController {
     
     
     func didTouchButton(sender: XLFormRowDescriptor) {
-        if sender.sectionDescriptor.formDescriptor.formRowWithTag(Tags.SwitchBool.rawValue)?.value?.boolValue == true{
+        if sender.sectionDescriptor.formDescriptor.formRowWithTag(Tags.SwitchBool)?.value?.boolValue == true{
             let alertView = UIAlertView(title: "Switch is ON", message: "Button has checked the switch value...", delegate: self, cancelButtonTitle: "OK")
             alertView.show()
         }
@@ -166,18 +171,17 @@ class OthersFormViewController : XLFormViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        let barButton = UIBarButtonItem(title: "Disable", style: UIBarButtonItemStyle.Plain, target: self, action: "disableEnable:")
+        let barButton = UIBarButtonItem(title: "Disable", style: .Plain, target: self, action: "disableEnable:")
         barButton.possibleTitles = Set(["Disable", "Enable"])
-        self.navigationItem.rightBarButtonItem = barButton
+        navigationItem.rightBarButtonItem = barButton
     }
     
     
-    func disableEnable(button : UIBarButtonItem)
-    {
-        self.form.disabled = !self.form.disabled
-        button.title = self.form.disabled ? "Enable" : "Disable"
-        self.tableView.endEditing(true)
-        self.tableView.reloadData()
+    func disableEnable(button : UIBarButtonItem) {
+        form.disabled = !form.disabled
+        button.title = form.disabled ? "Enable" : "Disable"
+        tableView.endEditing(true)
+        tableView.reloadData()
     }
 
 }

Examples/Swift/SwiftExample/PredicateExamples/BasicPredicateViewController.swift

@@ -26,23 +26,23 @@
 
 class BasicPredicateViewController : XLFormViewController {
 
-    private enum Tags : String {
+    private struct Tags {
         
-        case HideRow = "tag1"
-        case HideSection = "tag2"
-        case Text = "tag3"
-        case Date = "tag4"
+        static let HideRow = "tag1"
+        static let HideSection = "tag2"
+        static let Text = "tag3"
+        static let Date = "tag4"
 
     }
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
     func initializeForm() {
@@ -58,32 +58,27 @@ class BasicPredicateViewController : XLFormViewController {
         section.title = "A Section"
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.HideRow.rawValue, rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "Show next row")
+        row = XLFormRowDescriptor(tag: Tags.HideRow, rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "Show next row")
         row.value = 1
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.HideSection.rawValue, rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "Show B Section")
-        row.hidden = "$\(Tags.HideRow.rawValue)==0"
+        row = XLFormRowDescriptor(tag: Tags.HideSection, rowType: XLFormRowDescriptorTypeBooleanSwitch, title: "Show B Section")
+        row.hidden = "$\(Tags.HideRow)==0"
         row.value = 1
         section.addFormRow(row)
         
         section = XLFormSectionDescriptor()
         section.title = "B Section"
         section.footerTitle = "BasicPredicateViewController.swift"
-        section.hidden = "$\(Tags.HideSection.rawValue)==0"
+        section.hidden = "$\(Tags.HideSection)==0"
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.Text.rawValue, rowType: XLFormRowDescriptorTypeText)
+        row = XLFormRowDescriptor(tag: Tags.Text, rowType: XLFormRowDescriptorTypeText)
         row.cellConfigAtConfigure["textField.placeholder"] = "Gonna disappear soon!!"
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: Tags.Date.rawValue, rowType: XLFormRowDescriptorTypeDateInline, title: "Some Date")
-        row.hidden = "$\(Tags.Text.rawValue).value contains 'aaa'"
+        row = XLFormRowDescriptor(tag: Tags.Date, rowType: XLFormRowDescriptorTypeDateInline, title: "Some Date")
+        row.hidden = "$\(Tags.Text).value contains 'aaa'"
         section.addFormRow(row)
-        
-        
-
-        
     }
-    
 }

Examples/Swift/SwiftExample/PredicateExamples/BlogExampleViewController.swift

@@ -1,8 +1,8 @@
 //
-//  BlogExampleViewController.m
+//  BlogExampleViewController.swift
 //  XLForm ( https://github.com/xmartlabs/XLForm )
 //
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
+//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,87 +23,67 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import "BlogExampleViewController.h"
+class BlogExampleViewController : XLFormViewController {
 
-NSString *const kHobbies = @"hobbies";
-NSString *const kSport = @"sport";
-NSString *const kFilm = @"films1";
-NSString *const kFilm2 = @"films2";
-NSString *const kMusic = @"music";
-
-@interface BlogExampleViewController ()
-
-@end
-
-@implementation BlogExampleViewController
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self initializeForm];
+    private struct Tags {
+        static let Hobbies = "hobbies"
+        static let Sport = "sport"
+        static let Film = "films1"
+        static let Film2 = "films2"
+        static let Music = "music"
     }
-    return self;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        [self initializeForm];
+    
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+        initializeForm()
     }
-    return self;
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        initializeForm()
+    }
+    
+    func initializeForm() {
+        
+        let form : XLFormDescriptor
+        var section : XLFormSectionDescriptor
+        var row : XLFormRowDescriptor
+        
+        form = XLFormDescriptor(title: "Blog Example: Hobbies")
+        
+        section = XLFormSectionDescriptor()
+        section.title = "Hobbies"
+        form.addFormSection(section)
+        
+        
+        row = XLFormRowDescriptor(tag: Tags.Hobbies, rowType: XLFormRowDescriptorTypeMultipleSelector, title:"Select Hobbies")
+        row.selectorOptions = ["Sport", "Music", "Films"]
+        row.value = []
+        section.addFormRow(row)
+        
+        section = XLFormSectionDescriptor()
+        section.title = "Some more questions"
+        section.hidden = NSPredicate(format: "$\(row.description).value.@count == 0")
+        section.footerTitle = "BlogExampleViewController.swift"
+        form.addFormSection(section)
+        
+        row = XLFormRowDescriptor(tag: Tags.Sport, rowType: XLFormRowDescriptorTypeTextView, title:"Your favourite sportsman?")
+        row.hidden = "NOT $\(Tags.Hobbies).value contains 'Sport'"
+        section.addFormRow(row)
+        
+        row = XLFormRowDescriptor(tag: Tags.Film, rowType:XLFormRowDescriptorTypeTextView, title: "Your favourite film?")
+        row.hidden = "NOT $\(Tags.Hobbies) contains 'Films'"
+        section.addFormRow(row)
+        
+        row = XLFormRowDescriptor(tag: Tags.Film2, rowType:XLFormRowDescriptorTypeTextView, title:"Your favourite actor?")
+        row.hidden = "NOT $\(Tags.Hobbies) contains 'Films'"
+        section.addFormRow(row)
+        
+        row = XLFormRowDescriptor(tag: Tags.Music, rowType:XLFormRowDescriptorTypeTextView, title:"Your favourite singer?")
+        row.hidden = "NOT $\(Tags.Hobbies) contains 'Music'"
+        section.addFormRow(row)
+        
+        self.form = form
+    }
+    
 }
-
-
-- (void)initializeForm
-{
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    
-    form = [XLFormDescriptor formDescriptorWithTitle:@"Blog Example: Hobbies"];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Hobbies"];
-    [form addFormSection:section];
-    
-    XLFormRowDescriptor* hobbyRow = [XLFormRowDescriptor formRowDescriptorWithTag:kHobbies
-                                                                          rowType:XLFormRowDescriptorTypeMultipleSelector
-                                                                            title:@"Select Hobbies"];
-    hobbyRow.selectorOptions = @[@"Sport", @"Music", @"Films"];
-    hobbyRow.value = @[];
-    [section addFormRow:hobbyRow];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Some more questions"];
-    section.hidden = [NSPredicate predicateWithFormat:[NSString stringWithFormat:@"$%@.value.@count = 0", hobbyRow]];
-    section.footerTitle = @"BlogExampleViewController.m";
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kSport
-                                                rowType:XLFormRowDescriptorTypeTextView
-                                                  title:@"Your favourite sportsman?"];
-    row.hidden = [NSString stringWithFormat:@"NOT $%@.value contains 'Sport'", hobbyRow];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kFilm
-                                                rowType:XLFormRowDescriptorTypeTextView
-                                                  title:@"Your favourite film?"];
-    row.hidden = [NSString stringWithFormat:@"NOT $%@ contains 'Films'", hobbyRow];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kFilm2
-                                                rowType:XLFormRowDescriptorTypeTextView
-                                                  title:@"Your favourite actor?"];
-    row.hidden = [NSString stringWithFormat:@"NOT $%@ contains 'Films'", hobbyRow];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kMusic
-                                                rowType:XLFormRowDescriptorTypeTextView
-                                                  title:@"Your favourite singer?"];
-    row.hidden = [NSString stringWithFormat:@"NOT $%@ contains 'Music'", hobbyRow];
-    [section addFormRow:row];
-    
-    self.form = form;
-}
-
-
-@end

Examples/Swift/SwiftExample/PredicateExamples/PredicateFormViewController.swift

@@ -1,8 +1,8 @@
 //
-//  PredicateFormViewController.m
+//  PredicateFormViewController.swift
 //  XLForm ( https://github.com/xmartlabs/XLForm )
 // 
-//  Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
+//  Copyright (c) 2014-2015 Xmartlabs ( http://xmartlabs.com )
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,91 +23,99 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-NSString *const kPred = @"pred";
-NSString *const kPredDep = @"preddep";
-NSString *const kPredDep2 = @"preddep2";
 
-#import "PredicateFormViewController.h"
+class PredicateFormViewController : XLFormViewController {
 
-@implementation PredicateFormViewController
-
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self initializeForm];
+    private struct Tags {
+        static let Text = "text"
+        static let Integer = "integer"
+        static let Switch = "switch"
+        static let Date = "date"
+        static let Account = "account"
     }
-    return self;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        [self initializeForm];
+    
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+        initializeForm()
     }
-    return self;
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        initializeForm()
+    }
+    
+    func initializeForm() {
+        
+        let form : XLFormDescriptor
+        var section : XLFormSectionDescriptor
+        var row : XLFormRowDescriptor
+
+        form = XLFormDescriptor(title: "Predicates example")
+        
+        section = XLFormSectionDescriptor()
+        section.title = "Independent rows"
+        form.addFormSection(section)
+        
+        row = XLFormRowDescriptor(tag: Tags.Text, rowType: XLFormRowDescriptorTypeAccount, title:"Text")
+        row.cellConfigAtConfigure["textField.placeholder"] = "Type disable"
+        section.addFormRow(row)
+        
+        row = XLFormRowDescriptor(tag: Tags.Integer, rowType: XLFormRowDescriptorTypeInteger, title:"Integer")
+        row.hidden = NSPredicate(format: "$\(Tags.Switch).value==0")
+        section.addFormRow(row)
+        
+        row = XLFormRowDescriptor(tag: Tags.Switch, rowType: XLFormRowDescriptorTypeBooleanSwitch, title:"Boolean")
+        row.value = true
+        section.addFormRow(row)
+        
+        form.addFormSection(section)
+        
+        section = XLFormSectionDescriptor()
+        section.title = "Dependent section"
+        section.footerTitle = "Type disable in the textfield, a number between 18 and 60 in the integer field or use the switch to disable the last row. By doing all three the last section will hide.\nThe integer field hides when the boolean switch is set to 0."
+        form.addFormSection(section)
+        
+        // Predicate Disabling
+        row = XLFormRowDescriptor(tag: Tags.Date, rowType: XLFormRowDescriptorTypeDateInline, title:"Disabled")
+        row.value = NSDate()
+        section.addFormRow(row)
+        row.disabled = NSPredicate(format: "$\(Tags.Text).value contains[c] 'disable' OR ($\(Tags.Integer).value between {18, 60}) OR ($\(Tags.Switch).value == 0)")
+        section.hidden = NSPredicate(format: "($\(Tags.Text).value contains[c] 'disable') AND ($\(Tags.Integer).value between {18, 60}) AND ($\(Tags.Switch).value == 0)")
+        
+        
+        
+        section = XLFormSectionDescriptor()
+        section.title = "More predicates..."
+        section.footerTitle = "This row hides when the row of the previous section is disabled and the textfield in the first section contains \"out\"\n\nPredicateFormViewController.swift"
+        form.addFormSection(section)
+        
+        
+        
+        row = XLFormRowDescriptor(tag: "thirds", rowType:XLFormRowDescriptorTypeAccount, title:"Account")
+        section.addFormRow(row)
+        row.hidden =  NSPredicate(format: "$\(Tags.Date).isDisabled == 1 AND $\(Tags.Text).value contains[c] 'Out'")
+        
+        
+        row.onChangeBlock = { [weak self] oldValue, newValue, _ in
+            let noValue = "No Value"
+            let message = "Old value: \(oldValue ?? noValue), New value: \(newValue ?? noValue)"
+            let alertView = UIAlertController(title: "Account Field changed", message: message, preferredStyle: .ActionSheet)
+            alertView.addAction(UIAlertAction(title: "Cancel", style: .Cancel, handler: nil))
+            self?.navigationController?.presentViewController(alertView, animated: true, completion: nil)
+        }
+        
+        self.form = form
+    }
+    
 }
 
 
-- (void)initializeForm
-{
-    XLFormDescriptor * form;
-    XLFormSectionDescriptor * section;
-    XLFormRowDescriptor * row;
-    XLFormRowDescriptor * pred, *pred3, *pred4;
-    
-    form = [XLFormDescriptor formDescriptorWithTitle:@"Predicates example"];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Independent rows"];
-    
-
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kPredDep rowType:XLFormRowDescriptorTypeAccount title:@"Text"];
-    [row.cellConfigAtConfigure setObject:@"Type disable" forKey:@"textField.placeholder"];
-    pred = row;
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kPredDep2 rowType:XLFormRowDescriptorTypeInteger title:@"Integer"];
-    row.hidden = [NSString stringWithFormat:@"$switch==0"];
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"switch" rowType:XLFormRowDescriptorTypeBooleanSwitch title:@"Boolean"];
-    row.value = @1;
-    pred3 = row;
-    [section addFormRow:row];
-    
-    [form addFormSection:section];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"Dependent section"];
-    section.footerTitle = @"Type disable in the textfield, a number between 18 and 60 in the integer field or use the switch to disable the last row. By doing all three the last section will hide.\nThe integer field hides when the boolean switch is set to 0.";
-    [form addFormSection:section];
-    
-    // Predicate Disabling
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:kPred rowType:XLFormRowDescriptorTypeDateInline title:@"Disabled"];
-    row.value = [NSDate new];
-    [section addFormRow:row];
-    
-    row.disabled = [NSString stringWithFormat:@"$%@ contains[c] 'disable' OR ($%@.value between {18, 60}) OR ($%@.value == 0)", pred, kPredDep2, pred3];
-    //[NSPredicate predicateWithFormat:[NSString stringWithFormat:@"($%@.value contains[c] %%@) OR ($%@.value between {18, 60}) OR ($%@.value == 0)", pred, pred2, pred3],  @"disable"] ];
-    pred4 = row;
-
-    section.hidden = [NSPredicate predicateWithFormat:[NSString stringWithFormat:@"($%@.value contains[c] 'disable') AND ($%@.value between {18, 60}) AND ($%@.value == 0)", pred, kPredDep2, pred3]];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:@"More predicates..."];
-    section.footerTitle = @"This row hides when the row of the previous section is disabled and the textfield in the first section contains \"out\"\n\nPredicateFormViewController.m";
-    [form addFormSection:section];
-    
-
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"thirds" rowType:XLFormRowDescriptorTypeAccount title:@"Account"];
-    [section addFormRow:row];
-    row.hidden = [NSString stringWithFormat:@"$%@.isDisabled == 1 AND $%@.value contains[c] 'Out'", pred4, pred];
-    
-    
-    
-    
-    self.form = form;
-}
 
 
-@end
+
+
+
+
+
+
+

Examples/Swift/SwiftExample/RealExamples/NativeEventFormViewController.swift

@@ -26,26 +26,22 @@
 
 class NativeEventFormViewController : XLFormViewController {
 
-
-
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
 
-
     func initializeForm() {
         
         let form : XLFormDescriptor
         var section : XLFormSectionDescriptor
         var row : XLFormRowDescriptor
 
-        
         form = XLFormDescriptor(title: "Add Event")
         
         section = XLFormSectionDescriptor.formSection()
@@ -141,11 +137,10 @@ class NativeEventFormViewController : XLFormViewController {
         self.form = form
     }
 
-    override func viewDidLoad()
-    {
+    override func viewDidLoad(){
         super.viewDidLoad()
-        self.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Cancel, target: self, action: "cancelPressed:")
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Save, target: self, action: "savePressed:")
+        navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: "cancelPressed:")
+        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Save, target: self, action: "savePressed:")
     }
 
 // MARK: XLFormDescriptorDelegate
@@ -158,79 +153,75 @@ class NativeEventFormViewController : XLFormViewController {
                 let newRow = formRow.copy() as! XLFormRowDescriptor
                 newRow.tag = "secondAlert"
                 newRow.title = "Second Alert"
-                self.form.addFormRow(newRow, afterRow:formRow)
+                form.addFormRow(newRow, afterRow:formRow)
             }
             else if !oldValue.valueData().isEqual(0) && newValue.valueData().isEqual(0) {
-                self.form.removeFormRowWithTag("secondAlert")
+                form.removeFormRowWithTag("secondAlert")
             }
         }
         else if formRow.tag == "all-day" {
-            let startDateDescriptor = self.form.formRowWithTag("starts")!
-            let endDateDescriptor = self.form.formRowWithTag("ends")!
+            let startDateDescriptor = form.formRowWithTag("starts")!
+            let endDateDescriptor = form.formRowWithTag("ends")!
             let dateStartCell: XLFormDateCell = startDateDescriptor.cellForFormController(self) as! XLFormDateCell
             let dateEndCell: XLFormDateCell = endDateDescriptor.cellForFormController(self) as! XLFormDateCell
             if formRow.value!.valueData() as? Bool == true {
                 startDateDescriptor.valueTransformer = DateValueTrasformer.self
                 endDateDescriptor.valueTransformer = DateValueTrasformer.self
-                dateStartCell.formDatePickerMode = XLFormDateDatePickerMode.Date
-                dateEndCell.formDatePickerMode = XLFormDateDatePickerMode.Date
+                dateStartCell.formDatePickerMode = .Date
+                dateEndCell.formDatePickerMode = .Date
             }
             else{
                 startDateDescriptor.valueTransformer = DateTimeValueTrasformer.self
                 endDateDescriptor.valueTransformer = DateTimeValueTrasformer.self
-                dateStartCell.formDatePickerMode = XLFormDateDatePickerMode.DateTime
-                dateEndCell.formDatePickerMode = XLFormDateDatePickerMode.DateTime
+                dateStartCell.formDatePickerMode = .DateTime
+                dateEndCell.formDatePickerMode = .DateTime
             }
-            self.updateFormRow(startDateDescriptor)
-            self.updateFormRow(endDateDescriptor)
+            updateFormRow(startDateDescriptor)
+            updateFormRow(endDateDescriptor)
         }
         else if formRow.tag == "starts" {
-            let startDateDescriptor = self.form.formRowWithTag("starts")!
-            let endDateDescriptor = self.form.formRowWithTag("ends")!
-            let dateStartCell: XLFormDateCell = startDateDescriptor.cellForFormController(self) as! XLFormDateCell
-            let dateEndCell: XLFormDateCell = endDateDescriptor.cellForFormController(self) as! XLFormDateCell
-            if startDateDescriptor.value!.compare(endDateDescriptor.value as! NSDate) == NSComparisonResult.OrderedDescending {
+            let startDateDescriptor = form.formRowWithTag("starts")!
+            let endDateDescriptor = form.formRowWithTag("ends")!
+            if startDateDescriptor.value!.compare(endDateDescriptor.value as! NSDate) == .OrderedDescending {
                 // startDateDescriptor is later than endDateDescriptor
                 endDateDescriptor.value = NSDate(timeInterval: 60*60*24, sinceDate: startDateDescriptor.value as! NSDate)
                 endDateDescriptor.cellConfig.removeObjectForKey("detailTextLabel.attributedText")
-                self.updateFormRow(endDateDescriptor)
+                updateFormRow(endDateDescriptor)
             }
         }
         else if formRow.tag == "ends" {
-            let startDateDescriptor = self.form.formRowWithTag("starts")!
-            let endDateDescriptor = self.form.formRowWithTag("ends")!
+            let startDateDescriptor = form.formRowWithTag("starts")!
+            let endDateDescriptor = form.formRowWithTag("ends")!
             let dateEndCell = endDateDescriptor.cellForFormController(self) as! XLFormDateCell
-            if startDateDescriptor.value!.compare(endDateDescriptor.value as! NSDate) == NSComparisonResult.OrderedDescending {
+            if startDateDescriptor.value!.compare(endDateDescriptor.value as! NSDate) == .OrderedDescending {
                 // startDateDescriptor is later than endDateDescriptor
                 dateEndCell.update()
-                let newDetailText : String =  dateEndCell.detailTextLabel!.text!
+                let newDetailText =  dateEndCell.detailTextLabel!.text!
                 let strikeThroughAttribute = [NSStrikethroughStyleAttributeName : NSUnderlineStyle.StyleSingle.rawValue]
                 let strikeThroughText = NSAttributedString(string: newDetailText, attributes: strikeThroughAttribute)
                 endDateDescriptor.cellConfig["detailTextLabel.attributedText"] = strikeThroughText
-                self.updateFormRow(endDateDescriptor)
+                updateFormRow(endDateDescriptor)
             }
             else{
                 let endDateDescriptor = self.form.formRowWithTag("ends")!
                 endDateDescriptor.cellConfig.removeObjectForKey("detailTextLabel.attributedText")
-                self.updateFormRow(endDateDescriptor)
+                updateFormRow(endDateDescriptor)
             }
         }
     }
 
-    func cancelPressed(button: UIBarButtonItem)
-    {
-        self.dismissViewControllerAnimated(true, completion: nil)
+    func cancelPressed(button: UIBarButtonItem){
+        dismissViewControllerAnimated(true, completion: nil)
     }
 
 
-    func savePressed(button: UIBarButtonItem)
-    {
-        let validationErrors : Array<NSError> = self.formValidationErrors() as! Array<NSError>
+    func savePressed(button: UIBarButtonItem){
+        let validationErrors : Array<NSError> = formValidationErrors() as! Array<NSError>
         if (validationErrors.count > 0){
-            self.showFormValidationError(validationErrors.first)
+            showFormValidationError(validationErrors.first)
             return
         }
-        self.tableView.endEditing(true)
+        tableView.endEditing(true)
     }
 }
 
@@ -239,7 +230,7 @@ class NativeEventNavigationViewController : UINavigationController {
     
     override func viewDidLoad(){
         super.viewDidLoad()
-        self.view.tintColor = UIColor.redColor()
+        view.tintColor = .redColor()
     }
     
 }

Examples/Swift/SwiftExample/SelectorsFormViewController.swift

@@ -33,7 +33,6 @@ class NSArrayValueTrasformer : NSValueTransformer {
         return NSString.self
     }
     
-    
     override class func allowsReverseTransformation() -> Bool {
         return false
     }
@@ -72,48 +71,48 @@ class ISOLanguageCodesValueTranformer : NSValueTransformer {
 
 class SelectorsFormViewController : XLFormViewController {
     
-    private enum Tags : String {
-        case Push = "selectorPush"
-        case Popover = "selectorPopover"
-        case ActionSheet = "selectorActionSheet"
-        case AlertView = "selectorAlertView"
-        case PickerView = "selectorPickerView"
-        case Picker = "selectorPicker"
-        case PickerViewInline = "selectorPickerViewInline"
-        case MultipleSelector = "multipleSelector"
-        case MultipleSelectorPopover = "multipleSelectorPopover"
-        case DynamicSelectors = "dynamicSelectors"
-        case CustomSelectors = "customSelectors"
-        case SelectorWithSegueId = "selectorWithSegueId"
-        case SelectorWithSegueClass = "selectorWithSegueClass"
-        case SelectorWithNibName = "selectorWithNibName"
-        case SelectorWithStoryboardId = "selectorWithStoryboardId"
+    private struct Tags {
+        static let Push = "selectorPush"
+        static let Popover = "selectorPopover"
+        static let ActionSheet = "selectorActionSheet"
+        static let AlertView = "selectorAlertView"
+        static let PickerView = "selectorPickerView"
+        static let Picker = "selectorPicker"
+        static let PickerViewInline = "selectorPickerViewInline"
+        static let MultipleSelector = "multipleSelector"
+        static let MultipleSelectorPopover = "multipleSelectorPopover"
+        static let DynamicSelectors = "dynamicSelectors"
+        static let CustomSelectors = "customSelectors"
+        static let SelectorWithSegueId = "selectorWithSegueId"
+        static let SelectorWithSegueClass = "selectorWithSegueClass"
+        static let SelectorWithNibName = "selectorWithNibName"
+        static let SelectorWithStoryboardId = "selectorWithStoryboardId"
     }
     
 
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        let barButton = UIBarButtonItem(title: "Disable", style: UIBarButtonItemStyle.Plain, target: self, action: "disableEnable:")
+        let barButton = UIBarButtonItem(title: "Disable", style: .Plain, target: self, action: "disableEnable:")
         barButton.possibleTitles = Set(["Disable", "Enable"])
-        self.navigationItem.rightBarButtonItem = barButton
+        navigationItem.rightBarButtonItem = barButton
     }
     
     func disableEnable(button : UIBarButtonItem)
     {
-        self.form.disabled = !self.form.disabled
-        button.title = self.form.disabled ? "Enable" : "Disable"
-        self.tableView.endEditing(true)
-        self.tableView.reloadData()
+        form.disabled = !form.disabled
+        button.title = form.disabled ? "Enable" : "Disable"
+        tableView.endEditing(true)
+        tableView.reloadData()
     }
     
     func initializeForm() {
@@ -129,7 +128,7 @@ class SelectorsFormViewController : XLFormViewController {
         
         
         // Selector Push
-        row = XLFormRowDescriptor(tag: Tags.Push.rawValue, rowType:XLFormRowDescriptorTypeSelectorPush, title:"Push")
+        row = XLFormRowDescriptor(tag: Tags.Push, rowType:XLFormRowDescriptorTypeSelectorPush, title:"Push")
         row.selectorOptions = [XLFormOptionsObject(value: 0, displayText: "Option 1"),
                                     XLFormOptionsObject(value: 1, displayText:"Option 2"),
                                     XLFormOptionsObject(value: 2, displayText:"Option 3"),
@@ -142,14 +141,14 @@ class SelectorsFormViewController : XLFormViewController {
         
         // Selector Popover
         if (UIDevice.currentDevice().userInterfaceIdiom == UIUserInterfaceIdiom.Pad){
-            row = XLFormRowDescriptor(tag: Tags.Popover.rawValue, rowType:XLFormRowDescriptorTypeSelectorPopover, title:"PopOver")
+            row = XLFormRowDescriptor(tag: Tags.Popover, rowType:XLFormRowDescriptorTypeSelectorPopover, title:"PopOver")
             row.selectorOptions = ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5", "Option 6"]
             row.value = "Option 2"
             section.addFormRow(row)
         }
     
         // Selector Action Sheet
-        row = XLFormRowDescriptor(tag :Tags.ActionSheet.rawValue, rowType:XLFormRowDescriptorTypeSelectorActionSheet, title:"Sheet")
+        row = XLFormRowDescriptor(tag :Tags.ActionSheet, rowType:XLFormRowDescriptorTypeSelectorActionSheet, title:"Sheet")
         row.selectorOptions = ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5"]
         row.value = "Option 3"
         section.addFormRow(row)
@@ -157,13 +156,13 @@ class SelectorsFormViewController : XLFormViewController {
         
         
         // Selector Alert View
-        row = XLFormRowDescriptor(tag: Tags.AlertView.rawValue, rowType:XLFormRowDescriptorTypeSelectorAlertView, title:"Alert View")
+        row = XLFormRowDescriptor(tag: Tags.AlertView, rowType:XLFormRowDescriptorTypeSelectorAlertView, title:"Alert View")
         row.selectorOptions = ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5"]
         row.value = "Option 3"
         section.addFormRow(row)
         
         // Selector Picker View
-        row = XLFormRowDescriptor(tag: Tags.PickerView.rawValue, rowType:XLFormRowDescriptorTypeSelectorPickerView, title:"Picker View")
+        row = XLFormRowDescriptor(tag: Tags.PickerView, rowType:XLFormRowDescriptorTypeSelectorPickerView, title:"Picker View")
         row.selectorOptions = ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5"]
         row.value = "Option 4"
         section.addFormRow(row)
@@ -173,7 +172,7 @@ class SelectorsFormViewController : XLFormViewController {
         section = XLFormSectionDescriptor.formSectionWithTitle("Fixed Controls")
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.Picker.rawValue, rowType:XLFormRowDescriptorTypePicker)
+        row = XLFormRowDescriptor(tag: Tags.Picker, rowType:XLFormRowDescriptorTypePicker)
         row.selectorOptions = ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5"]
         row.value = "Option 1"
         section.addFormRow(row)
@@ -182,7 +181,7 @@ class SelectorsFormViewController : XLFormViewController {
         section = XLFormSectionDescriptor.formSectionWithTitle("Inline Selectors")
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.MultipleSelector.rawValue, rowType:XLFormRowDescriptorTypeSelectorPickerViewInline, title:"Inline Picker View")
+        row = XLFormRowDescriptor(tag: Tags.MultipleSelector, rowType:XLFormRowDescriptorTypeSelectorPickerViewInline, title:"Inline Picker View")
         row.selectorOptions = ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5", "Option 6"]
         row.value = "Option 6"
         section.addFormRow(row)
@@ -191,14 +190,14 @@ class SelectorsFormViewController : XLFormViewController {
         section = XLFormSectionDescriptor.formSectionWithTitle("Multiple Selectors")
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.MultipleSelector.rawValue, rowType:XLFormRowDescriptorTypeMultipleSelector, title:"Multiple Selector")
+        row = XLFormRowDescriptor(tag: Tags.MultipleSelector, rowType:XLFormRowDescriptorTypeMultipleSelector, title:"Multiple Selector")
         row.selectorOptions = ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5", "Option 6"]
         row.value = ["Option 1", "Option 3", "Option 4", "Option 5", "Option 6"]
         section.addFormRow(row)
         
         
         // Multiple selector with value tranformer
-        row = XLFormRowDescriptor(tag: Tags.MultipleSelector.rawValue, rowType:XLFormRowDescriptorTypeMultipleSelector, title:"Multiple Selector")
+        row = XLFormRowDescriptor(tag: Tags.MultipleSelector, rowType:XLFormRowDescriptorTypeMultipleSelector, title:"Multiple Selector")
         row.selectorOptions = ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5", "Option 6"]
         row.value = ["Option 1", "Option 3", "Option 4", "Option 5", "Option 6"]
         row.valueTransformer = NSArrayValueTrasformer.self
@@ -206,7 +205,7 @@ class SelectorsFormViewController : XLFormViewController {
         
         
         // Language multiple selector
-        row = XLFormRowDescriptor(tag: Tags.MultipleSelector.rawValue, rowType:XLFormRowDescriptorTypeMultipleSelector, title:"Multiple Selector")
+        row = XLFormRowDescriptor(tag: Tags.MultipleSelector, rowType:XLFormRowDescriptorTypeMultipleSelector, title:"Multiple Selector")
         row.selectorOptions = NSLocale.ISOLanguageCodes()
         row.selectorTitle = "Languages"
         row.valueTransformer = ISOLanguageCodesValueTranformer.self
@@ -214,9 +213,9 @@ class SelectorsFormViewController : XLFormViewController {
         section.addFormRow(row)
 
     
-        if UIDevice.currentDevice().userInterfaceIdiom == UIUserInterfaceIdiom.Pad {
+        if UIDevice.currentDevice().userInterfaceIdiom == .Pad {
             // Language multiple selector popover
-            row = XLFormRowDescriptor(tag: Tags.MultipleSelectorPopover.rawValue, rowType:XLFormRowDescriptorTypeMultipleSelectorPopover, title:"Multiple Selector PopOver")
+            row = XLFormRowDescriptor(tag: Tags.MultipleSelectorPopover, rowType:XLFormRowDescriptorTypeMultipleSelectorPopover, title:"Multiple Selector PopOver")
             row.selectorOptions = NSLocale.ISOLanguageCodes()
             row.valueTransformer = ISOLanguageCodesValueTranformer.self
             row.value = NSLocale.preferredLanguages()
@@ -229,7 +228,7 @@ class SelectorsFormViewController : XLFormViewController {
         section = XLFormSectionDescriptor.formSectionWithTitle("Dynamic Selectors")
         form.addFormSection(section)
 
-        row = XLFormRowDescriptor(tag: Tags.DynamicSelectors.rawValue, rowType:XLFormRowDescriptorTypeButton, title:"Dynamic Selectors")
+        row = XLFormRowDescriptor(tag: Tags.DynamicSelectors, rowType:XLFormRowDescriptorTypeButton, title:"Dynamic Selectors")
         row.action.viewControllerClass = DynamicSelectorsFormViewController.self
         section.addFormRow(row)
         
@@ -239,7 +238,7 @@ class SelectorsFormViewController : XLFormViewController {
         section = XLFormSectionDescriptor.formSectionWithTitle("Custom Selectors")
         form.addFormSection(section)
         
-        row = XLFormRowDescriptor(tag: Tags.CustomSelectors.rawValue, rowType:XLFormRowDescriptorTypeButton, title:"Custom Selectors")
+        row = XLFormRowDescriptor(tag: Tags.CustomSelectors, rowType:XLFormRowDescriptorTypeButton, title:"Custom Selectors")
         row.action.viewControllerClass = CustomSelectorsFormViewController.self
         section.addFormRow(row)
         
@@ -249,7 +248,7 @@ class SelectorsFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         // selector with segue class
-        row = XLFormRowDescriptor(tag: Tags.SelectorWithSegueClass.rawValue, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Selector with Segue Class")
+        row = XLFormRowDescriptor(tag: Tags.SelectorWithSegueClass, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Selector with Segue Class")
         row.action.formSegueClass = NSClassFromString("UIStoryboardPushSegue")
         row.action.viewControllerClass = MapViewController.self
         row.valueTransformer = CLLocationValueTrasformer.self
@@ -257,21 +256,21 @@ class SelectorsFormViewController : XLFormViewController {
         section.addFormRow(row)
         
         // selector with SegueId
-        row = XLFormRowDescriptor(tag: Tags.SelectorWithSegueId.rawValue, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Selector with Segue Idenfifier")
-        row.action.formSegueIdenfifier = "MapViewControllerSegue";
+        row = XLFormRowDescriptor(tag: Tags.SelectorWithSegueId, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Selector with Segue Idenfifier")
+        row.action.formSegueIdentifier = "MapViewControllerSegue";
         row.valueTransformer = CLLocationValueTrasformer.self
         row.value = CLLocation(latitude: -33, longitude: -56)
         section.addFormRow(row)
         
         // selector using StoryboardId
-        row = XLFormRowDescriptor(tag: Tags.SelectorWithStoryboardId.rawValue, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Selector with StoryboardId")
+        row = XLFormRowDescriptor(tag: Tags.SelectorWithStoryboardId, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Selector with StoryboardId")
         row.action.viewControllerStoryboardId = "MapViewController";
         row.valueTransformer = CLLocationValueTrasformer.self
         row.value = CLLocation(latitude: -33, longitude: -56)
         section.addFormRow(row)
         
         // selector with NibName
-        row = XLFormRowDescriptor(tag: Tags.SelectorWithNibName.rawValue, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Selector with NibName")
+        row = XLFormRowDescriptor(tag: Tags.SelectorWithNibName, rowType: XLFormRowDescriptorTypeSelectorPush, title: "Selector with NibName")
         row.action.viewControllerNibName = "MapViewController"
         row.valueTransformer = CLLocationValueTrasformer.self
         row.value = CLLocation(latitude: -33, longitude: -56)

Examples/Swift/SwiftExample/StoryboardExample/iPhoneStoryboard.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="p4n-1v-pzo">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="p4n-1v-pzo">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->
@@ -272,11 +273,6 @@
             <point key="canvasLocation" x="-159" y="1151"/>
         </scene>
     </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
         <segue reference="wAD-tS-AFZ"/>
     </inferredMetricsTieBreakers>

Examples/Swift/SwiftExample/UICustomization/UICustomizationFormViewController.swift

@@ -25,9 +25,9 @@
 
 class UICustomizationFormViewController : XLFormViewController {
     
-    private enum Tags : String {
-        case Name = "Name"
-        case Button = "Button"
+    private struct Tags {
+        static let Name = "Name"
+        static let Button = "Button"
     }
     
     
@@ -36,7 +36,7 @@ class UICustomizationFormViewController : XLFormViewController {
         self.initializeForm()
     }
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         self.initializeForm()
     }
@@ -53,7 +53,7 @@ class UICustomizationFormViewController : XLFormViewController {
         form.addFormSection(section)
     
         // Name
-        row = XLFormRowDescriptor(tag: Tags.Name.rawValue, rowType: XLFormRowDescriptorTypeText, title:"Name")
+        row = XLFormRowDescriptor(tag: Tags.Name, rowType: XLFormRowDescriptorTypeText, title:"Name")
         // change the background color
         row.cellConfigAtConfigure["backgroundColor"] = UIColor.greenColor()
         // font
@@ -72,7 +72,7 @@ class UICustomizationFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         //Button
-        row = XLFormRowDescriptor(tag: Tags.Button.rawValue, rowType: XLFormRowDescriptorTypeButton, title:"Button")
+        row = XLFormRowDescriptor(tag: Tags.Button, rowType: XLFormRowDescriptorTypeButton, title:"Button")
         row.cellConfigAtConfigure["backgroundColor"] = UIColor.purpleColor()
         row.cellConfig["textLabel.color"] = UIColor.whiteColor()
         row.cellConfig["textLabel.font"] = UIFont.systemFontOfSize(40)
@@ -83,10 +83,10 @@ class UICustomizationFormViewController : XLFormViewController {
     
     override func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
         // change cell height of a particular cell
-        if self.form.formRowAtIndex(indexPath)?.tag == "Name" {
+        if form.formRowAtIndex(indexPath)?.tag == "Name" {
             return 60.0
         }
-        else if self.form.formRowAtIndex(indexPath)?.tag == "Button" {
+        else if form.formRowAtIndex(indexPath)?.tag == "Button" {
             return 100.0
         }
         return super.tableView(tableView, heightForRowAtIndexPath: indexPath)

Examples/Swift/SwiftExample/Validations/ValidationExamplesFormViewController.swift

@@ -26,22 +26,22 @@
 
 class ValidationExamplesFormViewController : XLFormViewController {
 
-    private enum Tags : String {
-        case ValidationName = "Name"
-        case ValidationEmail = "Email"
-        case ValidationPassword = "Password"
-        case ValidationInteger = "Integer"
+    private struct Tags {
+        static let ValidationName = "Name"
+        static let ValidationEmail = "Email"
+        static let ValidationPassword = "Password"
+        static let ValidationInteger = "Integer"
     }
     
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        self.initializeForm()
+        initializeForm()
     }
     
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        self.initializeForm()
+        initializeForm()
     }
     
     func initializeForm() {
@@ -58,7 +58,7 @@ class ValidationExamplesFormViewController : XLFormViewController {
         
         
         // Name
-        row = XLFormRowDescriptor(tag: Tags.ValidationName.rawValue, rowType: XLFormRowDescriptorTypeText, title:"Name")
+        row = XLFormRowDescriptor(tag: Tags.ValidationName, rowType: XLFormRowDescriptorTypeText, title:"Name")
         row.cellConfigAtConfigure["textField.placeholder"] = "Required..."
         row.cellConfigAtConfigure["textField.textAlignment"] =  NSTextAlignment.Right.rawValue
         row.required = true
@@ -70,7 +70,7 @@ class ValidationExamplesFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         // Email
-        row = XLFormRowDescriptor(tag: Tags.ValidationEmail.rawValue, rowType: XLFormRowDescriptorTypeText, title:"Email")
+        row = XLFormRowDescriptor(tag: Tags.ValidationEmail, rowType: XLFormRowDescriptorTypeText, title:"Email")
         row.cellConfigAtConfigure["textField.textAlignment"] = NSTextAlignment.Right.rawValue
         row.required = false
         row.value = "not valid email"
@@ -84,7 +84,7 @@ class ValidationExamplesFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         // Password
-        row = XLFormRowDescriptor(tag: Tags.ValidationPassword.rawValue, rowType: XLFormRowDescriptorTypePassword, title:"Password")
+        row = XLFormRowDescriptor(tag: Tags.ValidationPassword, rowType: XLFormRowDescriptorTypePassword, title:"Password")
         row.cellConfigAtConfigure["textField.placeholder"] = "Required..."
         row.cellConfigAtConfigure["textField.textAlignment"] = NSTextAlignment.Right.rawValue
         row.required = true
@@ -98,7 +98,7 @@ class ValidationExamplesFormViewController : XLFormViewController {
         form.addFormSection(section)
         
         // Integer
-        row = XLFormRowDescriptor(tag: Tags.ValidationInteger.rawValue, rowType:XLFormRowDescriptorTypeInteger, title:"Integer")
+        row = XLFormRowDescriptor(tag: Tags.ValidationInteger, rowType:XLFormRowDescriptorTypeInteger, title:"Integer")
         row.cellConfigAtConfigure["textField.placeholder"] = "Required..."
         row.cellConfigAtConfigure["textField.textAlignment"] = NSTextAlignment.Right.rawValue
         row.required = true
@@ -106,14 +106,12 @@ class ValidationExamplesFormViewController : XLFormViewController {
         section.addFormRow(row)
         
         self.form = form
-    
-    
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.navigationItem.rightBarButtonItem?.target = self
-        self.navigationItem.rightBarButtonItem?.action = "validateForm:"
+        navigationItem.rightBarButtonItem?.target = self
+        navigationItem.rightBarButtonItem?.action = "validateForm:"
     }
     
 
@@ -121,22 +119,22 @@ class ValidationExamplesFormViewController : XLFormViewController {
 //MARK: Actions
     
     func validateForm(buttonItem: UIBarButtonItem) {
-        let array = self.formValidationErrors()
+        let array = formValidationErrors()
         for errorItem in array {
             let error = errorItem as! NSError
-            let validationStatus : XLFormValidationStatus = error.userInfo![XLValidationStatusErrorKey] as! XLFormValidationStatus
-            if validationStatus.rowDescriptor!.tag == Tags.ValidationName.rawValue {
-                if let cell = self.tableView.cellForRowAtIndexPath(self.form.indexPathOfFormRow(validationStatus.rowDescriptor)!) {
-                    cell.backgroundColor = UIColor.orangeColor()
+            let validationStatus : XLFormValidationStatus = error.userInfo[XLValidationStatusErrorKey] as! XLFormValidationStatus
+            if validationStatus.rowDescriptor!.tag == Tags.ValidationName {
+                if let rowDescriptor = validationStatus.rowDescriptor, let indexPath = form.indexPathOfFormRow(rowDescriptor), let cell = tableView.cellForRowAtIndexPath(indexPath) {
+                    cell.backgroundColor = .orangeColor()
                     UIView.animateWithDuration(0.3, animations: { () -> Void in
-                        cell.backgroundColor = UIColor.whiteColor()
+                        cell.backgroundColor = .whiteColor()
                     })
                 }
             }
-            else if validationStatus.rowDescriptor!.tag == Tags.ValidationEmail.rawValue ||
-                    validationStatus.rowDescriptor!.tag == Tags.ValidationPassword.rawValue ||
-                    validationStatus.rowDescriptor!.tag == Tags.ValidationInteger.rawValue {
-                if let cell = self.tableView.cellForRowAtIndexPath(self.form.indexPathOfFormRow(validationStatus.rowDescriptor)!) {
+            else if validationStatus.rowDescriptor!.tag == Tags.ValidationEmail ||
+                    validationStatus.rowDescriptor!.tag == Tags.ValidationPassword ||
+                    validationStatus.rowDescriptor!.tag == Tags.ValidationInteger {
+                if let rowDescriptor = validationStatus.rowDescriptor, let indexPath = form.indexPathOfFormRow(rowDescriptor), let cell = tableView.cellForRowAtIndexPath(indexPath) {
                     self.animateCell(cell)
                 }
             }