tgios 0.0.34 → 0.0.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQxNmQ5YzAxNDM2MTUxYWRhYTc5ZmQ0YjIyYjVhZjgxYzljNDUyZA==
+    OGNhNjk1M2E4OTdlMDEyYWJhNzYyNjkyN2NjYWM0NTllNzY2OTA5MQ==
   data.tar.gz: !binary |-
-    MjViMzE5MmQ0ZmI4N2Q2MzU5NTc3ZTA3OWUwY2JiZWZmMWVmODJkMA==
+    ZmNlMGM0OGJhYzE3ZmYyMWViMjI3NGJiYmZjOTg1OTk5ZDAzMDdmYw==
 SHA512:
   metadata.gz: !binary |-
-    ODM3OTgyMTdjZGIzMDkxZjg0NWI4MWQzYjc4MTI1MzdhNjk2ZTE1ODEwYWVh
-    OTY3MmY3ZDMwNjZiZTk2N2NlNzMwYWU2YjJlZTFmMGVlMmUzMWZiZmQ2NGVh
-    YzY1MDFiZDgwODU5NmI3YjFiMWE5MTM0ODRiNmRlYzU4NmExZWM=
+    ZTY3YzY3MWRkMjlkMmM5MzFmNGMzNGU2ODNiYmU3ODVlMTM5NDI3NDQ4MjVm
+    ZjBiNjg2MGM2MTUzZDNmZjEyMWMyM2E4OWUzYjljMDI3N2RiZmFjOWE1YjQ3
+    NzFjNmZlOTMxMGFmOTMzZmVkNzVlNjEzOGQ2ZmJlOWM2ODIxYjU=
   data.tar.gz: !binary |-
-    ZDE1YjNjMGI4ZjA0NjViOTViYjQwN2VlMGRkM2Q3NjNkN2EzZTNhZmU1ZWQ3
-    YjA0ZDU3OTZlNTEwN2E0OWIwMzRmYWQ3YzNhMGVlMGQyNGVjZGRiYjE4ZTQ1
-    NTUzOTc1NGVkZTg1MDAyZjVjOTk0NDkzMzgyZGQ4Yzc2OTI4MDI=
+    YTFmMDFjYjUxY2M1NjM2YTEyMDI0ODQwZDA3MWY4OTUxNzFhMjgzZjFkOTlm
+    N2E5NWMyNzY0MWQ1Mzk4Y2YyYWNhMTFjZTU1YmVhOGMzNWMyNzA0ZjhkZTM2
+    OTk5N2FhMDNhYjhiZjFmYTU4Y2ZiMjQxNDQ5NTdiYmI2YjQyYTM=

data/Gemfile.lock

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

data/lib/tgios/beacon_manager.rb

@@ -11,7 +11,7 @@ module Tgios
   end
 
   class BeaconManager < BindingBase
-    attr_accessor :rssi, :current_beacon
+    attr_accessor :range_method, :range_limit, :tolerance, :current_beacon, :background
 
     BeaconFoundKey = 'Tgios::BeaconManager::BeaconFound'
     EnterRegionKey = 'Tgios::BeaconManager::EnterRegion'
@@ -25,14 +25,15 @@ module Tgios
       @default
     end
 
-    def initialize(uuid, rssi=-70, background=false, tolerance=5)
+    def initialize(uuid, range_limit=-70, background=false, tolerance=5, range_method=:rssi)
       @events = {}
       @previous_beacons = []
       @background = background
       @tolerance = (tolerance || 5)
 
       @uuid = NSUUID.alloc.initWithUUIDString(uuid)
-      @rssi = rssi
+      @range_method = range_method
+      @range_limit = range_limit
 
       @region = CLBeaconRegion.alloc.initWithProximityUUID(@uuid, identifier: uuid.split('-').first)
       @region.notifyOnEntry = true
@@ -75,18 +76,25 @@ module Tgios
     end
 
     def locationManager(manager, didRangeBeacons: beacons, inRegion: region)
-      if has_event(:beacons_found)
-        @events[:beacons_found].call(beacons.select{|b| b.proximity != CLProximityUnknown && b.rssi >= @rssi}, beacons)
+      beacons = beacons.sort_by{|b| b.try(@range_method)}
+      beacons = beacons.reverse if @range_method == :rssi
+      known_beacons = beacons.select{|b| b.proximity != CLProximityUnknown}
+      unknown_beacons = beacons - known_beacons
+      beacon = nil
+      beacons_in_range = known_beacons.select{|b| @range_method == :accuracy ? b.try(@range_method) <= @range_limit : b.try(@range_method) >= @range_limit}
+      beacon = beacons_in_range.first if beacons_in_range.present?
+      
+      NSLog("beacons_in_range: ")
+      beacons_in_range.each_with_index do |bir, i|
+        NSLog("##{i}: major: #{bir.major}, minor: #{bir.minor}, accuracy: #{bir.accuracy}, rssi: #{bir.rssi}")
       end
