tgios 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzU2M2M5Y2I2NjI2NzQzZmRlMTEyMWFlOTE0MmRkNDRhZjdmOThjZg==
+    Yzg1YmIyZmExYmQyMDJmNDQ4NWNiOTRlYWU2YmQ0ZjZhZWViYWY5NQ==
   data.tar.gz: !binary |-
-    ZGQzMDljMDBhNDMxOTZkY2UyNzM4OTJmNTE1ZDM2ZTFhOThiOGU3MQ==
+    Nzk4YTI2OTNlOWJiMmIyM2Y0MmU0MDdlOGQ2ODliMGEzM2M2NmMxOQ==
 SHA512:
   metadata.gz: !binary |-
-    NDdkZjU2Y2E3YmFhMzViNGQ3Yzc5YzE4YmQ4NWI4ODE0YWE1OWJjOWQ0Nzdl
-    MWU1OGJkNjkzMTNjNTgzMjk5MWRlZjA0NGY0ZDEyOTU1MjA2ZmJlMGU0M2Q2
-    MjdkYTBkODY2N2UwZTAyNjllZDk1MDNkZWUzNGFiZWY1OGEyMGM=
+    ZDA0MDYzODc2MzI5ZGEyNWNiOTc3OGZhZDNhZGRkZmM0ODgzY2YwM2EyZDdh
+    ZjM3ZTdmYWM1MmQzMzY0YWJiMWI0MTk5Mzk4YTI3ZGMyNzQxM2JhN2RiYWUy
+    NGMyZDZhODRiMjdlYzM2NmY1MDlkMzlkYmI4YmQyZjY0ZWFmNTk=
   data.tar.gz: !binary |-
-    ZjM3ZjE1YWU4NTk3MGJhMWI0ZTk0ODk4NDQ3NTZhZTcyYWQ0OWRiYWZlNjU4
-    MzYxNzAzNTEyODEyMTgyYTgwODY1NTdhMGQyMTJhY2U4NjRmZTcwOWE3YjZh
-    NzRjNzg0MzM3ZjE3ZWNhNTI0NzBjNDhiNDRjNjg2YjhlMjkwODc=
+    OGEwYmVkOGMyNjY3YjdjMGM3MzYwZGVhNzExNDFlM2MzM2Q2YTYwZDUyN2My
+    NzU3MGNjOWE5MTdiMmU0Y2I4MzE2N2EyMTViYmRmMThiNDJlMzcxZTE5NzAz
+    NmJjZjZhMTZmYzY1YzFhMmYxMTdhNGZkNzMzYzg1N2ZiYWJiOTM=

data/Gemfile.lock

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

data/lib/tgios/common_ui_utility.rb

@@ -26,5 +26,14 @@ module Tgios
         normalized_image
       end
     end
+
+    def self.add_full_subview(super_view, subview)
+      Motion::Layout.new do |l|
+        l.view super_view
+        l.subviews 'subview' => subview
+        l.vertical '|[subview]|'
+        l.horizontal '|[subview]|'
+      end
+    end
   end
 end

data/lib/tgios/extended_ui_table_view.rb

@@ -5,12 +5,7 @@ module Tgios
     def add_full_table_view_to(view, style=:grouped)
       style ||= :plain
       table = UITableView.send(style)
-      Motion::Layout.new do |l|
-        l.view view
-        l.subviews 'table' => table
-        l.vertical '|[table]|'
-        l.horizontal '|[table]|'
-      end
+      CommonUIUtility.add_full_subview(view, table)
       table
     end
 

data/lib/tgios/loading_indicator.rb

@@ -1,47 +1,62 @@
 include PlasticCup
 module Tgios
-  module LoadingIndicator
-    def add_loading_indicator_to(view)
-      Base.add_style_sheet(:loading_view, {
-          backgroundColor: :black.uicolor,
-          alpha: 0.5
-      })
-      @loading_view = Base.style(UIView.new, hidden: true)
-      base_view = Base.style(UIView.new, :loading_view)
-      @indicator = UIActivityIndicatorView.large
-      [{super_view: view, subview: @loading_view}, {super_view: @loading_view, subview: base_view}, {super_view: @loading_view, subview: @indicator}].each do |hash|
+  class LoadingView < UIView
+    def initWithFrame(frame)
+      if super
+        self.hidden = true
+        base_view = Base.style(UIView.new, backgroundColor: :black.uicolor, alpha: 0.5)
+
+        @indicator = UIActivityIndicatorView.large
+        [{super_view: self, subview: base_view}, {super_view: self, subview: @indicator}].each do |hash|
+          CommonUIUtility.add_full_subview(hash[:super_view], hash[:subview])
+        end
+        @label = Base.style(UILabel.new,
+                            frame: self.bounds,
+                            font: lambda {UIFont.systemFontOfSize(22)},
+                            textAlignment: :center.uialignment,
+                            backgroundColor: :clear.uicolor,
+                            textColor: :white.uicolor)
+        @label.sizeToFit
         Motion::Layout.new do |l|
