Skip to content

chore: convert DeckSelectionDialog to ViewBinding #20185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrayanDSO merged 1 commit into from
Jan 23, 2026
+32 −37
Merged

chore: convert DeckSelectionDialog to ViewBinding #20185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 23 additions & 28 deletions AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import android.view.WindowManager
import android.widget.Filter
import android.widget.Filterable
import android.widget.ImageButton
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.SearchView
import androidx.appcompat.widget.Toolbar
Expand All @@ -43,6 +42,8 @@ import com.ichi2.anki.R
import com.ichi2.anki.analytics.AnalyticsDialogFragment
import com.ichi2.anki.common.annotations.NeedsTest
import com.ichi2.anki.common.utils.annotation.KotlinCleanup
import com.ichi2.anki.databinding.DeckPickerDialogListItemBinding
import com.ichi2.anki.databinding.DialogDeckPickerBinding
import com.ichi2.anki.dialogs.DeckSelectionDialog.DecksArrayAdapter.DecksFilter
import com.ichi2.anki.launchCatchingTask
import com.ichi2.anki.libanki.DeckId
Expand Down Expand Up @@ -74,6 +75,7 @@ import java.util.Locale
@NeedsTest("test the ordering of decks in search page in the dialog")
@NeedsTest("test syncing the status of collapsing deck with teh deckPicker")
open class DeckSelectionDialog : AnalyticsDialogFragment() {
private lateinit var binding: DialogDeckPickerBinding
private var dialog: AlertDialog? = null
private lateinit var expandImage: Drawable
private lateinit var collapseImage: Drawable
Expand All @@ -96,32 +98,28 @@ open class DeckSelectionDialog : AnalyticsDialogFragment() {
}

override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val dialogView =
LayoutInflater
.from(activity)
.inflate(R.layout.deck_picker_dialog, null, false)
val summary = dialogView.findViewById<TextView>(R.id.deck_picker_dialog_summary)
binding = DialogDeckPickerBinding.inflate(LayoutInflater.from(context))
val summary = binding.summary
val arguments = requireArguments()
if (getSummaryMessage(arguments) == null) {
summary.visibility = View.GONE
} else {
summary.visibility = View.VISIBLE
summary.text = getSummaryMessage(arguments)
}
val recyclerView: RecyclerView = dialogView.findViewById(R.id.deck_picker_dialog_list)
recyclerView.requestFocus()
binding.list.requestFocus()
val deckLayoutManager: RecyclerView.LayoutManager = LinearLayoutManager(requireActivity())
recyclerView.layoutManager = deckLayoutManager
val dividerItemDecoration = DividerItemDecoration(recyclerView.context, DividerItemDecoration.VERTICAL)
recyclerView.addItemDecoration(dividerItemDecoration)
binding.list.layoutManager = deckLayoutManager
val dividerItemDecoration = DividerItemDecoration(binding.list.context, DividerItemDecoration.VERTICAL)
binding.list.addItemDecoration(dividerItemDecoration)
val decks: List<SelectableDeck> = getDeckNames(arguments)
val adapter = DecksArrayAdapter(decks)
recyclerView.adapter = adapter
adjustToolbar(dialogView, adapter)
binding.list.adapter = adapter
adjustToolbar(binding.root, adapter)
dialog =
AlertDialog.Builder(requireActivity()).create {
negativeButton(R.string.dialog_cancel)
customView(view = dialogView)
customView(view = binding.root)
if (arguments.getBoolean(KEEP_RESTORE_DEFAULT_BUTTON)) {
positiveButton(R.string.restore_default) {
onDeckSelected(null)
Expand Down Expand Up @@ -150,7 +148,7 @@ open class DeckSelectionDialog : AnalyticsDialogFragment() {
dialogView: View,
adapter: DecksArrayAdapter,
) {
val toolbar: Toolbar = dialogView.findViewById(R.id.deck_picker_dialog_toolbar)
val toolbar: Toolbar = binding.toolbar
toolbar.title = title
toolbar.inflateMenu(R.menu.deck_picker_dialog_menu)
val searchItem = toolbar.menu.findItem(R.id.deck_picker_dialog_action_filter)
Expand Down Expand Up @@ -259,27 +257,26 @@ open class DeckSelectionDialog : AnalyticsDialogFragment() {
) : RecyclerView.Adapter<DecksArrayAdapter.ViewHolder>(),
Filterable {
inner class ViewHolder(
deckHolder: View,
) : RecyclerView.ViewHolder(deckHolder) {
private val binding: DeckPickerDialogListItemBinding,
) : RecyclerView.ViewHolder(binding.root) {
private var currentDeck: SelectableDeck? = null

private val deckTextView: TextView = deckHolder.findViewById(R.id.deckpicker_name)
val expander: ImageButton = deckHolder.findViewById(R.id.deckpicker_expander)
val indentView: ImageButton = deckHolder.findViewById(R.id.deckpicker_indent)
val expander: ImageButton = binding.expander
val indentView: ImageButton = binding.indent

fun setDeck(deck: SelectableDeck) {
deckTextView.text = deck.getDisplayName(requireContext())
binding.deckTextView.text = deck.getDisplayName(requireContext())
currentDeck = deck
}

init {
deckHolder.setOnClickListener {
binding.root.setOnClickListener {
currentDeck?.let { selectDeckAndClose(it) }
}
expander.setOnClickListener {
currentDeck?.let { toggleExpansion(it) }
}
deckHolder.setOnContextAndLongClickListener {
binding.root.setOnContextAndLongClickListener {
// creating sub deck with parent deck path
currentDeck?.let { deck ->
if (deck is SelectableDeck.Deck) {
Expand Down Expand Up @@ -318,11 +315,9 @@ open class DeckSelectionDialog : AnalyticsDialogFragment() {
parent: ViewGroup,
viewType: Int,
): ViewHolder {
val v =
LayoutInflater
.from(parent.context)
.inflate(R.layout.deck_picker_dialog_list_item, parent, false)
return ViewHolder(v)
val layoutInflater = LayoutInflater.from(context)
val binding = DeckPickerDialogListItemBinding.inflate(layoutInflater, parent, false)
return ViewHolder(binding)
}

override fun onBindViewHolder(
Expand Down
8 changes: 4 additions & 4 deletions AnkiDroid/src/main/res/layout/deck_picker_dialog_list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
android:orientation="horizontal"
android:paddingStart="1dp"
android:paddingEnd="@dimen/deck_picker_right_padding"
tools:showIn="@layout/deck_picker_dialog">
tools:showIn="@layout/dialog_deck_picker">
<ImageButton
android:id="@+id/deckpicker_indent"
android:id="@+id/indent"
android:minWidth="0dp"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
Expand All @@ -39,7 +39,7 @@
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageButton
android:id="@+id/deckpicker_expander"
android:id="@+id/expander"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="48dp"
Expand All @@ -49,7 +49,7 @@
/>

<com.ichi2.ui.FixedTextView
android:id="@+id/deckpicker_name"
android:id="@+id/deck_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
Expand Down
10 changes: 5 additions & 5 deletions ...rc/main/res/layout/deck_picker_dialog.xml → ...rc/main/res/layout/dialog_deck_picker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
android:layout_height="match_parent">

<androidx.appcompat.widget.Toolbar
android:id="@+id/deck_picker_dialog_toolbar"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
Expand All @@ -35,22 +35,22 @@
tools:menu="@menu/deck_picker_dialog_menu">
</androidx.appcompat.widget.Toolbar>

<com.ichi2.ui.FixedTextView android:id="@+id/deck_picker_dialog_summary"
<com.ichi2.ui.FixedTextView android:id="@+id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:textSize="18sp"
android:padding="8dp"
android:gravity="center"
android:textIsSelectable="false"
android:layout_below="@id/deck_picker_dialog_toolbar"
android:layout_below="@id/toolbar"
tools:text="optional summary for 'deck override' picker"/>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/deck_picker_dialog_list"
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/deck_picker_dialog_summary"
android:layout_below="@id/summary"
android:scrollbars="vertical"
tools:listitem="@layout/deck_picker_dialog_list_item" />
</RelativeLayout>
Loading