mir/newpipe
2
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-08-28 13:17:48 +00:00
Code Issues Releases Wiki Activity

# Change

Browse Source 
Adjusted the new Class SelectFeedGroupFragment for its Role
- Renamed Variables
- adjusted Imports
- adjusted Interface with FeedGroupEntity Values
This commit is contained in:
Diana Victoria Furrer 2025-05-30 17:45:51 +02:00
parent e6c4690e7d
commit 7c3989ff93
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/main/java/org/schabi/newpipe/settings/SelectFeedGroupFragment.java
View File

@ -15,12 +15,12 @@ import androidx.fragment.app.DialogFragment;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import org.schabi.newpipe.NewPipeDatabase;
import org.schabi.newpipe.R; import org.schabi.newpipe.R;
import org.schabi.newpipe.database.subscription.SubscriptionEntity; import org.schabi.newpipe.database.AppDatabase;
import org.schabi.newpipe.database.feed.model.FeedGroupEntity;
import org.schabi.newpipe.error.ErrorUtil; import org.schabi.newpipe.error.ErrorUtil;
import org.schabi.newpipe.local.subscription.SubscriptionManager;
import org.schabi.newpipe.util.ThemeHelper; import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.util.image.PicassoHelper;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
@ -60,7 +60,7 @@ public class SelectFeedGroupFragment extends DialogFragment {
private TextView emptyView; private TextView emptyView;
private RecyclerView recyclerView; private RecyclerView recyclerView;
private List<SubscriptionEntity> subscriptions = new Vector<>(); private List<FeedGroupEntity> feedGroups = new Vector<>();
public void setOnSelectedListener(final OnSelectedListener listener) { public void setOnSelectedListener(final OnSelectedListener listener) {
onSelectedListener = listener; onSelectedListener = listener;
@ -86,8 +86,8 @@ public class SelectFeedGroupFragment extends DialogFragment {
final View v = inflater.inflate(R.layout.select_feed_group_fragment, container, false); final View v = inflater.inflate(R.layout.select_feed_group_fragment, container, false);
recyclerView = v.findViewById(R.id.items_list); recyclerView = v.findViewById(R.id.items_list);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
final SelectChannelAdapter channelAdapter = new SelectChannelAdapter(); final SelectFeedGroupAdapter feedGroupAdapter = new SelectFeedGroupAdapter();
recyclerView.setAdapter(channelAdapter); recyclerView.setAdapter(feedGroupAdapter);
progressBar = v.findViewById(R.id.progressBar); progressBar = v.findViewById(R.id.progressBar);
emptyView = v.findViewById(R.id.empty_state_view); emptyView = v.findViewById(R.id.empty_state_view);
@ -96,11 +96,11 @@ public class SelectFeedGroupFragment extends DialogFragment {
emptyView.setVisibility(View.GONE); emptyView.setVisibility(View.GONE);
final SubscriptionManager subscriptionManager = new SubscriptionManager(requireContext()); final AppDatabase database = NewPipeDatabase.getInstance(requireContext());
subscriptionManager.subscriptions().toObservable() database.feedGroupDAO().getAll().toObservable()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscriptionObserver()); .subscribe(getFeedGroupObserver());
return v; return v;
} }
@ -119,9 +119,10 @@ public class SelectFeedGroupFragment extends DialogFragment {
private void clickedItem(final int position) { private void clickedItem(final int position) {
if (onSelectedListener != null) { if (onSelectedListener != null) {
final SubscriptionEntity entry = subscriptions.get(position); final FeedGroupEntity entry = feedGroups.get(position);
onSelectedListener onSelectedListener
.onChannelSelected(entry.getServiceId(), entry.getUrl(), entry.getName()); .onFeedGroupSelected(entry.getUid(), entry.getName(),
entry.getIcon().getDrawableResource());
} }
dismiss(); dismiss();
} }
@ -130,10 +131,10 @@ public class SelectFeedGroupFragment extends DialogFragment {
// Item handling // Item handling
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/
private void displayChannels(final List<SubscriptionEntity> newSubscriptions) { private void displayFeedGroups(final List<FeedGroupEntity> newFeedGroups) {
this.subscriptions = newSubscriptions; this.feedGroups = newFeedGroups;
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
if (newSubscriptions.isEmpty()) { if (newFeedGroups.isEmpty()) {
emptyView.setVisibility(View.VISIBLE); emptyView.setVisibility(View.VISIBLE);
return; return;
} }
@ -141,20 +142,20 @@ public class SelectFeedGroupFragment extends DialogFragment {
} }
private Observer<List<SubscriptionEntity>> getSubscriptionObserver() { private Observer<List<FeedGroupEntity>> getFeedGroupObserver() {
return new Observer<List<SubscriptionEntity>>() { return new Observer<List<FeedGroupEntity>>() {
@Override @Override
public void onSubscribe(@NonNull final Disposable disposable) { } public void onSubscribe(@NonNull final Disposable disposable) { }
@Override @Override
public void onNext(@NonNull final List<SubscriptionEntity> newSubscriptions) { public void onNext(@NonNull final List<FeedGroupEntity> newGroups) {
displayChannels(newSubscriptions); displayFeedGroups(newGroups);
} }
@Override @Override
public void onError(@NonNull final Throwable exception) { public void onError(@NonNull final Throwable exception) {
ErrorUtil.showUiErrorSnackbar(SelectFeedGroupFragment.this, ErrorUtil.showUiErrorSnackbar(SelectFeedGroupFragment.this,
"Loading subscription", exception); "Loading Feed Groups", exception);
} }
@Override @Override
@ -167,42 +168,42 @@ public class SelectFeedGroupFragment extends DialogFragment {
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/
public interface OnSelectedListener { public interface OnSelectedListener {
void onChannelSelected(int serviceId, String url, String name); void onFeedGroupSelected(Long groupId, String name, int icon);
} }
public interface OnCancelListener { public interface OnCancelListener {
void onCancel(); void onCancel();
} }
private class SelectChannelAdapter private class SelectFeedGroupAdapter
extends RecyclerView.Adapter<SelectChannelAdapter.SelectChannelItemHolder> { extends RecyclerView.Adapter<SelectFeedGroupAdapter.SelectFeedGroupItemHolder> {
@NonNull @NonNull
@Override @Override
public SelectChannelItemHolder onCreateViewHolder(final ViewGroup parent, public SelectFeedGroupItemHolder onCreateViewHolder(final ViewGroup parent,
final int viewType) { final int viewType) {
final View item = LayoutInflater.from(parent.getContext()) final View item = LayoutInflater.from(parent.getContext())
.inflate(R.layout.select_feed_group_item, parent, false); .inflate(R.layout.select_feed_group_item, parent, false);
return new SelectChannelItemHolder(item); return new SelectFeedGroupItemHolder(item);
} }
@Override @Override
public void onBindViewHolder(final SelectChannelItemHolder holder, final int position) { public void onBindViewHolder(final SelectFeedGroupItemHolder holder, final int position) {
final SubscriptionEntity entry = subscriptions.get(position); final FeedGroupEntity entry = feedGroups.get(position);
holder.titleView.setText(entry.getName()); holder.titleView.setText(entry.getName());
holder.view.setOnClickListener(view -> clickedItem(position)); holder.view.setOnClickListener(view -> clickedItem(position));
PicassoHelper.loadAvatar(entry.getAvatarUrl()).into(holder.thumbnailView); holder.thumbnailView.setImageResource(entry.getIcon().getDrawableResource());
} }
@Override @Override
public int getItemCount() { public int getItemCount() {
return subscriptions.size(); return feedGroups.size();
} }
public class SelectChannelItemHolder extends RecyclerView.ViewHolder { public class SelectFeedGroupItemHolder extends RecyclerView.ViewHolder {
public final View view; public final View view;
final ImageView thumbnailView; final ImageView thumbnailView;
final TextView titleView; final TextView titleView;
SelectChannelItemHolder(final View v) { SelectFeedGroupItemHolder(final View v) {
super(v); super(v);
this.view = v; this.view = v;
thumbnailView = v.findViewById(R.id.itemThumbnailView); thumbnailView = v.findViewById(R.id.itemThumbnailView);