diff options
| author | Thomas <tschneider.ac@gmail.com> | 2022-12-23 18:32:56 +0100 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2022-12-23 18:32:56 +0100 |
| commit | 45dad375adca55dcd02c1735b9a9fbce6c206bda (patch) | |
| tree | b6056898e30ed56d457fcdb84cabec2c1a454e59 | |
| parent | c9479aee203062bd7a988c2e6b108dddc8e4c91e (diff) | |
Fix #671 - Improve toggle for blocked accounts
| -rw-r--r-- | app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_account.xml | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java index 031030ba0..3ccea89d7 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java @@ -142,14 +142,18 @@ public class AccountAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder if (account.relationShip.blocking) { - accountViewHolder.binding.block.setChecked(true); + accountViewHolder.binding.block.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(context, R.attr.colorError))); + accountViewHolder.binding.block.setIconResource(R.drawable.ic_baseline_lock_open_24); + accountViewHolder.binding.block.setContentDescription(context.getString(R.string.action_unblock)); accountViewHolder.binding.block.setOnClickListener(v -> accountsVM.unblock(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe((LifecycleOwner) context, relationShip -> { account.relationShip = relationShip; adapter.notifyItemChanged(position); })); } else { - accountViewHolder.binding.block.setChecked(false); + accountViewHolder.binding.block.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(context, R.attr.colorPrimary))); + accountViewHolder.binding.block.setIconResource(R.drawable.ic_baseline_block_24); + accountViewHolder.binding.block.setContentDescription(context.getString(R.string.more_action_2)); accountViewHolder.binding.block.setOnClickListener(v -> accountsVM.block(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id) .observe((LifecycleOwner) context, relationShip -> { account.relationShip = relationShip; diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml index 61caa37a5..e2d33830f 100644 --- a/app/src/main/res/layout/drawer_account.xml +++ b/app/src/main/res/layout/drawer_account.xml @@ -143,15 +143,15 @@ <com.google.android.material.button.MaterialButton android:id="@+id/block" - style="@style/Widget.Material3.Button.OutlinedButton" + style="@style/Widget.Material3.Button" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginStart="24dp" - android:layout_marginTop="6dp" + android:layout_marginTop="4dp" android:padding="0dp" + app:icon="@drawable/ic_baseline_block_24" app:iconGravity="textStart" app:iconPadding="0dp" - app:icon="@drawable/ic_baseline_block_24" app:layout_constraintStart_toEndOf="@id/mute_group" app:layout_constraintTop_toBottomOf="@id/bio" /> |