ProMotion-XLForm 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fc58053fd275bef181a86bb72f899c4b18f19cf
-  data.tar.gz: 9999d16ffe8002ce607fdd01456dd94fd0394312
+  metadata.gz: ee27a2aaaa760891254d3dc74750627ba2e5f3dd
+  data.tar.gz: 7b94d7fa1b9a90a67683ef6f5857c67bc7140083
 SHA512:
-  metadata.gz: 3eeeaac0957b4c65a68cd69a4f03b778f1416c978da4211375b0dcf7e709d149803b2855793ea0888bdf12e44f500a102847473a49f2654ede5866b107e23337
-  data.tar.gz: 7962d3602e3ed6fff45265b710250a8d3783a8e20350e3e747b64cbf8a18a26863492a41fb7570bcb365d063afd969bae884a5f7c982beda312c87f8748ac14d
+  metadata.gz: 2aa17d7cdc982ab7c05070e25f707b3776117be81817d917670bb7bc1263003aa49af8cf98f7c028db215d115736b67a153043c9ae3547be4d81d3b46de16b85
+  data.tar.gz: aec5cdfd8915d050124fb65b0fabfe7d001cc4509b465fc1dd713114502133e4b6df5577389de4d5bc7b364b0688d10bb2592880e3a839607a2bffd94a6b49cc

data/README.md

@@ -2,9 +2,6 @@
 
 ProMotion-XLForm provides a PM::XLFormScreen for [ProMotion](https://github.com/clearsightstudio/ProMotion) powered by the CocoaPod [XLForm](https://github.com/xmartlabs/XLForm).
 
-## Warning
-This gem is currently in very early-stage. Use it at your own risk :)
-
 [![Build Status](https://travis-ci.org/bmichotte/ProMotion-XLForm.svg?branch=master)](https://travis-ci.org/bmichotte/ProMotion-XLForm) [![Gem Version](https://badge.fury.io/rb/ProMotion-XLForm.svg)](http://badge.fury.io/rb/ProMotion-XLForm)
 
 ## Installation
@@ -115,6 +112,7 @@ class TestFormScreen < PM::XLFormScreen
                on_cancel: :cancel_form # will be called when you touch cancel
 
    def save_form(values)
+     dismiss_keyboard
      mp values
    end
 
@@ -125,7 +123,8 @@ end
 
 ### Getting values
 
-You can get the values of your form with `values`. You can also get validation errors with `validation_errors` and check if the form is valid with `valid?`.
+You can get the values of your form with `values`. You can call `dismiss_keyboard` before before calling `values` to ensure you capture the input from the currently focused form element.
+You can also get validation errors with `validation_errors` and check if the form is valid with `valid?`.
 You can also get a specific value with `value_for_cell(:my_cell)`.
 
 ### Events

data/lib/ProMotion-XLForm.rb

@@ -6,9 +6,7 @@ require 'motion-cocoapods'
 
 Motion::Project::App.setup do |app|
   lib_dir_path = File.dirname(File.expand_path(__FILE__))
-  app.files << File.join(lib_dir_path, "ProMotion/XLForm/cells/xl_form_cell.rb")
-  app.files << File.join(lib_dir_path, "ProMotion/XLForm/cells/xl_form_image_selector_cell.rb")
-  app.files << File.join(lib_dir_path, "ProMotion/XLForm/cells/xl_form_color_selector_cell.rb")
+
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_class_methods.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_module.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_view_controller.rb")
@@ -19,11 +17,19 @@ Motion::Project::App.setup do |app|
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_helper.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_cell_builder.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_section_builder.rb")
+  
+  app.files << File.join(lib_dir_path, "ProMotion/XLForm/cells/xl_form_cell.rb")
+  app.files << File.join(lib_dir_path, "ProMotion/XLForm/cells/xl_form_image_selector_cell.rb")
+  app.files << File.join(lib_dir_path, "ProMotion/XLForm/cells/xl_form_color_selector_cell.rb")
+
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/value_transformer.rb")
+  
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/validators/validator.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/validators/url_validator.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/validators/regex_validator.rb")
 
+  app.files << File.join(lib_dir_path, "ProMotion/XLForm/ui_alert_controller.rb")
+
   app.pods do
     pod 'XLForm', '~> 3.0.0'
     pod 'RSColorPicker'

data/lib/ProMotion/XLForm/cells/xl_form_cell.rb

@@ -1,5 +1,10 @@
 module ProMotion
   class XLFormCell < XLFormBaseCell
+    include ProMotion::TableViewCellModule
+
+    def check_deprecated_styles
+      # just ignore ProMotion messages
+    end
 
     def value=(value)
       rowDescriptor.value = value

data/lib/ProMotion/XLForm/cells/xl_form_color_selector_cell.rb

@@ -1,27 +1,30 @@
-class XLFormColorSelectorCell < XLFormBaseCell
-  def configure
-    super.tap do
-      self.selectionStyle = UITableViewCellSelectionStyleNone
+module ProMotion
+  class XLFormColorSelectorCell < XLFormCell
+
+    def setup(data_cell, screen)
+      super
+ 
       @color_view = UIView.alloc.initWithFrame [[0, 0], [80, 30]]
       @color_view.contentMode = UIViewContentModeScaleAspectFit
       @color_view.layer.borderWidth = 1
       @color_view.layer.borderColor = UIColor.blackColor.CGColor
       @color_view.backgroundColor = UIColor.whiteColor
-      tap = UITapGestureRecognizer.alloc.initWithTarget(self, action: 'on_color_tap:')
-      self.addGestureRecognizer(tap)
-
       self.accessoryView = @color_view
+
+      self.selectionStyle = UITableViewCellSelectionStyleNone
+      self.backgroundColor = UIColor.whiteColor
+      self.separatorInset = UIEdgeInsetsZero
     end
-  end
 
-  def on_color_tap(_)
-    unless self.rowDescriptor.disabled
+    def formDescriptorCellDidSelectedWithFormController(controller)
+      return if self.rowDescriptor.disabled
+
       self.formViewController.view.endEditing(true)
 
       size = if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
                [400, 440]
              else
-               [320, 440]
+               UIScreen.mainScreen.bounds.size
              end
       color_chooser = PMXLColorChooser.alloc.initWithFrame [[0, 0], size]
       color_chooser.delegate = self
@@ -61,30 +64,24 @@ class XLFormColorSelectorCell < XLFormBaseCell
         end
       end
     end
-  end
 
-  def hide_picker(_)
-    self.formViewController.dismissViewControllerAnimated(true, completion: nil)
-  end
+    def hide_picker(_)
+      self.formViewController.dismissViewControllerAnimated(true, completion: nil)
+    end
 
-  def update
-    super.tap do
-      self.textLabel.text = (self.rowDescriptor.isRequired && self.rowDescriptor.title) ? "#{self.rowDescriptor.title}*" : self.rowDescriptor.title
-      @color_view.frame = [[305.0, 7.0], [80.0, 30.0]]
-      color = self.rowDescriptor.value
+    def update
+      color = value
       unless color
         color = UIColor.whiteColor
       end
-      @color_view.layer.borderColor = UIColor.blackColor.CGColor
       @color_view.backgroundColor = color
-      self.textLabel.font = UIFont.preferredFontForTextStyle(UIFontTextStyleBody)
     end
-  end
 
-  def colorPickerDidChangeSelection(color_picker)
-    color = color_picker.selectionColor
-    @color_view.backgroundColor = color
-    self.rowDescriptor.value = color
+    def colorPickerDidChangeSelection(color_picker)
+      color = color_picker.selectionColor
+      @color_view.backgroundColor = color
+      self.value = color
+    end
   end
 end
 

data/lib/ProMotion/XLForm/cells/xl_form_image_selector_cell.rb

@@ -1,229 +1,153 @@
-class XLFormImageSelectorCell < XLFormBaseCell
+module ProMotion
+  class XLFormImageSelectorCell < XLFormCell
 
-  attr_accessor :imageview, :text_label
+    def setup(data_cell, screen)
+      super
 
-  def configure
-    super
-    @image_height = 100.0
-    @image_width = 100.0
-    self.selectionStyle = UITableViewCellSelectionStyleNone
-    self.backgroundColor = UIColor.whiteColor
-    self.separatorInset = UIEdgeInsetsZero
+      size = (data_cell[:height] || 100) - 20 
 
-    self.contentView.addSubview(imageview)
-    self.contentView.addSubview(text_label)
-    text_label.addObserver(self, forKeyPath: "text", options: NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew, context: 0)
-  end
-
-  def update
-    text_label.text = self.rowDescriptor.title
-    imageview.image = self.rowDescriptor.value
-
-    text_label.setFont(UIFont.preferredFontForTextStyle(UIFontTextStyleBody))
-    text_label.sizeToFit
-    updateConstraints
-  end
+      @imageview = UIImageView.alloc.initWithFrame([[0, 0], [size, size]])
+      self.accessoryView = @imageview
 
-  def self.formDescriptorCellHeightForRowDescriptor(_)
-    120.0
-  end
+      self.selectionStyle = UITableViewCellSelectionStyleNone
+      self.backgroundColor = UIColor.whiteColor
+      self.separatorInset = UIEdgeInsetsZero
+    end
 
-  def formDescriptorCellDidSelectedWithFormController(controller)
-    if Kernel.const_defined?("UIAlertController") && UIAlertController.respond_to?(:'alertControllerWithTitle:message:preferredStyle:')
-      alert = UIAlertController.alertControllerWithTitle(self.rowDescriptor.selectorTitle,
-                                                         message: nil,
-                                                         preferredStyle: UIAlertControllerStyleActionSheet)
+    def update
+      @imageview.image = value
+    end
 
-      alert.addAction(UIAlertAction.actionWithTitle(NSLocalizedString("Choose From Library", nil),
-                                                    style: UIAlertActionStyleDefault,
-                                                    handler: lambda { |_|
-                                                      open_from_alert(UIImagePickerControllerSourceTypePhotoLibrary)
-                                                    }))
+    def formDescriptorCellDidSelectedWithFormController(controller)
+      if Kernel.const_defined?("UIAlertController") && UIAlertController.respond_to?(:'alertControllerWithTitle:message:preferredStyle:')
+        alert = UIAlertController.alertControllerWithTitle(self.rowDescriptor.selectorTitle,
+                                                           message: nil,
+                                                           preferredStyle: UIAlertControllerStyleActionSheet)
 
-      if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceTypeCamera)
-        alert.addAction(UIAlertAction.actionWithTitle(NSLocalizedString("Take Photo", nil),
+        alert.addAction(UIAlertAction.actionWithTitle(NSLocalizedString("Choose From Library", nil),
                                                       style: UIAlertActionStyleDefault,
                                                       handler: lambda { |_|
-                                                        open_from_alert(UIImagePickerControllerSourceTypeCamera)
+                                                        open_from_alert(UIImagePickerControllerSourceTypePhotoLibrary)
                                                       }))
-      end
 
-      if 
-        alert.modalPresentationStyle = UIModalPresentationPopover
-        alert.popoverPresentationController.sourceView = self.contentView
-        alert.popoverPresentationController.sourceRect = self.contentView.bounds
-      end
+        if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceTypeCamera)
+          alert.addAction(UIAlertAction.actionWithTitle(NSLocalizedString("Take Photo", nil),
+                                                        style: UIAlertActionStyleDefault,
+                                                        handler: lambda { |_|
+                                                          open_from_alert(UIImagePickerControllerSourceTypeCamera)
+                                                        }))
+        end
+
+        if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
+          alert.modalPresentationStyle = UIModalPresentationPopover
+          alert.popoverPresentationController.sourceView = self.contentView
+          alert.popoverPresentationController.sourceRect = self.contentView.bounds
+        end
+
+        present = -> {
+          self.formViewController.presentViewController(alert, animated: true, completion: nil)
+        }
+        if self.formViewController.presentedViewController
+          self.formViewController.dismissViewControllerAnimated(true, completion: present)
+        else
+          present.call
+        end
 
-      present = -> {
-        self.formViewController.presentViewController(alert, animated: true, completion: nil)
-      }
-      if self.formViewController.presentedViewController
-        self.formViewController.dismissViewControllerAnimated(true, completion: present)
       else
-        present.call
+        if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceTypeCamera)
+          action_sheet = UIActionSheet.alloc.initWithTitle(self.rowDescriptor.selectorTitle,
+                                                           delegate: self,
+                                                           cancelButtonTitle: NSLocalizedString("Cancel", nil),
+                                                           destructiveButtonTitle: nil,
+                                                           otherButtonTitles: NSLocalizedString("Choose From Library", nil), NSLocalizedString("Take Photo", nil), nil)
+        else
+          action_sheet = UIActionSheet.alloc.initWithTitle(self.rowDescriptor.selectorTitle,
+                                                           delegate: self,
+                                                           cancelButtonTitle: NSLocalizedString("Cancel", nil),
+                                                           destructiveButtonTitle: nil,
+                                                           otherButtonTitles: NSLocalizedString("Choose From Library", nil), nil)
+        end
+        action_sheet.tag = self.tag
+        action_sheet.showInView(self.formViewController.view)
       end
-
-    else
-      if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceTypeCamera)
-        action_sheet = UIActionSheet.alloc.initWithTitle(self.rowDescriptor.selectorTitle,
-                                                         delegate: self,
-                                                         cancelButtonTitle: NSLocalizedString("Cancel", nil),
-                                                         destructiveButtonTitle: nil,
-                                                         otherButtonTitles: NSLocalizedString("Choose From Library", nil), NSLocalizedString("Take Photo", nil), nil)
-      else
-        action_sheet = UIActionSheet.alloc.initWithTitle(self.rowDescriptor.selectorTitle,
-                                                         delegate: self,
-                                                         cancelButtonTitle: NSLocalizedString("Cancel", nil),
-                                                         destructiveButtonTitle: nil,
-                                                         otherButtonTitles: NSLocalizedString("Choose From Library", nil), nil)
-      end
-      action_sheet.tag = self.tag
-      action_sheet.showInView(self.formViewController.view)
     end
