mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-22 16:50:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Support pronouns

Browse source
This commit is contained in:
Thomas 2024-01-23 19:03:41 +01:00
parent 7ab24d900b
commit 394d72bd01
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java
View file

@ -88,6 +88,7 @@ public class Account implements Serializable {
@SerializedName("role") @SerializedName("role")
public Role role; public Role role;
public transient RelationShip relationShip; public transient RelationShip relationShip;
public transient String pronouns = null;
public synchronized Spannable getSpanDisplayName(Context context, WeakReference<View> viewWeakReference) { public synchronized Spannable getSpanDisplayName(Context context, WeakReference<View> viewWeakReference) {

14
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountsSearchAdapter.java
View file

@ -30,6 +30,7 @@ import java.util.List;
import app.fedilab.android.databinding.DrawerAccountSearchBinding; import app.fedilab.android.databinding.DrawerAccountSearchBinding;
import app.fedilab.android.mastodon.client.entities.api.Account; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.mastodon.client.entities.api.Field;
import app.fedilab.android.mastodon.helper.MastodonHelper; import app.fedilab.android.mastodon.helper.MastodonHelper;
@ -116,6 +117,19 @@ public class AccountsSearchAdapter extends ArrayAdapter<Account> implements Filt
holder.binding.accountUn.setText(String.format("@%s", account.acct)); holder.binding.accountUn.setText(String.format("@%s", account.acct));
holder.binding.accountDn.setText(account.display_name); holder.binding.accountDn.setText(account.display_name);
holder.binding.accountDn.setVisibility(View.VISIBLE); holder.binding.accountDn.setVisibility(View.VISIBLE);
account.pronouns = null;
for(Field field: account.fields) {
if(field.name.trim().equalsIgnoreCase("pronouns")) {
account.pronouns = field.value;
break;
}
}
if(account.pronouns != null) {
holder.binding.pronouns.setText(account.pronouns);
holder.binding.pronouns.setVisibility(View.VISIBLE);
} else {
holder.binding.pronouns.setVisibility(View.GONE);
}
MastodonHelper.loadPPMastodon(holder.binding.accountPp, account); MastodonHelper.loadPPMastodon(holder.binding.accountPp, account);
return holder.view; return holder.view;
} }

14
app/src/main/res/layouts/mastodon/layout/drawer_account_search.xml
View file

@ -15,6 +15,7 @@
see <http://www.gnu.org/licenses> see <http://www.gnu.org/licenses>
--> -->
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/account_container" android:id="@+id/account_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -27,16 +28,29 @@
android:layout_height="30dp" android:layout_height="30dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="5dp" android:layout_margin="5dp"
tools:src="@tools:sample/avatars"
android:contentDescription="@string/profile_picture" /> android:contentDescription="@string/profile_picture" />
<TextView <TextView
android:id="@+id/account_un" android:id="@+id/account_un"
tools:text="@tools:sample/lorem"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:singleLine="true" /> android:singleLine="true" />
<TextView
android:layout_marginStart="2dp"
android:id="@+id/pronouns"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:visibility="gone"
tools:visibility="visible"
android:textColor="?colorPrimary"
tools:text="He/Him" />
<TextView <TextView
android:id="@+id/account_dn" android:id="@+id/account_dn"
android:layout_width="wrap_content" android:layout_width="wrap_content"