Skip to content

chore: convert DeckPickerWidgetConfig to ViewBinding #19522

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
lukstbit merged 1 commit into from
Nov 19, 2025
Merged

chore: convert DeckPickerWidgetConfig to ViewBinding #19522

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
39 changes: 17 additions & 22 deletions AnkiDroid/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidgetConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import android.content.Intent
import android.content.IntentFilter
import android.os.Bundle
import android.view.View
import android.widget.Button
import androidx.activity.OnBackPressedCallback
import androidx.annotation.StringRes
import androidx.annotation.VisibleForTesting
Expand All @@ -32,10 +31,10 @@ import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.google.android.material.snackbar.Snackbar
import com.ichi2.anki.AnkiActivity
import com.ichi2.anki.R
import com.ichi2.anki.databinding.WidgetDeckPickerConfigBinding
import com.ichi2.anki.dialogs.DeckSelectionDialog
import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckSelectionListener
import com.ichi2.anki.dialogs.DiscardChangesDialog
Expand All @@ -51,6 +50,7 @@ import com.ichi2.widget.AppWidgetId.Companion.INVALID_APPWIDGET_ID
import com.ichi2.widget.AppWidgetId.Companion.getAppWidgetId
import com.ichi2.widget.AppWidgetId.Companion.updateWidget
import com.ichi2.widget.WidgetConfigScreenAdapter
import dev.androidbroadcast.vbpd.viewBinding
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
Expand All @@ -64,9 +64,11 @@ import timber.log.Timber
* User Can remove, reorder decks and reconfigure by holding the widget.
*/
class DeckPickerWidgetConfig :
AnkiActivity(),
AnkiActivity(R.layout.widget_deck_picker_config),
DeckSelectionListener,
BaseSnackbarBuilderProvider {
private val binding by viewBinding(WidgetDeckPickerConfigBinding::bind)

private var appWidgetId = INVALID_APPWIDGET_ID
lateinit var deckAdapter: WidgetConfigScreenAdapter
private lateinit var deckPickerWidgetPreferences: DeckPickerWidgetPreferences
Expand All @@ -90,8 +92,6 @@ class DeckPickerWidgetConfig :
return
}

setContentView(R.layout.widget_deck_picker_config)

deckPickerWidgetPreferences = DeckPickerWidgetPreferences(this)

appWidgetId = intent.getAppWidgetId()
Expand Down Expand Up @@ -145,7 +145,7 @@ class DeckPickerWidgetConfig :
setUnsavedChanges(true)
}

findViewById<RecyclerView>(R.id.recyclerViewSelectedDecks).apply {
binding.recyclerViewSelectedDecks.apply {
layoutManager = LinearLayoutManager(context)
adapter = this@DeckPickerWidgetConfig.deckAdapter
val itemTouchHelper = ItemTouchHelper(itemTouchHelperCallback)
Expand All @@ -156,7 +156,7 @@ class DeckPickerWidgetConfig :

// TODO: Implement multi-select functionality so that user can select desired decks in once.
// TODO: Implement a functionality to hide already selected deck.
findViewById<FloatingActionButton>(R.id.fabWidgetDeckPicker).setOnClickListener {
binding.fabWidgetDeckPicker.setOnClickListener {
showDeckSelectionDialog()
}

Expand Down Expand Up @@ -216,7 +216,7 @@ class DeckPickerWidgetConfig :
}

override val baseSnackbarBuilder: SnackbarBuilder = {
anchorView = findViewById<FloatingActionButton>(R.id.fabWidgetDeckPicker)
anchorView = binding.fabWidgetDeckPicker
}

/**
Expand All @@ -228,12 +228,11 @@ class DeckPickerWidgetConfig :
* and the activity is finished.
*/
private fun setupDoneButton() {
val doneButton = findViewById<Button>(R.id.submit_button)
val saveText = getString(R.string.save).uppercase()

// Set the button text and click listener only once during initialization
doneButton.text = saveText
doneButton.setOnClickListener {
binding.submitButton.text = saveText
binding.submitButton.setOnClickListener {
saveSelectedDecksToPreferencesDeckPickerWidget()
hasUnsavedChanges = false
setUnsavedChanges(false)
Expand All @@ -253,8 +252,7 @@ class DeckPickerWidgetConfig :
}

private fun updateDoneButtonVisibility() {
val doneButton = findViewById<Button>(R.id.submit_button)
doneButton.isVisible = deckAdapter.itemCount != 0
binding.submitButton.isVisible = deckAdapter.itemCount != 0
}

/** Updates the visibility of the FloatingActionButton based on the number of selected decks */
Expand All @@ -272,8 +270,8 @@ class DeckPickerWidgetConfig :

val selectedDeckCount = deckAdapter.itemCount

val fab = findViewById<FloatingActionButton>(R.id.fabWidgetDeckPicker)
fab.isVisible = !(selectedDeckCount >= MAX_DECKS_ALLOWED || selectedDeckCount >= adjustedTotalSelectableDecks)
binding.fabWidgetDeckPicker.isVisible =
!(selectedDeckCount >= MAX_DECKS_ALLOWED || selectedDeckCount >= adjustedTotalSelectableDecks)
}
}

Expand Down Expand Up @@ -370,15 +368,12 @@ class DeckPickerWidgetConfig :

/** Updates the visibility of the "no decks" placeholder and the widget configuration container */
fun updateViewVisibility() {
val noDecksPlaceholder = findViewById<View>(R.id.no_decks_placeholder)
val widgetConfigContainer = findViewById<View>(R.id.widgetConfigContainer)

if (deckAdapter.itemCount > 0) {
noDecksPlaceholder.visibility = View.GONE
widgetConfigContainer.visibility = View.VISIBLE
binding.noDecksPlaceholder.visibility = View.GONE
binding.widgetConfigContainer.visibility = View.VISIBLE
} else {
noDecksPlaceholder.visibility = View.VISIBLE
widgetConfigContainer.visibility = View.GONE
binding.noDecksPlaceholder.visibility = View.VISIBLE
binding.widgetConfigContainer.visibility = View.GONE
}
}

Expand Down