protoform 0.1.1 → 0.1.2

data/History.txt

@@ -0,0 +1,11 @@
+== 0.1.2
+
+Upgrade the sample UI to an XML Layout
+
+== 0.1.1
+
+Cleanup dependencies and add notes
+
+== 0.1.0 2010-11-28
+
+First gem release

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/generators/android/templates/application.mirah

@@ -2,13 +2,11 @@ import "android.app.Activity"
 import "android.os.Bundle"
 import "android.widget.TextView"
 import "android.content.Context"
+import "Layout", "<%= package %>.R$layout"
 
 class <%= app_name %> < Activity
   def onCreate(savedInstanceState:Bundle)
     super(savedInstanceState)
-    # cast to Context should be unnecessary
-    tv = TextView.new(Context(self))
-    tv.setText("Hello World!")
-    setContentView(tv)
+    setContentView(Layout.main)
   end
 end

data/lib/generators/android/templates/build.xml

@@ -66,10 +66,19 @@
 
     <target name="compile" depends="-resource-src, -aidl"
             description="Compiles project's .mirah files into .class files">
+
+      <exec executable="javac" dir="gen">
+        <arg value="-d" />
+        <arg value="../bin/classes"/>
+        <arg value="../gen/<%= package.gsub('.', '/') %>/R.java"/>
+      </exec>
+
       <exec executable="mirahc" dir="src">
         <env key="CLASSPATH" file="${android.jar}" />
         <arg value="-d" />
-        <arg value="../bin/classes/" />
+        <arg value="../bin/classes" />
+        <arg value="-c"/>
+        <arg value="../bin/classes:../gen" />
         <arg value="." />
       </exec>
     </target>

data/lib/generators/android/templates/res/layout/main.xml

@@ -5,9 +5,10 @@
     android:layout_height="fill_parent"
     >
 <TextView  
+    android:id="@+id/textview"
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" 
-    android:text="Hello World!"
+    android:text="@string/welcome"
     />
 </LinearLayout>
 

data/lib/generators/android/templates/res/values/strings.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="title"><%= title %></string>
+    <string name="welcome">Hello goodbye!</string>
 </resources>

data/protoform.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{protoform}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Plante"]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     "Gemfile",
     "Gemfile.lock",
+    "History.txt",
     "LICENSE.txt",
     "README.md",
     "Rakefile",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 1
-    - 1
-  version: 0.1.1
+    - 2
+  version: 0.1.2
 platform: ruby
 authors: 
   - Nick Plante
@@ -95,6 +95,7 @@ extra_rdoc_files:
 files: 
   - Gemfile
   - Gemfile.lock
+  - History.txt
   - LICENSE.txt
   - README.md
   - Rakefile