-  end
 
-  def updateConstraints
-    ui_components = { "image" => imageview, "text" => text_label }
-
-    self.contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:|-16-[text]", options: 0, metrics: 0, views: ui_components))
-    self.contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("V:|-6-[text]", options: 0, metrics: 0, views: ui_components))
-
-    self.contentView.addConstraint(NSLayoutConstraint.constraintWithItem(imageview,
-                                                                         attribute: NSLayoutAttributeTop,
-                                                                         relatedBy: NSLayoutRelationEqual,
-                                                                         toItem: self.contentView,
-                                                                         attribute: NSLayoutAttributeTop,
-                                                                         multiplier: 1.0,
-                                                                         constant: 10.0))
-
-    self.contentView.addConstraint(NSLayoutConstraint.constraintWithItem(imageview,
-                                                                         attribute: NSLayoutAttributeBottom,
-                                                                         relatedBy: NSLayoutRelationEqual,
-                                                                         toItem: self.contentView,
-                                                                         attribute: NSLayoutAttributeBottom,
-                                                                         multiplier: 1.0,
-                                                                         constant: -10.0))
-
-    self.contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:[image(width)]", options: 0, metrics: { "width" => @image_width }, views: ui_components))
-    self.contentView.addConstraint(NSLayoutConstraint.constraintWithItem(imageview,
-                                                                         attribute: NSLayoutAttributeCenterX,
-                                                                         relatedBy: NSLayoutRelationEqual,
-                                                                         toItem: self.contentView,
-                                                                         attribute: NSLayoutAttributeCenterX,
-                                                                         multiplier: 1.0,
-                                                                         constant: 0.0))
-    super
-  end
+    # trick to force the status bar to be hidden when presenting the UIImagePickerViewController
+    def navigationController(_, willShowViewController: _, animated: _)
+      UIApplication.sharedApplication.setStatusBarHidden true
+    end
 