+      push_beacon(beacon) # nil value will signify null beacon
 
-      known_beacons = beacons.select{|b| b.proximity != CLProximityUnknown}.sort_by{|b| b.rssi}
-      if known_beacons.present?
-        beacon = known_beacons.last if known_beacons.last.rssi >= @rssi
-        beacon ||= known_beacons.last if known_beacons.length == 1 && known_beacons.last.rssi >= @rssi - 1
+      if has_event(:beacons_found)
+        # use known_beacons + unknown_beacons to make sure closest range comes to the top
+        @events[:beacons_found].call(beacons_in_range, known_beacons + unknown_beacons, @current_beacon)
       end
 
-      push_beacon(beacon)
-
       if has_event(:beacon_found)
         @events[:beacon_found].call(@current_beacon)
       end
@@ -107,8 +115,8 @@ module Tgios
     def request_authorization(manager)
       if manager.respond_to?(:requestAlwaysAuthorization)
         status = CLLocationManager.authorizationStatus
-        if status == KCLAuthorizationStatusAuthorizedWhenInUse || status == KCLAuthorizationStatusDenied
-          title = (status == kCLAuthorizationStatusDenied) ? "Location services are off" : "Background location is not enabled"
+        if status != KCLAuthorizationStatusAuthorizedAlways
+          title = (status == KCLAuthorizationStatusDenied) ? "Location services are off" : "Background location is not enabled"
           message = "To use background location you must turn on 'Always' in the Location Services Settings"
 
           UIAlertView.alert(title, message: message)
@@ -189,4 +197,4 @@ module Tgios
       super
     end
   end
-end
+end

data/lib/tgios/images_collection_view_binding.rb

@@ -29,8 +29,12 @@ module Tgios
     end
 
     def list=(new_list)
+      set_list(new_list)
+    end
+
+    def set_list(new_list, options={})
       if new_list.is_a?(Array)
-        @image_views = self.class.new_image_views(new_list)
+        @image_views = self.class.new_image_views(new_list, options)
         reload(@image_views)
       end
     end

data/lib/tgios/loading_indicator.rb

@@ -16,7 +16,7 @@ module Tgios
         @label = Base.style(UILabel.new,
                             frame: self.bounds,
                             font: lambda {UIFont.systemFontOfSize(22)},
-                            textAlignment: :center.uialignment,
+                            textAlignment: :center.nstextalignment,
                             backgroundColor: :clear.uicolor,
                             textColor: :white.uicolor)
         @label.sizeToFit

data/lib/tgios/photo_scroll_view.rb

@@ -1,7 +1,6 @@
 module Tgios
   class PhotoScrollView < UIScrollView
-    attr_accessor :image
-    MAX_SCALE = 4.0
+    attr_accessor :image, :max_scale, :content_type, :min_content_type
 
     def init
       if super
@@ -11,6 +10,11 @@ module Tgios
         self.decelerationRate = UIScrollViewDecelerationRateFast
         self.delegate = self
         self.backgroundColor = :clear.uicolor
+        @max_scale = 4.0
+        @content_type = @min_content_type = :horizontal # :horizontal, :vertical, :fit, :fill
+
+        @image_view = PlasticCup::Base.style(UIImageView.new, contentMode: UIViewContentModeScaleAspectFit)
+        self.addSubview(@image_view)
       end
       self
     end
@@ -26,25 +30,25 @@ module Tgios
     def image=(image)
       super
       if image.is_a?(UIImage)
-        frame = self.frame
-        page_rect = CGRectMake(0, 0, image.size.width, image.size.height)
 
-        img_scale = frame.size.width / page_rect.size.width
-        fit_scale = frame.size.height / page_rect.size.height
-        fit_scale = img_scale if img_scale < fit_scale
+        fit_scale = get_scale(@content_type, image)
 
-        page_rect.size = CGSizeMake(page_rect.size.width * img_scale, page_rect.size.height * img_scale)
+        image_view_size = CGSizeMake(image.size.width * fit_scale, image.size.height * fit_scale)
 
-        @image_view = PlasticCup::Base.style(UIImageView.new,
-                                             image: image,
-                                             frame: page_rect,
-                                             contentMode: UIViewContentModeScaleAspectFit)
-        self.addSubview(@image_view)
+        #reset content
+        self.contentOffset = CGPointZero
+        self.zoomScale = 1.0
+
+        @image_view.image= image
+        @image_view.frame = [[0,0], [image_view_size.width, image_view_size.height]]
 
-        self.zoomScale = 0.995 if page_rect.size.height > frame.size.height
+        #center image
+        self.contentOffset = CGPointMake((image_view_size.width - frame.size.width)/2.0, (image_view_size.height - frame.size.height)/2.0)
+
+        self.zoomScale = 0.995
+        self.maximumZoomScale = @max_scale / fit_scale
+        self.minimumZoomScale = get_scale(@min_content_type, image) / fit_scale
 
