bluepotion 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d63573b24ac2969163f7eb92fcb46e368dda0e9f
-  data.tar.gz: 7dd7129bd3785eb9a27166f6cff5ecba0dc8b6eb
+  metadata.gz: 6dd3f2d3afeb74ed27d0462acbc47b6a15690f45
+  data.tar.gz: 8a045fc0e5135d3b915baf52e96b65cd1d617763
 SHA512:
-  metadata.gz: 9e61f1e779c465eb103cc4747af76d263ecd2c3e19b7886a30fd4bd9002f7be6f2c9186b1459f6640c22d5c4f4811c1faaa6fe26a994345e1547e08e80b3b317
-  data.tar.gz: 057cb3c8acda52faf7a9604cffb398345d5abd22570b4977998f641c8cb579980d88f90bb9b89630828f18a9c8c68eb25c4b7f6a4a7cefac16e5fb4f16ffd209
+  metadata.gz: e51238c06e1b09622ff5f2d62c909f2ecc2bb3e9015fd8a600cbbbf655c1d47cde5f295dcdb233511b7c836f5d96da2e2b0eccce4a3184097cfacda19cbd90a6
+  data.tar.gz: 4463dabf7934ab8ab4ec5051fbe121be0ee0f2020ca5fda508d31a2a2e96ff8115605ef109e471fadc72466b8b64f25b5ad39630436368567ea3a94849f52df7

data/lib/project/ext/nil.rb

@@ -0,0 +1,8 @@
+class NilClass
+
+  # REMOVE when RubyMotion adds this
+  def empty?
+    self.to_s.empty?
+  end
+
+end

data/lib/project/ext/object.rb

@@ -46,6 +46,9 @@ class Object
     self.class.name.split('.').last
   end
 
+  def blank?
+    self.respond_to?(:empty?) ? self.empty? : !self
+  end
 
   # RMQ stuff
 

data/lib/project/potion.rb

@@ -3,6 +3,8 @@ module Potion
   View = Android::View::View
   ViewGroup = Android::View::ViewGroup
   Integer = Java::Lang::Integer
+  ArrayList = Java::Util::ArrayList
+  Bundle = Android::Os::Bundle
 
   # layouts
   LinearLayout = Android::Widget::LinearLayout
@@ -21,8 +23,6 @@ module Potion
   # graphics
   Color = Android::Graphics::Color
   Typeface = Android::Graphics::Typeface
-
-  ArrayList = Java::Util::ArrayList
 end
 
 #

data/lib/project/pro_motion/pm_activity.rb

@@ -33,6 +33,11 @@
     def clear_references
     end
 
+    def onCreateOptionsMenu(menu)
+      on_create_menu(menu)
+    end
+    def on_create_menu(_); end
+
   end
 
 #end

data/lib/project/pro_motion/pm_hash_bundle.rb

@@ -0,0 +1,83 @@
+class PMHashBundle
+  KEYS_KEY = "pm_hash_bundle_hash_keys"
+  VALUE_TYPES_KEY = "pm_hash_bundle_value_types"
+
+  def initialize(bundle, hash)
+    @bundle = bundle
+    @hash = hash
+  end
+
+  def to_bundle
+    @bundle
+  end
+
+  def to_h
+    @hash
+  end
+
+  class << self
+
+    def from_bundle(bundle)
+      #hash_keys = fragment_arguments.getStringArrayList("hash_keys")
+      h = {}
+
+      keys = bundle.getStringArrayList(PMHashBundle::KEYS_KEY)
+      value_types = bundle.getStringArrayList(PMHashBundle::VALUE_TYPES_KEY)
+
+      keys.each_with_index do |key, i|
+        value_type = value_types[i]
+
+        value = case value_type
+        when "com.rubymotion.String"
+          bundle.getString(key)
+        when "java.lang.Integer"
+          bundle.getInt(key)
+        when "java.lang.Double"
+          bundle.getFloat(key)
+        when "java.util.ArrayList"
+          bundle.getStringArrayList(key)
+          # TODO, do more types
+        else
+          raise "[BluePotion ERROR] In PMHashBundle#from_hash: invalid type for: #{key}"
+        end
+
+        h[key.to_sym] = value
+      end
+
+      PMHashBundle.new(bundle, h)
+    end
+
+    def from_hash(h)
+      bundle = Potion::Bundle.new
+      keys = h.keys.map(&:to_s)
+      values = h.values
+      value_types = h.values.map do |value|
+        value.class.name
+      end
+      bundle.putStringArrayList(PMHashBundle::KEYS_KEY, keys)
+      bundle.putStringArrayList(PMHashBundle::VALUE_TYPES_KEY, value_types)
+
+      keys.each_with_index do |key, i|
+        value_type = value_types[i]
+        value = values[i]
+
+        case value_type
+        when "com.rubymotion.String"
+          bundle.putString(key, value)
+        when "java.lang.Integer"
+          bundle.putInt(key, value)
+        when "java.lang.Double"
+          bundle.putFloat(key, value)
+        when "java.util.ArrayList"
+          value = value.map{|o| o.to_s}
+          bundle.putStringArrayList(key, value)
+        # TODO, do more types
+        else
+          raise "[BluePotion ERROR] In PMHashBundle#from_hash: invalid type for: #{key}"
+        end
+      end
+
+      PMHashBundle.new(bundle, h)
+    end
+  end
+end

data/lib/project/pro_motion/pm_screen.rb

@@ -6,6 +6,12 @@
 
     attr_accessor :view
 
+    def onAttach(activity); super; on_attach(activity); end
+    def on_attach(activity); end
+
+    def onCreate(bundle); super; on_create(bundle); end
+    def on_create(bundle); end
+
     def onCreateView(inflater, parent, saved_instance_state)
       super
 
@@ -18,8 +24,11 @@
 
       action_bar.hide if hide_action_bar?
 
+      on_create_view(inflater, parent, saved_instance_state)
+
       @view
     end
+    def on_create_view(inflater, parent, saved_instance_state); end
 
     def load_view
       Potion::FrameLayout.new(self.activity)
@@ -45,8 +54,34 @@
       self.activity.title = self.class.bars_title
 
       on_load
+      on_activity_created
     end
+    def on_load; end
+    def on_activity_created; end
+
+    def onStart; super; on_start; end
+    def on_start; end
+    alias :on_appear :on_start
+
+    def onResume; super; on_resume; end
+    def on_resume; end
+
+    def on_create_menu(menu); end
+
+    def onPause; super; on_pause; end
+    def on_pause; end
+
+    def onStop; super; on_stop; end
+    def on_stop; end
+
+    def onDestroyView; super; on_destroy_view; end
+    def on_destroy_view; end
+
+    def onDestroy; super; on_destroy; end
+    def on_destroy; end
 
+    def onDetach; super; on_detach; end
+    def on_detach; end
 
     private
 

data/lib/project/pro_motion/pm_screen_module.rb

@@ -18,13 +18,16 @@
         @rmq_style_sheet_class
       end
 
-      def uses_xml(xml_resource=nil)
+      def xml_layout(xml_resource=nil)
         @xml_resource = xml_resource ||= deduce_resource_id
       end
+      alias_method :uses_xml, :xml_layout
 
-      def uses_action_bar(show_action_bar)
+      def action_bar(show_action_bar)
         @show_action_bar = show_action_bar
       end
+      alias_method :nav_bar, :action_bar
+      alias_method :uses_action_bar, :action_bar
 
       def title(new_title)
         @bars_title = new_title
@@ -105,7 +108,7 @@
 
     def open(screen_class, options={})
       mp "ScreenModule open", debugging_only: true
-      activity_class = options[:activity] || PMSingleFragmentActivity
+      activity_class = options.delete(:activity) || PMSingleFragmentActivity
 
       # TODO: replace the fragment in the activity when possible
       # replace the fragment if we can; otherwise launch a new activity
@@ -115,16 +118,26 @@
       intent = Android::Content::Intent.new(self.activity, activity_class)
       intent.putExtra PMSingleFragmentActivity::EXTRA_FRAGMENT_CLASS, screen_class.to_s
 
-      ## TODO: limited support for extras for now - should reimplement with fragment arguments
-      if options[:extras]
-        options[:extras].keys.each do |key|
-          intent.putExtra key.to_s, options[:extras][key].toString
+      if extras = options.delete(:extras)
+        extras.keys.each do |key, value|
+          # TODO, cahnge to bundle and do like below
+          intent.putExtra key.to_s, value.toString
         end
       end
 
+      unless options.blank?
+        # The rest of the options are screen accessors, we use fragment arguments for this
+        hash_bundle = PMHashBundle.from_hash(options)
+        intent.putExtra PMSingleFragmentActivity::EXTRA_FRAGMENT_ARGUMENTS, hash_bundle.to_bundle
+      end
+
       self.activity.startActivity intent
     end
 
+    def close(options={})
+      self.activity.finish
+    end
+
     def start_activity(activity_class)
       intent = Android::Content::Intent.new(self.activity, activity_class)
       #intent.putExtra("key", value); # Optional parameters
@@ -154,5 +167,31 @@
       activity.getActionBar()
     end
 
+    def menu
+      activity.menu
+    end
+
+    # Example: add_action_bar_button(title: "My text", show: :if_room)
+    def add_action_bar_button(options={})
+      unless menu
+        mp "#{self.inspect}#add_action_bar_button: No menu set up yet."
+        return
+      end
+
+      options[:show] ||= :always
+
+      # Should be something like Android::MenuItem::SHOW_AS_ACTION_IF_ROOM
+      show_as_action = 0 if options[:show] == :never
+      show_as_action = 1 if options[:show] == :if_room
+      show_as_action = 2 if options[:show] == :always
+      show_as_action = 4 if options[:show] == :with_text
+      show_as_action = 8 if options[:show] == :collapse
+
+      btn = self.activity.menu.add(options.fetch(:group, 0), options.fetch(:item_id, 0), options.fetch(:order, 0), options.fetch(:title, "Untitled"))
+      btn.setShowAsAction(show_as_action) if show_as_action
+      btn.setIcon(options[:icon]) if options[:icon]
+      btn
+    end
+
   end
 #end

data/lib/project/pro_motion/pm_single_fragment_activity.rb

@@ -2,9 +2,10 @@
 # RM-733
 #module ProMotion
   class PMSingleFragmentActivity < PMActivity
-    attr_accessor :fragment_container, :fragment
+    attr_accessor :fragment_container, :fragment, :menu
 
     EXTRA_FRAGMENT_CLASS = "fragment_class"
+    EXTRA_FRAGMENT_ARGUMENTS = "fragment_arguments"
 
     def on_create(saved_instance_state)
       super
@@ -16,8 +17,18 @@
       self.contentView = @fragment_container
 
       if (fragment_class = intent.getStringExtra(EXTRA_FRAGMENT_CLASS))
-        # TODO weird way to create this intance, look at this later
-        set_fragment Kernel.const_get(fragment_class.to_s).new
+        if fragment_instance = Kernel.const_get(fragment_class.to_s).new
+          set_fragment fragment_instance
+
+          # Grab the fragment arguments and call them on the class
+          if fragment_arguments = intent.getBundleExtra(EXTRA_FRAGMENT_ARGUMENTS)
+            fragment_arguments = PMHashBundle.from_bundle(fragment_arguments).to_h
+
+            fragment_arguments.each do |key, value|
+              fragment_instance.send "#{key}=", value
+            end
+          end
+        end
       end
     end
 
@@ -27,5 +38,10 @@
       fragmentManager.beginTransaction.add(@fragment_container.getId, fragment, fragment.class.to_s).commit
     end
 
+    def on_create_menu(menu)
+      @menu = menu
+      self.fragment.on_create_menu(menu) if self.fragment
+    end
+
   end
 #end

data/lib/project/ruby_motion_query/rmq/enumerablish.rb

@@ -2,13 +2,17 @@ class RMQ
   # I'm purposly not including Enumerable,
   # please use to_a if you want one
 
-
   # @return [RMQ]
   def <<(value)
     selected << value if value.is_a?(UIView)
     self
   end
 
+  def empty?
+    selected.length == 0
+  end
+  alias :is_blank? :empty?
+
   # @return [RMQ]
   #
   # @example

data/lib/project/ruby_motion_query/rmq/event_wrappers/rmq_click.rb

@@ -0,0 +1,23 @@
+class RMQClickBase
+  attr_accessor :click_block
+
+  def initialize(&block)
+    @click_block = block
+  end
+end
+
+class RMQClick < RMQClickBase
+
+  def onClick(view)
+    click_block.call(view)
+  end
+
+end
+
+class RMQItemClick < RMQClickBase
+
+  def onItemClick(parent, view, position, id)
+    click_block.call(parent, view, position, id)
+  end
+
+end

data/lib/project/ruby_motion_query/rmq/event_wrappers/rmq_seek_change.rb

@@ -0,0 +1,23 @@
+class RMQSeekChange
+  attr_accessor :change_block
+
+  def initialize(action=:change, &block)
+    @action = action
+    # Empty hash from RMQ Events means we keep our default
+    @action = :change if @action == {}
+    @change_block = block
+  end
+
+  def onStopTrackingTouch(seek_bar)
+    @change_block.call(seek_bar) if @action == :stop
+  end
+
+  def onStartTrackingTouch(seek_bar)
+    @change_block.call(seek_bar) if @action == :start
+  end
+
+  def onProgressChanged(seek_bar, progress, from_user)
+    @change_block.call(seek_bar, progress, from_user) if @action == :change
+  end
+
+end

data/lib/project/ruby_motion_query/rmq/event_wrappers/rmq_text_change.rb

@@ -0,0 +1,24 @@
+# http://developer.android.com/reference/android/text/TextWatcher.html
+# there seems to be a bug with this particular interface - subclassing this class works around it
+# http://community.rubymotion.com/t/how-to-use-textwatcher-to-listen-to-changes-of-an-edittext/522
+class RMQTextChange < Android::Telephony::PhoneNumberFormattingTextWatcher
+  attr_accessor :change_block
+
+  def initialize(action=:after, &block)
+    @action = action
+    @change_block = block
+  end
+
+  def onTextChanged(s, start, before, count)
+    @change_block.call(s, start, before, count) if @action == :on
+  end
+
+  def beforeTextChanged(s, start, count, after)
+    @change_block.call(s, start, count, after) if @action == :before
+  end
+
+  def afterTextChanged(s)
+    @change_block.call(s) if @action == :after
+  end
+
+end

data/lib/project/ruby_motion_query/rmq/events.rb

@@ -1,28 +1,41 @@
 class RMQ
   def on(event, args={}, &block)
     self.selected.each do |view|
-
       case event
       when :click, :tap, :touch
-        view.onClickListener = RMQClickHandler.new(&block)
+        handle_click(view, &block)
+      when :change
+        handle_change(view, &block)
       else
         raise "[RMQ ERROR] Unrecognized event: #{event}"
       end
-
     end
 
   end
-end
 
-class RMQClickHandler
-  attr_accessor :click_block
+  private
 
-  def initialize(&block)
-    @click_block = block
+  def handle_click(view, &block)
+    # Click event for ListItems
+    if view.respond_to? :setOnItemClickListener
+      view.onItemClickListener = RMQItemClick.new(&block)
+    # Generic Click
+    else
+      view.onClickListener = RMQClick.new(&block)
+    end
   end
 
-  def onClick(view)
-    click_block.call(view)
+  def handle_change(view, &block)
+    # Seek bar change
+    if view.respond_to? :setOnSeekBarChangeListener
+      view.onSeekBarChangeListener = RMQSeekChange.new(args, &block)
+    # Text change
+    elsif view.respond_to? :addTextChangeListener
+      view.addTextChangedListener(RMQTextChange.new(&block))
+    end
   end
 
 end
+
+
+

data/lib/project/ruby_motion_query/stylers/rmq_image_view_styler.rb

@@ -4,6 +4,7 @@ class RMQImageViewStyler < RMQViewStyler
     @view.imageResource = resource_id
   end
   alias_method :image=, :image_resource=
+  alias_method :src=, :image_resource=
 
   def adjust_view_bounds=(adjust_view_bounds)
     @view.adjustViewBounds = adjust_view_bounds

data/lib/project/ruby_motion_query/stylers/rmq_linear_layout_styler.rb

@@ -21,9 +21,9 @@ class RMQLinearLayoutStyler < RMQViewStyler
   def convert_orientation(orientation)
     case orientation
     when :horizontal
-      Android::Widget::LinearLayout::HORIZONTAL
+      Potion::LinearLayout::HORIZONTAL
     when :vertical
-      Android::Widget::LinearLayout::VERTICAL
+      Potion::LinearLayout::VERTICAL
     else
       orientation
     end

data/lib/project/version.rb

@@ -1,3 +1,3 @@
 module BluePotion
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bluepotion
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - InfiniteRed
+- ClearSight Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,6 +28,7 @@ dependencies:
 description: BluePotion - Just like RedPotion, but for Android
 email:
 - hello@infinitered.com
+- hello@clearsightstudio.com
 executables:
 - bluepotion
 extensions: []
@@ -38,12 +40,14 @@ files:
 - lib/project/ext/activity.rb
 - lib/project/ext/array_list.rb
 - lib/project/ext/fragment.rb
+- lib/project/ext/nil.rb
 - lib/project/ext/object.rb
 - lib/project/ext/string.rb
 - lib/project/ext/view.rb
 - lib/project/potion.rb
 - lib/project/pro_motion/pm_activity.rb
 - lib/project/pro_motion/pm_application.rb
+- lib/project/pro_motion/pm_hash_bundle.rb
 - lib/project/pro_motion/pm_home_activity.rb
 - lib/project/pro_motion/pm_screen.rb
 - lib/project/pro_motion/pm_screen_module.rb
@@ -53,6 +57,9 @@ files:
 - lib/project/ruby_motion_query/rmq/data.rb
 - lib/project/ruby_motion_query/rmq/debug.rb
 - lib/project/ruby_motion_query/rmq/enumerablish.rb
+- lib/project/ruby_motion_query/rmq/event_wrappers/rmq_click.rb
+- lib/project/ruby_motion_query/rmq/event_wrappers/rmq_seek_change.rb
+- lib/project/ruby_motion_query/rmq/event_wrappers/rmq_text_change.rb
 - lib/project/ruby_motion_query/rmq/events.rb
 - lib/project/ruby_motion_query/rmq/factory.rb
 - lib/project/ruby_motion_query/rmq/position.rb