Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'placeholder_images_for_screenshots_897' into 'master'

Browse Source 
Placeholder images for screenshots 897

See merge request !450
This commit is contained in:
Hans-Christoph Steiner 2017-03-20 18:29:02 +00:00
commit 61e219a02e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/assets/screenshot_placeholder.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

8
app/src/main/java/org/fdroid/fdroid/net/IconDownloader.java
View File

@ -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();
}
}
}

8
app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java
View File

@ -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