android_query 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17844db6657c5dc25029a6ed1c13797a3b054bc0
-  data.tar.gz: a6459ae1d7bdec869b05f952e3bf874c56680eef
+  metadata.gz: 2cac681d57bb85063a53184fa2da5889f2c5b6cf
+  data.tar.gz: 0a02022cd528fe128f5d4e4b0c8796a5c9091556
 SHA512:
-  metadata.gz: 155b2c8cc1f22e5b94c4d924d2ffa44d3dd54afac25467840c429dbef642ea6d44ed6d9a0ab5cfc0419e7205eca4f263795ae6e05ac4acde04eee7e03e193230
-  data.tar.gz: f53af793423a174ac1d0a1eda864d19ca5f07177f34e060c9b4da737a4044099fa1e64ccd71a526dfba6402c651bde2e59049cbb48d685e428d7cd557a88b59b
+  metadata.gz: 96a173ed0a4dae949e3ad96ecc0faac8324424c3f6327604aad7f106b8875618d8de9abeaa04caa1391279299ca45f405ab0373c4eda531bfec359039c2355f2
+  data.tar.gz: d63d96e315e7dc598aab325e691cb53b3227093e8766598b711d9c6c6f536c956b0c9d25a0b35bd120e1bc191e5b9b5681f3bb68ad770cec8ccd98ec08abe1ab

data/README.md

@@ -15,7 +15,7 @@ It's intended for developers who prefer to code their UIs rather than use a GUI
 Add this line to your application's Gemfile:
 
 ```ruby
-  gem 'android_query', '~> 0.0.4'
+  gem 'android_query', '~> 0.0.5'
 ```
 
 And then execute:
@@ -28,47 +28,95 @@ Or install it yourself as:
 
 ## Usage
 
+The general rule is to create a top-level layout and add views to it.
+Each view should be passed a style method.
+
 ```ruby
-def onCreate(savedInstanceState)
-  super
-  @counter = 0
-  self.aq = AndroidQuery.new(self)
-  aq.layout(:linear, weight_sum: 10, w: :mp, h: :mp) do |linear|
-    aq.edit_text(linear, id: 10, w: :mp, h: :wc)
-    aq.text_view(linear, id: 11, text: "Hello Android Query!", w: :mp, h: :wc, weight: 8)
-    aq.layout(:linear, parent: linear, weight_sum: 2, weight: 1, orientation: :h) do |buttons_layout|
-      aq.button(buttons_layout, text: "+ (plus)", w: :wc, h: :mp, weight: 1, click: :increase_counter)
-      aq.button(buttons_layout, text: "- (minus)", w: :wc, h: :mp, weight: 1, click: :decrease_counter)
-    end
-    aq.layout(:linear, parent: linear, weight_sum: 2, weight: 1) do |sweet|
-      aq.button(sweet, id: 12, text: "This is SO SWEET!", w: :mp, h: :mp, click: :toast_me, weight: 1)
-      aq.button(sweet, id: 13, text: "Change Label", w: :mp, h: :mp, click: :show_message, weight: 1)
+class MainActivity < Android::App::Activity
+  attr_accessor :aq, :counter
+  
+  def onCreate(savedInstanceState)
+    super
+    self.counter = 0
+    self.aq = AndroidQuery.new(self, HomeStyle)
+    self.aq.linear_layout(:top_layout) do |top|
+      top.text_view(:phone_field)
+      top.edit_text(:email_field)
+      top.button(:submit_button)
+      top.linear_layout(:counter_layout) do |counter_layout|
+        counter_layout.button(:increment)
+        counter_layout.button(:decrement)
+      end
     end
   end
+  
+  def show_message(view)
+    # toast options can be:
+    # for gravity: :bottom, :right, :left, :center, :top, and their combinations
+    # for length: :short, :long
+    self.aq.toast("The counter is set at #{self.counter}", gravity: :bottom_right, length: :short)
+  end
+  
+  def increment_counter(view)
+    self.counter += 1
+  end
+  
+  def decrement_counter(view)
+    self.counter -= 1
+  end
 end
+```
+The previous code produces the following app:
+![Sample Screenshot](screenshot.png)
 
-def toast_me(view)
-  aq.toast("You've been toasted #{@counter} times!", gravity: :center)
-end
-
-def increase_counter(view)
-  @counter += 1
-end
-
-def decrease_counter(view)
-  @counter -= 1
-end
 
