diff --git a/app/build.gradle b/app/build.gradle index d5d53f45..9ed2cf94 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.24' + implementation 'com.simplemobiletools:commons:5.33.7' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.documentfile:documentfile:1.0.1' diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt index 2460c0f9..6a083b19 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt @@ -148,26 +148,25 @@ class ChecklistAdapter(activity: BaseSimpleActivity, var items: ArrayList - val position = items.indexOfFirst { it.id == keys.value } - val tempItem = items[position] - items.removeAt(position) - items.add(0, tempItem) - } + selectedKeys.reversed().forEach { checklistId -> + val position = items.indexOfFirst { it.id == checklistId } + val tempItem = items[position] + items.removeAt(position) + items.add(0, tempItem) + } + notifyDataSetChanged() listener?.saveChecklist() } private fun moveSelectedItemsToBottom() { - selectedKeys.withIndex() - .forEach { keys -> - val position = items.indexOfFirst { it.id == keys.value } - val tempItem = items[position] - items.removeAt(position) - items.add(items.size, tempItem) - } + selectedKeys.forEach { checklistId -> + val position = items.indexOfFirst { it.id == checklistId } + val tempItem = items[position] + items.removeAt(position) + items.add(items.size, tempItem) + } + notifyDataSetChanged() listener?.saveChecklist() } diff --git a/app/src/main/res/drawable-anydpi/ic_move_to_bottom.xml b/app/src/main/res/drawable-anydpi/ic_move_to_bottom.xml deleted file mode 100644 index c8adf15c..00000000 --- a/app/src/main/res/drawable-anydpi/ic_move_to_bottom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-anydpi/ic_move_to_top.xml b/app/src/main/res/drawable-anydpi/ic_move_to_top.xml deleted file mode 100644 index 4c8580d3..00000000 --- a/app/src/main/res/drawable-anydpi/ic_move_to_top.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-hdpi/ic_move_to_bottom.png b/app/src/main/res/drawable-hdpi/ic_move_to_bottom.png deleted file mode 100644 index 62b6ae78..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_move_to_bottom.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_move_to_top.png b/app/src/main/res/drawable-hdpi/ic_move_to_top.png deleted file mode 100644 index 5f64fafc..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_move_to_top.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_move_to_bottom.png b/app/src/main/res/drawable-mdpi/ic_move_to_bottom.png deleted file mode 100644 index 36f2a775..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_move_to_bottom.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_move_to_top.png b/app/src/main/res/drawable-mdpi/ic_move_to_top.png deleted file mode 100644 index 0e6852f4..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_move_to_top.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_move_to_bottom.png b/app/src/main/res/drawable-xhdpi/ic_move_to_bottom.png deleted file mode 100644 index 096fce2f..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_move_to_bottom.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_move_to_top.png b/app/src/main/res/drawable-xhdpi/ic_move_to_top.png deleted file mode 100644 index 57f42d19..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_move_to_top.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_move_to_bottom.png b/app/src/main/res/drawable-xxhdpi/ic_move_to_bottom.png deleted file mode 100644 index d9b8f8b9..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_move_to_bottom.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_move_to_top.png b/app/src/main/res/drawable-xxhdpi/ic_move_to_top.png deleted file mode 100644 index 22629474..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_move_to_top.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_move_to_bottom_vector.xml b/app/src/main/res/drawable/ic_move_to_bottom_vector.xml new file mode 100644 index 00000000..ded90da2 --- /dev/null +++ b/app/src/main/res/drawable/ic_move_to_bottom_vector.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_move_to_top_vector.xml b/app/src/main/res/drawable/ic_move_to_top_vector.xml new file mode 100644 index 00000000..111bbeca --- /dev/null +++ b/app/src/main/res/drawable/ic_move_to_top_vector.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/menu/cab_checklist.xml b/app/src/main/res/menu/cab_checklist.xml index 668197c7..23eeea18 100644 --- a/app/src/main/res/menu/cab_checklist.xml +++ b/app/src/main/res/menu/cab_checklist.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> Pridať do zoznamu nové položky Zoznam položiek je prázdny Odstrániť splnené položky - Move to top - Move to bottom + Presunúť na vrch + Presunúť na spodok Exportovať všetky poznámky ako súbory