diff --git a/app/src/main/assets/screenshot_placeholder.png b/app/src/main/assets/screenshot_placeholder.png new file mode 100644 index 000000000..68d0b172a Binary files /dev/null and b/app/src/main/assets/screenshot_placeholder.png differ diff --git a/app/src/main/java/org/fdroid/fdroid/net/IconDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/IconDownloader.java index 943b23cb7..1ba751f99 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/IconDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/IconDownloader.java @@ -17,7 +17,11 @@ public class IconDownloader implements ImageDownloader { @Override public InputStream getStream(String imageUri, Object extra) throws IOException { - return DownloaderFactory.create(context, imageUri).getInputStream(); + switch (Scheme.ofUri(imageUri)) { + case ASSETS: + return context.getAssets().open(Scheme.ASSETS.crop(imageUri)); + default: + return DownloaderFactory.create(context, imageUri).getInputStream(); + } } - } diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java index 0bd883a03..08b2ac923 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java @@ -12,21 +12,20 @@ import android.widget.ImageView; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.ImageScaleType; +import com.nostra13.universalimageloader.core.download.ImageDownloader; import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; public class ScreenShotsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements LinearLayoutManagerSnapHelper.LinearSnapHelperListener { - private final App app; private final DisplayImageOptions displayImageOptions; private View selectedView; private int selectedPosition; private final int selectedItemElevation; private final int unselectedItemMargin; - public ScreenShotsRecyclerViewAdapter(Context context, App app) { + public ScreenShotsRecyclerViewAdapter(Context context, @SuppressWarnings("unused") App app) { super(); - this.app = app; selectedPosition = 0; selectedItemElevation = context.getResources().getDimensionPixelSize(R.dimen.details_screenshot_selected_elevation); unselectedItemMargin = context.getResources().getDimensionPixelSize(R.dimen.details_screenshot_margin); @@ -47,7 +46,8 @@ public class ScreenShotsRecyclerViewAdapter extends RecyclerView.Adapter<Recycle if (position == selectedPosition) { this.selectedView = vh.itemView; } - ImageLoader.getInstance().displayImage(app.iconUrlLarge, vh.image, displayImageOptions); + // For now, use the screenshot placeholder + ImageLoader.getInstance().displayImage(ImageDownloader.Scheme.ASSETS.wrap("screenshot_placeholder.png"), vh.image, displayImageOptions); } @Override