formotion 1.3.1 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmNhMGY5ZTMyZWUwYWIzMzhlMTVhYmQ0ODk2NGQ3YTBlYzRmNGI5NQ==
+    ZmYyOTdkNGExNDMzMzU5Mjg5NjMxZGIxZWE4NzcxY2NjNjM5ZDBjMA==
   data.tar.gz: !binary |-
-    ODI0MWFkNzkwOTAxNGFmZjM1Yjg5ZjVkYTMwYzkzMTdhMWZhMzZiOA==
+    YWJmNzEwODljYmUzN2ZhN2I0MTE4YmFkYWI1ODhhMDkzOTQxYzNjZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDkzMzM3YWE2MTNjZjMwOGI5MWUzN2ZlZWNmYWNkMGMwMTczNDY3YzA4Njli
-    NmEzMzQzYjZkYjNkYzI5NTQxNDI2MjM3OWUwZGM3MTkxZTBjNDJlYmJiNjk4
-    NjI2NjY2YjJlOTMyNmI5YTZmYTgyYmQ0NzNiMzBhZTc4ODEzYTc=
+    YzYyMTNkZjI3MWE3YTFiMGY5MzBiMTc4MWEyOGVmNGE5NGE3Y2I5MDgxZjM1
+    MDMxZDliM2Y0OWY2ZjhkODFjMjczYTIyMDI2MDNkNWU0YzIzYzRiOTYzNzRk
+    Yjg3ZGRmN2UwZWY3OTdmODY5YjBiZTEzNWU1NDg3ZjE3NjFiYzE=
   data.tar.gz: !binary |-
-    MDM3ODUyZWI5MmE5ZTQxOGQyN2YxY2ZhZDI0MzUyNjI5ZDU4M2QyMjI1ODk5
-    ZDA5ZTM5Y2ZlY2QyMmI5YWVjMjhjYzE3MjliYmVhMWIzYTY1NTBkNmQ0ZWQ4
-    MWIyYTVjMjJmNzM0MWRlMzFmM2VlMjI4MTMwZTlkMDJjYmQ0ZDY=
+    NzQzNzdmYmM5YjJkY2YxZDU5YjliM2RmYzUyZDIyMzIyM2NjYjVkYmViZTA2
+    MWZmYTgxMGEyMmY4NmM1NmJjZDA1NWE3YTE4ZDRkNWEwNzA5NzYxZTgzMzU2
+    ZTFkZWZkODQ0MWU4ZjViNzIyY2FkMTUyN2FjMjUwYzhlNjk0ZTk=

data/.travis.yml

@@ -1,5 +1,6 @@
 language: objective-c
 before_install:
+  - rvm install ruby-1.9.3-p429
   - rvm use 1.9.3
 install: bundle install
 script: bundle exec rake spec:units

data/Formotion.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "bubble-wrap", ">= 1.1.4"
+  s.add_dependency "bubble-wrap", "~> 1.3.0"
   s.add_dependency "motion-require", "~> 0.0.3"
   s.add_development_dependency 'rake'
 end

data/LIST_OF_ROW_TYPES.md

@@ -5,7 +5,8 @@
 [Phone](#phone)<br/>
 [Number](#number)<br/>
 [Currency](#currency)<br/>
-[Date](#date)
+[Date](#date)<br/>
+[Object](#object)<br/>
 
 **Other**<br/>
 [Static](#static)<br/>
@@ -16,7 +17,11 @@
 [Option](#option)<br/>
 [Picker](#picker)<br/>
 [Subform](#subform)<br/>
-[Template](#template)
+[Template](#template)<br/>
+[MapView](#mapview)<br/>
+[WebView](#webview)<br/>
+[PagedImage](#pagedimage)<br/>
+[Tags](#tags)<br/>
 
 **Buttons**<br/>
 [Button](#button)<br/>
@@ -89,6 +94,34 @@ The `TextRow` is a multiline text input row and opens the default keyboard when
 To define the height of the row set the property `row_height`.
 
 
+#### <a name="text_fonts"></a> Text row with Big Font
+![Text Row](https://github.com/clayallsopp/formotion/wiki/row-types/text_big_font.png)
+
+```ruby
+{
+  title: "Big Text",
+  key: :text,
+  type: :text,
+  font: {name: 'Helvetica', size: 24},
+  placeholder: "Enter your big text here",
+  row_height: 100
+}
+```
+
+#### <a name="text_fonts"></a> Text row with Small Font
+![Text Row](https://github.com/clayallsopp/formotion/wiki/row-types/text_small_font.png)
+
+```ruby
+{
+  title: "Small Text",
+  key: :text,
+  type: :text,
+  font: {name: 'Chalkduster', size: 8},
+  placeholder: "Enter your small text here",
+  row_height: 100
+}
+```
+
 ### <a name="email"></a> Email row
 ![Email row](https://github.com/clayallsopp/formotion/wiki/row-types/email.png)
 ```ruby
@@ -186,6 +219,21 @@ Note: If you use `:date_time` or `:time` for the type, `:minute_interval` will b
 the default is the Apple default of 1.
 
 
+### <a name="object"></a> Object row
+
+```ruby
+{
+  title: "My Data",
+  type: :object,
+  value: object       # an object
+}
+```
+
+Same as StringRow with the difference that it would not change the row.value to string.
+The object needs a to_s method.
+
+
+
 ## Other
 
 ### <a name="static"></a> Static row
@@ -378,6 +426,69 @@ Use a `:display_key` to show the value of the subform in the row:
 }
 ```
 
+
+### <a name="mapview"></a> MapView row
+![MapView row](https://github.com/rheoli/formotion/wiki/row-types/Mapview.png)
+```ruby
+{
+  title: "Map",
+  type: :map_view,
+  value: coordinates,  # of type CLLocationCoordinate2D
+  row_height: 200      # for better viewing
+}
+```
+
+Shows a map with a pin at the coordinates from value.
+
+
+### <a name="webview"></a> WebView row
+![WebView row](https://github.com/rheoli/formotion/wiki/row-types/Webview.png)
+```ruby
+{
+  title: "Page",
+  type: :web_view,
+  value: html,      # HTML code to be shown
+  row_height: 200   # for better viewing
+}
+```
+
+
+### <a name="pagedimage"></a> PagedImage row
+![Pagedimage row](https://github.com/rheoli/formotion/wiki/row-types/Pagedimage.png)
+```ruby
+{
+  title: "Photos",
+  type: :paged_image,
+  value: images,      # array of UIImage's
+  row_height: 200     # for better viewing
+}
+```
+Same functionality as ImageRow but you can scroll through many photos.
+
+
+### <a name="tags"></a> Tags row
+![Tags row](https://github.com/rheoli/formotion/wiki/row-types/Tags.png)
+```ruby
+{
+  title: "Tags",
+  type: :tags,
+  value: ["Beer","Dark Beer"],
+  row_height: 200               # for better viewing
+}
+```
+
+Add on_tap callback:
+```ruby
+row.on_tap do |row|
+  ... # will be called when '+' in editable mode will touched
+      # add the new tag with row.object.add_tag(new_tag)
+end
+
+```
+Show/Edit tags.
+
+
+
 ## Buttons
 
 ### <a name="button"></a> Button row
@@ -386,10 +497,11 @@ Use a `:display_key` to show the value of the subform in the row:
 {
   title: "Any Button",
   type: :button,
+  key: :some_button
 }
 
 # later...
-form.sections[0].rows[0].on_tap do |row|
+form.row(:some_button).on_tap do |row|
   # do something when tapped
 end
 ```

data/README.md

@@ -218,6 +218,7 @@ end
 row.on_enter do |row|
   p "I'm called when the user taps the return key while typing in my text field"
 end
+```
      
 ## Forking
 

data/examples/KitchenSink/app/app_delegate.rb

@@ -57,10 +57,24 @@ class AppDelegate
           type: :string,
           row_height: 60
         }, {
-          title: "Text",
+            title: "Text",
+            key: :text,
+            type: :text,
+            placeholder: "Enter your text here",
+            row_height: 100
+        }, {
+          title: "Big Text",
+          key: :text,
+          type: :text,
+          font: {name: 'Helvetica', size: 24},
+          placeholder: "Enter your big text here",
+          row_height: 100
+        }, {
+          title: "Small Text",
           key: :text,
           type: :text,
-          placeholder: "Enter your text here",
+          font: {name: 'Chalkduster', size: 8},
+          placeholder: "Enter your small text here",
           row_height: 100
         }, {
           title: "Check",

data/lib/formotion.rb

@@ -1,7 +1,15 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "formotion/version"))
 require 'bubble-wrap/core'
+require 'bubble-wrap/font'
 require 'bubble-wrap/camera'
 
 require 'motion-require'
 
-Motion::Require.all(Dir.glob(File.expand_path('../formotion/**/*.rb', __FILE__)))
+Motion::Require.all(Dir.glob(File.expand_path('../formotion/**/*.rb', __FILE__)))
+
+Motion::Project::App.setup do |app|
+  app.frameworks<<'CoreLocation' unless app.frameworks.include?('CoreLocation')
+  app.frameworks<<'MapKit' unless app.frameworks.include?('MapKit')
+  
+  app.resources_dirs << File.join(File.dirname(__FILE__), '../resources')
+end

data/lib/formotion/form/form.rb

@@ -96,6 +96,13 @@ module Formotion
       self.sections[index_path.section].rows[index_path.row]
     end
 
+    def row(key)
+      each_row do |row|
+        return row if row.key == key
+      end
+      nil
+    end
+
     #########################
     #  callbacks
 

data/lib/formotion/form/form_delegate.rb

@@ -35,7 +35,7 @@ module Formotion
       previous_row, next_row = nil
 
       last_row = self.sections[-1] && self.sections[-1].rows[-1]
-      if last_row
+      if last_row && last_row.type != :text
         last_row.return_key ||= UIReturnKeyDone
       end
 
@@ -92,7 +92,7 @@ module Formotion
     def tableView(tableView, didSelectRowAtIndexPath:indexPath)
       tableView.deselectRowAtIndexPath(indexPath, animated:true)
       row = row_for_index_path(indexPath)
-      row.object.on_select(tableView, self)
+      row.object._on_select(tableView, self)
     end
 
     def tableView(tableView, editingStyleForRowAtIndexPath:indexPath)

data/lib/formotion/patch/ui_image.rb

@@ -0,0 +1,45 @@
+class UIImage
+  
+  # Resize Image
+  # target_size: Array or CGSize
+  # upscale: Boolean (false = do not upscale image)
+  #
+  # Code ideas from http://stackoverflow.com/questions/15653953/resize-image-in-iphone
+  #
+  def resize_image_to_size(target_size, upscale=true)
+    image_size = self.size
+    
+    # convert Array to CGSize
+    if target_size.is_a?(Array)
+      target_size = CGSizeMake(target_size[0], target_size[1])
+    end
+    # when target_size no CGSize set to image_size
+    unless target_size.is_a?(CGSize)
+      target_size = image_size
+    end
+    
+    # do not upscale when requested
+    if !upscale and (target_size.width > image_size.width or target_size.height > image_size.height)
+      target_size = image_size
+    end
+    
+    unless CGSizeEqualToSize(image_size, target_size)
+      width_factor = target_size.width / image_size.width
+      height_factor = target_size.height / image_size.height
+      if width_factor < height_factor
+        target_size.height = image_size.height * width_factor
+      else
+        target_size.width = image_size.width * height_factor
+      end
+    end
+    
+    UIGraphicsBeginImageContext(target_size)
+    resize_rect = CGRectMake(0, 0, target_size.width, target_size.height)
+    self.drawInRect resize_rect
+    resized_image = UIGraphicsGetImageFromCurrentImageContext()
+    UIGraphicsEndImageContext()
+    
+    resized_image
+  end
+  
+end

data/lib/formotion/patch/ui_text_view_placeholder.rb

@@ -55,7 +55,10 @@ class UITextView
   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)
+    x_offset = font.xHeight
+    y_offset = font.capHeight + font.descender
+
+    CGRectMake(self.contentInset.left + x_offset, self.contentInset.top + y_offset, self.frame.size.width - self.contentInset.left - self.contentInset.right - x_offset, self.frame.size.height - self.contentInset.top - self.contentInset.bottom - y_offset)
   end
 
   def placeholder_color

data/lib/formotion/row/row.rb

@@ -88,10 +88,18 @@ module Formotion
       # In a date/time or time picker, the minute interval can
       # be set. That allows picking by every 15 minutes, etc.
       :minute_interval,
+      #-Resize image when needed (size as Array [1500,1500])
+      :max_image_size,
+      # Font for String and Text rows
+      :font,
       # Display an inputAccessoryView when editing a StringRow.
       # OPTIONS: :done (a black translucent toolbar with a right-aligned "Done" button)
       # DEFAULT is nil
-      :input_accessory
+      :input_accessory,
+      # Cell selection style
+      # OPTIONS: :blue, :gray, :none
+      # DEFAULT is :blue
+      :selection_style
     ]
     PROPERTIES.each {|prop|
       attr_accessor prop
@@ -257,6 +265,10 @@ module Formotion
       @text_alignment = const_int_get("UITextAlignment", alignment)
     end
 
+    def selection_style=(style)
+      @selection_style = const_int_get("UITableViewCellSelectionStyle", style || :blue)
+    end
+
     def editable=(editable)
       case editable
       when TrueClass

data/lib/formotion/row_type/base.rb

@@ -56,17 +56,26 @@ module Formotion
 
       # method gets triggered when tableView(tableView, didSelectRowAtIndexPath:indexPath)
       # in UITableViewDelegate is executed
-      def on_select(tableView, tableViewDelegate)
+      def _on_select(tableView, tableViewDelegate)
         # row class should call super and proceed if false is return (not handled here)
         if row.on_tap_callback
           # Not all row types will want to define on_tap, but call it if so
-          row.on_tap_callback.call(self.row)
-          true
+          if row.on_tap_callback.call(self.row) != false
+            on_select(tableView, tableViewDelegate)
+            true
+          else
+            false
+          end
         else
-          false
+          on_select(tableView, tableViewDelegate)
         end
       end
 
+      # Override in subclass
+      def on_select(tableView, tableViewDelegate)
+        false
+      end
+
       # called when the delete editing style was triggered tableView:commitEditingStyle:forRowAtIndexPath:
       def on_delete(tableView, tableViewDelegate)
         if row.on_delete_callback

data/lib/formotion/row_type/button.rb

@@ -11,6 +11,7 @@ module Formotion
       # for just this one UITableViewCell object, in order to
       # center it's labels horizontally.
       def build_cell(cell)
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
         cell.swizzle(:layoutSubviews) do
           def layoutSubviews
             old_layoutSubviews

data/lib/formotion/row_type/check_row.rb

@@ -14,6 +14,7 @@ module Formotion
       # instantiate long-lived objects in them.
       # Maybe that logic should be moved elsewhere?
       def build_cell(cell)
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
         update_cell_value(cell)
         observe(self.row, "value") do |old_value, new_value|
           update_cell_value(cell)
@@ -36,4 +37,4 @@ module Formotion
 
     end
   end
-end
+end

data/lib/formotion/row_type/date_row.rb

@@ -1,8 +1,11 @@
 motion_require 'string_row'
+motion_require 'multi_choice_row'
 
 module Formotion
   module RowType
     class DateRow < StringRow
+      include RowType::MultiChoiceRow
+
       # overwrite Character on_change method
       def on_change(text_field)
       end