droiuby 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e29da43679c8c5f4829be9fb804d930d4190b4e1
-  data.tar.gz: dce9cf4cd19f1076ab129b4c49657f84cdac18da
+  metadata.gz: d80b4b3f1f57823a9abc631a671014c10bd0c348
+  data.tar.gz: 90e65885732363c9438f60afd4ab7df3e52bef63
 SHA512:
-  metadata.gz: faf1ae4a98f43b89e89e170b92047cabe49f17549b9f26feb3f69f353af097e4114397a25f1fd5a736d5afea8d7a17ea1f3e2afa3bbd85cf47d2b14cd510b650
-  data.tar.gz: f0dd17e82be52f37edb4c945553c37f6ef4c75f549a9adc8ecbf0c5dd6a8a93907cdb24eba102f47a43e483c0db2c533abd4cf60968ce3ef09034b7f4601aba8
+  metadata.gz: 16365865f6071727185220870931377b1bfbfb3dfd845525527e0c72ae285c5c3bdf57be21975a2cfbcf1632e374a2cd00b460267b6973a2d4508023ea2c002c
+  data.tar.gz: 26e4a4f39e90ffd7bf3fab19fa22df52cb176c92b136f69a8186aab4313defe71bdffe311dae0438bcd6eb0d1850f7204dcaecfc3862de1b7bd5d3f0e20e0aa3

data/lib/droiuby/wrappers/{canvas.rb → canvas_wrapper.rb}

@@ -6,21 +6,21 @@ class Rect
     else
       @native = rect
     end
-    
+
   end
-  
+
   def native
     @native
   end
-  
+
   def height
     @native.height
   end
-  
+
   def width
     @native.width
   end
-  
+
   def set(left, top, right, bottom)
     @native.set(left, top, right, bottom)
   end
@@ -34,103 +34,103 @@ class Paint
   def initialize
     @native = Java::android.graphics.Paint.new
   end
-  
+
   def native
     @native
   end
-  
+
   def alpha=(value)
       @native.setAlpha(Java::android.graphics.Color.parseColor(value))
   end
-    
+
   def alpha
     @native.getAlpha
   end
-    
+
   def color=(value)
     if (value.kind_of String)
       value = value.to_color
     end
     @native.setColor(value)
   end
-  
+
   def color
     @native.getColor
   end
-  
+
   def stroke_width=(width)
     @native.setStrokeWidth(width)
   end
-  
+
   def stroke_width
     @native.getStrokeWidth
   end
 end
 
-class Canvas
-  
+class CanvasWrapper
+
   include JavaMethodHelper
   include Droiuby::ViewHelper
-  
+
   java_fast_reader Java::android.graphics.Canvas, :width
   java_fast_reader Java::android.graphics.Canvas, :height
-  
+
   java_native_method Java::android.graphics.Canvas, :drawColor, [Java::int]
   java_native_method Java::android.graphics.Canvas, :drawText, [Java::java.lang.String, Java::float, Java::float, Java::android.graphics.Paint]
   java_native_method Java::android.graphics.Canvas, :drawBitmap, [Java::android.graphics.Bitmap, Java::float, Java::float, Java::android.graphics.Paint]
   java_native_method Java::android.graphics.Canvas, :drawCircle, [Java::float, Java::float, Java::float, Java::android.graphics.Paint]
   java_native_method Java::android.graphics.Canvas, :drawLine, [Java::float, Java::float, Java::float, Java::float, Java::android.graphics.Paint]
   java_native_method Java::android.graphics.Canvas, :drawRoundRect, [Java::android.graphics.RectF, Java::float, Java::float, Java::android.graphics.Paint]
-  
+
   def initialize(native)
     @native = native
     @paint = make_paint
   end
-  
+
   def native
     @native
   end
-  
+
   def make_paint
     Paint.new
   end
-  
+
   def make_rect(left, top, right, bottom)
     Java::android.graphics.RectF.new(left, top, right, bottom)
   end
-  
+
   def paint
     @paint
   end
-  
+
   def paint=(p)
     @paint = p
   end
-  
+
   def draw_color(value)
     if (value.kind_of? String)
       value = value.to_color
     end
-    
+
     java_drawColor(value)
   end
-  
+
   def text(msg, x, y, paint = nil)
     paint = @paint if paint.nil?
-    
+
     java_drawText(msg, x, y, paint.native);
   end
-  
+
   def circle(x, y, size, paint = nil)
     paint = @paint if paint.nil?
     java_drawCircle(x, y, size, paint.native);
   end
-  
+
   def line(x, y, x1, y1, paint = nil)
     paint = @paint if paint.nil?
     java_drawLine(x, y, x1, y1, paint.native);
   end
-  
+
   def bitmap(bitmap, x, y, paint = nil, options = {})
     paint = @paint if paint.nil?
     if bitmap.class == BitmapDrawableWrapper
@@ -139,9 +139,9 @@ class Canvas
 #    native.drawBitmap(bitmap, x.to_f, y.to_f, paint.native)
     java_drawBitmap(bitmap, x.to_f, y.to_f, paint.native)
   end
-  
+
   def round_rect(rect, x, y, paint = nil)
     paint = @paint if paint.nil?