-def show_message(view)
-  my_text = aq.find(10)
-  my_label = aq.find(11)
-  my_label.text = my_text.text
-  my_text.text = ""
+The following is the `HomeStyle` class that styles the screen:
+```ruby
+class HomeStyle < AndroidMotionQuery::Stylesheet
+  def top_layout(v)
+    v.width = :mp # <-- :mp, :wc, or a number
+    v.height = :mp
+    v.orientation = :vertical # <-- or :horizontal
+    v.weight_sum = 10
+  end
+  
+  def phone_field(v)
+    v.text = 'Hello My Style!'
+    v.weight = 4
+  end
+  
+  def email_field(v)
+    v.text = 'This is my email'
+    v.weight = 1
+  end
+  
+  def submit_button(v)
+    v.text = 'Click Me To See'
+    v.weight = 5
+    v.click = :show_message # <-- this would call the show_message(view) method on the activity
+  end
+  
+  def counter_layout(v)
+    v.orientation = :horizontal
+    v.width = :mp 
+    v.height = :wc
+    v.weight_sum = 2
+  end
+  
+  def increment(v)
+    v.text = '+ Increment'
+    v.click = :increment_counter
+    v.weight = 1
+  end
+  
+  def decrement(v)
+    v.text = '- Decrement'
+    v.click = :decrement_counter
+    v.weight = 1
+  end
 end
 ```
 
-![Sample Screenshot](screenshot.png)
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/aesmail/android_query.

data/lib/android_query/version.rb

@@ -1,3 +1,3 @@
 module AndroidQuery
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/android_query/views.rb

