Clean up Account adapters (#3202)

* make BlocksAdapter use viewbinding

* remove LoadingFooterViewHolder

* cleanup code

* move accountlist to component packes

* make FollowRequestsHeaderAdapter use viewbinding

* add license to MutesAdapter

* move accountlist to component packages

* use ConstraintLayout in item_blocked_user.xml

* support the bot badge everywhere

* cleanup code

* cleanup xml files

* ktlint

* ktlint

app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt

@@ -50,13 +50,13 @@ import com.google.android.material.shape.ShapeAppearanceModel
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import com.keylesspalace.tusky.AccountListActivity
 import com.keylesspalace.tusky.BottomSheetActivity
 import com.keylesspalace.tusky.EditProfileActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.StatusListActivity
 import com.keylesspalace.tusky.ViewMediaActivity
 import com.keylesspalace.tusky.components.account.list.ListsForAccountFragment
+import com.keylesspalace.tusky.components.accountlist.AccountListActivity
 import com.keylesspalace.tusky.components.compose.ComposeActivity
 import com.keylesspalace.tusky.components.report.ReportActivity
 import com.keylesspalace.tusky.databinding.ActivityAccountBinding

app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListActivity.kt

@@ -0,0 +1,88 @@
+/* Copyright 2017 Andrew Dawson
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.accountlist
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.commit
+import com.keylesspalace.tusky.BaseActivity
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.databinding.ActivityAccountListBinding
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasAndroidInjector
+import javax.inject.Inject
+
+class AccountListActivity : BaseActivity(), HasAndroidInjector {
+
+    @Inject
+    lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Any>
+
+    enum class Type {
+        FOLLOWS,
+        FOLLOWERS,
+        BLOCKS,
+        MUTES,
+        FOLLOW_REQUESTS,
+        REBLOGGED,
+        FAVOURITED
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val binding = ActivityAccountListBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val type = intent.getSerializableExtra(EXTRA_TYPE) as Type
+        val id: String? = intent.getStringExtra(EXTRA_ID)
+        val accountLocked: Boolean = intent.getBooleanExtra(EXTRA_ACCOUNT_LOCKED, false)
+
+        setSupportActionBar(binding.includedToolbar.toolbar)
+        supportActionBar?.apply {
+            when (type) {
+                Type.BLOCKS -> setTitle(R.string.title_blocks)
+                Type.MUTES -> setTitle(R.string.title_mutes)
+                Type.FOLLOW_REQUESTS -> setTitle(R.string.title_follow_requests)
+                Type.FOLLOWERS -> setTitle(R.string.title_followers)
+                Type.FOLLOWS -> setTitle(R.string.title_follows)
+                Type.REBLOGGED -> setTitle(R.string.title_reblogged_by)
+                Type.FAVOURITED -> setTitle(R.string.title_favourited_by)
+            }
+            setDisplayHomeAsUpEnabled(true)
+            setDisplayShowHomeEnabled(true)
+        }
+
+        supportFragmentManager.commit {
+            replace(R.id.fragment_container, AccountListFragment.newInstance(type, id, accountLocked))
+        }
+    }
+
+    override fun androidInjector() = dispatchingAndroidInjector
+
+    companion object {
+        private const val EXTRA_TYPE = "type"
+        private const val EXTRA_ID = "id"
+        private const val EXTRA_ACCOUNT_LOCKED = "acc_locked"
+
+        fun newIntent(context: Context, type: Type, id: String? = null, accountLocked: Boolean = false): Intent {
+            return Intent(context, AccountListActivity::class.java).apply {
+                putExtra(EXTRA_TYPE, type)
+                putExtra(EXTRA_ID, id)
+                putExtra(EXTRA_ACCOUNT_LOCKED, accountLocked)
+            }
+        }
+    }
+}

app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt

@@ -0,0 +1,403 @@
+/* Copyright 2017 Andrew Dawson
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.accountlist
+
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.ConcatAdapter
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SimpleItemAnimator
+import autodispose2.androidx.lifecycle.AndroidLifecycleScopeProvider.from
+import autodispose2.autoDispose
+import com.google.android.material.snackbar.Snackbar
+import com.keylesspalace.tusky.BaseActivity
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.components.account.AccountActivity
+import com.keylesspalace.tusky.components.accountlist.AccountListActivity.Type
+import com.keylesspalace.tusky.components.accountlist.adapter.AccountAdapter
+import com.keylesspalace.tusky.components.accountlist.adapter.BlocksAdapter
+import com.keylesspalace.tusky.components.accountlist.adapter.FollowAdapter
+import com.keylesspalace.tusky.components.accountlist.adapter.FollowRequestsAdapter
+import com.keylesspalace.tusky.components.accountlist.adapter.FollowRequestsHeaderAdapter
+import com.keylesspalace.tusky.components.accountlist.adapter.MutesAdapter
+import com.keylesspalace.tusky.databinding.FragmentAccountListBinding
+import com.keylesspalace.tusky.db.AccountManager
+import com.keylesspalace.tusky.di.Injectable
+import com.keylesspalace.tusky.entity.Relationship
+import com.keylesspalace.tusky.entity.TimelineAccount
+import com.keylesspalace.tusky.interfaces.AccountActionListener
+import com.keylesspalace.tusky.network.MastodonApi
+import com.keylesspalace.tusky.settings.PrefKeys
+import com.keylesspalace.tusky.util.HttpHeaderLink
+import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.viewBinding
+import com.keylesspalace.tusky.view.EndlessOnScrollListener
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import kotlinx.coroutines.launch
+import retrofit2.Response
+import java.io.IOException
+import javax.inject.Inject
+
+class AccountListFragment : Fragment(R.layout.fragment_account_list), AccountActionListener, Injectable {
+
+    @Inject
+    lateinit var api: MastodonApi
+    @Inject
+    lateinit var accountManager: AccountManager
+
+    private val binding by viewBinding(FragmentAccountListBinding::bind)
+
+    private lateinit var type: Type
+    private var id: String? = null
+
+    private lateinit var scrollListener: EndlessOnScrollListener
+    private lateinit var adapter: AccountAdapter<*>
+    private var fetching = false
+    private var bottomId: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        type = requireArguments().getSerializable(ARG_TYPE) as Type
+        id = requireArguments().getString(ARG_ID)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+        binding.recyclerView.setHasFixedSize(true)
+        val layoutManager = LinearLayoutManager(view.context)
+        binding.recyclerView.layoutManager = layoutManager
+        (binding.recyclerView.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
+
+        binding.recyclerView.addItemDecoration(DividerItemDecoration(view.context, DividerItemDecoration.VERTICAL))
+
+        val pm = PreferenceManager.getDefaultSharedPreferences(view.context)
+        val animateAvatar = pm.getBoolean(PrefKeys.ANIMATE_GIF_AVATARS, false)
+        val animateEmojis = pm.getBoolean(PrefKeys.ANIMATE_CUSTOM_EMOJIS, false)
+        val showBotOverlay = pm.getBoolean(PrefKeys.SHOW_BOT_OVERLAY, true)
+
+        adapter = when (type) {
+            Type.BLOCKS -> BlocksAdapter(this, animateAvatar, animateEmojis, showBotOverlay)
+            Type.MUTES -> MutesAdapter(this, animateAvatar, animateEmojis, showBotOverlay)
+            Type.FOLLOW_REQUESTS -> {
+                val headerAdapter = FollowRequestsHeaderAdapter(
+                    instanceName = accountManager.activeAccount!!.domain,
+                    accountLocked = arguments?.getBoolean(ARG_ACCOUNT_LOCKED) == true
+                )
+                val followRequestsAdapter = FollowRequestsAdapter(this, animateAvatar, animateEmojis, showBotOverlay)
+                binding.recyclerView.adapter = ConcatAdapter(headerAdapter, followRequestsAdapter)
+                followRequestsAdapter
+            }
+            else -> FollowAdapter(this, animateAvatar, animateEmojis, showBotOverlay)
+        }
+        if (binding.recyclerView.adapter == null) {
+            binding.recyclerView.adapter = adapter
+        }
+
+        scrollListener = object : EndlessOnScrollListener(layoutManager) {
+            override fun onLoadMore(totalItemsCount: Int, view: RecyclerView) {
+                if (bottomId == null) {
+                    return
+                }
+                fetchAccounts(bottomId)
+            }
+        }
+
+        binding.recyclerView.addOnScrollListener(scrollListener)
+
+        fetchAccounts()
+    }
+
+    override fun onViewAccount(id: String) {
+        (activity as BaseActivity?)?.let {
+            val intent = AccountActivity.getIntent(it, id)
+            it.startActivityWithSlideInAnimation(intent)
+        }
+    }
+
+    override fun onMute(mute: Boolean, id: String, position: Int, notifications: Boolean) {
+        viewLifecycleOwner.lifecycleScope.launch {
+            try {
+                if (!mute) {
+                    api.unmuteAccount(id)
+                } else {
+                    api.muteAccount(id, notifications)
+                }
+                onMuteSuccess(mute, id, position, notifications)
+            } catch (_: Throwable) {
+                onMuteFailure(mute, id, notifications)
+            }
+        }
+    }
+
+    private fun onMuteSuccess(muted: Boolean, id: String, position: Int, notifications: Boolean) {
+        val mutesAdapter = adapter as MutesAdapter
+        if (muted) {
+            mutesAdapter.updateMutingNotifications(id, notifications, position)
+            return
+        }
+        val unmutedUser = mutesAdapter.removeItem(position)
+
+        if (unmutedUser != null) {
+            Snackbar.make(binding.recyclerView, R.string.confirmation_unmuted, Snackbar.LENGTH_LONG)
+                .setAction(R.string.action_undo) {
+                    mutesAdapter.addItem(unmutedUser, position)
+                    onMute(true, id, position, notifications)
+                }
+                .show()
+        }
+    }
+
+    private fun onMuteFailure(mute: Boolean, accountId: String, notifications: Boolean) {
+        val verb = if (mute) {
+            if (notifications) {
+                "mute (notifications = true)"
+            } else {
+                "mute (notifications = false)"
+            }
+        } else {
+            "unmute"
+        }
+        Log.e(TAG, "Failed to $verb account id $accountId")
+    }
+
+    override fun onBlock(block: Boolean, id: String, position: Int) {
+        viewLifecycleOwner.lifecycleScope.launch {
+            try {
+                if (!block) {
+                    api.unblockAccount(id)
+                } else {
+                    api.blockAccount(id)
+                }
+                onBlockSuccess(block, id, position)
+            } catch (_: Throwable) {
+                onBlockFailure(block, id)
+            }
+        }
+    }
+
+    private fun onBlockSuccess(blocked: Boolean, id: String, position: Int) {
+        if (blocked) {
+            return
+        }
+        val blocksAdapter = adapter as BlocksAdapter
+        val unblockedUser = blocksAdapter.removeItem(position)
+
+        if (unblockedUser != null) {
+            Snackbar.make(binding.recyclerView, R.string.confirmation_unblocked, Snackbar.LENGTH_LONG)
+                .setAction(R.string.action_undo) {
+                    blocksAdapter.addItem(unblockedUser, position)
+                    onBlock(true, id, position)
+                }
+                .show()
+        }
+    }
+
+    private fun onBlockFailure(block: Boolean, accountId: String) {
+        val verb = if (block) {
+            "block"
+        } else {
+            "unblock"
+        }
+        Log.e(TAG, "Failed to $verb account accountId $accountId")
+    }
+
+    override fun onRespondToFollowRequest(
+        accept: Boolean,
+        accountId: String,
+        position: Int
+    ) {
+
+        if (accept) {
+            api.authorizeFollowRequest(accountId)
+        } else {
+            api.rejectFollowRequest(accountId)
+        }.observeOn(AndroidSchedulers.mainThread())
+            .autoDispose(from(this, Lifecycle.Event.ON_DESTROY))
+            .subscribe(
+                {
+                    onRespondToFollowRequestSuccess(position)
+                },
+                { throwable ->
+                    val verb = if (accept) {
+                        "accept"
+                    } else {
+                        "reject"
+                    }
+                    Log.e(TAG, "Failed to $verb account id $accountId.", throwable)
+                }
+            )
+    }
+
+    private fun onRespondToFollowRequestSuccess(position: Int) {
+        val followRequestsAdapter = adapter as FollowRequestsAdapter
+        followRequestsAdapter.removeItem(position)
+    }
+
+    private suspend fun getFetchCallByListType(fromId: String?): Response<List<TimelineAccount>> {
+        return when (type) {
+            Type.FOLLOWS -> {
+                val accountId = requireId(type, id)
+                api.accountFollowing(accountId, fromId)
+            }
+            Type.FOLLOWERS -> {
+                val accountId = requireId(type, id)
+                api.accountFollowers(accountId, fromId)
+            }
+            Type.BLOCKS -> api.blocks(fromId)
+            Type.MUTES -> api.mutes(fromId)
+            Type.FOLLOW_REQUESTS -> api.followRequests(fromId)
+            Type.REBLOGGED -> {
+                val statusId = requireId(type, id)
+                api.statusRebloggedBy(statusId, fromId)
+            }
+            Type.FAVOURITED -> {
+                val statusId = requireId(type, id)
+                api.statusFavouritedBy(statusId, fromId)
+            }
+        }
+    }
+
+    private fun requireId(type: Type, id: String?): String {
+        return requireNotNull(id) { "id must not be null for type " + type.name }
+    }
+
+    private fun fetchAccounts(fromId: String? = null) {
+        if (fetching) {
+            return
+        }
+        fetching = true
+
+        if (fromId != null) {
+            binding.recyclerView.post { adapter.setBottomLoading(true) }
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            try {
+                val response = getFetchCallByListType(fromId)
+                if (!response.isSuccessful) {
+                    onFetchAccountsFailure(Exception(response.message()))
+                    return@launch
+                }
+
+                val accountList = response.body()
+
+                if (accountList == null) {
+                    onFetchAccountsFailure(Exception(response.message()))
+                    return@launch
+                }
+
+                val linkHeader = response.headers()["Link"]
+                onFetchAccountsSuccess(accountList, linkHeader)
+            } catch (exception: IOException) {
+                onFetchAccountsFailure(exception)
+            }
+        }
+    }
+
+    private fun onFetchAccountsSuccess(accounts: List<TimelineAccount>, linkHeader: String?) {
+        adapter.setBottomLoading(false)
+
+        val links = HttpHeaderLink.parse(linkHeader)
+        val next = HttpHeaderLink.findByRelationType(links, "next")
+        val fromId = next?.uri?.getQueryParameter("max_id")
+
+        if (adapter.itemCount > 0) {
+            adapter.addItems(accounts)
+        } else {
+            adapter.update(accounts)
+        }
+
+        if (adapter is MutesAdapter) {
+            fetchRelationships(accounts.map { it.id })
+        }
+
+        bottomId = fromId
+
+        fetching = false
+
+        if (adapter.itemCount == 0) {
+            binding.messageView.show()
+            binding.messageView.setup(
+                R.drawable.elephant_friend_empty,
+                R.string.message_empty,
+                null
+            )
+        } else {
+            binding.messageView.hide()
+        }
+    }
+
+    private fun fetchRelationships(ids: List<String>) {
+        api.relationships(ids)
+            .observeOn(AndroidSchedulers.mainThread())
+            .autoDispose(from(this))
+            .subscribe(::onFetchRelationshipsSuccess) { throwable ->
+                Log.e(TAG, "Fetch failure for relationships of accounts: $ids", throwable)
+            }
+    }
+
+    private fun onFetchRelationshipsSuccess(relationships: List<Relationship>) {
+        val mutesAdapter = adapter as MutesAdapter
+        val mutingNotificationsMap = HashMap<String, Boolean>()
+        relationships.map { mutingNotificationsMap.put(it.id, it.mutingNotifications) }
+        mutesAdapter.updateMutingNotificationsMap(mutingNotificationsMap)
+    }
+
+    private fun onFetchAccountsFailure(throwable: Throwable) {
+        fetching = false
+        Log.e(TAG, "Fetch failure", throwable)
+
+        if (adapter.itemCount == 0) {
+            binding.messageView.show()
+            if (throwable is IOException) {
+                binding.messageView.setup(R.drawable.elephant_offline, R.string.error_network) {
+                    binding.messageView.hide()
+                    this.fetchAccounts(null)
+                }
+            } else {
+                binding.messageView.setup(R.drawable.elephant_error, R.string.error_generic) {
+                    binding.messageView.hide()
+                    this.fetchAccounts(null)
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val TAG = "AccountList" // logging tag
+        private const val ARG_TYPE = "type"
+        private const val ARG_ID = "id"
+        private const val ARG_ACCOUNT_LOCKED = "acc_locked"
+
+        fun newInstance(type: Type, id: String? = null, accountLocked: Boolean = false): AccountListFragment {
+            return AccountListFragment().apply {
+                arguments = Bundle(3).apply {
+                    putSerializable(ARG_TYPE, type)
+                    putString(ARG_ID, id)
+                    putBoolean(ARG_ACCOUNT_LOCKED, accountLocked)
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/keylesspalace/tusky/components/accountlist/adapter/AccountAdapter.kt

@@ -0,0 +1,126 @@
+/* Copyright 2021 Tusky Contributors.
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+package com.keylesspalace.tusky.components.accountlist.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.keylesspalace.tusky.databinding.ItemFooterBinding
+import com.keylesspalace.tusky.entity.TimelineAccount
+import com.keylesspalace.tusky.interfaces.AccountActionListener
+import com.keylesspalace.tusky.util.BindingHolder
+import com.keylesspalace.tusky.util.removeDuplicates
+
+/** Generic adapter with bottom loading indicator. */
+abstract class AccountAdapter<AVH : RecyclerView.ViewHolder> internal constructor(
+    protected val accountActionListener: AccountActionListener,
+    protected val animateAvatar: Boolean,
+    protected val animateEmojis: Boolean,
+    protected val showBotOverlay: Boolean
+) : RecyclerView.Adapter<RecyclerView.ViewHolder?>() {
+
+    protected var accountList: MutableList<TimelineAccount> = mutableListOf()
+    private var bottomLoading: Boolean = false
+
+    override fun getItemCount(): Int {
+        return accountList.size + if (bottomLoading) 1 else 0
+    }
+
+    abstract fun createAccountViewHolder(parent: ViewGroup): AVH
+
+    abstract fun onBindAccountViewHolder(viewHolder: AVH, position: Int)
+
+    final override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        if (getItemViewType(position) == VIEW_TYPE_ACCOUNT) {
+            @Suppress("UNCHECKED_CAST")
+            this.onBindAccountViewHolder(holder as AVH, position)
+        }
+    }
+
+    final override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): RecyclerView.ViewHolder {
+        return when (viewType) {
+            VIEW_TYPE_ACCOUNT -> this.createAccountViewHolder(parent)
+            VIEW_TYPE_FOOTER -> this.createFooterViewHolder(parent)
+            else -> error("Unknown item type: $viewType")
+        }
+    }
+
+    private fun createFooterViewHolder(
+        parent: ViewGroup,
+    ): RecyclerView.ViewHolder {
+        val binding = ItemFooterBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return BindingHolder(binding)
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (position == accountList.size && bottomLoading) {
+            VIEW_TYPE_FOOTER
+        } else {
+            VIEW_TYPE_ACCOUNT
+        }
+    }
+
+    fun update(newAccounts: List<TimelineAccount>) {
+        accountList = removeDuplicates(newAccounts)
+        notifyDataSetChanged()
+    }
+
+    fun addItems(newAccounts: List<TimelineAccount>) {
+        val end = accountList.size
+        val last = accountList[end - 1]
+        if (newAccounts.none { it.id == last.id }) {
+            accountList.addAll(newAccounts)
+            notifyItemRangeInserted(end, newAccounts.size)
+        }
+    }
+
+    fun setBottomLoading(loading: Boolean) {
+        val wasLoading = bottomLoading
+        if (wasLoading == loading) {
+            return
+        }
+        bottomLoading = loading
+        if (loading) {
+            notifyItemInserted(accountList.size)
+        } else {
+            notifyItemRemoved(accountList.size)
+        }
+    }
+
+    fun removeItem(position: Int): TimelineAccount? {
+        if (position < 0 || position >= accountList.size) {
+            return null
+        }
+        val account = accountList.removeAt(position)
+        notifyItemRemoved(position)
+        return account
+    }
+
+    fun addItem(account: TimelineAccount, position: Int) {
+        if (position < 0 || position > accountList.size) {
+            return
+        }
+        accountList.add(position, account)
+        notifyItemInserted(position)
+    }
+
+    companion object {
+        const val VIEW_TYPE_ACCOUNT = 0
+        const val VIEW_TYPE_FOOTER = 1
+    }
+}

