ProMotion-XLForm 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4953d1198db5beb180fb0a772c4ed0f4974ffff
-  data.tar.gz: 15c71318fed226e75954bf103ab07671142fbc17
+  metadata.gz: 6ccbbd4523b880c96a97d116954a4a2f489d25ee
+  data.tar.gz: a3205db9af2f36746e5b8fc9c586f78c9448abcf
 SHA512:
-  metadata.gz: b19ad4e1ba5c0017ac3955ebae76adf3f733c87289b2a1b59a4aaf948886e95635cb6e0092510d1962f6cd71811f1e27cc61e54b5a2460ad61a5c7287a158486
-  data.tar.gz: 8fe4483864350bf7a1866bb099710475d763e6ee10e41de5e82d72e75555fbc132a220a1feaabd67e3e4fafe48ec5293855c009b8202e804399783b9412a8537
+  metadata.gz: 92da0d7781a60fa052347d026a3b1e0fc885a0f391d7264131543b62d1f75f5c9049a1c78f2202b060bbaab0a7f8683de7a17cc575f2971da6144b3ed11ddaf2
+  data.tar.gz: 28b2e846427d54be79d82e209121a00c5190996cb38daf589431241217c3a56991ba7729dddb7117256c9d5ced9e0736697f2889e7eb9e2f3d14390e6f725234

data/README.md

@@ -113,7 +113,8 @@ class TestFormScreen < PM::XLFormScreen
 
   form_options required:  :asterisks, # add an asterisk to required fields
                on_save:   :'save_form:', # will be called when you touch save
-               on_cancel: :cancel_form # will be called when you touch cancel
+               on_cancel: :cancel_form, # will be called when you touch cancel
+               auto_focus: true # the form will focus on the first focusable field
 
    def save_form(values)
      dismiss_keyboard
@@ -170,10 +171,17 @@ You can also get a specific value with `value_for_cell(:my_cell)`.
     female: 'Female',
     other: 'Other'
   },
+  # An optional row paramater may be passed |old_value, new_value|
   on_change: lambda do |old_value, new_value|
     puts "Changed from #{old_value} to #{new_value}"
   end
 }
+# An optional row paramater may be passed to on_change:
+#  on_change: lambda do |old_value, new_value, row|
+#    puts "Changed from #{old_value} to #{new_value}"
+#    row.setTitle(new_value)
+#    self.reloadFormRow(row) if old_value != new_value
+#  end
 ```
 
 ### Multivalued Sections (Insert, Delete, Reorder rows)
@@ -384,6 +392,14 @@ You can change the appearance of the cell using the `appearance` hash
     "value_3" => "Value 3",
     "value_4" => "Value 4",
   }
+},
+{
+  title: 'Alignment',
+  name: :align,
+  type: :text,
+  appearance: {
+    alignment: :right # or NSTextAlignmentRight
+  }
 }
 ```
 
@@ -397,6 +413,21 @@ You can also pass any key-value to configure your cell. Take a look at [this](ht
 }
 ```
 
+### Keyboard
+For the text based cells (like `:text`, `:password`, `:number`, `:integer`, `:decimal`), you can specify a `keyboard_type`. The following keyboard types are available :
+- :default
+- :ascii
+- :numbers_punctuation
+- :url
+- :number_pad
+- :phone_pad
+- :name_phone_pad
+- :email
+- :decimal_pad
+- :twitter
+- :web_search
+- :alphabet
+
 ## Contributing
 
 1. Fork it

data/lib/ProMotion-XLForm.rb

@@ -18,7 +18,6 @@ Motion::Project::App.setup do |app|
   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")

data/lib/ProMotion/XLForm/xl_form.rb

@@ -11,12 +11,19 @@ module ProMotion
       @form_data = form_data
       @title = opts[:title] || ''
       @required = opts[:required]
+      @auto_focus = opts[:auto_focus]
     end
 
     def build
       form = XLFormDescriptor.formDescriptorWithTitle(@title)
       form.addAsteriskToRequiredRowsTitle = (@required == :asterisks)
 
+
+      # focus on this cell
+      if @auto_focus
+        form.assignFirstResponderOnShow = true
+      end
+
       form_data.each do |section_data|
         section = create_section(section_data)
         form.addFormSection(section)
@@ -79,9 +86,9 @@ module ProMotion
         button: XLFormRowDescriptorTypeButton,
         info: XLFormRowDescriptorTypeInfo,
         step_counter: XLFormRowDescriptorTypeStepCounter,
-        image: 'XLFormRowDescriptorTypeImage',
+        image: XLFormRowDescriptorTypeImage,
         color: 'XLFormRowDescriptorTypeColor',
-      }[symbol] || symbol
+      }[symbol]
     end
 
   end

data/lib/ProMotion/XLForm/xl_form_cell_builder.rb

@@ -13,6 +13,8 @@ module ProMotion
         type = :selector_push
       end
 
+      mp("Can't find the type #{type}, maybe a typo ?", force_color: :red) if row_type(type).nil? && !cell_data[:cell_class]
+
       cell = XLFormRowDescriptor.formRowDescriptorWithTag(tag, rowType: row_type(type), title: title)
 
       cell.required = cell_data[:required]
@@ -60,11 +62,7 @@ module ProMotion
 
       cell_class = cell_data[:cell_class]
 
-      # image
-      if cell_data[:type] == :image
-        cell_class = XLFormImageSelectorCell if cell_class.nil?
-        cell_data[:height] ||= 100
-      elsif cell_data[:type] == :color
+      if cell_data[:type] == :color
         cell_class = XLFormColorSelectorCell if cell_class.nil?
       end
 
@@ -159,6 +157,7 @@ module ProMotion
         cell.cellConfig["detailTextLabel.font"] = appearance[:detail_font] if appearance[:detail_font]
         cell.cellConfig["detailTextLabel.textColor"] = appearance[:detail_color] if appearance[:detail_color]
         cell.cellConfig["backgroundColor"] = appearance[:background_color] if appearance[:background_color]
+        cell.cellConfig["textField.textAlignment"] = text_alignment(appearance[:alignment]) if appearance[:alignment]
 
         appearance.delete_if { |k, v| k.is_a?(Symbol) }.each do |k, v|
           cell.cellConfig[k] = v
@@ -187,5 +186,16 @@ module ProMotion
       cell
     end
 
+    def text_alignment(symbol)
+      {
+        left: NSTextAlignmentLeft,
+        center: NSTextAlignmentCenter,
+        centered: NSTextAlignmentCenter,
+        right: NSTextAlignmentRight,
+        justified: NSTextAlignmentJustified,
+        natural: NSTextAlignmentNatural
+      }[symbol] || symbol || NSTextAlignmentLeft
+    end
+
   end
 end

data/lib/ProMotion/XLForm/xl_form_patch.rb

@@ -62,11 +62,35 @@ class XLFormRowDescriptor
       if self.cell && self.cell.respond_to?(:setup)
         self.cell.setup(cell_data, form_controller)
       end
+      if self.cell.respond_to?(:accessibilityLabel) && cell_data && cell_data[:title]
+        self.cell.accessibilityLabel = cell_data[:title]
+      end
+      if self.cell.respond_to?(:keyboard_type) && cell_data[:keyboard_type]
+        self.cell.keyboard_type = keyboard_type(cell_data[:keyboard_type])
+      end
+
       self.configureCellAtCreationTime
     end
 
     self.cell
   end
+
+  def keyboard_type(symbol)
+    {
+      default: UIKeyboardTypeDefault,
+      ascii: UIKeyboardTypeASCIICapable,
+      numbers_punctuation: UIKeyboardTypeNumbersAndPunctuation,
+      url: UIKeyboardTypeURL,
+      number_pad: UIKeyboardTypeNumberPad,
+      phone_pad: UIKeyboardTypePhonePad,
+      name_phone_pad: UIKeyboardTypeNamePhonePad,
+      email: UIKeyboardTypeEmailAddress,
+      decimal_pad: UIKeyboardTypeDecimalPad,
+      twitter: UIKeyboardTypeTwitter,
+      web_search: UIKeyboardTypeWebSearch,
+      alphabet: UIKeyboardTypeASCIICapable
+    }[symbol] || symbol || UIKeyboardTypeDefault
+  end
 end
 
 class XLFormSectionDescriptor
@@ -100,6 +124,7 @@ class XLFormSectionDescriptor
   def sectionOptions
     @section_options || originalSectionOptions
   end
+
   alias_method :options, :sectionOptions
 
   def self.parse_section_options(options)
@@ -132,3 +157,16 @@ class XLFormSectionDescriptor
     }[symbol] || symbol || XLFormSectionOptionNone
   end
 end
+
+class XLFormTextFieldCell
+
+  attr_accessor :keyboard_type
+
+  alias :old_update :update
+
+  def update
+    old_update
+
+    self.textField.keyboardType = self.keyboard_type if self.keyboard_type
+  end
+end

data/lib/ProMotion/XLForm/xl_form_screen.rb

@@ -21,10 +21,10 @@ module ProMotion
         end
 
         set_nav_bar_button :left, {
-                                  system_item: item,
-                                  title: title,
-                                  action: 'on_cancel:'
-                                }
+          system_item: item,
+          title: title,
+          action: 'on_cancel:'
+        }
       end
 
       if form_options[:on_save]
@@ -37,10 +37,10 @@ module ProMotion
         end
 
         set_nav_bar_button :right, {
-                                   system_item: item,
-                                   title: title,
-                                   action: 'on_save:'
-                                 }
+          system_item: item,
+          title: title,
+          action: 'on_save:'
+        }
       end
 
       self.form_added if self.respond_to?(:form_added)
@@ -55,12 +55,13 @@ module ProMotion
       form_options = self.class.get_form_options
       title = self.class.title
       required = form_options[:required]
+      auto_focus = form_options[:auto_focus]
 
       @form_builder = PM::XLForm.new(self.form_data,
-                                     {
-                                       title: title,
-                                       required: required
-                                     })
+                                     title: title,
+                                     required: required,
+                                     auto_focus: auto_focus
+      )
       @form_object = @form_builder.build
       self.form = @form_object
     end
@@ -262,7 +263,17 @@ module ProMotion
         if new_value.is_a? XLFormOptionsObject
           new_value = new_value.formValue
         end
-        callback.call(old_value, new_value)
+
+        case arity = callback.arity
+          when 0 then
+            callback.call
+          when 2 then
+            callback.call(old_value, new_value)
+          when 3 then
+            callback.call(old_value, new_value, row)
+          else
+            mp("Callback requires 0, 2, or 3 paramters", force_color: :red)
+        end
       end
     end
 

data/lib/ProMotion/XLForm/xl_form_view_controller.rb

@@ -1,5 +1,10 @@
 module ProMotion
   class XlFormViewController < XLFormViewController
+
+    def class_handles_delegates?
+      true
+    end
+
     def self.new(args = {})
       s = self.alloc.init
       s.screen_init(args) if s.respond_to?(:screen_init)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-XLForm
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Benjamin Michotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion
@@ -91,7 +91,6 @@ files:
 - lib/ProMotion-XLForm.rb
 - 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
@@ -127,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Adds PM::XLFormScreen support to ProMotion, similar to ProMotion-form.

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

@@ -1,162 +0,0 @@
-module ProMotion
-  class XLFormImageSelectorCell < XLFormCell
-
-    def self.formDescriptorCellHeightForRowDescriptor(_)
-      100
-    end
-
-    def setup(data_cell, screen)
-      super
-
-      size = (data_cell[:height] || 100) - 20
-
-      @imageview = UIImageView.alloc.initWithFrame([[0, 0], [size, size]])
-      self.accessoryView = @imageview
-
-      self.selectionStyle = UITableViewCellSelectionStyleNone
-      self.backgroundColor = UIColor.whiteColor
-      self.separatorInset = UIEdgeInsetsZero
-      self.editingAccessoryView = self.accessoryView
-    end
-
-    def update
-      @imageview.image = value
-    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)
-
-        alert.addAction(UIAlertAction.actionWithTitle(NSLocalizedString("Choose From Library", nil),
-                                                      style: UIAlertActionStyleDefault,
-                                                      handler: lambda { |_|
-                                                        open_from_alert(UIImagePickerControllerSourceTypePhotoLibrary)
-                                                      }))
-
-        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 = -> {
-          Dispatch::Queue.main.async do
-            self.formViewController.presentViewController(alert, animated: true, completion: nil)
-          end
-        }
-        if self.formViewController.presentedViewController
-          self.formViewController.dismissViewControllerAnimated(true, completion: present)
-        else
-          present.call
-        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
-
-    # 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
-
-      title = action_sheet.buttonTitleAtIndex(button_index)
-
-      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
-
-    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)
-        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,
-                                                      completion: nil)
-      end
-    end
-
-    # 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
-    end
-
-  end
-end