From 105ad3317d5d40d4954b0e1d508bb21351e84f4f Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 1 Aug 2020 17:52:55 -0700 Subject: [PATCH] Pass parent view into grid adapters --- app/src/main/java/com/limelight/grid/AppGridAdapter.java | 2 +- app/src/main/java/com/limelight/grid/GenericGridAdapter.java | 4 ++-- app/src/main/java/com/limelight/grid/PcGridAdapter.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/limelight/grid/AppGridAdapter.java b/app/src/main/java/com/limelight/grid/AppGridAdapter.java index 3e4be251..10857fb4 100644 --- a/app/src/main/java/com/limelight/grid/AppGridAdapter.java +++ b/app/src/main/java/com/limelight/grid/AppGridAdapter.java @@ -111,7 +111,7 @@ public class AppGridAdapter extends GenericGridAdapter { } @Override - public void populateView(ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, AppView.AppObject obj) { + public void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, AppView.AppObject obj) { // Let the cached asset loader handle it loader.populateImageView(obj.app, imgView, txtView); diff --git a/app/src/main/java/com/limelight/grid/GenericGridAdapter.java b/app/src/main/java/com/limelight/grid/GenericGridAdapter.java index 1814a177..cec3de5b 100644 --- a/app/src/main/java/com/limelight/grid/GenericGridAdapter.java +++ b/app/src/main/java/com/limelight/grid/GenericGridAdapter.java @@ -54,7 +54,7 @@ public abstract class GenericGridAdapter extends BaseAdapter { return i; } - public abstract void populateView(ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, T obj); + public abstract void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, T obj); @Override public View getView(int i, View convertView, ViewGroup viewGroup) { @@ -67,7 +67,7 @@ public abstract class GenericGridAdapter extends BaseAdapter { TextView txtView = convertView.findViewById(R.id.grid_text); ProgressBar prgView = convertView.findViewById(R.id.grid_spinner); - populateView(imgView, prgView, txtView, overlayView, itemList.get(i)); + populateView(convertView, imgView, prgView, txtView, overlayView, itemList.get(i)); return convertView; } diff --git a/app/src/main/java/com/limelight/grid/PcGridAdapter.java b/app/src/main/java/com/limelight/grid/PcGridAdapter.java index 6ce19ef3..91e313f3 100644 --- a/app/src/main/java/com/limelight/grid/PcGridAdapter.java +++ b/app/src/main/java/com/limelight/grid/PcGridAdapter.java @@ -49,7 +49,7 @@ public class PcGridAdapter extends GenericGridAdapter { } @Override - public void populateView(ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, PcView.ComputerObject obj) { + public void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, PcView.ComputerObject obj) { imgView.setImageResource(R.drawable.ic_computer); if (obj.details.state == ComputerDetails.State.ONLINE) { imgView.setAlpha(1.0f);