owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(account-switcher-sheet): remove duplicated code

Browse Source
This commit is contained in:
FineFindus
2023-03-18 20:09:07 +01:00
parent f3c9f52d37
commit 9c01f7a522
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
View File

@@ -49,9 +49,9 @@ import me.grishka.appkit.views.UsableRecyclerView;
public class AccountSwitcherSheet extends BottomSheet{ public class AccountSwitcherSheet extends BottomSheet{
private final Activity activity; private final Activity activity;
private UsableRecyclerView list; private final UsableRecyclerView list;
private List<WrappedAccount> accounts; private final List<WrappedAccount> accounts;
private ListImageLoaderWrapper imgLoader; private final ListImageLoaderWrapper imgLoader;
private final boolean logOutEnabled; private final boolean logOutEnabled;
private final Consumer<AccountSession> onClick; private final Consumer<AccountSession> onClick;
@@ -76,11 +76,8 @@ public class AccountSwitcherSheet extends BottomSheet{
if(addAccountEnabled){ if(addAccountEnabled){
AccountViewHolder holder = new AccountViewHolder(); AccountViewHolder holder = new AccountViewHolder();
holder.more.setVisibility(View.GONE);
holder.currentIcon.setVisibility(View.GONE);
holder.display_name.setVisibility(View.GONE); holder.display_name.setVisibility(View.GONE);
holder.display_add_account.setVisibility(View.VISIBLE); 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.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary))); holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, () -> { adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, () -> {
@@ -91,12 +88,8 @@ public class AccountSwitcherSheet extends BottomSheet{
if(showOpenURL) { if(showOpenURL) {
AccountViewHolder holder = new AccountViewHolder(); 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.setVisibility(View.VISIBLE);
holder.display_add_account.setText(R.string.mo_share_open_url); 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.setImageResource(R.drawable.ic_fluent_open_24_regular);
holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary))); holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, () -> { adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, () -> {

3
mastodon/src/main/res/layout/item_account_switcher.xml
View File

@@ -9,6 +9,7 @@
<ImageView <ImageView
android:id="@+id/avatar" android:id="@+id/avatar"
android:scaleType="center"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
@@ -63,6 +64,7 @@
android:id="@+id/current" android:id="@+id/current"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:visibility="gone"
android:background="@drawable/ic_fluent_checkmark_24_filled" android:background="@drawable/ic_fluent_checkmark_24_filled"
android:backgroundTint="?android:textColorSecondary" android:backgroundTint="?android:textColorSecondary"
android:contentDescription="@string/current_account"/> android:contentDescription="@string/current_account"/>
@@ -71,6 +73,7 @@
android:id="@+id/more" android:id="@+id/more"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:visibility="gone"
android:src="@drawable/ic_fluent_more_vertical_24_regular" android:src="@drawable/ic_fluent_more_vertical_24_regular"
android:tint="?android:textColorSecondary" android:tint="?android:textColorSecondary"
android:contentDescription="@string/more_options" android:contentDescription="@string/more_options"