One app fixture for the tests, and ViewModels built where they are used

The tests' `app` fixture, the same two lines in eleven files, now lives once in
tests/conftest.py.

On Android each ViewModel carried a companion `factory` that only wrapped its
constructor in viewModelFactory { initializer { … } }. MainActivity now builds
each one with Compose's viewModel { … } builder, so the five factories and their
imports are gone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

android/app/src/main/java/com/fabledsword/inkwell/MainActivity.kt

@@ -219,15 +219,16 @@ private fun App(
 ) {
     val context = LocalContext.current
     val board: BoardViewModel =
-        viewModel(
-            factory =
-                BoardViewModel.factory(core, readFile = files::read) {
-                    // Any store write can have moved the next reminder. Called on
-                    // the IO dispatcher by the view model, which is where it has to
-                    // be — this reads every note carrying a reminder.
-                    Reminders.refresh(context, core)
-                },
-        )
+        viewModel {
+            BoardViewModel(
+                core,
+                // Any store write can have moved the next reminder. Called on the IO
+                // dispatcher by the view model, which is where it has to be — this
+                // reads every note carrying a reminder.
+                onRemindersChanged = { Reminders.refresh(context, core) },
+                readFile = files::read,
+            )
+        }
 
     // Consumed, not just read: without clearing it, every later recomposition
     // would reopen the same note and make the editor impossible to leave.
@@ -251,7 +252,7 @@ private fun App(
     // A pull can rewrite every note the board is holding, so a sync that changed
     // anything tells it to reload. Wired here, at the one place that owns both.
     val sync: SyncViewModel =
-        viewModel(factory = SyncViewModel.factory(core, onStoreChanged = board::refresh))
+        viewModel { SyncViewModel(core, onStoreChanged = board::refresh) }
 
     // Screen visibility is view STATE, not view-model state: it is about what is on
     // the display, and nothing in the store cares. Saveable so a rotation does not
@@ -266,14 +267,14 @@ private fun App(
     // board may be LOOKING at one that a delete or a merge just removed. Both are
     // `refreshLabels`, which also leaves a lens whose tag stopped existing.
     val tags: TagsViewModel =
-        viewModel(factory = TagsViewModel.factory(core, onStoreChanged = board::refreshLabels))
+        viewModel { TagsViewModel(core, onStoreChanged = board::refreshLabels) }
 
     // A share landing changes the note's `shared` flag, which the board's card chip
     // reads, so the board reloads after one.
     val share: ShareViewModel =
-        viewModel(factory = ShareViewModel.factory(core, onStoreChanged = board::refresh))
+        viewModel { ShareViewModel(core, onStoreChanged = board::refresh) }
 
-    val update: UpdateViewModel = viewModel(factory = UpdateViewModel.factory(core, context))
+    val update: UpdateViewModel = viewModel { UpdateViewModel(core, context.applicationContext) }
     val settings = remember(context) { SyncSettings(context) }
     var automatic by remember { mutableStateOf(settings.automatic) }
 

android/app/src/main/java/com/fabledsword/inkwell/ui/BoardViewModel.kt

@@ -5,10 +5,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
 import com.fabledsword.inkwell.core.Inkwell
 import com.fabledsword.inkwell.core.Label
 import com.fabledsword.inkwell.core.Note
@@ -660,13 +657,6 @@ class BoardViewModel(
 
         /** The board and the Archive together — everything not in Trash. */
         private const val VIEW_ALL = "all"
-
-        fun factory(
-            core: Inkwell,
-            readFile: (Uri) -> PickedFile,
-            onRemindersChanged: () -> Unit,
-        ): ViewModelProvider.Factory =
-            viewModelFactory { initializer { BoardViewModel(core, onRemindersChanged, readFile) } }
     }
 }
 

android/app/src/main/java/com/fabledsword/inkwell/ui/ShareViewModel.kt

@@ -4,10 +4,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
 import com.fabledsword.inkwell.core.CoreException
 import com.fabledsword.inkwell.core.Inkwell
 import com.fabledsword.inkwell.core.Member
@@ -132,11 +129,4 @@ class ShareViewModel(
                 }
         }
     }
-
-    companion object {
-        fun factory(
-            core: Inkwell,
-            onStoreChanged: () -> Unit,
-        ): ViewModelProvider.Factory = viewModelFactory { initializer { ShareViewModel(core, onStoreChanged) } }
-    }
 }

android/app/src/main/java/com/fabledsword/inkwell/ui/SyncViewModel.kt

@@ -4,10 +4,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
 import com.fabledsword.inkwell.core.Compatibility
 import com.fabledsword.inkwell.core.Inkwell
 import com.fabledsword.inkwell.core.ProbeResult
@@ -315,13 +312,6 @@ class SyncViewModel(
     fun dismissSyncError() {
         state = state.copy(syncError = null)
     }
-
-    companion object {
-        fun factory(
-            core: Inkwell,
-            onStoreChanged: () -> Unit,
-        ): ViewModelProvider.Factory = viewModelFactory { initializer { SyncViewModel(core, onStoreChanged) } }
-    }
 }
 
 /**

android/app/src/main/java/com/fabledsword/inkwell/ui/TagsViewModel.kt

@@ -4,10 +4,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
 import com.fabledsword.inkwell.core.Inkwell
 import com.fabledsword.inkwell.core.Label
 import kotlinx.coroutines.Dispatchers
@@ -163,11 +160,4 @@ class TagsViewModel(
             onStoreChanged()
         }
     }
-
-    companion object {
-        fun factory(
-            core: Inkwell,
-            onStoreChanged: () -> Unit,
-        ): ViewModelProvider.Factory = viewModelFactory { initializer { TagsViewModel(core, onStoreChanged) } }
-    }
 }

android/app/src/main/java/com/fabledsword/inkwell/ui/UpdateViewModel.kt

@@ -5,10 +5,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
 import com.fabledsword.inkwell.AppUpdate
 import com.fabledsword.inkwell.UpdateOutcome
 import com.fabledsword.inkwell.core.ClientUpdate
@@ -214,14 +211,6 @@ class UpdateViewModel(
     fun dismissError() {
         state = state.copy(error = null)
     }
-
-    companion object {
-        fun factory(
-            core: Inkwell,
-            context: Context,
-        ): ViewModelProvider.Factory =
-            viewModelFactory { initializer { UpdateViewModel(core, context.applicationContext) } }
-    }
 }
 
 private const val FALLBACK = "The update couldn't be checked."