From dbdfc7b49f9d31f685a9070000b797f115a04bcd Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 18 Jun 2017 21:28:10 +0200 Subject: [PATCH] minor code cleanup --- .../simplemobiletools/notes/activities/MainActivity.kt | 10 ++++++---- .../notes/adapters/NotesPagerAdapter.kt | 6 +----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt index c7642644..549737ff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -69,20 +69,22 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { } private fun handleText(text: String) { - val notes = DBHelper.newInstance(this@MainActivity).getNotes() + val notes = mDb.getNotes() val list = arrayListOf().apply { add(RadioItem(0, getString(R.string.create_new_note))) - notes.forEachIndexed { index, note -> add(RadioItem(index + 1, note.title)) } + notes.forEachIndexed { index, note -> + add(RadioItem(index + 1, note.title)) + } } - RadioGroupDialog(this@MainActivity, list, -1, R.string.add_to_note, { + RadioGroupDialog(this, list, -1, R.string.add_to_note) { if (it as Int == 0) { displayNewNoteDialog(text) } else { updateSelectedNote(notes[it - 1].id) addTextToCurrentNote(if (mCurrentNote.value.isEmpty()) text else "\n$text") } - }).create() + } } private fun initViewPager() { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt index c0eab44c..20ef6b74 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt @@ -36,11 +36,7 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity fun getCurrentNoteViewText(position: Int) = fragments[position]?.getCurrentNoteViewText() - fun appendText(position: Int, text: String) { - val fragment = fragments[position] - val finalText = fragment?.getCurrentNoteViewText() + text - fragment?.getNotesView()?.setText(finalText) - } + fun appendText(position: Int, text: String) = fragments[position]?.getNotesView()?.append(text) fun saveCurrentNote(position: Int) = fragments[position]?.saveText()