-  # trick to force the status bar to be hidden when presenting the UIImagePickerViewController
-  def navigationController(_, willShowViewController: _, animated: _)
-    UIApplication.sharedApplication.setStatusBarHidden true
-  end
+    # UIActionSheetDelegate
+    def actionSheet(action_sheet, clickedButtonAtIndex: button_index)
+      return if button_index == action_sheet.cancelButtonIndex
 
-  def setImageValue(image)
-    self.rowDescriptor.value = image
-    imageview.image = image
-  end
+      title = action_sheet.buttonTitleAtIndex(button_index)
 
-  def observeValueForKeyPath(key_path, ofObject: object, change: change, context: _)
-    if object == text_label && key_path == "text"
-      if change[NSKeyValueChangeKindKey] == NSKeyValueChangeSetting
-        text_label.sizeToFit
-        frame = text_label.frame
-        frame.origin = [16, 4]
-        text_label.frame = frame
-        self.contentView.needsUpdateConstraints
+      case title
+        when NSLocalizedString("Choose From Library", nil)
+          open_from_alert(UIImagePickerControllerSourceTypePhotoLibrary)
+        when NSLocalizedString("Take Photo", nil)
+          open_from_alert(UIImagePickerControllerSourceTypeCamera)
+        else
+          return
       end
     end
