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

Fix regex

This commit is contained in:
tom79 2019-08-24 14:42:51 +02:00
parent 47f9035f87
commit a716225212
6 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/app/fedilab/android/client/Entities/Status.java
View File

@ -652,6 +652,7 @@ public class Status implements Parcelable{
}
status.setImageURL(imgs);
content = content.replaceAll("(<\\s?p\\s?>)&gt;(((?!(<\\/p>)|(<br)).){5,})(<\\s?\\/p\\s?><\\s?p\\s?>|<\\s?br\\s?\\/?>)","<blockquote>$2</blockquote><p>");
content = content.replaceAll("^<\\s?p\\s?>(.*)<\\s?\\/p\\s?>$","$1");
spannableStringContent = new SpannableString(content);
final int[] j = {0};
if( status.getImageURL() != null && status.getImageURL().size() > 0){

1
app/src/main/res/layout/drawer_notification.xml
View File

@ -137,7 +137,6 @@
android:orientation="vertical">
<app.fedilab.android.helper.CustomTextView
android:id="@+id/notification_status_content"
android:layout_marginBottom="-20dp"
android:textIsSelectable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

1
app/src/main/res/layout/drawer_status.xml
View File

@ -336,7 +336,6 @@
<app.fedilab.android.helper.CustomTextView
android:id="@+id/status_content"
android:layout_marginBottom="-20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textIsSelectable="true" />

1
app/src/main/res/layout/drawer_status_compact.xml
View File

@ -248,7 +248,6 @@
<app.fedilab.android.helper.CustomTextView
android:id="@+id/status_content"
android:textIsSelectable="true"
android:layout_marginBottom="-20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button

1
app/src/main/res/layout/drawer_status_console.xml
View File

@ -244,7 +244,6 @@
<app.fedilab.android.helper.CustomTextView
android:id="@+id/status_content"
android:textIsSelectable="true"
android:layout_marginBottom="-20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button

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

@ -177,7 +177,6 @@
<app.fedilab.android.helper.CustomTextView
android:id="@+id/status_content"
android:textIsSelectable="true"
android:layout_marginBottom="-20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button