Merge branch 'main' into feature/following-screen

android/Omnivore/app/build.gradle.kts

@@ -27,8 +27,8 @@ android {
         applicationId = "app.omnivore.omnivore"
         minSdk = 26
         targetSdk = 34
-        versionCode = 194001
-        versionName = "0.195.0"
+        versionCode = 200004
+        versionName = "0.200.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

android/Omnivore/app/src/main/java/app/omnivore/omnivore/core/database/OmnivoreDatabase.kt

@@ -27,7 +27,7 @@ import app.omnivore.omnivore.core.database.entities.ViewerDao
         HighlightChange::class,
         SavedItemAndSavedItemLabelCrossRef::class,
         SavedItemAndHighlightCrossRef::class],
-    version = 24,
+    version = 26,
     exportSchema = true
 )
 abstract class OmnivoreDatabase : RoomDatabase() {

android/Omnivore/app/src/main/java/app/omnivore/omnivore/di/DatabaseModule.kt

@@ -21,5 +21,7 @@ object DatabaseModule {
         context,
         OmnivoreDatabase::class.java,
         "omnivore-database",
-    ).build()
+    )
+    .fallbackToDestructiveMigration()
+    .build()
 }

android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/notebook/NotebookView.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material3.*
@@ -42,6 +43,7 @@ import app.omnivore.omnivore.core.database.entities.Highlight
 import app.omnivore.omnivore.feature.theme.OmnivoreTheme
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardCapitalization
 
 
 fun notebookMD(notes: List<Highlight>, highlights: List<Highlight>): String {
@@ -179,12 +181,15 @@ fun EditNoteModal(initialValue: String?, onDismiss: (save: Boolean, text: String
                     )
                 }
             ) { paddingValues ->
-
                 TextField(
                     modifier = Modifier
                         .padding(top = paddingValues.calculateTopPadding())
                         .focusRequester(focusRequester)
                         .fillMaxSize(),
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        autoCorrect = true,
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
                     value = annotation.value, onValueChange = { annotation.value = it },
                     colors = TextFieldDefaults.textFieldColors(
                         focusedTextColor = MaterialTheme.colorScheme.onSurface,