ProMotion-XLForm 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee27a2aaaa760891254d3dc74750627ba2e5f3dd
-  data.tar.gz: 7b94d7fa1b9a90a67683ef6f5857c67bc7140083
+  metadata.gz: d4953d1198db5beb180fb0a772c4ed0f4974ffff
+  data.tar.gz: 15c71318fed226e75954bf103ab07671142fbc17
 SHA512:
-  metadata.gz: 2aa17d7cdc982ab7c05070e25f707b3776117be81817d917670bb7bc1263003aa49af8cf98f7c028db215d115736b67a153043c9ae3547be4d81d3b46de16b85
-  data.tar.gz: aec5cdfd8915d050124fb65b0fabfe7d001cc4509b465fc1dd713114502133e4b6df5577389de4d5bc7b364b0688d10bb2592880e3a839607a2bffd94a6b49cc
+  metadata.gz: b19ad4e1ba5c0017ac3955ebae76adf3f733c87289b2a1b59a4aaf948886e95635cb6e0092510d1962f6cd71811f1e27cc61e54b5a2460ad61a5c7287a158486
+  data.tar.gz: 8fe4483864350bf7a1866bb099710475d763e6ee10e41de5e82d72e75555fbc132a220a1feaabd67e3e4fafe48ec5293855c009b8202e804399783b9412a8537

data/README.md

@@ -26,36 +26,40 @@ To create a form, create a new `PM::XLFormScreen` and implement `form_data`.
 ```ruby
 class TestFormScreen < PM::XLFormScreen
   def form_data
-  [
-    {
-      title:  'Account information',
-      cells: [
-        {
-          title:       'Email',
-          name:        :email,
-          type:        :email,
-          placeholder: 'Enter your email',
-          required:    true
-        },
-        {
-          title: 'Name',
-          name:  :name,
-          type:  :text,
-          value: 'Default value'
-        },
-        {
-          title: 'Sex',
-          name: :sex,
-          type: :selector_push,
-          options: {
-            male: 'Male',
-            female: 'Female',
-            other: 'Other'
+    genders = [
+      { id: :male, name: 'Male' },
+      { id: :female, name: 'Female' },
+      { id: :other,  name: 'Other' },
+    ]
+
+    [
+      {
+        title:  'Account information',
+        cells: [
+          {
+            title:       'Email',
+            name:        :email,
+            type:        :email,
+            placeholder: 'Enter your email',
+            required:    true
+          },
+          {
+            title: 'Name',
+            name:  :name,
+            type:  :text,
+            value: 'Default value'
+          },
+          {
+            title: 'Gender',
+            name: :gender,
+            type: :selector_push,
+            options: Hash[genders.map do |gender|
+              [gender[:id], gender[:name]]
+            end]
           }
-        }
-      ]
-    }
-  ]
+        ]
+      }
+    ]
   end
 end
 ```
