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

change the Note ID type to Long

Browse Source
This commit is contained in:
tibbi
2018-11-07 19:00:06 +01:00
parent 885170edfc
commit 99ee559836
10 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,8 +269,8 @@ class MainActivity : SimpleActivity() {
}
private fun getWantedNoteIndex(): Int {
var wantedNoteId = intent.getIntExtra(OPEN_NOTE_ID, -1)
if (wantedNoteId == -1) {
var wantedNoteId = intent.getLongExtra(OPEN_NOTE_ID, -1)
if (wantedNoteId == -1L) {
wantedNoteId = config.currentNoteId
}
return getNoteIndexWithId(wantedNoteId)
@ -289,7 +289,7 @@ class MainActivity : SimpleActivity() {
}
}
private fun updateSelectedNote(id: Int) {
private fun updateSelectedNote(id: Long) {
config.currentNoteId = id
val index = getNoteIndexWithId(id)
view_pager.currentItem = index
@ -298,14 +298,14 @@ class MainActivity : SimpleActivity() {
private fun displayNewNoteDialog(value: String = "") {
NewNoteDialog(this, dbHelper) {
val newNote = Note(0, it, value, TYPE_NOTE)
val newNote = Note(null, it, value, TYPE_NOTE)
addNewNote(newNote)
}
}
private fun addNewNote(note: Note) {
Thread {
val id = notesDB.insertOrUpdate(note).toInt()
val id = notesDB.insertOrUpdate(note)
mNotes = notesDB.getNotes().toMutableList() as ArrayList<Note>
showSaveButton = false
runOnUiThread {
@ -386,10 +386,11 @@ class MainActivity : SimpleActivity() {
private fun openPath(path: String) {
openFile(path, false) {
var title = path.getFilenameFromPath()
if (dbHelper.doesNoteTitleExist(title))
if (dbHelper.doesNoteTitleExist(title)) {
title += " (file)"
}
val note = Note(0, title, "", TYPE_NOTE, path)
val note = Note(null, title, "", TYPE_NOTE, path)
addNewNote(note)
}
}
@ -406,16 +407,11 @@ class MainActivity : SimpleActivity() {
FilePickerDialog(this, pickFile = false, canAddShowHiddenButton = true) {
openFolder(it) {
ImportFolderDialog(this, it.path) {
val noteId = it
NotesHelper(this).getNotes {
mNotes = it
showSaveButton = false
invalidateOptionsMenu()
initViewPager()
updateSelectedNote(noteId)
view_pager.onGlobalLayout {
mAdapter?.focusEditText(getNoteIndexWithId(noteId))
}
}
}
}
@ -623,7 +619,7 @@ class MainActivity : SimpleActivity() {
mAdapter?.redo(view_pager.currentItem)
}
private fun getNoteIndexWithId(id: Int): Int {
private fun getNoteIndexWithId(id: Long): Int {
for (i in 0 until mNotes.count()) {
if (mNotes[i].id == id) {
mCurrentNote = mNotes[i]

6
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
View File

@ -92,17 +92,17 @@ class WidgetConfigureActivity : SimpleActivity() {
private fun showNoteSelector() {
val items = ArrayList<RadioItem>()
mNotes.forEach {
items.add(RadioItem(it.id!!, it.title))
items.add(RadioItem(it.id!!.toInt(), it.title))
}
RadioGroupDialog(this, items, mCurrentNoteId) {
val selectedId = it as Int
updateCurrentNote(mNotes.first { it.id == selectedId })
updateCurrentNote(mNotes.first { it.id!!.toInt() == selectedId })
}
}
private fun updateCurrentNote(note: Note) {
mCurrentNoteId = note.id!!
mCurrentNoteId = note.id!!.toInt()
notes_picker_value.text = note.title
val sampleValue = if (note.value.isEmpty() || mIsCustomizingColors) getString(R.string.widget_config) else note.value
notes_view.text = sampleValue