From 7740a3cfb85d788b1d1581b4a7ed579319f998c4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 21 Jan 2021 19:00:31 +0100 Subject: [PATCH] tweaking the way checklist items are moved to the top or bottom --- app/build.gradle | 2 +- .../notes/pro/adapters/ChecklistAdapter.kt | 29 +++++++++--------- .../res/drawable-anydpi/ic_move_to_bottom.xml | 11 ------- .../res/drawable-anydpi/ic_move_to_top.xml | 11 ------- .../res/drawable-hdpi/ic_move_to_bottom.png | Bin 188 -> 0 bytes .../main/res/drawable-hdpi/ic_move_to_top.png | Bin 182 -> 0 bytes .../res/drawable-mdpi/ic_move_to_bottom.png | Bin 119 -> 0 bytes .../main/res/drawable-mdpi/ic_move_to_top.png | Bin 116 -> 0 bytes .../res/drawable-xhdpi/ic_move_to_bottom.png | Bin 162 -> 0 bytes .../res/drawable-xhdpi/ic_move_to_top.png | Bin 161 -> 0 bytes .../res/drawable-xxhdpi/ic_move_to_bottom.png | Bin 205 -> 0 bytes .../res/drawable-xxhdpi/ic_move_to_top.png | Bin 207 -> 0 bytes .../res/drawable/ic_move_to_bottom_vector.xml | 9 ++++++ .../res/drawable/ic_move_to_top_vector.xml | 9 ++++++ app/src/main/res/menu/cab_checklist.xml | 4 +-- app/src/main/res/values-sk/strings.xml | 4 +-- 16 files changed, 37 insertions(+), 42 deletions(-) delete mode 100644 app/src/main/res/drawable-anydpi/ic_move_to_bottom.xml delete mode 100644 app/src/main/res/drawable-anydpi/ic_move_to_top.xml delete mode 100644 app/src/main/res/drawable-hdpi/ic_move_to_bottom.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_move_to_top.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_move_to_bottom.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_move_to_top.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_move_to_bottom.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_move_to_top.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_move_to_bottom.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_move_to_top.png create mode 100644 app/src/main/res/drawable/ic_move_to_bottom_vector.xml create mode 100644 app/src/main/res/drawable/ic_move_to_top_vector.xml 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 62b6ae788ef19e45fb6959e5f2535a57e3aa51ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBnmt_{Ln>~)y?&avK|#PZaMl8j zt_7T@7IMs95HQCxLf}#R3FVdQ&MBb@069ZK;Q#;t 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 5f64fafc89abc3fb99e29cc1fe9492ac1e34c20d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBYCT;XLn>}1CrGd^Zg6|>|Nno- zEk~YMWEkpx+)!}gLD!~0ho>@{T!)%Z8rBBrSVhP%pSERwuA$Q>Y2p5`kms+gYfJKr z*BT2{w`H`(h)z;ob>T@4`zoO}ON|VJl;45uy;d1l92fIRm0noU>?Z4y%AToYYHs4b f+h%dX0!9V_rK|Rrc3PJL9m3%0>gTe~DWM4f{((Ud 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 36f2a775f62f881cab79c3e152735504d9267cec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjcAhSdAr-fh6C_x#u>Al3Kc45% zVzHhmgRFxAn;9|^1kNPrSaeLA#&YqJy5p9vW`$Xjc3)1_6n#7pZNPPbkwLVBsbdRI Rz6{VL22WQ%mvv4FO#t_`CS3pk 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 0e6852f482b4cfa7b47960b135cd78ecdd406096..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj)}AhoAr-fh6C_xdH2weoUw;`3 z{~p%Ec6Ch-Gp4m2K4jG~tu6SvkWAayB3S}L>Xi;%IZkWWMJ@n$kcK0<$hJ5 OF$|urelF{r5}E*@C?)p* 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 096fce2f929a6b060f8072c8521ee8b604a50fa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtOivfbkcwMxuQ_rx7znT&+*7#! zh4W%}&W?^QzZGqJ{TDW^^}ICY>%HlJ8G))1;0)W1V^=M{9SSvCG-VChk-}|>G z9iOjYbWC1h(=q;zGaoPM-2HLB@(BaOJ~od_tJelA?&Ndqy2G8G z^Su=ocIrumHF`%*fBgC0<)^~)z1qp!pdjGtn6<=} z>nNLuzDw$J)%^@=Hz!O|@tpMKYS!A++!O{zCKe6>1&0Pa3^p6Pe8!T9HWTY}&K@^+ zx*mSnVq$*IcZr0B_{5}#b6mPQiv={z&hZJ&VFMu<&q;B=yH3w%2b-(J>^VtA(~Vnf X`MHPPLG|)L_c3_7`njxgN@xNARqH#t 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 22629474e9f9d94909225113414cdee60449eb12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!(>z@qLn>~)y|IzE!GMS1;F%L$ zJXtP|k|_!zo$pok3tCfmntD!B$#fCic;2Rgfsu)2h0z2R&sTEzopr07PIuxc~qF 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