mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-02-28 16:33:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some deprecations

Browse Source
This commit is contained in:
TacoTheDank 2021-09-24 21:28:33 -04:00
parent a5ca6ac2bc
commit d1740f77d1
15 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AcknowledgementRecyclerViewAdapter.java
View File

@ -35,7 +35,7 @@ public class AcknowledgementRecyclerViewAdapter extends RecyclerView.Adapter<Ack
@Override @Override
public void onBindViewHolder(@NonNull AcknowledgementViewHolder holder, int position) { public void onBindViewHolder(@NonNull AcknowledgementViewHolder holder, int position) {
Acknowledgement acknowledgement = acknowledgements.get(holder.getAdapterPosition()); Acknowledgement acknowledgement = acknowledgements.get(holder.getBindingAdapterPosition());
if (acknowledgement != null) { if (acknowledgement != null) {
holder.nameTextView.setText(acknowledgement.getName()); holder.nameTextView.setText(acknowledgement.getName());
holder.introductionTextView.setText(acknowledgement.getIntroduction()); holder.introductionTextView.setText(acknowledgement.getIntroduction());

2
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AwardRecyclerViewAdapter.java
View File

@ -91,7 +91,7 @@ public class AwardRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.
coinTextView.setTextColor(primaryTextColor); coinTextView.setTextColor(primaryTextColor);
itemView.setOnClickListener(view -> { itemView.setOnClickListener(view -> {
itemOnClickListener.onClick(awards.get(getAdapterPosition())); itemOnClickListener.onClick(awards.get(getBindingAdapterPosition()));
}); });
} }
} }

10
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/FlairBottomSheetRecyclerViewAdapter.java
View File

@ -44,7 +44,7 @@ public class FlairBottomSheetRecyclerViewAdapter extends RecyclerView.Adapter<Fl
@Override @Override
public void onBindViewHolder(@NonNull FlairViewHolder holder, int position) { public void onBindViewHolder(@NonNull FlairViewHolder holder, int position) {
if (flairs.get(holder.getAdapterPosition()).isEditable()) { if (flairs.get(holder.getBindingAdapterPosition()).isEditable()) {
holder.editFlairImageView.setVisibility(View.VISIBLE); holder.editFlairImageView.setVisibility(View.VISIBLE);
holder.editFlairImageView.setOnClickListener(view -> { holder.editFlairImageView.setOnClickListener(view -> {
View dialogView = ((Activity) context).getLayoutInflater().inflate(R.layout.dialog_edit_flair, null); View dialogView = ((Activity) context).getLayoutInflater().inflate(R.layout.dialog_edit_flair, null);
@ -59,7 +59,7 @@ public class FlairBottomSheetRecyclerViewAdapter extends RecyclerView.Adapter<Fl
.setView(dialogView) .setView(dialogView)
.setPositiveButton(R.string.ok, (dialogInterface, i) .setPositiveButton(R.string.ok, (dialogInterface, i)
-> { -> {
Flair flair = flairs.get(holder.getAdapterPosition()); Flair flair = flairs.get(holder.getBindingAdapterPosition());
flair.setText(flairEditText.getText().toString()); flair.setText(flairEditText.getText().toString());
itemClickListener.onClick(flair); itemClickListener.onClick(flair);
}) })
@ -68,13 +68,13 @@ public class FlairBottomSheetRecyclerViewAdapter extends RecyclerView.Adapter<Fl
}); });
} }
if (flairs.get(holder.getAdapterPosition()).isEditable() && flairs.get(holder.getAdapterPosition()).getText().equals("")) { if (flairs.get(holder.getBindingAdapterPosition()).isEditable() && flairs.get(holder.getBindingAdapterPosition()).getText().equals("")) {
holder.itemView.setOnClickListener(view -> holder.editFlairImageView.performClick()); holder.itemView.setOnClickListener(view -> holder.editFlairImageView.performClick());
} else { } else {
holder.itemView.setOnClickListener(view -> itemClickListener.onClick(flairs.get(holder.getAdapterPosition()))); holder.itemView.setOnClickListener(view -> itemClickListener.onClick(flairs.get(holder.getBindingAdapterPosition())));
} }
holder.flairTextView.setText(flairs.get(holder.getAdapterPosition()).getText()); holder.flairTextView.setText(flairs.get(holder.getBindingAdapterPosition()).getText());
} }
@Override @Override

