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

UI Improvements - Fix issue #543 & issue #544

This commit is contained in:
stom79 2018-11-01 09:19:58 +01:00
parent 72d50837df
commit 249e74fd51
4 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,9 +617,13 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
});
}
if( status.getContentSpan().toString().equals("") || status.getContentSpan().toString().length() == 0){
holder.status_content_container.setVisibility(View.GONE);
}else {
holder.status_content_container.setVisibility(View.VISIBLE);
}
holder.status_content.setText(status.getContentSpan(), TextView.BufferType.SPANNABLE);
holder.status_spoiler.setText(status.getContentSpanCW(), TextView.BufferType.SPANNABLE);
holder.status_content.setMovementMethod(LinkMovementMethod.getInstance());
@ -686,7 +690,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_account_displayname.setText(context.getResources().getString(R.string.reblog_by, status.getAccount().getUsername()));
}else {
ppurl = status.getAccount().getAvatar();
holder.status_account_displayname.setText(status.getAccount().getdisplayNameSpan(), TextView.BufferType.SPANNABLE);
if( status.getAccount().getdisplayNameSpan() == null || status.getAccount().getdisplayNameSpan().toString().trim().length() == 0)
holder.status_account_displayname.setText(status.getAccount().getUsername().replace("@",""), TextView.BufferType.SPANNABLE);
else
holder.status_account_displayname.setText(status.getAccount().getdisplayNameSpan(), TextView.BufferType.SPANNABLE);
}
//-------- END -> Displays name & emoji in toot header

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

@ -206,7 +206,7 @@
android:layout_height="wrap_content">
<fr.gouv.etalab.mastodon.helper.CustomTextView
android:id="@+id/status_spoiler"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textIsSelectable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -217,10 +217,6 @@
android:drawableStart="@drawable/ic_remove_red_eye"
android:gravity="center_vertical"
android:drawablePadding="5dp"
android:paddingLeft="10dp"
android:paddingStart="10dp"
android:paddingRight="10dp"
android:paddingEnd="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:maxLines="1"
@ -237,7 +233,7 @@
<fr.gouv.etalab.mastodon.helper.CustomTextView
android:id="@+id/status_content"
android:textIsSelectable="true"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
@ -250,13 +246,13 @@
android:maxLines="1"
android:layout_gravity="end"
android:gravity="end"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textStyle="italic"
/>
<LinearLayout
android:id="@+id/status_content_translated_container"
android:visibility="gone"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -278,7 +274,6 @@
<LinearLayout
android:id="@+id/status_cardview"
android:padding="5dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:visibility="gone"
android:background="@drawable/card_border"
@ -340,7 +335,7 @@
<RelativeLayout
android:id="@+id/status_horizontal_document_container"
android:visibility="gone"
android:layout_marginTop="20dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -469,7 +464,7 @@
android:visibility="gone"
android:id="@+id/status_document_container"
android:orientation="horizontal"
android:layout_marginTop="20dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="200dp"
android:baselineAligned="false">
@ -592,10 +587,6 @@
android:drawableStart="@drawable/ic_photo"
android:gravity="center_vertical"
android:drawablePadding="5dp"
android:paddingLeft="10dp"
android:paddingStart="10dp"
android:paddingRight="10dp"
android:paddingEnd="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:maxLines="1"
@ -612,7 +603,7 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/status_mention_spoiler"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
@ -620,7 +611,6 @@
android:id="@+id/status_action_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView

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

@ -459,7 +459,7 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:baselineAligned="false">
<RelativeLayout
android:layout_width="0dp"
@ -600,7 +600,7 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/status_mention_spoiler"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
@ -615,7 +615,7 @@
android:maxLines="1"
android:layout_gravity="end"
android:gravity="end"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:textStyle="italic"
android:textSize="16sp"
android:textColor="?attr/colorAccent"
@ -624,7 +624,6 @@
android:id="@+id/status_action_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView

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

@ -111,7 +111,7 @@
android:layout_height="wrap_content">
<fr.gouv.etalab.mastodon.helper.CustomTextView
android:id="@+id/status_spoiler"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textIsSelectable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -138,7 +138,7 @@
<fr.gouv.etalab.mastodon.helper.CustomTextView
android:id="@+id/status_content"
android:textIsSelectable="true"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
@ -170,7 +170,7 @@
<LinearLayout
android:id="@+id/status_content_translated_container"
android:visibility="gone"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -192,7 +192,6 @@
<LinearLayout
android:id="@+id/status_cardview"
android:padding="5dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:visibility="gone"
android:background="@drawable/card_border"
@ -243,7 +242,7 @@
android:id="@+id/status_cardview_video"
android:layout_width="300dp"
android:layout_height="220dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
>
<WebView
android:id="@+id/status_cardview_webview"
@ -253,7 +252,7 @@
<RelativeLayout
android:id="@+id/status_horizontal_document_container"
android:visibility="gone"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -380,7 +379,7 @@
</RelativeLayout>
<LinearLayout
android:visibility="gone"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:id="@+id/status_document_container"
android:orientation="horizontal"
android:layout_width="match_parent"
@ -521,12 +520,12 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/status_mention_spoiler"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:id="@+id/status_toot_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -540,7 +539,7 @@
android:maxLines="1"
android:layout_gravity="end"
android:gravity="end"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textStyle="italic"
android:textSize="16sp"
android:textColor="?attr/colorAccent"
@ -549,7 +548,6 @@
android:id="@+id/status_action_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView