Remove view binding

scoop-basics/build.gradle

@@ -47,7 +47,10 @@ dependencies {
     compile 'com.android.support:support-v4:22.0.0'
     compile 'com.android.support:design:22.2.0'
     compile 'com.android.support:multidex:1.0.0'
-    compile 'com.jakewharton:butterknife:7.0.1'
+
+    compile 'com.jakewharton:butterknife:8.2.1'
+    apt 'com.jakewharton:butterknife-compiler:8.2.1'
+
     compile 'com.jakewharton.timber:timber:3.1.0'
     compile 'com.jakewharton.rxrelay:rxrelay:1.0.0'
     compile 'com.google.android.gms:play-services-location:8.1.0'

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

@@ -1,11 +1,7 @@
 package com.example.scoop.basics;
 
 import android.support.multidex.MultiDexApplication;
-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;
 
@@ -22,19 +18,10 @@ public void onCreate() {
 
         Timber.d("onCreate");
 
-        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-basics/src/main/java/com/example/scoop/basics/MainActivity.java

@@ -3,7 +3,7 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.ViewGroup;
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import com.example.scoop.basics.scoop.AppRouter;
 import com.example.scoop.basics.scoop.DialogRouter;
@@ -19,10 +19,10 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    @Bind(R.id.screen_container)
+    @BindView(R.id.screen_container)
     MainUiContainer mainUiContainer;
 
-    @Bind(R.id.dialog_container)
+    @BindView(R.id.dialog_container)
     DialogUiContainer dialogContainer;
 
     @Inject

scoop-basics/src/main/java/com/example/scoop/basics/common/INullable.java

@@ -1,5 +1,6 @@
 package com.example.scoop.basics.common;
 
 public interface INullable {
+
     boolean isNull();
 }

scoop-basics/src/main/java/com/example/scoop/basics/common/Lists.java

@@ -37,7 +37,7 @@ public static <T> boolean isEmptyOrNull(List<T> list) {
         }
     }
 
-    public static <T1, T2> List<T2> map(List<T1> list, Func1<T1,T2> converter) {
+    public static <T1, T2> List<T2> map(List<T1> list, Func1<T1, T2> converter) {
         ArrayList<T2> mappedList = new ArrayList<>(list.size());
         for (T1 item : list) {
             mappedList.add(converter.call(item));

scoop-basics/src/main/java/com/example/scoop/basics/common/time/Iso8601Formatter.java

@@ -5,6 +5,7 @@
 import java.util.TimeZone;
 
 public class Iso8601Formatter {
+
     public static SimpleDateFormat create() {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
         simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));

scoop-basics/src/main/java/com/example/scoop/basics/ui/BaseViewController.java

@@ -0,0 +1,26 @@
+package com.example.scoop.basics.ui;
+
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import com.lyft.scoop.ViewController;
+
+public abstract class BaseViewController extends ViewController {
+
+    private Unbinder unbinder;
+
+    @Override
+    public void onAttach() {
+        super.onAttach();
+        unbinder = ButterKnife.bind(this, getView());
+    }
+
+    @Override
+    public void onDetach() {
+        if (unbinder != null) {
+            unbinder.unbind();
+            unbinder = null;
+        }
+
+        super.onDetach();
+    }
+}

scoop-basics/src/main/java/com/example/scoop/basics/ui/DemosController.java

@@ -16,10 +16,9 @@
 import com.example.scoop.basics.ui.paramsample.screen.ParametrizedScreen;
 import com.example.scoop.basics.ui.transitions.TransitionsScreen;
 import com.example.scoop.basics.ui.wizardsample.screen.EnterFirstNameScreen;
-import com.lyft.scoop.ViewController;
 import javax.inject.Inject;
 
-public class DemosController extends ViewController {
+public class DemosController extends BaseViewController {
 
     private AppRouter appRouter;
     private NotificationManager notificationManager;

scoop-basics/src/main/java/com/example/scoop/basics/ui/Keyboard.java

@@ -11,12 +11,13 @@
 import java.security.InvalidParameterException;
 
 public final class Keyboard {
+
     private static InputMethodManager getInputManager(Context paramContext) {
         return (InputMethodManager) paramContext.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
-    public static void hideKeyboard(Context paramContext, IBinder paramIBinder) {
-        getInputManager(paramContext).hideSoftInputFromWindow(paramIBinder, 0);
+    public static void hideKeyboard(Context paramContext, IBinder paramIBindViewer) {
+        getInputManager(paramContext).hideSoftInputFromWindow(paramIBindViewer, 0);
     }
 
     public static void hideKeyboard(View paramView) {
@@ -34,11 +35,13 @@ public void run() {
     }
 
     public static void showOnStart(View view) {
-        setSoftInputMode(view, WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED);
+        setSoftInputMode(view,
+                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED);
     }
 
     public static void hideOnStart(View view) {
-        setSoftInputMode(view, WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        setSoftInputMode(view,
+                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
     }
 
     private static void setSoftInputMode(View view, int inputMode) {

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/LayoutInjectData.java

@@ -1,6 +1,7 @@
 package com.example.scoop.basics.ui.layoutsample;
 
 public class LayoutInjectData {
+
     private final String data;
 
     public LayoutInjectData(final String data) {

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/layout/LayoutView.java

@@ -4,7 +4,7 @@
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import com.example.scoop.basics.R;
@@ -14,18 +14,18 @@
 import com.lyft.scoop.Screen;
 import javax.inject.Inject;
 
-public class LayoutView extends FrameLayout{
+public class LayoutView extends FrameLayout {
 
     @Inject
     AppRouter appRouter;
 
     @Inject
     LayoutInjectData layoutInjectData;
 
-    @Bind(R.id.inject_text_view)
+    @BindView(R.id.inject_text_view)
     TextView injectTextView;
 
-    @Bind(R.id.param_text_view)
+    @BindView(R.id.param_text_view)
     TextView paramTextView;
 
     public LayoutView(Context context, AttributeSet attrs) {
@@ -44,7 +44,6 @@ protected void onAttachedToWindow() {
         final LayoutScreen layoutScreen = Screen.fromView(this);
         paramTextView.setText(layoutScreen.getParam());
         injectTextView.setText(layoutInjectData.getData());
-
     }
 
     @OnClick(R.id.go_back_button)

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/layout/NestedLayoutViewController.java

@@ -3,21 +3,21 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.OnClick;
 import com.example.scoop.basics.R;
 import com.example.scoop.basics.scoop.AppRouter;
+import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.layoutsample.module.NestedViewModule;
-import com.lyft.scoop.ViewController;
 import com.lyft.scoop.dagger.DaggerInjector;
 import javax.inject.Inject;
 
-public class NestedLayoutViewController extends ViewController {
+public class NestedLayoutViewController extends BaseViewController {
 
-    @Bind(R.id.nested_layout_parent)
+    @BindView(R.id.nested_layout_parent)
     FrameLayout nestedLayoutParent;
 
-    @Bind(R.id.add_view_button)
+    @BindView(R.id.add_view_button)
     Button button;
 
     private AppRouter appRouter;

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/layout/NestedView.java

@@ -4,16 +4,16 @@
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import com.example.scoop.basics.R;
 import com.example.scoop.basics.ui.layoutsample.LayoutInjectData;
 import com.lyft.scoop.dagger.DaggerInjector;
 import javax.inject.Inject;
 
-public class NestedView extends LinearLayout{
+public class NestedView extends LinearLayout {
 
-    @Bind(R.id.nested_text_view)
+    @BindView(R.id.nested_text_view)
     TextView nestedTextView;
 
     @Inject

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/module/LayoutModule.java

@@ -12,6 +12,7 @@
         library = true
 )
 public class LayoutModule {
+
     @Provides
     public LayoutInjectData provideInjectData() {
         return new LayoutInjectData("This is injected data.");

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/module/NestedViewModule.java

@@ -11,6 +11,7 @@
         library = true
 )
 public class NestedViewModule {
+
     @Provides
     public LayoutInjectData provideInjectData() {
         return new LayoutInjectData("This is injected data.");

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/screen/LayoutScreen.java

@@ -16,7 +16,7 @@ public LayoutScreen(final String param) {
         this.param = param;
     }
 
-    public String getParam(){
+    public String getParam() {
         return this.param;
     }
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/controller/AController.java

@@ -4,11 +4,12 @@
 import butterknife.OnClick;
 import com.example.scoop.basics.R;
 import com.example.scoop.basics.scoop.AppRouter;
+import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.navigationsample.screen.BScreen;
-import com.lyft.scoop.ViewController;
 import javax.inject.Inject;
 
-public class AController extends ViewController {
+public class AController extends BaseViewController {
+
     private static final String TOAST_TEXT = "Successfully called \"getView()\"";
 
     private AppRouter appRouter;

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/controller/BController.java

@@ -1,14 +1,13 @@
 package com.example.scoop.basics.ui.navigationsample.controller;
 
-import android.view.View;
 import butterknife.OnClick;
 import com.example.scoop.basics.R;
 import com.example.scoop.basics.scoop.AppRouter;
+import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.navigationsample.screen.CScreen;
-import com.lyft.scoop.ViewController;
 import javax.inject.Inject;
 
-public class BController extends ViewController {
+public class BController extends BaseViewController {
 
     private AppRouter appRouter;
 
@@ -25,7 +24,6 @@ protected int layoutId() {
     @Override
     public void onAttach() {
         super.onAttach();
-
     }
 
     @Override

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/controller/CController.java

@@ -1,14 +1,13 @@
 package com.example.scoop.basics.ui.navigationsample.controller;
 
-import android.view.View;
 import butterknife.OnClick;
 import com.example.scoop.basics.R;
 import com.example.scoop.basics.scoop.AppRouter;
+import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.navigationsample.screen.AScreen;
-import com.lyft.scoop.ViewController;
 import javax.inject.Inject;
 
-public class CController extends ViewController {
+public class CController extends BaseViewController {
 
     private AppRouter appRouter;
 

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/screen/AScreen.java

@@ -13,5 +13,5 @@
 @DaggerModule(AModule.class)
 @EnterTransition(FadeTransition.class)
 @ExitTransition(FadeTransition.class)
-public class AScreen extends Screen{
+public class AScreen extends Screen {
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/screen/BScreen.java

@@ -14,5 +14,5 @@
 @DaggerModule(BModule.class)
 @EnterTransition(ForwardSlideTransition.class)
 @ExitTransition(BackwardSlideTransition.class)
-public class BScreen extends Screen{
+public class BScreen extends Screen {
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/screen/CScreen.java

@@ -14,5 +14,5 @@
 @DaggerModule(CModule.class)
 @EnterTransition(ForwardSlideTransition.class)
 @ExitTransition(BackwardSlideTransition.class)
-public class CScreen extends Screen{
+public class CScreen extends Screen {
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/paramsample/controller/ParametrizedController.java

@@ -1,17 +1,16 @@
 package com.example.scoop.basics.ui.paramsample.controller;
 
-import android.view.View;
 import android.widget.TextView;
-import butterknife.Bind;
+import butterknife.BindView;
 import com.example.scoop.basics.R;
+import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.paramsample.screen.ParametrizedScreen;
 import com.lyft.scoop.Screen;
-import com.lyft.scoop.ViewController;
 import javax.inject.Inject;
 
-public class ParametrizedController extends ViewController {
+public class ParametrizedController extends BaseViewController {
 
-    @Bind(R.id.param_text_view)
+    @BindView(R.id.param_text_view)
     TextView paramTextView;
 
     @Inject