bluepotion 0.1.2 → 0.1.3

data/lib/project/pro_motion/{pm_screen.rb → fragments/pm_screen.rb}

@@ -6,7 +6,11 @@
 
     attr_accessor :view
 
-    def onAttach(activity); super; on_attach(activity); end
+    def onAttach(activity)
+      super
+      activity.on_fragment_attached(self) if activity.respond_to?(:on_fragment_attached)
+      on_attach(activity)
+    end
     def on_attach(activity); end
 
     def onCreate(bundle); super; on_create(bundle); end
@@ -18,7 +22,8 @@
       if @xml_resource = self.class.xml_resource
         @view = inflater.inflate(r(:layout, @xml_resource), parent, false)
       else
-        @view = load_view
+        v = load_view
+        @view ||= v
         @view.setId Potion::ViewIdGenerator.generate
       end
 
@@ -50,9 +55,7 @@
 
       build_and_tag_xml_views
 
-      self.action_bar.title = self.class.bars_title
-      self.activity.title = self.class.bars_title
-
+      set_title
       on_load
       on_activity_created
     end
@@ -80,9 +83,31 @@
     def onDestroy; super; on_destroy; end
     def on_destroy; end
 
-    def onDetach; super; on_detach; end
+    def onDetach
+      super
+      on_detach
+      self.activity.on_fragment_detached(self) if self.activity.respond_to?(:on_fragment_detached)
+    end
     def on_detach; end
 
+    def set_title
+      self.title = self.class.bars_title
+    end
+
+    def title
+      @title
+    end
+    def title=(value)
+      @title = value
+
+      if a = self.activity
+        if a_bar = self.action_bar
+          a_bar.title = value
+        end
+        a.title = value
+      end
+    end
+
     private
 
     def build_and_tag_xml_views

data/lib/project/pro_motion/{pm_screen_module.rb → fragments/pm_screen_module.rb}

@@ -93,8 +93,21 @@
       self.rmq.append(view_or_class, style, opts).get
     end
 
-    # TODO add create and build
+    def create(view_or_class, style=nil, opts={})
+      self.rmq.create(view_or_class, style, opts)
+    end
+
+    def create!(view_or_class, style=nil, opts={})
+      self.rmq.create(view_or_class, style, opts).get
+    end
 
+    def build(view_or_class, style=nil, opts={})
+      self.rmq.build(view_or_class, style, opts)
+    end
+
+    def build!(view_or_class, style=nil, opts={})
+      self.rmq.build(view_or_class, style, opts).get
+    end
 
     # temporary stand-in for Java's R class
     def r(resource_type, resource_name)
@@ -108,15 +121,27 @@
 
     def open(screen_class, options={})
       mp "ScreenModule open", debugging_only: true
-      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
-      # we're taking a conservative approach for now - eventually we'll want to allow
-      # replacing fragments for any kind of activity, but I'm not sure of the best way
-      # to implement that yet
-      intent = Android::Content::Intent.new(self.activity, activity_class)
-      intent.putExtra PMSingleFragmentActivity::EXTRA_FRAGMENT_CLASS, screen_class.to_s
+      if !options[:activity] && self.activity.respond_to?(:open_fragment)
+        if screen_class.respond_to?(:new)
+          screen = screen_class.new
+        else
+          screen = screen_class
+        end
+        self.activity.open_fragment screen, options
+      else
+        open_modal(screen_class, options)
+      end
+    end
+
+    def open_modal(screen_class, options)
+      activity_class = options.delete(:activity) || PMNavigationActivity
+      activity_class = PMNavigationActivity if activity_class == :nav
+      activity_class = PMSingleFragmentActivity if activity_class == :single
+
+      intent = Potion::Intent.new(self.activity, activity_class)
+      intent.putExtra PMActivity::EXTRA_FRAGMENT_CLASS, screen_class.to_s
+      intent.setFlags(Potion::Intent::FLAG_ACTIVITY_CLEAR_TOP) if options.delete(:close)
 
       if extras = options.delete(:extras)
         extras.keys.each do |key, value|
@@ -128,18 +153,34 @@
       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
+        intent.putExtra PMActivity::EXTRA_FRAGMENT_ARGUMENTS, hash_bundle.to_bundle
       end
 
       self.activity.startActivity intent
     end
 
     def close(options={})
-      self.activity.finish
+      # Hang onto an activity reference, since we lose the activity
+      act = self.activity
+
+      if options[:activity] && options[:to_screen]
+        # Closing to particular activity
+        open options[:to_screen], activity: options[:activity], close: true
+      elsif options[:to_screen]
+        # Closing to particular fragment
+        while act.fragment && !act.fragment.is_a?(options[:to_screen])
+          act.close_fragment
+          act.finish unless act.fragment
+        end
+      else
+        # Closing current screen or activity if no screens left
+        act.close_fragment if act.fragment
+        act.finish unless act.fragment
+      end
     end
 
     def start_activity(activity_class)
-      intent = Android::Content::Intent.new(self.activity, activity_class)
+      intent = Potion::Intent.new(self.activity, activity_class)
       #intent.putExtra("key", value); # Optional parameters
       self.activity.startActivity(intent)
     end
@@ -158,13 +199,10 @@
       input_manager.hideSoftInputFromWindow(view.getWindowToken(), 0);
     end
 
-
-    def activity
-      getActivity()
-    end
-
     def action_bar
-      activity.getActionBar()
+      if a = activity
+        a.getActionBar
+      end
     end
 
     def menu
@@ -173,6 +211,7 @@
 
     # Example: add_action_bar_button(title: "My text", show: :if_room)
     def add_action_bar_button(options={})
+      @action_bar ||= { button_actions: {} }
       unless menu
         mp "#{self.inspect}#add_action_bar_button: No menu set up yet."
         return
@@ -187,11 +226,24 @@
       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 = self.activity.menu.add(options.fetch(:group, 0), options.fetch(:item_id, @action_bar[:current_id] || 0), options.fetch(:order, 0), options.fetch(:title, ""))
       btn.setShowAsAction(show_as_action) if show_as_action
-      btn.setIcon(options[:icon]) if options[:icon]
+      btn.setIcon(image.resource(options[:icon].to_s)) if options[:icon]
+      @action_bar[:button_actions][btn.getItemId] = options[:action] if options[:action]
+      @action_bar[:current_id] = btn.getItemId + 1
       btn
     end
 
+    def on_options_item_selected(item)
+      return unless @action_bar
+      return unless method_name = @action_bar[:button_actions][item.getItemId]
+      if respond_to?(method_name)
+        send(method_name)
+      else
+        mp "#{self.inspect} No method #{method_name.inspect} implemented for this screen."
+        true
+      end
+    end
+
   end
 #end

data/lib/project/pro_motion/pm_application.rb

@@ -43,11 +43,10 @@
       end
     end
 
+    # Typically you don't use this, use `find.screen` instead, TODO, probably should remove this
     def current_screen
-      if @current_activity && (ca = @current_activity)
-        if ca.is_a?(PMSingleFragmentActivity)
-          ca.fragment
-        end
+      if @current_activity && @current_activity.respond_to?(:fragment)
+        @current_activity.fragment
       end
     end
 
@@ -78,6 +77,18 @@
       environment == :development
     end
 
+    def resource
+      RMQResource
+    end
+
+    def net
+      BluePotionNet
+    end
+
+    def async(options={}, &block)
+      MotionAsync.async(options, &block)
+    end
+
     class << self
       attr_accessor :current_application, :home_screen_class
 

data/lib/project/pro_motion/{pm_hash_bundle.rb → support/pm_hash_bundle.rb}

@@ -30,6 +30,8 @@ class PMHashBundle
         value = case value_type
         when "com.rubymotion.String"
           bundle.getString(key)
+        when "com.rubymotion.Symbol"
+          bundle.getString(key).to_sym
         when "java.lang.Integer"
           bundle.getInt(key)
         when "java.lang.Double"
@@ -64,6 +66,8 @@ class PMHashBundle
         case value_type
         when "com.rubymotion.String"
           bundle.putString(key, value)
+        when "com.rubymotion.Symbol"
+          bundle.putString(key, value.to_s)
         when "java.lang.Integer"
           bundle.putInt(key, value)
         when "java.lang.Double"

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

@@ -8,7 +8,7 @@ class RMQ
       if value.is_a?(Potion::Activity)
         @originated_from = value
         @activity = value
-      elsif value.is_a?(PMScreen)
+      elsif value.is_a?(PMScreen) || value.is_a?(PMListScreen)
         @originated_from = value
       elsif value.is_a?(Potion::View)
         @originated_from = value

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

@@ -3,25 +3,8 @@ class RMQ
       if new_data != :rmq_not_provided
         selected.each do |view|
           case view
-          #when UILabel              then view.setText new_data # set is faster than =
-          #when UIButton             then view.setTitle(new_data, forState: UIControlStateNormal)
-          #when UIImageView          then view.image = new_data
-          #when UITableView          then
-          #when UISwitch             then view.setOn(new_data)
-          #when UIDatePicker         then
-          #when UISegmentedControl   then
-          #when UIRefreshControl     then
-          #when UIPageControl        then
-          #when UISlider             then
-          #when UIStepper            then
-          #when UITabBar             then
-          #when UITableViewCell      then
+          when Potion::EditText      then view.text = new_data.to_s.toString
           when Potion::TextView      then view.text = new_data
-          #when UITextField          then view.text = new_data
-          #when UINavigationBar      then
-          #when UIScrollView         then
-          #when UIProgressView       then view.setProgress(new_data, animated: true)
-
           # TODO, finish
           end
         end
@@ -30,25 +13,8 @@ class RMQ
       else
         out = selected.map do |view|
           case view
-          #when UILabel              then view.text
-          #when UIButton             then view.titleForState(UIControlStateNormal)
-          #when UIImageView          then view.image
-          #when UITableView          then
-          #when UISwitch             then
-          #when UIDatePicker         then
-          #when UISegmentedControl   then
-          #when UIRefreshControl     then
-          #when UIPageControl        then
-          #when UISlider             then
-          #when UIStepper            then
-          #when UITabBar             then
-          #when UITableViewCell      then
+          when Potion::EditText      then view.text.toString.to_s
           when Potion::TextView      then view.text
-          #when UITextField          then view.text
-          #when UINavigationBar      then
-          #when UIScrollView         then
-          #when UIProgressView       then view.progress
-
           # TODO, finish
           end
         end

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

@@ -6,9 +6,17 @@ class RMQ
       created = false
       appended = false
       built = false
+      tag_xml_layout = false
 
       if view_or_class.is_a?(Potion::View)
         new_view = view_or_class
+      elsif view_or_class.is_a?(Symbol) # Inflate from xml
+        created = true
+        layout = RMQResource.layout(view_or_class)
+
+        inflater = Potion::LayoutInflater.from(self.activity)
+        new_view = inflater.inflate(layout, nil)
+        tag_xml_layout = true
       else
         created = true
         new_view = view_or_class.new(RMQ.app.context)
@@ -48,6 +56,8 @@ class RMQ
       if self.stylesheet
         apply_style_to_view(new_view, opts[:style]) if opts[:style]
       end
+
+      tag_all_from_resource_entry_name(new_view) if tag_xml_layout
     end
 
     viewq = RMQ.create_with_array_and_selectors(subviews_added, selectors, @originated_from, self)
@@ -57,6 +67,26 @@ class RMQ
   end
   alias :insert :add_subview
 
