diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuSettingsFragment.kt index fa2308970e1b..84ffdce318bf 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuSettingsFragment.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuSettingsFragment.kt @@ -23,12 +23,12 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.appbar.MaterialToolbar import com.google.android.material.snackbar.Snackbar import com.ichi2.anki.R +import com.ichi2.anki.databinding.PreferencesReviewerMenuBinding import com.ichi2.anki.snackbar.showSnackbar import com.ichi2.anki.utils.ext.sharedPrefs +import dev.androidbroadcast.vbpd.viewBinding import kotlinx.coroutines.launch class ReviewerMenuSettingsFragment : @@ -37,22 +37,22 @@ class ReviewerMenuSettingsFragment : ActionMenuView.OnMenuItemClickListener { private lateinit var repository: ReviewerMenuRepository + private val binding by viewBinding(PreferencesReviewerMenuBinding::bind) + override fun onViewCreated( view: View, savedInstanceState: Bundle?, ) { super.onViewCreated(view, savedInstanceState) repository = ReviewerMenuRepository(sharedPrefs()) - setupRecyclerView(view) - view.findViewById(R.id.toolbar).setNavigationOnClickListener { + setupRecyclerView() + binding.toolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } - view.findViewById(R.id.reviewer_menu_view).apply { - setOnMenuItemClickListener(this@ReviewerMenuSettingsFragment) - } + binding.reviewerMenuView.setOnMenuItemClickListener(this@ReviewerMenuSettingsFragment) } - private fun setupRecyclerView(view: View) { + private fun setupRecyclerView() { val menuItems = repository.getActionsByMenuDisplayTypes() fun section(displayType: MenuDisplayType): List = @@ -72,7 +72,7 @@ class ReviewerMenuSettingsFragment : } } - view.findViewById(R.id.recycler_view).apply { + binding.recyclerView.apply { setHasFixedSize(true) layoutManager = LinearLayoutManager(requireContext()) this.adapter = adapter @@ -108,7 +108,7 @@ class ReviewerMenuSettingsFragment : ) lifecycleScope.launch { - val menu = requireView().findViewById(R.id.reviewer_menu_view) + val menu = binding.reviewerMenuView menu.clear() menu.addActions(alwaysShowActions, menuOnlyActions) menu.setFlagTitles()