tgios 0.0.29 → 0.0.30

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDgwMjVjYThlM2M3YzExYTRjNGE0NTMxMDVmNDBkNjRlNjcxMmY3Nw==
+    MTAzMDBiY2EyMjc5ZTI5ZDVkNzgwMWRlNDE5MTU1YzgwNGQ4ZDE1Mg==
   data.tar.gz: !binary |-
-    NDliZjc4NTNiYWFjM2VkMWQ5YWZiNTBhMjJlNzE3OGI5MDcwMTg0Ng==
+    N2EyODYxMjJkMDAyYmU4ZjJhNjYwZjE5YWJmYzI3NTg0YWExOGY3MA==
 SHA512:
   metadata.gz: !binary |-
-    ZTk3ODVmNTZjZDg4NDYzMTdiOTZhYjJlMTUxMTkzOTA2NjIxM2M4NDFjYjc0
-    ODdkYTE2YmY1ZWMwMjkyODViYzYyYzBmYjRkYzU4ZmE2ZWEyZjg1NTQzM2Ex
-    M2QzZWJjYTQ4ZjA4MjE5OTVlMjg0NjY0YTlkZTg0NjNiOGU1NzQ=
+    YzBlNGViMDMwMTY5NzRiM2JjYjNjZjY5NDYxYzllZWI3ZjZmMzM3NWMxZjRh
+    ZGE0MTNlNDI2YWUyOWY1MjNlNzk0NDJlNzQxNjI2NWVmNmFkOTcyODRlZDgy
+    ZjBkOGM0MGI0NjNkODgyZDFkNGE0OTliNWJlMGIwMmNmYTgwNDE=
   data.tar.gz: !binary |-
-    MTg5OWFjZDIyNGQ4NzgwYTQzZjRkOTUxM2E1ZWZmYmE4ODE5OWJiODQyMGRm
-    MDU2ZTJkMzJjYzRhZDgxZjI4ODE3NmMwYjRmNDY5NjdmOTJiMzZlNGRiMmVl
-    OTcwZjgxNWNkNTViOTkzNTI3ZTYwMzljYmQwYmMyOTk0ZDcwNzI=
+    MDVhMGU3ZDVjMGM3NTI3OWZhNzQ5ODNmZDdlM2IzNDgxOGU2N2ZhZmUyZWI4
+    N2YzNDBkY2IxMWIxMjAwZjQ2ZGRlOTZkNzhiNzgwMjRjMjAwODhlZjMwNWFm
+    MjdmNTIwZTBlN2MzNDZmODc4ZDI5YTY3YWIyZDYzMzJjNDU2M2M=

data/Gemfile.lock

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

data/lib/tgios/animatable_view.rb

@@ -16,18 +16,18 @@ module Tgios
     end
 
     def show_animated
+      new_frame = self.frame
+      new_frame.origin.y = self.superview.frame.size.height - self.bounds.size.height
       @show_notification ||= NSNotification.notificationWithName(
           UIKeyboardWillShowNotification,
           object: self,
-          userInfo:{UIKeyboardFrameEndUserInfoKey=> NSValue.valueWithCGRect(self.frame),
+          userInfo:{UIKeyboardFrameEndUserInfoKey=> NSValue.valueWithCGRect(self.superview.convertRect(new_frame, toView: nil)),
                     UIKeyboardAnimationCurveUserInfoKey=> UIViewAnimationOptionCurveEaseInOut,
                     UIKeyboardAnimationDurationUserInfoKey=> DURATION})
       UIView.animateWithDuration(DURATION, animations: ->{
         NSNotificationCenter.defaultCenter.postNotification(@show_notification)
         self.alpha = 1.0
-        frame = self.frame
-        frame.origin.y = self.superview.frame.size.height - self.bounds.size.height
-        self.frame = frame
+        self.frame = new_frame
       })
       @is_shown = true
     end

data/lib/tgios/images_collection_view_binding.rb

@@ -21,7 +21,7 @@ module Tgios
                                                   },
                                                   clipsToBounds: true}.merge(options))
         CommonUIUtility.get_image(item) do |image|
-          image_view.image = image
+          image_view.image = image unless image.nil?
         end
         image_views << image_view
       end

data/lib/tgios/search_controller.rb

@@ -2,7 +2,7 @@ module Tgios
   class SearchController < ExtendedUIViewController
     include ExtendedUITableView
     Events=[:record_selected, :search, :after_layout, :load_more]
