Merge pull request #78 from lyft/view-binder-factory

add a view binder factory

scoop-basics/src/main/java/com/example/scoop/basics/App.java

@@ -4,6 +4,8 @@
 import com.example.scoop.basics.scoop.ButterKnifeViewBinder;
 import com.facebook.stetho.Stetho;
 import com.lyft.scoop.Scoop;
+import com.lyft.scoop.ViewBinder;
+import com.lyft.scoop.ViewBinderFactory;
 import dagger.ObjectGraph;
 import timber.log.Timber;
 
@@ -20,12 +22,19 @@ public void onCreate() {
 
         Timber.d("onCreate");
 
-        Scoop.setViewBinder(new ButterKnifeViewBinder());
+        Scoop.setViewBinderFactory(VIEW_BINDER_FACTORY);
 
         applicationGraph = ObjectGraph.create(new AppModule(this));
     }
 
     public ObjectGraph getApplicationGraph() {
         return applicationGraph;
     }
+
+    private static final ViewBinderFactory VIEW_BINDER_FACTORY = new ViewBinderFactory() {
+        @Override
+        public ViewBinder create(Object object) {
+            return new ButterKnifeViewBinder();
+        }
+    };
 }

scoop/src/main/java/com/lyft/scoop/NoOpViewBinderFactory.java

@@ -0,0 +1,9 @@
+package com.lyft.scoop;
+
+class NoOpViewBinderFactory implements ViewBinderFactory {
+
+    @Override
+    public ViewBinder create(Object object) {
+        return new NoOpViewBinder();
+    }
+}

scoop/src/main/java/com/lyft/scoop/Scoop.java

@@ -5,20 +5,19 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
 public final class Scoop {
 
-    static ViewBinder viewBinder = new NoOpViewBinder();
+    static ViewBinderFactory viewBinderFactory = new NoOpViewBinderFactory();
 
     private String name;
     private Scoop parent;
     private Map<String, Object> services;
-    private HashMap<String, Scoop> children = new LinkedHashMap<>();
+    private Map<String, Scoop> children = new LinkedHashMap<>();
     private boolean destroyed;
 
     private Scoop(String name, Scoop parent, Map<String, Object> services) {
@@ -108,8 +107,8 @@ public Scoop build() {
         }
     }
 
-    public static void setViewBinder(ViewBinder binder) {
-        viewBinder = binder;
+    public static void setViewBinderFactory(ViewBinderFactory factory) {
+        viewBinderFactory = factory;
     }
 
     public static Scoop fromView(View view) {

scoop/src/main/java/com/lyft/scoop/ViewBinderFactory.java

@@ -0,0 +1,6 @@
+package com.lyft.scoop;
+
+public interface ViewBinderFactory {
+
+    ViewBinder create(Object object);
+}

scoop/src/main/java/com/lyft/scoop/ViewController.java

@@ -10,10 +10,12 @@ public abstract class ViewController {
     private boolean attached;
     private Scoop scoop;
     private View view;
+    private ViewBinder viewBinder;
 
     final void attach(View view) {
         this.view = view;
-        Scoop.viewBinder.bind(this, view);
+        this.viewBinder = scoop.viewBinderFactory.create(this);
+        this.viewBinder.bind(this, view);
         view.setTag(VIEW_CONTROLLER_TAG, this);
         onAttach();
         this.attached = true;
@@ -30,10 +32,11 @@ protected final boolean attached() {
 
     final void detach(View view) {
         this.isDetaching = true;
-        if(this.attached) {
+        if (this.attached) {
             onDetach();
             view.setTag(VIEW_CONTROLLER_TAG, null);
-            Scoop.viewBinder.unbind(this);
+            this.viewBinder.unbind(this);
+            this.viewBinder = null;
             this.view = null;
             this.attached = false;
             this.isDetaching = false;