diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java b/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java index 374f74f..4dac219 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java @@ -144,6 +144,7 @@ import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPO import static app.fedilab.fedilabtube.helper.Helper.getAttColor; import static app.fedilab.fedilabtube.helper.Helper.getLiveInstance; import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn; +import static app.fedilab.fedilabtube.helper.Helper.loadGiF; import static com.google.android.exoplayer2.Player.MEDIA_ITEM_TRANSITION_REASON_AUTO; @@ -586,7 +587,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd binding.peertubeDescriptionMore.setVisibility(View.GONE); show_more_content = null; }else{ - if( peertube != null && description.getDescription().compareTo(peertube.getDescription()) > 0) { + if( peertube != null && peertube.getDescription() != null && description.getDescription().compareTo(peertube.getDescription()) > 0) { binding.peertubeDescriptionMore.setVisibility(View.VISIBLE); show_more_content = description.getDescription(); }else{ @@ -796,6 +797,19 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd binding.peertubeDislikeCount.setText(Helper.withSuffix(peertube.getDislikes())); binding.peertubeLikeCount.setText(Helper.withSuffix(peertube.getLikes())); binding.peertubeViewCount.setText(Helper.withSuffix(peertube.getViews())); + loadGiF(PeertubeActivity.this,peertube.getChannel().getAvatar()!=null?peertube.getChannel().getAvatar().getPath():null, binding.ppChannel); + binding.ppChannel.setOnClickListener(v->{ + Intent intent = new Intent(PeertubeActivity.this, ShowChannelActivity.class); + Bundle b = new Bundle(); + b.putParcelable("channel", peertube.getChannel()); + b.putBoolean("sepia_search", sepiaSearch); + if (sepiaSearch) { + b.putString("peertube_instance", peertube.getAccount().getHost()); + } + intent.putExtras(b); + startActivity(intent); + }); + video_id = peertube.getId(); changeColor(); diff --git a/app/src/main/res/layout/activity_peertube.xml b/app/src/main/res/layout/activity_peertube.xml index 9df285e..f32c535 100644 --- a/app/src/main/res/layout/activity_peertube.xml +++ b/app/src/main/res/layout/activity_peertube.xml @@ -121,6 +121,16 @@ android:layout_marginTop="5dp" android:orientation="horizontal"> +