40
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/FollowedUsersRecyclerViewAdapter.java
View File

@ -106,8 +106,8 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
int offset = (mFavoriteSubscribedUserData != null && mFavoriteSubscribedUserData.size() > 0) ? int offset = (mFavoriteSubscribedUserData != null && mFavoriteSubscribedUserData.size() > 0) ?
mFavoriteSubscribedUserData.size() + 2 : 0; mFavoriteSubscribedUserData.size() + 2 : 0;
if (!mSubscribedUserData.get(viewHolder.getAdapterPosition() - offset).getIconUrl().equals("")) { if (!mSubscribedUserData.get(viewHolder.getBindingAdapterPosition() - offset).getIconUrl().equals("")) {
glide.load(mSubscribedUserData.get(viewHolder.getAdapterPosition() - offset).getIconUrl()) glide.load(mSubscribedUserData.get(viewHolder.getBindingAdapterPosition() - offset).getIconUrl())
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))) .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
.error(glide.load(R.drawable.subreddit_default_icon) .error(glide.load(R.drawable.subreddit_default_icon)
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))) .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
@ -117,16 +117,16 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))) .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
.into(((UserViewHolder) viewHolder).iconGifImageView); .into(((UserViewHolder) viewHolder).iconGifImageView);
} }
((UserViewHolder) viewHolder).userNameTextView.setText(mSubscribedUserData.get(viewHolder.getAdapterPosition() - offset).getName()); ((UserViewHolder) viewHolder).userNameTextView.setText(mSubscribedUserData.get(viewHolder.getBindingAdapterPosition() - offset).getName());
if(mSubscribedUserData.get(viewHolder.getAdapterPosition() - offset).isFavorite()) { if(mSubscribedUserData.get(viewHolder.getBindingAdapterPosition() - offset).isFavorite()) {
((UserViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp); ((UserViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
} else { } else {
((UserViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp); ((UserViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
} }
} else if (viewHolder instanceof FavoriteUserViewHolder) { } else if (viewHolder instanceof FavoriteUserViewHolder) {
if (!mFavoriteSubscribedUserData.get(viewHolder.getAdapterPosition() - 1).getIconUrl().equals("")) { if (!mFavoriteSubscribedUserData.get(viewHolder.getBindingAdapterPosition() - 1).getIconUrl().equals("")) {
glide.load(mFavoriteSubscribedUserData.get(viewHolder.getAdapterPosition() - 1).getIconUrl()) glide.load(mFavoriteSubscribedUserData.get(viewHolder.getBindingAdapterPosition() - 1).getIconUrl())
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))) .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
.error(glide.load(R.drawable.subreddit_default_icon) .error(glide.load(R.drawable.subreddit_default_icon)
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))) .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
@ -136,9 +136,9 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))) .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
.into(((FavoriteUserViewHolder) viewHolder).iconGifImageView); .into(((FavoriteUserViewHolder) viewHolder).iconGifImageView);
} }
((FavoriteUserViewHolder) viewHolder).userNameTextView.setText(mFavoriteSubscribedUserData.get(viewHolder.getAdapterPosition() - 1).getName()); ((FavoriteUserViewHolder) viewHolder).userNameTextView.setText(mFavoriteSubscribedUserData.get(viewHolder.getBindingAdapterPosition() - 1).getName());
if(mFavoriteSubscribedUserData.get(viewHolder.getAdapterPosition() - 1).isFavorite()) { if(mFavoriteSubscribedUserData.get(viewHolder.getBindingAdapterPosition() - 1).isFavorite()) {
((FavoriteUserViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp); ((FavoriteUserViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
} else { } else {
((FavoriteUserViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp); ((FavoriteUserViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
@ -205,7 +205,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
userNameTextView.setTextColor(mPrimaryTextColor); userNameTextView.setTextColor(mPrimaryTextColor);
itemView.setOnClickListener(view -> { itemView.setOnClickListener(view -> {
int position = getAdapterPosition() - 1; int position = getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteSubscribedUserData.size() > position) { if(position >= 0 && mFavoriteSubscribedUserData.size() > position) {
Intent intent = new Intent(mContext, ViewUserDetailActivity.class); Intent intent = new Intent(mContext, ViewUserDetailActivity.class);
intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mFavoriteSubscribedUserData.get(position).getName()); intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mFavoriteSubscribedUserData.get(position).getName());
@ -214,7 +214,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
}); });
favoriteImageView.setOnClickListener(view -> { favoriteImageView.setOnClickListener(view -> {
int position = getAdapterPosition() - 1; int position = getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteSubscribedUserData.size() > position) { if(position >= 0 && mFavoriteSubscribedUserData.size() > position) {
if(mFavoriteSubscribedUserData.get(position).isFavorite()) { if(mFavoriteSubscribedUserData.get(position).isFavorite()) {
favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp); favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
@ -225,7 +225,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
new FavoriteThing.FavoriteThingListener() { new FavoriteThing.FavoriteThingListener() {
@Override @Override
public void success() { public void success() {
int position = getAdapterPosition() - 1; int position = getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteSubscribedUserData.size() > position) { if(position >= 0 && mFavoriteSubscribedUserData.size() > position) {
mFavoriteSubscribedUserData.get(position).setFavorite(false); mFavoriteSubscribedUserData.get(position).setFavorite(false);
} }
@ -235,7 +235,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
@Override @Override
public void failed() { public void failed() {
Toast.makeText(mContext, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(mContext, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show();
int position = getAdapterPosition() - 1; int position = getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteSubscribedUserData.size() > position) { if(position >= 0 && mFavoriteSubscribedUserData.size() > position) {
mFavoriteSubscribedUserData.get(position).setFavorite(true); mFavoriteSubscribedUserData.get(position).setFavorite(true);
} }
@ -251,7 +251,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
new FavoriteThing.FavoriteThingListener() { new FavoriteThing.FavoriteThingListener() {
@Override @Override
public void success() { public void success() {
int position = getAdapterPosition() - 1; int position = getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteSubscribedUserData.size() > position) { if(position >= 0 && mFavoriteSubscribedUserData.size() > position) {
mFavoriteSubscribedUserData.get(position).setFavorite(true); mFavoriteSubscribedUserData.get(position).setFavorite(true);
} }
@ -261,7 +261,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
@Override @Override
public void failed() { public void failed() {
Toast.makeText(mContext, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(mContext, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show();
int position = getAdapterPosition() - 1; int position = getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteSubscribedUserData.size() > position) { if(position >= 0 && mFavoriteSubscribedUserData.size() > position) {
mFavoriteSubscribedUserData.get(position).setFavorite(false); mFavoriteSubscribedUserData.get(position).setFavorite(false);
} }
@ -290,7 +290,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
itemView.setOnClickListener(view -> { itemView.setOnClickListener(view -> {
int offset = (mFavoriteSubscribedUserData != null && mFavoriteSubscribedUserData.size() > 0) ? int offset = (mFavoriteSubscribedUserData != null && mFavoriteSubscribedUserData.size() > 0) ?
mFavoriteSubscribedUserData.size() + 2 : 0; mFavoriteSubscribedUserData.size() + 2 : 0;
int position = getAdapterPosition() - offset; int position = getBindingAdapterPosition() - offset;
if(position >= 0 && mSubscribedUserData.size() > position) { if(position >= 0 && mSubscribedUserData.size() > position) {
Intent intent = new Intent(mContext, ViewUserDetailActivity.class); Intent intent = new Intent(mContext, ViewUserDetailActivity.class);
intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mSubscribedUserData.get(position).getName()); intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mSubscribedUserData.get(position).getName());
@ -301,7 +301,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
favoriteImageView.setOnClickListener(view -> { favoriteImageView.setOnClickListener(view -> {
int offset = (mFavoriteSubscribedUserData != null && mFavoriteSubscribedUserData.size() > 0) ? int offset = (mFavoriteSubscribedUserData != null && mFavoriteSubscribedUserData.size() > 0) ?
mFavoriteSubscribedUserData.size() + 2 : 0; mFavoriteSubscribedUserData.size() + 2 : 0;
int position = getAdapterPosition() - offset; int position = getBindingAdapterPosition() - offset;
if(position >= 0 && mSubscribedUserData.size() > position) { if(position >= 0 && mSubscribedUserData.size() > position) {
if(mSubscribedUserData.get(position).isFavorite()) { if(mSubscribedUserData.get(position).isFavorite()) {
@ -313,7 +313,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
new FavoriteThing.FavoriteThingListener() { new FavoriteThing.FavoriteThingListener() {
@Override @Override
public void success() { public void success() {
int position = getAdapterPosition() - offset; int position = getBindingAdapterPosition() - offset;
if(position >= 0 && mSubscribedUserData.size() > position) { if(position >= 0 && mSubscribedUserData.size() > position) {
mSubscribedUserData.get(position).setFavorite(false); mSubscribedUserData.get(position).setFavorite(false);
} }
@ -323,7 +323,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
@Override @Override
public void failed() { public void failed() {
Toast.makeText(mContext, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(mContext, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show();
int position = getAdapterPosition() - offset; int position = getBindingAdapterPosition() - offset;
if(position >= 0 && mSubscribedUserData.size() > position) { if(position >= 0 && mSubscribedUserData.size() > position) {
mSubscribedUserData.get(position).setFavorite(true); mSubscribedUserData.get(position).setFavorite(true);
} }
@ -339,7 +339,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
new FavoriteThing.FavoriteThingListener() { new FavoriteThing.FavoriteThingListener() {
@Override @Override
public void success() { public void success() {
int position = getAdapterPosition() - offset; int position = getBindingAdapterPosition() - offset;
if(position >= 0 && mSubscribedUserData.size() > position) { if(position >= 0 && mSubscribedUserData.size() > position) {
mSubscribedUserData.get(position).setFavorite(true); mSubscribedUserData.get(position).setFavorite(true);
} }
@ -349,7 +349,7 @@ public class FollowedUsersRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
@Override @Override
public void failed() { public void failed() {
Toast.makeText(mContext, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(mContext, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show();
int position = getAdapterPosition() - offset; int position = getBindingAdapterPosition() - offset;
if(position >= 0 && mSubscribedUserData.size() > position) { if(position >= 0 && mSubscribedUserData.size() > position) {
mSubscribedUserData.get(position).setFavorite(false); mSubscribedUserData.get(position).setFavorite(false);
} }

4
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MessageRecyclerViewAdapter.java
View File

@ -201,7 +201,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
@Override @Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if (holder instanceof DataViewHolder) { if (holder instanceof DataViewHolder) {
Message message = getItem(holder.getAdapterPosition()); Message message = getItem(holder.getBindingAdapterPosition());
if (message != null) { if (message != null) {
ArrayList<Message> replies = message.getReplies(); ArrayList<Message> replies = message.getReplies();
Message displayedMessage; Message displayedMessage;
@ -240,7 +240,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
} else if (mMessageType == FetchMessage.MESSAGE_TYPE_PRIVATE_MESSAGE) { } else if (mMessageType == FetchMessage.MESSAGE_TYPE_PRIVATE_MESSAGE) {
Intent intent = new Intent(mContext, ViewPrivateMessagesActivity.class); Intent intent = new Intent(mContext, ViewPrivateMessagesActivity.class);
intent.putExtra(ViewPrivateMessagesActivity.EXTRA_PRIVATE_MESSAGE, message); intent.putExtra(ViewPrivateMessagesActivity.EXTRA_PRIVATE_MESSAGE, message);
intent.putExtra(ViewPrivateMessagesActivity.EXTRA_MESSAGE_POSITION, holder.getAdapterPosition()); intent.putExtra(ViewPrivateMessagesActivity.EXTRA_MESSAGE_POSITION, holder.getBindingAdapterPosition());
mContext.startActivity(intent); mContext.startActivity(intent);
} }

20
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MultiRedditListingRecyclerViewAdapter.java
View File

@ -116,7 +116,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
int offset = (mFavoriteMultiReddits != null && mFavoriteMultiReddits.size() > 0) ? int offset = (mFavoriteMultiReddits != null && mFavoriteMultiReddits.size() > 0) ?
mFavoriteMultiReddits.size() + 2 : 0; mFavoriteMultiReddits.size() + 2 : 0;
MultiReddit multiReddit = mMultiReddits.get(holder.getAdapterPosition() - offset); MultiReddit multiReddit = mMultiReddits.get(holder.getBindingAdapterPosition() - offset);
name = multiReddit.getDisplayName(); name = multiReddit.getDisplayName();
iconUrl = multiReddit.getIconUrl(); iconUrl = multiReddit.getIconUrl();
if(multiReddit.isFavorite()) { if(multiReddit.isFavorite()) {
@ -134,7 +134,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
new FavoriteMultiReddit.FavoriteMultiRedditListener() { new FavoriteMultiReddit.FavoriteMultiRedditListener() {
@Override @Override
public void success() { public void success() {
int position = holder.getAdapterPosition() - offset; int position = holder.getBindingAdapterPosition() - offset;
if(position >= 0 && mMultiReddits.size() > position) { if(position >= 0 && mMultiReddits.size() > position) {
mMultiReddits.get(position).setFavorite(false); mMultiReddits.get(position).setFavorite(false);
} }
@ -144,7 +144,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
@Override @Override
public void failed() { public void failed() {
Toast.makeText(mActivity, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(mActivity, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show();
int position = holder.getAdapterPosition() - offset; int position = holder.getBindingAdapterPosition() - offset;
if(position >= 0 && mMultiReddits.size() > position) { if(position >= 0 && mMultiReddits.size() > position) {
mMultiReddits.get(position).setFavorite(true); mMultiReddits.get(position).setFavorite(true);
} }
@ -160,7 +160,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
new FavoriteMultiReddit.FavoriteMultiRedditListener() { new FavoriteMultiReddit.FavoriteMultiRedditListener() {
@Override @Override
public void success() { public void success() {
int position = holder.getAdapterPosition() - offset; int position = holder.getBindingAdapterPosition() - offset;
if(position >= 0 && mMultiReddits.size() > position) { if(position >= 0 && mMultiReddits.size() > position) {
mMultiReddits.get(position).setFavorite(true); mMultiReddits.get(position).setFavorite(true);
} }
@ -170,7 +170,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
@Override @Override
public void failed() { public void failed() {
Toast.makeText(mActivity, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(mActivity, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show();
int position = holder.getAdapterPosition() - offset; int position = holder.getBindingAdapterPosition() - offset;
if(position >= 0 && mMultiReddits.size() > position) { if(position >= 0 && mMultiReddits.size() > position) {
mMultiReddits.get(position).setFavorite(false); mMultiReddits.get(position).setFavorite(false);
} }
@ -202,7 +202,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
} }
((MultiRedditViewHolder) holder).multiRedditNameTextView.setText(name); ((MultiRedditViewHolder) holder).multiRedditNameTextView.setText(name);
} else if (holder instanceof FavoriteMultiRedditViewHolder) { } else if (holder instanceof FavoriteMultiRedditViewHolder) {
MultiReddit multiReddit = mFavoriteMultiReddits.get(holder.getAdapterPosition() - 1); MultiReddit multiReddit = mFavoriteMultiReddits.get(holder.getBindingAdapterPosition() - 1);
String name = multiReddit.getDisplayName(); String name = multiReddit.getDisplayName();
String iconUrl = multiReddit.getIconUrl(); String iconUrl = multiReddit.getIconUrl();
if(multiReddit.isFavorite()) { if(multiReddit.isFavorite()) {
@ -220,7 +220,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
new FavoriteMultiReddit.FavoriteMultiRedditListener() { new FavoriteMultiReddit.FavoriteMultiRedditListener() {
@Override @Override
public void success() { public void success() {
int position = holder.getAdapterPosition() - 1; int position = holder.getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteMultiReddits.size() > position) { if(position >= 0 && mFavoriteMultiReddits.size() > position) {
mFavoriteMultiReddits.get(position).setFavorite(false); mFavoriteMultiReddits.get(position).setFavorite(false);
} }
@ -230,7 +230,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
@Override @Override
public void failed() { public void failed() {
Toast.makeText(mActivity, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(mActivity, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show();
int position = holder.getAdapterPosition() - 1; int position = holder.getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteMultiReddits.size() > position) { if(position >= 0 && mFavoriteMultiReddits.size() > position) {
mFavoriteMultiReddits.get(position).setFavorite(true); mFavoriteMultiReddits.get(position).setFavorite(true);
} }
@ -246,7 +246,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
new FavoriteMultiReddit.FavoriteMultiRedditListener() { new FavoriteMultiReddit.FavoriteMultiRedditListener() {
@Override @Override
public void success() { public void success() {
int position = holder.getAdapterPosition() - 1; int position = holder.getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteMultiReddits.size() > position) { if(position >= 0 && mFavoriteMultiReddits.size() > position) {
mFavoriteMultiReddits.get(position).setFavorite(true); mFavoriteMultiReddits.get(position).setFavorite(true);
} }
@ -256,7 +256,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
@Override @Override
public void failed() { public void failed() {
Toast.makeText(mActivity, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(mActivity, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show();
int position = holder.getAdapterPosition() - 1; int position = holder.getBindingAdapterPosition() - 1;
if(position >= 0 && mFavoriteMultiReddits.size() > position) { if(position >= 0 && mFavoriteMultiReddits.size() > position) {
mFavoriteMultiReddits.get(position).setFavorite(false); mFavoriteMultiReddits.get(position).setFavorite(false);
} }

2
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostFilterUsageRecyclerViewAdapter.java
View File

@ -86,7 +86,7 @@ public class PostFilterUsageRecyclerViewAdapter extends RecyclerView.Adapter<Rec
usageTextView = (TextView) itemView; usageTextView = (TextView) itemView;
usageTextView.setOnClickListener(view -> { usageTextView.setOnClickListener(view -> {
onItemClickListener.onClick(postFilterUsages.get(getAdapterPosition())); onItemClickListener.onClick(postFilterUsages.get(getBindingAdapterPosition()));
}); });
} }
} }

4
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PrivateMessagesDetailRecyclerViewAdapter.java
View File

@ -117,10 +117,10 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
@Override @Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
Message message; Message message;
if (holder.getAdapterPosition() == 0) { if (holder.getBindingAdapterPosition() == 0) {
message = mMessage; message = mMessage;
} else { } else {
message = mMessage.getReplies().get(holder.getAdapterPosition() - 1); message = mMessage.getReplies().get(holder.getBindingAdapterPosition() - 1);
} }
if (message != null) { if (message != null) {
if (holder instanceof MessageViewHolder) { if (holder instanceof MessageViewHolder) {

10
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/ReportReasonRecyclerViewAdapter.java
View File

@ -42,9 +42,9 @@ public class ReportReasonRecyclerViewAdapter extends RecyclerView.Adapter<Recycl
if (holder instanceof ReasonViewHolder) { if (holder instanceof ReasonViewHolder) {
ReportReason reportReason; ReportReason reportReason;
if (position >= generalReasons.size()) { if (position >= generalReasons.size()) {
reportReason = rules.get(holder.getAdapterPosition() - generalReasons.size()); reportReason = rules.get(holder.getBindingAdapterPosition() - generalReasons.size());
} else { } else {
reportReason = generalReasons.get(holder.getAdapterPosition()); reportReason = generalReasons.get(holder.getBindingAdapterPosition());
} }
((ReasonViewHolder) holder).reasonTextView.setText(reportReason.getReportReason()); ((ReasonViewHolder) holder).reasonTextView.setText(reportReason.getReportReason());
((ReasonViewHolder) holder).checkBox.setChecked(reportReason.isSelected()); ((ReasonViewHolder) holder).checkBox.setChecked(reportReason.isSelected());
@ -119,10 +119,10 @@ public class ReportReasonRecyclerViewAdapter extends RecyclerView.Adapter<Recycl
} }
} }
if (getAdapterPosition() >= generalReasons.size()) { if (getBindingAdapterPosition() >= generalReasons.size()) {
rules.get(getAdapterPosition() - generalReasons.size()).setSelected(checkBox.isChecked()); rules.get(getBindingAdapterPosition() - generalReasons.size()).setSelected(checkBox.isChecked());
} else { } else {
generalReasons.get(getAdapterPosition()).setSelected(checkBox.isChecked()); generalReasons.get(getBindingAdapterPosition()).setSelected(checkBox.isChecked());
} }
}); });

6
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/RulesRecyclerViewAdapter.java
View File

@ -82,11 +82,11 @@ public class RulesRecyclerViewAdapter extends RecyclerView.Adapter<RulesRecycler
@Override @Override
public void onBindViewHolder(@NonNull RuleViewHolder holder, int position) { public void onBindViewHolder(@NonNull RuleViewHolder holder, int position) {
holder.shortNameTextView.setText(rules.get(holder.getAdapterPosition()).getShortName()); holder.shortNameTextView.setText(rules.get(holder.getBindingAdapterPosition()).getShortName());
if (rules.get(holder.getAdapterPosition()).getDescriptionHtml() == null) { if (rules.get(holder.getBindingAdapterPosition()).getDescriptionHtml() == null) {
holder.descriptionMarkwonView.setVisibility(View.GONE); holder.descriptionMarkwonView.setVisibility(View.GONE);
} else { } else {
markwon.setMarkdown(holder.descriptionMarkwonView, rules.get(holder.getAdapterPosition()).getDescriptionHtml()); markwon.setMarkdown(holder.descriptionMarkwonView, rules.get(holder.getBindingAdapterPosition()).getDescriptionHtml());
} }
} }

4
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SearchActivityRecyclerViewAdapter.java
View File

@ -82,12 +82,12 @@ public class SearchActivityRecyclerViewAdapter extends RecyclerView.Adapter<Recy
itemView.setOnClickListener(view -> { itemView.setOnClickListener(view -> {
if (recentSearchQueries != null && !recentSearchQueries.isEmpty()) { if (recentSearchQueries != null && !recentSearchQueries.isEmpty()) {
itemOnClickListener.onClick(recentSearchQueries.get(getAdapterPosition()).getSearchQuery()); itemOnClickListener.onClick(recentSearchQueries.get(getBindingAdapterPosition()).getSearchQuery());
} }
}); });
deleteImageView.setOnClickListener(view -> { deleteImageView.setOnClickListener(view -> {
itemOnClickListener.onDelete(recentSearchQueries.get(getAdapterPosition())); itemOnClickListener.onDelete(recentSearchQueries.get(getBindingAdapterPosition()));
}); });
} }
} }

6
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/SelectedSubredditsRecyclerViewAdapter.java
View File

@ -39,10 +39,10 @@ public class SelectedSubredditsRecyclerViewAdapter extends RecyclerView.Adapter<
@Override @Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if (holder instanceof SubredditViewHolder) { if (holder instanceof SubredditViewHolder) {
((SubredditViewHolder) holder).subredditNameTextView.setText(subreddits.get(holder.getAdapterPosition())); ((SubredditViewHolder) holder).subredditNameTextView.setText(subreddits.get(holder.getBindingAdapterPosition()));
((SubredditViewHolder) holder).deleteButton.setOnClickListener(view -> { ((SubredditViewHolder) holder).deleteButton.setOnClickListener(view -> {
subreddits.remove(holder.getAdapterPosition()); subreddits.remove(holder.getBindingAdapterPosition());
notifyItemRemoved(holder.getAdapterPosition()); notifyItemRemoved(holder.getBindingAdapterPosition());
}); });
} }
} }

6
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/UserFlairRecyclerViewAdapter.java
View File

@ -43,7 +43,7 @@ public class UserFlairRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerV
@Override @Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if (holder instanceof UserFlairViewHolder) { if (holder instanceof UserFlairViewHolder) {
UserFlair userFlair = userFlairs.get(holder.getAdapterPosition()); UserFlair userFlair = userFlairs.get(holder.getBindingAdapterPosition());
if (userFlair.getHtmlText() == null || userFlair.getHtmlText().equals("")) { if (userFlair.getHtmlText() == null || userFlair.getHtmlText().equals("")) {
((UserFlairViewHolder) holder).userFlairHtmlTextView.setText(userFlair.getText()); ((UserFlairViewHolder) holder).userFlairHtmlTextView.setText(userFlair.getText());
} else { } else {
@ -77,11 +77,11 @@ public class UserFlairRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerV
editUserFlairImageView.setColorFilter(customThemeWrapper.getPrimaryTextColor(), android.graphics.PorterDuff.Mode.SRC_IN); editUserFlairImageView.setColorFilter(customThemeWrapper.getPrimaryTextColor(), android.graphics.PorterDuff.Mode.SRC_IN);
itemView.setOnClickListener(view -> { itemView.setOnClickListener(view -> {
itemClickListener.onClick(userFlairs.get(getAdapterPosition()), false); itemClickListener.onClick(userFlairs.get(getBindingAdapterPosition()), false);
}); });
editUserFlairImageView.setOnClickListener(view -> { editUserFlairImageView.setOnClickListener(view -> {
itemClickListener.onClick(userFlairs.get(getAdapterPosition()), true); itemClickListener.onClick(userFlairs.get(getBindingAdapterPosition()), true);
}); });
} }
} }

2
app/src/main/java/ml/docilealligator/infinityforreddit/utils/APIUtils.java
View File

@ -120,6 +120,6 @@ public class APIUtils {
} }
public static RequestBody getRequestBody(String s) { public static RequestBody getRequestBody(String s) {
return RequestBody.create(MediaType.parse("text/plain"), s); return RequestBody.create(s, MediaType.parse("text/plain"));
} }
} }

2
app/src/main/java/ml/docilealligator/infinityforreddit/utils/UploadImageUtils.java
View File

@ -50,7 +50,7 @@ public class UploadImageUtils {
image.compress(Bitmap.CompressFormat.JPEG, 100, stream); image.compress(Bitmap.CompressFormat.JPEG, 100, stream);
byte[] byteArray = stream.toByteArray(); byte[] byteArray = stream.toByteArray();
RequestBody fileBody = RequestBody.create(MediaType.parse("application/octet-stream"), byteArray); RequestBody fileBody = RequestBody.create(byteArray, MediaType.parse("application/octet-stream"));
MultipartBody.Part fileToUpload = MultipartBody.Part.createFormData("file", "post_image.jpg", fileBody); MultipartBody.Part fileToUpload = MultipartBody.Part.createFormData("file", "post_image.jpg", fileBody);
RedditAPI uploadMediaToAWSApi = uploadMediaRetrofit.create(RedditAPI.class); RedditAPI uploadMediaToAWSApi = uploadMediaRetrofit.create(RedditAPI.class);