Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions AnkiDroid/src/main/java/com/ichi2/anki/dialogs/GradeNowDialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ArrayAdapter
import android.widget.TextView
import androidx.annotation.DrawableRes
import androidx.appcompat.app.AppCompatActivity
import anki.scheduler.CardAnswer.Rating
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.ichi2.anki.CollectionManager.TR
import com.ichi2.anki.R
import com.ichi2.anki.common.annotations.NeedsTest
import com.ichi2.anki.databinding.GradeNowListItemBinding
import com.ichi2.anki.launchCatchingTask
import com.ichi2.anki.libanki.CardId
import com.ichi2.anki.observability.undoableOp
Expand Down Expand Up @@ -105,13 +105,15 @@ private class GradeNowListAdapter(
convertView: View?,
parent: ViewGroup,
): View =
convertView ?: LayoutInflater.from(context).inflate(R.layout.grade_now_list_item, parent, false).apply {
val grade = getItem(position)!!
findViewById<TextView>(R.id.grade_view).apply {
text = grade.getLabel()
setCompoundDrawablesRelativeWithIntrinsicBoundsKt(start = grade.iconRes)
}
}
convertView ?: GradeNowListItemBinding
.inflate(LayoutInflater.from(context), parent, false)
.also { binding ->
val grade = getItem(position)!!
binding.gradeTextView.apply {
text = grade.getLabel()
setCompoundDrawablesRelativeWithIntrinsicBoundsKt(start = grade.iconRes)
}
}.root
}

private enum class Grade(
Expand Down
2 changes: 1 addition & 1 deletion AnkiDroid/src/main/res/layout/grade_now_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
>

<com.ichi2.ui.FixedTextView
android:id="@+id/grade_view"
android:id="@+id/grade_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/listPreferredItemHeight"
Expand Down