+  def tag_all_from_resource_entry_name(view)
+    view.rmq.find.each do |view|
+      if ren = view.resource_entry_name
+        view.rmq_data.tag(ren.to_sym)
+      end
+    end
+  end
+
+
+  # Removes the selected views from their parent's (superview) subview array
+  #
+  # @example
+  #   rmq(a_view, another_view).remove
+  #
+  # @return [RMQ]
+  def remove
+    selected.each { |view| view.parent.removeView(view) }
+    self
+  end
+
   def append(view_or_class, style=nil, opts={}, dummy=nil) # <- dummy is to get around RM bug)
     opts[:style] = style
     #opts[:block] = block if block

data/lib/project/ruby_motion_query/rmq_color.rb

@@ -92,7 +92,7 @@ end
 class RMQColorFactory
 
   class << self
-    def build(params)
+    def build(params, dummy=nil) # Dummy works around RM bug
       return RMQColor if params.empty?
       return from_rgba(*params) if params.count > 1
 

data/lib/project/ruby_motion_query/rmq_resource.rb

@@ -0,0 +1,26 @@
+class RMQ
+  # @return [RMQResource]
+  def self.resource
+    RMQResource
+  end
+
+  # @return [RMQResource]
+  def resource
+    RMQResource
+  end
+end
+
+class RMQResource
+  class << self
+    def find(resource_type, resource_name)
+      application = PMApplication.current_application
+      application.resources.getIdentifier(resource_name.to_s,
+                                          resource_type.to_s,
+                                          application.package_name)
+    end
+
+    def layout(name)
+      self.find("layout", name)
+    end
+  end
+end

data/lib/project/version.rb

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

data/lib/project/volley_wrap/http_result.rb

@@ -0,0 +1,98 @@
+module VW
+  class HTTPResult
+    attr_accessor :object, :error, :response, :request_url, :request_params, :request_method
+
+    def initialize(response, response_object, error)
+      @response = response
+      @object = response_object
+      @error = error
+    end
+
+    def status_code
+      @response.statusCode if @response
+    end
+
+    def not_modified?
+      @response.notModified if @response
+    end
+
+    def body
+      @object.to_s if @object
+    end
+
+    def method_description
+      case @request_method
+      when 0
+        "GET"
+      when 1
+        "POST"
+      when 2
+        "PUT"
+      when 3
+        "DELETE"
+      else
+        "Unknown"
+      end
+    end
+
+    def headers
+      if @response
+        @_headers ||= @response.headers.inject({}){|h, entry_set| h[entry_set[0]] = entry_set[1] ; h }
+      end
+    end
+
+    def success?
+      !failure?
+    end
+
+    def failure?
+      !!error
+    end
+
+    def inspect
+      "<VW::HTTPResult:#{self.object_id} #{@request_url}>"
+    end
+
+    def to_s
+      header_string = if (h = headers)
+        h.map{|k,v| "  #{k} = #{v}"}.join("\n")
+      else
+        "none"
+      end
+
+      #mp @request_params.class.name
+      params_string = if @request_params
+        #@request_params.class.name
+        @request_params.map{|k,v| "  #{k} = #{v}"}.join("\n")
+      else
+        "none"
+      end
+
+      %(
+
+Request -------------------------
+
+URL: #{@request_url}
+Method: #{method_description}
+Params:
+#{params_string}
+
+Response -------------------------
+
+Status code: #{status_code}
+Not modified?: #{not_modified?}
+Success: #{success?}
+
+Error: #{error.toString if error}
+
+Headers:
+#{header_string}
+
+Body:
+#{body}
+\n
+)
+    end
+  end
+end
+

data/lib/project/volley_wrap/request.rb