-          l.view hash[:super_view]
-          l.subviews 'subview' => hash[:subview]
-          l.vertical '|[subview]|'
-          l.horizontal '|[subview]|'
+          l.view self
+          l.subviews 'label' => @label
+          l.vertical '[label]-290-|'
+          l.horizontal '|-20-[label]-20-|'
         end
       end
-      @label = Base.style(UILabel.new,
-                          frame: view.bounds,
-                          font: lambda {UIFont.systemFontOfSize(22)},
-                          textAlignment: :center.uialignment,
-                          backgroundColor: :clear.uicolor,
-                          textColor: :white.uicolor)
-      @label.sizeToFit
-      Motion::Layout.new do |l|
-        l.view @loading_view
-        l.subviews 'label' => @label
-        l.vertical '[label]-290-|'
-        l.horizontal '|-20-[label]-20-|'
-      end
+      self
+    end
+
+    def self.add_loading_view_to(view)
+      loading_view = LoadingView.alloc.initWithFrame(view.bounds)
+      CommonUIUtility.add_full_subview(view, loading_view)
+      loading_view
     end
 
     def start_loading(text='')
       @label.text = text
-      self.view.endEditing(true)
-      @loading_view.hidden = false
+      self.hidden = false
       @indicator.startAnimating
     end
 
     def stop_loading
-      @loading_view.hidden = true
+      self.hidden = true
       @indicator.stopAnimating
     end
   end
+
+  module LoadingIndicator
+    def add_loading_indicator_to(view)
+      @loading_view = LoadingView.add_loading_view_to(view)
+    end
+
+    def start_loading(text='')
+      self.view.endEditing(true)
+      @loading_view.start_loading(text)
+    end
+
+    def stop_loading
+      @loading_view.stop_loading
+    end
+  end
 end

data/lib/tgios/photo_scroll_view.rb

@@ -1,17 +1,31 @@
 module Tgios
   class PhotoScrollView < UIScrollView
+    attr_accessor :image
     MAX_SCALE = 4.0
 
+    def init
+      if super
+        self.showsVerticalScrollIndicator = false
+        self.showsHorizontalScrollIndicator = false
+        self.bouncesZoom = true
+        self.decelerationRate = UIScrollViewDecelerationRateFast
+        self.delegate = self
+        self.backgroundColor = :clear.uicolor
+      end
+      self
+    end
+
     def initWithFrame(frame, image: image)
-      initWithFrame(frame)
-      ap "init #{self.class.name}"
-      self.showsVerticalScrollIndicator = false
-      self.showsHorizontalScrollIndicator = false
-      self.bouncesZoom = true
-      self.decelerationRate = UIScrollViewDecelerationRateFast
-      self.delegate = self
-      self.backgroundColor = :clear.uicolor
+      init
+      self.frame = frame
+      self.image = image
 
+      self
+    end
+
+    def image=(image)
+      super
+      frame = self.frame
       page_rect = CGRectMake(0, 0, image.size.width, image.size.height)
 
       img_scale = frame.size.width / page_rect.size.width
@@ -30,21 +44,21 @@ module Tgios
 
       self.maximumZoomScale = MAX_SCALE / img_scale
       self.minimumZoomScale = fit_scale / img_scale
-
-      self
     end
 
     def layoutSubviews
       super
+      unless @image_view.nil?
+        bsize = self.bounds.size
+        center_frame = @image_view.frame
 
-      bsize = self.bounds.size
-      center_frame = @image_view.frame
+        center_frame.origin.x = center_frame.size.width < bsize.width ? (bsize.width - center_frame.size.width) / 2.0 : 0
+        center_frame.origin.y = center_frame.size.height < bsize.height ? (bsize.height - center_frame.size.height) / 2.0 : 0
 
-      center_frame.origin.x = center_frame.size.width < bsize.width ? (bsize.width - center_frame.size.width) / 2.0 : 0
-      center_frame.origin.y = center_frame.size.height < bsize.height ? (bsize.height - center_frame.size.height) / 2.0 : 0
+        @image_view.frame = center_frame
+        @image_view.contentScaleFactor = 1.0
 
-      @image_view.frame = center_frame
-      @image_view.contentScaleFactor = 1.0
+      end
 
     end
 

data/lib/tgios/version.rb

@@ -1,3 +1,3 @@
 module Tgios
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

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