diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java index 59c7507e5..96dabb24a 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java @@ -20,10 +20,8 @@ import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.Schema; -import org.fdroid.fdroid.views.updates.items.AppNotification; import org.fdroid.fdroid.views.updates.items.AppStatus; import org.fdroid.fdroid.views.updates.items.AppUpdateData; -import org.fdroid.fdroid.views.updates.items.DonationPrompt; import org.fdroid.fdroid.views.updates.items.UpdateableApp; import org.fdroid.fdroid.views.updates.items.UpdateableAppsHeader; @@ -45,8 +43,8 @@ import java.util.Set; * + Once "Show apps" is expanded then each app is shown along with its own download button. * * It does this by maintaining several different lists of interesting apps. Each list contains wrappers - * around the piece of data it wants to render ({@link AppStatus}, {@link DonationPrompt}, - * {@link AppNotification}, {@link UpdateableApp}). Instead of juggling the various viewTypes + * around the piece of data it wants to render ({@link AppStatus}, {@link UpdateableApp}). + * Instead of juggling the various viewTypes * to find out which position in the adapter corresponds to which view type, this is handled by * the {@link UpdatesAdapter#delegatesManager}. * @@ -68,8 +66,6 @@ public class UpdatesAdapter extends RecyclerView.Adapter appsToShowStatus = new ArrayList<>(); - private final List appsToPromptForDonation = new ArrayList<>(); - private final List appsToNotifyAbout = new ArrayList<>(); private final List updateableApps = new ArrayList<>(); private boolean showAllUpdateableApps = false; @@ -78,8 +74,6 @@ public class UpdatesAdapter extends RecyclerView.Adapter> { - - @Override - protected boolean isForViewType(@NonNull List items, int position) { - return items.get(position) instanceof AppNotification; - } - - @NonNull - @Override - protected RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { - return new ViewHolder(new TextView(parent.getContext())); - } - - @Override - protected void onBindViewHolder(@NonNull List items, int position, @NonNull RecyclerView.ViewHolder holder, @NonNull List payloads) { - AppNotification app = (AppNotification) items.get(position); - ((ViewHolder) holder).bindApp(app); - } - } - - public static class ViewHolder extends RecyclerView.ViewHolder { - public ViewHolder(View itemView) { - super(itemView); - } - - public void bindApp(AppNotification app) { - ((TextView) itemView).setText(""); - } - } - -} diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/DonationPrompt.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/DonationPrompt.java deleted file mode 100644 index 697860703..000000000 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/DonationPrompt.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.fdroid.fdroid.views.updates.items; - -import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.hannesdorfmann.adapterdelegates3.AdapterDelegate; - -import java.util.List; - -/** - * The app (if any) which we should prompt the user about potentially donating to (due to having - * updated several times). - */ -public class DonationPrompt extends AppUpdateData { - - public DonationPrompt(Activity activity) { - super(activity); - } - - public static class Delegate extends AdapterDelegate> { - - @Override - protected boolean isForViewType(@NonNull List items, int position) { - return items.get(position) instanceof DonationPrompt; - } - - @NonNull - @Override - protected RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) { - return new ViewHolder(new TextView(parent.getContext())); - } - - @Override - protected void onBindViewHolder(@NonNull List items, int position, @NonNull RecyclerView.ViewHolder holder, @NonNull List payloads) { - DonationPrompt app = (DonationPrompt) items.get(position); - ((ViewHolder) holder).bindApp(app); - } - } - - public static class ViewHolder extends RecyclerView.ViewHolder { - public ViewHolder(View itemView) { - super(itemView); - } - - public void bindApp(DonationPrompt app) { - ((TextView) itemView).setText(""); - } - } - -}