diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java index e259b9861..f819e8107 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java @@ -8,6 +8,7 @@ import android.graphics.drawable.Animatable; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build; +import android.view.Gravity; import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; @@ -25,6 +26,7 @@ import org.joinmastodon.android.api.session.AccountSession; import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment; import org.joinmastodon.android.ui.utils.UiUtils; +import org.w3c.dom.Text; import java.util.List; import java.util.function.Consumer; @@ -79,7 +81,8 @@ public class AccountSwitcherSheet extends BottomSheet{ AccountViewHolder holder = new AccountViewHolder(); holder.more.setVisibility(View.GONE); holder.currentIcon.setVisibility(View.GONE); - holder.name.setText(R.string.add_account); + holder.display_name.setVisibility(View.GONE); + holder.display_add_account.setVisibility(View.VISIBLE); holder.avatar.setScaleType(ImageView.ScaleType.CENTER); holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled); holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary))); @@ -183,6 +186,8 @@ public class AccountSwitcherSheet extends BottomSheet{ private class AccountViewHolder extends BindableViewHolder implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{ private final TextView name; + private final TextView display_name; + private final TextView display_add_account; private final ImageView avatar; private final ImageButton more; private final View currentIcon; @@ -191,6 +196,8 @@ public class AccountSwitcherSheet extends BottomSheet{ public AccountViewHolder(){ super(activity, R.layout.item_account_switcher, list); name=findViewById(R.id.name); + display_name=findViewById(R.id.display_name); + display_add_account=findViewById(R.id.add_account); avatar=findViewById(R.id.avatar); more=findViewById(R.id.more); currentIcon=findViewById(R.id.current); @@ -210,6 +217,7 @@ public class AccountSwitcherSheet extends BottomSheet{ @SuppressLint("SetTextI18n") @Override public void onBind(AccountSession item){ + display_name.setText(item.self.displayName); name.setText("@"+item.self.username+"@"+item.domain); if(AccountSessionManager.getInstance().getLastActiveAccountID().equals(item.getID())){ more.setVisibility(View.GONE); diff --git a/mastodon/src/main/res/layout/item_account_switcher.xml b/mastodon/src/main/res/layout/item_account_switcher.xml index 1cffbf7af..efb569b38 100644 --- a/mastodon/src/main/res/layout/item_account_switcher.xml +++ b/mastodon/src/main/res/layout/item_account_switcher.xml @@ -2,28 +2,63 @@ + + + + + + + + + +