From 9c01f7a52282523e11d70af2119deccadc1e4191 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Sat, 18 Mar 2023 20:09:07 +0100
Subject: [PATCH] refactor(account-switcher-sheet): remove duplicated code

---
 .../android/ui/AccountSwitcherSheet.java            | 13 +++----------
 .../src/main/res/layout/item_account_switcher.xml   |  3 +++
 2 files changed, 6 insertions(+), 10 deletions(-)

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 49ff38b21..6a7c41ff7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
@@ -49,9 +49,9 @@ import me.grishka.appkit.views.UsableRecyclerView;
 
 public class AccountSwitcherSheet extends BottomSheet{
 	private final Activity activity;
-	private UsableRecyclerView list;
-	private List<WrappedAccount> accounts;
-	private ListImageLoaderWrapper imgLoader;
+	private final UsableRecyclerView list;
+	private final List<WrappedAccount> accounts;
+	private final ListImageLoaderWrapper imgLoader;
 	private final boolean logOutEnabled;
 	private final Consumer<AccountSession> onClick;
 
@@ -76,11 +76,8 @@ public class AccountSwitcherSheet extends BottomSheet{
 
 		if(addAccountEnabled){
 			AccountViewHolder holder = new AccountViewHolder();
-			holder.more.setVisibility(View.GONE);
-			holder.currentIcon.setVisibility(View.GONE);
 			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)));
 			adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, () -> {
@@ -91,12 +88,8 @@ public class AccountSwitcherSheet extends BottomSheet{
 
 		if(showOpenURL) {
 			AccountViewHolder holder = new AccountViewHolder();
-			holder.more.setVisibility(View.GONE);
-			holder.currentIcon.setVisibility(View.GONE);
-			holder.display_name.setVisibility(View.VISIBLE);
 			holder.display_add_account.setVisibility(View.VISIBLE);
 			holder.display_add_account.setText(R.string.mo_share_open_url);
-			holder.avatar.setScaleType(ImageView.ScaleType.CENTER);
 			holder.avatar.setImageResource(R.drawable.ic_fluent_open_24_regular);
 			holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
 			adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, () -> {
diff --git a/mastodon/src/main/res/layout/item_account_switcher.xml b/mastodon/src/main/res/layout/item_account_switcher.xml
index efb569b38..ba8f60aac 100644
--- a/mastodon/src/main/res/layout/item_account_switcher.xml
+++ b/mastodon/src/main/res/layout/item_account_switcher.xml
@@ -9,6 +9,7 @@
 	
 	<ImageView
 		android:id="@+id/avatar"
+		android:scaleType="center"
 		android:layout_width="36dp"
 		android:layout_height="36dp"
 		android:importantForAccessibility="no"/>
@@ -63,6 +64,7 @@
 		android:id="@+id/current"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
+		android:visibility="gone"
 		android:background="@drawable/ic_fluent_checkmark_24_filled"
 		android:backgroundTint="?android:textColorSecondary"
 		android:contentDescription="@string/current_account"/>
@@ -71,6 +73,7 @@
 		android:id="@+id/more"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
+		android:visibility="gone"
 		android:src="@drawable/ic_fluent_more_vertical_24_regular"
 		android:tint="?android:textColorSecondary"
 		android:contentDescription="@string/more_options"