Fix media not added in chat view
This commit is contained in:
parent
c72d3432ee
commit
8079a213f7
|
@ -814,11 +814,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
||||||
if (statusToDeal.card.width > statusToDeal.card.height) {
|
if (statusToDeal.card.width > statusToDeal.card.height) {
|
||||||
holder.binding.cardImageHorizontal.setVisibility(View.VISIBLE);
|
holder.binding.cardImageHorizontal.setVisibility(View.VISIBLE);
|
||||||
holder.binding.cardImageVertical.setVisibility(View.GONE);
|
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 {
|
} else {
|
||||||
holder.binding.cardImageHorizontal.setVisibility(View.GONE);
|
holder.binding.cardImageHorizontal.setVisibility(View.GONE);
|
||||||
holder.binding.cardImageVertical.setVisibility(View.VISIBLE);
|
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.cardTitle.setText(statusToDeal.card.title);
|
||||||
holder.binding.cardDescription.setText(statusToDeal.card.description);
|
holder.binding.cardDescription.setText(statusToDeal.card.description);
|
||||||
|
@ -2643,7 +2643,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onAttachedToRecyclerView(RecyclerView recyclerView) {
|
public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
|
||||||
super.onAttachedToRecyclerView(recyclerView);
|
super.onAttachedToRecyclerView(recyclerView);
|
||||||
|
|
||||||
mRecyclerView = recyclerView;
|
mRecyclerView = recyclerView;
|
||||||
|
@ -2729,6 +2729,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
||||||
if (viewHolder.getItemViewType() == STATUS_HIDDEN) {
|
if (viewHolder.getItemViewType() == STATUS_HIDDEN) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
context = viewHolder.itemView.getContext();
|
||||||
Status status = statusList.get(position);
|
Status status = statusList.get(position);
|
||||||
if (viewHolder.getItemViewType() == STATUS_VISIBLE) {
|
if (viewHolder.getItemViewType() == STATUS_VISIBLE) {
|
||||||
StatusViewHolder holder = (StatusViewHolder) viewHolder;
|
StatusViewHolder holder = (StatusViewHolder) viewHolder;
|
||||||
|
|
|
@ -16,7 +16,6 @@ package app.fedilab.android.mastodon.ui.fragment.media;
|
||||||
|
|
||||||
|
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.graphics.Bitmap;
|
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
@ -131,16 +130,16 @@ public class FragmentMedia extends Fragment {
|
||||||
scheduleStartPostponedTransition(binding.mediaPicture);
|
scheduleStartPostponedTransition(binding.mediaPicture);
|
||||||
if (Helper.isValidContextForGlide(requireActivity()) && isAdded()) {
|
if (Helper.isValidContextForGlide(requireActivity()) && isAdded()) {
|
||||||
Glide.with(requireActivity())
|
Glide.with(requireActivity())
|
||||||
.asBitmap()
|
.asDrawable()
|
||||||
.dontTransform()
|
.dontTransform()
|
||||||
.load(preview_url).into(
|
.load(preview_url).into(
|
||||||
new CustomTarget<Bitmap>() {
|
new CustomTarget<Drawable>() {
|
||||||
@Override
|
@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) {
|
if (binding == null || !isAdded() || getActivity() == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
binding.mediaPicture.setImageBitmap(resource);
|
binding.mediaPicture.setImageDrawable(resource);
|
||||||
|
|
||||||
if (attachment.type.equalsIgnoreCase("image") && !attachment.url.toLowerCase().endsWith(".gif")) {
|
if (attachment.type.equalsIgnoreCase("image") && !attachment.url.toLowerCase().endsWith(".gif")) {
|
||||||
binding.mediaPicture.setVisibility(View.VISIBLE);
|
binding.mediaPicture.setVisibility(View.VISIBLE);
|
||||||
|
@ -148,17 +147,17 @@ public class FragmentMedia extends Fragment {
|
||||||
handler.postDelayed(() -> {
|
handler.postDelayed(() -> {
|
||||||
if (isAdded() && Helper.isValidContextForGlide(requireActivity())) {
|
if (isAdded() && Helper.isValidContextForGlide(requireActivity())) {
|
||||||
Glide.with(requireActivity())
|
Glide.with(requireActivity())
|
||||||
.asBitmap()
|
.asDrawable()
|
||||||
.dontTransform()
|
.dontTransform()
|
||||||
.load(url).into(
|
.load(url).into(
|
||||||
new CustomTarget<Bitmap>() {
|
new CustomTarget<Drawable>() {
|
||||||
@Override
|
@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) {
|
if (binding == null || !isAdded() || getActivity() == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
binding.loader.setVisibility(View.GONE);
|
binding.loader.setVisibility(View.GONE);
|
||||||
binding.mediaPicture.setImageBitmap(resource);
|
binding.mediaPicture.setImageDrawable(resource);
|
||||||
binding.mediaPicture.setZoomable(true);
|
binding.mediaPicture.setZoomable(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue