diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 497935378..c51d1aa83 100644 --- a/Habitica/build.gradle +++ b/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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/EditTextDrawer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/EditTextDrawer.java index a8c391e3d..e7015435b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/EditTextDrawer.java +++ b/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 { @@ -48,10 +48,10 @@ public class EditTextDrawer extends BasePrimaryDrawerItem { - @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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java index 9cee089ec..95dc926bc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java +++ b/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) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java index da5f95fc9..3ac88d66f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java +++ b/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.. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java index fb5790bc1..ec827d479 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java +++ b/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 fragments = new ArrayList<>(); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java index 483bf0830..3ceb9cc68 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java +++ b/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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java index 165c3d4f9..4eb82433f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java index 46da227ee..c0697363e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java +++ b/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 viewFragmentsDictionary = new HashMap<>(); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java index 42235f497..7f781b899 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java +++ b/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 tagCheckBoxList; private List 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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java index fbf9980d2..f492520e0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java +++ b/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 { @@ -122,16 +122,16 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter { @@ -47,7 +47,7 @@ public class FAQOverviewRecyclerAdapter extends RecyclerView.Adapter { @@ -61,16 +61,16 @@ public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter { @@ -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java index e26e77130..4bf801340 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java +++ b/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 { @@ -68,16 +68,16 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter { @@ -76,16 +76,16 @@ public class PetDetailRecyclerAdapter extends RecyclerView.Adapter { @@ -79,16 +79,16 @@ public class StableRecyclerAdapter extends RecyclerView.Adapter { @@ -135,16 +135,16 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter { @@ -51,13 +51,13 @@ public class TaskSetupAdapter extends RecyclerView.Adapter { @@ -128,44 +128,44 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter { @@ -56,19 +56,19 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter { - @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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java index 7f759500a..2d0f9ce35 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java +++ b/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 { @@ -55,13 +55,13 @@ public class QuestCollectRecyclerViewAdapter extends RecyclerView.Adapter 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 public class HabitViewHolder extends ViewHolder { - @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 public class ChecklistedViewHolder extends ViewHolder 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 public class RewardViewHolder extends ViewHolder { RewardItemCardBinding binding; - @Bind(R.id.btnReward) + @BindView(R.id.btnReward) Button btnReward; public RewardViewHolder(View itemView) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java index c16df1512..9fc9fb1fd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java +++ b/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(); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java index 521712ca3..2c1c77149 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java @@ -1,9 +1,9 @@ package com.habitrpg.android.habitica.ui.fragments; import android.os.Bundle; +import android.support.annotation.CallSuper; import android.support.annotation.Nullable; import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -23,6 +23,9 @@ import org.json.JSONObject; import java.util.Date; +import butterknife.ButterKnife; +import butterknife.Unbinder; + public class BaseFragment extends DialogFragment { private boolean registerEventBus = false; @@ -30,6 +33,8 @@ public class BaseFragment extends DialogFragment { public String tutorialStepIdentifier; public String tutorialText; + private Unbinder unbinder; + @Override public void setUserVisibleHint(boolean isVisibleToUser) { super.setUserVisibleHint(isVisibleToUser); @@ -69,11 +74,19 @@ public class BaseFragment extends DialogFragment { return null; } + @CallSuper + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + unbinder = ButterKnife.bind(this, view); + } + @Override public void onDestroyView() { if (registerEventBus) { EventBus.getDefault().unregister(this); } + unbinder.unbind(); super.onDestroyView(); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java index aec12f2e9..0b027eb65 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java @@ -4,8 +4,6 @@ import android.content.Context; import android.os.Bundle; import android.support.design.widget.TabLayout; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; @@ -17,9 +15,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.raizlabs.android.dbflow.sql.builder.Condition; import com.raizlabs.android.dbflow.sql.language.Select; -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.EventBusException; - public abstract class BaseMainFragment extends BaseFragment { public MainActivity activity; @@ -95,12 +90,6 @@ public abstract class BaseMainFragment extends BaseFragment { return null; } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); - } - @Override public void onSaveInstanceState(Bundle outState) { if (user != null) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java index 346603080..cc6a3d02b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java @@ -25,8 +25,7 @@ import org.solovyev.android.checkout.Purchases; import org.solovyev.android.checkout.RequestListener; import org.solovyev.android.checkout.Sku; -import butterknife.Bind; -import butterknife.ButterKnife; +import butterknife.BindView; import butterknife.OnClick; import io.fabric.sdk.android.Fabric; @@ -38,7 +37,7 @@ public class GemsPurchaseFragment extends BaseMainFragment { private BillingRequests billingRequests; - @Bind(R.id.btn_purchase_gems) + @BindView(R.id.btn_purchase_gems) Button btnPurchaseGems; @Override @@ -56,8 +55,6 @@ public class GemsPurchaseFragment extends BaseMainFragment { View v = inflater.inflate(R.layout.fragment_gem_purchase, container, false); - ButterKnife.bind(this, v); - btnPurchaseGems.setEnabled(false); ViewHelper.SetBackgroundTint(btnPurchaseGems, ContextCompat.getColor(container.getContext(), R.color.brand)); @@ -185,12 +182,6 @@ public class GemsPurchaseFragment extends BaseMainFragment { } - @Override - public void onDestroyView() { - super.onDestroyView(); - ButterKnife.unbind(this); - } - public interface Listener { ActivityCheckout getActivityCheckout(); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java index 18544d66a..90e4a44f5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java +++ b/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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java index ca84df609..64365b06b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java @@ -28,8 +28,7 @@ import org.greenrobot.eventbus.Subscribe; import java.util.List; -import butterknife.Bind; -import butterknife.ButterKnife; +import butterknife.BindView; public class SkillsFragment extends BaseMainFragment { @@ -56,7 +55,7 @@ public class SkillsFragment extends BaseMainFragment { return view; } - @Bind(R.id.recyclerView) + @BindView(R.id.recyclerView) RecyclerView mRecyclerView; SkillsRecyclerViewAdapter adapter; @@ -65,8 +64,6 @@ public class SkillsFragment extends BaseMainFragment { public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - ButterKnife.bind(this, view); - mRecyclerView.setLayoutManager(new LinearLayoutManager(activity)); mRecyclerView.setAdapter(adapter); } @@ -142,11 +139,4 @@ public class SkillsFragment extends BaseMainFragment { } } - @Override - public void onDestroyView() { - super.onDestroyView(); - ButterKnife.unbind(this); - - } - } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java index 1ad0b5962..ccb29d72c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java index d1d469740..fa99dd6be 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java index 1ce7559d7..934c35c26 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java index c60ca4e2b..3ac92cf60 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java index b83445ad9..bebcce31d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java index cdc100532..a1d6f4127 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java index c2a01f860..8660d6b80 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java +++ b/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> { 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 nameMapping; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java index a5e6d7827..9db8a2b6d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java index 4fdc29633..0e065e510 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.java index 3d9812864..5c7980934 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java index c2c13f077..1cd8fcc1c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java index 3cc03b08d..6edf825bb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java index 47a9d5990..ee330d0a5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java +++ b/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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java index 5a209af9a..463b3ed7c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java +++ b/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>, 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 guilds; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java index 28ba5ebf2..253d1e64b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java +++ b/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 memberGuildIDs; ArrayList guilds; - @Bind(R.id.recyclerView) + @BindView(R.id.recyclerView) RecyclerView recyclerView; private View view; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java index dea9d70ca..6f408cc98 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java +++ b/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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java index ff8e06363..fd2b85352 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java @@ -16,8 +16,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import java.util.ArrayList; -import butterknife.Bind; -import butterknife.ButterKnife; +import butterknife.BindView; /** * Created by Negue on 15.09.2015. @@ -37,7 +36,7 @@ public class PartyMemberListFragment extends Fragment { private View view; - @Bind(R.id.recyclerView) + @BindView(R.id.recyclerView) RecyclerView mRecyclerView; @Nullable @@ -53,8 +52,6 @@ public class PartyMemberListFragment extends Fragment { public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - ButterKnife.bind(this, view); - mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx)); viewAdapter = new PartyMemberRecyclerViewAdapter(); viewAdapter.context = this.ctx; @@ -70,11 +67,4 @@ public class PartyMemberListFragment extends Fragment { viewAdapter.setMemberList(members); } - @Override - public void onDestroyView() { - super.onDestroyView(); - ButterKnife.unbind(this); - - } - }