android_query 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cac681d57bb85063a53184fa2da5889f2c5b6cf
-  data.tar.gz: 0a02022cd528fe128f5d4e4b0c8796a5c9091556
+  metadata.gz: 1fae24679345a4398a3d4c74bfec81e04a949473
+  data.tar.gz: 562ab6af7cd492f6a4ae51bfbe9dff7a06074ea3
 SHA512:
-  metadata.gz: 96a173ed0a4dae949e3ad96ecc0faac8324424c3f6327604aad7f106b8875618d8de9abeaa04caa1391279299ca45f405ab0373c4eda531bfec359039c2355f2
-  data.tar.gz: d63d96e315e7dc598aab325e691cb53b3227093e8766598b711d9c6c6f536c956b0c9d25a0b35bd120e1bc191e5b9b5681f3bb68ad770cec8ccd98ec08abe1ab
+  metadata.gz: 02dc384ec6f0cbbd858e04bed96e1baaac1ed05e04f7fffbc50753f18f4a92c364ce707943ae0c133e0ff8919e1f60d2818f20d984b54e064dc9e135f162014c
+  data.tar.gz: 106b1946d4989ff99f1e64f560731e072f00ccbb5a96ccbabb48cfdc963a59593ae96236b18c29c69e5ae6d6424e0da44607d7f49897c6bf72110f035db1070e

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.5'
+  gem 'android_query', '~> 0.0.6'
 ```
 
 And then execute:
@@ -33,90 +33,108 @@ Each view should be passed a style method.
 
 ```ruby
 class MainActivity < Android::App::Activity
-  attr_accessor :aq, :counter
+  attr_accessor :aq
   
   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)
+    aq.linear_layout(:top_layout) do |top|
+      top.image_button(:plumbing_button)
+      top.image_button(:electricity_button)
+      top.linear_layout(:directions) do |direction_layout|
+        direction_layout.text_view(:left_text)
+        direction_layout.button(:right_button)
       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)
+  def coffee_message(view)
+    aq.toast('This is a message for COFFEE LOVERS :)', gravity: :center)
   end
   
-  def increment_counter(view)
-    self.counter += 1
+  def random_thing(view)
+    puts "This should be printed when I click the button"
   end
   
-  def decrement_counter(view)
-    self.counter -= 1
+  def another_toast(view)
+    aq.toast("This is a purple", gravity: :top_right, length: :long)
   end
 end
 ```
+
 The previous code produces the following app:
+
 ![Sample Screenshot](screenshot.png)
 
 
 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
+  def top_layout(st)
+    st.width = :mp
+    st.height = 0
+    st.weight_sum = 4
+    st.orientation = :vertical
+    st.background_color = '#A87E54'
   end
   
-  def phone_field(v)
-    v.text = 'Hello My Style!'
-    v.weight = 4
+  def plumbing_button(st)
+    st.width = :mp
+    st.margin_top = 10
+    st.margin_bottom = 10
+    st.background_image = 'bench'
+    st.click = :coffee_message
+    shared_button_styles(st)
   end
   
-  def email_field(v)
-    v.text = 'This is my email'
-    v.weight = 1
+  def electricity_button(st)
+    st.width = :mp
+    st.background_image = 'flower'
+    st.click = :random_thing
+    shared_button_styles(st)
   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
+  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
   end
   
-  def counter_layout(v)
-    v.orientation = :horizontal
-    v.width = :mp 
-    v.height = :wc
-    v.weight_sum = 2
+  def directions(st)
+    st.orientation = :horizontal
+    st.weight = 1
+    st.weight_sum = 2
+    st.width = :mp
+    st.height = 0
+    st.margin_top = 10
   end
   
-  def increment(v)
-    v.text = '+ Increment'
-    v.click = :increment_counter
-    v.weight = 1
+  def left_text(st)
+    st.weight = 1
+    st.text = 'android_query is AWESOME!'
+    st.text_alignment = :center
   end
   
-  def decrement(v)
-    v.text = '- Decrement'
-    v.click = :decrement_counter
-    v.weight = 1
+  def right_button(st)
+    st.weight = 1
+    st.text = 'Click Me'
+    st.click = :another_toast
+    st.background_color = '#927FD5'
+    st.text_color = :white
   end
 end
 ```
 
+## Todo List
+- [ ] Set automatic IDs for views
+- [ ] Support all built-in android widgets (currently android_query supports 4 widgets)
+- [ ] Support @string
+- [x] Support @drawable
+- [ ] Support easy animations
+
 ## 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.5"
+  VERSION = "0.0.6"
 end

data/lib/android_query/views.rb

@@ -1,6 +1,6 @@
 module AndroidMotionQuery
   class View
-    attr_accessor :view, :activity, :stylesheet, :style_name, :layout_params, :options
+    attr_accessor :view, :activity, :stylesheet, :style_name, :layout_params, :options, :extra
 
     def initialize(view, activity, stylesheet, style_name, layout_params, options = {})
       self.view = view
@@ -12,14 +12,22 @@ module AndroidMotionQuery
         parent: nil,
       }.merge(options)
     end
-
-    def get
-      self.view
-    end
+    
+    # convenience methods
+    def get; self.view end
+    def left; get.getLeft end
+    def right; get.getRight end
+    def bottom; get.getBottom end
+    def top; get.getTop end
+    def width; get.getWidth end
+    def height; get.getHeight end
+    def text; get.text end
+    def text=(t); get.text = t 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)
+      puts "Adding #{aqv.get} to #{self.get}"
       self.get.addView(aqv.get)
       block.call(aqv) if block_given?
       aqv
@@ -45,6 +53,20 @@ module AndroidMotionQuery
       view = Android::Widget::Button.new(self.activity)
       create_android_query_view(view, style_method, self.layout_params, {}, &block)
     end
+    
+    def image_view(style_method, &block)
+      view = Android::Widget::ImageView.new(self.activity)
+      create_android_query_view(view, style_method, self.layout_params, {}, &block)
+    end
+    
+    def image_button(style_method, &block)
+      view = Android::Widget::ImageButton.new(self.activity)
+      create_android_query_view(view, style_method, self.layout_params, {}, &block)
+    end
+    
+    def new_view(view, style_method, &block)
+      create_android_query_view(view, style_method, self.layout_params, {}, &block)
+    end
   end
 
   class Stylesheet
@@ -52,12 +74,13 @@ module AndroidMotionQuery
       style_view = StylesheetElement.new(view, layout_params)
       self.send(style_name.to_s, style_view)
       view.get.setLayoutParams(style_view.params)
+      view.get.tag = view
       view
     end
   end
 
   class StylesheetElement
