bluepotion 0.1.6 → 0.1.7

data/lib/project/pro_motion/adapters/pm_cursor_adapter.rb

@@ -6,47 +6,23 @@ class PMCursorAdapter < PMBaseAdapter
     super()
     @cursor = opts.fetch(:cursor)
     @cell_options = opts.fetch(:cell, 1)
+    @cell_options[:cursor] = @cursor # slip the cursor inside so callbacks have it
   end
 
   def count
     cursor.count
   end
 
-  def item(position)
+  def item_data(position)
     cursor.moveToPosition(position)
-    cursor
+    cell_options # return the one & only one cell_options
   end
 
-  def view(position, convert_view, parent)
-    data = item(position)
-    out = convert_view || rmq.create!(cell_options[:cell_class] || Potion::TextView)
-    update_view(out, data)
-    if cell_options[:action]
-      find(out).on(:tap) do
-        find.screen.send(cell_options[:action], item(position), position)
-      end
-    end
-    out
+  # slighty different arguments to send when tapping
+  def action_arguments(data, position)
+    item_data(position) # move the cursor into position
+    @cursor
   end
 
-  def update_view(out, data)
-    if cell_options[:update].is_a?(Proc)
-      cell_options[:update].call(out, data)
-    elsif cell_options[:update].is_a?(Symbol) || cell_options[:update].is_a?(String)
-      find.screen.send(cell_options[:update], out, data)
-    else
-      out.text = data.getString(cell_options[:title_column].to_i)
-    end
-  end
-
-end
-
-__END__
-
-def table_data
-  {
-    cursor: my_cursor,
-    title_column: 0,
-  }
 end
 

data/lib/project/pro_motion/fragments/pm_list_screen.rb

@@ -12,15 +12,9 @@
     end
 
     def load_view
-      # Potion::LinearLayout.new(self.activity)
-      self.view = create!(Potion::ListView, :list)
-      # find(self.view).style do |st|
-        # st.layout_width = :match_parent
-        # st.layout_height = :match_parent
-        # st.layout_weight = 1
-        # st.view.drawSelectorOnTop = false
-      # end
-      # self.view
+      v = Potion::View.new(app.context) # TODO, fix this horrible hack
+      lv = rmq(v).create(Potion::ListView).tag(:list)
+      self.view = lv.get
     end
 
     def screen_setup
@@ -55,7 +49,8 @@
       @adapter ||= begin
         td = table_data
         if td.is_a?(Array)
-          PMBaseAdapter.new(data: td)
+          cells = td.first[:cells]
+          PMBaseAdapter.new(data: cells)
         elsif td.is_a?(Hash)
           mp "Please supply a cursor in #{self.inspect}#table_data." unless td[:cursor]
           PMCursorAdapter.new(td)
@@ -64,6 +59,13 @@
     end
 
     def update_table_data
+      # base adapters must reacquire their data from the PMListScreen "delegate"
+      if adapter.instance_of?(PMCursorAdapter)
+        # TODO:  Reload for PMCursorAdapter
+      elsif adapter.is_a?(PMBaseAdapter)
+        td = table_data
+        adapter.data = td && td.first && td.first[:cells]
+      end
       adapter.notifyDataSetChanged
     end
 
@@ -86,8 +88,9 @@
         @view = inflater.inflate(r(:layout, @xml_resource), parent, false)
       else
         v = load_view
+        mp v
         @view ||= v
-        @view.setId Potion::ViewIdGenerator.generate
+        @view.id = Potion::ViewIdGenerator.generate
       end
 
       set_up_action_bar(self.class.action_bar_options)

data/lib/project/pro_motion/fragments/pm_screen.rb

@@ -17,8 +17,11 @@
     def on_create(bundle); end
 
     def onCreateView(inflater, parent, saved_instance_state)
+      mp "PMScreen onCreateView #{self.class}" if RMQ.debugging?
       super
 
+      self.cleanup
+
       if @xml_resource = self.class.xml_resource
         @view = inflater.inflate(r(:layout, @xml_resource), parent, false)
       else

data/lib/project/pro_motion/fragments/pm_screen_module.rb

@@ -55,6 +55,25 @@
       @_rmq_data ||= RMQScreenData.new
     end
 
+    def dummy_workaround_for_kind_of
+    end
+
+    def onDestroy
+      #return super # disable rmq cleaning while debugging, but still super
+      mp "onDestroy screen: #{self.class}", debugging_only: true
+      self.cleanup
+      super
+    end
+
+    def cleanup
+      find.all.cleanup
+      find.children.remove
+      if @_rmq_data
+        @_rmq_data.cleanup
+        @_rmq_data = nil
+      end
+    end
+
     def stylesheet
       self.rmq.stylesheet
     end
@@ -63,6 +82,16 @@
       self.rmq.stylesheet = value
     end
 
+    def find(*working_selectors) # I do not call rmq below for performance reasons
+      crmq = (rmq_data.cached_rmq ||= RMQ.create_with_selectors([], self))
+
+      if working_selectors.length == 0
+        crmq
+      else
+        RMQ.create_with_selectors(working_selectors, self, crmq)
+      end
+    end
+
     def rmq(*working_selectors)
       crmq = (rmq_data.cached_rmq ||= RMQ.create_with_selectors([], self))
 
@@ -117,13 +146,17 @@
       self.rmq.build(view_or_class, style, opts).get
     end
 
-    # temporary stand-in for Java's R class
+    def log_tree
+      rmq.log_tree
+    end
+
+    # temporary stand-in for Java's R class, TODO remove this
     def r(resource_type, resource_name)
       resources.getIdentifier(resource_name.to_s, resource_type.to_s,
                               activity.getApplicationInfo.packageName)
     end
 
-    def show_toast(message)
+    def show_toast(message) # TODO, remove this, use app.toast
       Android::Widget::Toast.makeText(activity, message, Android::Widget::Toast::LENGTH_SHORT).show
     end
 
@@ -213,6 +246,12 @@
       input_manager.hideSoftInputFromWindow(view.getWindowToken(), 0)
     end
 
+    def show_keyboard
+      field = activity.getCurrentFocus()
+      input_manager = activity.getSystemService(Android::Content::Context::INPUT_METHOD_SERVICE)
+      input_manager.showSoftInput(field, Android::View::InputMethod::InputMethodManager::SHOW_FORCED)
+    end
+
     def action_bar
       activity && activity.getActionBar
     end

data/lib/project/pro_motion/pm_application.rb

@@ -29,6 +29,10 @@
       context.getPackageManager
     end
 
+    def content_resolver
+      context.contentResolver
+    end
+
     def name
       application_info.loadLabel(package_manager)
     end
@@ -115,6 +119,65 @@
       AlertDialog.new(options, &block)
     end
 
+    # Send user to native Texting
+    # app.sms("555-555-5555")
+    def sms(phone_number)
+      mp "[BP Deprecated] use app.launch(sms: #{phone_number}) over app.sms"
+      launch(sms: phone_number)
+    end
+
+    # Launch native services via intent
+    # app.launch(sms: '5045558008')
+    # app.launch(tel: '5045558008')
+    # app.launch(web: 'http://giphy.com')
+    # app.launch(email: 'your@mom.com')
+    # app.launch(email: 'your@mom.com', subject: "Hey Chica", message: "Howdy")
+    # app.launch(chooser: 'I hope you have a nice day!')
+    def launch(command={})
+      action_view = "android.intent.action.VIEW"
+      action_send = "android.intent.action.SEND"
+      action_dial = "android.intent.action.DIAL"
+      key_list = command.keys
+      launch_intent = case
+      when key_list.include?(:sms)
+        sms_intent = Android::Content::Intent.new(action_view)
+        sms_intent.setData(Android::Net::Uri.fromParts("sms", command[:sms].to_s, nil))
+      when key_list.include?(:email)
+        email_intent = Android::Content::Intent.new(action_view)
+        email_string = "mailto:#{command[:email]}"
+        email_string += "?subject=#{command[:subject].to_s}"
+        email_string += "&body=#{command[:message].to_s}"
+        email_intent.setData(Android::Net::Uri.parse(email_string))
+      when key_list.include?(:web)
+        web_intent = Android::Content::Intent.new(action_view)
+        web_intent.setData(Android::Net::Uri.parse(command[:web]))
+      when key_list.include?(:tel)
+        tel_intent = Android::Content::Intent.new(action_dial)
+        tel_intent.setData(Android::Net::Uri.fromParts("tel", command[:tel], nil))
+      when key_list.include?(:chooser)
+        message_intent = Android::Content::Intent.new(action_send)
+        message_intent.type = "text/plain"
+        message_intent.putExtra("android.intent.extra.TEXT", command[:chooser].to_s) if command[:chooser]
+        Android::Content::Intent.createChooser(message_intent, nil)
+      else
+        mp "[BP Warning] Launch type unknown - '#{command.keys.inspect}'"
+        nil
+      end
+
+      find.activity.startActivity(launch_intent) if launch_intent
+    end
+
+    # Execute the given block after the given number of seconds
+    #
+    # @example
+    # app.after(10) do
+    #   p "This will print in 10 seconds"
+    # end
+    #
+    def after(delay, &block)
+      DelayedExecution.after(delay, &block)
+    end
+
     class << self
       attr_accessor :current_application, :home_screen_class
 

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

