refactor(notetypeFieldEditor): NotetypeFieldEditor ViewModel by S-H-Y-A · Pull Request #20480 · ankidroid/Anki-Android

S-H-Y-A · 2026-03-15T12:46:44Z

Purpose / Description

This commit brings ViewModel to NotetypeFieldEditor, including no UI change.
This is the first one of the split PRs of #20453.

Approach

Moved NotetypeFieldEditor.kt to group it and other new files.
Moved UI states and the operations of editing collection to ViewModel.
Extracted edit dialogs to from NotetypeFieldEditor.kt, to clarify these dialogs' roles.

How Has This Been Tested?

Physical device
Pixel 7a
Android 16

Learning (optional, can help others)

Checklist

Please, go through these checks before submitting the PR.

You have a descriptive commit message with a short title (first line, max 50 chars).
You have commented your code, particularly in hard-to-understand areas
You have performed a self-review of your own code
UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
UI Changes: You have tested your change using the Google Accessibility Scanner

david-allison

Please remove the merge commit from the history and fix the lint errors

david-allison

Is there any way you can rebase this to make it easier to review?

I'm looking through 8d21a89 and most of the changes feel unnecessary/incorrect

for example:

- AnkiActivity(R.layout.note_type_field_editor) {
+ com.ichi2.anki.AnkiActivity(_root_ide_package_.com.ichi2.anki.R.layout.note_type_field_editor) {

S-H-Y-A · 2026-03-15T18:08:41Z

Thank you for quick look.
I rebased the branch and fixed as many wrong/inappropriate changes as I could recognize.
If there are any additional required changes, please tell me those.

david-allison · 2026-03-15T18:13:38Z

AnkiDroid/src/main/java/com/ichi2/anki/notetype/fieldeditor/NoteTypeFieldEditor.kt

-        noteFields = notetype.fields
-        fieldsLabels = notetype.fieldsNames
-        binding.fields.adapter = NoteFieldAdapter(this, fieldNamesWithKind())
+        lifecycleScope.launch {


launchCollectionInLifecycleScope

david-allison · 2026-03-15T18:15:48Z

AnkiDroid/src/main/java/com/ichi2/anki/notetype/fieldeditor/NoteTypeFieldEditorViewModel.kt

@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2024 Neel Doshi <neeldoshi147@gmail.com>


Your copyright as well

david-allison · 2026-03-15T18:28:46Z

AnkiDroid/src/main/java/com/ichi2/anki/notetype/fieldeditor/NoteTypeFieldEditor.kt

+                    viewModel.state.value.noteFields[viewModel.state.value.currentPos]
+                        .name


This is verbose.

The use of currentPos is questionable, but why not define this as viewModel.currentField.name

david-allison · 2026-03-15T18:31:18Z

AnkiDroid/src/main/java/com/ichi2/anki/notetype/fieldeditor/NoteTypeFieldEditorState.kt

+    val noteFields: Fields = notetype.fields,
+    val fieldsLabels: List<String> = notetype.fieldsNames,
+    val isLoading: Boolean = false,
+)


Most of these properties are derived properties which are unchanged, and therefore shouldn't be in the constructor.

david-allison · 2026-03-15T18:31:25Z

AnkiDroid/src/main/java/com/ichi2/anki/notetype/fieldeditor/NoteTypeFieldEditorState.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024 Neel Doshi <neeldoshi147@gmail.com>


david-allison · 2026-03-15T18:31:42Z

AnkiDroid/src/main/java/com/ichi2/anki/notetype/fieldeditor/NoteTypeFieldEditorViewModel.kt

+) : ViewModel() {
+    private val _state by lazy {
+        val noteTypeID = savedStateHandle.get<Long>(EXTRA_NOTETYPE_ID) ?: 0
+        val notetype = getColUnsafe().notetypes.get(noteTypeID)!!


Don't use getColUnsafe() in ViewModels

david-allison · 2026-03-15T18:32:21Z

AnkiDroid/src/main/java/com/ichi2/anki/notetype/fieldeditor/NoteTypeFieldEditorViewModel.kt

+class NoteTypeFieldEditorViewModel(
+    private val savedStateHandle: SavedStateHandle,
+) : ViewModel() {
+    private val _state by lazy {


I find it's OK to expose MutableStateFlow publicly

Now we're on Kotlin 2.3, we can specify a different type for the public view of the type

According to the lint, "-Xexplicit-backing-fields" need to use Explicit Backing Fields.
The lint failed due to it.
(I oppressed it on my local machine when coding.)

david-allison · 2026-03-15T18:32:44Z

AnkiDroid/src/main/java/com/ichi2/anki/notetype/fieldeditor/NoteTypeFieldEditorViewModel.kt

+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+class NoteTypeFieldEditorViewModel(


Please add tests

Brought in viewModel to NoteTypeFieldEditor

…peFieldEditor.kt

Removed unnecessary values from the state Stopped offering unnecessary data to NoteTypeFieldEditor.kt Removed an unused method: undo()

S-H-Y-A · 2026-03-16T06:18:17Z

I have been working on #20453 this week.
As I mentioned in #20453, I spent my vacation on these commits, but it has become clear that I won't be able to finish them before my vacation ends.
I believe it's better to close this PR for now rather than leaving it in an unfinished state. I will suspend work on #20453, too. I know it's selfish, but forgive me; I'm staying on as a user because I love this app.

david-allison · 2026-03-16T16:08:38Z

That's not a problem. We'll get it in. Thanks so much for your time!

Do get in touch before a large change next time, and we can speed things along

github-actions bot added the Needs Review label Mar 15, 2026

david-allison added the Needs Author Reply Waiting for a reply from the original author label Mar 15, 2026

david-allison requested changes Mar 15, 2026

View reviewed changes

S-H-Y-A force-pushed the notetypeFieldEditor_viewModel branch from f902c97 to df487ef Compare March 15, 2026 14:33

david-allison reviewed Mar 15, 2026

View reviewed changes

S-H-Y-A force-pushed the notetypeFieldEditor_viewModel branch 2 times, most recently from 4ea4517 to c68f093 Compare March 15, 2026 17:47

S-H-Y-A requested a review from david-allison March 15, 2026 18:08

david-allison reviewed Mar 15, 2026

View reviewed changes

S-H-Y-A added 6 commits March 16, 2026 11:49

refactor: reposition NoteTypeFieldEditor.kt

e89f5b5

refactor(notetypefieldeditor): move edit field operations to viewModel

fec46d5

Brought in viewModel to NoteTypeFieldEditor

refactor(notetypefieldeditor): extract edit field dialogs from NoteTy…

1ae73be

…peFieldEditor.kt

refactor(notetypefieldeditor): improve the viewmodel independence

5ada8db

Removed unnecessary values from the state Stopped offering unnecessary data to NoteTypeFieldEditor.kt Removed an unused method: undo()

test(notetypefieldeditor): add NoteTypeFieldEditorViewModelTest

2350124

refactor(notetypefieldeditor): appropriate Copyright

a2fefbf

S-H-Y-A force-pushed the notetypeFieldEditor_viewModel branch from 1ed1160 to a2fefbf Compare March 16, 2026 02:56

S-H-Y-A closed this Mar 16, 2026

S-H-Y-A mentioned this pull request Mar 16, 2026

feat: New intuitive edit notetype field screen #20453

Draft

5 tasks

		@@ -0,0 +1,148 @@
		/*
		* Copyright (c) 2024 Neel Doshi <neeldoshi147@gmail.com>

		viewModel.state.value.noteFields[viewModel.state.value.currentPos]
		.name

		@@ -0,0 +1,29 @@
		/*
		* Copyright (c) 2024 Neel Doshi <neeldoshi147@gmail.com>

Uh oh!

Conversation

S-H-Y-A commented Mar 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose / Description

Approach

How Has This Been Tested?

Learning (optional, can help others)

Checklist

Uh oh!

david-allison left a comment

Choose a reason for hiding this comment

Uh oh!

david-allison left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

S-H-Y-A commented Mar 15, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

S-H-Y-A Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

S-H-Y-A commented Mar 16, 2026

Uh oh!

david-allison commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

S-H-Y-A commented Mar 15, 2026 •

edited

Loading

david-allison left a comment •

edited

Loading

S-H-Y-A Mar 16, 2026 •

edited

Loading

david-allison commented Mar 16, 2026 •

edited

Loading