Update to butterknife 8.0.1

Habitica/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.databinding'
 apply plugin: 'io.fabric'
+apply plugin: 'com.neenbedankt.android-apt'
 
 buildscript {
     repositories {
@@ -12,6 +13,7 @@ buildscript {
         classpath 'io.fabric.tools:gradle:1.21.5'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.4.4'
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }
 
@@ -49,7 +51,8 @@ dependencies {
     }
 
     // View Elements Binding :)
-    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.jakewharton:butterknife:8.0.1'
+    apt 'com.jakewharton:butterknife-compiler:8.0.1'
 
     compile('com.mikepenz:materialdrawer:5.0.9@aar') {
         transitive = true

Habitica/src/main/java/com/habitrpg/android/habitica/ui/EditTextDrawer.java

@@ -14,7 +14,7 @@ import com.mikepenz.materialdrawer.model.BaseViewHolder;
 
 import org.greenrobot.eventbus.EventBus;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class EditTextDrawer extends BasePrimaryDrawerItem<EditTextDrawer, EditTextDrawer.ViewHolder> {
@@ -48,10 +48,10 @@ public class EditTextDrawer extends BasePrimaryDrawerItem<EditTextDrawer, EditTe
 
         View view;
 
-        @Bind(R.id.editText)
+        @BindView(R.id.editText)
         EditText editText;
 
-        @Bind(R.id.btnAdd)
+        @BindView(R.id.btnAdd)
         Button btnAdd;
 
         private ViewHolder(View view) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java

@@ -11,21 +11,21 @@ import android.widget.TextView;
 import com.habitrpg.android.habitica.R;
 import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class TutorialView extends FrameLayout implements View.OnClickListener {
 
-    @Bind(R.id.tutorialTextView)
+    @BindView(R.id.tutorialTextView)
     TextView tutorialTextView;
 
-    @Bind(R.id.background)
+    @BindView(R.id.background)
     RelativeLayout background;
 
-    @Bind(R.id.dismissButton)
+    @BindView(R.id.dismissButton)
     Button dismissButton;
 
-    @Bind(R.id.completeButton)
+    @BindView(R.id.completeButton)
     Button completeButton;
 
     public TutorialStep step;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.java

@@ -17,14 +17,14 @@ import com.habitrpg.android.habitica.ui.fragments.AboutFragment;
 import com.mikepenz.aboutlibraries.Libs;
 import com.mikepenz.aboutlibraries.LibsBuilder;
 
-import butterknife.Bind;
+import butterknife.BindView;
 
 public class AboutActivity extends BaseActivity {
 
-    @Bind(R.id.pager)
+    @BindView(R.id.pager)
     ViewPager pager;
 
-    @Bind(R.id.tab_layout)
+    @BindView(R.id.tab_layout)
     TabLayout tabLayout;
 
     @Override

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java

@@ -24,7 +24,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
 import java.util.HashMap;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.OnClick;
 import retrofit.Callback;
 import retrofit.RetrofitError;
@@ -36,13 +36,13 @@ public class ClassSelectionActivity extends BaseActivity implements Callback<Hab
     Boolean classWasUnset = false;
     Boolean shouldFinish = false;
 
-    @Bind(R.id.healerImageView)
+    @BindView(R.id.healerImageView)
     ImageView healerImageView;
-    @Bind(R.id.mageImageView)
+    @BindView(R.id.mageImageView)
     ImageView mageImageView;
-    @Bind(R.id.rogueImageView)
+    @BindView(R.id.rogueImageView)
     ImageView rogueImageView;
-    @Bind(R.id.warriorImageView)
+    @BindView(R.id.warriorImageView)
     ImageView warriorImageView;
 
     APIHelper apiHelper;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java

@@ -24,7 +24,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.UiUtils;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 
-import butterknife.Bind;
+import butterknife.BindView;
 
 public class GroupFormActivity extends BaseActivity {
 
@@ -36,19 +36,19 @@ public class GroupFormActivity extends BaseActivity {
     String groupPrivacy;
     String groupLeader;
 
-    @Bind(R.id.group_name_edittext)
+    @BindView(R.id.group_name_edittext)
     EditText groupNameEditText;
 
-    @Bind(R.id.group_description_edittext)
+    @BindView(R.id.group_description_edittext)
     EmojiEditText groupDescriptionEditText;
 
-    @Bind(R.id.emoji_toggle_btn)
+    @BindView(R.id.emoji_toggle_btn)
     ImageButton emojiButton;
 
-    @Bind(R.id.privacyWrapper)
+    @BindView(R.id.privacyWrapper)
     LinearLayout privacyWrapper;
 
-    @Bind(R.id.privacySpinner)
+    @BindView(R.id.privacySpinner)
     Spinner privacySpinner;
 
     EmojiPopup popup;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java

@@ -16,23 +16,23 @@ import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
 import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
 import com.viewpagerindicator.CirclePageIndicator;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import retrofit.Callback;
 import retrofit.RetrofitError;
 import retrofit.client.Response;
 
 public class IntroActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener, Callback<ContentResult> {
 
-    @Bind(R.id.view_pager)
+    @BindView(R.id.view_pager)
     ViewPager pager;
 
-    @Bind(R.id.view_pager_indicator)
+    @BindView(R.id.view_pager_indicator)
     CirclePageIndicator indicator;
 
-    @Bind(R.id.skipButton)
+    @BindView(R.id.skipButton)
     Button skipButton;
 
-    @Bind(R.id.finishButton)
+    @BindView(R.id.finishButton)
     Button finishButton;
 
     @Override

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java

@@ -42,7 +42,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.BindString;
 import butterknife.ButterKnife;
 import retrofit.Callback;
@@ -66,34 +66,34 @@ public class LoginActivity extends AppCompatActivity
 
     private CallbackManager callbackManager;
 
-	@Bind(R.id.login_btn)
+	@BindView(R.id.login_btn)
 	Button mLoginNormalBtn;
 
-	@Bind(R.id.PB_AsyncTask)
+	@BindView(R.id.PB_AsyncTask)
 	ProgressBar mProgressBar;
 
-    @Bind(R.id.username)
+    @BindView(R.id.username)
     EditText mUsernameET;
 
-    @Bind(R.id.password)
+    @BindView(R.id.password)
     EditText mPasswordET;
 
-    @Bind(R.id.email)
+    @BindView(R.id.email)
     EditText mEmail;
 
-    @Bind(R.id.confirm_password)
+    @BindView(R.id.confirm_password)
     EditText mConfirmPassword;
 
-    @Bind(R.id.email_row)
+    @BindView(R.id.email_row)
     TableRow mEmailRow;
 
-    @Bind(R.id.confirm_password_row)
+    @BindView(R.id.confirm_password_row)
     TableRow mConfirmPasswordRow;
 
-    @Bind(R.id.login_button)
+    @BindView(R.id.login_button)
     LoginButton mFacebookLoginBtn;
 
-    @Bind(R.id.forgot_pw_tv)
+    @BindView(R.id.forgot_pw_tv)
     TextView mForgotPWTV;
 
 	protected void onCreate(Bundle savedInstanceState) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java

@@ -130,7 +130,7 @@ import java.util.Map;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import retrofit.Callback;
 import retrofit.RetrofitError;
 import retrofit.client.Response;
@@ -145,15 +145,15 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
     private static final int MIN_LEVEL_FOR_SKILLS = 11;
     public static final int SELECT_CLASS_RESULT = 11;
 
-    @Bind(R.id.floating_menu_wrapper)
+    @BindView(R.id.floating_menu_wrapper)
     FrameLayout floatingMenuWrapper;
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(R.id.detail_tabs)
+    @BindView(R.id.detail_tabs)
     TabLayout detail_tabs;
-    @Bind(R.id.avatar_with_bars)
+    @BindView(R.id.avatar_with_bars)
     View avatar_with_bars;
-    @Bind(R.id.overlayFrameLayout)
+    @BindView(R.id.overlayFrameLayout)
     FrameLayout overlayFrameLayout;
 
     // Checkout needs to be in the Activity..

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java

@@ -19,16 +19,16 @@ import com.raizlabs.android.dbflow.structure.BaseModel;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class PartyInviteActivity extends BaseActivity {
 
     public static final int RESULT_SEND_INVITES = 100;
-    @Bind(R.id.tab_layout)
+    @BindView(R.id.tab_layout)
     TabLayout tabLayout;
 
-    @Bind(R.id.view_pager)
+    @BindView(R.id.view_pager)
     ViewPager viewPager;
 
     List<PartyInviteFragment> fragments = new ArrayList<>();

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java

@@ -14,12 +14,12 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.fragments.AccountDetailsFragment;
 import com.habitrpg.android.habitica.ui.fragments.PreferencesFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 
 public class PrefsActivity extends BaseActivity implements
         PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
 
     @Override

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java

@@ -28,20 +28,20 @@ import org.json.JSONObject;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 
 public class SetupActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
 
-    @Bind(R.id.view_pager)
+    @BindView(R.id.view_pager)
     ViewPager pager;
 
-    @Bind(R.id.skipButton)
+    @BindView(R.id.skipButton)
     Button skipButton;
 
-    @Bind(R.id.nextButton)
+    @BindView(R.id.nextButton)
     Button nextButton;
 
-    @Bind (R.id.previousButton)
+    @BindView(R.id.previousButton)
     Button previousButton;
 
     AvatarSetupFragment avatarSetupFragment;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java

@@ -17,14 +17,14 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 import java.util.HashMap;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 
 public class SkillTasksActivity extends BaseActivity {
 
-    @Bind(R.id.viewpager)
+    @BindView(R.id.viewpager)
     public ViewPager viewPager;
 
-    @Bind(R.id.tab_layout)
+    @BindView(R.id.tab_layout)
     public TabLayout tabLayout;
 
     Map<Integer, SkillTasksRecyclerViewFragment> viewFragmentsDictionary = new HashMap<>();

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java

@@ -63,7 +63,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import butterknife.Bind;
+import butterknife.BindView;
 
 
 public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener {
@@ -87,102 +87,102 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
     private List<CheckBox> tagCheckBoxList;
     private List<String> userSelectedTagIds;
 
-    @Bind(R.id.task_value_edittext)
+    @BindView(R.id.task_value_edittext)
     EditText taskValue;
 
-    @Bind(R.id.task_value_layout)
+    @BindView(R.id.task_value_layout)
     TextInputLayout taskValueLayout;
 
-    @Bind(R.id.task_checklist_wrapper)
+    @BindView(R.id.task_checklist_wrapper)
     LinearLayout checklistWrapper;
 
-    @Bind(R.id.task_difficulty_wrapper)
+    @BindView(R.id.task_difficulty_wrapper)
     LinearLayout difficultyWrapper;
 
-    @Bind(R.id.task_attribute_wrapper)
+    @BindView(R.id.task_attribute_wrapper)
     LinearLayout attributeWrapper;
 
-    @Bind(R.id.task_main_wrapper)
+    @BindView(R.id.task_main_wrapper)
     LinearLayout mainWrapper;
 
-    @Bind(R.id.task_text_edittext)
+    @BindView(R.id.task_text_edittext)
     EmojiEditText taskText;
 
-    @Bind(R.id.task_notes_edittext)
+    @BindView(R.id.task_notes_edittext)
     EmojiEditText taskNotes;
 
-    @Bind(R.id.task_difficulty_spinner)
+    @BindView(R.id.task_difficulty_spinner)
     Spinner taskDifficultySpinner;
 
-    @Bind(R.id.task_attribute_spinner)
+    @BindView(R.id.task_attribute_spinner)
     Spinner taskAttributeSpinner;
 
-    @Bind(R.id.btn_delete_task)
+    @BindView(R.id.btn_delete_task)
     Button btnDelete;
 
-    @Bind(R.id.task_startdate_layout)
+    @BindView(R.id.task_startdate_layout)
     LinearLayout startDateLayout;
 
-    @Bind(R.id.task_task_wrapper)
+    @BindView(R.id.task_task_wrapper)
     LinearLayout taskWrapper;
 
-    @Bind(R.id.task_positive_checkbox)
+    @BindView(R.id.task_positive_checkbox)
     CheckBox positiveCheckBox;
 
-    @Bind(R.id.task_negative_checkbox)
+    @BindView(R.id.task_negative_checkbox)
     CheckBox negativeCheckBox;
 
-    @Bind(R.id.task_actions_wrapper)
+    @BindView(R.id.task_actions_wrapper)
     LinearLayout actionsLayout;
 
-    @Bind(R.id.task_weekdays_wrapper)
+    @BindView(R.id.task_weekdays_wrapper)
     LinearLayout weekdayWrapper;
 
-    @Bind(R.id.task_frequency_spinner)
+    @BindView(R.id.task_frequency_spinner)
     Spinner dailyFrequencySpinner;
 
-    @Bind(R.id.task_frequency_container)
+    @BindView(R.id.task_frequency_container)
     LinearLayout frequencyContainer;
 
-    @Bind(R.id.checklist_recycler_view)
+    @BindView(R.id.checklist_recycler_view)
     RecyclerView recyclerView;
 
-    @Bind(R.id.new_checklist)
+    @BindView(R.id.new_checklist)
     EmojiEditText newCheckListEditText;
 
-    @Bind(R.id.add_checklist_button)
+    @BindView(R.id.add_checklist_button)
     Button button;
 
-    @Bind(R.id.emoji_toggle_btn0)
+    @BindView(R.id.emoji_toggle_btn0)
     ImageButton emojiToggle0;
 
-    @Bind(R.id.emoji_toggle_btn1)
+    @BindView(R.id.emoji_toggle_btn1)
     ImageButton emojiToggle1;
 
 
     ImageButton emojiToggle2;
 
-    @Bind(R.id.task_duedate_layout)
+    @BindView(R.id.task_duedate_layout)
     LinearLayout dueDateLayout;
 
-    @Bind(R.id.task_duedate_picker_layout)
+    @BindView(R.id.task_duedate_picker_layout)
     LinearLayout dueDatePickerLayout;
 
-    @Bind(R.id.duedate_checkbox)
+    @BindView(R.id.duedate_checkbox)
     CheckBox dueDateCheckBox;
 
-    @Bind(R.id.startdate_text_edittext)
+    @BindView(R.id.startdate_text_edittext)
     EditText startDatePickerText;
     DateEditTextListener startDateListener;
 
-    @Bind(R.id.duedate_text_edittext)
+    @BindView(R.id.duedate_text_edittext)
     EditText dueDatePickerText;
     DateEditTextListener dueDateListener;
 
-    @Bind(R.id.task_tags_wrapper)
+    @BindView(R.id.task_tags_wrapper)
     LinearLayout tagsWrapper;
 
-    @Bind(R.id.task_tags_checklist)
+    @BindView(R.id.task_tags_checklist)
     LinearLayout tagsContainerLinearLayout;
 
     EmojiPopup popup;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java

@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -122,16 +122,16 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
 
     class CustomizationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        @Bind(R.id.card_view)
+        @BindView(R.id.card_view)
              CardView cardView;
 
-        @Bind(R.id.linearLayout)
+        @BindView(R.id.linearLayout)
         RelativeLayout linearLayout;
 
-        @Bind(R.id.imageView)
+        @BindView(R.id.imageView)
         ImageView imageView;
 
-        @Bind(R.id.purchaseOverlay)
+        @BindView(R.id.purchaseOverlay)
         View purchaseOverlay;
 
         Customization customization;
@@ -220,10 +220,10 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
 
         private CustomizationSet set;
 
-        @Bind(R.id.label)
+        @BindView(R.id.label)
         TextView label;
 
-        @Bind(R.id.purchaseSetButton)
+        @BindView(R.id.purchaseSetButton)
         Button purchaseSetButton;
 
         Context context;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java

@@ -14,7 +14,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class FAQOverviewRecyclerAdapter  extends RecyclerView.Adapter<FAQOverviewRecyclerAdapter.FAQArticleViewHolder> {
@@ -47,7 +47,7 @@ public class FAQOverviewRecyclerAdapter  extends RecyclerView.Adapter<FAQOvervie
 
     class FAQArticleViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        @Bind(R.id.textView)
+        @BindView(R.id.textView)
         TextView textView;
 
         FAQArticle article;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java

@@ -19,7 +19,7 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.util.UUID;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 
@@ -88,7 +88,7 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTas
 
         SkillTaskItemCardBinding binding;
 
-        @Bind(R.id.notesTextView)
+        @BindView(R.id.notesTextView)
         TextView notesTextView;
 
         public ViewHolder(View itemView) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java

@@ -20,7 +20,7 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecyclerViewAdapter.SkillViewHolder> {
@@ -61,16 +61,16 @@ public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecycl
 
     class SkillViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        @Bind(R.id.skill_image)
+        @BindView(R.id.skill_image)
         ImageView skillImageView;
 
-        @Bind(R.id.skill_text)
+        @BindView(R.id.skill_text)
         TextView skillNameTextView;
 
-        @Bind(R.id.skill_notes)
+        @BindView(R.id.skill_notes)
         TextView skillNotesTextView;
 
-        @Bind(R.id.price_button)
+        @BindView(R.id.price_button)
         Button priceButton;
 
         Skill skill;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java

@@ -19,7 +19,7 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<EquipmentRecyclerViewAdapter.GearViewHolder> {
@@ -56,19 +56,19 @@ public int getItemCount() {
 
 class GearViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-    @Bind(R.id.gear_container)
+    @BindView(R.id.gear_container)
     View gearContainer;
 
-    @Bind(R.id.gear_text)
+    @BindView(R.id.gear_text)
     TextView gearNameTextView;
 
-    @Bind(R.id.gear_notes)
+    @BindView(R.id.gear_notes)
     TextView gearNotesTextView;
 
-    @Bind(R.id.gear_image)
+    @BindView(R.id.gear_image)
     ImageView imageView;
 
-    @Bind(R.id.equippedIndicator)
+    @BindView(R.id.equippedIndicator)
     View equippedIndicator;
 
     ItemData gear;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java

@@ -25,7 +25,7 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.HashMap;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetailRecyclerAdapter.MountViewHolder> {
@@ -68,16 +68,16 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetail
     class MountViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         Mount animal;
 
-        @Bind(R.id.card_view)
+        @BindView(R.id.card_view)
         CardView cardView;
 
-        @Bind(R.id.imageView)
+        @BindView(R.id.imageView)
         ImageView imageView;
 
-        @Bind(R.id.titleTextView)
+        @BindView(R.id.titleTextView)
         TextView titleView;
 
-        @Bind(R.id.ownedTextView)
+        @BindView(R.id.ownedTextView)
         TextView ownedTextView;
 
         Resources resources;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java

@@ -27,7 +27,7 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.HashMap;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecyclerAdapter.PetViewHolder> {
@@ -76,16 +76,16 @@ public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecy
     class PetViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         Pet animal;
 
-        @Bind(R.id.card_view)
+        @BindView(R.id.card_view)
         CardView cardView;
 
-        @Bind(R.id.imageView)
+        @BindView(R.id.imageView)
         ImageView imageView;
 
-        @Bind(R.id.titleTextView)
+        @BindView(R.id.titleTextView)
         TextView titleView;
 
-        @Bind(R.id.trainedProgressBar)
+        @BindView(R.id.trainedProgressBar)
         ProgressBar trainedProgressbar;
 
         Resources resources;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java

@@ -21,7 +21,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.inventory.Animal;
 import java.util.HashMap;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class StableRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -79,16 +79,16 @@ public class StableRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     class StableViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         Animal animal;
 
-        @Bind(R.id.card_view)
+        @BindView(R.id.card_view)
         CardView cardView;
 
-        @Bind(R.id.imageView)
+        @BindView(R.id.imageView)
         ImageView imageView;
 
-        @Bind(R.id.titleTextView)
+        @BindView(R.id.titleTextView)
         TextView titleView;
 
-        @Bind(R.id.ownedTextView)
+        @BindView(R.id.ownedTextView)
         TextView ownedTextView;
 
         Resources resources;
@@ -143,10 +143,10 @@ public class StableRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
     class SectionViewHolder extends RecyclerView.ViewHolder {
 
-        @Bind(R.id.label)
+        @BindView(R.id.label)
         TextView label;
 
-        @Bind(R.id.purchaseSetButton)
+        @BindView(R.id.purchaseSetButton)
         Button purchaseSetButton;
 
         Context context;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java

@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -135,16 +135,16 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
 
     class CustomizationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        @Bind(R.id.card_view)
+        @BindView(R.id.card_view)
         CardView cardView;
 
-        @Bind(R.id.linearLayout)
+        @BindView(R.id.linearLayout)
         RelativeLayout linearLayout;
 
-        @Bind(R.id.imageView)
+        @BindView(R.id.imageView)
         ImageView imageView;
 
-        @Bind(R.id.purchaseOverlay)
+        @BindView(R.id.purchaseOverlay)
         View purchaseOverlay;
 
         Customization customization;
@@ -189,7 +189,7 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
 
     class SectionViewHolder extends RecyclerView.ViewHolder {
 
-        @Bind(R.id.label)
+        @BindView(R.id.label)
         TextView label;
 
         Context context;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java

@@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.R;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder> {
@@ -51,13 +51,13 @@ public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.Task
 
     class TaskViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
-        @Bind(R.id.checkedTextView)
+        @BindView(R.id.checkedTextView)
         TextView textView;
 
-        @Bind(R.id.checkBoxHolder)
+        @BindView(R.id.checkBoxHolder)
         RelativeLayout checkBoxHolder;
 
-        @Bind(R.id.checkBox)
+        @BindView(R.id.checkBox)
         CheckBox checkBox;
 
         String[] taskGroup;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java

@@ -38,7 +38,7 @@ import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerViewAdapter.ChatRecyclerViewHolder> {
@@ -128,44 +128,44 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
         private String groupId;
 
         // Toggle Inn State
-        @Bind(R.id.btn_toggle_inn)
+        @BindView(R.id.btn_toggle_inn)
         @Nullable
         Button btnToggleInn;
 
         // New Msg
-        @Bind(R.id.edit_new_message_text)
+        @BindView(R.id.edit_new_message_text)
         @Nullable
         EmojiEditText textNewMessage;
 
-        @Bind(R.id.btn_send_message)
+        @BindView(R.id.btn_send_message)
         @Nullable
         Button btnSendNewMessage;
 
-        @Bind(R.id.btn_options)
+        @BindView(R.id.btn_options)
         @Nullable
         ImageView btnOptions;
 
-        @Bind(R.id.user_background_layout)
+        @BindView(R.id.user_background_layout)
         @Nullable
         LinearLayout userBackground;
 
-        @Bind(R.id.like_background_layout)
+        @BindView(R.id.like_background_layout)
         @Nullable
         LinearLayout likeBackground;
 
-        @Bind(R.id.user_label)
+        @BindView(R.id.user_label)
         @Nullable
         TextView userLabel;
 
-        @Bind(R.id.message_text)
+        @BindView(R.id.message_text)
         @Nullable
         EmojiTextView messageText;
 
-        @Bind(R.id.ago_label)
+        @BindView(R.id.ago_label)
         @Nullable
         TextView agoLabel;
 
-        @Bind(R.id.tvLikes)
+        @BindView(R.id.tvLikes)
         @Nullable
         TextView tvLikes;
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java

@@ -21,7 +21,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
 import java.util.ArrayList;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMemberRecyclerViewAdapter.MemberViewHolder> {
@@ -56,19 +56,19 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
 
     class MemberViewHolder extends RecyclerView.ViewHolder {
 
-        @Bind(R.id.avatar)
+        @BindView(R.id.avatar)
         ImageView imageView;
 
-        @Bind(R.id.username)
+        @BindView(R.id.username)
         TextView userName;
 
-        @Bind(R.id.user_lvl)
+        @BindView(R.id.user_lvl)
         TextView lvl;
 
-        @Bind(R.id.class_label)
+        @BindView(R.id.class_label)
         TextView classLabel;
 
-        @Bind(R.id.class_background_layout)
+        @BindView(R.id.class_background_layout)
         View classBackground;
 
         ValueBarBinding hpBar;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java

@@ -17,7 +17,7 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.util.ArrayList;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import retrofit.Callback;
 import retrofit.RetrofitError;
@@ -59,16 +59,16 @@ public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<Public
 
     class GuildViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, Callback<Group> {
 
-        @Bind(R.id.nameTextView)
+        @BindView(R.id.nameTextView)
         TextView nameTextView;
 
-        @Bind(R.id.memberCountTextView)
+        @BindView(R.id.memberCountTextView)
         TextView memberCountTextView;
 
-        @Bind(R.id.descriptionTextView)
+        @BindView(R.id.descriptionTextView)
         TextView descriptionTextView;
 
-        @Bind(R.id.joinleaveButton)
+        @BindView(R.id.joinleaveButton)
         Button joinLeaveButton;
 
         Group guild;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java

@@ -14,7 +14,7 @@ import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class QuestCollectRecyclerViewAdapter extends RecyclerView.Adapter<QuestCollectRecyclerViewAdapter.QuestCollectViewHolder> {
@@ -55,13 +55,13 @@ public class QuestCollectRecyclerViewAdapter extends RecyclerView.Adapter<QuestC
     }
 
     class QuestCollectViewHolder extends RecyclerView.ViewHolder {
-        @Bind(R.id.image)
+        @BindView(R.id.image)
         ImageView image;
 
-        @Bind(R.id.name)
+        @BindView(R.id.name)
         TextView name;
 
-        @Bind(R.id.count)
+        @BindView(R.id.count)
         TextView count;
 
         View view;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java

@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -79,10 +79,10 @@ public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.Item
     public class ItemViewHolder extends RecyclerView.ViewHolder implements
             ItemTouchHelperViewHolder, Button.OnClickListener {
 
-        @Bind(R.id.item_edittext)
+        @BindView(R.id.item_edittext)
         EmojiEditText checkListTextView;
 
-        @Bind(R.id.delete_item_button)
+        @BindView(R.id.delete_item_button)
         Button deleteButton;
 
         public ItemViewHolder(View itemView) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitItemRecyclerViewAdapter.java

@@ -57,7 +57,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 
@@ -253,10 +253,10 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
 
         public HabitItem Item;
 
-        @Bind(R.id.checkedTextView)
+        @BindView(R.id.checkedTextView)
         TextView titleTextView;
 
-        @Bind(R.id.notesTextView)
+        @BindView(R.id.notesTextView)
         TextView notesTextView;
 
         public ViewHolder(View itemView) {
@@ -297,10 +297,10 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
 
     public class HabitViewHolder extends ViewHolder<Task> {
 
-        @Bind(R.id.btnPlus)
+        @BindView(R.id.btnPlus)
         Button btnPlus;
 
-        @Bind(R.id.btnMinus)
+        @BindView(R.id.btnMinus)
         Button btnMinus;
 
         HabitItemCardBinding binding;
@@ -343,16 +343,16 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
 
     public class ChecklistedViewHolder extends ViewHolder<Task> implements CompoundButton.OnCheckedChangeListener {
 
-        @Bind(R.id.checkBoxHolder)
+        @BindView(R.id.checkBoxHolder)
         RelativeLayout checkboxHolder;
 
-        @Bind(R.id.checkBox)
+        @BindView(R.id.checkBox)
         CheckBox checkbox;
 
-        @Bind(R.id.checklistView)
+        @BindView(R.id.checklistView)
         LinearLayout checklistView;
 
-        @Bind(R.id.checklistIndicatorWrapper)
+        @BindView(R.id.checklistIndicatorWrapper)
         RelativeLayout checklistIndicatorWrapper;
 
         public Boolean displayChecklist;
@@ -522,7 +522,7 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
     public class RewardViewHolder extends ViewHolder<Task> {
         RewardItemCardBinding binding;
 
-        @Bind(R.id.btnReward)
+        @BindView(R.id.btnReward)
         Button btnReward;
 
         public RewardViewHolder(View itemView) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java

@@ -15,9 +15,10 @@ import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import butterknife.Unbinder;
 
 public class AboutFragment extends Fragment {
 
@@ -27,8 +28,9 @@ public class AboutFragment extends Fragment {
     String versionName = "";
     int versionCode = 0;
     String userId = "";
+    Unbinder unbinder;
 
-    @Bind(R.id.versionInfo)
+    @BindView(R.id.versionInfo)
     public TextView versionInfo;
 
     @OnClick(R.id.sourceCodeLink)
@@ -82,7 +84,7 @@ public class AboutFragment extends Fragment {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
 
         Activity activity = getActivity();
         try {
@@ -122,7 +124,6 @@ public class AboutFragment extends Fragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
-
     }
 }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java

@@ -25,9 +25,10 @@ import org.solovyev.android.checkout.Purchases;
 import org.solovyev.android.checkout.RequestListener;
 import org.solovyev.android.checkout.Sku;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import butterknife.Unbinder;
 import io.fabric.sdk.android.Fabric;
 
 public class GemsPurchaseFragment extends BaseMainFragment {
@@ -38,9 +39,11 @@ public class GemsPurchaseFragment extends BaseMainFragment {
 
     private BillingRequests billingRequests;
 
-    @Bind(R.id.btn_purchase_gems)
+    @BindView(R.id.btn_purchase_gems)
     Button btnPurchaseGems;
 
+    private Unbinder unbinder;
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -56,7 +59,7 @@ public class GemsPurchaseFragment extends BaseMainFragment {
 
         View v = inflater.inflate(R.layout.fragment_gem_purchase, container, false);
 
-        ButterKnife.bind(this, v);
+        unbinder = ButterKnife.bind(this, v);
 
         btnPurchaseGems.setEnabled(false);
         ViewHelper.SetBackgroundTint(btnPurchaseGems, ContextCompat.getColor(container.getContext(), R.color.brand));
@@ -188,7 +191,7 @@ public class GemsPurchaseFragment extends BaseMainFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 
     public interface Listener {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java

@@ -9,14 +9,14 @@ import android.webkit.WebView;
 import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.R;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class NewsFragment extends BaseMainFragment {
 
     private View view;
 
-    @Bind(R.id.news_webview)
+    @BindView(R.id.news_webview)
     WebView newsWebview;
 
     @Override

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java

@@ -28,8 +28,9 @@ import org.greenrobot.eventbus.Subscribe;
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 public class SkillsFragment extends BaseMainFragment {
 
@@ -56,16 +57,17 @@ public class SkillsFragment extends BaseMainFragment {
         return view;
     }
 
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     RecyclerView mRecyclerView;
 
     SkillsRecyclerViewAdapter adapter;
+    Unbinder unbinder;
 
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
         mRecyclerView.setAdapter(adapter);
@@ -145,7 +147,7 @@ public class SkillsFragment extends BaseMainFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
 
     }
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java

@@ -12,14 +12,14 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class FAQDetailFragment extends BaseMainFragment {
-    @Bind(R.id.questionTextView)
+    @BindView(R.id.questionTextView)
     TextView questionTextView;
 
-    @Bind(R.id.answerTextView)
+    @BindView(R.id.answerTextView)
     TextView answerTextView;
 
     private FAQArticle article;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java

@@ -16,11 +16,11 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class FAQOverviewFragment extends BaseMainFragment {
-        @Bind(R.id.recyclerView)
+        @BindView(R.id.recyclerView)
         RecyclerView recyclerView;
 
         FAQOverviewRecyclerAdapter adapter;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java

@@ -29,14 +29,14 @@ import org.greenrobot.eventbus.Subscribe;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class StableRecyclerFragment extends BaseFragment {
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     public RecyclerViewEmptySupport recyclerView;
 
-    @Bind(R.id.empty_view)
+    @BindView(R.id.empty_view)
     public TextView emptyView;
 
     public StableRecyclerAdapter adapter;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java

@@ -22,7 +22,7 @@ import com.raizlabs.android.dbflow.sql.language.Where;
 import java.util.Date;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -34,7 +34,7 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
     public String category;
     public String activeCustomization;
 
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
 
     CustomizationRecyclerViewAdapter adapter;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java

@@ -18,7 +18,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import java.util.HashMap;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import retrofit.Callback;
 import retrofit.RetrofitError;
@@ -28,34 +28,34 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
 
     FragmentAvatarOverviewBinding viewBinding;
 
-    @Bind(R.id.avatar_size_spinner)
+    @BindView(R.id.avatar_size_spinner)
     Spinner avatarSizeSpinner;
 
-    @Bind(R.id.avatar_shirt)
+    @BindView(R.id.avatar_shirt)
     View avatarShirtView;
 
-    @Bind(R.id.avatar_skin)
+    @BindView(R.id.avatar_skin)
     View avatarSkinView;
 
-    @Bind(R.id.avatar_hair_color)
+    @BindView(R.id.avatar_hair_color)
     View avatarHairColorView;
 
-    @Bind(R.id.avatar_hair_base)
+    @BindView(R.id.avatar_hair_base)
     View avatarHairBaseView;
 
-    @Bind(R.id.avatar_hair_bangs)
+    @BindView(R.id.avatar_hair_bangs)
     View avatarHairBangsView;
 
-    @Bind(R.id.avatar_hair_flower)
+    @BindView(R.id.avatar_hair_flower)
     View avatarHairFlowerView;
 
-    @Bind(R.id.avatar_hair_beard)
+    @BindView(R.id.avatar_hair_beard)
     View avatarHairBeardView;
 
-    @Bind(R.id.avatar_hair_mustache)
+    @BindView(R.id.avatar_hair_mustache)
     View avatarHairMustacheView;
 
-    @Bind(R.id.avatar_background)
+    @BindView(R.id.avatar_background)
     View avatarBackgroundView;
 
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java

@@ -17,7 +17,7 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class EquipmentDetailFragment extends BaseMainFragment {
@@ -26,7 +26,7 @@ public class EquipmentDetailFragment extends BaseMainFragment {
     public String equippedGear;
     public Boolean isCostume;
 
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
 
     EquipmentRecyclerViewAdapter adapter;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java

@@ -24,17 +24,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class EquipmentOverviewFragment extends BaseMainFragment implements TransactionListener<List<ItemData>> {
 
     FragmentEquipmentOverviewBinding viewBinding;
 
-    @Bind(R.id.battle_gear_group)
+    @BindView(R.id.battle_gear_group)
     View battleGearGroupView;
 
-    @Bind(R.id.costume_group)
+    @BindView(R.id.costume_group)
     View costumeGroupView;
 
     View battleGearHeadView;
@@ -55,7 +55,7 @@ public class EquipmentOverviewFragment extends BaseMainFragment implements Trans
     View costumeWeaponView;
     View costumeShieldView;
 
-    @Bind(R.id.costume_switch)
+    @BindView(R.id.costume_switch)
     Switch costumeSwitch;
 
     HashMap<String, String> nameMapping;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java

@@ -34,17 +34,17 @@ import org.w3c.dom.Text;
 import java.util.HashMap;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class ItemRecyclerFragment extends BaseFragment {
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     public RecyclerViewEmptySupport recyclerView;
 
-    @Bind(R.id.empty_view)
+    @BindView(R.id.empty_view)
     public TextView emptyView;
 
-    @Bind(R.id.titleTextView)
+    @BindView(R.id.titleTextView)
     public TextView titleView;
     public ItemRecyclerAdapter adapter;
     public String itemType;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java

@@ -23,7 +23,7 @@ import com.raizlabs.android.dbflow.sql.language.Where;
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class AvatarSetupFragment extends BaseFragment {
@@ -34,10 +34,10 @@ public class AvatarSetupFragment extends BaseFragment {
     public int width;
 
 
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
 
-    @Bind(R.id.avatarView)
+    @BindView(R.id.avatarView)
     ImageView avatarView;
 
     CustomizationSetupAdapter adapter;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.java

@@ -12,18 +12,18 @@ import android.widget.TextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class IntroFragment extends BaseFragment {
 
-    @Bind(R.id.titleTextView)
+    @BindView(R.id.titleTextView)
     TextView titleTextView;
 
-    @Bind(R.id.descriptionTextView)
+    @BindView(R.id.descriptionTextView)
     TextView descriptionTextView;
 
-    @Bind(R.id.imageView)
+    @BindView(R.id.imageView)
     ImageView imageView;
 
     Drawable image;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java

@@ -19,7 +19,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class TaskSetupFragment extends BaseFragment {
@@ -33,7 +33,7 @@ public class TaskSetupFragment extends BaseFragment {
 
     private Object[][] tasks;
 
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
 
     TaskSetupAdapter adapter;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java

@@ -40,7 +40,7 @@ import org.greenrobot.eventbus.Subscribe;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import retrofit.Callback;
 import retrofit.RetrofitError;
@@ -104,10 +104,10 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
         return view;
     }
 
-    @Bind(R.id.chat_list)
+    @BindView(R.id.chat_list)
     RecyclerView mRecyclerView;
 
-    @Bind(R.id.chat_refresh_layout)
+    @BindView(R.id.chat_refresh_layout)
     SwipeRefreshLayout swipeRefreshLayout;
 
     LinearLayoutManager layoutManager;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java

@@ -24,7 +24,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.Group;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import retrofit.Callback;
@@ -37,9 +37,9 @@ public class GroupInformationFragment extends Fragment {
     private View view;
     FragmentGroupInfoBinding viewBinding;
     APIHelper mAPIHelper;
-    @Bind(R.id.questMemberView)
+    @BindView(R.id.questMemberView)
     LinearLayout questMemberView;
-    @Bind(R.id.collectionStats)
+    @BindView(R.id.collectionStats)
     RecyclerView collectionStats;
     private Group group;
     private HabitRPGUser user;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java

@@ -20,7 +20,7 @@ import com.raizlabs.android.dbflow.sql.language.Where;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import retrofit.Callback;
 import retrofit.RetrofitError;
@@ -28,13 +28,13 @@ import retrofit.client.Response;
 
 public class GuildsOverviewFragment extends BaseMainFragment implements Callback<ArrayList<Group>>, View.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
 
-    @Bind(R.id.my_guilds_listview)
+    @BindView(R.id.my_guilds_listview)
     LinearLayout  guildsListView;
 
-    @Bind(R.id.publicGuildsButton)
+    @BindView(R.id.publicGuildsButton)
     Button publicGuildsButton;
 
-    @Bind(R.id.chat_refresh_layout)
+    @BindView(R.id.chat_refresh_layout)
     SwipeRefreshLayout swipeRefreshLayout;
 
     private List<Group> guilds;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java

@@ -16,7 +16,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.Group;
 
 import java.util.ArrayList;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import retrofit.Callback;
 import retrofit.RetrofitError;
@@ -27,7 +27,7 @@ public class PublicGuildsFragment extends BaseMainFragment implements Callback<A
     ArrayList<String> memberGuildIDs;
     ArrayList <Group> guilds;
 
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
 
     private View view;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java

@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -24,10 +24,10 @@ public class PartyInviteFragment extends BaseFragment {
 
     public boolean isEmailInvite;
 
-    @Bind(R.id.inviteDescription)
+    @BindView(R.id.inviteDescription)
     TextView inviteDescription;
 
-    @Bind(R.id.invitationWrapper)
+    @BindView(R.id.invitationWrapper)
     LinearLayout invitationWrapper;
 
     @Nullable

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java

@@ -16,8 +16,9 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
 import java.util.ArrayList;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 /**
  * Created by Negue on 15.09.2015.
@@ -36,8 +37,9 @@ public class PartyMemberListFragment extends Fragment {
     }
 
     private View view;
+    private Unbinder unbinder;
 
-    @Bind(R.id.recyclerView)
+    @BindView(R.id.recyclerView)
     RecyclerView mRecyclerView;
 
     @Nullable
@@ -53,7 +55,7 @@ public class PartyMemberListFragment extends Fragment {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
         viewAdapter = new PartyMemberRecyclerViewAdapter();
@@ -73,8 +75,7 @@ public class PartyMemberListFragment extends Fragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
-
     }
 
 }