android-xml 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d506adcceb4029ba73f444e1bfb5c31f67c95df0
-  data.tar.gz: 84898757fcdcf17cacc66d4960a5935b99ab9274
+  metadata.gz: 74fdc8cf167a00e6fc913368b39b225d0d4d0c1c
+  data.tar.gz: e50d23184c0a996f2b5d9557d468e97d4e7dd001
 SHA512:
-  metadata.gz: b27e7d59f2d2c4158380e5a4241dd99040b1b970dd5885c0c684563ac1e29264b624f0f343c84736016527cb6cc0619917f0388577c4b35a4050ac8756feca7f
-  data.tar.gz: 9f09c2c75c8b22a14fb1fbf138dee0e1bd4a9ea121cf461c1a4062fe452f16e08b6d99136a9f3658ebd5987120e2fa745e15367db8043de19e5714217f54ada6
+  metadata.gz: 3cf9021c429ed0baa13e54e82f4c7f5c973b2ea5954da51a88222d3f8f0151d764593a913443350937a67631c9ff2306ee6d2c8ff554594921741709afddddc9
+  data.tar.gz: 5230c0bb21226467546661037a8899016fb87fde53b752798ea9462760c5fcda8d72c7ead82d01d6b413188dc513b150a33f18ad9fbfc59861edb8d23bbe7aba

data/README.md

@@ -17,6 +17,7 @@ end
 
 AndroidXml.write_all
 AndroidXml.clean_up 'res/'
+AndroidXml.missing_strings?
 ```
 
     > ruby generate_xml.rb
@@ -81,9 +82,12 @@ end
 # strings.
 AndroidXml.write_all
 AndroidXml.clean_up 'res/'
+# Outputs any missing string tags (looks for @string/name attributes and
+# <string name="name"> tags)
+AndroidXml.missing_strings?
 ```
 
-# Helpers
+# Setup / Helpers
 
 Here's how we create the main_action helper, or if you need to specify that some
 attributes don't need the `android:` prefix.
@@ -129,14 +133,16 @@ often have big chunks that are reusable.  Let's say you have a button that is
 in a FrameLayout, and centered at the bottom:
 
 ```ruby
+# create a <Button> tag
 close_button = AndroidXml.Button(
+  id: '@+id/close_button',
   layout_width: 'wrap_content',
   layout_height: 'wrap_content',
-  id: '@+id/cheat_button',
   layout_gravity: 'bottom|center',
-  text: '@string/cheat_button'
+  text: '@string/close_button'
   )
 
+# and include it in a layout
 AndroidXml.file('res/layout/some_activity.xml') do
   RelativeLayout(...) do
     # ...
@@ -145,8 +151,6 @@ AndroidXml.file('res/layout/some_activity.xml') do
 end
 ```
 
-Note: so far, this could also be accomplished using a [Helper](#helpers):
-
 You can `clone` a tag and make changes to it:
 
 ```ruby
@@ -154,7 +158,57 @@ AndroidXml.file('res/layout-land/some_activity.xml') do
   RelativeLayout(...) do
     # ...
 
-    include close_button(padding: '')
+    include close_button(padding: 8.dp)
+  end
+end
+```
+
+You can create a tag with sub nodes, too!
+
+```ruby
+warning = AndroidXml.LinearLayout(
+  layout_width: 'match_parent',
+  layout_height: 'match_parent',
+  orientation: 'horizontal'
+  ) do
+  Image(padding: 24.dp, src: '@drawable/warning_icon')
+  TextView(layout_width: 'wrap_content',
+    layout_height: 'wrap_content',
+    text: '@string/warning_text')
+end
+
+AndroidXml.file('layout.xml') do
+  LinearLayout layout_width: 'match_parent',
+    layout_height: 'match_parent',
+    gravity: 'center',
+    orientation: 'vertical' do
+      include warning
+
+      # if you want to replace the contents:
+      include warning.clone do
+        Image(padding: 24.dp, src: '@drawable/error_icon')
+        TextView(layout_width: 'wrap_content',
+          layout_height: 'wrap_content',
+          text: '@string/error_text')
+      end
+  end
+end
+```
+
+Note: this could also be accomplished using `AndroidXml.setup`, but setup is
+meant for global conventions.  Layout-specific things should be included with
+`include`, in my opinion.  But, up to you:
+
+```ruby
+AndroidXml.setup do
+  tag :close_button => 'Button' do
+    defaults id: '@+id/close_button',
+      layout_width: 'wrap_content',
+      layout_height: 'wrap_content',
+      layout_gravity: 'bottom|center',
+      text: '@string/close_button'
+    contents do
+    end
   end
 end
 ```

data/lib/android-xml.rb

@@ -4,5 +4,6 @@ require_relative './android-xml/tag'
 require_relative './android-xml/file'
 require_relative './android-xml/defaults'
 require_relative './android-xml/exts'
+require_relative './android-xml/string'
 
 AndroidXml.setup_defaults

data/lib/android-xml/main.rb

@@ -56,6 +56,8 @@ module AndroidXml
     Setup.reset
     @files = nil
     @generated = nil
+    Tag.found_strings.clear
+    Tag.registered_strings.clear
   end
 
   def tag(tag_name, attrs=nil, &block)

data/lib/android-xml/string.rb

@@ -1,13 +1,42 @@
+require 'android-xml'
+
+
 module AndroidXml
 
   class Tag
 
+    class << self
+
+      def found_strings
+        @found_strings ||= []
+      end
+
+      def registered_strings
+        @registered_strings ||= []
+      end
+
+    end
+
     def string(attrs={}, &block)
       tag = Tag.new('string', attrs, &block)
+      string = attrs['name'] || attrs[:name]
+      raise "name is required in a <string> tag" unless string && ! string.empty?
+      Tag.registered_strings << (string)
       include tag
       tag
     end
 
   end
 
+  module_function
+
+  def missing_strings?
+    diff = Tag.found_strings - Tag.registered_strings
+    unless diff.empty?
+      diff.each do |name|
+        puts "  string(name='#{name}') { '#{name}' }"
+      end
+    end
+  end
+
 end

data/lib/android-xml/tag.rb

@@ -67,6 +67,10 @@ module AndroidXml
           xml_key = "android:#{key}"
         end
 
+        if value =~ /^@string\/(\w+)$/
+          Tag.found_strings << $1
+        end
+
         if is_first
           output << " #{xml_key}=\"#{value}\""
           is_first = false

data/lib/android-xml/version.rb

@@ -1,3 +1,3 @@
 module AndroidXml
-  Version = '1.2.2'
+  Version = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: android-xml
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Colin T.A. Gray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec