sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-18 20:04:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #305 from ianrumac/update/butterknife

Browse source 
Updated butterknife dependency and unbinded fragment views
This commit is contained in:
Phillip Thelen 2015-12-17 15:21:25 +01:00
commit 6660e83af2
17 changed files with 142 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/build.gradle
View file

@ -42,8 +42,8 @@ dependencies {
transitive = true;
}
// View Elements Injection :)
compile 'com.jakewharton:butterknife:6.1.0'
// View Elements Binding :)
compile 'com.jakewharton:butterknife:7.0.1'
compile('com.mikepenz:materialdrawer:4.3.8@aar') {
transitive = true

8
Habitica/src/com/habitrpg/android/habitica/AboutActivity.java
View file

@ -17,15 +17,15 @@ import com.habitrpg.android.habitica.ui.fragments.AboutFragment;
import com.mikepenz.aboutlibraries.Libs;
import com.mikepenz.aboutlibraries.LibsBuilder;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
public class AboutActivity extends AppCompatActivity {
@InjectView(R.id.pager)
@Bind(R.id.pager)
ViewPager pager;
@InjectView(R.id.tab_layout)
@Bind(R.id.tab_layout)
TabLayout tabLayout;
@Override
@ -33,7 +33,7 @@ public class AboutActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
ButterKnife.inject(this);
ButterKnife.bind(this);
ActionBar actionBar = getSupportActionBar();

21
Habitica/src/com/habitrpg/android/habitica/MainActivity.java
View file

@ -22,7 +22,6 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import butterknife.ButterKnife;
import butterknife.InjectView;
import com.afollestad.materialdialogs.MaterialDialog;
import com.crashlytics.android.Crashlytics;
import com.crashlytics.android.core.CrashlyticsCore;
@ -78,6 +77,14 @@ import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import butterknife.Bind;
import butterknife.ButterKnife;
import de.greenrobot.event.EventBus;
import io.fabric.sdk.android.Fabric;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
public class MainActivity extends AppCompatActivity implements HabitRPGUserCallback.OnUserReceived,
TaskScoringCallback.OnTaskScored,
GemsPurchaseFragment.Listener {
@ -88,16 +95,16 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb
BaseFragment activeFragment;
@InjectView(R.id.floating_menu_wrapper)
@Bind(R.id.floating_menu_wrapper)
FrameLayout floatingMenuWrapper;
@InjectView(R.id.toolbar)
@Bind(R.id.toolbar)
Toolbar toolbar;
@InjectView(R.id.detail_tabs)
@Bind(R.id.detail_tabs)
TabLayout detail_tabs;
@InjectView(R.id.avatar_with_bars)
@Bind(R.id.avatar_with_bars)
View avatar_with_bars;
AccountHeader accountHeader;
@ -121,7 +128,7 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb
setContentView(R.layout.activity_main);
// Inject Controls
ButterKnife.inject(this);
ButterKnife.bind(this);
// Initialize Crashlytics
Crashlytics crashlytics = new Crashlytics.Builder()
@ -621,6 +628,7 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb
this.mAPIHelper.retrieveUser(new HabitRPGUserCallback(this));
user.getStats().setLvl((int) lvl);
this.showSnackbar(message.toString());
} else {
com.magicmicky.habitrpgwrapper.lib.models.Stats stats = user.getStats();
@ -719,7 +727,6 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb
if (customView != null) {
TextView detailView = (TextView) customView.findViewById(R.id.levelupDetail);
detailView.setText(this.getString(R.string.levelup_detail, level));
ImageView avatarView = (ImageView) customView.findViewById(R.id.avatarView);
UserPicture userPicture = new UserPicture(user, this, false, false);
userPicture.setPictureOn(avatarView);

8
Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java
View file

@ -17,17 +17,17 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import java.util.HashMap;
import java.util.Map;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
/**
* Created by viirus on 28/11/15.
*/
public class SkillTasksActivity extends AppCompatActivity {
@InjectView(R.id.viewpager)
@Bind(R.id.viewpager)
public ViewPager viewPager;
@InjectView(R.id.tab_layout)
@Bind(R.id.tab_layout)
public TabLayout tabLayout;
Map<Integer, SkillTasksRecyclerViewFragment> ViewFragmentsDictionary = new HashMap<>();
@ -37,7 +37,7 @@ public class SkillTasksActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_skill_tasks);
ButterKnife.inject(this);
ButterKnife.bind(this);
loadTaskLists();
}

16
Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
View file

@ -47,8 +47,8 @@ import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
@ -70,22 +70,22 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
private CheckListAdapter checklistAdapter;
private Button btnDelete;
@InjectView(R.id.task_value_edittext)
@Bind(R.id.task_value_edittext)
EditText taskValue;
@InjectView(R.id.task_value_layout)
@Bind(R.id.task_value_layout)
TextInputLayout taskValueLayout;
@InjectView(R.id.task_checklist_wrapper)
@Bind(R.id.task_checklist_wrapper)
LinearLayout checklistWrapper;
@InjectView(R.id.task_startdate_layout)
@Bind(R.id.task_startdate_layout)
LinearLayout startDateWrapper;
@InjectView(R.id.task_startdate_picker)
@Bind(R.id.task_startdate_picker)
DatePicker startDatePicker;
@InjectView(R.id.task_difficulty_wrapper)
@Bind(R.id.task_difficulty_wrapper)
LinearLayout difficultyWrapper;
@Override
@ -93,7 +93,7 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_task_form);
ButterKnife.inject(this);
ButterKnife.bind(this);
Intent intent = getIntent();
Bundle bundle = intent.getExtras();

8
Habitica/src/com/habitrpg/android/habitica/ui/EditTextDrawer.java
View file

@ -11,8 +11,8 @@ import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
import com.mikepenz.materialdrawer.model.BasePrimaryDrawerItem;
import com.mikepenz.materialdrawer.model.utils.ViewHolderFactory;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
/**
@ -55,16 +55,16 @@ public class EditTextDrawer extends BasePrimaryDrawerItem<EditTextDrawer> {
View view;
@InjectView(R.id.editText)
@Bind(R.id.editText)
EditText editText;
@InjectView(R.id.btnAdd)
@Bind(R.id.btnAdd)
Button btnAdd;
private ViewHolder(View view) {
super(view);
this.view = view;
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
ViewHelper.SetBackgroundTint(btnAdd, view.getResources().getColor(R.color.brand));

46
Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java
View file

@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.adapter;
import android.content.Context;
import android.content.res.Resources;
import android.support.annotation.Nullable;
import android.support.v7.widget.AppCompatEditText;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
@ -33,9 +34,8 @@ import java.lang.reflect.Field;
import java.util.List;
import java.util.Map;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.Optional;
import de.greenrobot.event.EventBus;
/**
@ -130,45 +130,45 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
private String groupId;
// Toggle Inn State
@InjectView(R.id.btn_toggle_inn)
@Optional
@Bind(R.id.btn_toggle_inn)
@Nullable
Button btnToggleInn;
// New Msg
@InjectView(R.id.edit_new_message_text)
@Optional
@Bind(R.id.edit_new_message_text)
@Nullable
AppCompatEditText textNewMessage;
@InjectView(R.id.btn_send_message)
@Optional
@Bind(R.id.btn_send_message)
@Nullable
Button btnSendNewMessage;
@InjectView(R.id.btn_options)
@Optional
@Bind(R.id.btn_options)
@Nullable
ImageView btnOptions;
@InjectView(R.id.user_background_layout)
@Optional
@Bind(R.id.user_background_layout)
@Nullable
LinearLayout userBackground;
@InjectView(R.id.like_background_layout)
@Optional
@Bind(R.id.like_background_layout)
@Nullable
LinearLayout likeBackground;
@InjectView(R.id.user_label)
@Optional
@Bind(R.id.user_label)
@Nullable
TextView userLabel;
@InjectView(R.id.message_text)
@Optional
@Bind(R.id.message_text)
@Nullable
TextView messageText;
@InjectView(R.id.ago_label)
@Optional
@Bind(R.id.ago_label)
@Nullable
TextView agoLabel;
@InjectView(R.id.tvLikes)
@Optional
@Bind(R.id.tvLikes)
@Nullable
TextView tvLikes;
Context context;
@ -180,7 +180,7 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
this.uuid = currentUserId;
this.groupId = groupId;
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
context = viewContext;

8
Habitica/src/com/habitrpg/android/habitica/ui/adapter/CheckListAdapter.java
View file

@ -19,8 +19,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
/**
* Created by franzejr on 15/11/15.
@ -79,15 +79,15 @@ public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.Item
public class ItemViewHolder extends RecyclerView.ViewHolder implements
ItemTouchHelperViewHolder, Button.OnClickListener {
@InjectView(R.id.item_edittext)
@Bind(R.id.item_edittext)
EditText checkListTextView;
@InjectView(R.id.delete_item_button)
@Bind(R.id.delete_item_button)
Button deleteButton;
public ItemViewHolder(View itemView) {
super(itemView);
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
deleteButton.setOnClickListener(this);
checkListTextView.addTextChangedListener(new TextWatcher() {

18
Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
View file

@ -49,8 +49,8 @@ import com.raizlabs.android.dbflow.sql.language.Select;
import java.util.List;
import java.util.UUID;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
@ -249,7 +249,7 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
public THabitItem Item;
@InjectView(R.id.notesTextView)
@Bind(R.id.notesTextView)
TextView notesTextView;
public ViewHolder(View itemView) {
@ -261,7 +261,7 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
itemView.setOnLongClickListener(this);
itemView.setLongClickable(true);
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
resources = itemView.getResources();
}
@ -298,10 +298,10 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
public class HabitViewHolder extends ViewHolder<Task> {
@InjectView(R.id.btnPlus)
@Bind(R.id.btnPlus)
Button btnPlus;
@InjectView(R.id.btnMinus)
@Bind(R.id.btnMinus)
Button btnMinus;
HabitItemCardBinding binding;
@ -344,13 +344,13 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
public class ChecklistedViewHolder extends ViewHolder<Task> implements CompoundButton.OnCheckedChangeListener {
@InjectView(R.id.checkBox)
@Bind(R.id.checkBox)
CheckBox checkbox;
@InjectView(R.id.checklistView)
@Bind(R.id.checklistView)
LinearLayout checklistView;
@InjectView(R.id.checklistIndicatorWrapper)
@Bind(R.id.checklistIndicatorWrapper)
RelativeLayout checklistIndicatorWrapper;
public Boolean displayChecklist;
@ -501,7 +501,7 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
public class RewardViewHolder extends ViewHolder<Task> {
RewardItemCardBinding binding;
@InjectView(R.id.btnReward)
@Bind(R.id.btnReward)
Button btnReward;
public RewardViewHolder(View itemView) {

14
Habitica/src/com/habitrpg/android/habitica/ui/adapter/PartyMemberRecyclerViewAdapter.java
View file

@ -18,8 +18,8 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import java.util.ArrayList;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
/**
* Created by Negue on 22.09.2015.
@ -56,19 +56,19 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
class MemberViewHolder extends RecyclerView.ViewHolder {
@InjectView(R.id.avatar)
@Bind(R.id.avatar)
ImageView imageView;
@InjectView(R.id.username)
@Bind(R.id.username)
TextView userName;
@InjectView(R.id.user_lvl)
@Bind(R.id.user_lvl)
TextView lvl;
@InjectView(R.id.class_label)
@Bind(R.id.class_label)
TextView classLabel;
@InjectView(R.id.class_background_layout)
@Bind(R.id.class_background_layout)
View classBackground;
ValueBarBinding hpBar;
@ -78,7 +78,7 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
public MemberViewHolder(View itemView) {
super(itemView);
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
View hpBarView = itemView.findViewById(R.id.hpBar);

6
Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
View file

@ -19,8 +19,8 @@ import com.raizlabs.android.dbflow.sql.language.Select;
import java.util.UUID;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTasksRecyclerViewAdapter.ViewHolder> {
@ -89,7 +89,7 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTas
SkillTaskItemCardBinding binding;
@InjectView(R.id.notesTextView)
@Bind(R.id.notesTextView)
TextView notesTextView;
public ViewHolder(View itemView) {
@ -98,7 +98,7 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTas
itemView.setOnClickListener(this);
itemView.setClickable(true);
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
binding = DataBindingUtil.bind(itemView);
resources = itemView.getResources();

10
Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
View file

@ -14,8 +14,8 @@ import com.magicmicky.habitrpgwrapper.lib.models.Skill;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
/**
@ -60,13 +60,13 @@ public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecycl
class SkillViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@InjectView(R.id.skill_text)
@Bind(R.id.skill_text)
TextView skillNameTextView;
@InjectView(R.id.skill_notes)
@Bind(R.id.skill_notes)
TextView skillNotesTextView;
@InjectView(R.id.price_button)
@Bind(R.id.price_button)
Button priceButton;
Skill skill;
@ -76,7 +76,7 @@ public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecycl
public SkillViewHolder(View itemView) {
super(itemView);
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
resources = itemView.getResources();

9
Habitica/src/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
View file

@ -71,7 +71,7 @@ public class AboutFragment extends Fragment {
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
}
private void openBrowserLink(String url) {
@ -86,4 +86,11 @@ public class AboutFragment extends Fragment {
emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
startActivity(Intent.createChooser(emailIntent, "Send email..."));
}
@Override
public void onDestroyView() {
super.onDestroyView();
ButterKnife.unbind(this);
}
}

11
Habitica/src/com/habitrpg/android/habitica/ui/fragments/ChatListFragment.java
View file

@ -31,8 +31,8 @@ import com.magicmicky.habitrpgwrapper.lib.models.PostChatMessageResult;
import java.util.ArrayList;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
import de.greenrobot.event.EventBusException;
import retrofit.Callback;
@ -83,10 +83,10 @@ public class ChatListFragment extends Fragment implements SwipeRefreshLayout.OnR
return view;
}
@InjectView(R.id.chat_list)
@Bind(R.id.chat_list)
RecyclerView mRecyclerView;
@InjectView(R.id.chat_refresh_layout)
@Bind(R.id.chat_refresh_layout)
SwipeRefreshLayout swipeRefreshLayout;
LinearLayoutManager layoutManager;
@ -95,7 +95,7 @@ public class ChatListFragment extends Fragment implements SwipeRefreshLayout.OnR
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
swipeRefreshLayout.setOnRefreshListener(this);
@ -241,6 +241,9 @@ public class ChatListFragment extends Fragment implements SwipeRefreshLayout.OnR
if (registerEventBus) {
EventBus.getDefault().unregister(this);
}
ButterKnife.unbind(this);
super.onDestroyView();
}
}

21
Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
View file

@ -7,7 +7,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.OnClick;
import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.R;
@ -23,6 +22,12 @@ import org.solovyev.android.checkout.Purchase;
import org.solovyev.android.checkout.Purchases;
import org.solovyev.android.checkout.RequestListener;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.greenrobot.event.EventBus;
import io.fabric.sdk.android.Fabric;
/**
* Created by Negue on 24.11.2015.
*/
@ -34,7 +39,7 @@ public class GemsPurchaseFragment extends BaseFragment {
private BillingRequests billingRequests;
@InjectView(R.id.btn_purchase_gems)
@Bind(R.id.btn_purchase_gems)
Button btnPurchaseGems;
@Override
@ -52,7 +57,7 @@ public class GemsPurchaseFragment extends BaseFragment {
View v = inflater.inflate(R.layout.fragment_gem_purchase, container, false);
ButterKnife.inject(this, v);
ButterKnife.bind(this, v);
btnPurchaseGems.setEnabled(false);
ViewHelper.SetBackgroundTint(btnPurchaseGems, container.getResources().getColor(R.color.brand));
@ -157,6 +162,16 @@ public class GemsPurchaseFragment extends BaseFragment {
}
@Override
public void onDestroyView() {
super.onDestroyView();
ButterKnife.unbind(this);
}
public interface Listener {
ActivityCheckout getActivityCheckout();
}

14
Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyMemberListFragment.java
View file

@ -17,8 +17,8 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import java.util.ArrayList;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
/**
* Created by Negue on 15.09.2015.
@ -39,7 +39,7 @@ public class PartyMemberListFragment extends Fragment {
private View view;
@InjectView(R.id.recyclerView)
@Bind(R.id.recyclerView)
RecyclerView mRecyclerView;
@Nullable
@ -55,7 +55,7 @@ public class PartyMemberListFragment extends Fragment {
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
mRecyclerView.setAdapter(viewAdapter);
@ -68,4 +68,12 @@ public class PartyMemberListFragment extends Fragment {
public void setMemberList(ArrayList<HabitRPGUser> members) {
viewAdapter.setMemberList(members);
}
@Override
public void onDestroyView() {
super.onDestroyView();
ButterKnife.unbind(this);
}
}

14
Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
View file

@ -25,8 +25,8 @@ import com.raizlabs.android.dbflow.sql.language.Select;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
/**
* Created by viirus on 25/11/15.
@ -53,7 +53,7 @@ public class SkillsFragment extends BaseFragment {
return view;
}
@InjectView(R.id.recyclerView)
@Bind(R.id.recyclerView)
RecyclerView mRecyclerView;
SkillsRecyclerViewAdapter adapter;
@ -62,7 +62,7 @@ public class SkillsFragment extends BaseFragment {
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
mRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
mRecyclerView.setAdapter(adapter);
@ -136,4 +136,12 @@ public class SkillsFragment extends BaseFragment {
progressDialog.dismiss();
}
}
@Override
public void onDestroyView() {
super.onDestroyView();
ButterKnife.unbind(this);
}
}