Skip to content

Commit 72c6ed2

Browse files
TobiGrTobiGr
authored
Merge pull request #10066 from Stypox/swap-subchannel-avatar
Fix uploader and subchannel avatars being swapped and disable loading thumbnail message failure on content details page
2 parents 42de2c7 + 10c42de commit 72c6ed2

3 files changed

Lines changed: 30 additions & 48 deletions

File tree

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

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import com.google.android.material.appbar.AppBarLayout;
6262
import com.google.android.material.bottomsheet.BottomSheetBehavior;
6363
import com.google.android.material.tabs.TabLayout;
64-
import com.squareup.picasso.Callback;
6564

6665
import org.schabi.newpipe.App;
6766
import org.schabi.newpipe.R;
@@ -649,27 +648,6 @@ protected void initListeners() {
649648
}
650649
}
651650

652-
private void initThumbnailViews(@NonNull final StreamInfo info) {
653-
PicassoHelper.loadDetailsThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
654-
.into(binding.detailThumbnailImageView, new Callback() {
655-
@Override
656-
public void onSuccess() {
657-
// nothing to do, the image was loaded correctly into the thumbnail
658-
}
659-
660-
@Override
661-
public void onError(final Exception e) {
662-
showSnackBarError(new ErrorInfo(e, UserAction.LOAD_IMAGE,
663-
info.getThumbnailUrl(), info));
664-
}
665-
});
666-
667-
PicassoHelper.loadAvatar(info.getSubChannelAvatarUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
668-
.into(binding.detailSubChannelThumbnailView);
669-
PicassoHelper.loadAvatar(info.getUploaderAvatarUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
670-
.into(binding.detailUploaderThumbnailView);
671-
}
672-
673651
/*//////////////////////////////////////////////////////////////////////////
674652
// OwnStack
675653
//////////////////////////////////////////////////////////////////////////*/
@@ -1480,12 +1458,9 @@ public void handleResult(@NonNull final StreamInfo info) {
14801458
binding.detailSubChannelThumbnailView.setVisibility(View.GONE);
14811459

14821460
if (!isEmpty(info.getSubChannelName())) {
1483-
displayBothUploaderAndSubChannel(info, activity);
1484-
} else if (!isEmpty(info.getUploaderName())) {
1485-
displayUploaderAsSubChannel(info, activity);
1461+
displayBothUploaderAndSubChannel(info);
14861462
} else {
1487-
binding.detailUploaderTextView.setVisibility(View.GONE);
1488-
binding.detailUploaderThumbnailView.setVisibility(View.GONE);
1463+
displayUploaderAsSubChannel(info);
14891464
}
14901465

14911466
final Drawable buddyDrawable =
@@ -1559,7 +1534,8 @@ public void handleResult(@NonNull final StreamInfo info) {
15591534
binding.detailSecondaryControlPanel.setVisibility(View.GONE);
15601535

15611536
checkUpdateProgressInfo(info);
1562-
initThumbnailViews(info);
1537+
PicassoHelper.loadDetailsThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
1538+
.into(binding.detailThumbnailImageView);
15631539
showMetaInfoInTextView(info.getMetaInfo(), binding.detailMetaInfoTextView,
15641540
binding.detailMetaInfoSeparator, disposables);
15651541

@@ -1596,27 +1572,30 @@ public void handleResult(@NonNull final StreamInfo info) {
15961572
noVideoStreams ? R.drawable.ic_headset_shadow : R.drawable.ic_play_arrow_shadow);
15971573
}
15981574

1599-
private void displayUploaderAsSubChannel(final StreamInfo info, final Context context) {
1575+
private void displayUploaderAsSubChannel(final StreamInfo info) {
16001576
binding.detailSubChannelTextView.setText(info.getUploaderName());
16011577
binding.detailSubChannelTextView.setVisibility(View.VISIBLE);
16021578
binding.detailSubChannelTextView.setSelected(true);
16031579

16041580
if (info.getUploaderSubscriberCount() > -1) {
16051581
binding.detailUploaderTextView.setText(
1606-
Localization.shortSubscriberCount(context, info.getUploaderSubscriberCount()));
1582+
Localization.shortSubscriberCount(activity, info.getUploaderSubscriberCount()));
16071583
binding.detailUploaderTextView.setVisibility(View.VISIBLE);
16081584
} else {
16091585
binding.detailUploaderTextView.setVisibility(View.GONE);
16101586
}
1587+
1588+
PicassoHelper.loadAvatar(info.getUploaderAvatarUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
1589+
.into(binding.detailSubChannelThumbnailView);
1590+
binding.detailSubChannelThumbnailView.setVisibility(View.VISIBLE);
1591+
binding.detailUploaderThumbnailView.setVisibility(View.GONE);
16111592
}
16121593

1613-
private void displayBothUploaderAndSubChannel(final StreamInfo info, final Context context) {
1594+
private void displayBothUploaderAndSubChannel(final StreamInfo info) {
16141595
binding.detailSubChannelTextView.setText(info.getSubChannelName());
16151596
binding.detailSubChannelTextView.setVisibility(View.VISIBLE);
16161597
binding.detailSubChannelTextView.setSelected(true);
16171598

1618-
binding.detailSubChannelThumbnailView.setVisibility(View.VISIBLE);
1619-
16201599
final StringBuilder subText = new StringBuilder();
16211600
if (!isEmpty(info.getUploaderName())) {
16221601
subText.append(
@@ -1627,7 +1606,7 @@ private void displayBothUploaderAndSubChannel(final StreamInfo info, final Conte
16271606
subText.append(Localization.DOT_SEPARATOR);
16281607
}
16291608
subText.append(
1630-
Localization.shortSubscriberCount(context, info.getUploaderSubscriberCount()));
1609+
Localization.shortSubscriberCount(activity, info.getUploaderSubscriberCount()));
16311610
}
16321611

16331612
if (subText.length() > 0) {
@@ -1637,6 +1616,13 @@ private void displayBothUploaderAndSubChannel(final StreamInfo info, final Conte
16371616
} else {
16381617
binding.detailUploaderTextView.setVisibility(View.GONE);
16391618
}
1619+
1620+
PicassoHelper.loadAvatar(info.getSubChannelAvatarUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
1621+
.into(binding.detailSubChannelThumbnailView);
1622+
binding.detailSubChannelThumbnailView.setVisibility(View.VISIBLE);
1623+
PicassoHelper.loadAvatar(info.getUploaderAvatarUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
1624+
.into(binding.detailUploaderThumbnailView);
1625+
binding.detailUploaderThumbnailView.setVisibility(View.VISIBLE);
16401626
}
16411627

16421628
public void openDownloadDialog() {

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,23 +267,21 @@
267267
android:layout_height="wrap_content">
268268

269269
<com.google.android.material.imageview.ShapeableImageView
270-
android:id="@+id/detail_uploader_thumbnail_view"
270+
android:id="@+id/detail_sub_channel_thumbnail_view"
271271
android:layout_width="@dimen/video_item_detail_uploader_image_size"
272272
android:layout_height="@dimen/video_item_detail_uploader_image_size"
273-
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
273+
android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
274274
android:src="@drawable/placeholder_person"
275275
app:shapeAppearance="@style/CircularImageView" />
276276

277277
<com.google.android.material.imageview.ShapeableImageView
278-
android:id="@+id/detail_sub_channel_thumbnail_view"
278+
android:id="@+id/detail_uploader_thumbnail_view"
279279
android:layout_width="@dimen/video_item_detail_sub_channel_image_size"
280280
android:layout_height="@dimen/video_item_detail_sub_channel_image_size"
281281
android:layout_gravity="bottom|right"
282-
android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
282+
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
283283
android:src="@drawable/placeholder_person"
284-
android:visibility="gone"
285-
app:shapeAppearance="@style/CircularImageView"
286-
tools:visibility="visible" />
284+
app:shapeAppearance="@style/CircularImageView" />
287285

288286
</FrameLayout>
289287

‎app/src/main/res/layout/fragment_video_detail.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,24 +254,22 @@
254254
android:layout_height="wrap_content">
255255

256256
<com.google.android.material.imageview.ShapeableImageView
257-
android:id="@+id/detail_uploader_thumbnail_view"
257+
android:id="@+id/detail_sub_channel_thumbnail_view"
258258
android:layout_width="@dimen/video_item_detail_uploader_image_size"
259259
android:layout_height="@dimen/video_item_detail_uploader_image_size"
260-
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
260+
android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
261261
android:src="@drawable/placeholder_person"
262262
app:shapeAppearance="@style/CircularImageView" />
263263

264264
<com.google.android.material.imageview.ShapeableImageView
265-
android:id="@+id/detail_sub_channel_thumbnail_view"
265+
android:id="@+id/detail_uploader_thumbnail_view"
266266
android:layout_width="@dimen/video_item_detail_sub_channel_image_size"
267267
android:layout_height="@dimen/video_item_detail_sub_channel_image_size"
268268
android:layout_gravity="bottom|right"
269-
android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
269+
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
270270
android:src="@drawable/placeholder_person"
271-
android:visibility="gone"
272271
app:shapeAppearance="@style/CircularImageView"
273-
tools:ignore="RtlHardcoded"
274-
tools:visibility="visible" />
272+
tools:ignore="RtlHardcoded" />
275273

276274
</FrameLayout>
277275

0 commit comments

Comments
 (0)