Skip to content

Use absolute adapter position on notifications and playlists #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use absolute adapter position on notifications and playlists #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d258e6
Use absolute adapter position on notification's click listener
kekkyojin Dec 21, 2022
81d4952
Use absolute adapter position on playlist item's click listener
kekkyojin Dec 21, 2022
a874c15
Import Iterator class
kekkyojin Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions app/src/main/java/com/odysee/app/adapter/NotificationListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,17 @@
import android.widget.ImageView;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;

import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;

import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.List;
import java.util.TimeZone;

import com.odysee.app.R;
import com.odysee.app.listener.SelectionModeListener;
Expand Down Expand Up @@ -168,8 +166,9 @@ public void addNotifications(List<LbryNotification> notifications) {
notifyDataSetChanged();
}

@NonNull
@Override
public NotificationListAdapter.ViewHolder onCreateViewHolder(ViewGroup root, int viewType) {
public NotificationListAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup root, int viewType) {
View v = LayoutInflater.from(context).inflate(R.layout.list_item_notification, root, false);
return new NotificationListAdapter.ViewHolder(v);
}
Expand Down Expand Up @@ -229,7 +228,7 @@ public void onBindViewHolder(NotificationListAdapter.ViewHolder vh, int position
if (config.smallestScreenWidthDp > 359) {
ImageCDNUrl imageCDNUrl = new ImageCDNUrl(Utils.STREAM_THUMBNAIL_WIDTH, Utils.STREAM_THUMBNAIL_HEIGHT, Utils.STREAM_THUMBNAIL_Q, null, notification.getClaimThumbnailUrl());

String turl = imageCDNUrl.toString();;
String turl = imageCDNUrl.toString();

Glide.with(context.getApplicationContext()).asBitmap().load(turl).into(vh.claimThumbnailView);
vh.claimThumbnailView.setVisibility(View.VISIBLE);
Expand All @@ -249,14 +248,14 @@ public void onBindViewHolder(NotificationListAdapter.ViewHolder vh, int position
@Override
public void onClick(View view) {
if (inSelectionMode) {
toggleSelectedNotification(notification);
toggleSelectedNotification(items.get(vh.getAbsoluteAdapterPosition()));
} else {
if (clickListener != null) {
clickListener.onNotificationClicked(notification);
clickListener.onNotificationClicked(items.get(vh.getAbsoluteAdapterPosition()));
}
notification.setRead(true);
notification.setSeen(true);
notifyItemChanged(position);
items.get(vh.getAbsoluteAdapterPosition()).setRead(true);
items.get(vh.getAbsoluteAdapterPosition()).setSeen(true);
notifyItemChanged(vh.getAbsoluteAdapterPosition());
}
}
});
Expand All @@ -269,7 +268,7 @@ public boolean onLongClick(View view) {
selectionModeListener.onEnterSelectionMode();
}
}
toggleSelectedNotification(notification);
toggleSelectedNotification(items.get(vh.getAbsoluteAdapterPosition()));
return true;
}
});
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/com/odysee/app/adapter/PlaylistCollectionListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import android.widget.ImageView;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

import com.bumptech.glide.Glide;
import com.odysee.app.R;
import com.odysee.app.model.Claim;
import com.odysee.app.model.OdyseeCollection;
import com.odysee.app.utils.Helper;
import com.odysee.app.utils.ImageCDNUrl;
Expand Down Expand Up @@ -59,14 +59,15 @@ public void updateCollectionThumbnailUrls(Map<String, String> collectionIdThumbn
notifyDataSetChanged();
}

@NonNull
@Override
public PlaylistCollectionListAdapter.ViewHolder onCreateViewHolder(ViewGroup root, int viewType) {
public PlaylistCollectionListAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup root, int viewType) {
View v = LayoutInflater.from(context).inflate(R.layout.list_item_playlist, root, false);
return new PlaylistCollectionListAdapter.ViewHolder(v);
}

@Override
public void onBindViewHolder(PlaylistCollectionListAdapter.ViewHolder vh, int position) {
public void onBindViewHolder(@NonNull PlaylistCollectionListAdapter.ViewHolder vh, int position) {
final OdyseeCollection item = items.get(position);

if (OdyseeCollection.BUILT_IN_ID_WATCHLATER.equalsIgnoreCase(item.getId())) {
Expand Down Expand Up @@ -104,7 +105,7 @@ public void onBindViewHolder(PlaylistCollectionListAdapter.ViewHolder vh, int po
@Override
public void onClick(View view) {
if (listener != null) {
listener.onClick(item, position);
listener.onClick(items.get(vh.getAbsoluteAdapterPosition()), vh.getAbsoluteAdapterPosition());
}
}
});
Expand Down