-  end
-
-  def dealloc
-    text_label.removeObserver(self, forKeyPath: "text")
-  end
 
-  # UIActionSheetDelegate
-  def actionSheet(action_sheet, clickedButtonAtIndex: button_index)
-    return if button_index == action_sheet.cancelButtonIndex
-
-    title = action_sheet.buttonTitleAtIndex(button_index)
+    def open_from_alert(source)
+      open = -> {
+        open_picker(source)
+      }
 
-    case title
-      when NSLocalizedString("Choose From Library", nil)
-        open_from_alert(UIImagePickerControllerSourceTypePhotoLibrary)
-      when NSLocalizedString("Take Photo", nil)
-        open_from_alert(UIImagePickerControllerSourceTypeCamera)
+      if @popover_controller && @popover_controller.isPopoverVisible
+        @popover_controller.dismissPopoverAnimated(true)
+        open.call
+      elsif self.formViewController.presentedViewController
+        self.formViewController.dismissViewControllerAnimated(true, completion: open)
       else
-        return
-    end
-  end
-
-  def open_from_alert(source)
-    open = -> {
-      open_picker(source)
-    }
-
-    if @popover_controller && @popover_controller.isPopoverVisible
-      @popover_controller.dismissPopoverAnimated(true)
-      open.call
-    elsif self.formViewController.presentedViewController
-      self.formViewController.dismissViewControllerAnimated(true, completion: open)
-    else
-      open.call
-    end
-  end
-
-  def open_picker(source)
-    @image_picker = UIImagePickerController.alloc.init
-    @image_picker.delegate = self
-    @image_picker.allowsEditing = true
-    @image_picker.sourceType = source
-
-    if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
-      @popover_controller = UIPopoverController.alloc.initWithContentViewController(@image_picker)
-      @popover_controller.presentPopoverFromRect(self.contentView.frame,
-                                                 inView: self.formViewController.view,
-                                                 permittedArrowDirections: UIPopoverArrowDirectionAny,
-                                                 animated: true)
-    else
-      self.formViewController.presentViewController(@image_picker,
-                                                    animated: true,
-                                                    completion: nil)
+        open.call
+      end
     end