-    attr_accessor :view, :params
+    attr_accessor :view, :params, :radius
 
     LAYOUT_SIZE_OPTIONS = {
       mp: Android::View::ViewGroup::LayoutParams::MATCH_PARENT,
@@ -74,7 +97,12 @@ module AndroidMotionQuery
       self.params = layout_params.new(LAYOUT_SIZE_OPTIONS[:mp], LAYOUT_SIZE_OPTIONS[:wc])
       self
     end
-
+    
+    def id=(number)
+      
+      self.view.get.id = number
+    end
+    
     def text=(t)
       self.view.get.text = t
     end
@@ -109,9 +137,169 @@ module AndroidMotionQuery
       self.params.weight = number
     end
     
+    def padding_left=(number)
+      left, top, right, bottom = get_padding
+      self.padding = [number, top, right, bottom]
+    end
+    
+    def padding_right=(number)
+      left, top, right, bottom = get_padding
+      self.padding = [left, top, number, bottom]
+    end
+    
+    def padding_top=(number)
+      left, top, right, bottom = get_padding
+      self.padding = [left, number, right, bottom]
+    end
+    
+    def padding_bottom=(number)
+      left, top, right, bottom = get_padding
+      self.padding = [left, top, right, number]
+    end
+    
+    def padding=(number)
+      if number.class == Array && number.count == 4
+        left, top, right, bottom = number
+        self.view.get.setPadding(left, top, right, bottom)
+      elsif number.class == Fixnum
+        self.view.get.setPadding(number, number, number, number)
+      else
+        raise "Invalid value (#{number}) set as padding for #{self.view.get}"
+      end
+    end
+    
+    def get_padding
+      v = self.view.get
+      [v.getPaddingLeft, v.getPaddingTop, v.getPaddingRight, v.getPaddingBottom]
+    end
+    
+    def margin_left=(number)
+      left, top, right, bottom = get_margins
+      self.margin = [number, top, right, bottom]
+    end
+    
+    def margin_right=(number)
+      left, top, right, bottom = get_margins
+      self.margin = [left, top, number, bottom]
+    end
+    
+    def margin_top=(number)
+      left, top, right, bottom = get_margins
+      self.margin = [left, number, right, bottom]
+    end
+    
+    def margin_bottom=(number)
+      left, top, right, bottom = get_margins
+      self.margin = [left, top, right, number]
+    end
+    
+    def get_margins
+      lp = self.params
+      [lp.leftMargin, lp.topMargin, lp.rightMargin, lp.bottomMargin]
+    end
+    
+    def margin=(number)
+      if number.class == Array && number.count == 4
+        left, top, right, bottom = number
+        self.params.setMargins(left, top, right, bottom)
+      elsif number.class == Fixnum
+        self.params.setMargins(number, number, number, number)
+      else
+        raise "Invalid value (#{number}) set as margin for #{self.view.get}"
+      end
+    end
+    
+    def extra=(something)
+      self.view.extra = something
+    end
+    
     def click=(method_name)
       self.view.get.onClickListener = AQClickListener.new(self.view.activity, method_name)
     end
+    
+    # TODO find a solution for rounded corners (with or without images)
+    # def corner_radius=(radius)
+    #   self.radius ||= radius
+    #   drawable = self.view.get.getDrawable
+    #   if drawable
+    #     self.draw_image_with_radius(drawable, self.radius)
+    #   else
+    #     shape = Android::Graphics::GradientDrawable.new
+    #     shape.cornerRadius = self.radius
+    #     self.view.get.background = shape
+    #   end
+    # end
+    # TODO find a solution for rounded corners (with or without images)
+    # def draw_image_with_radius(image, radius)
+    #   self.radius ||= radius
+    #   width = image.getWidth
+    #   height = image.getHeight
+    #   result = Android::Graphics::Bitmap.createBitmap(width, height, Android::Graphics::Bitmap::Config::ARGB_8888)
+    #   canvas = Android::Graphics::Canvas.new(result)
+    #   canvas.drawARGB(0, 0, 0, 0)
+    #   paint = Android::Graphics::Paint.new
+    #   paint.antiAlias = true
+    #   paint.color = AQColor.parse_color('#000000')
+    #   rect = Android::Graphics::Rect.new(0, 0, width, height)
+    #   rect_f = Android::Graphics::RectF.new(rect)
+    #   canvas.drawRoundRect(rect_f, self.radius, self.radius, paint)
+    #   paint.xfermode = Android::Graphics::PorterDuffXfermode.new(Android::Graphics::PorterDuff::Mode::SRC_IN)
+    #   canvas.drawBitmap(raw, rect, rect, paint)
+    #   result
+    # end
+    
+    def background_color=(color)
+      self.view.get.backgroundColor = AQColor.parse_color(color.to_s)
+    end
+    
+    def background_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]
+    end
+    
+    def text_alignment=(alignment)
+      self.gravity = alignment
+    end
+    
+    def text_color=(color)
+      self.view.get.textColor = AQColor.parse_color(color.to_s)
+    end
+    
+    def gravity=(alignment)
+      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,
+      }
+      self.view.get.gravity = gravity_options[alignment]
+    end
+  end
+  
+  class AQColor
+    def self.parse_color(hex); Android::Graphics::Color.parseColor(hex) end
   end
   
   class AQClickListener
@@ -129,7 +317,7 @@ end
 
 
 class AndroidQuery
-  attr_accessor :activity, :stylesheet
+  attr_accessor :activity, :stylesheet, :root, :view_ids
   
   def initialize(activity, stylesheet)
     self.activity = activity
@@ -137,17 +325,27 @@ class AndroidQuery
     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)
+  def create_android_query_view(view, style_method, layout_params, options = {}, &block)
+    self.root = AndroidMotionQuery::View.new(view, self.activity, self.stylesheet, style_method, layout_params, options)
+    self.stylesheet.apply_style_for(self.root, style_method, layout_params)
+    block.call(self.root) if block_given?
+    self.activity.setContentView(self.root.get)
+  end
+  
+  def find(id)
+    self.root.get.findViewById(id).tag
   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)
+    create_android_query_view(view, style_method, layout_params, {}, &block)
+  end
+  
+  def relative_layout(style_method, &block)
+    view = Android::Widget::RelativeLayout.new(self.activity)
+    layout_params = Android::Widget::RelativeLayout::Params
+    create_android_query_view(view, style_method, layout_params, {}, &block)
   end
   
   def toast(text, options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: android_query
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Abdullah Esmail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake