fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-02-08 23:48:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #238, save note text at renaming, if autosave is enabled

Browse Source
This commit is contained in:
tibbi 2018-12-09 21:03:23 +01:00
parent b314acf30c
commit 4498428fb5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
View File

@ -294,7 +294,7 @@ class MainActivity : SimpleActivity() {
} }
private fun displayRenameDialog() { private fun displayRenameDialog() {
RenameNoteDialog(this, mCurrentNote) { RenameNoteDialog(this, mCurrentNote, getCurrentNoteText()) {
mCurrentNote = it mCurrentNote = it
initViewPager(mCurrentNote.id) initViewPager(mCurrentNote.id)
} }

7
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt
View File

@ -5,13 +5,14 @@ import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.notesDB import com.simplemobiletools.notes.pro.extensions.notesDB
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_new_note.view.* import kotlinx.android.synthetic.main.dialog_new_note.view.*
import java.io.File import java.io.File
class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val callback: (note: Note) -> Unit) { class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val currentNoteText: String?, val callback: (note: Note) -> Unit) {
init { init {
val view = activity.layoutInflater.inflate(R.layout.dialog_rename_note, null) val view = activity.layoutInflater.inflate(R.layout.dialog_rename_note, null)
@ -39,6 +40,10 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val callbac
activity.notesDB.getNoteIdWithTitle(title) != null -> activity.toast(R.string.title_taken) activity.notesDB.getNoteIdWithTitle(title) != null -> activity.toast(R.string.title_taken)
else -> { else -> {
note.title = title note.title = title
if (activity.config.autosaveNotes && currentNoteText != null) {
note.value = currentNoteText
}
val path = note.path val path = note.path
if (path.isEmpty()) { if (path.isEmpty()) {
activity.notesDB.insertOrUpdate(note) activity.notesDB.insertOrUpdate(note)