bluepotion 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb0d8c6161c235baac6480838e5e1cabe94c6fa
-  data.tar.gz: b908f87be8c23fd810d18a48052bca355ad6c731
+  metadata.gz: 621ef614c7cdeca5215428c03e6b965d5562be5a
+  data.tar.gz: dacd0d747992dcfbb1955c12b72eb0330619feee
 SHA512:
-  metadata.gz: caf24b6c2f5646512dff78031b1e02e3ff7149013f15da9ec9daaee3aa51329f45ef14c5eaed5a26a12c587732e90e38a2e82e673e36155f986eee5bbce865da
-  data.tar.gz: def61d81138b2120c82ac3745a59e96879d7076b2f9b8810e4a0c188b31060ac8fb992f2f5f07789f3c11f63631d5f692ecbda79aaf7e1d14f4f8d0417bd6eeb
+  metadata.gz: f38534a7f09220f82b5a8a7cf623f8536280df078b9cfd472980c7902aa8ae897b9fbbe85ca55d44af80db3d8eca055804d2bd02efc8e9f4e2f2104cfc9da381
+  data.tar.gz: 51d14f5d4f7c13130c76ce108b423d33bb2023284ae4964c8e99b6b82cdc521fbf1b600e2db699b0cf125f0fe58868e2f372d8215066e9cdfc62cd6059976fea

data/README.md

@@ -5,6 +5,13 @@
 BluePotion
 -----------
 
