android_motion_query 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3835347be88f8b42c279a29b9b446338dfbc29e
-  data.tar.gz: deae968ca52cb5b0b2e9a3dcd0035b8e7a46cb68
+  metadata.gz: a229c9f9b35ef709975966d4a4527a28e2179a3f
+  data.tar.gz: 98375db35f31a7a8f65b23580dda5044adcfa3ce
 SHA512:
-  metadata.gz: c023102ff26902db3704a7fbd01eeded609b615e9aacb79813a77848024158983e76d707494ee7f1be961bd4def3c0bf5c49e6ef18c720033bf6c176ccaa0629
-  data.tar.gz: 2ecccde46ba389558abbfa07b749dcf5d95721420fb22cb244addc4c5e1f4d7588aa72609d8ac63410975a9a7bc7acf2f4cd6135b70616649205c75308a5187e
+  metadata.gz: 713f5b2fdee999eb6e40eeabed41e3d58b6f221022683b321eabf82d5aed11261cf583bf18de9584e1dcc3bb889526c647af4e1151f740b6d78b6b3630b26d34
+  data.tar.gz: eae6dc3aec88c7bf4992f701f7fbb513b14aed2403ba6ed2188f733f2f305a4bcdd636e84b1ff9370d6520eeb4991960ded54aa4c32a92a2732e54f1adc0f8a3

data/README.md

@@ -13,7 +13,7 @@ If you don't like dealing with XML layouts and long method names, `android_motio
 Add this line to your application's Gemfile:
 
 ```ruby
-  gem 'android_motion_query', '~> 0.1.0'
+  gem 'android_motion_query', '~> 0.2.0'
 ```
 
 And then execute:
@@ -27,15 +27,15 @@ Or install it yourself as:
 ## Usage
 
 The general rule is to create a top-level layout and add views to it.
-Each view accepts a style method.
+Each view accepts a style name as an argument.
 
 #### Tiny Example:
 
 To create a LinearLayout and add a TextView widget to it:
 
 ```ruby
-amq.linear_layout(:layout_style) do |my_layout|
-  my_layout.text_view(:some_information)
+amq.add(:linear_layout, :layout_style) do |my_layout|
+  my_layout.add(:text_view, :some_information)
 end
 ```
 
@@ -43,7 +43,7 @@ The style for the LinearLayout is `:layout_style` and the TextView has a `:some_
 
 How do you define styles?
 
-Styles are defined in a separate class that inherit from `AndroidMotionQuery::Stylesheet`.
+Styles are defined in a separate class that inherits from `AMQStylesheet`.
 
 Each style is passed a wrapper of the android view:
 
@@ -68,110 +68,124 @@ end
 
 #### Complete Example:
 
-```ruby
-class MainActivity < AMQScreen
-  def on_create(saved_state)
-    amq.stylesheet = HomeStyle
-    amq.linear_layout(:top_layout) do |top|
-      top.image_button(:bench_button)
-      top.image_button(:flower_button)
-      top.linear_layout(:directions) do |direction_layout|
-        direction_layout.text_view(:left_text)
-        direction_layout.button(:right_button)
-      end
-    end
-  end
-  
-  def coffee_message(view)
-    amq.toast('This is a message for COFFEE LOVERS :)', gravity: :center)
-  end
-  
-  def random_thing(view)
-    puts "This should be printed when I click the button"
-  end
-  
-  def another_toast(view)
-    amq.toast("This is a purple", gravity: :top_right, length: :long)
-  end
-end
-```
-
-The previous code produces the following app:
+This code creates the following simple calculator app:
 
 ![Sample Screenshot](screenshot.png)
 
-
-The following is the `HomeStyle` class that styles the screen:
 ```ruby
-class HomeStyle < AMQStylesheet
-  def top_layout(st)
-    st.width = :mp
-    st.height = 0
-    st.weight_sum = 4
-    st.orientation = :vertical
-    st.background_color = '#A87E54'
+class CalculatorScreen < AMQScreen
+  def on_create(state)
+    setup_calculator_variables
+    amq.stylesheet = CalculatorStyle
+    amq.add(:linear_layout, :top_layout) do |top|
+      @result_label = top.add(:text_view, :result_label)
+      top.add(:linear_layout, :buttons_layout) do |bottom|
+        bottom.add(:linear_layout, :row_layout) do |row|
+          row.add(:button, :ac).tap { reset_calculator }
+          row.add(:button, :plus_minus).tap { amq.toast('This is not supported yet') }
+          row.add(:button, :percentage).tap { amq.toast('This is not supported yet') }
+          row.add(:button, :division).tap { save_result_with_operation(:div) }
+        end
+        
+        bottom.add(:linear_layout, :row_layout) do |row|
+          row.add(:button, :seven).tap { add_digit('7') }
+          row.add(:button, :eight).tap { add_digit('8') }
+          row.add(:button, :nine).tap { add_digit('9') }
+          row.add(:button, :multiplication).tap { save_result_with_operation(:mul) }
+        end
+        
+        bottom.add(:linear_layout, :row_layout) do |row|
+          row.add(:button, :four).tap { add_digit('4') }
+          row.add(:button, :five).tap { add_digit('5') }
+          row.add(:button, :six).tap { add_digit('6') }
+          row.add(:button, :minus).tap { save_result_with_operation(:min) }
+        end
+        
+        bottom.add(:linear_layout, :row_layout) do |row|
+          row.add(:button, :one).tap { add_digit('1') }
+          row.add(:button, :two).tap { add_digit('2') }
+          row.add(:button, :three).tap { add_digit('3') }
+          row.add(:button, :plus).tap { save_result_with_operation(:add) }
+        end
+        
+        bottom.add(:linear_layout, :row_layout) do |row|
+          row.add(:button, :zero).tap { add_digit('0') }
+          row.add(:button, :decimal_point).tap { add_decimal }
+          row.add(:button, :equals).tap { calculate_result }
+        end
+      end
+    end
   end
   
-  def bench_button(st)
-    st.width = :mp
-    st.margin_top = 10
-    st.margin_bottom = 10
-    st.background_image = 'bench' # <-- image is resources/drawable/bench.png
-    st.click = :coffee_message
-    shared_button_styles(st)
+  def setup_calculator_variables
+    @start_new_number = true
+    @first_number = 0
+    @result = 0
+    @operation = nil
   end
   
-  def flower_button(st)
-    st.width = :mp
-    st.background_image = 'flower'
-    st.click = :random_thing
-    shared_button_styles(st)
+  def add_digit(digit)
+    @result_label.text = '' if @start_new_number
+    display = @result_label.text + digit
+    if display['.']
+      display = display.to_f unless digit == '0'
+    else
+      display = display.to_i
+    end
+    @result_label.text = display.to_s
+    @start_new_number = false
   end
   
-  def shared_button_styles(st)
-    st.height = 0
-    st.padding = 0
-    st.margin_left = 10
-    st.margin_right = 10
-    st.scale_type = :fit_xy
-    st.weight = 1.5
+  def add_decimal
+    display = @result_label.text
+    @result_label.text = display + '.'
   end
   
-  def directions(st)
-    st.orientation = :horizontal
-    st.weight = 1
-    st.weight_sum = 2
-    st.width = :mp
-    st.height = 0
-    st.margin_top = 10
+  def reset_calculator
+    @result_label.text = '0'
+    @result = 0
+    @first_number = 0
+    @start_new_number = true
+    @operation = nil
   end
   
-  def left_text(st)
-    st.weight = 1
-    st.text = 'android_query is AWESOME!'
-    st.text_alignment = :center
+  def save_result_with_operation(op)
+    display = @result_label.text
+    @first_number = display.to_f
+    @operation = op
+    @start_new_number = true
   end
   
-  def right_button(st)
-    st.weight = 1
-    st.text = 'Click Me'
-    st.click = :another_toast
-    st.background_color = '#927FD5'
-    st.text_color = :white
+  def calculate_result
+    display = @result_label.text.to_f
+    case @operation
+    when :add
+      @result = @first_number + display
+    when :min
+      @result = @first_number - display
+    when :mul
+      @result = @first_number * display
+    when :div
+      @result = @first_number / display
+    end
+    @result_label.text = @result.to_s
   end
 end
 ```
 
+Please check the `example` folder for the complete calculator app code.
+
+
 ## Todo List
 - [ ] Refactor - create more "single responsibility" classes and have smaller functions (this will never be "done", it's just here as a constant reminder)
 - [ ] Set automatic IDs for views
 - [ ] Add wrappers for all built-in android widgets (currently android_query supports 5 widgets)
 - [x] Add support for LinearLayouts
 - [ ] Add support for RelativeLayouts
-- [ ] Add support for FrameLayouts
+- [x] Add support for FrameLayouts
 - [ ] Add support for AbsoluteLayouts (worth it? AbsoluteLayout is deprecated a long time ago)
-- [x] Add support for working with custom widgets/views (throught `aqv.new_view()`)
-- [ ] Add support for `view.click { block of code }`
+- [x] Add support for working with custom widgets/views (through `amq.new_view()`)
+- [x] Add support for `amq.tap { block of code }` for `onClickListener` events
 - [ ] Add support for @string values (strings.xml)
 - [x] Add support for @drawable values (images in the resources/drawable directory)
 - [ ] Add support for easy and quick animations

data/lib/android_motion_query/adapters.rb

@@ -1,9 +1,11 @@
 class AMQAdapter < Android::Widget::BaseAdapter
-  attr_accessor :mContext, :items
+  attr_accessor :context, :items, :view_block
   
-  def initialize(context, list, options={})
-    self.mContext = context
+  def initialize(context, list, &block)
+    self.context = context
     self.items = list
+    self.view_block = block if block_given?
+    self
   end
   
   def getCount
@@ -19,8 +21,16 @@ class AMQAdapter < Android::Widget::BaseAdapter
   end
   
   def getView(position, convert_view, parent)
-    text_view = Android::Widget::TextView.new(self.mContext)
-    text_view.text = self.items[position]
-    text_view
+    self.custom_view(position, convert_view, parent, &self.view_block)
+  end
+  
+  def custom_view(position, convert_view, parent, &block)
+    if block_given?
+      block.call(self.items[position], position)
+    else
+      text_view = Android::Widget::TextView.new(self.context)
+      text_view.text = self.items[position]
+      text_view
+    end
   end
 end

data/lib/android_motion_query/amq.rb

@@ -16,12 +16,24 @@ class AndroidMotionQuery
     self.stylesheet.apply_style_for(self.root, style_method, layout_params)
     block.call(self.root) if block_given?
     self.activity.setContentView(self.root.get)
+    self
+  end
+  
+  def create_standalone_amq_view(view, style_method, layout_params, options = {}, &block)
+    amq_view = AMQView.new(view, self.activity, self.stylesheet, style_method, layout_params, options)
+    self.stylesheet.apply_style_for(amq_view, style_method, layout_params)
+    block.call(amq_view) if block_given?
+    amq_view
   end
   
   def find(id)
     self.root.get.findViewById(id).tag
   end
   
+  def add(view_sym, style, &block)
+    self.send(view_sym, style, &block)
+  end
+  
   def linear_layout(style_method, &block)
     view = Android::Widget::LinearLayout.new(self.activity)
     layout_params = Android::Widget::LinearLayout::LayoutParams
@@ -30,10 +42,22 @@ class AndroidMotionQuery
   
   def relative_layout(style_method, &block)
     view = Android::Widget::RelativeLayout.new(self.activity)
-    layout_params = Android::Widget::RelativeLayout::Params
+    layout_params = Android::Widget::RelativeLayout::LayoutParams
     create_android_query_view(view, style_method, layout_params, {}, &block)
   end
   
+  def frame_layout(style_method, &block)
+    view = Android::Widget::FrameLayout.new(self.activity)
+    layout_params = Android::Widget::FrameLayout::LayoutParams
+    create_android_query_view(view, style_method, layout_params, {}, &block)
+  end
+  
+  def text_view(style_method, &block)
+    view = Android::Widget::TextView.new(self.activity)
+    layout_params = Android::Widget::LinearLayout::LayoutParams
+    create_standalone_amq_view(view, style_method, layout_params, {}, &block)
+  end
+  
   def toast(text, options = {})
     options = {
       gravity: :bottom,

data/lib/android_motion_query/events.rb

@@ -9,3 +9,18 @@ class AMQClickListener
     self.activity.send(self.method_name.to_s, view)
   end
 end
+
+
+class AMQTapListener
+  attr_accessor :activity, :amq, :callback
+  def initialize(activity, amq, &block)
+    self.activity = activity
+    self.callback = block
+    self.amq = amq
+    self
+  end
+  
+  def onClick(view)
+    self.callback.call(view)
+  end
+end

data/lib/android_motion_query/screen.rb

@@ -1,5 +1,6 @@
 class AMQScreen < Android::App::Activity
-  attr_accessor :amq
+  attr_accessor :amq, :extras
+  
   def onCreate(savedInstance)
     super
     self.create_amq_object
@@ -10,18 +11,19 @@ class AMQScreen < Android::App::Activity
     self.amq = AndroidMotionQuery.new(self)
   end
   
-  def open(screen, extra={})
+  def open_screen(screen, extra_data={})
     intent = Android::Content::Intent.new(self, screen)
-    extra.each {|k, v| intent.putExtra(k.to_s, v) }
+    extra_data.each do |k, v|
+      intent.putExtra(k.to_s, v)
+    end
     startActivity(intent)
   end
   
-  def extras
-    # TODO implement a way to get information from the putExtra() method
-    # puts self.getIntent.getExtras
-    # if k
-    #   package_name = self.getPackageName
-    #   self.getExtras
-    # self.getExtras
+  def extra(key)
+    data = getIntent.getExtra(key.to_s)
+    if data.nil?
+      puts "WARNING: The extra data (#{key.to_s}) you are trying to get is nil"
+    end
+    data
   end
 end

data/lib/android_motion_query/stylesheet.rb

@@ -1,4 +1,67 @@
+# TYPE_FACE = Android::Graphics::TypeFace
+# TYPE_FACE_OPTIONS = {
+#   normal:           TYPE_FACE::Create("sans-serif",            TYPE_FACE::NORMAL),
+#   normal_bold:      TYPE_FACE::Create("sans-serif",            TYPE_FACE::BOLD),
+#   light:            TYPE_FACE::Create("sans-serif-light",      TYPE_FACE::NORMAL),
+#   light_bold:       TYPE_FACE::Create("sans-serif-light",      TYPE_FACE::BOLD),
+#   condensed:        TYPE_FACE::Create("sans-serif-condensed",  TYPE_FACE::NORMAL),
+#   condensed_bold:   TYPE_FACE::Create("sans-serif-condensed",  TYPE_FACE::BOLD),
+# }
+
+VIEW_GROUP_PARAMS = Android::View::ViewGroup::LayoutParams
+LAYOUT_SIZE_OPTIONS = {
+  mp: VIEW_GROUP_PARAMS::MATCH_PARENT,
+  wc: VIEW_GROUP_PARAMS::WRAP_CONTENT,
+}
+
+LINEAR_LAYOUT = Android::Widget::LinearLayout
+ORIENTATION_OPTIONS = {
+  vertical:   LINEAR_LAYOUT::VERTICAL,
+  horizontal: LINEAR_LAYOUT::HORIZONTAL,
+}
+
+SCALE_TYPE = Android::Widget::ImageView::ScaleType
+SCALE_TYPES = {
+  center:         SCALE_TYPE::CENTER,
+  center_crop:    SCALE_TYPE::CENTER_CROP,
+  center_inside:  SCALE_TYPE::CENTER_INSIDE,
+  fit_center:     SCALE_TYPE::FIT_CENTER,
+  fit_end:        SCALE_TYPE::FIT_END,
+  fit_start:      SCALE_TYPE::FIT_START,
+  fit_xy:         SCALE_TYPE::FIT_XY,
+  matrix:         SCALE_TYPE::MATRIX,
+}
+
 INPUT_TYPE = Android::Text::InputType
+INPUT_TYPES = {
+  normal:             INPUT_TYPE::TYPE_CLASS_TEXT,
+  password:           INPUT_TYPE::TYPE_CLASS_TEXT | INPUT_TYPE::TYPE_TEXT_VARIATION_PASSWORD,
+  visible_password:   INPUT_TYPE::TYPE_CLASS_TEXT | INPUT_TYPE::TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,
+  number:             INPUT_TYPE::TYPE_CLASS_NUMBER,
+  email:              INPUT_TYPE::TYPE_CLASS_TEXT | INPUT_TYPE::TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
+  phone:              INPUT_TYPE::TYPE_CLASS_PHONE,
+  date:               INPUT_TYPE::TYPE_CLASS_DATETIME | INPUT_TYPE::TYPE_DATETIME_VARIATION_DATE,
+  time:               INPUT_TYPE::TYPE_CLASS_DATETIME | INPUT_TYPE::TYPE_DATETIME_VARIATION_TIME,
+  datetime:           INPUT_TYPE::TYPE_CLASS_DATETIME,
+}
+
+GRAVITY = Android::View::Gravity
+GRAVITY_OPTIONS = {
+  top:                GRAVITY::TOP,
+  left:               GRAVITY::LEFT,
+  right:              GRAVITY::RIGHT,
+  bottom:             GRAVITY::BOTTOM,
+  center:             GRAVITY::CENTER,
+  center_horizontal:  GRAVITY::CENTER_HORIZONTAL,
+  center_vertical:    GRAVITY::CENTER_VERTICAL,
+  bottom_right:       GRAVITY::BOTTOM | GRAVITY::RIGHT,
+  bottom_left:        GRAVITY::BOTTOM | GRAVITY::LEFT,
+  center_right:       GRAVITY::CENTER | GRAVITY::RIGHT,
+  center_left:        GRAVITY::CENTER | GRAVITY::LEFT,
+  top_right:          GRAVITY::TOP | GRAVITY::RIGHT,
+  top_left:           GRAVITY::TOP | GRAVITY::LEFT,
+}
+
 
 class AMQStylesheet
   def apply_style_for(view, style_name, layout_params)
@@ -15,19 +78,9 @@ end
 class AMQStylesheetElement
   attr_accessor :view, :params, :radius
   
-  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.params = layout_params.new(LAYOUT_SIZE_OPTIONS[:mp], LAYOUT_SIZE_OPTIONS[:mp])
     self
   end
   
@@ -38,6 +91,7 @@ class AMQStylesheetElement
   
   def text=(t)
     self.view.get.text = t
+    self
   end
 
   def width=(w)
@@ -181,28 +235,27 @@ class AMQStylesheetElement
   #   result
   # end
   
+  def border_color=(color)
+    shape = Android::Graphics::Drawable::ShapeDrawable.new
+    shape.shape = Android::Graphics::Drawable::Shapes::RectShape.new
+    shape.paint.color = AMQColor.parse_color(color.to_s)
+    shape.paint.strokeWidth = 1
+    shape.paint.style = Android::Graphics::Paint::Style::STROKE
+    self.view.get.background = shape
+  end
+  
   def background_color=(color)
     self.view.get.backgroundColor = AMQColor.parse_color(color.to_s)
   end
   
-  def background_image=(image_name)
+  def image=(image_name)
     context = self.view.get.getContext
     resource_id = context.getResources.getIdentifier(image_name, "drawable", context.getPackageName)
     self.view.get.setImageResource(resource_id)
   end
   
   def scale_type=(option)
-    scale_types = {
-      center: Android::Widget::ImageView::ScaleType::CENTER,
-      center_crop: Android::Widget::ImageView::ScaleType::CENTER_CROP,
-      center_inside: Android::Widget::ImageView::ScaleType::CENTER_INSIDE,
-      fit_center: Android::Widget::ImageView::ScaleType::FIT_CENTER,
-      fit_end: Android::Widget::ImageView::ScaleType::FIT_END,
-      fit_start: Android::Widget::ImageView::ScaleType::FIT_START,
-      fit_xy: Android::Widget::ImageView::ScaleType::FIT_XY,
-      matrix: Android::Widget::ImageView::ScaleType::MATRIX,
-    }
-    self.view.get.scaleType = scale_types[option]
+    self.view.get.scaleType = SCALE_TYPES[option]
   end
   
   def text_alignment=(alignment)
@@ -213,22 +266,22 @@ class AMQStylesheetElement
     self.view.get.textColor = AMQColor.parse_color(color.to_s)
   end
   
+  def text_size=(size)
+    self.view.get.textSize = size
+  end
+  
+  # def font=(font)
+  #   if TYPE_FACE_OPTIONS.keys.include? font
+  #     self.view.get.typeFace = TYPE_FACE_OPTIONS[font]
+  #   else
+  #     raise "The value #{font} is not a supported font value. Use one of #{TYPE_FACE_OPTIONS.keys}"
+  #   end
+  # end
+  
   def hint=(t)
     self.view.get.hint = t
   end
   
-  INPUT_TYPES = {
-    normal: INPUT_TYPE::TYPE_CLASS_TEXT,
-    password: INPUT_TYPE::TYPE_CLASS_TEXT | INPUT_TYPE::TYPE_TEXT_VARIATION_PASSWORD,
-    visible_password: INPUT_TYPE::TYPE_CLASS_TEXT | INPUT_TYPE::TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,
-    number: INPUT_TYPE::TYPE_CLASS_NUMBER,
-    email: INPUT_TYPE::TYPE_CLASS_TEXT | INPUT_TYPE::TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
-    phone: INPUT_TYPE::TYPE_CLASS_PHONE,
-    date: INPUT_TYPE::TYPE_CLASS_DATETIME | INPUT_TYPE::TYPE_DATETIME_VARIATION_DATE,
-    time: INPUT_TYPE::TYPE_CLASS_DATETIME | INPUT_TYPE::TYPE_DATETIME_VARIATION_TIME,
-    datetime: INPUT_TYPE::TYPE_CLASS_DATETIME,
-  }
-  
   def input_type=(text_type)
     if INPUT_TYPES.keys.include? text_type
       self.view.get.inputType = INPUT_TYPES[text_type]
@@ -238,21 +291,6 @@ class AMQStylesheetElement
     end
   end
   
-  GRAVITY = Android::View::Gravity
-  GRAVITY_OPTIONS = {
-    top: GRAVITY::TOP,
-    left: GRAVITY::LEFT,
-    right: GRAVITY::RIGHT,
-    bottom: GRAVITY::BOTTOM,
-    center: GRAVITY::CENTER,
-    bottom_right: GRAVITY::BOTTOM | GRAVITY::RIGHT,
-    bottom_left: GRAVITY::BOTTOM | GRAVITY::LEFT,
-    center_right: GRAVITY::CENTER | GRAVITY::RIGHT,
-    center_left: GRAVITY::CENTER | GRAVITY::LEFT,
-    top_right: GRAVITY::TOP | GRAVITY::RIGHT,
-    top_left: GRAVITY::TOP | GRAVITY::LEFT,
-  }
-  
   def gravity=(alignment)
     if GRAVITY_OPTIONS.keys.include? alignment
       self.view.get.gravity = GRAVITY_OPTIONS[alignment]
@@ -261,4 +299,13 @@ class AMQStylesheetElement
       self.gravity = :center
     end
   end
+  
+  def layout_gravity=(alignment)
+    if GRAVITY_OPTIONS.keys.include? alignment
+      self.params.gravity = GRAVITY_OPTIONS[alignment]
+    else
+      puts "The value #{alignment} is not a supported gravity value. Defaulting to center."
+      self.params.gravity = :center
+    end
+  end
 end

data/lib/android_motion_query/version.rb

@@ -1,3 +1,3 @@
 module AndroidQuery
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/android_motion_query/views.rb

@@ -14,7 +14,7 @@ class AMQView
   
   # convenience methods
   def id; get.id end
-  def id=(vid); get.id = vid end
+  def id=(vid); get.id = vid; self end
   def get; self.view end
   def left; get.getLeft end
   def right; get.getRight end
@@ -24,7 +24,12 @@ class AMQView
   def height; get.getHeight end
   def text; get.text end
   def text=(t); get.text = t end
-
+  def data(t); get.text = t; self end
+  def tap(&block)
+    self.get.onClickListener = AMQTapListener.new(self.activity, self, &block)
+    self
+  end
+  
   def create_android_query_view(view, style_method, layout_params, options = {}, &block)
     aqv = AMQView.new(view, self.activity, self.stylesheet, style_method, layout_params, options)
     self.stylesheet.apply_style_for(aqv, style_method, layout_params)
@@ -33,11 +38,27 @@ class AMQView
     aqv
   end
   
+  def add(view_sym, style, &block)
+    self.send(view_sym, style, &block)
+  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 relative_layout(style_method, &block)
+    view = Android::Widget::RelativeLayout.new(self.activity)
+    lp = Android::Widget::RelativeLayout::LayoutParams
+    create_android_query_view(view, style_method, lp, {}, &block)
+  end
+  
+  def frame_layout(style_method, &block)
+    view = Android::Widget::FrameLayout.new(self.activity)
+    lp = Android::Widget::FrameLayout::LayoutParams
+    create_android_query_view(view, style_method, lp, {}, &block)
+  end
 
   def text_view(style_method, &block)
     view = Android::Widget::TextView.new(self.activity)
@@ -65,10 +86,16 @@ class AMQView
   end
   
   def grid_view(style_method, &block)
-    view = Android::Widget::GridView.new(self)
+    view = Android::Widget::GridView.new(self.activity)
     new_view(view, style_method, &block)
   end
   
+  def adapter(list, &block)
+    # this method has to be called from a grid_view or similar views (which accept adapters)
+    self.get.adapter = AMQAdapter.new(self.activity, list, &block)
+    self
+  end
+  
   def new_view(view, style_method, &block)
     create_android_query_view(view, style_method, self.layout_params, {}, &block)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: android_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Abdullah Esmail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,7 +42,7 @@ files:
 - lib/android_motion_query/stylesheet.rb
 - lib/android_motion_query/version.rb
 - lib/android_motion_query/views.rb
-homepage: https://github.com/aesmail/android-query
+homepage: https://github.com/aesmail/android-motion-query
 licenses:
 - MIT
 metadata: {}