-    attr_accessor :table_list_binding_options, :pop_after_selected, :hide_keyboard, :field_name
+    attr_accessor :table_list_binding_options, :pop_after_selected, :hide_keyboard, :field_name, :instant_search
 
     def on(event_name, &block)
       raise ArgumentError.new("Event not found, valid events are: [#{Events.join(', ')}]") unless Events.include?(event_name)
@@ -42,12 +42,19 @@ module Tgios
 
     def searchBarSearchButtonClicked(searchBar)
       searchBar.resignFirstResponder
+      call_search(searchBar.text, true)
+    end
+
+    def searchBar(searchBar, textDidChange: searchText)
+      call_search(searchText) if @instant_search
+    end
 
+    def call_search(text, select_one=false)
       unless @events.nil? || @events[:search].nil?
-        @events[:search].call(searchBar.text) do |success, result|
+        @events[:search].call(text) do |success, result|
           if success
             @result=result
-            if @result.count == 1
+            if @result.count == 1 && select_one
               select_record(@result.first)
             else
               @search_result_table_binding.reload(@result) unless @search_result_table_binding.nil?

data/lib/tgios/ui_picker_view_list_binding.rb

@@ -26,7 +26,8 @@ module Tgios
     end
 
     def pickerView(pickerView, titleForRow: row, forComponent: component)
-      @list[row][@display_field]
+      record = @list[row]
+      record.is_a?(Hash) ? record[@display_field] : record.send(@display_field)
     end
 
     def pickerView(pickerView, didSelectRow:row, inComponent:component)

data/lib/tgios/ui_table_view_model_list_binding.rb

@@ -122,12 +122,13 @@ module Tgios
         field_set = field_set_at_index_path(index_path)
         real_fs = field_set
         real_fs = real_fs[:child_field] unless real_fs[:child_index].nil?
-        if real_fs[:delete] == true
+        if real_fs[:delete] == true # TODO: change :delete to :delete_row after trim-ios changed
           unless @events[:delete_row].nil?
             @events[:delete_row].call(field_set, @models[index_path.section].send(field_set[:name]), {tableView: tableView, commitEditingStyle: editingStyle, forRowAtIndexPath:index_path}) do |success|
               tableView.deleteRowsAtIndexPaths([index_path], withRowAnimation: UITableViewRowAnimationFade) if success
             end
           end
+        elsif real_fs[:delete_section] == true
           unless @events[:delete_section].nil?
             @events[:delete_section].call(field_set, @models[index_path.section], {tableView: tableView, commitEditingStyle:editingStyle, forRowAtIndexPath:index_path}) do |success|
               tableView.deleteSections(NSIndexSet.indexSetWithIndex(index_path.section), withRowAnimation: UITableViewRowAnimationFade) if success
@@ -139,8 +140,15 @@ module Tgios
 
     def tableView(tableView, canEditRowAtIndexPath: index_path)
       field_set = field_set_at_index_path(index_path)
-      field_set = field_set[:child_field] unless field_set[:child_index].nil?
-      return field_set[:delete] == true
+      unless field_set.nil?
+        can_edit = @events[:can_edit].call(field_set, index_path) unless @events[:can_edit].nil?
+        if can_edit.nil?
+          field_set = field_set[:child_field] unless field_set[:child_index].nil?
+          can_edit = field_set[:delete] == true || field_set[:delete_section] == true
+        end
+      end
+      can_edit = false if can_edit.nil?
+      can_edit
     end
 
     def tableView(tableView, heightForRowAtIndexPath: index_path)

data/lib/tgios/ui_table_view_utility_binding.rb

@@ -63,13 +63,15 @@ module Tgios
     end
 
     def shrink_table_view(note)
-      # TODO: don't shrink when table frame bottom is above the keyboard
       @shrinking = true
       rect = note[UIKeyboardFrameEndUserInfoKey].CGRectValue
+      table_rect= @table.superview.convertRect(@table.frame, toView:nil)
+      intersect = CGRectIntersection(rect, table_rect)
+      expand_height = intersect.present? ? intersect.size.height : 0
       if @expanding
-        @shrink_height = rect.size.height
+        @shrink_height = expand_height
       else
-        set_content_inset_bottom(rect.size.height)
+        set_content_inset_bottom(expand_height)
       end
     end
 
@@ -104,7 +106,7 @@ module Tgios
     end
 
     def scroll_to_index_path(index_path)
-      @table.scrollToRowAtIndexPath(index_path, atScrollPosition: UITableViewScrollPositionBottom, animated: true)
+      @table.scrollToRowAtIndexPath(index_path, atScrollPosition: UITableViewScrollPositionMiddle, animated: true)
       @index_path_to_scroll = nil
     end
 

