tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Butterknife 7

Browse source
This commit is contained in:
Karim Abou Zeid 2015-07-15 15:53:03 +02:00
commit e5f0e6a6c8
15 changed files with 111 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
View file

@ -143,7 +143,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
public class ViewHolder extends MediaEntryViewHolder {
public ViewHolder(@NonNull View itemView, int itemViewType) {
super(itemView);
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
itemView.setOnLongClickListener(null);
if (itemViewType != HEADER) {

35
app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java
View file

@ -10,60 +10,53 @@ import android.widget.TextView;
import com.kabouzeid.gramophone.R;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.Optional;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public abstract class MediaEntryViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
@Nullable
@Optional
@InjectView(R.id.image)
@Bind(R.id.image)
public ImageView image;
@Nullable
@Optional
@InjectView(R.id.image_text)
@Bind(R.id.image_text)
public TextView imageText;
@Nullable
@Optional
@InjectView(R.id.title)
@Bind(R.id.title)
public TextView title;
@Nullable
@Optional
@InjectView(R.id.text)
@Bind(R.id.text)
public TextView text;
@Nullable
@Optional
@InjectView(R.id.menu)
@Bind(R.id.menu)
public View menu;
@Nullable
@Optional
@InjectView(R.id.separator)
@Bind(R.id.separator)
public View separator;
@Nullable
@Optional
@InjectView(R.id.short_separator)
@Bind(R.id.short_separator)
public View shortSeparator;
@Nullable
@Optional
@InjectView(R.id.selected_indicator)
@Bind(R.id.selected_indicator)
public View selectedIndicator;
@Nullable
@Optional
@InjectView(R.id.palette_color_container)
@Bind(R.id.palette_color_container)
public View paletteColorContainer;
public int paletteColor;
public MediaEntryViewHolder(View itemView) {
super(itemView);
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
itemView.setOnClickListener(this);
itemView.setOnLongClickListener(this);