diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index b01d7f87c..13befb065 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -151,6 +151,10 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_prev2 = (ImageView) convertView.findViewById(R.id.status_prev2); holder.status_prev3 = (ImageView) convertView.findViewById(R.id.status_prev3); holder.status_prev4 = (ImageView) convertView.findViewById(R.id.status_prev4); + holder.status_prev1_play = (ImageView) convertView.findViewById(R.id.status_prev1_play); + holder.status_prev2_play = (ImageView) convertView.findViewById(R.id.status_prev2_play); + holder.status_prev3_play = (ImageView) convertView.findViewById(R.id.status_prev3_play); + holder.status_prev4_play = (ImageView) convertView.findViewById(R.id.status_prev4_play); holder.status_container2 = (LinearLayout) convertView.findViewById(R.id.status_container2); holder.status_container3 = (LinearLayout) convertView.findViewById(R.id.status_container3); holder.status_reply = (ImageView) convertView.findViewById(R.id.status_reply); @@ -465,14 +469,31 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf } for(final Attachment attachment: attachments){ ImageView imageView; - if( i == 0) - imageView = holder.status_prev1; - else if( i == 1) - imageView = holder.status_prev2; - else if(i == 2) - imageView = holder.status_prev3; - else - imageView = holder.status_prev4; + if( i == 0) { + imageView = holder.status_prev1; + if( attachment.getType().equals("image")) + holder.status_prev1_play.setVisibility(View.GONE); + else + holder.status_prev1_play.setVisibility(View.VISIBLE); + }else if( i == 1) { + imageView = holder.status_prev2; + if( attachment.getType().equals("image")) + holder.status_prev2_play.setVisibility(View.GONE); + else + holder.status_prev2_play.setVisibility(View.VISIBLE); + }else if(i == 2) { + imageView = holder.status_prev3; + if( attachment.getType().equals("image")) + holder.status_prev3_play.setVisibility(View.GONE); + else + holder.status_prev3_play.setVisibility(View.VISIBLE); + }else { + imageView = holder.status_prev4; + if( attachment.getType().equals("image")) + holder.status_prev4_play.setVisibility(View.GONE); + else + holder.status_prev4_play.setVisibility(View.VISIBLE); + } String url = attachment.getPreview_url(); if( url == null || url.trim().equals("")) url = attachment.getUrl(); @@ -644,6 +665,10 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf ImageView status_prev2; ImageView status_prev3; ImageView status_prev4; + ImageView status_prev1_play; + ImageView status_prev2_play; + ImageView status_prev3_play; + ImageView status_prev4_play; ImageView status_reply; ImageView status_privacy; LinearLayout status_container2; diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow.png b/app/src/main/res/drawable-hdpi/ic_play_arrow.png new file mode 100644 index 000000000..9211546a0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_play_arrow.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_play_arrow.png b/app/src/main/res/drawable-ldpi/ic_play_arrow.png new file mode 100644 index 000000000..15d2eb3ba Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_play_arrow.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow.png b/app/src/main/res/drawable-mdpi/ic_play_arrow.png new file mode 100644 index 000000000..e4ae4b23c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_play_arrow.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow.png new file mode 100644 index 000000000..590d072fc Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_play_arrow.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow.png new file mode 100644 index 000000000..8a54ba21a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_play_arrow.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow.png new file mode 100644 index 000000000..73db57c03 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow.png differ diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index b7b5a031d..0502badad 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -29,7 +29,8 @@ + android:orientation="horizontal" + android:baselineAligned="false"> - + + > + + + - + android:layout_weight="1"> + + + + - - + + android:layout_height="wrap_content"> + + + + + + + +