From f335f018b3b32a043f272727c38e5c3c3374e70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20Nicolas?= <steff.nicolas@gmail.com>
Date: Sat, 6 Apr 2013 02:07:09 +0200
Subject: [PATCH] Updated a few version numbers. Added automatic injection in
 custom views

Conflicts:
	.gitignore
	astroboy/pom.xml
	roboguice/pom.xml
	roboguice/src/main/java/roboguice/activity/RoboActivity.java
	roboguice/src/test/java/roboguice/view/ViewInjectionTest.java
---
 astroboy/res/layout/main.xml                  |  4 ++
 astroboy/res/layout/view_custom.xml           | 21 +++++++
 .../roboguice/astroboy/view/CustomView.java   | 59 +++++++++++++++++++
 .../java/roboguice/activity/RoboActivity.java | 49 ++++++++++++++-
 4 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100644 astroboy/res/layout/view_custom.xml
 create mode 100644 astroboy/src/main/java/org/roboguice/astroboy/view/CustomView.java

diff --git a/astroboy/res/layout/main.xml b/astroboy/res/layout/main.xml
index c608c7abd..11142cc4a 100644
--- a/astroboy/res/layout/main.xml
+++ b/astroboy/res/layout/main.xml
@@ -48,4 +48,8 @@
         android:layout_gravity="center"
         android:text="Self Destruct"/>
     
+    <org.roboguice.astroboy.view.CustomView 
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"/>"
+    
 </LinearLayout>
diff --git a/astroboy/res/layout/view_custom.xml b/astroboy/res/layout/view_custom.xml
new file mode 100644
index 000000000..e1a89324d
--- /dev/null
+++ b/astroboy/res/layout/view_custom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal" >
+
+    <TextView
+        android:id="@+id/tv_status"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:text="TV is open" />
+
+    <Button
+        android:id="@+id/close_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Close TV" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/astroboy/src/main/java/org/roboguice/astroboy/view/CustomView.java b/astroboy/src/main/java/org/roboguice/astroboy/view/CustomView.java
new file mode 100644
index 000000000..0eae7211e
--- /dev/null
+++ b/astroboy/src/main/java/org/roboguice/astroboy/view/CustomView.java
@@ -0,0 +1,59 @@
+package org.roboguice.astroboy.view;
+
+import org.roboguice.astroboy.R;
+
+import roboguice.inject.InjectView;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class CustomView extends LinearLayout {
+
+    @InjectView(R.id.close_tv)
+    private Button buttonCloseTv;
+    @InjectView(R.id.tv_status)
+    private TextView textviewStatus;
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    private CustomView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initializeView(context);
+    }
+
+    public CustomView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initializeView(context);
+    }
+
+    public CustomView(Context context) {
+        super(context);
+        initializeView(context);
+    }
+
+    public void initializeView(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.view_custom, this, true);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        buttonCloseTv.setOnClickListener(new OnClickListener() {
+
+            public void onClick(View v) {
+                textviewStatus.setText("Closed");
+            }
+        });
+        textviewStatus.setOnClickListener(new OnClickListener() {
+
+            public void onClick(View v) {
+                textviewStatus.setText("Open");
+            }
+        });
+    }
+}
diff --git a/roboguice/src/main/java/roboguice/activity/RoboActivity.java b/roboguice/src/main/java/roboguice/activity/RoboActivity.java
index 5710fefb3..88b4cc706 100644
--- a/roboguice/src/main/java/roboguice/activity/RoboActivity.java
+++ b/roboguice/src/main/java/roboguice/activity/RoboActivity.java
@@ -21,12 +21,23 @@
 import android.os.Bundle;
 import com.google.inject.Inject;
 import com.google.inject.Key;
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+import java.util.Map;
+
 import roboguice.RoboGuice;
 import roboguice.activity.event.*;
 import roboguice.context.event.OnConfigurationChangedEvent;
 import roboguice.context.event.OnCreateEvent;
 import roboguice.context.event.OnDestroyEvent;
 import roboguice.context.event.OnStartEvent;
+import roboguice.activity.event.OnActivityResultEvent;
+import roboguice.activity.event.OnContentChangedEvent;
+import roboguice.activity.event.OnNewIntentEvent;
+import roboguice.activity.event.OnPauseEvent;
+import roboguice.activity.event.OnRestartEvent;
+import roboguice.activity.event.OnResumeEvent;
+import roboguice.activity.event.OnStopEvent;
 import roboguice.event.EventManager;
 import roboguice.inject.ContentViewListener;
 import roboguice.inject.RoboInjector;
@@ -35,6 +46,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
 /**
  * A {@link RoboActivity} extends from {@link Activity} to provide dynamic
  * injection of collaborators, using Google Guice.<br />
@@ -63,9 +78,10 @@
  */
 public class RoboActivity extends Activity implements RoboContext {
     protected EventManager eventManager;
-    protected HashMap<Key<?>,Object> scopedObjects = new HashMap<Key<?>, Object>();
+    protected HashMap<Key<?>, Object> scopedObjects = new HashMap<Key<?>, Object>();
 
-    @Inject ContentViewListener ignored; // BUG find a better place to put this
+    @Inject
+    ContentViewListener ignored; // BUG find a better place to put this
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -107,7 +123,7 @@ protected void onPause() {
     }
 
     @Override
-    protected void onNewIntent( Intent intent ) {
+    protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         eventManager.fire(new OnNewIntentEvent(this));
     }
@@ -158,4 +174,31 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     public Map<Key<?>, Object> getScopedObjectMap() {
         return scopedObjects;
     }
+
+    @Override
+    public View onCreateView(String name, Context context, AttributeSet attrs) {
+        try {
+            Class clazz = Class.forName(name);
+            Constructor constructor = clazz.getConstructor(Context.class, AttributeSet.class);
+            View view = (View) constructor.newInstance(context, attrs);
+            final RoboInjector injector = RoboGuice.getInjector(this);
+            injector.injectMembers(view);
+            return view;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return super.onCreateView(name, context, attrs);
+    }
+
+    @Override
+    public View onCreateView(View parent, String name, Context context, AttributeSet attrs) {
+        View view = super.onCreateView(parent, name, context, attrs);
+        final RoboInjector injector = RoboGuice.getInjector(this);
+        try {
+            injector.injectMembers(view);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return view;
+    }
 }