motion-form 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09ef894ca746f523ff535a24fc6a087cea8a81d2
-  data.tar.gz: e9f23285416fc9fcdc676952c90fbcd3aa438a5e
+  metadata.gz: c793153ac5710719c85021fde056751ffe3e2396
+  data.tar.gz: 031ba7b22c0c0a3a0ef0161d6e258b35fb1e491b
 SHA512:
-  metadata.gz: f0971e202bc441add4a481064d56bdb29b2e971fcc79b1b5374ba40fd20250829d66dc1444965c94f81b14d20b06538ddf8a054bee95de96fef35236b72b8711
-  data.tar.gz: d12f57fe38dadab75f55d55f2e1d35b9ba9adae4d37649d92cf3a4cae71068512e656e7922271d11cbe158ef1fe301d6fdbd9ac4b9ed7615eabaa4122a5ae1cc
+  metadata.gz: 238174d7a0399ad62ec129e827b171ed326f091adf3e48ec9d8b88d06aa2709d171de2088c79a64d418b2aadb14ef1c5cea5ba70f53c98f1c26b34aba9d039bf
+  data.tar.gz: 1958358b9767a1e39532443c316fb13714978704ed765a227bb15294eeb0885535d661a2b768898d96b85c80856b8c7c8f82e61889963052831fbe22e08e7b1d

data/lib/motion-form.rb

@@ -1,5 +1,8 @@
 require 'bubble-wrap/core'
 require 'motion-require'
 
-Motion::Require.all(Dir.glob(File.expand_path('../project/**/*.rb', __FILE__)))
+unless defined?(Motion::Project::Config)
+  raise 'This file must be required within a RubyMotion project Rakefile.'
+end
 
+Motion::Require.all(Dir.glob(File.expand_path('../project/**/*.rb', __FILE__)))

data/lib/project/cells/button_cell.rb

@@ -1,6 +1,6 @@
 motion_require './text_field_cell'
 
-class ButtonCell < TextFieldCell
+class ButtonCell < TextInputCell
   IDENTIFIER = 'ButtonCell'
 
   class << self

data/lib/project/cells/text_field_cell.rb

@@ -6,9 +6,11 @@ class TextFieldCell < BaseCell
 
   def initWithStyle(style, reuseIdentifier: reuse_identifier)
     super.tap do |cell|
-      cell.observe('ButtonCallbackWillFire', 'resign_textfield:')
-      cell.observe('FormWillValidate',       'resign_textfield:')
-      cell.observe('FormWillRender',         'resign_textfield:')
+      cell.observe('ButtonCallbackWillFire', 'resign_text_view:')
+      cell.observe('FormWillValidate',       'resign_text_view:')
+      cell.observe('FormWillRender',         'resign_text_view:')
+
+      cell.setup_constraints
     end
   end
 
@@ -18,69 +20,89 @@ class TextFieldCell < BaseCell
     end
   end
 
-  def resign_textfield(notification)
-    text_field.resignFirstResponder if text_field.isFirstResponder
+  def setup_constraints
+    Motion::Layout.new do |layout|
+      layout.view       contentView
+      layout.subviews   'text_view' => text_view
+      layout.horizontal '|[text_view]|'
+      layout.vertical   '|[text_view]|'
+    end
+  end
+
+  def resign_text_view(notification)
+    text_view.resignFirstResponder if text_view.isFirstResponder
   end
 
   def label=(label)
-    text_field.placeholder = label
   end
 
   def secure=(secure)
-    text_field.secureTextEntry = secure
   end
 
   def icon=(icon)
     left_view.name = icon
   end
 
-  def text_field
-    @text_field ||= UITextField.alloc.init.tap do |field|
-      field.autocorrectionType       = UITextAutocorrectionTypeNo
-      field.autoresizingMask         = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
-      field.backgroundColor          = UIColor.clearColor
-      field.clearButtonMode          = UITextFieldViewModeWhileEditing
-      field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
-      field.leftView                 = left_view
-      field.leftViewMode             = UITextFieldViewModeAlways
-      field.textColor                = UIColor.grayColor
-
-      field.delegate = self
+  def text_view
+    @text_view ||= SZTextView.alloc.init.tap do |text_view|
+      text_view.font         = UIFont.fontWithName('HelveticaNeue-Light', size: 14.0)
+      text_view.placeholder  = 'Write a short bio'
+      text_view.delegate     = self
     end
   end
+  alias_method :text_field, :text_view
 
   def left_view
     @left_view ||= IconView.alloc.init
   end
 
   def value
-    text_field.text
+    text_view.text
   end
 
   def value=(value)
-    text_field.text = value
+    text_view.text = value
   end
 
-  def layoutSubviews
-    text_field.frame = [[10, 0], [300, 43]]
-    left_view.frame  = [[0, 0], [36, 43]]
-  end
-
-  def textFieldDidBeginEditing(text_field)
+  def textViewDidBeginEditing(text_view)
     post('FormCellDidBeginEditing', notification_payload)
   end
 
-  def textFieldDidEndEditing(text_field)
+  def textViewDidEndEditing(text_view)
     post('FormCellDidEndEditing', notification_payload)
   end
 
-  def textFieldShouldReturn(text_field)
-    text_field.resignFirstResponder
+  def textFieldShouldReturn(text_view)
+    text_view.resignFirstResponder
 
     true
   end
 
+  def textView(text_view, shouldChangeTextInRange: range, replacementText: text)
+    if text == "\n"
+      text_view.resignFirstResponder
+
+      false
+    else
+      true
+    end
+  end
+
+  def textViewDidChange(text_view)
+    line     = text_view.caretRectForPosition(text_view.selectedTextRange.start)
+    overflow = line.origin.y + line.size.height - (text_view.contentOffset.y + text_view.bounds.size.height - text_view.contentInset.bottom - text_view.contentInset.top )
+
+    if overflow > 0
+      offset = text_view.contentOffset
+      offset.y += overflow + 7
+
+      UIView.animateWithDuration(0.2, animations: -> {
+        text_view.setContentOffset(offset)
+      })
+    end
+  end
+
   def notification_payload
-    { key: key, value: value, text_field: text_field }
+    { key: key, value: value, text_field: text_view }
   end
 end

data/lib/project/cells/text_input_cell.rb

@@ -0,0 +1,86 @@
+motion_require './base_cell'
+motion_require '../views/icon_view'
+
+class TextInputCell < BaseCell
+  IDENTIFIER = 'TextInputCell'
+
+  def initWithStyle(style, reuseIdentifier: reuse_identifier)
+    super.tap do |cell|
+      cell.observe('ButtonCallbackWillFire', 'resign_textfield:')
+      cell.observe('FormWillValidate',       'resign_textfield:')
+      cell.observe('FormWillRender',         'resign_textfield:')
+    end
+  end
+
+  class << self
+    def has_value?
+      true
+    end
+  end
+
+  def resign_textfield(notification)
+    text_field.resignFirstResponder if text_field.isFirstResponder
+  end
+
+  def label=(label)
+    text_field.placeholder = label
+  end
+
+  def secure=(secure)
+    text_field.secureTextEntry = secure
+  end
+
+  def icon=(icon)
+    left_view.name = icon
+  end
+
+  def text_field
+    @text_field ||= UITextField.alloc.init.tap do |field|
+      field.autocorrectionType       = UITextAutocorrectionTypeNo
+      field.autoresizingMask         = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
+      field.backgroundColor          = UIColor.clearColor
+      field.clearButtonMode          = UITextFieldViewModeWhileEditing
+      field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
+      field.leftView                 = left_view
+      field.leftViewMode             = UITextFieldViewModeAlways
+      field.textColor                = UIColor.grayColor
+
+      field.delegate = self
+    end
+  end
+
+  def left_view
+    @left_view ||= IconView.alloc.init
+  end
+
+  def value
+    text_field.text
+  end
+
+  def value=(value)
+    text_field.text = value
+  end
+
+  def layoutSubviews
+    text_field.frame = [[10, 0], [300, 43]]
+    left_view.frame  = [[0, 0], [36, 43]]
+  end
+
+  def textFieldDidBeginEditing(text_field)
+    post('FormCellDidBeginEditing', notification_payload)
+  end
+
+  def textFieldDidEndEditing(text_field)
+    post('FormCellDidEndEditing', notification_payload)
+  end
+
+  def textFieldShouldReturn(text_field)
+    text_field.resignFirstResponder
+
+    true
+  end
+
+  def notification_payload
+    { key: key, value: value, text_field: text_field }
+  end
+end

data/lib/project/font_icon_mapper.rb

@@ -0,0 +1,22 @@
+module MotionForm
+  module FontIconMapper
+    class << self
+      def call(icon)
+        unicode(icon).hex.chr(Encoding::UTF_8)
+      end
+
+      def unicode(icon)
+        mappings[icon] || ''
+      end
+
+      def mappings
+        @mappings ||= begin
+          path = NSBundle.mainBundle.pathForResource('icons', ofType:'json')
+          data = NSData.dataWithContentsOfFile(path)
+
+          NSJSONSerialization.JSONObjectWithData(data, options: 0, error: nil)
+        end
+      end
+    end
+  end
+end

data/lib/project/form/base.rb

@@ -13,11 +13,24 @@ module MotionForm
         f.dataSource = self
         f.delegate   = self
 
+        f.addGestureRecognizer(tap_recognizer)
+
         @keyboard_avoiding_delegate = Motion::KeyboardAvoiding.new(f)
+
         listen
       end
     end
 
+    def tap_recognizer
+      @tap_recognizer ||= UITapGestureRecognizer.alloc.init.tap do |recognizer|
+        recognizer.addTarget(self, action: 'tapped:')
+      end
+    end
+
+    def tapped(recognizer)
+      endEditing(true)
+    end
+
     def listen
       observers << notification_center.addObserver(self, selector: 'did_begin_editing:', name: 'FormCellDidBeginEditing', object: nil)
       observers << notification_center.addObserver(self, selector: 'did_end_editing:', name: 'FormCellDidEndEditing', object: nil)
@@ -78,6 +91,13 @@ module MotionForm
       row     = section.rows[index_path.row]
     end
 
+    def tableView(table_view, heightForRowAtIndexPath: index_path)
+      section = sections[index_path.section]
+      row     = section.rows[index_path.row]
+
+      row.respondsToSelector('height') ? row.height : 44
+    end
+
     def tableView(table_view, viewForHeaderInSection: section)
       unless sections[section].title.blank?
         SectionHeaderView.alloc.initWithFrame([[0, 0], [size.width, 44.0]]).tap do |header|
@@ -105,7 +125,7 @@ module MotionForm
     def valid?
       notification_center.postNotificationName('FormWillValidate', object: self, userInfo: nil)
 
-      rows.select { |row| row.is_a? TextFieldRow }.all? { |row| row.valid? }
+      rows.select { |row| row.is_a? TextInputRow }.all? { |row| row.valid? }
     end
 
     def tableView(table_view, cellForRowAtIndexPath: index_path)

data/lib/project/motion-form.rb

@@ -42,7 +42,7 @@ module MotionForm
     end
 
     def included_cells
-      [TextFieldCell, ButtonCell]
+      [TextInputCell, TextFieldCell, ButtonCell]
     end
 
     def section_header_font
@@ -54,7 +54,7 @@ module MotionForm
     end
 
     def icon_mapper
-      @icon_mapper || -> (icon_name) { icon_name }
+      @icon_mapper || FontIconMapper
     end
 
     def section_header_color

data/lib/project/rows/button_row.rb

@@ -1,7 +1,7 @@
 motion_require '../cells/button_cell'
 motion_require './text_field_row'
 
-class ButtonRow < TextFieldRow
+class ButtonRow < TextInputRow
   attr_reader :on_tap_callback, :accessory
 
   def initialize(key, options)

data/lib/project/rows/text_field_row.rb

@@ -1,70 +1,12 @@
 motion_require './base_row'
 motion_require '../cells/text_field_cell'
 
-class TextFieldRow < BaseRow
-  EMAIL_REGEX = /^[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/
-  URL_REGEX   = /https?:\/\/[\S]+/
-
-  attr_accessor :value
-
-  def initialize(key, options)
-    super
-
-    setup_validation
-
-    listen
-  end
-
-  def setup_validation
-    if options[:required]
-      validation_rules << lambda { |value| value && value != '' }
-    end
-
-    if options[:email]
-      validation_rules << lambda { |value| value && value[EMAIL_REGEX] }
-    end
-
-    if options[:url]
-      validation_rules << lambda { |value| value && value[URL_REGEX] }
-    end
-
-    if options[:format] && options[:format].is_a?(Regexp)
-      validation_rules << lambda { |value| value && value[options[:format]] }
-    end
-
-    if options[:validate_with] && options[:validate_with].is_a?(Proc)
-      validation_rules << options[:validate_with]
-    end
-  end
-
-  def valid?
-    validation_rules.all? { |rule| rule.call(value) }
-  end
-
-  def validation_rules
-    @validation_rules ||= []
-  end
-
-  def listen
-    observe('FormCellDidEndEditing', 'did_end_editing:')
-  end
-
-  def did_end_editing(notification)
-    self.value = notification.userInfo[:value] if notification.userInfo[:key] == key
-  end
-
-  def textFieldDidEndEditing(text_field)
-    self.value = text_field.text
-  end
-
-  def update_cell(cell)
-    super
-
-    cell.secure = options[:secure]
-    cell.value  = options[:value]
-  end
-
+class TextFieldRow < TextInputRow
   def cell_type
     TextFieldCell
   end
+
+  def height
+    100
+  end
 end

data/lib/project/rows/text_input_row.rb

@@ -0,0 +1,70 @@
+motion_require './base_row'
+motion_require '../cells/text_input_cell'
+
+class TextInputRow < BaseRow
+  EMAIL_REGEX = /^[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/
+  URL_REGEX   = /https?:\/\/[\S]+/
+
+  attr_accessor :value
+
+  def initialize(key, options)
+    super
+
+    setup_validation
+
+    listen
+  end
+
+  def setup_validation
+    if options[:required]
+      validation_rules << lambda { |value| value && value != '' }
+    end
+
+    if options[:email]
+      validation_rules << lambda { |value| value && value[EMAIL_REGEX] }
+    end
+
+    if options[:url]
+      validation_rules << lambda { |value| value && value[URL_REGEX] }
+    end
+
+    if options[:format] && options[:format].is_a?(Regexp)
+      validation_rules << lambda { |value| value && value[options[:format]] }
+    end
+
+    if options[:validate_with] && options[:validate_with].is_a?(Proc)
+      validation_rules << options[:validate_with]
+    end
+  end
+
+  def valid?
+    validation_rules.all? { |rule| rule.call(value) }
+  end
+
+  def validation_rules
+    @validation_rules ||= []
+  end
+
+  def listen
+    observe('FormCellDidEndEditing', 'did_end_editing:')
+  end
+
+  def did_end_editing(notification)
+    self.value = notification.userInfo[:value] if notification.userInfo[:key] == key
+  end
+
+  def textFieldDidEndEditing(text_field)
+    self.value = text_field.text
+  end
+
+  def update_cell(cell)
+    super
+
+    cell.secure = options[:secure]
+    cell.value  = options[:value]
+  end
+
+  def cell_type
+    TextInputCell
+  end
+end

data/lib/project/section/section.rb

@@ -10,6 +10,10 @@ class MotionForm
     end
 
     def input(key, options = {})
+      rows << TextInputRow.new(key, options)
+    end
+
+    def text(key, options = {})
       rows << TextFieldRow.new(key, options)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-form
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Devon Blandin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-keyboard-avoiding
@@ -38,6 +38,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: cocoapods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.27.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.27.1
+- !ruby/object:Gem::Dependency
+  name: motion-cocoapods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
+- !ruby/object:Gem::Dependency
+  name: motion-layout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,12 +106,15 @@ files:
 - lib/project/cells/base_cell.rb
 - lib/project/cells/button_cell.rb
 - lib/project/cells/text_field_cell.rb
+- lib/project/cells/text_input_cell.rb
 - lib/project/controllers/form_controller.rb
+- lib/project/font_icon_mapper.rb
 - lib/project/form/base.rb
 - lib/project/motion-form.rb
 - lib/project/rows/base_row.rb
 - lib/project/rows/button_row.rb
 - lib/project/rows/text_field_row.rb
+- lib/project/rows/text_input_row.rb
 - lib/project/section/section.rb
 - lib/project/string.rb
 - lib/project/views/icon_view.rb
@@ -95,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.1
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: Simple DSL for RubyMotion form creation