-  end
 
-  # UIImagePickerControllerDelegate
-  def imagePickerController(_, didFinishPickingMediaWithInfo: info)
-    editedImage = info[UIImagePickerControllerEditedImage]
-    originalImage = info[UIImagePickerControllerOriginalImage]
-    if editedImage
-      imageToUse = editedImage
-    else
-      imageToUse = originalImage
+    def open_picker(source)
+      @image_picker = UIImagePickerController.alloc.init
+      @image_picker.delegate = self
+      @image_picker.allowsEditing = true
+      @image_picker.sourceType = source
+
+      if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
+        @popover_controller = UIPopoverController.alloc.initWithContentViewController(@image_picker)
+        @popover_controller.presentPopoverFromRect(self.contentView.frame,
+                                                   inView: self.formViewController.view,
+                                                   permittedArrowDirections: UIPopoverArrowDirectionAny,
+                                                   animated: true)
+      else
+        self.formViewController.presentViewController(@image_picker,
+                                                      animated: true,
+                                                      completion: nil)
+      end
     end
-    setImageValue(imageToUse)
 
-    if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
-      if @popover_controller && @popover_controller.isPopoverVisible
-        @popover_controller.dismissPopoverAnimated(true)
+    # UIImagePickerControllerDelegate
+    def imagePickerController(_, didFinishPickingMediaWithInfo: info)
+      editedImage = info[UIImagePickerControllerEditedImage]
+      originalImage = info[UIImagePickerControllerOriginalImage]
+      if editedImage
+        imageToUse = editedImage
+      else
+        imageToUse = originalImage
+      end
+      
+      self.value = imageToUse
+      @imageview.image = imageToUse
+
+      if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
+        if @popover_controller && @popover_controller.isPopoverVisible
+          @popover_controller.dismissPopoverAnimated(true)
+        end
+      else
+        self.formViewController.dismissViewControllerAnimated(true, completion: nil)
       end
-    else
-      self.formViewController.dismissViewControllerAnimated(true, completion: nil)
     end
-  end
-
-  # Properties
-  def imageview
-    return @imageview if @imageview
 
-    @imageview = UIImageView.autolayoutView
-    @imageview.layer.masksToBounds = true
-    @imageview.contentMode = UIViewContentModeScaleAspectFit
-    @imageview
   end
-
-  def text_label
-    return @text_label if @text_label
-    @text_label = UILabel.autolayoutView
-  end
-
 end

data/lib/ProMotion/XLForm/ui_alert_controller.rb

@@ -0,0 +1,14 @@
+class UIAlertController
+  # workaround for 
+  # Terminating app due to uncaught exception 'NSInternalInconsistencyException', reason: 'UIAlertController:supportedInterfaceOrientations was invoked recursively!'
+
+  def supportedInterfaceOrientations
+    orientation = UIApplication.sharedApplication.statusBarOrientation
+
+    orientation == UIDeviceOrientationPortrait || orientation == UIDeviceOrientationPortraitUpsideDown ? UIInterfaceOrientationMaskPortrait : UIInterfaceOrientationMaskLandscape
+  end
+
+  def shouldAutorotate
+    true
+  end
+end

data/lib/ProMotion/XLForm/xl_form_cell_builder.rb

@@ -14,7 +14,6 @@ module ProMotion
       end
 
       cell = XLFormRowDescriptor.formRowDescriptorWithTag(tag, rowType: row_type(type), title: title)
-      cell.cell_data = cell_data
 
       cell.required = cell_data[:required]
 
@@ -64,6 +63,7 @@ module ProMotion
       # image
       if cell_data[:type] == :image
         cell_class = XLFormImageSelectorCell if cell_class.nil?
