Merge branch 'changes_font' into develop
# Conflicts: # app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
This commit is contained in:
commit
7bf58eead8
Binary file not shown.
|
@ -295,6 +295,8 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
|
||||||
|
|
||||||
SpannableString spannableString = Helper.clickableElements(context, content,
|
SpannableString spannableString = Helper.clickableElements(context, content,
|
||||||
status.getReblog() != null?status.getReblog().getMentions():status.getMentions(), true);
|
status.getReblog() != null?status.getReblog().getMentions():status.getMentions(), true);
|
||||||
|
Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/DroidSans-Regular.ttf");
|
||||||
|
holder.notification_status_content.setTypeface(tf);
|
||||||
holder.notification_status_content.setText(spannableString, TextView.BufferType.SPANNABLE);
|
holder.notification_status_content.setText(spannableString, TextView.BufferType.SPANNABLE);
|
||||||
holder.notification_status_content.setMovementMethod(null);
|
holder.notification_status_content.setMovementMethod(null);
|
||||||
holder.notification_status_content.setMovementMethod(LinkMovementMethod.getInstance());
|
holder.notification_status_content.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
|
@ -302,9 +304,6 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
|
||||||
holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count()));
|
holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count()));
|
||||||
holder.status_date.setText(Helper.dateDiff(context, status.getCreated_at()));
|
holder.status_date.setText(Helper.dateDiff(context, status.getCreated_at()));
|
||||||
|
|
||||||
Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/WorkSans-Regular.ttf");
|
|
||||||
holder.notification_status_content.setTypeface(tf);
|
|
||||||
|
|
||||||
//Adds attachment -> disabled, to enable them uncomment the line below
|
//Adds attachment -> disabled, to enable them uncomment the line below
|
||||||
//loadAttachments(status, holder);
|
//loadAttachments(status, holder);
|
||||||
holder.notification_status_container.setVisibility(View.VISIBLE);
|
holder.notification_status_container.setVisibility(View.VISIBLE);
|
||||||
|
|
|
@ -571,7 +571,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/WorkSans-Regular.ttf");
|
Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/DroidSans-Regular.ttf");
|
||||||
holder.status_content.setTypeface(tf);
|
holder.status_content.setTypeface(tf);
|
||||||
|
|
||||||
//Toot was translated and user asked to see it
|
//Toot was translated and user asked to see it
|
||||||
|
|
Loading…
Reference in New Issue