Skip to content

Commit

Permalink
Fix raw use of parametrized class RecyclerView.Adapter.
Browse files Browse the repository at this point in the history
  • Loading branch information
@amCap1712
amCap1712 committed Jun 1, 2020
1 parent c5e5aa0 commit a2e616a
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 44 deletions.
15 changes: 7 additions & 8 deletions app/src/main/java/org/metabrainz/mobile/presentation/features/adapters/ResultAdapter.java
View file
Expand Up @@ -16,9 +16,9 @@

import java.util.List;

public class ResultAdapter extends RecyclerView.Adapter {
private List<ResultItem> data;
private MBEntityType entity;
public class ResultAdapter extends RecyclerView.Adapter<ResultViewHolder> {
private final List<ResultItem> data;
private final MBEntityType entity;
private int lastPosition = -1;

public ResultAdapter(List<ResultItem> data, MBEntityType entity) {
Expand All @@ -40,11 +40,10 @@ public ResultViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewTy
}

@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
ResultViewHolder viewHolder = (ResultViewHolder) holder;
viewHolder.bind(data.get(position));
setAnimation(viewHolder.itemView, position);
viewHolder.itemView.setOnClickListener(v -> onClick(v, position));
public void onBindViewHolder(@NonNull ResultViewHolder holder, int position) {
holder.bind(data.get(position));
setAnimation(holder.itemView, position);
holder.itemView.setOnClickListener(v -> onClick(v, position));
}

private void setAnimation(View viewToAnimate, int position) {
Expand Down
23 changes: 11 additions & 12 deletions app/src/main/java/org/metabrainz/mobile/presentation/features/artist/ArtistLinkAdapter.java
View file
Expand Up @@ -21,7 +21,7 @@

import java.util.List;

class ArtistLinkAdapter extends RecyclerView.Adapter implements View.OnClickListener {
class ArtistLinkAdapter extends RecyclerView.Adapter<ArtistLinkAdapter.LinkViewHolder> implements View.OnClickListener {
private final List<Link> links;
private final Context context;

Expand All @@ -32,29 +32,28 @@ public ArtistLinkAdapter(Context context, List<Link> links) {

@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
public ArtistLinkAdapter.LinkViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.item_link, parent, false);
return new LinkViewHolder(view);
}

@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
public void onBindViewHolder(@NonNull ArtistLinkAdapter.LinkViewHolder holder, int position) {
String type = links.get(position).getType();
Drawable drawable = getLinkImage(type);
LinkViewHolder linkViewHolder = (LinkViewHolder) holder;

if (drawable != null) {
linkViewHolder.linkTextView.setVisibility(View.GONE);
linkViewHolder.linkImageView.setImageDrawable(drawable);
holder.linkTextView.setVisibility(View.GONE);
holder.linkImageView.setImageDrawable(drawable);
} else {
linkViewHolder.linkTextView.setVisibility(View.VISIBLE);
linkViewHolder.linkTextView.setText(type.toUpperCase());
holder.linkTextView.setVisibility(View.VISIBLE);
holder.linkTextView.setText(type.toUpperCase());
drawable = getGenericLinkIcon(type);
linkViewHolder.linkImageView.setImageDrawable(drawable);
holder.linkImageView.setImageDrawable(drawable);
}
linkViewHolder.itemView.setTag(R.id.link_image, links.get(position).getUrl());
linkViewHolder.itemView.setOnClickListener(this);
holder.itemView.setTag(R.id.link_image, links.get(position).getUrl());
holder.itemView.setOnClickListener(this);
}

@Override
Expand Down Expand Up @@ -99,7 +98,7 @@ private Drawable getGenericLinkIcon(String type) {
}
}

class LinkViewHolder extends RecyclerView.ViewHolder {
static class LinkViewHolder extends RecyclerView.ViewHolder {
final ImageView linkImageView;
final TextView linkTextView;

Expand Down
10 changes: 5 additions & 5 deletions ...in/java/org/metabrainz/mobile/presentation/features/collection/CollectionListAdapter.java
View file
Expand Up @@ -17,7 +17,7 @@

import java.util.List;

class CollectionListAdapter extends RecyclerView.Adapter {
class CollectionListAdapter extends RecyclerView.Adapter<CollectionListAdapter.CollectionViewHolder> {

private final List<Collection> collections;

Expand All @@ -27,24 +27,24 @@ public CollectionListAdapter(List<Collection> collections) {

@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
public CollectionListAdapter.CollectionViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
LayoutInflater inflater = (LayoutInflater) parent.getContext()
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
return new CollectionViewHolder(inflater.inflate(R.layout.item_collection, parent, false));
}

@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
public void onBindViewHolder(@NonNull CollectionListAdapter.CollectionViewHolder holder, int position) {
Collection collection = collections.get(position);
((CollectionViewHolder) holder).bind(collection);
holder.bind(collection);
}

@Override
public int getItemCount() {
return collections.size();
}

private static class CollectionViewHolder extends RecyclerView.ViewHolder {
static class CollectionViewHolder extends RecyclerView.ViewHolder {
private final TextView collectionNameView;
private final TextView collectionTypeView;
private final TextView collectionCountView;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/metabrainz/mobile/presentation/features/release/ReleaseTrackAdapter.java
View file
Expand Up @@ -20,7 +20,7 @@

import static android.view.View.GONE;

class ReleaseTrackAdapter extends RecyclerView.Adapter {
class ReleaseTrackAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

private static final int VIEWTYPE_TRACK = 0;
private static final int VIEWTYPE_HEADING = 1;
Expand Down
15 changes: 7 additions & 8 deletions ...ain/java/org/metabrainz/mobile/presentation/features/release_list/ReleaseListAdapter.java
View file
Expand Up @@ -31,7 +31,7 @@

import static android.view.View.GONE;

class ReleaseListAdapter extends RecyclerView.Adapter {
class ReleaseListAdapter extends RecyclerView.Adapter<ReleaseListAdapter.ReleaseItemViewHolder> {

private final List<Release> releaseList;
private final CoverArtViewModel viewModel;
Expand All @@ -46,19 +46,18 @@ public ReleaseListAdapter(Context context, List<Release> releaseList) {

@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
public ReleaseListAdapter.ReleaseItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.card_release_item, parent, false);
return new ReleaseItemViewHolder(view);
}

@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
ReleaseItemViewHolder viewHolder = (ReleaseItemViewHolder) holder;
if (viewHolder.disposable != null && !viewHolder.disposable.isDisposed())
compositeDisposable.remove(viewHolder.disposable);
public void onBindViewHolder(@NonNull ReleaseListAdapter.ReleaseItemViewHolder holder, int position) {
if (holder.disposable != null && !holder.disposable.isDisposed())
compositeDisposable.remove(holder.disposable);

viewHolder.bind(releaseList.get(position));
holder.bind(releaseList.get(position));
}

@Override
Expand Down Expand Up @@ -89,7 +88,7 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
compositeDisposable.clear();
}

private class ReleaseItemViewHolder extends RecyclerView.ViewHolder {
class ReleaseItemViewHolder extends RecyclerView.ViewHolder {
final TextView releaseName;
final TextView releaseDisambiguation;
final ImageView coverArtView;
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/org/metabrainz/mobile/presentation/features/userdata/TagAdapter.java
View file
Expand Up @@ -14,7 +14,7 @@

import java.util.List;

class TagAdapter extends RecyclerView.Adapter {
class TagAdapter extends RecyclerView.Adapter<TagAdapter.TagViewHolder> {

private final List<Tag> list;

Expand All @@ -24,23 +24,23 @@ public TagAdapter(List<Tag> list) {

@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
public TagAdapter.TagViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
LayoutInflater inflater = (LayoutInflater) parent.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
return new TagViewHolder(inflater.inflate(R.layout.layout_tag, parent, false));
}

@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
public void onBindViewHolder(@NonNull TagAdapter.TagViewHolder holder, int position) {
Tag tag = list.get(position);
((TagViewHolder) holder).bindView(tag);
holder.bindView(tag);
}

@Override
public int getItemCount() {
return list.size();
}

class TagViewHolder extends RecyclerView.ViewHolder {
static class TagViewHolder extends RecyclerView.ViewHolder {
final TextView tagView;

TagViewHolder(View itemView) {
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/org/metabrainz/mobile/presentation/features/userdata/UserTagAdapter.java
View file
Expand Up @@ -14,7 +14,7 @@

import java.util.List;

class UserTagAdapter extends RecyclerView.Adapter {
class UserTagAdapter extends RecyclerView.Adapter<UserTagAdapter.TagViewHolder> {

private final List<UserTag> list;

Expand All @@ -24,23 +24,23 @@ public UserTagAdapter(List<UserTag> list) {

@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
public UserTagAdapter.TagViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
LayoutInflater inflater = (LayoutInflater) parent.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
return new TagViewHolder(inflater.inflate(R.layout.layout_tag, parent, false));
}

@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
public void onBindViewHolder(@NonNull UserTagAdapter.TagViewHolder holder, int position) {
UserTag tag = list.get(position);
((TagViewHolder) holder).bindView(tag);
holder.bindView(tag);
}

@Override
public int getItemCount() {
return list.size();
}

class TagViewHolder extends RecyclerView.ViewHolder {
static class TagViewHolder extends RecyclerView.ViewHolder {
final TextView tagView;

TagViewHolder(View itemView) {
Expand Down

0 comments on commit a2e616a

Please sign in to comment.