Commit a55401df authored by Thomas's avatar Thomas
Browse files

Mute from lists

parent d8de0164

app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java

+16 −0
Original line number Diff line number Diff line
@@ -143,6 +143,22 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis 
        if (item.getItemId() == android.R.id.home) {

            onBackPressed();

            return true;

        } else if (item.getItemId() == R.id.action_user_mute_home) {

            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MastodonListActivity.this, Helper.dialogStyle());

            dialogBuilder.setTitle(R.string.put_all_accounts_in_home_muted);

            dialogBuilder.setPositiveButton(R.string.mute_them_all, (dialog, id) -> {

                timelinesVM.getAccountsInList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, mastodonList.id, null, null, 0)

                        .observe(MastodonListActivity.this, accounts -> {

                            if (accounts != null && accounts.size() > 0) {

                                for (Account account : accounts) {

                                    accountsVM.muteHome(MainActivity.currentAccount, account);

                                }

                            }

                        });

                dialog.dismiss();

            });

            dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());

            dialogBuilder.show();

        } else if (item.getItemId() == R.id.action_manage_users) {

            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MastodonListActivity.this, Helper.dialogStyle());

            PopupManageAccountsListBinding popupManageAccountsListBinding = PopupManageAccountsListBinding.inflate(getLayoutInflater());

app/src/main/java/app/fedilab/android/activities/ProfileActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ package app.fedilab.android.activities; 




import static app.fedilab.android.BaseMainActivity.currentAccount;

import static app.fedilab.android.ui.drawer.StatusAdapter.sendAction;



import android.content.BroadcastReceiver;

import android.content.ClipData;
@@ -1020,7 +1019,6 @@ public class ProfileActivity extends BaseActivity { 
                        .observe(ProfileActivity.this, account -> {

                            homeMuted = true;

                            invalidateOptionsMenu();

                            sendAction(ProfileActivity.this, Helper.ARG_STATUS_ACCOUNT_ID_DELETED, null, account.id);

                            Toasty.info(ProfileActivity.this, getString(R.string.toast_mute), Toasty.LENGTH_LONG).show();

                        }));

            }

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+0 −1
Original line number Diff line number Diff line
@@ -1662,7 +1662,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                    builderInner.setNeutralButton(R.string.cancel, (dialog, which) -> dialog.dismiss());

                    builderInner.setPositiveButton(R.string.action_mute, (dialog, which) -> accountsVM.muteHome(currentAccount, statusToDeal.account)

                            .observe((LifecycleOwner) context, account -> {

                                sendAction(context, Helper.ARG_STATUS_ACCOUNT_ID_DELETED, null, statusToDeal.account.id);

                                Toasty.info(context, context.getString(R.string.toast_mute), Toasty.LENGTH_LONG).show();

                            }));

                    builderInner.show();

app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java

+1 −0
Original line number Diff line number Diff line
@@ -821,6 +821,7 @@ public class AccountsVM extends AndroidViewModel { 
                e.printStackTrace();

            }

            Handler mainHandler = new Handler(Looper.getMainLooper());

            sendAction(getApplication().getApplicationContext(), Helper.ARG_STATUS_ACCOUNT_ID_DELETED, null, target.id);

            Runnable myRunnable = () -> accountMutableLiveData.setValue(target);

            mainHandler.post(myRunnable);

        }).start();

app/src/main/res/menu/menu_list.xml

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ 
        android:icon="@drawable/ic_baseline_edit_note_24"

        android:title="@string/action_lists_edit"

        app:showAsAction="ifRoom" />

    <item

        android:id="@+id/action_user_mute_home"

        android:icon="@drawable/ic_baseline_volume_mute_24"

        android:title="@string/add_all_users_home_muted"

        app:showAsAction="ifRoom" />

    <item

        android:id="@+id/action_delete"

        android:icon="@drawable/ic_baseline_delete_24"