andredlight · donv · Aug 9, 2012 · Aug 9, 2012 · Aug 9, 2012 · Aug 9, 2012
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/gen
diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
diff --git a/bin/AndroidManifest.xml.d b/bin/AndroidManifest.xml.d
diff --git a/bin/Multiact-debug-unaligned.apk b/bin/Multiact-debug-unaligned.apk
diff --git a/bin/Multiact-debug-unaligned.apk.d b/bin/Multiact-debug-unaligned.apk.d
diff --git a/bin/Multiact-debug.apk b/bin/Multiact-debug.apk
diff --git a/bin/Multiact.ap_ b/bin/Multiact.ap_
diff --git a/bin/Multiact.ap_.d b/bin/Multiact.ap_.d
diff --git a/bin/build.prop b/bin/build.prop
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes.dex.d b/bin/classes.dex.d
diff --git a/bin/classes/org/ruboto/EntryPointActivity$1.class b/bin/classes/org/ruboto/EntryPointActivity$1.class
diff --git a/bin/classes/org/ruboto/EntryPointActivity$2$1.class b/bin/classes/org/ruboto/EntryPointActivity$2$1.class
diff --git a/bin/classes/org/ruboto/EntryPointActivity$2$2.class b/bin/classes/org/ruboto/EntryPointActivity$2$2.class
diff --git a/bin/classes/org/ruboto/EntryPointActivity$2.class b/bin/classes/org/ruboto/EntryPointActivity$2.class
diff --git a/bin/classes/org/ruboto/EntryPointActivity$3.class b/bin/classes/org/ruboto/EntryPointActivity$3.class
diff --git a/bin/classes/org/ruboto/EntryPointActivity.class b/bin/classes/org/ruboto/EntryPointActivity.class
diff --git a/bin/classes/org/ruboto/JRubyAdapter.class b/bin/classes/org/ruboto/JRubyAdapter.class
diff --git a/bin/classes/org/ruboto/Log.class b/bin/classes/org/ruboto/Log.class
diff --git a/bin/classes/org/ruboto/RubotoActivity.class b/bin/classes/org/ruboto/RubotoActivity.class
diff --git a/bin/classes/org/ruboto/RubotoBroadcastReceiver.class b/bin/classes/org/ruboto/RubotoBroadcastReceiver.class
diff --git a/bin/classes/org/ruboto/RubotoDialog.class b/bin/classes/org/ruboto/RubotoDialog.class
diff --git a/bin/classes/org/ruboto/RubotoService.class b/bin/classes/org/ruboto/RubotoService.class
diff --git a/bin/classes/org/ruboto/Script.class b/bin/classes/org/ruboto/Script.class
diff --git a/bin/classes/org/rubototest/multiact/BuildConfig.class b/bin/classes/org/rubototest/multiact/BuildConfig.class
diff --git a/bin/classes/org/rubototest/multiact/MultiactActivity.class b/bin/classes/org/rubototest/multiact/MultiactActivity.class
diff --git a/bin/classes/org/rubototest/multiact/R$attr.class b/bin/classes/org/rubototest/multiact/R$attr.class
diff --git a/bin/classes/org/rubototest/multiact/R$drawable.class b/bin/classes/org/rubototest/multiact/R$drawable.class
diff --git a/bin/classes/org/rubototest/multiact/R$id.class b/bin/classes/org/rubototest/multiact/R$id.class
diff --git a/bin/classes/org/rubototest/multiact/R$layout.class b/bin/classes/org/rubototest/multiact/R$layout.class
diff --git a/bin/classes/org/rubototest/multiact/R$string.class b/bin/classes/org/rubototest/multiact/R$string.class
diff --git a/bin/classes/org/rubototest/multiact/R.class b/bin/classes/org/rubototest/multiact/R.class
diff --git a/bin/jarlist.cache b/bin/jarlist.cache
diff --git a/bin/proguard.txt b/bin/proguard.txt
diff --git a/bin/res/drawable-hdpi/ic_launcher.png b/bin/res/drawable-hdpi/ic_launcher.png
diff --git a/bin/res/drawable-ldpi/ic_launcher.png b/bin/res/drawable-ldpi/ic_launcher.png
diff --git a/bin/res/drawable-mdpi/ic_launcher.png b/bin/res/drawable-mdpi/ic_launcher.png
diff --git a/bin/res/drawable-xhdpi/ic_launcher.png b/bin/res/drawable-xhdpi/ic_launcher.png
diff --git a/bin/res/drawable/get_ruboto_core.png b/bin/res/drawable/get_ruboto_core.png
diff --git a/gen/R.java.d b/gen/R.java.d
diff --git a/gen/org/rubototest/multiact/BuildConfig.java b/gen/org/rubototest/multiact/BuildConfig.java
diff --git a/gen/org/rubototest/multiact/R.java b/gen/org/rubototest/multiact/R.java
diff --git a/libs/jruby-core-1.7.0.preview2.dev.jar b/libs/jruby-core-1.7.0.preview2.dev.jar
diff --git a/libs/jruby-core-1.7.0.preview2.jar b/libs/jruby-core-1.7.0.preview2.jar
diff --git a/libs/jruby-stdlib-1.7.0.preview2.dev.jar b/libs/jruby-stdlib-1.7.0.preview2.dev.jar
diff --git a/libs/jruby-stdlib-1.7.0.preview2.jar b/libs/jruby-stdlib-1.7.0.preview2.jar
diff --git a/src/multiact_activity.rb b/src/multiact_activity.rb
@@ -6,27 +6,23 @@
 
 # http://xkcd.com/378/
 
