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

make mAdapter nullable

Browse Source
This commit is contained in:
tibbi 2017-07-10 19:20:51 +02:00
parent 459aa99cdb
commit 3123b96b0c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,11 +36,11 @@ import java.io.File
import java.nio.charset.Charset import java.nio.charset.Charset
class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
val STORAGE_OPEN_FILE = 1 private val STORAGE_OPEN_FILE = 1
val STORAGE_EXPORT_AS_FILE = 2 private val STORAGE_EXPORT_AS_FILE = 2
private var mAdapter: NotesPagerAdapter? = null
lateinit var mCurrentNote: Note lateinit var mCurrentNote: Note
lateinit var mAdapter: NotesPagerAdapter
lateinit var mDb: DBHelper lateinit var mDb: DBHelper
lateinit var mNotes: List<Note> lateinit var mNotes: List<Note>
@ -154,7 +154,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
// https://code.google.com/p/android/issues/detail?id=191430 quickfix // https://code.google.com/p/android/issues/detail?id=191430 quickfix
override fun onActionModeStarted(mode: ActionMode?) { override fun onActionModeStarted(mode: ActionMode?) {
super.onActionModeStarted(mode) super.onActionModeStarted(mode)
currentNotesView().apply { currentNotesView()?.apply {
if (config.clickableLinks || movementMethod == LinkMovementMethod.getInstance()) { if (config.clickableLinks || movementMethod == LinkMovementMethod.getInstance()) {
movementMethod = ArrowKeyMovementMethod.getInstance() movementMethod = ArrowKeyMovementMethod.getInstance()
noteViewWithTextSelected = this noteViewWithTextSelected = this
@ -169,7 +169,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
} }
} }
private fun currentNotesView() = mAdapter.getItem(view_pager.currentItem).notes_view private fun currentNotesView() = mAdapter?.getItem(view_pager.currentItem)?.notes_view
private fun displayRenameDialog() { private fun displayRenameDialog() {
RenameNoteDialog(this, mDb, mCurrentNote) { RenameNoteDialog(this, mDb, mCurrentNote) {
@ -200,7 +200,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
updateSelectedNote(id) updateSelectedNote(id)
view_pager.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener { view_pager.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
override fun onGlobalLayout() { override fun onGlobalLayout() {
mAdapter.showKeyboard(getNoteIndexWithId(id)) mAdapter?.showKeyboard(getNoteIndexWithId(id))
view_pager.viewTreeObserver.removeOnGlobalLayoutListener(this) view_pager.viewTreeObserver.removeOnGlobalLayoutListener(this)
} }
}) })