-    java_drawRoundRect(rect, x, y, paint.native) 
-  end  
-end
+    java_drawRoundRect(rect, x, y, paint.native)
+  end
+end

data/lib/droiuby/wrappers/listeners/auto_wrap.rb

@@ -7,14 +7,14 @@ module Droiuby
           Droiuby::Wrappers::ProxyBuilder::InvocationHandler.new("#{package}$#{klass}", self).to_native
         end
       end
-      
+
       class AutoWrap < AutoWrapBase
-        
+
         def initialize(execution_bundle, auto_wrap_block)
           @execution_bundle = execution_bundle
           @auto_wrap_block = auto_wrap_block
         end
-        
+
         def method_missing(meth, *args, &block)
           if meth.to_s =~ /^on(.+)$/
             wrapped_args = args.collect { |a|
@@ -27,21 +27,21 @@ module Droiuby
                   # lookup.
           end
         end
-              
-        
+
+
       end
-      
+
       class AutoWrapMultiple < AutoWrapBase
-        
+
         def initialize(execution_bundle, impl_blocks = {})
           @execution_bundle = execution_bundle
           @auto_wrap_blocks = impl_blocks
         end
-        
+
         def impl(method, &block)
           @auto_wrap_block["on#{meth.to_s.camelize}"] = block
         end
-        
+
         def method_missing(meth, *args, &block)
           if meth.to_s =~ /^on(.+)$/
             wrapped_args = args.collect { |a|
@@ -55,18 +55,31 @@ module Droiuby
           end
         end
       end
-      
+
       def on(event,&block)
         listener_ref = event.to_s.camelize
-        self.native.send(:"setOn#{listener_ref}Listener",_listener("On#{listener_ref}Listener", &block))
+        case event.to_sym
+          when :touch
+            #convert return to boolean
+            wrapped_block = Proc.new { |*args| !!block.call(*args) }
+          else
+            wrapped_block = block
+        end
+        self.native.send(:"setOn#{listener_ref}Listener",_listener("On#{listener_ref}Listener", &wrapped_block))
       end
-      
+
       protected
-      
+
       def _listener(java_class, package = 'android.view.View' , &block)
-        Droiuby::Wrappers::Listeners::AutoWrap.new(_execution_bundle, block).to_native(java_class, package)  
+        puts "using dexmaker auto wrapper"
+        Proc.new { |*args|
+          wrapped_args = args.collect { |a|
+            wrap_native_view(a)
+          }
+          block.call(*wrapped_args)
+        }
       end
-      
+
     end
   end
 end

data/lib/droiuby/wrappers/surface_view_wrapper.rb

@@ -1,36 +1,39 @@
 class SurfaceHolderWrapper
-  
+
   include JavaMethodHelper
-  
+
   java_native_method Java::com.droiuby.client.core.wrappers.SurfaceViewHolderWrapper, :lockCanvas, [], "java_lockCanvasVoid"
   java_native_method Java::com.droiuby.client.core.wrappers.SurfaceViewHolderWrapper, :lockCanvas, [Java::android.graphics.Rect], "java_lockCanvas"
   java_native_method Java::com.droiuby.client.core.wrappers.SurfaceViewHolderWrapper, :unlockCanvasAndPost, [Java::android.graphics.Canvas]
-    
+
   def initialize(surface)
     @native = surface
   end
-  
+
   def native
     @native
   end
-  
+
   def lock(rect = nil, &block)
     if rect.nil?
 #      canvas = Canvas.new(native.lockCanvas)
-      canvas = Canvas.new(java_lockCanvasVoid)
+
+
+      canvas_lock = java_lockCanvasVoid
+      canvas = CanvasWrapper.new(canvas_lock)
     else
 #      canvas = Canvas.new(native.lockCanvas(rect))
-      canvas = Canvas.new(java_lockCanvas(rect.native))
+      canvas = CanvasWrapper.new(java_lockCanvas(rect.native))
     end
     block.call(canvas)
 #    native.unlockCanvasAndPost(canvas.native)
     java_unlockCanvasAndPost(canvas.native)
   end
-  
+
 end
 
 class SurfaceViewWrapper < ViewWrapper
-  
+
   def initialize(view = nil)
     unless view.nil?
       @view = view
@@ -40,7 +43,7 @@ class SurfaceViewWrapper < ViewWrapper
     @builder = Java::com.droiuby.client.core.builder.ViewBuilder.new
     @builder.setContext(_current_activity)
   end
-  
+
   def on(event, &block)
     case(event.to_sym)
         when :surface_created
@@ -53,5 +56,5 @@ class SurfaceViewWrapper < ViewWrapper
           super(event.to_sym, &block)
       end
   end
-    
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
@@ -132,7 +132,7 @@ files:
 - lib/droiuby/wrappers/animation_listener_wrapper.rb
 - lib/droiuby/wrappers/async_wrapper.rb
 - lib/droiuby/wrappers/button_wrapper.rb
-- lib/droiuby/wrappers/canvas.rb
+- lib/droiuby/wrappers/canvas_wrapper.rb
 - lib/droiuby/wrappers/collection/view_array.rb
 - lib/droiuby/wrappers/compound_button_wrapper.rb
 - lib/droiuby/wrappers/edit_text_wrapper.rb