app/src/main/java/com/keylesspalace/tusky/components/accountlist/adapter/BlocksAdapter.kt

@@ -0,0 +1,68 @@
+/* Copyright 2017 Andrew Dawson
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.accountlist.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.databinding.ItemBlockedUserBinding
+import com.keylesspalace.tusky.interfaces.AccountActionListener
+import com.keylesspalace.tusky.util.BindingHolder
+import com.keylesspalace.tusky.util.emojify
+import com.keylesspalace.tusky.util.loadAvatar
+import com.keylesspalace.tusky.util.visible
+
+/** Displays a list of blocked accounts. */
+class BlocksAdapter(
+    accountActionListener: AccountActionListener,
+    animateAvatar: Boolean,
+    animateEmojis: Boolean,
+    showBotOverlay: Boolean,
+) : AccountAdapter<BindingHolder<ItemBlockedUserBinding>>(
+    accountActionListener = accountActionListener,
+    animateAvatar = animateAvatar,
+    animateEmojis = animateEmojis,
+    showBotOverlay = showBotOverlay
+) {
+
+    override fun createAccountViewHolder(parent: ViewGroup): BindingHolder<ItemBlockedUserBinding> {
+        val binding = ItemBlockedUserBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return BindingHolder(binding)
+    }
+
+    override fun onBindAccountViewHolder(viewHolder: BindingHolder<ItemBlockedUserBinding>, position: Int) {
+        val account = accountList[position]
+        val binding = viewHolder.binding
+        val context = binding.root.context
+
+        val emojifiedName = account.name.emojify(account.emojis, binding.blockedUserDisplayName, animateEmojis)
+        binding.blockedUserDisplayName.text = emojifiedName
+        val formattedUsername = context.getString(R.string.post_username_format, account.username)
+        binding.blockedUserUsername.text = formattedUsername
+
+        val avatarRadius = context.resources.getDimensionPixelSize(R.dimen.avatar_radius_48dp)
+        loadAvatar(account.avatar, binding.blockedUserAvatar, avatarRadius, animateAvatar)
+
+        binding.blockedUserBotBadge.visible(showBotOverlay && account.bot)
+
+        binding.blockedUserUnblock.setOnClickListener {
+            accountActionListener.onBlock(false, account.id, position)
+        }
+        binding.root.setOnClickListener {
+            accountActionListener.onViewAccount(account.id)
+        }
+    }
+}

app/src/main/java/com/keylesspalace/tusky/components/accountlist/adapter/FollowAdapter.kt

@@ -0,0 +1,51 @@
+/* Copyright 2021 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.accountlist.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.keylesspalace.tusky.adapter.AccountViewHolder
+import com.keylesspalace.tusky.databinding.ItemAccountBinding
+import com.keylesspalace.tusky.interfaces.AccountActionListener
+
+/** Displays either a follows or following list.  */
+class FollowAdapter(
+    accountActionListener: AccountActionListener,
+    animateAvatar: Boolean,
+    animateEmojis: Boolean,
+    showBotOverlay: Boolean
+) : AccountAdapter<AccountViewHolder>(
+    accountActionListener = accountActionListener,
+    animateAvatar = animateAvatar,
+    animateEmojis = animateEmojis,
+    showBotOverlay = showBotOverlay
+) {
+
+    override fun createAccountViewHolder(parent: ViewGroup): AccountViewHolder {
+        val binding = ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return AccountViewHolder(binding)
+    }
+
+    override fun onBindAccountViewHolder(viewHolder: AccountViewHolder, position: Int) {
+        viewHolder.setupWithAccount(
+            accountList[position],
+            animateAvatar,
+            animateEmojis,
+            showBotOverlay
+        )
+        viewHolder.setupActionListener(accountActionListener)
+    }
+}

app/src/main/java/com/keylesspalace/tusky/components/accountlist/adapter/FollowRequestsAdapter.kt

@@ -0,0 +1,51 @@
+/* Copyright 2021 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.accountlist.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.keylesspalace.tusky.adapter.FollowRequestViewHolder
+import com.keylesspalace.tusky.databinding.ItemFollowRequestBinding
+import com.keylesspalace.tusky.interfaces.AccountActionListener
+
+/** Displays a list of follow requests with accept/reject buttons. */
+class FollowRequestsAdapter(
+    accountActionListener: AccountActionListener,
+    animateAvatar: Boolean,
+    animateEmojis: Boolean,
+    showBotOverlay: Boolean
+) : AccountAdapter<FollowRequestViewHolder>(
+    accountActionListener = accountActionListener,
+    animateAvatar = animateAvatar,
+    animateEmojis = animateEmojis,
+    showBotOverlay = showBotOverlay
+) {
+
+    override fun createAccountViewHolder(parent: ViewGroup): FollowRequestViewHolder {
+        val binding = ItemFollowRequestBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return FollowRequestViewHolder(binding, false)
+    }
+
+    override fun onBindAccountViewHolder(viewHolder: FollowRequestViewHolder, position: Int) {
+        viewHolder.setupWithAccount(
+            account = accountList[position],
+            animateAvatar = animateAvatar,
+            animateEmojis = animateEmojis,
+            showBotOverlay = showBotOverlay
+        )
+        viewHolder.setupActionListener(accountActionListener, accountList[position].id)
+    }
+}

app/src/main/java/com/keylesspalace/tusky/components/accountlist/adapter/FollowRequestsHeaderAdapter.kt

@@ -0,0 +1,40 @@
+/* Copyright 2020 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.accountlist.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.databinding.ItemFollowRequestsHeaderBinding
+import com.keylesspalace.tusky.util.BindingHolder
+
+class FollowRequestsHeaderAdapter(
+    private val instanceName: String,
+    private val accountLocked: Boolean
+) : RecyclerView.Adapter<BindingHolder<ItemFollowRequestsHeaderBinding>>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BindingHolder<ItemFollowRequestsHeaderBinding> {
+        val binding = ItemFollowRequestsHeaderBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return BindingHolder(binding)
+    }
+
+    override fun onBindViewHolder(viewHolder: BindingHolder<ItemFollowRequestsHeaderBinding>, position: Int) {
+        viewHolder.binding.root.text = viewHolder.binding.root.context.getString(R.string.follow_requests_info, instanceName)
+    }
+
+    override fun getItemCount() = if (accountLocked) 0 else 1
+}

app/src/main/java/com/keylesspalace/tusky/components/accountlist/adapter/MutesAdapter.kt

@@ -0,0 +1,109 @@
+/* Copyright 2023 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.accountlist.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.databinding.ItemMutedUserBinding
+import com.keylesspalace.tusky.interfaces.AccountActionListener
+import com.keylesspalace.tusky.util.BindingHolder
+import com.keylesspalace.tusky.util.emojify
+import com.keylesspalace.tusky.util.loadAvatar
+import com.keylesspalace.tusky.util.visible
+
+/** Displays a list of muted accounts with mute/unmute account button and mute/unmute notifications switch */
+class MutesAdapter(
+    accountActionListener: AccountActionListener,
+    animateAvatar: Boolean,
+    animateEmojis: Boolean,
+    showBotOverlay: Boolean
+) : AccountAdapter<BindingHolder<ItemMutedUserBinding>>(
+    accountActionListener = accountActionListener,
+    animateAvatar = animateAvatar,
+    animateEmojis = animateEmojis,
+    showBotOverlay = showBotOverlay
+) {
+
+    private val mutingNotificationsMap = HashMap<String, Boolean>()
+
+    override fun createAccountViewHolder(parent: ViewGroup): BindingHolder<ItemMutedUserBinding> {
+        val binding = ItemMutedUserBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return BindingHolder(binding)
+    }
+
+    override fun onBindAccountViewHolder(viewHolder: BindingHolder<ItemMutedUserBinding>, position: Int) {
+        val account = accountList[position]
+        val binding = viewHolder.binding
+        val context = binding.root.context
+
+        val mutingNotifications = mutingNotificationsMap[account.id]
+
+        val emojifiedName = account.name.emojify(account.emojis, binding.mutedUserDisplayName, animateEmojis)
+        binding.mutedUserDisplayName.text = emojifiedName
+
+        val formattedUsername = context.getString(R.string.post_username_format, account.username)
+        binding.mutedUserUsername.text = formattedUsername
+
+        val avatarRadius = context.resources.getDimensionPixelSize(R.dimen.avatar_radius_48dp)
+        loadAvatar(account.avatar, binding.mutedUserAvatar, avatarRadius, animateAvatar)
+
+        binding.mutedUserBotBadge.visible(showBotOverlay && account.bot)
+
+        val unmuteString = context.getString(R.string.action_unmute_desc, formattedUsername)
+        binding.mutedUserUnmute.contentDescription = unmuteString
+        ViewCompat.setTooltipText(binding.mutedUserUnmute, unmuteString)
+
+        binding.mutedUserMuteNotifications.setOnCheckedChangeListener(null)
+
+        binding.mutedUserMuteNotifications.isChecked = if (mutingNotifications == null) {
+            binding.mutedUserMuteNotifications.isEnabled = false
+            true
+        } else {
+            binding.mutedUserMuteNotifications.isEnabled = true
+            mutingNotifications
+        }
+
+        binding.mutedUserUnmute.setOnClickListener {
+            accountActionListener.onMute(
+                false,
+                account.id,
+                viewHolder.bindingAdapterPosition,
+                false
+            )
+        }
+        binding.mutedUserMuteNotifications.setOnCheckedChangeListener { _, isChecked ->
+            accountActionListener.onMute(
+                true,
+                account.id,
+                viewHolder.bindingAdapterPosition,
+                isChecked
+            )
+        }
+        binding.root.setOnClickListener { accountActionListener.onViewAccount(account.id) }
+    }
+
+    fun updateMutingNotifications(id: String, mutingNotifications: Boolean, position: Int) {
+        mutingNotificationsMap[id] = mutingNotifications
+        notifyItemChanged(position)
+    }
+
+    fun updateMutingNotificationsMap(newMutingNotificationsMap: HashMap<String, Boolean>) {
+        mutingNotificationsMap.putAll(newMutingNotificationsMap)
+        notifyDataSetChanged()
+    }
+}

