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

Fix issue #563 - remove spacing due to missing buttons & card no longer visible when opening details

This commit is contained in:
stom79 2018-11-15 07:29:33 +01:00
parent ed09d42742
commit db499344c7
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1217,7 +1217,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
Card card = status.getReblog()!= null?status.getReblog().getCard():status.getCard();
if( card != null){
holder.status_cardview_content.setText(card.getDescription());
holder.status_cardview_title.setText(card.getTitle());
holder.status_cardview_url.setText(card.getUrl());
@ -1230,7 +1229,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
.into(holder.status_cardview_image);
}else
holder.status_cardview_image.setVisibility(View.GONE);
if( !card.getType().equals("video") && display_card) {
if( !card.getType().equals("video") && ( display_card || position == conversationPosition)) {
holder.status_cardview.setVisibility(View.VISIBLE);
holder.status_cardview_video.setVisibility(View.GONE);
holder.status_cardview.setOnClickListener(new View.OnClickListener() {
@ -1239,7 +1238,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
Helper.openBrowser(context, card.getUrl());
}
});
}else if(card.getType().equals("video") && display_video_preview){
}else if(card.getType().equals("video") && ( display_video_preview || position == conversationPosition)){
Glide.with(holder.status_cardview_image.getContext())
.load(card.getImage())
.apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10)))

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

@ -168,24 +168,27 @@
android:orientation="horizontal"
>
<ImageButton
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:id="@+id/status_translate"
android:gravity="center"
style="?attr/borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_translate"
android:layout_marginTop="10dp"
android:layout_gravity="center_horizontal"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/ic_translate"
style="@style/Base.Widget.AppCompat.Button.Colored"
/>
<ImageButton
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:id="@+id/status_bookmark"
android:gravity="center"
style="?attr/borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_bookmark_border"
android:layout_marginTop="10dp"
android:layout_gravity="center_horizontal"
android:tint="@android:color/white"
style="@style/Base.Widget.AppCompat.Button.Colored"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/ic_bookmark_border"
android:layout_marginTop="5dp"
/>
</LinearLayout>
<LinearLayout