-        self.maximumZoomScale = MAX_SCALE / img_scale
-        self.minimumZoomScale = fit_scale / img_scale
       end
     end
 
@@ -64,6 +68,23 @@ module Tgios
 
     end
 
+    def get_scale(type, image)
+      horizontal_scale = frame.size.width / image.size.width
+      vertical_scale = frame.size.height / image.size.height
+      case type
+        when :horizontal
+          horizontal_scale
+        when :vertical
+          vertical_scale
+        when :fit
+          [horizontal_scale, vertical_scale].min
+        when :fill
+          [horizontal_scale, vertical_scale].max
+        else
+          horizontal_scale
+      end
+    end
+
     def viewForZoomingInScrollView(scrollView)
       @image_view
     end

data/lib/tgios/ui_collection_view_binding.rb

@@ -2,6 +2,8 @@ module Tgios
   class UICollectionViewBinding < BindingBase
     include PlasticCup
 
+    attr_accessor :current_page
+
     def initialize(*args)
       super
       @events={}
@@ -43,12 +45,23 @@ module Tgios
 
     def scrollViewDidEndDecelerating(scrollView)
       page = (scrollView.contentOffset.x / scrollView.frame.size.width).round
-      if page != @page
-        @page = page
+      if page != @current_page
+        @current_page = page
         @events[:page_changed].call(page) unless @events[:page_changed].nil?
       end
     end
 
+    def scrollViewDidScroll(scroll_view)
+      @events[:view_did_scroll].call(scroll_view) if @events[:view_did_scroll]
+    end
+
+    def go_to_page(page, animated=false)
+      frame = @collection_view.bounds
+      frame.origin.x = frame.size.width * page
+      @collection_view.scrollRectToVisible(frame, animated: animated)
+      @events[:page_changed].call(page) unless @events[:page_changed].nil?
+    end
+
     def view_at(index_path)
       @views[index_path.row]
     end

data/lib/tgios/ui_picker_view_list_binding.rb

@@ -8,10 +8,11 @@ module Tgios
       @events[event_name]=block.weak!
     end
 
-    def bind(picker_view, list: list, display_field: display_field)
+    def bind(picker_view, options={})
+      @options = options
       @picker_view=WeakRef.new(picker_view)
-      @list=WeakRef.new(list)
-      @display_field=display_field
+      @list=WeakRef.new(options[:list])
+      @display_field=options[:display_field]
       @picker_view.dataSource=self
       @picker_view.delegate=self
     end
@@ -26,14 +27,24 @@ module Tgios
     end
 
     def pickerView(pickerView, titleForRow: row, forComponent: component)
-      record = @list[row]
-      record.is_a?(Hash) ? record[@display_field] : record.send(@display_field)
+      get_display_text(row)
+    end
+
+    def pickerView(pickerView, attributedTitleForRow:row, forComponent:component)
+      if @options[:text_color]
+        NSAttributedString.alloc.initWithString(get_display_text(row), attributes:{NSForegroundColorAttributeName => @options[:text_color]})
+      end
     end
 
     def pickerView(pickerView, didSelectRow:row, inComponent:component)
       @events[:row_selected].call(row, selected_record) unless @events[:row_selected].nil?
     end
 
+    def get_display_text(row)
+      record = @list[row]
+      record.is_a?(Hash) ? record[@display_field] : record.send(@display_field)
+    end
+
     def selected_record
       @list[@picker_view.selectedRowInComponent(0)]
     end

data/lib/tgios/ui_text_field_binding.rb

@@ -15,7 +15,7 @@ module Tgios
           extends: :decimal_button_common,
           frame: [[0, 163 + 44], [105, 54]],
           highlighted_background_image: Tgios::CommonUIUtility.imageFromColor(UIColor.colorWithRed(0.324, green: 0.352, blue: 0.402, alpha: 1)),
-          titleColor: :darkgray.uicolor,
+          titleColor: :dark_gray.uicolor,
           highlighted_title_color: :white.uicolor
       }, :ios6) unless Base.get_style_sheet(:decimal_button)
 
@@ -210,7 +210,7 @@ module Tgios
                                textColor: :red.uicolor,
                                backgroundColor: :clear.uicolor,
                                font: 'GillSans-Bold'.uifont(25),
-                               textAlignment: :center.uialignment,
+                               textAlignment: :center.nstextalignment,
                                text: '!',
                                tag: 888}
           error_label = Base.style(UILabel.new, error_label_styles)

data/lib/tgios/version.rb

@@ -1,3 +1,3 @@
 module Tgios
-  VERSION = '0.0.34'
+  VERSION = '0.0.35'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tgios
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - April Tsang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugarcube