From 2d36835ebbafe06ba485586a7a59984e39040d0b Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 7 Dec 2018 21:55:21 +0100 Subject: [PATCH] allow creating notes of a new type, Checklist --- .../notes/pro/activities/MainActivity.kt | 4 ++-- .../simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt | 9 +++++++-- app/src/main/res/layout/dialog_new_note.xml | 9 +++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index ce818327..dddb7674 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -312,8 +312,8 @@ class MainActivity : SimpleActivity() { private fun displayNewNoteDialog(value: String = "") { NewNoteDialog(this) { - val newNote = Note(null, it, value, TYPE_NOTE) - addNewNote(newNote) + it.value = value + addNewNote(it) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt index 57796009..fea01633 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt @@ -9,9 +9,12 @@ import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.extensions.notesDB +import com.simplemobiletools.notes.pro.helpers.TYPE_CHECKLIST +import com.simplemobiletools.notes.pro.helpers.TYPE_NOTE +import com.simplemobiletools.notes.pro.models.Note import kotlinx.android.synthetic.main.dialog_new_note.view.* -class NewNoteDialog(val activity: Activity, callback: (title: String) -> Unit) { +class NewNoteDialog(val activity: Activity, callback: (note: Note) -> Unit) { init { val view = activity.layoutInflater.inflate(R.layout.dialog_new_note, null) @@ -28,7 +31,9 @@ class NewNoteDialog(val activity: Activity, callback: (title: String) -> Unit) { title.isEmpty() -> activity.toast(R.string.no_title) activity.notesDB.getNoteIdWithTitle(title) != null -> activity.toast(R.string.title_taken) else -> { - callback(title) + val type = if (view.note_checklist.isChecked) TYPE_CHECKLIST else TYPE_NOTE + val newNote = Note(null, title, "", type) + callback(newNote) dismiss() } } diff --git a/app/src/main/res/layout/dialog_new_note.xml b/app/src/main/res/layout/dialog_new_note.xml index bccc6120..1f614e11 100644 --- a/app/src/main/res/layout/dialog_new_note.xml +++ b/app/src/main/res/layout/dialog_new_note.xml @@ -18,4 +18,13 @@ android:textCursorDrawable="@null" android:textSize="@dimen/normal_text_size"/> + +