Commit 32909a5

authored

Merge pull request #687 from esensar/fix/checklist-glitch

Wait for DB updates before refreshing checklist items

2 parents 886a397 + ec668ad commit 32909a5Copy full SHA for 32909a5

File tree

3 files changed

+21

-15

lines changed

app/src/main/kotlin/com/simplemobiletools/notes/pro
- adapters
  - ChecklistAdapter.kt
- fragments
  - ChecklistFragment.kt
- interfaces
  - ChecklistItemsListener.kt

3 files changed

+21

-15

lines changed

`‎app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt‎`

Lines changed: 16 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,9 @@ class ChecklistAdapter(`
`78`	`78`
`79`	`79`	`override fun getItemKeyPosition(key: Int) = items.indexOfFirst { it.id == key }`
`80`	`80`
`81`		`- override fun onActionModeCreated() {`
`82`		`- notifyDataSetChanged()`
`83`		`- }`
	`81`	`+ override fun onActionModeCreated() {}`
`84`	`82`
`85`		`- override fun onActionModeDestroyed() {`
`86`		`- notifyDataSetChanged()`
`87`		`- }`
	`83`	`+ override fun onActionModeDestroyed() {}`
`88`	`84`
`89`	`85`	`override fun prepareActionMode(menu: Menu) {`
`90`	`86`	`val selectedItems = getSelectedItems()`
`@@ -152,35 +148,44 @@ class ChecklistAdapter(`
`152`	`148`	`positions.sortDescending()`
`153`	`149`	`removeSelectedItems(positions)`
`154`	`150`
`155`		`- listener?.saveChecklist()`
`156`		`- if (items.isEmpty()) {`
`157`		`- listener?.refreshItems()`
	`151`	`+ listener?.saveChecklist {`
	`152`	`+ if (items.isEmpty()) {`
	`153`	`+ listener.refreshItems()`
	`154`	`+ }`
`158`	`155`	`}`
`159`	`156`	`}`
`160`	`157`
`161`	`158`	`private fun moveSelectedItemsToTop() {`
`162`	`159`	`activity.config.sorting = SORT_BY_CUSTOM`
	`160`	`+ val movedPositions = mutableListOf<Int>()`
`163`	`161`	`selectedKeys.reversed().forEach { checklistId ->`
`164`	`162`	`val position = items.indexOfFirst { it.id == checklistId }`
`165`	`163`	`val tempItem = items[position]`
`166`	`164`	`items.removeAt(position)`
	`165`	`+ movedPositions.add(position)`
`167`	`166`	`items.add(0, tempItem)`
`168`	`167`	`}`
`169`	`168`
`170`		`- notifyDataSetChanged()`
	`169`	`+ movedPositions.forEach {`
	`170`	`+ notifyItemMoved(it, 0)`
	`171`	`+ }`
`171`	`172`	`listener?.saveChecklist()`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`private fun moveSelectedItemsToBottom() {`
`175`	`176`	`activity.config.sorting = SORT_BY_CUSTOM`
	`177`	`+ val movedPositions = mutableListOf<Int>()`
`176`	`178`	`selectedKeys.forEach { checklistId ->`
`177`	`179`	`val position = items.indexOfFirst { it.id == checklistId }`
`178`	`180`	`val tempItem = items[position]`
`179`	`181`	`items.removeAt(position)`
	`182`	`+ movedPositions.add(position)`
`180`	`183`	`items.add(items.size, tempItem)`
`181`	`184`	`}`
`182`	`185`
`183`		`- notifyDataSetChanged()`
	`186`	`+ movedPositions.forEach {`
	`187`	`+ notifyItemMoved(it, items.size - 1)`
	`188`	`+ }`
`184`	`189`	`listener?.saveChecklist()`
`185`	`190`	`}`
`186`	`191`

`‎app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt‎`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
`193`		`- private fun saveNote(refreshIndex: Int = -1) {`
	`193`	`+ private fun saveNote(refreshIndex: Int = -1, callback: () ->Unit = {}) {`
`194`	`194`	`if (note == null) {`
`195`	`195`	`return`
`196`	`196`	`}`
`@@ -215,6 +215,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {`
`215`	`215`	`ensureBackgroundThread {`
`216`	`216`	`saveNoteValue(note!!, note!!.value)`
`217`	`217`	`context?.updateWidgets()`
	`218`	`+ activity?.runOnUiThread(callback)`
`218`	`219`	`}`
`219`	`220`	`}`
`220`	`221`	`}`
`@@ -235,8 +236,8 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {`
`235`	`236`
`236`	`237`	`fun getChecklistItems() = Gson().toJson(items)`
`237`	`238`
`238`		`- override fun saveChecklist() {`
`239`		`- saveNote()`
	`239`	`+ override fun saveChecklist(callback: () ->Unit) {`
	`240`	`+ saveNote(callback = callback)`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`override fun refreshItems() {`

`‎app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ChecklistItemsListener.kt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ package com.simplemobiletools.notes.pro.interfaces`
`3`	`3`	`interface ChecklistItemsListener {`
`4`	`4`	`fun refreshItems()`
`5`	`5`
`6`		`- fun saveChecklist()`
	`6`	`+ fun saveChecklist(callback: () ->Unit = {})`
`7`	`7`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 32909a5

File tree

3 files changed

3 files changed

`‎app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt‎`

`‎app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt‎`

`‎app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ChecklistItemsListener.kt‎`

0 commit comments