Merge pull request TeamNewPipe#8530 from krlvm/improve_placeholder_images

Improve image placeholders

Author: Stypox

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -714,7 +714,7 @@ private View.OnTouchListener getOnControlsTouchListener() {
     }
 
     private void initThumbnailViews(@NonNull final StreamInfo info) {
-        PicassoHelper.loadThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
+        PicassoHelper.loadDetailsThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
                 .into(binding.detailThumbnailImageView, new Callback() {
                     @Override
                     public void onSuccess() {
@@ -1551,7 +1551,8 @@ public void handleResult(@NonNull final StreamInfo info) {
             binding.detailUploaderThumbnailView.setVisibility(View.GONE);
         }
 
-        final Drawable buddyDrawable = AppCompatResources.getDrawable(activity, R.drawable.buddy);
+        final Drawable buddyDrawable
+                = AppCompatResources.getDrawable(activity, R.drawable.placeholder_person);
         binding.detailSubChannelThumbnailView.setImageDrawable(buddyDrawable);
         binding.detailUploaderThumbnailView.setImageDrawable(buddyDrawable);
 
@@ -2360,8 +2361,8 @@ private void updateOverlayData(@Nullable final String overlayTitle,
                                    @Nullable final String thumbnailUrl) {
         binding.overlayTitleTextView.setText(isEmpty(overlayTitle) ? "" : overlayTitle);
         binding.overlayChannelTextView.setText(isEmpty(uploader) ? "" : uploader);
-        binding.overlayThumbnail.setImageResource(R.drawable.dummy_thumbnail_dark);
-        PicassoHelper.loadThumbnail(thumbnailUrl).tag(PICASSO_VIDEO_DETAILS_TAG)
+        binding.overlayThumbnail.setImageDrawable(null);
+        PicassoHelper.loadDetailsThumbnail(thumbnailUrl).tag(PICASSO_VIDEO_DETAILS_TAG)
                 .into(binding.overlayThumbnail);
     }
 

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java

@@ -145,7 +145,8 @@ private void onPlaylistSelected(@NonNull final LocalPlaylistManager manager,
         final Toast successToast = Toast.makeText(getContext(),
                 R.string.playlist_add_stream_success, Toast.LENGTH_SHORT);
 
-        if (playlist.thumbnailUrl.equals("drawable://" + R.drawable.dummy_thumbnail_playlist)) {
+        if (playlist.thumbnailUrl
+                .equals("drawable://" + R.drawable.placeholder_thumbnail_playlist)) {
             playlistDisposables.add(manager
                     .changePlaylistThumbnail(playlist.uid, streams.get(0).getThumbnailUrl())
                     .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -613,7 +613,7 @@ private void updateThumbnailUrl() {
             newThumbnailUrl = ((PlaylistStreamEntry) itemListAdapter.getItemsList().get(0))
                     .getStreamEntity().getThumbnailUrl();
         } else {
-            newThumbnailUrl = "drawable://" + R.drawable.dummy_thumbnail_playlist;
+            newThumbnailUrl = "drawable://" + R.drawable.placeholder_thumbnail_playlist;
         }
 
         changeThumbnailUrl(newThumbnailUrl);

app/src/main/java/org/schabi/newpipe/player/Player.java

@@ -3108,7 +3108,7 @@ public String getUploaderName() {
     public Bitmap getThumbnail() {
         if (currentThumbnail == null) {
             currentThumbnail = BitmapFactory.decodeResource(
-                    context.getResources(), R.drawable.dummy_thumbnail);
+                    context.getResources(), R.drawable.placeholder_thumbnail_video);
         }
         return currentThumbnail;
     }

app/src/main/java/org/schabi/newpipe/util/PicassoHelper.java

@@ -97,19 +97,23 @@ public static boolean getShouldLoadImages() {
 
 
     public static RequestCreator loadAvatar(final String url) {
-        return loadImageDefault(url, R.drawable.buddy);
+        return loadImageDefault(url, R.drawable.placeholder_person);
     }
 
     public static RequestCreator loadThumbnail(final String url) {
-        return loadImageDefault(url, R.drawable.dummy_thumbnail);
+        return loadImageDefault(url, R.drawable.placeholder_thumbnail_video);
+    }
+
+    public static RequestCreator loadDetailsThumbnail(final String url) {
+        return loadImageDefault(url, R.drawable.placeholder_thumbnail_video, false);
     }
 
     public static RequestCreator loadBanner(final String url) {
-        return loadImageDefault(url, R.drawable.channel_banner);
+        return loadImageDefault(url, R.drawable.placeholder_channel_banner);
     }
 
     public static RequestCreator loadPlaylistThumbnail(final String url) {
-        return loadImageDefault(url, R.drawable.dummy_thumbnail_playlist);
+        return loadImageDefault(url, R.drawable.placeholder_thumbnail_playlist);
     }
 
     public static RequestCreator loadSeekbarThumbnailPreview(final String url) {
@@ -189,15 +193,24 @@ public void onPrepareLoad(final Drawable placeHolderDrawable) {
 
 
     private static RequestCreator loadImageDefault(final String url, final int placeholderResId) {
+        return loadImageDefault(url, placeholderResId, true);
+    }
+
+    private static RequestCreator loadImageDefault(final String url, final int placeholderResId,
+                                                   final boolean showPlaceholderWhileLoading) {
         if (!shouldLoadImages || isBlank(url)) {
             return picassoInstance
                     .load((String) null)
                     .placeholder(placeholderResId) // show placeholder when no image should load
                     .error(placeholderResId);
         } else {
-            return picassoInstance
+            final RequestCreator requestCreator = picassoInstance
                     .load(url)
-                    .error(placeholderResId); // don't show placeholder while loading, only on error
+                    .error(placeholderResId);
+            if (showPlaceholderWhileLoading) {
+                requestCreator.placeholder(placeholderResId);
+            }
+            return requestCreator;
         }
     }
 }