@@ -0,0 +1,98 @@
+module VW
+  class Request < Com::Android::Volley::Toolbox::StringRequest
+    # part of this class had to be implemented as a Java extension to work around
+    # what appears to be a RM bug. See request.java
+
+    VOLLEY_GET = 0
+    VOLLEY_POST = 1
+    VOLLEY_PUT = 2
+    VOLLEY_DELETE = 3
+
+    def self.get_request(url, listener)
+      set_request_for_listener VOLLEY_GET, url, nil, listener
+      Request.new(VOLLEY_GET, url, listener, listener).tap do |req|
+        req.setRetryPolicy(retry_policy)
+        req.listener = listener
+      end
+    end
+
+    def self.post_request(url, params, listener)
+      request_with_params(VOLLEY_POST, url, params, listener).tap do |req|
+        req.listener = listener
+      end
+    end
+
+    def self.put_request(url, params, listener)
+      request_with_params(VOLLEY_PUT, url, params, listener).tap do |req|
+        req.listener = listener
+      end
+    end
+
+    def self.delete_request(url, params, listener)
+      request_with_params(VOLLEY_DELETE, url, params, listener).tap do |req|
+        req.listener = listener
+      end
+    end
+
+    def listener=(value)
+      @listener = value
+    end
+
+    def self.retry_policy
+      Com::Android::Volley::DefaultRetryPolicy.new(10000, 3, 1)
+    end
+
+    def headers=(headers)
+      # call into the method defined in the .java file
+      setHeaders(headers)
+    end
+
+    def parseNetworkResponse(network_response)
+      @listener.network_response = network_response if @listener
+      super
+    end
+
+    def self.set_request_for_listener(method, url, params, listener)
+      # There probably is a much better way then passing all these around like this
+      listener.request_url = url
+      listener.request_params = params
+      listener.request_method = method
+    end
+
+    private
+
+    # this is to maintain compatibility with AFMotion - somewhere (possibly in AFNetworking?) the
+    # keys get flattened out like so:
+    #
+    #     { user: { email: "x@x.com", password: "pass" } }
+    # becomes
+    #     { "user[email]" => "x@x.com", "user[password]" => "pass" }
+    #
+    # This is not a robust implementation of this, but will serve our needs for now
+    def self.prepare_params(params)
+      new_params = {}
+      params.keys.each do |key|
+        if params[key].is_a?(Hash)
+          params[key].keys.each do |inner_key|
+            new_params["#{key}[#{inner_key}]"] = params[key][inner_key].to_s
+          end
+        else
+          new_params[key.to_s] = params[key].to_s
+        end
+      end
+      new_params
+    end
+
+    def self.request_with_params(method, url, params, listener)
+      set_request_for_listener method, url, params, listener
+
+      Request.new(method, url, listener, listener).tap do |req|
+        req.setRetryPolicy(retry_policy)
+        params = prepare_params(params)
+        req.setParams(params)
+      end
+    end
+
+  end
+
+end

data/lib/project/volley_wrap/response_listener.rb

@@ -0,0 +1,49 @@
+module VW
+  class ResponseListener
+    attr_accessor :serializer, :callback, :network_response, :request_url, :request_params, :request_method
+
+    def initialize(serializer, &block)
+      @serializer = serializer
+      @callback = block
+    end
+
+    def onResponse(response)
+      response_object = expect_json? ? Moran.parse(response.to_s) : response
+      create_result(@network_response, response_object, nil)
+    end
+
+    def onErrorResponse(error)
+      if network_response = error.networkResponse
+        data = network_response.data
+      end
+      create_result(network_response, data, error.toString)
+    end
+
+    private
+
+    def expect_json?
+      serializer == :json
+    end
+
+    def create_result(response, response_object, error)
+      request = HTTPResult.new(response, response_object, error)
+      request.request_url = @request_url
+      request.request_params = @request_params
+      request.request_method = @request_method
+
+      if VW::SessionClient.debug
+        mp request.to_s
+      end
+      callback.call request
+    end
+
+    def dump_network_error(error)
+      puts error.toString
+      if response = error.networkResponse
+        puts response.statusCode
+        puts response.headers
+        puts response.data
+      end
+    end
+  end
+end