+        cell_data[:height] ||= 100
       elsif cell_data[:type] == :color
         cell_class = XLFormColorSelectorCell if cell_class.nil?
       end
@@ -169,12 +169,15 @@ module ProMotion
         end
       end
 
-      if value === true || value === false
+      if value.is_a?(TrueClass) && (value === true || value === false)
         value = value ? 1 : 0
       end
 
       cell.value = value
 
+      # move this at the end so we can "override" some cell_data
+      cell.cell_data = cell_data
+
       cell
     end
 

data/lib/ProMotion/XLForm/xl_form_patch.rb

@@ -27,6 +27,10 @@ class XLFormRowDescriptor
     row_copy
   end
 
+  def enabled=(value)
+    self.disabled = !value
+  end
+
   def options=(options)
     self.selectorOptions = parse_options(options)
   end
@@ -42,6 +46,27 @@ class XLFormRowDescriptor
       XLFormOptionsObject.formOptionsObjectWithValue(val, displayText: text)
     end
   end
+
+  def cellForFormController(form_controller)
+    unless self.cell
+      cell_class = self.cellClass ? self.cellClass : XLFormViewController.cellClassesForRowDescriptorTypes[self.rowType]
+      if cell_class.is_a?(String)
+        bundle = NSBundle.bundleForClass(cell_class.to_s)
+        if bundle.pathForResource(cell_class, ofType: "nib")
+          self.cell = bundle.loadNibNamed(cell_class, owner: nil, options: nil).first
+        end
+      else
+        self.cell = cell_class.alloc.initWithStyle(self.cellStyle, reuseIdentifier: nil)
+      end
+
+      if self.cell && self.cell.respond_to?(:setup)
+        self.cell.setup(cell_data, form_controller) 
+      end
+      self.configureCellAtCreationTime
+    end
+    
+    self.cell 
+  end
 end
 
 class XLFormSectionDescriptor

data/lib/ProMotion/XLForm/xl_form_screen.rb

@@ -127,6 +127,10 @@ module ProMotion
       self.form.formRowWithTag(tag)
     end
 
+    def cell_at_path(path)
+      self.form.formRowAtIndex(path)
+    end
+
     def reload(cell)
       reloadFormRow(cell)
     end
@@ -184,6 +188,11 @@ module ProMotion
     def enabled?
       !self.form.isDisabled
     end
+    
+    # dismiss keyboard
+    def dismiss_keyboard
+      self.view.endEditing true
+    end
 
     protected
     def on_cancel(_)
@@ -267,6 +276,19 @@ module ProMotion
       @form_builder.create_cell(cell_data)
     end
 
+    # override XLFormViewController
+    def tableView(table_view, heightForRowAtIndexPath: index_path)
+      row = cell_at_path(index_path)
+      cell = row.cellForFormController(self)
+      cell_class = cell.class
+      if cell_class.respond_to?(:formDescriptorCellHeightForRowDescriptor)
+        return cell_class.formDescriptorCellHeightForRowDescriptor(row)
+      elsif row.respond_to?(:cell_data) && row.cell_data[:height]
+        return row.cell_data[:height]
+      end
+      self.tableView.rowHeight
+    end
+
     private
     def trigger_action(action, section_or_row, index_path)
       case arity = action.arity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-XLForm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Benjamin Michotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion
@@ -92,6 +92,7 @@ files:
 - lib/ProMotion/XLForm/cells/xl_form_cell.rb
 - lib/ProMotion/XLForm/cells/xl_form_color_selector_cell.rb
 - lib/ProMotion/XLForm/cells/xl_form_image_selector_cell.rb
+- lib/ProMotion/XLForm/ui_alert_controller.rb
 - lib/ProMotion/XLForm/validators/regex_validator.rb
 - lib/ProMotion/XLForm/validators/url_validator.rb
 - lib/ProMotion/XLForm/validators/validator.rb