owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add file attachments view

Browse Source 
This also fixes crashes on Calckey due to now being able to handle any type of attachment.
@sk22 this is also great for you
This commit is contained in:
LucasGGamerM
2023-05-13 18:42:25 -03:00
parent 697262bb47
commit 3fda9e9eab
4 changed files with 138 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java Normal file
View File

@@ -0,0 +1,60 @@
package org.joinmastodon.android.ui.displayitems;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import org.joinmastodon.android.R;
import org.joinmastodon.android.fragments.BaseStatusListFragment;
import org.joinmastodon.android.model.Attachment;
import org.joinmastodon.android.model.Card;
import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
import org.joinmastodon.android.ui.utils.UiUtils;
import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
public class FileStatusDisplayItem extends StatusDisplayItem{
private final Status status;
private final Attachment attachment;
public FileStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Attachment attachment, Status status){
super(parentID, parentFragment);
this.status=status;
this.attachment=attachment;
}
@Override
public Type getType(){
return Type.FILE;
}
public static class Holder extends StatusDisplayItem.Holder<FileStatusDisplayItem>{
private final TextView title, domain;
private boolean didClear;
public Holder(Context context, ViewGroup parent){
super(context, R.layout.display_item_file, parent);
title=findViewById(R.id.title);
domain=findViewById(R.id.domain);
findViewById(R.id.inner).setOnClickListener(this::onClick);
}
@Override
public void onBind(FileStatusDisplayItem item){
title.setText(item.attachment.description == null ? title.getContext().getText(R.string.media_no_description) : item.attachment.description);
domain.setText(Uri.parse(item.attachment.url).getHost());
}
private void onClick(View v){
UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), item.attachment.url);
}
}
}

12
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
View File

@@ -79,6 +79,7 @@ public abstract class StatusDisplayItem{
case EXTENDED_FOOTER -> new ExtendedFooterStatusDisplayItem.Holder(activity, parent);
case MEDIA_GRID -> new MediaGridStatusDisplayItem.Holder(activity, parent);
case WARNING -> new WarningFilteredStatusDisplayItem.Holder(activity, parent);
case FILE -> new FileStatusDisplayItem.Holder(activity, parent);
};
}
@@ -185,7 +186,7 @@ public abstract class StatusDisplayItem{
replyLine.needBottomPadding=true;
else
header.needBottomPadding=true;
List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());
List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage() && !att.type.equals(Attachment.Type.UNKNOWN)).collect(Collectors.toList());
if(!imageAttachments.isEmpty()){
PhotoLayoutHelper.TiledLayoutResult layout=PhotoLayoutHelper.processThumbs(imageAttachments);
items.add(new MediaGridStatusDisplayItem(parentID, fragment, layout, imageAttachments, statusForContent));
@@ -195,6 +196,12 @@ public abstract class StatusDisplayItem{
items.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att));
}
}
List<Attachment> fileAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.equals(Attachment.Type.UNKNOWN)).collect(Collectors.toList());
fileAttachments.forEach(attachment -> {
items.add(new FileStatusDisplayItem(parentID, fragment, attachment, statusForContent));
});
if(statusForContent.poll!=null){
buildPollItems(parentID, fragment, statusForContent.poll, items, statusForContent);
}
@@ -244,7 +251,8 @@ public abstract class StatusDisplayItem{
GAP,
WARNING,
EXTENDED_FOOTER,
MEDIA_GRID
MEDIA_GRID,
FILE
}
public static abstract class Holder<T extends StatusDisplayItem> extends BindableViewHolder<T> implements UsableRecyclerView.DisableableClickable{