+## Prerequisites
+
+  - RubyMotion android: `motion android-setup` (install API 16)
+  - Gradle: `brew install gradle`
+  - GenyMotion Emulator (optional) [Gant Laborde's post on Genymotion](http://www.iconoclastlabs.com/blog/rubymotion-android-in-the-emulator-with-genymotion).
+  - For running on your device, [do this](http://www.kingoapp.com/root-tutorials/how-to-enable-usb-debugging-mode-on-android.htm)
+
 ## Warning, BluePotion is an alpha release.
 
 BluePotion is the Android version of [RedPotion](http://redpotion.org). We're spending a lot of time working on it right now. It's currently in Alpha.

data/lib/project/alert_dialog/alert_dialog.rb

@@ -9,6 +9,11 @@
 #     mp "Fine!"
 #   end
 # end
+#
+# Example of alert with input
+# app.alert(title: "What's your name?", style: :input) do |choice, input_text|
+#  mp "User clicked #{choice} and typed #{input_text}"
+# end
 
 # Generic AlertDialog
 class AlertDialog < Android::App::DialogFragment
@@ -19,11 +24,12 @@ class AlertDialog < Android::App::DialogFragment
     @options = {
       theme: Android::App::AlertDialog::THEME_HOLO_LIGHT,
       title: "Alert!",
-      message: "",
+      message: nil,
       positive_button: "OK",
       negative_button: "Cancel",
       positive_button_handler: self,
       negative_button_handler: self,
+      style: nil,
       show: true
     }.merge(options)
 
@@ -38,7 +44,7 @@ class AlertDialog < Android::App::DialogFragment
   end
 
   def onCreateDialog(saved_instance_state)
-    builder = Android::App::AlertDialog::Builder.new(getActivity(), @options[:theme])
+    builder = Android::App::AlertDialog::Builder.new(activity, @options[:theme])
 
     builder.title = @options[:title]
     builder.message = @options[:message]
@@ -48,15 +54,31 @@ class AlertDialog < Android::App::DialogFragment
     builder.setNegativeButton(@options[:negative_button], @options[:negative_button_handler]) if @options[:negative_button]
 
     # Add custom view?
+    @options[:view] = simple_text_view if @options[:style] == :input
     builder.view = @options[:view] if @options[:view]
 
     # DONE!
-    builder.create()
+    builder.create
+  end
+
+  def simple_text_view
+    # Set up the input
+    input = Potion::EditText.new(activity)
+    input.singleLine = true
+    input.id = @text_view_id = Potion::ViewIdGenerator.generate
+    # possible input types - future feature
+    #input.inputType = (Android::Text::InputType.TYPE_CLASS_TEXT | Android::Text::InputType.TYPE_TEXT_VARIATION_PASSWORD)
+    input
   end
 
   def onClick(dialog, id)
     button_text = (id == Android::App::AlertDialog::BUTTON_POSITIVE) ? @options[:positive_button] : @options[:negative_button]
-    @callback.call(button_text) if @callback
+
+    # if a text_view is present, grab what the user gave us
+    text_view = @text_view_id && dialog.findViewById(@text_view_id)
+    input_text = text_view ? text_view.text.toString : nil
+
+    @callback.call(button_text, input_text) if @callback
   end
 
 end

data/lib/project/benchmark.rb

@@ -0,0 +1,34 @@
+class Benchmark
+  class << self
+    def decimal_formatter
+      @_decimal_formatter ||= Potion::DecimalFormat.new("#,###,###")
+    end
+
+    def total_run
+      @total_run
+    end
+
+    def run_single(setup_desc, code_desc, iterations, &block)
+      @total_run ||= 0
+      start_time = Time.milliseconds_since_epoch
+      iterations.times do
+        @total_run += 1
+        block.call
+        #mp "[#{@total_run}]"
+      end
+      end_time = Time.milliseconds_since_epoch
+
+      total_time = end_time - start_time
+      per_item = total_time / iterations.to_f
+      out =  "\nBenchmark  Started at: #{decimal_formatter.format(start_time)}"
+      out << "\n  Iterations: #{decimal_formatter.format(iterations)}"
+      out << "\n  Setup: #{setup_desc}\n  Code: #{code_desc}"
+      out << "\n  Total milliseconds: #{decimal_formatter.format(total_time)}"
+      out << "\n  Milliseconds per iteration: #{per_item}"
+      out << "\n  RMQ allocations: #{$rmq_initialized.to_s}"
+      mp out
+      Potion::System.gc
+      out
+    end
+  end
+end

data/lib/project/delayed_execution.rb

@@ -0,0 +1,16 @@
+module DelayedExecution
+
+  def self.after(delay, &block)
+    Potion::Handler.new.postDelayed(BlockRunnable.new(&block), delay * 1000.0)
+  end
+
+  class BlockRunnable
+    def initialize(&block)
+      @block = block
+    end
+
+    def run
+      @block.call
+    end
+  end
+end

data/lib/project/ext/object.rb

@@ -31,7 +31,7 @@ class Object
       out << klass_name.to_s
     end
 
-    out
+    mp out
   end
 
   def inspect
@@ -68,7 +68,6 @@ class Object
     rmq(*args).get
   end
 
-
   # BluePotion stuff
 
   # REMOVE when mp starts working
@@ -77,25 +76,28 @@ class Object
       return unless RMQ.debugging?
     end
 
+    @@mp_backspace ||= "\b\b " * (Android::App::Application.name.length + 20)
+
     if s.nil?
       s = "<nil>"
-    elsif s.is_a?(Array)
-      s = s.map{|e| e.inspect }.join("\n")
+    #elsif s.is_a?(Array) # TODO - THIS DOESN'T WORK
+      #s = s.map{|e| e.inspect }.join("\n")
     else
       s = s.to_s
     end
-    backspace = "\b\b " * (Android::App::Application.name.length + 20)
+
     lines = s.split("\n")
-    lines.each do |line|
-      if RMQ.debugging?
-        out = backspace
-        out << "\e[1;#{36}m#{self.object_id}\e[0m #{self.short_class_name}".ljust(50)
-        out << "  \e[1;#{34}m#{line}\e[0m"
-        puts out
-      else
-        puts "#{backspace} \e[1;#{34}m#{line}\e[0m"
-      end
+    @@mp_tproc ||= proc do |line| # This hack fixes RMA bug, TODO remove when RMA block retention bug is fixed
+      #if RMQ.debugging?
+        #out = @@mp_backspace
+        #out << "\e[1;#{36}m#{self.object_id}\e[0m #{self.short_class_name}".ljust(50)
+        #out << "  \e[1;#{34}m#{line}\e[0m"
+        #puts out
+      #else
+        puts "#{@@mp_backspace} \e[1;#{34}m#{line}\e[0m"
+      #end
     end
+    lines.each &@@mp_tproc
   end
 
   def app
@@ -106,5 +108,4 @@ class Object
     rmq.device
   end
 
-
 end

data/lib/project/ext/time.rb

@@ -0,0 +1,42 @@
+class Time
+  def self.iso8601(iso8601_string)
+    timestring = iso8601_string.toString
+    timestring = timestring.replaceAll("Z", "+00:00")
+    timestring = timestring.substring(0, 22) + timestring.substring(23)
+    date = Java::Text::SimpleDateFormat.new("yyyy-MM-dd'T'HH:mm:ss+SSS").parse(timestring)
+    Time.new(date.getTime())
+  end
+
+  def self.milliseconds_since_epoch
+    Java::Lang::System.currentTimeMillis.doubleValue
+  end
+
+  def today?
+    today = Time.now
+    (self.year == today.year) && (self.month == today.month) && (self.date == today.date)
+  end
+
+  def strftime(str)
+    converter = {
+      #Ruby => Android
+      '%A'  =>  'EEEE',
+      '%b'  =>  'MMM',
+      '%-e' =>  'd',
+      '%-l' =>  'h',
+      '%P'  =>  'a',
+      '%M'  =>  'mm',
+      '%P'  =>  'a',
+      '%m'  =>  'MM',
+      '%d'  =>  'dd',
+      '%Y'  =>  'yyyy'
+    }
+
+    converted = str.toString
+    converter.each do |k,v|
+      converted = converted.replaceAll(k, v)
+    end
+
+    formatter = Java::Text::SimpleDateFormat.new(converted)
+    formatter.format(self).to_s
+  end
+end

data/lib/project/ext/view.rb

@@ -3,6 +3,18 @@ class Android::View::View
     "<#{id} #{short_class_name}>"
   end
 
+  #def onDestroy
+    #mp 'onDestroy view'
+    #super
+  #end
+
+  def cleanup
+    if @_rmq_data
+      @_rmq_data.cleanup
+      @_rmq_data = nil
+    end
+  end
+
   def to_s
     self.inspect
   end
@@ -37,13 +49,21 @@ class Android::View::View
   def on_styled
   end
 
-  def rmq(*working_selectors)
-    q = RMQ.create_with_selectors(working_selectors, self) #.tap do |o|
-    q
-      #if vc = self.rmq_data.view_controller
-        #o.weak_view_controller = vc
+    #def rmq(*working_selectors)
+      #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 find(*working_selectors) # Not calling rmq below for performance reasons (one less method invocation)
+    RMQ.create_with_selectors(working_selectors, self)
+  end
+  def rmq(*working_selectors)
+    RMQ.create_with_selectors(working_selectors, self)
   end
 
   def color(*params)
@@ -67,6 +87,7 @@ class Android::View::View
   end
 
   def subviews
+    # TODO, see if anyone uses this, and remove
     out = []
 
     if self.is_a?(Potion::ViewGroup)

data/lib/project/potion.rb

@@ -14,6 +14,8 @@ module Potion
   BaseAdapter = Android::Widget::BaseAdapter
   Dialog = Android::App::Dialog
   EditorInfo = Android::View::Inputmethod::EditorInfo
+  System = Java::Lang::System
+  DecimalFormat =	Java::Text::DecimalFormat
 
   # Layouts
   LayoutInflater = Android::View::LayoutInflater
@@ -35,12 +37,19 @@ module Potion
   # Graphics
   Color = Android::Graphics::Color
   Typeface = Android::Graphics::Typeface
+  Bitmap = Android::Graphics::Bitmap
 
   # Media
   File = Java::Io::File
   FileOutputStream = Java::Io::FileOutputStream
   MediaStore = Android::Provider::MediaStore
   Contacts = Android::Provider::ContactsContract::Contacts
+  # This is needed since you can't access constants of interfaces
+  # Basically is Android::Provider::MediaStore::Images::Media::INTERNAL_CONTENT_URI
+  INTERNAL_CONTENT_URI = Potion::Uri.parse("content://media/internal/images/media")
+  PHONE_CONTENT_URI = Potion::Uri.parse("content://com.android.contacts/data/phones")
+
+  Handler = Android::Os::Handler
 end
 
 #

data/lib/project/pro_motion/activities/pm_activity.rb

@@ -27,6 +27,11 @@
       # Abstract
     end
 
+    def onStart
+      super
+      on_start if respond_to?(:on_start)
+    end
+
     def onResume
       super
       on_resume
@@ -60,6 +65,11 @@
       super
     end
 
+    def onBackPressed
+      super
+      finish if fragmentManager.getBackStackEntryCount == 0
+    end
+
     def open(screen, options={})
       find.screen.open screen, options
     end
@@ -68,6 +78,11 @@
       find.screen.close options
     end
 
+    def set_content layout_xml
+      layout_id = find.resource.layout(layout_xml)
+      setContentView(layout_id)
+    end
+
   end
 
 #end

data/lib/project/pro_motion/activities/pm_navigation_activity.rb

@@ -20,7 +20,7 @@
     end
 
     def open_fragment(frag, options={})
-      mp frag
+      mp "open fragment: #{frag.inspect}"
       mgr = fragmentManager.beginTransaction
       mgr.replace(@fragment_container.getId, frag, "screen-#{fragmentManager.getBackStackEntryCount + 1}")
       mgr.addToBackStack(nil)
@@ -79,5 +79,12 @@
       self.contentView = @fragment_container
     end
 
+    # Pass Acitivity result on to the Fragment/Screen
+    def on_activity_result(request_code, result_code, data)
+      if fragment && fragment.respond_to?(:activity_result)
+        fragment.activity_result(request_code, result_code, data)
+      end
+    end
+
   end
 #end

data/lib/project/pro_motion/activities/pm_single_fragment_activity.rb

@@ -55,7 +55,7 @@
     end
 
     def on_activity_result(request_code, result_code, data)
-      if @fragment && @fragment.respond_to?(:handle_activity_result)
+      if @fragment && @fragment.respond_to?(:activity_result)
         @fragment.activity_result(request_code, result_code, data)
       end
     end

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

@@ -3,7 +3,7 @@ class PMBaseAdapter < Android::Widget::BaseAdapter
 
   def initialize(opts={})
     super()
-    @data = opts.fetch(:data, [])
+    self.data = opts.fetch(:data, [])
   end
 
   def screen
@@ -35,12 +35,24 @@ class PMBaseAdapter < Android::Widget::BaseAdapter
 
   def getViewTypeCount(); view_type_count; end
   def view_type_count()
-    1
+    # all custom items added up (+1 for non-custom)
+    view_types.length + 1
   end
 
   def getItemViewType(position); item_view_type_id(position); end
   def item_view_type_id(position)
-    0
+    data_item = self.item_data(position)
+    idx = nil
+    if data_item[:prevent_reuse]
+      idx = Android::Widget::Adapter::IGNORE_ITEM_VIEW_TYPE
+    else
+      # get custom cell index
+      idx = view_types.index(data_item[:cell_xml] || data_item[:cell_class])
+      # Shift custom cells up 1, no custom == index 0
+      idx = idx ? (idx + 1) : 0
+    end
+
+    idx
   end
 
   def getCount(); count(); end
@@ -48,8 +60,8 @@ class PMBaseAdapter < Android::Widget::BaseAdapter
     data.length
   end
 
-  def getItem(position); item(position); end
-  def item(position)
+  def getItem(position); item_data(position); end
+  def item_data(position)
     data[position]
   end
 
@@ -60,22 +72,74 @@ class PMBaseAdapter < Android::Widget::BaseAdapter
 
   def getView(position, convert_view, parent); view(position, convert_view, parent); end
   def view(position, convert_view, parent)
-    data = item(position)
-    out = convert_view || rmq.create!(data[:cell_class] || Potion::TextView)
-    update_view(out, data[:title])
+    data = item_data(position)
+    out = selected_view(convert_view, data)
+    update_view(out, data)
     if data[:action]
-      find(out).on(:tap) { find.screen.send(data[:action], data[:arguments], position) }
+      find(out).on(:tap) do
+        arguments = action_arguments data, position
+        find.screen.send(data[:action], arguments, position) 
+      end
     end
     out
   end
 
+  # configure what to pass back when we tap that action
+  def action_arguments(data, position)
+    data[:arguments]
+  end
+
   def update_view(view, 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
+    update = data[:update]
+    if update.is_a?(Proc)
+      update.call(out, data)
+    elsif update.is_a?(Symbol) || update.is_a?(String)
+      if find.screen.respond_to?(update)
+        find.screen.send(update, view, data)
+      else
+        mp "Warning: #{find.screen.class} does not respond to #{update}"
+      end
+    elsif data[:properties]
+      data[:properties].each do |k, v|
+        if view.respond_to?("#{k}=")
+          view.send("#{k}=", v)
+        else
+          mp "Warning: #{view.class} does not respond to #{k}="
+        end
+      end
+    elsif view.is_a?(Potion::TextView)
+      # Specific to use of Simple list item 1
+      view.text = data[:title]
+    elsif update
+      mp "We don't know how to update your cell"
     end
   end
+
+  def view_types
+    # unique cell_xmls and cell_classes
+    data.map{ |i| i[:cell_xml] || i[:cell_class]}.compact.uniq
+  end
+
+  def selected_view(cv, data)
+    row_view = cv
+    unless row_view
+      if data[:cell_class]
+        row_view = rmq.create!(data[:cell_class])
+      elsif data[:cell_xml]
+        row_view = inflate_row(data[:cell_xml])
+        rmq.tag_all_from_resource_entry_name(row_view)
+      else
+        # Default is Sipmle List Item 1
+        # TODO:  Possibly use Android::R::Layout::Simple_list_item_2 which has subtitle
+        #https://android.googlesource.com/platform/frameworks/base/+/master/core/res/res/layout/simple_list_item_2.xml
+        row_view = inflate_row(Android::R::Layout::Simple_list_item_1)
+      end
+    end
+    row_view
+  end
+
+  def inflate_row(xml_resource)
+    inflater = Potion::LayoutInflater.from(find.activity)
+    row_view = inflater.inflate(xml_resource, nil, true)
+  end
 end