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

handle note updating and inserting

Browse Source
This commit is contained in:
tibbi 2018-11-07 19:57:30 +01:00
parent 99ee559836
commit 95ab889045
6 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,10 @@ import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.adapters.NotesPagerAdapter import com.simplemobiletools.notes.pro.adapters.NotesPagerAdapter
import com.simplemobiletools.notes.pro.databases.NotesDatabase import com.simplemobiletools.notes.pro.databases.NotesDatabase
import com.simplemobiletools.notes.pro.dialogs.* import com.simplemobiletools.notes.pro.dialogs.*
import com.simplemobiletools.notes.pro.extensions.* import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.dbHelper
import com.simplemobiletools.notes.pro.extensions.getTextSize
import com.simplemobiletools.notes.pro.extensions.updateWidgets
import com.simplemobiletools.notes.pro.helpers.MIME_TEXT_PLAIN import com.simplemobiletools.notes.pro.helpers.MIME_TEXT_PLAIN
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.helpers.OPEN_NOTE_ID import com.simplemobiletools.notes.pro.helpers.OPEN_NOTE_ID
@ -304,19 +307,16 @@ class MainActivity : SimpleActivity() {
} }
private fun addNewNote(note: Note) { private fun addNewNote(note: Note) {
Thread { NotesHelper(this).insertOrUpdateNote(note) {
val id = notesDB.insertOrUpdate(note) val newNoteId = it
mNotes = notesDB.getNotes().toMutableList() as ArrayList<Note>
showSaveButton = false showSaveButton = false
runOnUiThread { invalidateOptionsMenu()
invalidateOptionsMenu() initViewPager()
initViewPager() updateSelectedNote(newNoteId)
updateSelectedNote(id) view_pager.onGlobalLayout {
view_pager.onGlobalLayout { mAdapter?.focusEditText(getNoteIndexWithId(newNoteId))
mAdapter?.focusEditText(getNoteIndexWithId(id))
}
} }
}.start() }
} }
private fun launchAbout() { private fun launchAbout() {
@ -455,7 +455,7 @@ class MainActivity : SimpleActivity() {
mCurrentNote.value = "" mCurrentNote.value = ""
} }
dbHelper.updateNote(mCurrentNote) NotesHelper(this).insertOrUpdateNote(mCurrentNote)
} }
} }
} }

6
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt
View File

@ -9,7 +9,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
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.dbHelper import com.simplemobiletools.notes.pro.extensions.dbHelper
import com.simplemobiletools.notes.pro.extensions.notesDB import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.helpers.TYPE_NOTE import com.simplemobiletools.notes.pro.helpers.TYPE_NOTE
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_import_folder.view.* import kotlinx.android.synthetic.main.dialog_import_folder.view.*
@ -67,8 +67,6 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal
private fun saveNote(title: String, value: String, path: String) { private fun saveNote(title: String, value: String, path: String) {
val note = Note(null, title, value, TYPE_NOTE, path) val note = Note(null, title, value, TYPE_NOTE, path)
Thread { NotesHelper(activity).insertOrUpdateNote(note)
activity.notesDB.insertOrUpdate(note)
}
} }
} }

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

@ -6,6 +6,7 @@ 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.dbHelper import com.simplemobiletools.notes.pro.extensions.dbHelper
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
@ -31,7 +32,10 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, callback: (
note.title = title note.title = title
val path = note.path val path = note.path
if (path.isEmpty()) { if (path.isEmpty()) {
activity.dbHelper.updateNote(note) NotesHelper(activity).insertOrUpdateNote(note) {
dismiss()
callback(note)
}
} else { } else {
if (title.isEmpty()) { if (title.isEmpty()) {
activity.toast(R.string.filename_cannot_be_empty) activity.toast(R.string.filename_cannot_be_empty)
@ -48,16 +52,16 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, callback: (
activity.renameFile(file.absolutePath, newFile.absolutePath) { activity.renameFile(file.absolutePath, newFile.absolutePath) {
if (it) { if (it) {
note.path = newFile.absolutePath note.path = newFile.absolutePath
activity.dbHelper.updateNote(note) NotesHelper(activity).insertOrUpdateNote(note) {
dismiss()
callback(note)
}
} else { } else {
activity.toast(R.string.rename_file_error) activity.toast(R.string.rename_file_error)
return@renameFile return@renameFile
} }
} }
} }
dismiss()
callback(note)
} }
} }
} }

5
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt
View File

@ -188,8 +188,9 @@ class NoteFragment : androidx.fragment.app.Fragment() {
private fun saveNoteValue(note: Note) { private fun saveNoteValue(note: Note) {
if (note.path.isEmpty()) { if (note.path.isEmpty()) {
db.updateNote(note) NotesHelper(activity!!).insertOrUpdateNote(note) {
(activity as MainActivity).noteSavedSuccessfully(note.title) (activity as MainActivity).noteSavedSuccessfully(note.title)
}
} else { } else {
val currentText = getCurrentNoteViewText() val currentText = getCurrentNoteViewText()
if (currentText != null) { if (currentText != null) {

7
app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/DBHelper.kt
View File

@ -108,13 +108,6 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
return 0 return 0
} }
fun updateNote(note: Note) {
val values = fillNoteContentValues(note)
val selection = "$COL_ID = ?"
val selectionArgs = arrayOf(note.id.toString())
mDb.update(NOTES_TABLE_NAME, values, selection, selectionArgs)
}
fun getWidgets(): ArrayList<Widget> { fun getWidgets(): ArrayList<Widget> {
val widgets = ArrayList<Widget>() val widgets = ArrayList<Widget>()
val cols = arrayOf(COL_WIDGET_ID, COL_NOTE_ID) val cols = arrayOf(COL_WIDGET_ID, COL_NOTE_ID)

9
app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt
View File

@ -41,4 +41,13 @@ class NotesHelper(val activity: Activity) {
} }
}.start() }.start()
} }
fun insertOrUpdateNote(note: Note, callback: ((newNoteId: Long) -> Unit)? = null) {
Thread {
val noteId = activity.notesDB.insertOrUpdate(note)
activity.runOnUiThread {
callback?.invoke(noteId)
}
}.start()
}
} }