Stop inbox snippet from overflowing the thumbnail

Also ensure the thumbnails are placed correctly in the archive view.

Closes #4954
// FREEBIE
This commit is contained in:
haffenloher 2015-12-23 23:57:03 +01:00 committed by Moxie Marlinspike
parent bcf95e50aa
commit 6ad2c4bb29

View File

@ -178,6 +178,7 @@ public class ConversationListItem extends RelativeLayout
LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectView.getLayoutParams(); LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectView.getLayoutParams();
subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.thumbnail); subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.thumbnail);
subjectParams.addRule(RelativeLayout.START_OF, R.id.thumbnail);
this.subjectView.setLayoutParams(subjectParams); this.subjectView.setLayoutParams(subjectParams);
this.post(new ThumbnailPositioner(thumbnailView, archivedView, deliveryStatusIndicator, dateView)); this.post(new ThumbnailPositioner(thumbnailView, archivedView, deliveryStatusIndicator, dateView));
} else { } else {
@ -185,6 +186,7 @@ public class ConversationListItem extends RelativeLayout
LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectView.getLayoutParams(); LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectView.getLayoutParams();
subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.delivery_status); subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.delivery_status);
subjectParams.addRule(RelativeLayout.START_OF, R.id.delivery_status);
this.subjectView.setLayoutParams(subjectParams); this.subjectView.setLayoutParams(subjectParams);
} }
} }
@ -255,8 +257,10 @@ public class ConversationListItem extends RelativeLayout
(archivedView.getWidth() + deliveryStatusView.getWidth()) > dateView.getWidth()) (archivedView.getWidth() + deliveryStatusView.getWidth()) > dateView.getWidth())
{ {
thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.delivery_status); thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.delivery_status);
thumbnailParams.addRule(RelativeLayout.START_OF, R.id.delivery_status);
} else { } else {
thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.date); thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.date);
thumbnailParams.addRule(RelativeLayout.START_OF, R.id.date);
} }
thumbnailView.setLayoutParams(thumbnailParams); thumbnailView.setLayoutParams(thumbnailParams);