@@ -0,0 +1,182 @@
+module AndroidMotionQuery
+  class View
+    attr_accessor :view, :activity, :stylesheet, :style_name, :layout_params, :options
+
+    def initialize(view, activity, stylesheet, style_name, layout_params, options = {})
+      self.view = view
+      self.activity = activity
+      self.stylesheet = stylesheet
+      self.style_name = style_name
+      self.layout_params = layout_params
+      self.options = {
+        parent: nil,
+      }.merge(options)
+    end
+
+    def get
+      self.view
+    end
+
+    def create_android_query_view(view, style_method, layout_params, options = {}, &block)
+      aqv = View.new(view, self.activity, self.stylesheet, style_method, layout_params, options)
+      self.stylesheet.apply_style_for(aqv, style_method, layout_params)
+      self.get.addView(aqv.get)
+      block.call(aqv) if block_given?
+      aqv
+    end
+    
+    def linear_layout(style_method, &block)
+      view = Android::Widget::LinearLayout.new(self.activity)
+      lp = Android::Widget::LinearLayout::LayoutParams
+      create_android_query_view(view, style_method, lp, {}, &block)
+    end
+
+    def text_view(style_method, &block)
+      view = Android::Widget::TextView.new(self.activity)
+      create_android_query_view(view, style_method, self.layout_params, {}, &block)
+    end
+    
+    def edit_text(style_method, &block)
+      view = Android::Widget::EditText.new(self.activity)
+      create_android_query_view(view, style_method, self.layout_params, {}, &block)
+    end
+    
+    def button(style_method, &block)
+      view = Android::Widget::Button.new(self.activity)
+      create_android_query_view(view, style_method, self.layout_params, {}, &block)
+    end
+  end
+
+  class Stylesheet
+    def apply_style_for(view, style_name, layout_params)
+      style_view = StylesheetElement.new(view, layout_params)
+      self.send(style_name.to_s, style_view)
+      view.get.setLayoutParams(style_view.params)
+      view
+    end
+  end
+
+  class StylesheetElement
+    attr_accessor :view, :params
+
+    LAYOUT_SIZE_OPTIONS = {
+      mp: Android::View::ViewGroup::LayoutParams::MATCH_PARENT,
+      wc: Android::View::ViewGroup::LayoutParams::WRAP_CONTENT,
+    }
+
+    ORIENTATION_OPTIONS = {
+      vertical: Android::Widget::LinearLayout::VERTICAL,
+      horizontal: Android::Widget::LinearLayout::HORIZONTAL,
+    }
+
+    def initialize(view, layout_params)
+      self.view = view
+      self.params = layout_params.new(LAYOUT_SIZE_OPTIONS[:mp], LAYOUT_SIZE_OPTIONS[:wc])
+      self
+    end
+
+    def text=(t)
+      self.view.get.text = t
+    end
+
+    def width=(w)
+      if w == :mp || w == :wc
+        self.params.width = LAYOUT_SIZE_OPTIONS[w]
+      else
+        self.params.width = w
+      end
+    end
+
+    def height=(h)
+      if h == :mp || h == :wc
+        self.params.height = LAYOUT_SIZE_OPTIONS[h]
+      else
+        self.params.height = h
+      end
+    end
+
+    def orientation=(o)
+      if o == :vertical || o == :horizontal
+        self.view.get.orientation = ORIENTATION_OPTIONS[o]
+      end
+    end
+    
+    def weight_sum=(number)
+      self.view.get.weightSum = number
+    end
+    
+    def weight=(number)
+      self.params.weight = number
+    end
+    
+    def click=(method_name)
+      self.view.get.onClickListener = AQClickListener.new(self.view.activity, method_name)
+    end
+  end
+  
+  class AQClickListener
+    attr_accessor :activity, :method_name
+    def initialize(activity, method_name)
+      self.activity = activity
+      self.method_name = method_name
+    end
+    
+    def onClick(view)
+      self.activity.send(self.method_name.to_s, view)
+    end
+  end
+end
+
+
+class AndroidQuery
+  attr_accessor :activity, :stylesheet
+  
+  def initialize(activity, stylesheet)
+    self.activity = activity
+    self.stylesheet = stylesheet.new
+    self
+  end
+  
+  def create_android_query_view(view, style_method, layout_params, options = {})
+    AndroidMotionQuery::View.new(view, self.activity, self.stylesheet, style_method, layout_params, options)
+  end
+  
+  def linear_layout(style_method, &block)
+    view = Android::Widget::LinearLayout.new(self.activity)
+    layout_params = Android::Widget::LinearLayout::LayoutParams
+    aqv = create_android_query_view(view, style_method, layout_params, {})
+    self.stylesheet.apply_style_for(aqv, style_method, layout_params)
+    block.call(aqv) if block_given?
+    self.activity.setContentView(aqv.get)
+  end
+  
+  def toast(text, options = {})
+    options = {
+      gravity: :bottom,
+      length: :short
+    }.merge(options)
+
+    gravity_options = {
+      top: Android::View::Gravity::TOP,
+      left: Android::View::Gravity::LEFT,
+      right: Android::View::Gravity::RIGHT,
+      bottom: Android::View::Gravity::BOTTOM,
+      center: Android::View::Gravity::CENTER,
+      bottom_right: Android::View::Gravity::BOTTOM | Android::View::Gravity::RIGHT,
+      bottom_left: Android::View::Gravity::BOTTOM | Android::View::Gravity::LEFT,
+      center_right: Android::View::Gravity::CENTER | Android::View::Gravity::RIGHT,
+      center_left: Android::View::Gravity::CENTER | Android::View::Gravity::LEFT,
+      top_right: Android::View::Gravity::TOP | Android::View::Gravity::RIGHT,
+      top_left: Android::View::Gravity::TOP | Android::View::Gravity::LEFT,
+    }
+
+    length_options = {
+      short: Android::Widget::Toast::LENGTH_SHORT,
+      long: Android::Widget::Toast::LENGTH_LONG,
+    }
+
+    the_toast = Android::Widget::Toast.makeText(self.activity, text, length_options[options[:length]])
+    the_toast.setGravity(gravity_options[options[:gravity]], 0, 0)
+    the_toast.show    
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: android_query
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Abdullah Esmail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,8 +34,8 @@ files:
 - LICENSE.txt
 - README.md
 - lib/android_query.rb
-- lib/android_query/android_query.rb
 - lib/android_query/version.rb
+- lib/android_query/views.rb
 homepage: https://github.com/aesmail/android-query
 licenses:
 - MIT

data/lib/android_query/android_query.rb

