tgios 0.0.24 → 0.0.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDJhNGZlOTYyZTdiYjhiYzAyNDE5N2QyYzIyMzNiNTA1MmIwYzUxMA==
+    Y2Q3OGI0NGE2MTExMzg1Y2Q4ODY3ZDJlODM3NzFmMzcwZmQ1ZmE2NQ==
   data.tar.gz: !binary |-
-    Mjc4ZmVmZDEwMmMyZGI2MDlhZWEyY2Q1ZjFjYjkzZWI1ZDYzYWFlNw==
+    YzNjODRlY2MzZTZhNTcxNDNmZjhjNzdhNDA0Nzc0YzcxNzgwZmY4Yg==
 SHA512:
   metadata.gz: !binary |-
-    MWM4OWE0NmM2NjBmN2Y4YmNhNDBmYzAwYjBiOGNkODZlYTk3YmQzODQxZTU1
-    MTc5ZWIwZTUyM2NlY2U2ZGRkMTNjMzc4ODUzOTQzNDI0ZDc5ZDliMzliYjRk
-    ZjllY2EzOWM5ZGU1NTQ1MTFjZjc4OTBiOWVjZDdmYjdkZDczZDk=
+    MjA0YjY1NzYyOGU0M2Y2ZjY2OTgxYzY4YzY2NmY4NTg1NDg3OTU0ZmYxN2Yx
+    NmYyYTA1NTU1N2I0NDNjNjNlN2VhNWU1MTdjZTljMDNkMmI2ZThhYmM4MWU1
+    MjU2ZGViZTMwNzdlMmIwZmNmMGM3MDFiOTQwYjJhZGEwYTVlZDI=
   data.tar.gz: !binary |-
-    ODEzZDhmYjJiYzcyOTI1ZDhjYzgzNzlkYmI2MTEwN2IxZDliMjAzOWI1ZjA4
-    MmUxMjVlOGIzNmM1NjE3OTkzZGYyNDZiOTE4MWJjMDkwYWMyNzg2OTUwNDRj
-    MmQyZDE2NTQ4MDU1ZDZiOGRjNjc2NGMxZjcxY2UxYjVhZjEyZDY=
+    NmQwZmZjNjI0YmZjNzI3NmYyMmE1NGIzODFkYjZmYzg1MTc3MTg5NWMzYzQz
+    YjI3MDVkZDQzN2YxMjEyNTgyODc5MjBjZWIyYjA4Y2YyNWFiNzFhYTY1ZTY1
+    ZjhiODhlYzU2YjY0YmU3ZDA2M2FjYTAyMDk5ODZlMWVjYWQzMWQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tgios (0.0.24)
+    tgios (0.0.25)
       awesome_print_motion
       motion-layout
       plastic_cup (>= 0.1.1)

data/lib/tgios/ui_table_view_model_binding.rb

@@ -48,6 +48,7 @@ module Tgios
       self.model=model
       @tableView.dataSource=self
       @tableView.delegate=self
+      @table_utility_binding = UITableViewUtilityBinding.new.bind(@tableView)
       self
     end
 
@@ -134,7 +135,7 @@ module Tgios
           end
           text_field_binding.on(:begin_edit) do |model, field_name, event|
             @events[:text_begin_edit].call(model, field_name, event) unless @events[:text_begin_edit].nil?
-            performSelector('will_scroll_to_index_path:', withObject: index_path, afterDelay:0.01)
+            @table_utility_binding.will_scroll_to_index_path(index_path)
           end
           text_field_binding.update(ui_field, @model)
           ui_field.becomeFirstResponder if field_set[:first_responder] # TODO: not work when cell is not visible, buggy
@@ -186,7 +187,7 @@ module Tgios
           end
           text_field_binding.on(:begin_edit) do |model, field_name, event|
             @events[:text_begin_edit].call(model, field_name, event) unless @events[:text_begin_edit].nil?
-            performSelector('will_scroll_to_index_path:', withObject: index_path, afterDelay:0.01)
+            @table_utility_binding.will_scroll_to_index_path(index_path)
           end
           text_field_binding.update(ui_field, @model)
           ui_field.becomeFirstResponder if field_set[:first_responder] # TODO: not work when cell is not visible, buggy
