Skip to content

Feature/Remove empty note creation when no content is entered #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johntheprime wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feature/Remove empty note creation when no content is entered #169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions app/src/main/java/com/omgodse/notally/viewmodels/NotallyModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,9 @@ class NotallyModel(private val app: Application) : AndroidViewModel(app) {
audios.value = baseNote.audios
reminder.value = baseNote.reminder
} else {
createBaseNote()
Toast.makeText(app, R.string.cant_find_note, Toast.LENGTH_LONG).show()
}
} else createBaseNote()
}

private suspend fun createBaseNote() {
id = withContext(Dispatchers.IO) { baseNoteDao.insert(getBaseNote()) }
}
}


Expand All @@ -302,7 +297,20 @@ class NotallyModel(private val app: Application) : AndroidViewModel(app) {
}

suspend fun saveNote(): Long {
return withContext(Dispatchers.IO) { baseNoteDao.insert(getBaseNote()) }
if (isEmpty()) return 0L
return withContext(Dispatchers.IO) {
val savedId = baseNoteDao.insert(getBaseNote())
if (isNewNote) {
id = savedId
isNewNote = false
}
savedId
}
}

private fun isEmpty(): Boolean {
val bodyText = body.trimEnd().toString()
return title.isEmpty() && bodyText.isEmpty() && items.none { it.body.isNotEmpty() }
}

private suspend fun updateImages() {
Expand Down