app/src/main/java/com/keylesspalace/tusky/components/preference/AccountPreferencesFragment.kt

@@ -24,7 +24,6 @@ import androidx.annotation.DrawableRes
 import androidx.preference.PreferenceFragmentCompat
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
-import com.keylesspalace.tusky.AccountListActivity
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.BuildConfig
 import com.keylesspalace.tusky.FiltersActivity
@@ -32,6 +31,7 @@ import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.TabPreferenceActivity
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.PreferenceChangedEvent
+import com.keylesspalace.tusky.components.accountlist.AccountListActivity
 import com.keylesspalace.tusky.components.followedtags.FollowedTagsActivity
 import com.keylesspalace.tusky.components.instancemute.InstanceListActivity
 import com.keylesspalace.tusky.components.login.LoginActivity

app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt

@@ -34,14 +34,14 @@ import androidx.recyclerview.widget.SimpleItemAnimator
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import at.connyduck.sparkbutton.helpers.Utils
 import autodispose2.androidx.lifecycle.autoDispose
-import com.keylesspalace.tusky.AccountListActivity
-import com.keylesspalace.tusky.AccountListActivity.Companion.newIntent
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.adapter.StatusBaseViewHolder
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.PreferenceChangedEvent
 import com.keylesspalace.tusky.appstore.StatusComposedEvent
+import com.keylesspalace.tusky.components.accountlist.AccountListActivity
+import com.keylesspalace.tusky.components.accountlist.AccountListActivity.Companion.newIntent
 import com.keylesspalace.tusky.components.preference.PreferencesFragment.ReadingOrder
 import com.keylesspalace.tusky.components.timeline.viewmodel.CachedTimelineViewModel
 import com.keylesspalace.tusky.components.timeline.viewmodel.NetworkTimelineViewModel

app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt

@@ -32,10 +32,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.SimpleItemAnimator
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import com.google.android.material.snackbar.Snackbar
-import com.keylesspalace.tusky.AccountListActivity
-import com.keylesspalace.tusky.AccountListActivity.Companion.newIntent
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.components.accountlist.AccountListActivity
+import com.keylesspalace.tusky.components.accountlist.AccountListActivity.Companion.newIntent
 import com.keylesspalace.tusky.components.viewthread.edits.ViewEditsFragment
 import com.keylesspalace.tusky.databinding.FragmentViewThreadBinding
 import com.keylesspalace.tusky.di.Injectable