@@ -121,6 +125,31 @@ class TestFormScreen < PM::XLFormScreen
 end
 ```
 
+If you don't want the default navigation controller buttons, you could add something like
+
+```ruby
+
+form_options on_save: :my_save_method
+
+def form_data
+  [
+    {
+      title: 'Save',
+      name: :save,
+      type: :button,
+      on_click: -> (cell) {
+        on_save(nil)
+      }
+    }
+  ]
+end
+
+def my_save_method(values)
+  mp values
+end
+
+```
+
 ### Getting values
 
 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.

data/lib/ProMotion-XLForm.rb

@@ -17,21 +17,17 @@ 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 'XLForm', :head
     pod 'RSColorPicker'
   end
 end

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

@@ -1,10 +1,14 @@
 module ProMotion
   class XLFormImageSelectorCell < XLFormCell
 
+    def self.formDescriptorCellHeightForRowDescriptor(_)
+      100
+    end
+
     def setup(data_cell, screen)
       super
 
-      size = (data_cell[:height] || 100) - 20 
+      size = (data_cell[:height] || 100) - 20
 
       @imageview = UIImageView.alloc.initWithFrame([[0, 0], [size, size]])
       self.accessoryView = @imageview
@@ -12,6 +16,7 @@ module ProMotion
       self.selectionStyle = UITableViewCellSelectionStyleNone
       self.backgroundColor = UIColor.whiteColor
       self.separatorInset = UIEdgeInsetsZero
+      self.editingAccessoryView = self.accessoryView
     end
 
     def update
@@ -45,7 +50,9 @@ module ProMotion
         end
 
         present = -> {
-          self.formViewController.presentViewController(alert, animated: true, completion: nil)
+          Dispatch::Queue.main.async do
+            self.formViewController.presentViewController(alert, animated: true, completion: nil)
+          end
         }
         if self.formViewController.presentedViewController
           self.formViewController.dismissViewControllerAnimated(true, completion: present)
@@ -116,10 +123,12 @@ module ProMotion
 
       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)
+        Dispatch::Queue.main.async do
+          @popover_controller.presentPopoverFromRect(self.contentView.frame,
+                                                     inView: self.formViewController.view,
+                                                     permittedArrowDirections: UIPopoverArrowDirectionAny,
+                                                     animated: true)
+        end
       else
         self.formViewController.presentViewController(@image_picker,
                                                       animated: true,
@@ -136,7 +145,7 @@ module ProMotion
       else
         imageToUse = originalImage
       end
-      
+
       self.value = imageToUse
       @imageview.image = imageToUse
 

data/lib/ProMotion/XLForm/xl_form_cell_builder.rb

@@ -68,6 +68,12 @@ module ProMotion
         cell_class = XLFormColorSelectorCell if cell_class.nil?
       end
 
+      # image accessory
+      if cell_data[:image] && !cell_data[:image].is_a?(Hash)
+        accessory_image = cell_data[:image].is_a?(UIImage) ? cell_data[:image] : UIImage.imageNamed(cell_data[:image])
+        cell.cellConfigAtConfigure.setObject(accessory_image, forKey: "image")
+      end
+
       cell.cellClass = cell_class if cell_class
 
       # subcells

data/lib/ProMotion/XLForm/xl_form_helper.rb

@@ -37,6 +37,8 @@ module ProMotion
         elsif tag.start_with?(':')
           tag[0] = ''
         end
+        tag += ".value.valueData" if predicate.is_a?(Hash) && predicate[:options]
+
         value = case value
                   when nil
                     'nil'

data/lib/ProMotion/XLForm/xl_form_patch.rb

@@ -60,17 +60,17 @@ class XLFormRowDescriptor
       end
 
       if self.cell && self.cell.respond_to?(:setup)
-        self.cell.setup(cell_data, form_controller) 
+        self.cell.setup(cell_data, form_controller)
       end
       self.configureCellAtCreationTime
     end
-    
-    self.cell 
+
+    self.cell
   end
 end
 
 class XLFormSectionDescriptor
-  attr_accessor :section_data, :options
+  attr_accessor :section_data
 
   def self.section(section_data)
     title = section_data[:title]
@@ -81,21 +81,26 @@ class XLFormSectionDescriptor
 
     section = XLFormSectionDescriptor.formSectionWithTitle(title, sectionOptions: options, sectionInsertMode: insert_mode)
     section.section_data = section_data
-    section.options = options
+
     section
   end
 
   def options=(value)
-    @options = self.class.parse_section_options(value)
+    @section_options = self.class.parse_section_options(value)
   end
 
-  def options
-    @options
-  end
+  # Since `sectionOptions` is a property on the Objective-C class and not a
+  # Ruby method we can't use `super` to fallback when overriding the method.
+  # To achieve the same thing we create an alias and use that instead.
+  alias :originalSectionOptions :sectionOptions
 
+  # This property/method is used in the Objective-C initializer and is called
+  # before we ever have a chance to set @section_options so we need to be able
+  # to fallback to the original.
   def sectionOptions
-    options
+    @section_options || originalSectionOptions
   end
+  alias_method :options, :sectionOptions
 
   def self.parse_section_options(options)
     return section_options(:none) if options.nil?

data/lib/ProMotion/XLForm/xl_form_screen.rb

@@ -188,7 +188,7 @@ module ProMotion
     def enabled?
       !self.form.isDisabled
     end
-    
+
     # dismiss keyboard
     def dismiss_keyboard
       self.view.endEditing true
@@ -283,7 +283,7 @@ module ProMotion
       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]
+      elsif row.respond_to?(:cell_data) && row.cell_data && row.cell_data[:height]
         return row.cell_data[:height]
       end
       self.tableView.rowHeight

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-XLForm
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Benjamin Michotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion