formotion 1.6 → 1.7

data/lib/formotion/patch/ui_text_field.rb

@@ -39,7 +39,7 @@ class UITextField
   # block takes argument textField
   def on_end(&block)
     add_delegate_method do
-      @delegate.textFieldDidBeginEditing_callback = block
+      @delegate.textFieldDidEndEditing_callback = block
     end
   end
 
@@ -114,6 +114,11 @@ class UITextField_Delegate
     if self.textFieldShouldEndEditing_callback
       return self.textFieldShouldEndEditing_callback.call(theTextField)
     end
+
+    if Device.ios_version >= "7.0"
+      theTextField.text = theTextField.text.gsub("\u00a0", " ").strip
+    end
+
     true
   end
 
@@ -127,6 +132,15 @@ class UITextField_Delegate
     if self.shouldChangeCharactersInRange_callback
       return self.shouldChangeCharactersInRange_callback.call(theTextField, range, string)
     end
+
+    # fix for UITextField in iOS7 http://stackoverflow.com/questions/19569688/uitextfield-spacebar-does-not-advance-cursor-in-ios-7/20129483#20129483
+    if Device.ios_version >= "7.0"
+      if range.location == theTextField.text.length && string == " "
+        theTextField.text = theTextField.text.stringByAppendingString("\u00a0")
+        return false
+      end
+    end
+
     true
   end
 

data/lib/formotion/row/row.rb

@@ -9,6 +9,10 @@ module Formotion
       :value,
       # set as cell.titleLabel.text
       :title,
+      # set as cell.imageView.image
+      :image,
+      # an image placeholder for cell.imageView.image when using remote images
+      :image_placeholder,
       # set as cell.detailLabel.text
       :subtitle,
       # configures the type of input this is (string, phone, switch, etc)
@@ -101,7 +105,13 @@ module Formotion
       # Cell selection style
       # OPTIONS: :blue, :gray, :none
       # DEFAULT is :blue
-      :selection_style
+      :selection_style,
+
+      # The following apply only to weblink rows
+
+      # Whether or not to display a warning to the user before leaving the app.
+      # DEFAULT is false
+      :warn
     ]
     PROPERTIES.each {|prop|
       attr_accessor prop
@@ -139,6 +149,8 @@ module Formotion
     attr_accessor :on_tap_callback
     # callback for when a row is tapped
     attr_accessor :on_delete_callback
+    # callback for when a row is exited
+    attr_accessor :on_end_callback
 
     # RowType object
     attr_accessor :object
@@ -264,7 +276,7 @@ module Formotion
     end
 
     def text_alignment=(alignment)
-      @text_alignment = const_int_get("UITextAlignment", alignment)
+      @text_alignment = const_int_get("NSTextAlignment", alignment)
     end
 
     def selection_style=(style)
@@ -305,6 +317,10 @@ module Formotion
       self.on_begin_callback = block
     end
 
+    def on_end(&block)
+      self.on_end_callback = block
+    end
+
     # Used in :button type rows
     def on_tap(&block)
       self.on_tap_callback = block
@@ -398,7 +414,7 @@ module Formotion
         UITextFieldViewModeNever, UITextFieldViewModeAlways, UITextFieldViewModeWhileEditing,
         UITextFieldViewModeUnlessEditing, NSDateFormatterShortStyle, NSDateFormatterMediumStyle,
         NSDateFormatterLongStyle, NSDateFormatterFullStyle,
-        UITextAlignmentRight, UITextAlignmentCenter, UITextAlignmentLeft
+        NSTextAlignmentRight, NSTextAlignmentCenter, NSTextAlignmentLeft
       ]
     end
   end

data/lib/formotion/row/row_cell_builder.rb

@@ -23,13 +23,20 @@ module Formotion
         cell.textLabel.text = new_value
       end
 
+      if row.image
+        Formotion::RowCellBuilder.set_image(cell, row)
+        observe(row, "image") do |old_value, new_value|
+          Formotion::RowCellBuilder.set_image(cell, row)
+        end
+      end
+
       cell.detailTextLabel.text = row.subtitle
       observe(row, "subtitle") do |old_value, new_value|
         cell.detailTextLabel.text = new_value
       end
 
       edit_field = row.object.build_cell(cell)
-      
+
       if edit_field and edit_field.respond_to?("accessibilityLabel=")
         label = row.accessibility
         label = row.title unless label
@@ -39,5 +46,44 @@ module Formotion
       [cell, edit_field]
     end
 
+    def self.set_image(cell, row)
+      if row.image.is_a?(NSURL) || (row.image.is_a?(String) && row.image.include?("http"))
+        # Use a remote image helper to set the image.
+        image_url = row.image
+        image_url = NSURL.URLWithString(image_url) unless image_url.is_a?(NSURL)
+
+        placeholder = row.image_placeholder
+        placeholder = UIImage.imageNamed(placeholder) if placeholder.is_a?(String)
+
+        if cell.imageView.respond_to?("setImageWithURLRequest:placeholderImage:success:failure:")
+          # Use AFNetworking
+          request = NSURLRequest.requestWithURL(image_url)
+          cell.imageView.setImageWithURLRequest(request, placeholderImage: placeholder, success: ->(request, response, image) {
+            cell.imageView.image = image
+            cell.setNeedsLayout
+          }, failure: ->(request, response, error) {
+
+          })
+        elsif cell.imageView.respond_to?("setImageWithURL:placeholderImage:completed:")
+          cell.imageView.setImageWithURL(image_url, placeholderImage: placeholder, completed: ->(image, error, cacheType) {
+            cell.imageView.image = image
+            cell.setNeedsLayout
+          })
+        elsif cell.imageView.respond_to?("setImageWithURL:placeholder:")
+          # Use JMImageCache
+          JMImageCache.sharedCache.imageForURL(image_url, completionBlock: ->(downloadedImage) {
+              cell.imageView.image = downloadedImage
+              cell.setNeedsLayout
+          })
+        else
+          raise "Please add the AFNetworking, SDWebImage, or JMImageCache pods to your project to use remote images in Formotion"
+        end
+
+      else
+        # Just set the image like normal
+        cell.imageView.image = (row.image.is_a? String) ? UIImage.imageNamed(row.image) : row.image
+      end
+    end
+
   end
-end
+end

data/lib/formotion/row_type/button.rb

@@ -20,8 +20,8 @@ module Formotion
               ((self.frame.size.send(dimen) - frame.size.send(dimen)) / 2.0)
             }
 
-            self.textLabel.center = CGPointMake(self.frame.size.width / 2 - (Formotion::RowType::Base.field_buffer / 2), self.textLabel.center.y)
-            self.detailTextLabel.center = CGPointMake(self.frame.size.width / 2 - (Formotion::RowType::Base.field_buffer / 2), self.detailTextLabel.center.y)
+            self.textLabel.center = CGPointMake(self.frame.size.width / 2, self.textLabel.center.y)
+            self.detailTextLabel.center = CGPointMake(self.frame.size.width / 2, self.detailTextLabel.center.y)
           end
         end
         nil

data/lib/formotion/row_type/date_row.rb

@@ -40,6 +40,12 @@ module Formotion
 
       def after_build(cell)
         self.row.text_field.inputView = self.picker
+        # work around an iOS7 bug: http://bit.ly/KcwKSv
+        if row.picker_mode == :countdown
+          self.picker.setDate(self.picker.date, animated:true)
+          picker.countDownDuration = self.row.value
+        end
+
         update
       end
 
@@ -49,13 +55,14 @@ module Formotion
           picker.datePickerMode = self.picker_mode
           picker.hidden = false
           picker.date = self.date_value || Time.now
+          picker.countDownDuration = self.row.value if row.picker_mode == :countdown
           picker.minuteInterval = self.row.minute_interval if self.row.minute_interval
 
           picker.when(UIControlEventValueChanged) do
             if self.row.picker_mode == :countdown
               self.row.value = @picker.countDownDuration
             else
-              self.row.value = Time.at(@picker.date).to_i 
+              self.row.value = Time.at(@picker.date).to_i
             end
             update
           end

data/lib/formotion/row_type/image_row.rb

@@ -15,7 +15,7 @@ module Formotion
       def build_cell(cell)
         cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
         # only show the "plus" when editable
-        add_plus_accessory(cell) if row.editable?
+        add_plus_accessory(cell) if row.editable? && (row.value == nil)
 
         observe(self.row, "value") do |old_value, new_value|
           @image_view.image = new_value
@@ -25,7 +25,7 @@ module Formotion
           else
             self.row.row_height = 44
             # only show the "plus" when editable
-            add_plus_accessory(cell) if row.editable?
+            add_plus_accessory(cell) if row.editable? && (row.value == nil)
           end
           row.form.reload_data
         end

data/lib/formotion/row_type/map_row.rb

@@ -3,31 +3,35 @@ motion_require 'base'
 module Formotion
   module RowType
     class MapRowData
-  
+
       attr_accessor :pin, :options
       #attr_accessor :title, :subtitle, :coordinate
-  
-      def initialize(title, subtitle, coordinate, options={})
-        @title=title
-        @subtitle=subtitle
-        @coordinate=coordinate
-        @options=options
+
+      def initialize(options)
+        @title=options[:title]
+        @subtitle=options[:subtitle]
+        @coordinate=options[:coord]
+        @options=options[:options]
       end
-      
+
       def title
         @title
       end
-      
+
       def subtitle
         @subtitle
       end
-      
+
       def coordinate
-        @coordinate
+        if @coordinate.is_a? CLCircularRegion
+          @coordinate.center
+        else
+          @coordinate
+        end
       end
-  
+
     end
-    
+
     class MapRow < Base
       include BW::KVO
 
@@ -35,34 +39,67 @@ module Formotion
 
       def set_pin
         return unless row.value
-        coord = (row.value.is_a?(Array) and row.value.size==2) ? CLLocationCoordinate2D.new(row.value[0], row.value[1]) : row.value
-        if coord.is_a?(CLLocationCoordinate2D)
-          @map_view.removeAnnotation(@map_row_data) if @map_row_data
-          region = MKCoordinateRegionMakeWithDistance(coord, 400.0, 480.0)
-          @map_row_data = MapRowData.new(nil, nil, coord)
-          @map_view.setRegion(region, animated:true)
+
+        unless row.value.is_a?(Hash)
+          coord = (row.value.is_a?(Array) and row.value.size==2) ? CLLocationCoordinate2D.new(row.value[0], row.value[1]) : row.value
+          row.value = {coord: coord, pin: {coord:coord}}
+        end
+
+        # Set Defaults
+        row.value = {
+          animated: true,
+          type: MKMapTypeStandard,
+          enabled: true
+        }.merge(row.value)
+
+        if row.value[:coord].is_a?(CLLocationCoordinate2D)
+          region = MKCoordinateRegionMakeWithDistance(row.value[:coord], 400.0, 480.0)
+        elsif row.value[:coord].is_a?(CLCircularRegion)
+          region = MKCoordinateRegionMakeWithDistance(
+            row.value[:coord].center,
+            row.value[:coord].radius * 2,
+            row.value[:coord].radius * 2
+          )
+        else
+          return
+        end
+
+        if row.value[:pin]
+          row.value[:pin] = {title: nil, subtitle:nil}.merge(row.value[:pin]) #Defaults
+
+          @map_row_data = MapRowData.new(row.value[:pin])
+          @map_view.removeAnnotations(@map_view.annotations)
           @map_view.addAnnotation(@map_row_data)
+          @map_view.selectAnnotation(@map_row_data, animated:row.value[:animated]) if row.value[:pin][:title]
         end
+
+        @map_view.setUserInteractionEnabled(row.value[:enabled])
+        @map_view.setMapType(row.value[:type])
+        @map_view.setRegion(region, animated:row.value[:animated])
       end
-      
+
       def annotations
         @map_view.annotations
       end
 
+      def map
+        @map_view
+      end
+
       def build_cell(cell)
         cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
 
         @map_view = MKMapView.alloc.init
         @map_view.delegate = self
-        
+
         set_pin
-        
+
         observe(self.row, "value") do |old_value, new_value|
           break_with_semaphore do
             set_pin
           end
         end
-        
+
         @map_view.tag = MAP_VIEW_TAG
         @map_view.contentMode = UIViewContentModeScaleAspectFit
         @map_view.backgroundColor = UIColor.clearColor

data/lib/formotion/row_type/object_row.rb

@@ -17,7 +17,7 @@ module Formotion
 
         field.clearButtonMode = UITextFieldViewModeWhileEditing
         field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
-        field.textAlignment = row.text_alignment || UITextAlignmentRight
+        field.textAlignment = row.text_alignment || NSTextAlignmentRight
 
         field.keyboardType = keyboardType
 
@@ -54,7 +54,7 @@ module Formotion
         field
 
       end
-      
+
       # Used when row.value changes
       def update_text_field(new_value)
         self.row.text_field.text = row_value.to_s

data/lib/formotion/row_type/picker_row.rb

@@ -8,6 +8,38 @@ module Formotion
       include RowType::ItemsMapper
       include RowType::MultiChoiceRow
 
+      def input_accessory_view(input_accessory)
+        case input_accessory
+        when :done
+          @input_accessory ||= begin
+            tool_bar = UIToolbar.alloc.initWithFrame([[0, 0], [0, 44]])
+            tool_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
+            tool_bar.translucent = true
+
+            left_space = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
+                UIBarButtonSystemItemFlexibleSpace,
+                target: nil,
+                action: nil)
+
+            done_button = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
+                UIBarButtonSystemItemDone,
+                target: self,
+                action: :done_editing)
+
+            tool_bar.items = [left_space, done_button]
+
+            tool_bar
+          end
+        else
+          nil
+        end
+      end
+
+      # Callback for "Done" button in input_accessory_view
+      def done_editing
+        self.row.text_field.endEditing(true)
+      end
+
       def after_build(cell)
         self.row.text_field.inputView = self.picker
         self.row.text_field.text = name_for_value(row.value).to_s

data/lib/formotion/row_type/string_row.rb

@@ -33,7 +33,7 @@ module Formotion
 
         field.clearButtonMode = UITextFieldViewModeWhileEditing
         field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
-        field.textAlignment = row.text_alignment || UITextAlignmentRight
+        field.textAlignment = row.text_alignment || NSTextAlignmentRight
 
         field.keyboardType = keyboardType
 
@@ -112,6 +112,10 @@ module Formotion
           end
         end
 
+        field.on_end do |text_field|
+          row.on_end_callback && row.on_end_callback.call
+        end
+
         field.on_begin do |text_field|
           row.on_begin_callback && row.on_begin_callback.call
         end
@@ -152,7 +156,6 @@ module Formotion
           @input_accessory ||= begin
             tool_bar = UIToolbar.alloc.initWithFrame([[0, 0], [0, 44]])
             tool_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
-            tool_bar.barStyle = UIBarStyleBlack
             tool_bar.translucent = true
 
             left_space = UIBarButtonItem.alloc.initWithBarButtonSystemItem(

data/lib/formotion/row_type/web_link_row.rb

@@ -0,0 +1,48 @@
+module Formotion
+  module RowType
+    class WebLinkRow < ObjectRow
+
+      def after_build(cell)
+        super
+
+        cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator
+        self.row.text_field.hidden = true
+      end
+
+      def on_select(tableView, tableViewDelegate)
+        if is_url?
+          if row.warn.nil? || row.warn == false
+            App.open_url row.value
+          else
+            warn
+          end
+        else
+          raise StandardError, "Row value for WebLinkRow should be a URL string or instance of NSURL."
+        end
+      end
+
+      def is_url?
+        (row.value.is_a?(String) && row.value[0..3] == "http") || row.value.is_a?(NSURL)
+      end
+
+      def warn
+        row.warn = {} unless row.warn.is_a? Hash #Convert value from true to a hash
+        row.warn = {
+          title: "Leaving #{App.name}",
+          message: "This action will leave #{App.name} and open Safari.",
+          buttons: ["Cancel", "OK"]
+        }.merge(row.warn)
+
+        BW::UIAlertView.new({
+          title: row.warn[:title],
+          message: row.warn[:message],
+          buttons: row.warn[:buttons],
+          cancel_button_index: 0
+        }) do |alert|
+          App.open_url(row.value) unless alert.clicked_button.cancel?
+        end.show
+      end
+
+    end
+  end
+end