Switch to indeterminate progress bars

app/src/main/java/com/limelight/grid/AppGridAdapter.java

@@ -26,7 +26,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     private final CachedAppAssetLoader loader;
 
     public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) {
-        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item), R.drawable.image_loading);
+        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item));
 
         int dpi = activity.getResources().getDisplayMetrics().densityDpi;
         int dp;
@@ -51,9 +51,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
                 new NetworkAssetLoader(context, uniqueId),
                 new MemoryAssetLoader(),
-                new DiskAssetLoader(context.getCacheDir()),
+                new DiskAssetLoader(context.getCacheDir()));
-                BitmapFactory.decodeResource(activity.getResources(),
-                        R.drawable.image_loading, options));
     }
 
     public void cancelQueuedOperations() {
@@ -110,4 +108,9 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         // No overlay
         return false;
     }
+
+    @Override
+    public boolean shouldShowProgressBar(AppView.AppObject obj) {
+        return true;
+    }
 }

app/src/main/java/com/limelight/grid/GenericGridAdapter.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.limelight.R;
@@ -14,15 +15,13 @@ import java.util.ArrayList;
 
 public abstract class GenericGridAdapter<T> extends BaseAdapter {
     protected final Context context;
-    protected final int defaultImageRes;
     protected final int layoutId;
     protected final ArrayList<T> itemList = new ArrayList<>();
     protected final LayoutInflater inflater;
 
-    public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) {
+    public GenericGridAdapter(Context context, int layoutId) {
         this.context = context;
         this.layoutId = layoutId;
-        this.defaultImageRes = defaultImageRes;
 
         this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
@@ -49,6 +48,7 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
     public abstract boolean populateImageView(ImageView imgView, T obj);
     public abstract boolean populateTextView(TextView txtView, T obj);
     public abstract boolean populateOverlayView(ImageView overlayView, T obj);
+    public abstract boolean shouldShowProgressBar(T obj);
 
     @Override
     public View getView(int i, View convertView, ViewGroup viewGroup) {
@@ -59,10 +59,19 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
         ImageView imgView = (ImageView) convertView.findViewById(R.id.grid_image);
         ImageView overlayView = (ImageView) convertView.findViewById(R.id.grid_overlay);
         TextView txtView = (TextView) convertView.findViewById(R.id.grid_text);
+        ProgressBar prgView = (ProgressBar) convertView.findViewById(R.id.grid_spinner);
 
+        if (prgView != null) {
+            if (shouldShowProgressBar(itemList.get(i))) {
+                prgView.setVisibility(View.VISIBLE);
+            }
+            else {
+                prgView.setVisibility(View.INVISIBLE);
+            }
+        }
         if (imgView != null) {
             if (!populateImageView(imgView, itemList.get(i))) {
-                imgView.setImageResource(defaultImageRes);
+                imgView.setImageBitmap(null);
             }
         }
         if (!populateTextView(txtView, itemList.get(i))) {

app/src/main/java/com/limelight/grid/PcGridAdapter.java

@@ -14,7 +14,7 @@ import java.util.Comparator;
 public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
     public PcGridAdapter(Context context, boolean listMode, boolean small) {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item), R.drawable.computer);
+        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item));
     }
 
     public void addComputer(PcView.ComputerObject computer) {
@@ -37,20 +37,20 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
     @Override
     public boolean populateImageView(ImageView imgView, PcView.ComputerObject obj) {
-        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
+        if (obj.details.state == ComputerDetails.State.ONLINE) {
             imgView.setAlpha(1.0f);
         }
         else {
             imgView.setAlpha(0.4f);
         }
 
-        // Return false to use the default drawable
+        imgView.setImageResource(R.drawable.computer);
-        return false;
+        return true;
     }
 
     @Override
     public boolean populateTextView(TextView txtView, PcView.ComputerObject obj) {
-        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
+        if (obj.details.state == ComputerDetails.State.ONLINE) {
             txtView.setAlpha(1.0f);
         }
         else {
@@ -63,13 +63,13 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
     @Override
     public boolean populateOverlayView(ImageView overlayView, PcView.ComputerObject obj) {
-        if (obj.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-            // Still refreshing this PC so display the overlay
-            overlayView.setImageResource(R.drawable.image_loading);
-            return true;
-        }
-
         // No overlay
         return false;
     }
+
+    @Override
+    public boolean shouldShowProgressBar(PcView.ComputerObject obj) {
+        // Still refreshing this PC so display the progress bar
+        return obj.details.reachability == ComputerDetails.Reachability.UNKNOWN;
+    }
 }

app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java

@@ -53,13 +53,13 @@ public class CachedAppAssetLoader {
 
     public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
                                 NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
-                                DiskAssetLoader diskLoader, Bitmap placeholderBitmap) {
+                                DiskAssetLoader diskLoader) {
         this.computer = computer;
         this.scalingDivider = scalingDivider;
         this.networkLoader = networkLoader;
         this.memoryLoader = memoryLoader;
         this.diskLoader = diskLoader;
-        this.placeholderBitmap = placeholderBitmap;
+        this.placeholderBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
     }
 
     public void cancelBackgroundLoads() {
@@ -280,14 +280,14 @@ public class CachedAppAssetLoader {
         });
     }
 
-    public void populateImageView(NvApp app, ImageView view) {
+    public boolean populateImageView(NvApp app, ImageView view) {
         LoaderTuple tuple = new LoaderTuple(computer, app);
 
         // If there's already a task in progress for this view,
         // cancel it. If the task is already loading the same image,
         // we return and let that load finish.
         if (!cancelPendingLoad(tuple, view)) {
-            return;
+            return true;
         }
 
         // First, try the memory cache in the current context
@@ -296,7 +296,7 @@ public class CachedAppAssetLoader {
             // Show the bitmap immediately
             view.setAlpha(1.0f);
             view.setImageBitmap(bmp);
-            return;
+            return true;
         }
 
         // If it's not in memory, create an async task to load it. This task will be attached
@@ -308,6 +308,7 @@ public class CachedAppAssetLoader {
 
         // Run the task on our foreground executor
         task.executeOnExecutor(foregroundExecutor, tuple);
+        return false;
     }
 
     public class LoaderTuple {

app/src/main/res/layout-land/activity_pc_view.xml

@@ -15,18 +15,18 @@
         android:layout_centerInParent="true"
         android:layout_centerVertical="true"
         android:layout_centerHorizontal="true">
-        <ImageView
+        <ProgressBar
             android:id="@+id/pcs_loading"
             android:layout_width="75dp"
             android:layout_height="75dp"
-            android:src="@drawable/image_loading"/>
+            android:indeterminate="true"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/pcs_loading"
             android:layout_toEndOf="@+id/pcs_loading"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="10dp"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="10dp"
             android:layout_centerVertical="true"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:gravity="center"

app/src/main/res/layout-port/activity_pc_view.xml

@@ -15,18 +15,18 @@
         android:layout_centerInParent="true"
         android:layout_centerVertical="true"
         android:layout_centerHorizontal="true">
-        <ImageView
+        <ProgressBar
             android:id="@+id/pcs_loading"
             android:layout_width="75dp"
             android:layout_height="75dp"
-            android:src="@drawable/image_loading"/>
+            android:indeterminate="true"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/pcs_loading"
             android:layout_toEndOf="@+id/pcs_loading"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="10dp"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="10dp"
             android:layout_centerVertical="true"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:gravity="center"

app/src/main/res/layout/app_grid_item.xml

@@ -8,6 +8,14 @@
         android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_width="75dp"
+            android:layout_height="75dp"
+            android:indeterminate="true">
+        </ProgressBar>
         <ImageView
             android:id="@+id/grid_image"
             android:cropToPadding="false"

app/src/main/res/layout/app_grid_item_small.xml

@@ -8,6 +8,14 @@
         android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:indeterminate="true">
+        </ProgressBar>
         <ImageView
             android:id="@+id/grid_image"
             android:cropToPadding="false"

app/src/main/res/layout/pc_grid_item.xml

@@ -13,16 +13,17 @@
             android:layout_width="150dp"
             android:layout_height="100dp">
         </ImageView>
-        <ImageView
+        <ProgressBar
-            android:id="@+id/grid_overlay"
+            android:id="@+id/grid_spinner"
             android:layout_marginTop="15dp"
             android:layout_marginLeft="65dp"
             android:layout_marginStart="65dp"
             android:layout_marginRight="20dp"
             android:layout_marginEnd="20dp"
             android:layout_width="50dp"
-            android:layout_height="50dp">
+            android:layout_height="50dp"
-        </ImageView>
+            android:indeterminate="true">
+        </ProgressBar>
     </RelativeLayout>
     <TextView
         android:id="@+id/grid_text"

app/src/main/res/layout/pc_grid_item_small.xml

@@ -13,16 +13,17 @@
             android:layout_width="100dp"
             android:layout_height="67dp">
         </ImageView>
-        <ImageView
+        <ProgressBar
-            android:id="@+id/grid_overlay"
+            android:id="@+id/grid_spinner"
             android:layout_marginTop="10dp"
             android:layout_marginLeft="42dp"
             android:layout_marginStart="42dp"
             android:layout_marginRight="13dp"
             android:layout_marginEnd="13dp"
             android:layout_width="33dp"
-            android:layout_height="33dp">
+            android:layout_height="33dp"
-        </ImageView>
+            android:indeterminate="true">
+        </ProgressBar>
     </RelativeLayout>
     <TextView
         android:id="@+id/grid_text"

app/src/main/res/values/strings.xml

@@ -55,7 +55,7 @@
 
     <!-- General strings -->
     <string name="ip_hint">IP address of GeForce PC</string>
-    <string name="searching_pc">Searching for PCs…</string>
+    <string name="searching_pc">Searching for PCs with GeForce Experience running…</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="lost_connection">Lost connection to PC</string>