Merge pull request #388 from tanvir-ahmod/fix_382

Fix #382 , Implement deleting done checklist items

Author: tibbi

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

@@ -153,6 +153,7 @@ class MainActivity : SimpleActivity() {
             findItem(R.id.delete_note).isVisible = multipleNotesExist
             findItem(R.id.export_all_notes).isVisible = multipleNotesExist && hasPermission(PERMISSION_WRITE_STORAGE)
             findItem(R.id.open_search).isVisible = !isCurrentItemChecklist()
+            findItem(R.id.remove_done_items).isVisible = isCurrentItemChecklist()
             findItem(R.id.import_folder).isVisible = hasPermission(PERMISSION_READ_STORAGE)
 
             saveNoteButton = findItem(R.id.save_note)
@@ -185,6 +186,7 @@ class MainActivity : SimpleActivity() {
             R.id.delete_note -> displayDeleteNotePrompt()
             R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java))
             R.id.about -> launchAbout()
+            R.id.remove_done_items -> removeDoneItems()
             else -> return super.onOptionsItemSelected(item)
         }
         return true
@@ -1058,4 +1060,8 @@ class MainActivity : SimpleActivity() {
             checkWhatsNew(this, BuildConfig.VERSION_CODE)
         }
     }
+
+    private fun removeDoneItems() {
+        getPagerAdapter().removeDoneCheckListItems(view_pager.currentItem)
+    }
 }

app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt

@@ -89,4 +89,8 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val activity
         fragments[position] = fragment
         return fragment
     }
+
+    fun removeDoneCheckListItems(position: Int) {
+        (fragments[position] as? ChecklistFragment)?.removeDoneItems()
+    }
 }

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

@@ -135,11 +135,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
     }
 
     private fun setupAdapter() {
-        with(view) {
-            fragment_placeholder.beVisibleIf(items.isEmpty())
-            fragment_placeholder_2.beVisibleIf(items.isEmpty())
-            checklist_list.beVisibleIf(items.isNotEmpty())
-        }
+        updateUIVisibility()
 
         ChecklistAdapter(
             activity = activity as SimpleActivity,
@@ -176,6 +172,21 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
         }
     }
 
+    fun removeDoneItems() {
+        items.removeIf { it.isDone }
+        updateUIVisibility()
+        view.checklist_list.adapter?.notifyDataSetChanged()
+        saveNote()
+    }
+
+    private fun updateUIVisibility() {
+        with(view) {
+            fragment_placeholder.beVisibleIf(items.isEmpty())
+            fragment_placeholder_2.beVisibleIf(items.isEmpty())
+            checklist_list.beVisibleIf(items.isNotEmpty())
+        }
+    }
+
     override fun saveChecklist() {
         saveNote()
     }

app/src/main/res/menu/menu.xml

@@ -36,6 +36,11 @@
         android:icon="@drawable/ic_rename_new"
         android:title="@string/rename_note"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/remove_done_items"
+        android:title="@string/remove_done_items"
+        android:icon="@drawable/ic_delete_vector"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/share"
         android:icon="@drawable/ic_share_vector"

app/src/main/res/values-ar/strings.xml

@@ -55,6 +55,7 @@
     <string name="add_new_checklist_item">إضافة عنصر قائمة تدقيق جديد</string>
     <string name="add_new_checklist_items">إضافة عناصر قائمة تدقيق جديدة</string>
     <string name="checklist_is_empty">قائمة التدقيق فارغة</string>
+    <string name="remove_done_items">Remove done items</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">تصدير جميع الملاحظات كملفات</string>

app/src/main/res/values-az/strings.xml

@@ -55,6 +55,7 @@
     <string name="add_new_checklist_item">Add a new checklist item</string>
     <string name="add_new_checklist_items">Add new checklist items</string>
     <string name="checklist_is_empty">The checklist is empty</string>
+    <string name="remove_done_items">Remove done items</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Bütün qeydləri fayl şəklində çıxar</string>

app/src/main/res/values-cs/strings.xml

@@ -55,6 +55,7 @@
     <string name="add_new_checklist_item">Přidat do seznamu novou položku</string>
     <string name="add_new_checklist_items">Přidat do seznamu nové položky</string>
     <string name="checklist_is_empty">Seznam položek je prázdný</string>
+    <string name="remove_done_items">Remove done items</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Exportovat všechny poznámky jako soubory</string>

app/src/main/res/values-cy/strings.xml

@@ -55,6 +55,7 @@
     <string name="add_new_checklist_item">Ychwanegu eitem newydd at restr wirio</string>
     <string name="add_new_checklist_items">Ychwanegu eitemau newydd at restr wirio</string>
     <string name="checklist_is_empty">Mae\'r rhestr wirio yn wag</string>
+    <string name="remove_done_items">Remove done items</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Allforio pob nodyn fel ffeil</string>

app/src/main/res/values-da/strings.xml

@@ -55,6 +55,7 @@
     <string name="add_new_checklist_item">Føj et nyt punkt til tjeklisten</string>
     <string name="add_new_checklist_items">Føj nye punkter til tjeklisten</string>
     <string name="checklist_is_empty">Tjeklisten er tom</string>
+    <string name="remove_done_items">Remove done items</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Eksporter alle noter som filer</string>

app/src/main/res/values-de/strings.xml

@@ -55,6 +55,7 @@
     <string name="add_new_checklist_item">Einen neuen Checklisteneintrag hinzufügen</string>
     <string name="add_new_checklist_items">Neue Checklisteneinträge hinzufügen</string>
     <string name="checklist_is_empty">Die Checkliste ist leer</string>
+    <string name="remove_done_items">Remove done items</string>
 
     <!-- Import / Export -->
     <string name="export_all_notes">Alle Notizen als Dateien exportieren</string>