@@ -40,6 +40,16 @@ class RMQ
     self
   end
 
+  def cleanup
+    selected.each { |view| view.cleanup }
+    self
+  end
+
+  def clear_cache
+    selected.each { |view| view.rmq_data.clear_query_cache }
+    self
+  end
+
   #def toggle
     #selected.each { |view| view.hidden = !view.hidden? }
     #self

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

@@ -1,8 +1,18 @@
 class RMQ
   def initialize
     @selected_dirty = true
+    $rmq_initialized ||= 0
+    $rmq_initialized += 1
+    #mp $rmq_initialized
   end
 
+  #def finalize
+    #mp 'finalize' # Never called
+    #$rmq_initialized -= 1
+    #mp $rmq_initialized
+    #super
+  #end
+
   def originated_from=(value)
     if value
       if value.is_a?(Potion::Activity)
@@ -15,8 +25,9 @@ class RMQ
       elsif value.is_a?(RMQStylesheet)
         @originated_from = value.controller
       else
+        @originated_from = nil
         #debug.log_detailed('Invalid originated_from', objects: {value: value})
-        mp "Invalid originated_from: #{value.inspect}"
+        #mp "Invalid originated_from: #{value.inspect}"
       end
     else
       @originated_from = nil
@@ -44,9 +55,15 @@ class RMQ
   def originated_from_or_its_view
     if @originated_from.is_a?(Potion::Activity) || @originated_from.is_a?(PMScreen)
       @originated_from.root_view
-    else
+    elsif @originated_from.is_a?(Potion::View)
       @originated_from
     end
+
+    #if @originated_from.is_a?(Potion::Activity) || @originated_from.is_a?(PMScreen)
+      #@originated_from.root_view
+    #else
+      #@originated_from
+    #end
   end
 
   def get
@@ -82,16 +99,17 @@ class RMQ
     end
 
     wide = (opt == :wide)
-    out =  "\n id          |scr| class                 | style_name              | frame                                 |"
+    out =  "\n id          |object id   |scr| class                 | style_name              | frame                                 |"
     out << "\n" unless wide
-    out <<   " sv id       |een| superview             | subviews count          | tags                                  |"
-    line =   " ––––––––––––|–––|–––––––––––––––––––––––|–––––––––––––––––––––––––|–––––––––––––––––––––––––––––––––––––––|\n"
+    out <<   " sv id       |object id   |een| superview             | subviews count          | tags                                  |"
+    line =   " ––––––––––––|------------|–––|–––––––––––––––––––––––|–––––––––––––––––––––––––|–––––––––––––––––––––––––––––––––––––––|\n"
     out << "\n"
     out << line.chop if wide
     out << line
 
     selected.each do |view|
       out << " #{view.id.to_s.ljust(12)}|"
+      out << " #{view.object_id.to_s.ljust(12)}|"
       out << (view.rmq_data.screen_root_view? ? " √ |" : "   |")
 
       name = view.short_class_name
@@ -111,9 +129,12 @@ class RMQ
       out << s.ljust(36)
       out << "   |"
       out << "\n" unless wide
