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

Add coding

This commit is contained in:
tom79 2019-05-06 18:56:44 +02:00
parent 249fac6b8b
commit ec28de29ec
2 changed files with 82 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -147,6 +147,7 @@ import fr.gouv.etalab.mastodon.sqlite.StatusCacheDAO;
import fr.gouv.etalab.mastodon.sqlite.StatusStoredDAO; import fr.gouv.etalab.mastodon.sqlite.StatusStoredDAO;
import fr.gouv.etalab.mastodon.sqlite.TempMuteDAO; import fr.gouv.etalab.mastodon.sqlite.TempMuteDAO;
import fr.gouv.etalab.mastodon.sqlite.TimelinesDAO; import fr.gouv.etalab.mastodon.sqlite.TimelinesDAO;
import jp.wasabeef.glide.transformations.BlurTransformation;
import static fr.gouv.etalab.mastodon.activities.BaseMainActivity.mPageReferenceMap; import static fr.gouv.etalab.mastodon.activities.BaseMainActivity.mPageReferenceMap;
import static fr.gouv.etalab.mastodon.activities.BaseMainActivity.social; import static fr.gouv.etalab.mastodon.activities.BaseMainActivity.social;
@ -1535,6 +1536,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_content_container.setVisibility(View.VISIBLE); holder.status_content_container.setVisibility(View.VISIBLE);
} }
} }
if( fullAttachement) {
RelativeLayout.LayoutParams rel_btn = new RelativeLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
holder.status_show_more.setLayoutParams(rel_btn);
}
if (status.getReblog() == null) { if (status.getReblog() == null) {
if (status.getMedia_attachments().size() < 1) { if (status.getMedia_attachments().size() < 1) {
@ -1545,7 +1551,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
//If medias are loaded without any conditions or if device is on wifi //If medias are loaded without any conditions or if device is on wifi
if(behaviorWithAttachments != Helper.ATTACHMENT_ASK ) { if(behaviorWithAttachments != Helper.ATTACHMENT_ASK ) {
if (expand_media || !status.isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) { if (expand_media || !status.isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) {
loadAttachments(status, holder); loadAttachments(status, holder, false);
holder.status_show_more.setVisibility(View.GONE); holder.status_show_more.setVisibility(View.GONE);
status.setAttachmentShown(true); status.setAttachmentShown(true);
} else { } else {
@ -1558,8 +1564,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_horizontal_document_container.setVisibility(View.GONE); holder.status_horizontal_document_container.setVisibility(View.GONE);
else else
holder.status_document_container.setVisibility(View.GONE); holder.status_document_container.setVisibility(View.GONE);
loadAttachments(status, holder, true);
} else { } else {
loadAttachments(status, holder); loadAttachments(status, holder, false);
} }
} }
}else { }else {
@ -1572,8 +1579,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_horizontal_document_container.setVisibility(View.GONE); holder.status_horizontal_document_container.setVisibility(View.GONE);
else else
holder.status_document_container.setVisibility(View.GONE); holder.status_document_container.setVisibility(View.GONE);
loadAttachments(status, holder, true);
} else { } else {
loadAttachments(status, holder); loadAttachments(status, holder, false);
} }
} }
} }
@ -1589,7 +1597,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if(behaviorWithAttachments != Helper.ATTACHMENT_ASK ) { if(behaviorWithAttachments != Helper.ATTACHMENT_ASK ) {
//If medias are loaded without any conditions or if device is on wifi //If medias are loaded without any conditions or if device is on wifi
if (expand_media || !status.getReblog().isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) { if (expand_media || !status.getReblog().isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) {
loadAttachments(status.getReblog(), holder); loadAttachments(status.getReblog(), holder, false);
holder.status_show_more.setVisibility(View.GONE); holder.status_show_more.setVisibility(View.GONE);
status.setAttachmentShown(true); status.setAttachmentShown(true);
} else { } else {
@ -1602,8 +1610,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_horizontal_document_container.setVisibility(View.GONE); holder.status_horizontal_document_container.setVisibility(View.GONE);
else else
holder.status_document_container.setVisibility(View.GONE); holder.status_document_container.setVisibility(View.GONE);
loadAttachments(status.getReblog(), holder, true);
} else { } else {
loadAttachments(status.getReblog(), holder); loadAttachments(status.getReblog(), holder, false);
} }
} }
}else{ }else{
@ -1616,8 +1625,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_horizontal_document_container.setVisibility(View.GONE); holder.status_horizontal_document_container.setVisibility(View.GONE);
else else
holder.status_document_container.setVisibility(View.GONE); holder.status_document_container.setVisibility(View.GONE);
loadAttachments(status.getReblog(), holder, true);
} else { } else {
loadAttachments(status.getReblog(), holder); loadAttachments(status.getReblog(), holder, false);
} }
} }
} }
@ -2723,7 +2733,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
private void loadAttachments(final Status status, final ViewHolder holder){ private void loadAttachments(final Status status, final ViewHolder holder, boolean blur){
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean fullAttachement = sharedpreferences.getBoolean(Helper.SET_FULL_PREVIEW, false); boolean fullAttachement = sharedpreferences.getBoolean(Helper.SET_FULL_PREVIEW, false);
List<Attachment> attachments = status.getMedia_attachments(); List<Attachment> attachments = status.getMedia_attachments();
@ -2897,36 +2907,71 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if( fullAttachement){ if( fullAttachement){
imageView.setImageBitmap(null); imageView.setImageBitmap(null);
if( !url.trim().contains("missing.png") && !((Activity)context).isFinishing() ) if( !url.trim().contains("missing.png") && !((Activity)context).isFinishing() ) {
Glide.with(imageView.getContext()) if( !blur) {
.asBitmap() Glide.with(imageView.getContext())
.load(url) .asBitmap()
.thumbnail(0.1f) .load(url)
.apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) .thumbnail(0.1f)
.into(new SimpleTarget<Bitmap>() { .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10)))
@Override .into(new SimpleTarget<Bitmap>() {
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) { @Override
DrawableTransitionOptions.withCrossFade(); public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
int width = resource.getWidth(); DrawableTransitionOptions.withCrossFade();
int height = resource.getHeight(); int width = resource.getWidth();
int height = resource.getHeight();
if( height < Helper.convertDpToPixel(200, context)){ if (height < Helper.convertDpToPixel(200, context)) {
double ratio = ((double)Helper.convertDpToPixel(200, context) / (double)height); double ratio = ((double) Helper.convertDpToPixel(200, context) / (double) height);
width = (int)(ratio * width); width = (int) (ratio * width);
height = (int) Helper.convertDpToPixel(200, context); height = (int) Helper.convertDpToPixel(200, context);
resource = Bitmap.createScaledBitmap(resource, width, height, false); resource = Bitmap.createScaledBitmap(resource, width, height, false);
}
imageView.setImageBitmap(resource);
} }
imageView.setImageBitmap(resource); });
} }else{
}); Glide.with(imageView.getContext())
.asBitmap()
.load(url)
.thumbnail(0.1f)
.apply(new RequestOptions().transforms(new BlurTransformation(80), new RoundedCorners(10)))
.into(new SimpleTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
DrawableTransitionOptions.withCrossFade();
int width = resource.getWidth();
int height = resource.getHeight();
if (height < Helper.convertDpToPixel(200, context)) {
double ratio = ((double) Helper.convertDpToPixel(200, context) / (double) height);
width = (int) (ratio * width);
height = (int) Helper.convertDpToPixel(200, context);
resource = Bitmap.createScaledBitmap(resource, width, height, false);
}
imageView.setImageBitmap(resource);
}
});
}
}
}else { }else {
if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) {
Glide.with(imageView.getContext()) if( !blur) {
.load(url) Glide.with(imageView.getContext())
.thumbnail(0.1f) .load(url)
.apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) .thumbnail(0.1f)
.transition(DrawableTransitionOptions.withCrossFade()) .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10)))
.into(imageView); .transition(DrawableTransitionOptions.withCrossFade())
.into(imageView);
}else{
Glide.with(imageView.getContext())
.load(url)
.thumbnail(0.1f)
.apply(new RequestOptions().transforms(new BlurTransformation(80), new RoundedCorners(10)))
.transition(DrawableTransitionOptions.withCrossFade())
.into(imageView);
}
}
} }
final int finalPosition = position; final int finalPosition = position;
if( attachment.getDescription() != null && !attachment.getDescription().equals("null")) if( attachment.getDescription() != null && !attachment.getDescription().equals("null"))

5
app/src/main/res/layout/drawer_status.xml
View File

@ -419,6 +419,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
> >
<RelativeLayout <RelativeLayout
android:id="@+id/status_horizontal_document_container" android:id="@+id/status_horizontal_document_container"
android:visibility="gone" android:visibility="gone"
@ -671,8 +672,8 @@
android:visibility="gone" android:visibility="gone"
android:id="@+id/status_show_more" android:id="@+id/status_show_more"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="200dp"
android:gravity="center"> android:layout_centerInParent="true">
<TextView <TextView
android:id="@+id/show_more_content" android:id="@+id/show_more_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"