Skip to content

chore: convert NoteTypesAdapter to ViewBinding #20076

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

Open
david-allison wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −35
Open

chore: convert NoteTypesAdapter to ViewBinding #20076

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
52 changes: 22 additions & 30 deletions AnkiDroid/src/main/java/com/ichi2/anki/notetype/NoteTypesAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,14 @@ package com.ichi2.anki.notetype

import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.CheckBox
import android.widget.PopupMenu
import android.widget.TextView
import androidx.core.view.isVisible
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.button.MaterialButton
import com.ichi2.anki.R
import com.ichi2.anki.databinding.ItemManageNoteTypeBinding
import com.ichi2.anki.notetype.NoteTypesAdapter.NoteTypeViewHolder
import com.ichi2.anki.utils.ext.usingStyledAttributes

Expand All @@ -53,7 +50,7 @@ private val notetypeNamesAndCountDiff =
}

internal class NoteTypesAdapter(
context: Context,
private val context: Context,
private val onItemClick: (NoteTypeItemState) -> Unit,
private val onItemLongClick: (NoteTypeItemState) -> Unit,
private val onItemChecked: (NoteTypeItemState, Boolean) -> Unit,
Expand All @@ -76,7 +73,7 @@ internal class NoteTypesAdapter(
viewType: Int,
): NoteTypeViewHolder =
NoteTypeViewHolder(
rowView = layoutInflater.inflate(R.layout.item_manage_note_type, parent, false),
binding = ItemManageNoteTypeBinding.inflate(layoutInflater, parent, false),
onDelete = onDelete,
onRename = onRename,
onEditCards = onEditCards,
Expand All @@ -93,39 +90,34 @@ internal class NoteTypesAdapter(
}

inner class NoteTypeViewHolder(
private val rowView: View,
private val binding: ItemManageNoteTypeBinding,
onItemClick: (NoteTypeItemState) -> Unit,
onItemLongClick: (NoteTypeItemState) -> Unit,
onItemChecked: (NoteTypeItemState, Boolean) -> Unit,
onEditCards: (NoteTypeItemState) -> Unit,
onRename: (NoteTypeItemState) -> Unit,
onDelete: (NoteTypeItemState) -> Unit,
) : RecyclerView.ViewHolder(rowView) {
) : RecyclerView.ViewHolder(binding.root) {
private val selectableItemBackground: Int =
rowView.context.usingStyledAttributes(null, intArrayOf(android.R.attr.selectableItemBackground)) {
context.usingStyledAttributes(null, intArrayOf(android.R.attr.selectableItemBackground)) {
getResourceId(0, 0)
}
private val selectedNoteTypeBackground: Int =
rowView.context.usingStyledAttributes(null, intArrayOf(R.attr.currentDeckBackground)) {
context.usingStyledAttributes(null, intArrayOf(R.attr.currentDeckBackground)) {
getResourceId(0, 0)
}
val name: TextView = rowView.findViewById(R.id.note_name)
val useCount: TextView = rowView.findViewById(R.id.note_use_count)
private val btnEditCards: MaterialButton = rowView.findViewById(R.id.note_edit_cards)
private val btnMoreActions: MaterialButton = rowView.findViewById(R.id.btn_more)
private val checkbox: CheckBox = rowView.findViewById(R.id.checkbox)

private var noteTypeItemState: NoteTypeItemState? = null
private val resources = rowView.context.resources

init {
rowView.setOnClickListener { noteTypeItemState?.let(onItemClick) }
rowView.setOnLongClickListener {
itemView.setOnClickListener { noteTypeItemState?.let(onItemClick) }
itemView.setOnLongClickListener {
noteTypeItemState?.let(onItemLongClick)
true
}
btnEditCards.setOnClickListener { noteTypeItemState?.let(onEditCards) }
btnMoreActions.setOnClickListener {
PopupMenu(rowView.context, btnMoreActions)
binding.editCardsButton.setOnClickListener { noteTypeItemState?.let(onEditCards) }
binding.moreActionsButton.setOnClickListener {
PopupMenu(context, binding.moreActionsButton)
.apply {
inflate(R.menu.note_types_more_actions)
setOnMenuItemClickListener { item ->
Expand All @@ -138,21 +130,21 @@ internal class NoteTypesAdapter(
}
}.show()
}
checkbox.setOnCheckedChangeListener { _, isChecked ->
binding.checkbox.setOnCheckedChangeListener { _, isChecked ->
noteTypeItemState?.let { onItemChecked(it, isChecked) }
}
}

fun bind(state: NoteTypeItemState) {
this.noteTypeItemState = state
rowView.setBackgroundResource(if (state.isSelected) selectedNoteTypeBackground else selectableItemBackground)
btnEditCards.isVisible = !isInMultiSelectMode
btnMoreActions.isVisible = !isInMultiSelectMode
checkbox.isVisible = isInMultiSelectMode
checkbox.isChecked = isInMultiSelectMode && state.isSelected
name.text = state.name
useCount.text =
resources.getQuantityString(
itemView.setBackgroundResource(if (state.isSelected) selectedNoteTypeBackground else selectableItemBackground)
binding.editCardsButton.isVisible = !isInMultiSelectMode
binding.moreActionsButton.isVisible = !isInMultiSelectMode
binding.checkbox.isVisible = isInMultiSelectMode
binding.checkbox.isChecked = isInMultiSelectMode && state.isSelected
binding.noteName.text = state.name
binding.noteUseCount.text =
context.resources.getQuantityString(
R.plurals.model_browser_of_type,
state.useCount,
state.useCount,
Expand Down
10 changes: 5 additions & 5 deletions AnkiDroid/src/main/res/layout/item_manage_note_type.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
android:textAppearance="?attr/textAppearanceListItem"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/note_edit_cards"
app:layout_constraintEnd_toStartOf="@id/edit_cards_button"
app:layout_constraintHorizontal_bias="0.0"
tools:text="Basic (and reversed card)"
/>
Expand All @@ -29,26 +29,26 @@
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/note_name"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/note_edit_cards"
app:layout_constraintEnd_toStartOf="@id/edit_cards_button"
app:layout_constraintHorizontal_bias="0.0"
app:flow_horizontalBias="0.0"
tools:text="912 notes"
/>

<com.google.android.material.button.MaterialButton
android:id="@+id/note_edit_cards"
android:id="@+id/edit_cards_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/ic_edit_note"
style="@style/Widget.Material3.Button.IconButton"
android:contentDescription="@string/model_browser_template"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btn_more"
app:layout_constraintEnd_toStartOf="@+id/more_actions_button"
/>

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_more"
android:id="@+id/more_actions_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/ic_more_vertical"
Expand Down