refractor edit view model

wiiznokes · wiiznokes · commit 8f9046de9fef · 2025-05-19T17:00:49.000+02:00
diff --git a/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/EditScreen.kt b/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/EditScreen.kt
@@ -1,6 +1,5 @@
 package io.github.wiiznokes.gitnote.ui.screen.app
 
-import android.util.Log
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -14,7 +13,8 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Done
-import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.Lock
+import androidx.compose.material.icons.filled.LockOpen
 import androidx.compose.material.icons.filled.Save
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -102,7 +102,7 @@ fun EditScreen(
                 navigationIcon = {
                     IconButton(
                         onClick = {
-                            vm.onFinish()
+                            vm.shouldSaveWhenQuitting = false
                             onFinished()
                         },
                     ) {
@@ -151,31 +151,35 @@ fun EditScreen(
                             contentColor = MaterialTheme.colorScheme.onPrimary
                         ),
                         onClick = {
-                            vm.onValidation(onSuccess = null)
+                            vm.save()
                         },
                         enabled = !isReadOnlyModeActive
                     ) {
                         SimpleIcon(
                             imageVector = Icons.Default.Save,
                         )
                     }
-                    if (isReadOnlyModeActive) {
-                        Spacer(modifier = Modifier.width(10.dp))
-                        IconButton(
-                            colors = IconButtonDefaults.iconButtonColors(
-                                containerColor = MaterialTheme.colorScheme.primary,
-                                contentColor = MaterialTheme.colorScheme.onPrimary
-                            ),
-                            onClick = {
-                                vm.viewModelScope.launch {
-                                    vm.prefs.isReadOnlyModeActive.update(false)
-                                }
+
+                    Spacer(modifier = Modifier.width(10.dp))
+
+                    IconButton(
+                        colors = IconButtonDefaults.iconButtonColors(
+                            containerColor = MaterialTheme.colorScheme.primary,
+                            contentColor = MaterialTheme.colorScheme.onPrimary
+                        ),
+                        onClick = {
+                            vm.viewModelScope.launch {
+                                vm.prefs.isReadOnlyModeActive.update(!isReadOnlyModeActive)
+                            }
+                        },
+                    ) {
+                        SimpleIcon(
+                            imageVector = if (isReadOnlyModeActive) {
+                                Icons.Default.Lock
+                            } else {
+                                Icons.Default.LockOpen
                             },
-                        ) {
-                            SimpleIcon(
-                                imageVector = Icons.Default.Edit,
-                            )
-                        }
+                        )
                     }
                 }
             )
@@ -189,8 +193,7 @@ fun EditScreen(
                     containerColor = MaterialTheme.colorScheme.primary,
                     shape = RoundedCornerShape(20.dp),
                     onClick = {
-                        vm.onFinish()
-                        vm.onValidation(onSuccess = onFinished)
+                        vm.save(onSuccess = onFinished)
                     }
                 ) {
                     SimpleIcon(
@@ -203,17 +206,15 @@ fun EditScreen(
     ) { paddingValues ->
 
         if (isReadOnlyModeActive && vm.fileExtension.value is FileExtension.Md) {
-            Log.d(TAG, vm.content.value.text)
-            Box {
-                RichText(
-                    modifier = Modifier
-                        .padding(paddingValues)
-                        .fillMaxSize()
-                ) {
-                    Markdown(vm.content.value.text)
-                }
+            RichText(
+                modifier = Modifier
+                    .padding(paddingValues)
+                    .fillMaxSize()
+            ) {
+                Markdown(vm.content.value.text)
             }
 
+
         } else {
             TextField(
                 modifier = Modifier
@@ -234,8 +235,7 @@ fun EditScreen(
                 ),
                 keyboardActions = KeyboardActions(
                     onDone = {
-                        vm.onFinish()
-                        vm.onValidation(onSuccess = onFinished)
+                        vm.save(onSuccess = onFinished)
                     }
                 ),
                 readOnly = isReadOnlyModeActive
diff --git a/app/src/main/java/io/github/wiiznokes/gitnote/ui/viewmodel/EditViewModel.kt b/app/src/main/java/io/github/wiiznokes/gitnote/ui/viewmodel/EditViewModel.kt
@@ -11,7 +11,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
 import io.github.wiiznokes.gitnote.MyApp
 import io.github.wiiznokes.gitnote.R
-import io.github.wiiznokes.gitnote.data.AppPreferences
 import io.github.wiiznokes.gitnote.data.room.Note
 import io.github.wiiznokes.gitnote.helper.NameValidation
 import io.github.wiiznokes.gitnote.helper.UiHelper
@@ -50,7 +49,7 @@ class EditViewModel() : ViewModel() {
     lateinit var content: MutableState<TextFieldValue>
     lateinit var fileExtension: MutableState<FileExtension>
 
-    private var isSaved: Boolean = false
+    var shouldSaveWhenQuitting: Boolean = true
 
     constructor(editType: EditType, previousNote: Note) : this() {
         this.editType = editType
@@ -91,12 +90,13 @@ class EditViewModel() : ViewModel() {
     private val uiHelper: UiHelper = MyApp.appModule.uiHelper
     val prefs = MyApp.appModule.appPreferences
 
+    fun save(onSuccess: () -> Unit = {}) {
 
-    fun onFinish() {
-        isSaved = true
-    }
-
-    fun onValidation(onSuccess: (() -> Unit)?) {
+        if (isPreviousNoteTheSame()) {
+            uiHelper.makeToast(uiHelper.getString(R.string.error_note_is_the_same))
+            onSuccess()
+            return
+        }
 
         when (editType) {
             EditType.Create -> create(
@@ -106,12 +106,9 @@ class EditViewModel() : ViewModel() {
                 content = content.value.text,
                 id = previousNote.id
             ).onSuccess {
-                if (onSuccess != null) {
-                    onSuccess()
-                } else {
-                    editType = EditType.Update
-                    previousNote = it
-                }
+                editType = EditType.Update
+                previousNote = it
+                onSuccess()
             }
 
             EditType.Update -> update(
@@ -121,16 +118,13 @@ class EditViewModel() : ViewModel() {
                 fileExtension = fileExtension.value,
                 content = content.value.text,
             ).onSuccess {
-                if (onSuccess != null) {
-                    onSuccess()
-                } else {
-                    previousNote = it
-                }
+                previousNote = it
+                onSuccess()
             }
         }
     }
 
-    /** Return early to note block the ui thread.
+    /** Return early to not block the ui thread.
      * This is a best effort to catch problem
      */
     private fun update(
@@ -234,15 +228,17 @@ class EditViewModel() : ViewModel() {
         return success(note)
     }
 
+    private fun isPreviousNoteTheSame(): Boolean =
+        previousNote.nameWithoutExtension() == name.value.text
+                && previousNote.content == content.value.text
+                && previousNote.fileExtension().text == fileExtension.value.text
+
     override fun onCleared() {
 
-        fun isPreviousNoteTheSame(): Boolean =
-            previousNote.nameWithoutExtension() == name.value.text
-                    && previousNote.content == content.value.text
-                    && previousNote.fileExtension().text == fileExtension.value.text
 
 
-        if (isSaved || isPreviousNoteTheSame()) {
+
+        if (!shouldSaveWhenQuitting || isPreviousNoteTheSame()) {
             writeObj(EDIT_IS_UNSAVED, false)
             return
         }
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -73,6 +73,7 @@
     <string name="error_clone_repo">Impossible de clone: %1$s</string>
     <string name="error_open_repo">Impossible d\'ouvrir le dépôt: %1$s</string>
     <string name="error_create_repo">Impossible de créer le dépôt: %1$s</string>
+    <string name="error_note_is_the_same">Aucune modification</string>
     <string name="grid">Grille</string>
     <string name="about">À propos</string>
     <string name="app_page_choose_method">Choisir la méthode</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -62,6 +62,7 @@
     <string name="error_invalid_name">Name is invalid</string>
     <string name="error_invalid_extension">Extension is invalid</string>
     <string name="error_folder_already_exist">Folder already exist</string>
+    <string name="error_note_is_the_same">No modification</string>
     <string name="grid">Grid</string>
     <string name="about">About</string>
     <string name="app_page_choose_method">Choose method</string>