@@ -228,7 +229,7 @@ module Tgios
       @selected_field_set=field_set_at_index_path(index_path)
       @events[:touch_row].call(@selected_field_set, {tableView: tableView, didSelectRowAtIndexPath:index_path}) if @events.has_key?(:touch_row)
       if @selected_field_set[:scroll]
-        performSelector('will_scroll_to_index_path:', withObject: index_path, afterDelay:0.01)
+        @table_utility_binding.will_scroll_to_index_path(index_path)
       end
 
       field_set = @selected_field_set
@@ -292,108 +293,17 @@ module Tgios
     end
 
     def listen_to_keyboard
-      @scroll_when_editing = true
-      NSNotificationCenter.defaultCenter.addObserver(self, selector: 'keyboardWillShow:', name: UIKeyboardWillShowNotification, object: nil)
-      NSNotificationCenter.defaultCenter.addObserver(self, selector: 'keyboardWillHide:', name: UIKeyboardWillHideNotification, object: nil)
+      @table_utility_binding.listen_to_keyboard
     end
 
     def stop_listen_to_keyboard
-      @scroll_when_editing = false
-      NSNotificationCenter.defaultCenter.removeObserver(self)
-    end
-
-    def keyboardWillShow(note)
-      shrink_table_view(note)
-    end
-
-    def keyboardWillHide(note)
-      expand_table_view(note)
-    end
-
-    def expand_table_view(note)
-      @expanding = true
-      offset_y = @tableView.contentOffset.y
-      frame_height = @tableView.frame.size.height
-      content_height = @tableView.contentSize.height
-      new_offset_height = nil
-      if frame_height > content_height
-        if offset_y != 0
-          new_offset_height = 0
-        end
-      else
-        bottom_offset = frame_height - content_height + offset_y
-        if bottom_offset > 0
-          new_offset_height = offset_y - bottom_offset
-        end
-      end
-
-      if new_offset_height.nil?
-        reset_content_inset_bottom
-      else
-        curve = note[UIKeyboardAnimationCurveUserInfoKey]
-        duration = note[UIKeyboardAnimationDurationUserInfoKey]
-        @animation_proc = -> {
-          @tableView.setContentOffset([0, new_offset_height])
-        }
-        @completion_proc = lambda { |finished|
-          reset_content_inset_bottom
-        }
-        UIView.animateWithDuration(duration-0.01, delay: 0, options: curve,
-                                   animations: @animation_proc,
-                                   completion: @completion_proc)
-      end
-    end
-
-    def shrink_table_view(note)
-      # TODO: don't shrink when table frame bottom is above the keyboard
-      @shrinking = true
-      rect = note[UIKeyboardFrameEndUserInfoKey].CGRectValue
-      if @expanding
-        @shrink_height = rect.size.height
-      else
-        set_content_inset_bottom(rect.size.height)
-      end
-    end
-
-    def reset_content_inset_bottom
-      @tableView.contentInset = UIEdgeInsetsZero
-      @tableView.scrollIndicatorInsets = UIEdgeInsetsZero
-      @expanding = false
-      if @shrink_height
-        set_content_inset_bottom(@shrink_height)
-        @shrink_height = nil
-      end
-    end
-
-    def set_content_inset_bottom(height)
-      @tableView.contentInset = UIEdgeInsetsMake(0,0,height,0)
-      @tableView.scrollIndicatorInsets = UIEdgeInsetsMake(0,0,height,0)
-      @shrinking = false
-      if @index_path_to_scroll
-        scroll_to_index_path(@index_path_to_scroll)
-        @index_path_to_scroll = nil
-      end
-    end
-
-    def will_scroll_to_index_path(index_path)
-      if @scroll_when_editing
-        if @shrinking
-          @index_path_to_scroll = index_path
-        else
-          scroll_to_index_path(index_path)
-        end
-      end
-    end
-
-    def scroll_to_index_path(index_path)
-      @tableView.scrollToRowAtIndexPath(index_path, atScrollPosition: UITableViewScrollPositionBottom, animated: true)
-      @index_path_to_scroll = nil
+      @table_utility_binding.stop_listen_to_keyboard
     end
 
     def bindings_prepare_release
       @bindings.values.each do |binding|
         binding.prepareForRelease
-      end if @binding.is_a?(Hash)
+      end if @bindings.is_a?(Hash)
       @tv_bindings.values.each do |binding|
         binding.prepareForRelease
       end if @tv_bindings.is_a?(Hash)
@@ -401,9 +311,7 @@ module Tgios
 
     def onPrepareForRelease
       bindings_prepare_release
-      self.stop_listen_to_keyboard
-      @animation_proc=nil
-      @completion_proc=nil
+      @table_utility_binding.prepareForRelease
       @bindings=nil
       @tv_bindings=nil
       @events=nil

data/lib/tgios/ui_table_view_model_list_binding.rb

@@ -4,12 +4,7 @@ module Tgios
       super
 
       @events={}
-      @events[:build_cell]=->(cell_identifier) {
-        cell = UITableViewCell.value1(cell_identifier)
-        cell.detailTextLabel.adjustsFontSizeToFitWidth = true
-        cell.clipsToBounds = true
-        cell
-      }
+      @events[:build_cell]=->(cell_identifier, type) { build_cell(cell_identifier, type)}
       @events[:update_cell]=->(field_set, cell, index_path) { update_field(field_set, cell, index_path)}
       self
 
@@ -45,7 +40,7 @@ module Tgios
       cell=tableView.dequeueReusableCellWithIdentifier(cell_identifier)
       isReusedCell=!cell.nil?
 
-      cell=@events[:build_cell].call(cell_identifier) unless isReusedCell
+      cell=@events[:build_cell].call(cell_identifier, type) unless isReusedCell
 
       @events[:update_cell].call(field_set, cell, index_path)
 
@@ -53,6 +48,13 @@ module Tgios
 
     end
 
+    def build_cell(cell_identifier, type)
+      cell = UITableViewCell.value1(cell_identifier)
+      cell.detailTextLabel.adjustsFontSizeToFitWidth = true
+      cell.clipsToBounds = true
+      cell
+    end
+
     def update_field(o_field_set, cell, index_path)
       model = @models[index_path.section]
       field_set = o_field_set

data/lib/tgios/ui_table_view_utility_binding.rb

@@ -0,0 +1,118 @@
+module Tgios
+  # common usage:
+  # call listen_to_keyboard in viewWillAppear
+  # call stop_listen_to_keyboard in viewWillDisappear
+  # call will_scroll_to_index_path in text field begin_edit event
+  class UITableViewUtilityBinding < BindingBase
+    def bind(table)
+      @table = WeakRef.new(table)
+      self
+    end
+
+    def listen_to_keyboard
+      @scroll_when_editing = true
+      NSNotificationCenter.defaultCenter.addObserver(self, selector: 'keyboardWillShow:', name: UIKeyboardWillShowNotification, object: nil)
+      NSNotificationCenter.defaultCenter.addObserver(self, selector: 'keyboardWillHide:', name: UIKeyboardWillHideNotification, object: nil)
+    end
+
+    def stop_listen_to_keyboard
+      @scroll_when_editing = false
+      NSNotificationCenter.defaultCenter.removeObserver(self)
+    end
+
+    def keyboardWillShow(note)
+      shrink_table_view(note)
+    end
+
+    def keyboardWillHide(note)
+      expand_table_view(note)
+    end
+
+    def expand_table_view(note)
+      @expanding = true
+      offset_y = @table.contentOffset.y
+      frame_height = @table.frame.size.height
+      content_height = @table.contentSize.height
+      new_offset_height = nil
+      if frame_height > content_height
+        if offset_y != 0
+          new_offset_height = 0
+        end
+      else
+        bottom_offset = frame_height - content_height + offset_y
+        if bottom_offset > 0
+          new_offset_height = offset_y - bottom_offset
+        end
+      end
+
+      if new_offset_height.nil?
+        reset_content_inset_bottom
+      else
+        curve = note[UIKeyboardAnimationCurveUserInfoKey]
+        duration = note[UIKeyboardAnimationDurationUserInfoKey]
+        @animation_proc = -> {
+          @table.setContentOffset([0, new_offset_height])
+        }
+        @completion_proc = lambda { |finished|
+          reset_content_inset_bottom
+        }
+        UIView.animateWithDuration(duration-0.01, delay: 0, options: curve,
+                                   animations: @animation_proc,
+                                   completion: @completion_proc)
+      end
+    end
+
+    def shrink_table_view(note)
+      # TODO: don't shrink when table frame bottom is above the keyboard
+      @shrinking = true
+      rect = note[UIKeyboardFrameEndUserInfoKey].CGRectValue
+      if @expanding
+        @shrink_height = rect.size.height
+      else
+        set_content_inset_bottom(rect.size.height)
+      end
+    end
+
+    def reset_content_inset_bottom
+      @table.contentInset = UIEdgeInsetsZero
+      @table.scrollIndicatorInsets = UIEdgeInsetsZero
+      @expanding = false
+      if @shrink_height
+        set_content_inset_bottom(@shrink_height)
+        @shrink_height = nil
+      end
+    end
+
+    def set_content_inset_bottom(height)
+      @table.contentInset = UIEdgeInsetsMake(0,0,height,0)
+      @table.scrollIndicatorInsets = UIEdgeInsetsMake(0,0,height,0)
+      @shrinking = false
+      if @index_path_to_scroll
+        scroll_to_index_path(@index_path_to_scroll)
+        @index_path_to_scroll = nil
+      end
+    end
+
+    def will_scroll_to_index_path(index_path)
+      if @scroll_when_editing
+        if @shrinking
+          @index_path_to_scroll = index_path
+        else
+          performSelector('scroll_to_index_path:', withObject: index_path, afterDelay:0.01)
+        end
+      end
+    end
+
+    def scroll_to_index_path(index_path)
+      @table.scrollToRowAtIndexPath(index_path, atScrollPosition: UITableViewScrollPositionBottom, animated: true)
+      @index_path_to_scroll = nil
+    end
+
+    def onPrepareForRelease
+      self.stop_listen_to_keyboard
+      @animation_proc=nil
+      @completion_proc=nil
+      @table=nil
+    end
+  end
+end

