package com.veyndan.hermes;

import android.support.annotation.LayoutRes;
import android.support.annotation.Nullable;
import android.support.v7.widget.Toolbar;

import com.trello.rxlifecycle.components.support.RxAppCompatActivity;

public class BaseActivity extends RxAppCompatActivity {

    @Nullable private Toolbar toolbar;

    @Nullable
    protected Toolbar getToolbar() {
        if (toolbar == null) {
            toolbar = (Toolbar) findViewById(R.id.toolbar);
            if (toolbar != null) {
                setSupportActionBar(toolbar);
            }
        }
        return toolbar;
    }

    @Override
    public void setContentView(@LayoutRes int layoutResID) {
        super.setContentView(layoutResID);
        getToolbar();
    }
}

@@ -225,16 +225,78 @@
 ivity;%0A%0A
+import butterknife.BindView;%0Aimport butterknife.ButterKnife;%0A%0A
 public c
@@ -362,160 +362,17 @@
 ble 
-private Toolbar toolbar;%0A%0A    @Nullable%0A    protected Toolbar getToolbar() %7B%0A        if (toolbar == null) %7B%0A            toolbar = (Toolbar) f
+@B
 indView
-ById
 (R.i
@@ -385,129 +385,16 @@
 bar)
-;%0A            if (toolbar != null) %7B%0A                setSupportActionBar(toolbar);%0A            %7D%0A        %7D%0A        return
+ Toolbar
  too
@@ -398,22 +398,16 @@
 toolbar;
-%0A    %7D
 %0A%0A    @O
@@ -530,19 +530,67 @@
     
-getT
+ButterKnife.bind(this);%0A        setSupportActionBar(t
 oolbar
-(
 );%0A 

Use Butterknife to tidy up toolbar initialisation