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

Improves spacing in toots.

This commit is contained in:
tom79 2017-09-02 16:33:30 +02:00
parent 95d10b052d
commit 6c97bf876c
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -328,9 +328,9 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
if( description.length() > 200 )
description = description.substring(0,199) + "…";
if( title != null)
sharedContent = title + "\r\n\r\n\r\n" + description + "\r\n\r\n\r\n" + sharedContentIni;
sharedContent = title + "\n\n" + description + "\n\n" + sharedContentIni;
else
sharedContent = description + "\r\n\r\n\r\n" + sharedContentIni;
sharedContent = description + "\n\n" + sharedContentIni;
toot_content.setText(sharedContent);
toot_space_left.setText(String.valueOf(toot_content.length()));
toot_content.setSelection(toot_content.getText().length());

7
app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
View File

@ -293,8 +293,13 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
}else{
holder.notification_account_username.setCompoundDrawables( null, null, null, null);
}
String content = status.getContent();
content = content.replaceAll("</p>","<br/><br/>");
content = content.replaceAll("<p>","");
if( content.endsWith("<br/><br/>") )
content = content.substring(0,content.length() -10);
SpannableString spannableString = Helper.clickableElements(context, status.getContent(),
SpannableString spannableString = Helper.clickableElements(context, content,
status.getReblog() != null?status.getReblog().getMentions():status.getMentions(), true);
holder.notification_status_content.setText(spannableString, TextView.BufferType.SPANNABLE);
holder.notification_status_content.setMovementMethod(null);

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

@ -572,10 +572,10 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
});
holder.status_content_translated.setMovementMethod(LinkMovementMethod.getInstance());
}
content = content.replaceAll("</p>","<br/>");
content = content.replaceAll("</p>","<br/><br/>");
content = content.replaceAll("<p>","");
if( content.endsWith("<br/>") )
content = content.substring(0,content.length() -5);
if( content.endsWith("<br/><br/>") )
content = content.substring(0,content.length() -10);
final SpannableString spannableString = Helper.clickableElements(context,content,
status.getReblog() != null?status.getReblog().getMentions():status.getMentions(), true);
holder.status_content.setText(spannableString, TextView.BufferType.SPANNABLE);