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

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

Browse Source 
This reverts commit 9c01f7a522.
This commit is contained in:
LucasGGamerM
2023-03-18 17:03:15 -03:00
parent 98c193ac51
commit 8ccb505165
2 changed files with 10 additions and 6 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{
private final Activity activity;
private final UsableRecyclerView list;
private final List<WrappedAccount> accounts;
private final ListImageLoaderWrapper imgLoader;
private UsableRecyclerView list;
private List<WrappedAccount> accounts;
private ListImageLoaderWrapper imgLoader;
private final boolean logOutEnabled;
private final Consumer<AccountSession> onClick;
@@ -76,8 +76,11 @@ 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, () -> {
@@ -88,8 +91,12 @@ 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, () -> {

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

@@ -9,7 +9,6 @@
<ImageView
android:id="@+id/avatar"
android:scaleType="center"
android:layout_width="36dp"
android:layout_height="36dp"
android:importantForAccessibility="no"/>
@@ -64,7 +63,6 @@
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"/>
@@ -73,7 +71,6 @@
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"