-class RubotoActivity
-  def self.main(context)
-    context.start_ruboto_activity("$activity_main") do
-      def on_create(bundle)
-        setTitle "main activity"
-        setContentView(
-          linear_layout(:orientation => :vertical) do
-            @text_view = text_view :text => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
+class MultiactActivity
+  def on_create(bundle)
+    setTitle "main activity"
+    setContentView(
+        linear_layout(:orientation => :vertical) do
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
                                  :gravity => android.view.Gravity::CENTER, :text_size => 48.0
-            button :text => "Next activity", :id => 43, :width => :fill_parent, :on_click_listener => @on_click_next
-          end
-        )
-      end
-      @on_click_next = proc do |button|
-        RubotoActivity.next(self)
-      end
-    end
+          button :text => "Next activity", :id => 43, :width => :fill_parent, :on_click_listener => proc { next_activity ; nil }
+        end
+    )
   end
 
-  def self.next(context)
-    context.start_ruboto_activity("$activity_next") do
+  private
+
+  def next_activity
+    puts 'Start next activity'
+    start_ruboto_activity("$activity_next") do
       def on_create(bundle)
         setContentView(
           linear_layout(:orientation => :vertical) do
@@ -38,5 +34,3 @@ def on_create(bundle)
     end
   end
 end
-
-RubotoActivity.main $activity 
diff --git a/src/org/ruboto/JRubyAdapter.java b/src/org/ruboto/JRubyAdapter.java
@@ -400,12 +400,12 @@ private static void handleInitException(Exception e) {
 
     // FIXME(uwe):  Remove when we stop supporting JRuby < 1.7.0
     @Deprecated public static boolean isJRubyPreOneSeven() {
-        return ((String)get("JRUBY_VERSION")).equals("1.7.0.dev") || ((String)get("JRUBY_VERSION")).equals("1.6.7");
+        return ((String)get("JRUBY_VERSION")).equals("1.7.0.dev") || ((String)get("JRUBY_VERSION")).startsWith("1.6.");
     }
 
     // FIXME(uwe):  Remove when we stop supporting JRuby < 1.7.0
     @Deprecated public static boolean isJRubyOneSeven() {
-        return ((String)get("JRUBY_VERSION")).startsWith("1.7.");
+        return !isJRubyPreOneSeven() && ((String)get("JRUBY_VERSION")).startsWith("1.7.");
     }
 
     // FIXME(uwe):  Remove when we stop supporting Ruby 1.8

diff --git a/src/ruboto/activity.rb b/src/ruboto/activity.rb
@@ -21,7 +21,7 @@ def initialize_ruboto()
 
       instance_eval &$context_init_block if $context_init_block
       $context_init_block = nil
-      setup_ruboto_callbacks 
+      setup_ruboto_callbacks
 
       @initialized = true
       self