-      out << " #{view.superview.id.to_s.ljust(12)}|"
-      out << "   |"
-      out << " #{(view.superview ? view.superview.short_class_name : '')[0..21].ljust(22)}|"
+      if view.superview
+        out << " #{view.superview.id.to_s.ljust(12)}|"
+        out << "           |"
+        out << "   |"
+        out << " #{(view.superview ? view.superview.short_class_name : '')[0..21].ljust(22)}|"
+      end
       out << " #{view.subviews.length.to_s.ljust(23)} |"
       #out << "  #{view.subviews.length.to_s.rjust(8)} #{view.superview.short_class_name.ljust(20)} #{view.superview.object_id.to_s.rjust(10)}"
       out << " #{view.rmq_data.tag_names.join(',').ljust(38)}|"
@@ -132,22 +153,33 @@ class RMQ
   def tree_to_s(selected_views, depth = 0)
     out = ""
 
+    mp 1
+
     selected_views.each do |view|
+      mp 2
+      mp view.rmq_data.tags
       if depth == 0
         out << "\n"
       else
+        mp 3
         0.upto(depth - 1) do |i|
+          mp 4
           out << (i == (depth - 1) ? "    ├" : "    │")
         end
       end
 
       out << '───'
 
-      out << "#{view.id} "
+      mp 5
+      out << "#{view.id}|#{view.object_id} "
       out << "SCREEN ROOT/" if view.rmq_data.screen_root_view?
       out << "#{view.short_class_name[0..21]}"
       out << "  ( :#{view.rmq_data.style_name.to_s[0..23]} )" if view.rmq_data.style_name
-      out << "  [ #{view.rmq_data.tag_names.join(',')} ]" if view.rmq_data.tag_names.length > 0
+      if view.rmq_data.tag_names.length > 0
+        mp 6
+        mp view.rmq_data.tag_names.inspect
+        out << "  [ #{view.rmq_data.tag_names.join(',')} ]"
+      end
 
       #if view.origin
         #format = '#0.#'
@@ -182,16 +214,21 @@ class RMQ
       @_selected = []
 
       if RMQ.is_blank?(self.selectors)
-        @_selected << originated_from_or_its_view
+        if orig = originated_from_or_its_view
+          @_selected << orig
+        end
       #elsif self.selectors.length == 1 and self.selectors.first.is_a?(Java::Lang::Integer)
         ### Special case where we find by id
         #@_selected << self.root_view.findViewById(self.selectors.first)
       else
         working_selectors = self.selectors.dup
+
         extract_views_from_selectors(@_selected, working_selectors)
 
         unless RMQ.is_blank?(working_selectors)
           subviews = all_subviews_for(root_view)
+
+          #return @_selected
           subviews.each do |subview|
             @_selected << subview if match(subview, working_selectors)
           end
@@ -199,6 +236,13 @@ class RMQ
 
       end
 
+      #@_selected.each do |s|
+        #unless s.is_a?(Potion::View)
+          #mp "bad selected: #{s}"
+          #caller
+        #end
+      #end
+
       @selected_dirty = false
     else
       @_selected ||= []
@@ -220,27 +264,37 @@ class RMQ
 
   def all_subviews_for(view)
     out = []
+    return out unless view.is_a?(Potion::ViewGroup)
 
-    view.subviews.each do |subview|
-      out << subview
-      out << all_subviews_for(subview)
-    end
-    out.flatten!
-    out
-  end
-
-  def all_superviews_for(view, out = [])
-    if (sv = view.superview)
-      out << sv
+    needs_flattening = false
 
-      # Stop at root_view of screen or activity
-      unless (sv.rmq_data.screen_root_view?) || (sv == self.activity.root_view) # TODO speed this up if needed
-        all_superviews_for(sv, out)
+    (0...view.getChildCount).each_with_index do |i|
+      sbv = view.getChildAt(i)
+      if sbv && view != sbv
+        out << sbv
+        if sbv.is_a?(Potion::ViewGroup) && sbv.getChildCount > 0
+          needs_flattening = true
+          out << all_subviews_for(sbv)
+        end
       end
     end
+
+    out.flatten! if needs_flattening
     out
   end
 
+  #def all_superviews_for(view, out = [])
+    #if (sv = view.superview)
+      #out << sv
+
+      ## Stop at root_view of screen or activity
+      #unless (sv.rmq_data.screen_root_view?) || (sv == self.activity.root_view) # TODO speed this up if needed
+        #all_superviews_for(sv, out)
+      #end
+    #end
+    #out
+  #end
+
 end # RMQ
 
 __END__