tweaking some things about checklist item removal

tibbi · tibbi · commit 74cdea8cfb78 · 2021-01-10T19:16:23.000+01:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
@@ -129,8 +129,6 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
 
             saveNote()
             setupAdapter()
-
-            (view.checklist_list.adapter as? ChecklistAdapter)?.notifyDataSetChanged()
         }
     }
 
@@ -173,14 +171,13 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
     }
 
     fun removeDoneItems() {
-        items.removeIf { it.isDone }
-        updateUIVisibility()
-        view.checklist_list.adapter?.notifyDataSetChanged()
+        items = items.filter { !it.isDone }.toMutableList() as ArrayList<ChecklistItem>
         saveNote()
+        setupAdapter()
     }
 
     private fun updateUIVisibility() {
-        with(view) {
+        view.apply {
             fragment_placeholder.beVisibleIf(items.isEmpty())
             fragment_placeholder_2.beVisibleIf(items.isEmpty())
             checklist_list.beVisibleIf(items.isNotEmpty())

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,6 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {`
`129`	`129`
`130`	`130`	`saveNote()`
`131`	`131`	`setupAdapter()`
`132`		`-`
`133`		`- (view.checklist_list.adapter as? ChecklistAdapter)?.notifyDataSetChanged()`
`134`	`132`	`}`
`135`	`133`	`}`
`136`	`134`
`@@ -173,14 +171,13 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {`
`173`	`171`	`}`
`174`	`172`
`175`	`173`	`fun removeDoneItems() {`
`176`		`- items.removeIf { it.isDone }`
`177`		`- updateUIVisibility()`
`178`		`- view.checklist_list.adapter?.notifyDataSetChanged()`
	`174`	`+ items = items.filter { !it.isDone }.toMutableList() as ArrayList<ChecklistItem>`
`179`	`175`	`saveNote()`
	`176`	`+ setupAdapter()`
`180`	`177`	`}`
`181`	`178`
`182`	`179`	`private fun updateUIVisibility() {`
`183`		`- with(view) {`
	`180`	`+ view.apply {`
`184`	`181`	`fragment_placeholder.beVisibleIf(items.isEmpty())`
`185`	`182`	`fragment_placeholder_2.beVisibleIf(items.isEmpty())`
`186`	`183`	`checklist_list.beVisibleIf(items.isNotEmpty())`