mirror of
https://codeberg.org/tom79/Fedilab.git
synced 2024-12-22 16:50:04 +02:00
empty space with media
This commit is contained in:
parent
ccce81c49c
commit
773322b60a
1 changed files with 4 additions and 1 deletions
|
@ -58,6 +58,7 @@ import android.os.Looper;
|
||||||
import android.text.Html;
|
import android.text.Html;
|
||||||
import android.text.SpannableString;
|
import android.text.SpannableString;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
import android.util.Log;
|
||||||
import android.util.TypedValue;
|
import android.util.TypedValue;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.MotionEvent;
|
import android.view.MotionEvent;
|
||||||
|
@ -1512,9 +1513,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
||||||
//--- MEDIA ATTACHMENT ---
|
//--- MEDIA ATTACHMENT ---
|
||||||
boolean cardDisplayed = (statusToDeal.card != null && (display_card || statusToDeal.isFocused) && statusToDeal.quote_id == null);
|
boolean cardDisplayed = (statusToDeal.card != null && (display_card || statusToDeal.isFocused) && statusToDeal.quote_id == null);
|
||||||
if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0 && (!hideSingleMediaWithCard || !cardDisplayed || statusToDeal.media_attachments.size() > 1)) {
|
if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0 && (!hideSingleMediaWithCard || !cardDisplayed || statusToDeal.media_attachments.size() > 1)) {
|
||||||
|
|
||||||
if ((loadMediaType.equals("ASK") || (loadMediaType.equals("WIFI") && !TimelineHelper.isOnWIFI(context))) && !statusToDeal.canLoadMedia) {
|
if ((loadMediaType.equals("ASK") || (loadMediaType.equals("WIFI") && !TimelineHelper.isOnWIFI(context))) && !statusToDeal.canLoadMedia) {
|
||||||
holder.binding.mediaContainer.setVisibility(View.GONE);
|
holder.binding.mediaContainer.setVisibility(View.GONE);
|
||||||
|
holder.binding.media.mediaContainer.setVisibility(View.GONE);
|
||||||
holder.binding.displayMedia.setVisibility(View.VISIBLE);
|
holder.binding.displayMedia.setVisibility(View.VISIBLE);
|
||||||
holder.binding.displayMedia.setOnClickListener(v -> {
|
holder.binding.displayMedia.setOnClickListener(v -> {
|
||||||
statusToDeal.canLoadMedia = true;
|
statusToDeal.canLoadMedia = true;
|
||||||
|
@ -1523,6 +1524,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
holder.binding.displayMedia.setVisibility(View.GONE);
|
||||||
|
holder.binding.media.mediaContainer.setVisibility(View.VISIBLE);
|
||||||
int mediaPosition = 1;
|
int mediaPosition = 1;
|
||||||
boolean autoplaygif = sharedpreferences.getBoolean(context.getString(R.string.SET_AUTO_PLAY_GIG_MEDIA), true);
|
boolean autoplaygif = sharedpreferences.getBoolean(context.getString(R.string.SET_AUTO_PLAY_GIG_MEDIA), true);
|
||||||
if (!fullAttachement || statusToDeal.sensitive) {
|
if (!fullAttachement || statusToDeal.sensitive) {
|
||||||
|
|
Loading…
Reference in a new issue