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

Adds instance name after some usernames

This commit is contained in:
tom79 2017-10-10 18:39:40 +02:00
parent 47062a4bff
commit e09dbbe307
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
View File

@ -511,7 +511,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
}
if( account != null){
account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name(), true));
account_un.setText(String.format("@%s", account.getUsername()));
account_un.setText(String.format("@%s", account.getAcct()));
SpannableString spannableString = Helper.clickableElementsDescription(ShowAccountActivity.this, account.getNote());
account_note.setText(spannableString, TextView.BufferType.SPANNABLE);
account_note.setMovementMethod(LinkMovementMethod.getInstance());

2
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -1021,7 +1021,7 @@ public class Helper {
activity.startActivity(myIntent);
activity.finish(); //User is logged out to get a new token
}else {
username.setText(String.format("@%s",account.getUsername()));
username.setText(String.format("@%s",account.getUsername() + "@" + account.getInstance()));
displayedName.setText(account.getDisplay_name());
String url = account.getAvatar();
if( url.startsWith("/") ){

11
app/src/main/res/layout/nav_header_main.xml
View File

@ -66,8 +66,8 @@
tools:ignore="UseCompoundDrawables">
<TextView
android:gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:id="@+id/displayedName"
android:layout_width="0dp"
android:layout_weight="1"
@ -85,11 +85,12 @@
tools:ignore="ContentDescription" />
</LinearLayout>
<TextView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:id="@+id/username"
android:layout_width="wrap_content"
android:textSize="14sp"
android:textSize="12sp"
android:maxLines="1"
android:layout_height="wrap_content"
/>
</LinearLayout>