data/lib/tgios/ui_text_field_binding.rb

@@ -72,6 +72,7 @@ module Tgios
 
     def on(event, &block)
       @events[event]=block
+      self
     end
 
 
@@ -95,6 +96,24 @@ module Tgios
       @events[:begin_edit].call(@model, @field_name, {text_field: weak_text_field}) unless @events[:begin_edit].nil?
     end
 
+    def textFieldShouldBeginEditing(textField)
+      if @events[:should_edit].nil?
+        true
+      else
+        weak_text_field=WeakRef.new(textField)
+        @events[:should_edit].call(@model, @field_name, {text_field: weak_text_field})
+      end
+    end
+
+    def textFieldShouldClear(textField)
+      if @events[:should_clear].nil?
+        true
+      else
+        weak_text_field=WeakRef.new(textField)
+        @events[:should_clear].call(@model, @field_name, {text_field: weak_text_field})
+      end
+    end
+
     def keyboardDidShow(note)
       add_decimal_button if @ui_field.isFirstResponder
     end
@@ -108,7 +127,7 @@ module Tgios
     end
 
     def add_decimal_button
-      if is_decimal? && @ui_field.delegate == self
+      if is_decimal? && @ui_field.delegate == self && !@options[:ignore_number_addon]
         temp_window = (UIApplication.sharedApplication.windows[1] || UIApplication.sharedApplication.windows[0])
         temp_window.subviews.each do |keyboard|
           if keyboard.description.hasPrefix('<UIPeripheralHost')
@@ -186,7 +205,7 @@ module Tgios
         @ui_field.leftViewMode = UITextFieldViewModeNever
       end
 
-      if is_number_pad?
+      if is_number_pad? && !@options[:ignore_number_addon]
         text_toolbar = PlasticCup::Base.style(UIToolbar.new, frame: CGRectMake(0,0,320,44))
         done_button = UIBarButtonItem.alloc.initWithBarButtonSystemItem(UIBarButtonSystemItemDone, target: self, action: 'textFieldShouldReturn:')
         text_toolbar.items=[

data/lib/tgios/version.rb

@@ -1,3 +1,3 @@
 module Tgios
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tgios
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - April Tsang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugarcube
@@ -104,6 +104,7 @@ files:
 - lib/tgios/ui_table_view_list_binding.rb
 - lib/tgios/ui_table_view_model_binding.rb
 - lib/tgios/ui_table_view_model_list_binding.rb
+- lib/tgios/ui_table_view_utility_binding.rb
 - lib/tgios/ui_text_field_binding.rb
 - lib/tgios/ui_text_view_binding.rb
 - lib/tgios/version.rb