formotion 0.0.3 → 0.5

data/examples/Login/.gitignore

@@ -0,0 +1,5 @@
+.repl_history
+build
+resources/*.nib
+resources/*.momd
+resources/*.storyboardc

data/examples/Login/Rakefile

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project'
+require 'formotion'
+
+Motion::Project::App.setup do |app|
+  # Use `rake config' to see complete project settings.
+  app.name = 'Settings'
+end

data/examples/Login/app/app_delegate.rb

@@ -0,0 +1,16 @@
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+
+    @navigation_controller = UINavigationController.alloc.initWithRootViewController(UserController.controller)
+    @window.rootViewController = @navigation_controller
+    @window.makeKeyAndVisible
+
+    @login = LoginController.alloc.init
+    @login_navigation = UINavigationController.alloc.initWithRootViewController(@login)
+
+    UserController.controller.presentModalViewController(@login_navigation, animated:false)
+
+    true
+  end
+end

data/examples/Login/app/login_controller.rb

@@ -0,0 +1,47 @@
+class LoginController < Formotion::FormController
+  def init
+    form = Formotion::Form.new({
+      title: "Login",
+      sections: [{
+        rows: [{
+          title: "User Name",
+          type: :string,
+          placeholder: "name",
+          key: :user
+        }, {
+          title: "Password",
+          type: :string,
+          placeholder: "password",
+          key: :password,
+          secure: true
+        }, {
+          title: "Remember?",
+          type: :switch,
+          key: :remember,
+          value: true
+        }]
+      }, {
+        rows: [{
+          title: "Login",
+          type: :submit,
+        }]
+      }]
+    })
+    form.on_submit do
+      self.login
+    end
+    super.initWithForm(form)
+  end
+
+  def viewDidLoad
+    super
+    self.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle("Login", style: UIBarButtonItemStyleDone, target:self, action:'login')
+  end
+
+  def login
+    [:user, :password, :remember].each { |prop|
+      UserController.controller.send(prop.to_s + "=", form.render[prop])
+    }
+    self.navigationController.dismissModalViewControllerAnimated(true)
+  end
+end

data/examples/Login/app/user_controller.rb

@@ -0,0 +1,38 @@
+class UserController < UIViewController
+  def self.controller
+    @controller ||= UserController.alloc.initWithNibName(nil, bundle: nil)
+  end
+
+  def viewDidLoad
+    super
+
+    self.view.backgroundColor = UIColor.whiteColor
+
+    @user_label = UILabel.alloc.initWithFrame(CGRectZero)
+    self.view.addSubview(@user_label)
+
+    @password_label = UILabel.alloc.initWithFrame(CGRectZero)
+    self.view.addSubview(@password_label)
+
+    @remember_label = UILabel.alloc.initWithFrame(CGRectZero)
+    self.view.addSubview(@remember_label)
+  end
+
+  def user=(user)
+    @user_label.text = "User: #{user}"
+    @user_label.sizeToFit
+    @user_label.center = [self.view.frame.size.width/2, self.view.frame.size.height/2 - 40]
+  end
+
+  def password=(password)
+    @password_label.text = "Password: #{password}"
+    @password_label.sizeToFit
+    @password_label.center = [@user_label.center.x, @user_label.center.y + @password_label.bounds.size.height]
+  end
+
+  def remember=(remember)
+    @remember_label.text = "Remember? #{remember}"
+    @remember_label.sizeToFit
+    @remember_label.center = [@password_label.center.x, @password_label.center.y + @remember_label.bounds.size.height]
+  end
+end

data/examples/Login/spec/main_spec.rb

@@ -0,0 +1,9 @@
+describe "Application 'Settings'" do
+  before do
+    @app = UIApplication.sharedApplication
+  end
+
+  it "has one window" do
+    @app.windows.size.should == 1
+  end
+end

data/lib/formotion.rb

@@ -1,8 +1,14 @@
 require "formotion/version"
 require 'bubble-wrap/core'
+require 'bubble-wrap/camera'
 
 BW.require File.expand_path('../formotion/**/*.rb', __FILE__) do
-  ['form.rb', 'row.rb', 'section.rb'].each {|file|
+  file("lib/formotion/row_type/string_row.rb").depends_on 'lib/formotion/row_type/base.rb'
+  ['date_row', 'email_row', 'number_row', 'phone_row'].each {|file|
+    file("lib/formotion/row_type/#{file}.rb").depends_on 'lib/formotion/row_type/string_row.rb'
+  }
+
+  ['form/form.rb', 'row/row.rb', 'section/section.rb'].each {|file|
     file("lib/formotion/#{file}").depends_on 'lib/formotion/base.rb'
   }
   file("lib/formotion/form_controller.rb").depends_on 'lib/formotion/patch/ui_text_field.rb'

data/lib/formotion/{form_delegate.rb → form/form_delegate.rb}

@@ -52,6 +52,10 @@ module Formotion
       section = self.sections[section].title
     end
 
+    def tableView(tableView, titleForFooterInSection:section)
+      self.sections[section].footer
+    end
+
     def tableView(tableView, cellForRowAtIndexPath:indexPath)
       row = row_for_index_path(indexPath)
       reuseIdentifier = row.reuse_identifier
@@ -63,25 +67,16 @@ module Formotion
       cell
     end
 
+    def tableView(tableView, heightForRowAtIndexPath: indexPath)
+      row = row_for_index_path(indexPath)
+      row.rowHeight || tableView.rowHeight
+    end
+
     # UITableViewDelegate Methods
     def tableView(tableView, didSelectRowAtIndexPath:indexPath)
       tableView.deselectRowAtIndexPath(indexPath, animated:true)
       row = row_for_index_path(indexPath)
-      if row.submit_button?
-        self.submit
-      elsif row.checkable?
-        if row.section.select_one and !row.value
-          row.section.rows.each {|other_row|
-            other_row.value = (other_row == row)
-            Formotion::RowCellBuilder.make_check_cell(other_row, tableView.cellForRowAtIndexPath(other_row.index_path))
-          }
-        elsif !row.section.select_one
-          row.value = !row.value
-          Formotion::RowCellBuilder.make_check_cell(row, tableView.cellForRowAtIndexPath(row.index_path))
-        end
-      elsif row.editable?
-        row.text_field.becomeFirstResponder
-      end
+      row.object.on_select(tableView, self)
     end
   end
 end

data/lib/formotion/patch/object.rb

@@ -0,0 +1,9 @@
+class Object
+  # Creates an alias for :method with the form
+  # old_#{method}
+  # Instance evals the block.
+  def swizzle(method, &block)
+    self.class.send(:alias_method, "old_#{method.to_s}".to_sym, method)
+    self.instance_eval &block
+  end
+end

data/lib/formotion/patch/ui_action_sheet.rb

@@ -0,0 +1,27 @@
+# To make accessibility labels work in UIActionSheets
+# adapted from https://gist.github.com/953326
+
+class UIActionSheet
+
+  alias_method :old_addButtonWithTitle, :addButtonWithTitle
+
+  def addButtonWithTitle(title)
+    button_index = old_addButtonWithTitle(title)
+    self.subviews.each { |subview|
+      if subview.respond_to? :title
+        controlTitle = subview.send(:title)
+        if (title == controlTitle)
+          copyAccessibilityMetadataFrom(title, toControl: subview)
+          return button_index
+        end
+      end
+    }
+    button_index
+  end
+
+  private
+  def copyAccessibilityMetadataFrom(title, toControl:control)
+    control.accessibilityLabel = title
+  end
+
+end

data/lib/formotion/patch/ui_text_view.rb

@@ -0,0 +1,122 @@
+# Methods which use blocks for UITextViewDelegate methods.
+# EX
+# field.should_end? do |text_field|
+#   if text_field.text != "secret"
+#     return false
+#   end
+#   true
+# end
+#
+# Also includes an on_change method, which calls after the text
+# has changed (there is no UITextViewDelegate equivalent.)
+# EX
+# field.on_change do |text_field|
+#   p text_field.text
+# end
+
+class UITextView
+  attr_accessor :menu_options_enabled
+
+  def canPerformAction(action, withSender:sender)
+    self.menu_options_enabled
+  end
+
+  # block takes argument textView; should return true/false
+  def should_begin?(&block)
+    add_delegate_method do
+      @delegate.textViewShouldBeginEditing_callback = block
+    end
+  end
+
+  # block takes argument textView
+  def on_begin(&block)
+    add_delegate_method do
+      @delegate.textViewDidBeginEditing_callback = block
+    end
+  end
+
+  # block takes argument textView; should return true/false
+  def should_end?(&block)
+    add_delegate_method do
+      @delegate.textViewShouldEndEditing_callback = block
+    end
+  end
+
+  # block takes argument textView
+  def on_end(&block)
+    add_delegate_method do
+      @delegate.textViewDidEndEditing_callback = block
+    end
+  end
+
+  # block takes argument textView
+  def on_change(&block)
+    add_delegate_method do
+      @delegate.textViewDidChange_callback = block
+    end
+  end
+
+    # block takes argument textView, range [NSRange], and string; should return true/false
+  def should_change?(&block)
+    add_delegate_method do
+      @delegate.shouldChangeCharactersInRange_callback = block
+    end
+  end
+
+  private
+  def add_delegate_method
+    # create strong reference to the delegate
+    # (.delegate= only creates a weak reference)
+    @delegate ||= UITextView_Delegate.new
+    yield
+    self.delegate = @delegate
+  end
+end
+
+class UITextView_Delegate
+  [:textViewShouldBeginEditing, :textViewDidBeginEditing,
+   :textViewShouldEndEditing, :textViewDidEndEditing,
+   :textViewDidChange, :shouldChangeCharactersInRange].each {|method|
+    attr_accessor (method.to_s + "_callback").to_sym
+  }
+
+  def textViewShouldBeginEditing(theTextView)
+    if self.textViewShouldBeginEditing_callback
+      return self.textViewShouldBeginEditing_callback.call(theTextView)
+    end
+    true
+  end
+
+  def textViewDidBeginEditing(theTextView)
+    if self.textViewDidBeginEditing_callback
+      return self.textViewDidBeginEditing_callback.call(theTextView)
+    end
+  end
+
+  def textViewShouldEndEditing(theTextView)
+    if self.textViewShouldEndEditing_callback
+      return self.textViewShouldEndEditing_callback.call(theTextView)
+    end
+    true
+  end
+
+  def textView(textView, shouldChangeTextInRange:range, replacementText:text)
+    if self.shouldChangeCharactersInRange_callback
+      return self.shouldChangeCharactersInRange_callback.call(textView, range, text)
+    end
+    true
+  end
+
+  def textViewDidEndEditing(theTextView)
+    if self.textViewDidEndEditing_callback
+      return self.textViewDidEndEditing_callback.call(theTextView)
+    end
+  end
+
+  def textViewDidChange(theTextView)
+    if self.textViewDidChange_callback
+      self.textViewDidChange_callback.call(theTextView)
+    end
+  end
+
+end

data/lib/formotion/patch/ui_text_view_placeholder.rb

@@ -0,0 +1,65 @@
+class UITextView
+  attr_reader :placeholder
+  attr_accessor :placeholder_color
+
+  alias_method :old_initWithCoder, :initWithCoder
+  def initWithCoder(decoder)
+    old_initWithCoder(decoder)
+    setup
+    self
+  end
+
+  alias_method :old_initWithFrame, :initWithFrame
+  def initWithFrame(frame)
+    old_initWithFrame(frame)
+    setup
+    self
+  end
+
+  def setup
+    @foreground_observer = NSNotificationCenter.defaultCenter.observe UITextViewTextDidChangeNotification do |notification|
+      updateShouldDrawPlaceholder
+    end  
+  end
+
+  alias_method :old_drawRect, :drawRect
+  def drawRect(rect)
+    old_drawRect(rect)
+
+    if (@shouldDrawPlaceholder)
+        self.placeholder_color.set
+        self.placeholder.drawInRect(placeholder_rect, withFont:self.font)
+    end
+  end
+
+
+  alias_method :old_setText, :setText
+  def setText(text)
+    old_setText(text)
+
+    updateShouldDrawPlaceholder
+  end
+
+  def placeholder=(placeholder)
+    return if @placeholder == placeholder
+
+    @placeholder = placeholder
+
+    updateShouldDrawPlaceholder
+  end
+
+  def placeholder_rect
+    CGRectMake(self.contentInset.left + 10.0, self.contentInset.top, self.frame.size.width - self.contentInset.left - self.contentInset.right - 16.0, self.frame.size.height - self.contentInset.top - self.contentInset.bottom - 16.0)
+  end
+
+  def placeholder_color
+    @placeholder_color ||= UIColor.lightGrayColor
+  end
+
+  def updateShouldDrawPlaceholder
+    prev = @shouldDrawPlaceholder;
+    @shouldDrawPlaceholder = self.placeholder && self.text.length == 0
+
+    self.setNeedsDisplay if (prev != @shouldDrawPlaceholder)
+  end
+end

data/lib/formotion/{row.rb → row/row.rb}

@@ -6,20 +6,23 @@ module Formotion
       # the user's (or configured) value for this row.
       :value,
       # set as cell.titleLabel.text
-      :title, 
+      :title,
       # set as cell.detailLabel.text
       :subtitle,
       # configures the type of input this is (string, phone, switch, etc)
       # either Formotion::RowType or a string/symbol representation of one
       # see row_type.rb
       :type,
+      # Stores possible formatting information (used by date pickers, etc)
+      #   if :type == :date, accepts values in [:short, :medium, :long, :full]
+      :format,
 
       # The following apply only to text-input fields
 
       # placeholder text
       :placeholder,
       # whether or not the entry field is secure (like a password)
-      :secure, 
+      :secure,
       # given by a UIReturnKey___ integer, string, or symbol
       # EX :default, :google
       :return_key,
@@ -32,7 +35,20 @@ module Formotion
       # field.clearButtonMode; given by a UITextFieldViewMode__ integer, string, symbol
       # EX :never, :while_editing
       # DEFAULT is nil, which is used as :while_editing
-      :clear_button]
+      :clear_button,
+      # row height as integer; used for heightForRowAtIndexPath
+      # EX 200
+      # DEFAULT is nil, which is used as the tableView.rowHeight
+      :rowHeight,
+      # range used for slider min and max value
+      # EX (1..100)
+      # DEFAULT is (1..10)
+      :range,
+      # Array used for control row items
+      # EX ['free', 'pro']
+      # DEFAULT is []
+      :items,
+    ]
     PROPERTIES.each {|prop|
       attr_accessor prop
     }
@@ -62,6 +78,9 @@ module Formotion
     # starts editing #text_field.
     attr_accessor :on_begin_callback
 
+    # row type object
+    attr_accessor :object
+
     def initialize(params = {})
       super
 
@@ -74,7 +93,7 @@ module Formotion
     # these should be done with alias_method but there's currently a bug
     # in RM which messes up attr_accessors with alias_method
     # EX
-    # row.editable?
+    # row.secure?
     # => true
     # row.checkable?
     # => nil
@@ -103,7 +122,7 @@ module Formotion
 
     def next_row
       # if there are more rows in this section, use that.
-      return self.section.rows[self.index + 1] if self.index < (self.section.rows.count - 1)        
+      return self.section.rows[self.index + 1] if self.index < (self.section.rows.count - 1)
 
       # if there are more sections, then use the first row of that section.
       return self.section.next_section.rows[0] if self.section.next_section
@@ -112,7 +131,7 @@ module Formotion
     end
 
     def previous_row
-      return self.section.rows[self.index - 1] if self.index > 0        
+      return self.section.rows[self.index - 1] if self.index > 0
 
       # if there are more sections, then use the first row of that section.
       return self.section.previous_section.rows[-1] if self.section.previous_section
@@ -120,41 +139,30 @@ module Formotion
       nil
     end
 
-    def editable?
-      Formotion::RowType::TEXT_FIELD_TYPES.member? self.type
-    end
-
     def submit_button?
-      self.type == Formotion::RowType::SUBMIT
-    end
-
-    def switchable?
-      self.type == Formotion::RowType::SWITCH
-    end
-
-    def checkable?
-      self.type == Formotion::RowType::CHECK
+      object.submit_button?
     end
 
     #########################
     #  setter overrides
     def type=(type)
-      @type = Formotion::RowType.for(type)
+      @object = Formotion::RowType.for(type).new(self)
+      @type = type
     end
 
     def return_key=(value)
       @return_key = const_int_get("UIReturnKey", value)
     end
 
-    def auto_correction=(value)        
+    def auto_correction=(value)
       @auto_correction = const_int_get("UITextAutocorrectionType", value)
     end
 
-    def auto_capitalization=(value)        
+    def auto_capitalization=(value)
       @auto_capitalization = const_int_get("UITextAutocapitalizationType", value)
     end
 
-    def clear_button=(value)        
+    def clear_button=(value)
       @clear_button = const_int_get("UITextFieldViewMode", value)
     end
 
@@ -176,6 +184,7 @@ module Formotion
     def make_cell
       cell, text_field = Formotion::RowCellBuilder.make_cell(self)
       @text_field = text_field
+      self.object.after_build(cell)
       cell
     end
 
@@ -197,14 +206,15 @@ module Formotion
     # directly in your code, they don't get added
     # to Kernel and const_int_get crashes.
     def load_constants_hack
-      [UITextAutocapitalizationTypeNone, UITextAutocapitalizationTypeWords, 
+      [UITextAutocapitalizationTypeNone, UITextAutocapitalizationTypeWords,
         UITextAutocapitalizationTypeSentences,UITextAutocapitalizationTypeAllCharacters,
         UITextAutocorrectionTypeNo, UITextAutocorrectionTypeYes, UITextAutocorrectionTypeDefault,
-        UIReturnKeyDefault, UIReturnKeyGo, UIReturnKeyGoogle, UIReturnKeyJoin, 
+        UIReturnKeyDefault, UIReturnKeyGo, UIReturnKeyGoogle, UIReturnKeyJoin,
         UIReturnKeyNext, UIReturnKeyRoute, UIReturnKeySearch, UIReturnKeySend,
-        UIReturnKeyYahoo, UIReturnKeyDone, UIReturnKeyEmergencyCall, 
+        UIReturnKeyYahoo, UIReturnKeyDone, UIReturnKeyEmergencyCall,
         UITextFieldViewModeNever, UITextFieldViewModeAlways, UITextFieldViewModeWhileEditing,
-        UITextFieldViewModeUnlessEditing
+        UITextFieldViewModeUnlessEditing, NSDateFormatterShortStyle, NSDateFormatterMediumStyle,
+        NSDateFormatterLongStyle, NSDateFormatterFullStyle
       ]
     end
   end