Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix media not added in chat view

This commit is contained in:
Thomas 2023-02-15 15:45:50 +01:00
parent c72d3432ee
commit 8079a213f7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
View File

@ -814,11 +814,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
if (statusToDeal.card.width > statusToDeal.card.height) {
holder.binding.cardImageHorizontal.setVisibility(View.VISIBLE);
holder.binding.cardImageVertical.setVisibility(View.GONE);
Glide.with(context).load(statusToDeal.card.image).into(holder.binding.cardImageHorizontal);
Glide.with(holder.itemView.getContext()).load(statusToDeal.card.image).into(holder.binding.cardImageHorizontal);
} else {
holder.binding.cardImageHorizontal.setVisibility(View.GONE);
holder.binding.cardImageVertical.setVisibility(View.VISIBLE);
Glide.with(context).load(statusToDeal.card.image).into(holder.binding.cardImageVertical);
Glide.with(holder.itemView.getContext()).load(statusToDeal.card.image).into(holder.binding.cardImageVertical);
}
holder.binding.cardTitle.setText(statusToDeal.card.title);
holder.binding.cardDescription.setText(statusToDeal.card.description);
@ -2643,7 +2643,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
}
@Override
public void onAttachedToRecyclerView(RecyclerView recyclerView) {
public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
super.onAttachedToRecyclerView(recyclerView);
mRecyclerView = recyclerView;
@ -2729,6 +2729,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
if (viewHolder.getItemViewType() == STATUS_HIDDEN) {
return;
}
context = viewHolder.itemView.getContext();
Status status = statusList.get(position);
if (viewHolder.getItemViewType() == STATUS_VISIBLE) {
StatusViewHolder holder = (StatusViewHolder) viewHolder;

17
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java
View File

@ -16,7 +16,6 @@ package app.fedilab.android.mastodon.ui.fragment.media;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@ -131,16 +130,16 @@ public class FragmentMedia extends Fragment {
scheduleStartPostponedTransition(binding.mediaPicture);
if (Helper.isValidContextForGlide(requireActivity()) && isAdded()) {
Glide.with(requireActivity())
.asBitmap()
.asDrawable()
.dontTransform()
.load(preview_url).into(
new CustomTarget<Bitmap>() {
new CustomTarget<Drawable>() {
@Override
public void onResourceReady(@NonNull final Bitmap resource, Transition<? super Bitmap> transition) {
public void onResourceReady(@NonNull final Drawable resource, Transition<? super Drawable> transition) {
if (binding == null || !isAdded() || getActivity() == null) {
return;
}
binding.mediaPicture.setImageBitmap(resource);
binding.mediaPicture.setImageDrawable(resource);
if (attachment.type.equalsIgnoreCase("image") && !attachment.url.toLowerCase().endsWith(".gif")) {
binding.mediaPicture.setVisibility(View.VISIBLE);
@ -148,17 +147,17 @@ public class FragmentMedia extends Fragment {
handler.postDelayed(() -> {
if (isAdded() && Helper.isValidContextForGlide(requireActivity())) {
Glide.with(requireActivity())
.asBitmap()
.asDrawable()
.dontTransform()
.load(url).into(
new CustomTarget<Bitmap>() {
new CustomTarget<Drawable>() {
@Override
public void onResourceReady(@NonNull final Bitmap resource, Transition<? super Bitmap> transition) {
public void onResourceReady(@NonNull final Drawable resource, Transition<? super Drawable> transition) {
if (binding == null || !isAdded() || getActivity() == null) {
return;
}
binding.loader.setVisibility(View.GONE);
binding.mediaPicture.setImageBitmap(resource);
binding.mediaPicture.setImageDrawable(resource);
binding.mediaPicture.setZoomable(true);
}