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

Fix for not cropped media

This commit is contained in:
tom79 2019-05-07 18:10:49 +02:00
parent ec28de29ec
commit e1228f15c8
5 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1536,11 +1536,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
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.getMedia_attachments().size() < 1) {
@ -2737,7 +2732,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean fullAttachement = sharedpreferences.getBoolean(Helper.SET_FULL_PREVIEW, false);
List<Attachment> attachments = status.getMedia_attachments();
if( !blur)
holder.status_show_more.setVisibility(View.GONE);
else
holder.status_show_more.setVisibility(View.VISIBLE);
if( attachments != null && attachments.size() > 0){
int i = 0;
holder.horizontal_second_image.setVisibility(View.VISIBLE);
@ -2935,7 +2933,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
.asBitmap()
.load(url)
.thumbnail(0.1f)
.apply(new RequestOptions().transforms(new BlurTransformation(80), new RoundedCorners(10)))
.apply(new RequestOptions().transforms(new BlurTransformation(50,3), new RoundedCorners(10)))
.into(new SimpleTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
@ -2967,7 +2965,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
Glide.with(imageView.getContext())
.load(url)
.thumbnail(0.1f)
.apply(new RequestOptions().transforms(new BlurTransformation(80), new RoundedCorners(10)))
.apply(new RequestOptions().transforms(new BlurTransformation(50,3), new RoundedCorners(10)))
.transition(DrawableTransitionOptions.withCrossFade())
.into(imageView);
}
@ -3004,11 +3002,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
position++;
}
}else{
holder.status_horizontal_document_container.setVisibility(View.GONE);
holder.status_document_container.setVisibility(View.GONE);
holder.status_horizontal_document_container.setVisibility(View.GONE);
holder.status_document_container.setVisibility(View.GONE);
holder.status_show_more.setVisibility(View.GONE);
}
holder.status_show_more.setVisibility(View.GONE);
}

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

@ -672,12 +672,14 @@
android:visibility="gone"
android:id="@+id/status_show_more"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_height="match_parent"
android:layout_centerInParent="true">
<TextView
android:textSize="20sp"
android:gravity="center"
android:id="@+id/show_more_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
</RelativeLayout>

10
app/src/main/res/layout/drawer_status_compact.xml
View File

@ -633,12 +633,14 @@
android:visibility="gone"
android:id="@+id/status_show_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
android:layout_height="match_parent"
android:layout_centerInParent="true">
<TextView
android:textSize="20sp"
android:gravity="center"
android:id="@+id/show_more_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

10
app/src/main/res/layout/drawer_status_console.xml
View File

@ -633,12 +633,14 @@
android:visibility="gone"
android:id="@+id/status_show_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
android:layout_height="match_parent"
android:layout_centerInParent="true">
<TextView
android:textSize="20sp"
android:gravity="center"
android:id="@+id/show_more_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

10
app/src/main/res/layout/drawer_status_focused.xml
View File

@ -557,12 +557,14 @@
android:visibility="gone"
android:id="@+id/status_show_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
android:layout_height="match_parent"
android:layout_centerInParent="true">
<TextView
android:textSize="20sp"
android:gravity="center"
android:id="@+id/show_more_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>