Skip to content

Commit d10ae7b

Browse files
committed
refactor: Use "uncheck all items" uniformly
1 parent de87184 commit d10ae7b

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class MainActivity : SimpleActivity() {
269269
findItem(R.id.delete_note).isVisible = multipleNotesExist
270270
findItem(R.id.open_search).isVisible = !isCurrentItemChecklist
271271
findItem(R.id.remove_done_items).isVisible = isCurrentItemChecklist
272-
findItem(R.id.uncheck_done_items).isVisible = isCurrentItemChecklist
272+
findItem(R.id.uncheck_all_items).isVisible = isCurrentItemChecklist
273273
findItem(R.id.sort_checklist).isVisible = isCurrentItemChecklist
274274
findItem(R.id.import_folder).isVisible = !isQPlus()
275275
findItem(R.id.lock_note).isVisible =
@@ -317,7 +317,7 @@ class MainActivity : SimpleActivity() {
317317
R.id.settings -> launchSettings()
318318
R.id.about -> launchAbout()
319319
R.id.remove_done_items -> fragment?.handleUnlocking { removeDoneItems() }
320-
R.id.uncheck_done_items -> fragment?.handleUnlocking { uncheckDoneItems() }
320+
R.id.uncheck_all_items -> fragment?.handleUnlocking { uncheckAllItems() }
321321
R.id.sort_checklist -> fragment?.handleUnlocking { displaySortChecklistDialog() }
322322
else -> return@setOnMenuItemClickListener false
323323
}
@@ -1557,8 +1557,8 @@ class MainActivity : SimpleActivity() {
15571557
getPagerAdapter().removeDoneCheckListItems(binding.viewPager.currentItem)
15581558
}
15591559

1560-
private fun uncheckDoneItems() {
1561-
getPagerAdapter().uncheckCheckedItems(binding.viewPager.currentItem)
1560+
private fun uncheckAllItems() {
1561+
getPagerAdapter().uncheckAllItems(binding.viewPager.currentItem)
15621562
}
15631563

15641564
private fun displaySortChecklistDialog() {

app/src/main/kotlin/org/fossify/notes/adapters/NotesPagerAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val activity
9696
(fragments[position] as? TasksFragment)?.removeCheckedItems()
9797
}
9898

99-
fun uncheckCheckedItems(position: Int) {
100-
(fragments[position] as? TasksFragment)?.uncheckCheckedItems()
99+
fun uncheckAllItems(position: Int) {
100+
(fragments[position] as? TasksFragment)?.uncheckAllItems()
101101
}
102102

103103
fun refreshChecklist(position: Int) {

app/src/main/kotlin/org/fossify/notes/fragments/TasksFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class TasksFragment : NoteFragment(), TasksActionListener {
256256
setupAdapter()
257257
}
258258

259-
fun uncheckCheckedItems() {
259+
fun uncheckAllItems() {
260260
tasks = tasks.map { it.copy(isDone = false) }.toMutableList()
261261
saveAndReload()
262262
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
android:title="@string/delete_checked_items"
4242
app:showAsAction="never" />
4343
<item
44-
android:id="@+id/uncheck_done_items"
45-
android:title="@string/uncheck_checked_items"
44+
android:id="@+id/uncheck_all_items"
45+
android:title="@string/uncheck_all_items"
4646
app:showAsAction="never" />
4747
<item
4848
android:id="@+id/sort_checklist"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<string name="add_new_checklist_items">Add new checklist items</string>
7272
<string name="checklist_is_empty">The checklist is empty</string>
7373
<string name="delete_checked_items">Delete checked items</string>
74-
<string name="uncheck_checked_items">Uncheck checked items</string>
74+
<string name="uncheck_all_items">Uncheck all items</string>
7575
<string name="add_to_the_top">Add to the top</string>
7676
<string name="use_for_this_checklist">Use for this checklist only</string>
7777
<plurals name="num_checked_items">

0 commit comments

Comments
 (0)