@@ -1,178 +0,0 @@
-class AndroidQuery
-  attr_accessor :activity
-  
-  def initialize(source)
-    self.activity = source
-  end
-  
-  def layout(layout_sym, options = {}, &block)
-    layout_info = get_layout(layout_sym, options)
-    my_layout = create_layout_with_params(layout_info, options)
-    block_layout = {
-      layout: my_layout,
-      layout_class: layout_info[:layout_class],
-      params_class: layout_info[:params_class],
-      layout_sym: layout_sym,
-      parent: layout_info[:parent],
-    }
-    block.call(block_layout)
-    block_layout[:parent][:layout].addView(my_layout) if block_layout[:parent]
-    set_content(block_layout) if block_layout[:parent].nil?
-    block_layout
-  end
-  
-  def text_view(layout, options = {})
-    tv = Android::Widget::TextView.new(self.activity)
-    create_view_layout_params(tv, layout, options)
-  end
-  
-  def edit_text(layout, options = {})
-    et = Android::Widget::EditText.new(self.activity) 
-    create_view_layout_params(et, layout, options)
-  end
-  
-  def button(layout, options = {})
-    btn = Android::Widget::Button.new(self.activity)
-    create_view_layout_params(btn, layout, options)
-  end
-  
-  def set_content(layout, params = {})
-    self.activity.setContentView(layout[:layout])
-  end
-  
-  def get_layout(layout, options)
-    options = merge_options(options)
-    layout_and_params = case layout
-                        when :linear
-                          [Android::Widget::LinearLayout, Android::Widget::LinearLayout::LayoutParams]
-                        when :relative
-                          [Android::Widget::RelativeLayout, Android::Widget::RelativeLayout::LayoutParams]
-                        when :absolute
-                          [Android::Widget::AbsoluteLayout, Android::Widget::AbsoluteLayout::LayoutParams]
-                        else
-                          layout
-                        end
-    {
-      layout: nil,
-      layout_class: layout_and_params[0],
-      params_class: layout_and_params[1],
-      layout_sym: layout,
-      parent: options[:parent],
-    }
-  end
-  
-  def merge_options(options)
-    {
-      w: :mp,
-      h: :wc,
-      orientation: :vertical,
-      weight: 0,
-      weight_sum: 0,
-      parent: nil,
-      click: nil,
-      id: nil,
-    }.merge(options)
-  end
-  
-  def get_width(options, layout)
-    case options[:w]
-    when :mp, :match_parent
-      layout[:params_class]::MATCH_PARENT
-    when :wc, :wrap_content
-      layout[:params_class]::WRAP_CONTENT
-    else
-      options[:w]
-    end
-  end
-  
-  def get_height(options, layout)
-    case options[:h]
-    when :mp, :match_parent
-      layout[:params_class]::MATCH_PARENT
-    when :wc, :wrap_content
-      layout[:params_class]::WRAP_CONTENT
-    else
-      options[:h]
-    end
-  end
-  
-  def get_orientation(options, layout)
-    case options[:orientation]
-    when :vertical, :v
-      layout[:layout_class]::VERTICAL
-    when :horizontal, :h
-      layout[:layout_class]::HORIZONTAL
-    else
-      raise 'Please set either :horizontal or :vertical for the orientation'
-    end
-  end
-  
-  def create_layout_with_params(layout, options)
-    options = merge_options(options)
-    width = get_width(options, layout)
-    height = get_height(options, layout)
-    orientation = get_orientation(options, layout)
-    my_layout = layout[:layout_class].new(self.activity)
-    layout_params = layout[:params_class].new(width, height)
-    layout_params.weight = options[:weight] if layout[:layout_sym] == :linear
-    my_layout.setLayoutParams(layout_params)
-    my_layout.setOrientation(orientation) if layout[:layout_sym] == :linear
-    my_layout.setWeightSum(options[:weight_sum]) if layout[:layout_sym] == :linear
-    my_layout
-  end
-  
-  def create_view_layout_params(view, layout, options)
-    options = merge_options(options)
-    width = get_width(options, layout)
-    height = get_height(options, layout)
-    layout_params = layout[:params_class].new(width, height)
-    layout_params.weight = options[:weight]
-    view.setText(options[:text]) unless options[:text].nil?
-    view.setLayoutParams(layout_params)
-    view.onClickListener = AQClickListener.new(self.activity, options) if options[:click]
-    view.setId(options[:id]) if options[:id]
-    layout[:layout].addView(view)
-    view
-  end
-  
-  def find(view_id)
-    self.activity.findViewById(view_id)
-  end
-  
-  def toast(text, options = {})
-    options = {
-      gravity: :bottom,
-      length: :short
-    }.merge(options)
-    
-    gravity_options = {
-      top: Android::View::Gravity::TOP,
-      left: Android::View::Gravity::LEFT,
-      right: Android::View::Gravity::RIGHT,
-      bottom: Android::View::Gravity::BOTTOM,
-      center: Android::View::Gravity::CENTER,
-    }
-    
-    length_options = {
-      short: Android::Widget::Toast::LENGTH_SHORT,
-      long: Android::Widget::Toast::LENGTH_LONG,
-    }
-    
-    the_toast = Android::Widget::Toast.makeText(self.activity, text, length_options[options[:length]])
-    the_toast.setGravity(gravity_options[options[:gravity]], 0, 0)
-    the_toast.show
-  end
-end
-
-class AQClickListener
-  attr_accessor :activity, :options
-  
-  def initialize(activity, options)
-    self.activity = activity
-    self.options = options
-  end
-  
-  def onClick(view)
-    self.activity.send(self.options[:click], view)
-  end
-end