data/lib/tgios/ui_text_field_binding.rb

@@ -27,7 +27,11 @@ module Tgios
       }) unless Base.get_style_sheet(:decimal_button)
 
       @field_name=field_name
-      @options=options
+      @options=options.dup
+      %w(precision keyboard ignore_number_addon type auto_correct auto_capitalize reduce_font_size field_style).each do |k|
+        instance_variable_set("@#{k}", @options.delete(k.to_sym))
+      end
+
       @events={}
       @ui_field=WeakRef.new(ui_field)
       @model=WeakRef.new(model)
@@ -43,7 +47,7 @@ module Tgios
         @ui_field.text= if val.respond_to?(:round)
                           default_precision = 0
                           default_precision = 6 unless val.is_a?(Integer)
-                          val.round((@options[:precision] || default_precision)).to_s
+                          val.round((@precision || default_precision)).to_s
                         else
                           val.to_s
                         end
@@ -122,16 +126,16 @@ module Tgios
     end
 
     def is_decimal?
-      @options[:keyboard] == :decimal && is_number_pad?
+      @keyboard == :decimal && is_number_pad?
     end
 
     def add_decimal_button
-      if is_decimal? && @ui_field.delegate == self && !@options[:ignore_number_addon]
+      if is_decimal? && @ui_field.delegate == self && !@ignore_number_addon
         temp_window = (UIApplication.sharedApplication.windows[1] || UIApplication.sharedApplication.windows[0])
         temp_window.subviews.each do |keyboard|
           if keyboard.description.hasPrefix('<UIPeripheralHost')
             if @decimal_button.nil?
-              @decimal_button = PlasticCup::Base.style(UIButton.custom, :decimal_button)
+              @decimal_button = Base.style(UIButton.custom, :decimal_button)
               @decimal_button.addTarget(self, action: 'decimal_tapped', forControlEvents: UIControlEventTouchUpInside)
             end
             keyboard.addSubview(@decimal_button)
@@ -180,12 +184,13 @@ module Tgios
     ####
 
     def update_ui_field_style
-      @ui_field.secureTextEntry=@options[:type]==:password
-      @ui_field.autocorrectionType = get_auto_correct_type(@options[:auto_correct])
-      @ui_field.autocapitalizationType = get_auto_capitalize_type(@options[:auto_capitalize])
-      @ui_field.keyboardType = get_keyboard_type(@options[:keyboard])
-      @ui_field.enabled = @options[:type] != :label
-      @ui_field.adjustsFontSizeToFitWidth = @options[:reduce_font_size]
+      Base.style(@ui_field, @field_style) if @field_style.present?
+      @ui_field.secureTextEntry=@type==:password
+      @ui_field.autocorrectionType = get_auto_correct_type(@auto_correct)
+      @ui_field.autocapitalizationType = get_auto_capitalize_type(@auto_capitalize)
+      @ui_field.keyboardType = get_keyboard_type(@keyboard)
+      @ui_field.enabled = @type != :label
+      @ui_field.adjustsFontSizeToFitWidth = @reduce_font_size
 
       if @model.respond_to?(:has_error?) && @model.has_error?(@field_name)
         @ui_field.leftViewMode = UITextFieldViewModeAlways
@@ -197,15 +202,15 @@ module Tgios
                                textAlignment: :center.uialignment,
                                text: '!',
                                tag: 888}
-          error_label = PlasticCup::Base.style(UILabel.new, error_label_styles)
+          error_label = Base.style(UILabel.new, error_label_styles)
           @ui_field.leftView = error_label
         end
       else
         @ui_field.leftViewMode = UITextFieldViewModeNever
       end
 
-      if is_number_pad? && !@options[:ignore_number_addon]
-        text_toolbar = PlasticCup::Base.style(UIToolbar.new, frame: CGRectMake(0,0,320,44))
+      if is_number_pad? && !@ignore_number_addon
+        text_toolbar = Base.style(UIToolbar.new, frame: CGRectMake(0,0,320,44))
         done_button = UIBarButtonItem.alloc.initWithBarButtonSystemItem(UIBarButtonSystemItemDone, target: self, action: 'textFieldShouldReturn:')
         text_toolbar.items=[
             UIBarButtonItem.flexible_space, done_button

data/lib/tgios/version.rb

@@ -1,3 +1,3 @@
 module Tgios
-  VERSION = '0.0.29'
+  VERSION = '0.0.30'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tgios
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - April Tsang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugarcube