Skip to content

Commit 6ea85e6

Browse files
committed
Rename dummy_* and more to placeholder_*
1 parent 4d58026 commit 6ea85e6

31 files changed

Lines changed: 39 additions & 38 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ public void handleResult(@NonNull final StreamInfo info) {
15521552
}
15531553

15541554
final Drawable buddyDrawable
1555-
= AppCompatResources.getDrawable(activity, R.drawable.dummy_person);
1555+
= AppCompatResources.getDrawable(activity, R.drawable.placeholder_person);
15561556
binding.detailSubChannelThumbnailView.setImageDrawable(buddyDrawable);
15571557
binding.detailUploaderThumbnailView.setImageDrawable(buddyDrawable);
15581558

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ private void onPlaylistSelected(@NonNull final LocalPlaylistManager manager,
145145
final Toast successToast = Toast.makeText(getContext(),
146146
R.string.playlist_add_stream_success, Toast.LENGTH_SHORT);
147147

148-
if (playlist.thumbnailUrl.equals("drawable://" + R.drawable.dummy_thumbnail_playlist)) {
148+
if (playlist.thumbnailUrl
149+
.equals("drawable://" + R.drawable.placeholder_thumbnail_playlist)) {
149150
playlistDisposables.add(manager
150151
.changePlaylistThumbnail(playlist.uid, streams.get(0).getThumbnailUrl())
151152
.observeOn(AndroidSchedulers.mainThread())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ private void updateThumbnailUrl() {
613613
newThumbnailUrl = ((PlaylistStreamEntry) itemListAdapter.getItemsList().get(0))
614614
.getStreamEntity().getThumbnailUrl();
615615
} else {
616-
newThumbnailUrl = "drawable://" + R.drawable.dummy_thumbnail_playlist;
616+
newThumbnailUrl = "drawable://" + R.drawable.placeholder_thumbnail_playlist;
617617
}
618618

619619
changeThumbnailUrl(newThumbnailUrl);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3108,7 +3108,7 @@ public String getUploaderName() {
31083108
public Bitmap getThumbnail() {
31093109
if (currentThumbnail == null) {
31103110
currentThumbnail = BitmapFactory.decodeResource(
3111-
context.getResources(), R.drawable.dummy_thumbnail);
3111+
context.getResources(), R.drawable.placeholder_thumbnail_video);
31123112
}
31133113
return currentThumbnail;
31143114
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,23 @@ public static boolean getShouldLoadImages() {
9797

9898

9999
public static RequestCreator loadAvatar(final String url) {
100-
return loadImageDefault(url, R.drawable.dummy_person);
100+
return loadImageDefault(url, R.drawable.placeholder_person);
101101
}
102102

103103
public static RequestCreator loadThumbnail(final String url) {
104-
return loadImageDefault(url, R.drawable.dummy_thumbnail);
104+
return loadImageDefault(url, R.drawable.placeholder_thumbnail_video);
105105
}
106106

107107
public static RequestCreator loadDetailsThumbnail(final String url) {
108-
return loadImageDefault(url, R.drawable.dummy_thumbnail, false);
108+
return loadImageDefault(url, R.drawable.placeholder_thumbnail_video, false);
109109
}
110110

111111
public static RequestCreator loadBanner(final String url) {
112-
return loadImageDefault(url, R.drawable.channel_banner);
112+
return loadImageDefault(url, R.drawable.placeholder_channel_banner);
113113
}
114114

115115
public static RequestCreator loadPlaylistThumbnail(final String url) {
116-
return loadImageDefault(url, R.drawable.dummy_thumbnail_playlist);
116+
return loadImageDefault(url, R.drawable.placeholder_thumbnail_playlist);
117117
}
118118

119119
public static RequestCreator loadSeekbarThumbnailPreview(final String url) {

app/src/main/res/drawable-nodpi/channel_banner.png renamed to app/src/main/res/drawable-nodpi/placeholder_channel_banner.png

File renamed without changes.
File renamed without changes.

app/src/main/res/drawable/dummy_thumbnail_playlist.xml renamed to app/src/main/res/drawable/placeholder_thumbnail_playlist.xml

File renamed without changes.
File renamed without changes.

app/src/main/res/layout-large-land/fragment_video_detail.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
android:scaleType="fitCenter"
5858
tools:ignore="RtlHardcoded"
5959
tools:layout_height="200dp"
60-
tools:src="@drawable/dummy_thumbnail" />
60+
tools:src="@drawable/placeholder_thumbnail_video" />
6161

6262
<ImageView
6363
android:id="@+id/detail_thumbnail_play_button"
@@ -271,7 +271,7 @@
271271
android:layout_width="@dimen/video_item_detail_uploader_image_size"
272272
android:layout_height="@dimen/video_item_detail_uploader_image_size"
273273
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
274-
android:src="@drawable/dummy_person"
274+
android:src="@drawable/placeholder_person"
275275
app:shapeAppearance="@style/CircularImageView" />
276276

277277
<com.google.android.material.imageview.ShapeableImageView
@@ -280,7 +280,7 @@
280280
android:layout_height="@dimen/video_item_detail_sub_channel_image_size"
281281
android:layout_gravity="bottom|right"
282282
android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
283-
android:src="@drawable/dummy_person"
283+
android:src="@drawable/placeholder_person"
284284
android:visibility="gone"
285285
app:shapeAppearance="@style/CircularImageView"
286286
tools:visibility="visible" />
@@ -645,7 +645,7 @@
645645
android:paddingLeft="@dimen/video_item_search_padding"
646646
android:paddingRight="@dimen/video_item_search_padding"
647647
android:scaleType="fitCenter"
648-
android:src="@drawable/dummy_thumbnail" />
648+
android:src="@drawable/placeholder_thumbnail_video" />
649649

650650
<LinearLayout
651651
android:id="@+id/overlay_metadata_layout"

0 commit comments

Comments
 (0)