fenix
/
Simple-Notes
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #340 from SimpleMobileTools/request_1 

Allow opening files as Checklists
This commit is contained in:
Tibor Kaputa 2020-03-29 15:54:54 +02:00 committed by GitHub
parent 05c2e30a75 6733a9f263
commit 0d17a94d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,8 +497,8 @@ class MainActivity : SimpleActivity() {
}
}
private fun displayNewNoteDialog(value: String = "") {
NewNoteDialog(this) {
private fun displayNewNoteDialog(value: String = "", title: String? = null) {
NewNoteDialog(this, title) {
it.value = value
addNewNote(it)
}
@ -545,12 +545,13 @@ class MainActivity : SimpleActivity() {
val fileText = it.readText().trim()
val checklistItems = fileText.parseChecklistItems()
if (checklistItems != null) {
val note = Note(null, it.absolutePath.getFilenameFromPath().substringBeforeLast('.'), fileText, NoteType.TYPE_CHECKLIST.value)
addNewNote(note)
val title = it.absolutePath.getFilenameFromPath().substringBeforeLast('.')
val note = Note(null, title, fileText, NoteType.TYPE_CHECKLIST.value)
displayNewNoteDialog(note.value, title = title)
} else {
runOnUiThread {
OpenFileDialog(this, it.path) {
addNewNote(it)
displayNewNoteDialog(it.value, title = it.title)
}
}
}

4
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt
View File

@ -15,12 +15,14 @@ import com.simplemobiletools.notes.pro.helpers.NoteType
import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_new_note.view.*
class NewNoteDialog(val activity: Activity, callback: (note: Note) -> Unit) {
class NewNoteDialog(val activity: Activity, title: String? = null, callback: (note: Note) -> Unit) {
init {
val view = activity.layoutInflater.inflate(R.layout.dialog_new_note, null).apply {
new_note_type.check(if (activity.config.lastCreatedNoteType == NoteType.TYPE_TEXT.value) type_text_note.id else type_checklist.id)
}
view.note_title.setText(title)
AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok, null)
.setNegativeButton(R.string.cancel, null)