mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
Compare commits
No commits in common. "80180005848ddf5cf008164fa4b8a5f26214833b" and "219fcd3dd8db3e953e1be6fb47cb7f527a29527d" have entirely different histories.
8018000584
...
219fcd3dd8
2 changed files with 5 additions and 19 deletions
|
|
@ -168,7 +168,8 @@ class ImageAdapter(
|
||||||
|
|
||||||
// Getting selected index when switch is off
|
// Getting selected index when switch is off
|
||||||
} else if (actionableImagesMap.size > position) {
|
} else if (actionableImagesMap.size > position) {
|
||||||
ImageHelper.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])
|
ImageHelper
|
||||||
|
.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])
|
||||||
|
|
||||||
// For any other case return -1
|
// For any other case return -1
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -347,14 +348,8 @@ class ImageAdapter(
|
||||||
numberOfSelectedImagesMarkedAsNotForUpload--
|
numberOfSelectedImagesMarkedAsNotForUpload--
|
||||||
}
|
}
|
||||||
notifyItemChanged(position, ImageUnselected())
|
notifyItemChanged(position, ImageUnselected())
|
||||||
// Notify listener of deselection to update UI
|
|
||||||
imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
|
|
||||||
} else {
|
} else {
|
||||||
// Prevent adding the same image multiple times
|
val image = images[position]
|
||||||
val image = if (showAlreadyActionedImages) images[position] else ArrayList(actionableImagesMap.values)[position]
|
|
||||||
if (selectedImages.contains(image)) {
|
|
||||||
return // Image already selected, ignore additional clicks
|
|
||||||
}
|
|
||||||
scope.launch(ioDispatcher) {
|
scope.launch(ioDispatcher) {
|
||||||
val imageSHA1 = imageLoader.getSHA1(image, defaultDispatcher)
|
val imageSHA1 = imageLoader.getSHA1(image, defaultDispatcher)
|
||||||
withContext(Dispatchers.Main) {
|
withContext(Dispatchers.Main) {
|
||||||
|
|
@ -378,6 +373,7 @@ class ImageAdapter(
|
||||||
}
|
}
|
||||||
selectedImages.add(image)
|
selectedImages.add(image)
|
||||||
notifyItemChanged(position, ImageSelectedOrUpdated())
|
notifyItemChanged(position, ImageSelectedOrUpdated())
|
||||||
|
|
||||||
imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
|
imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -636,4 +632,4 @@ class ImageAdapter(
|
||||||
fun setSingleSelection(single: Boolean) {
|
fun setSingleSelection(single: Boolean) {
|
||||||
singleSelection = single
|
singleSelection = single
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Authors:
|
|
||||||
* Es Krim 5 Juta Rasa
|
|
||||||
-->
|
|
||||||
<resources>
|
|
||||||
<string name="crash_dialog_title">Commons cadang ngojut</string>
|
|
||||||
<string name="crash_dialog_text">Ay uy. Uwat say mak bonos!</string>
|
|
||||||
<string name="crash_dialog_comment_prompt">Unjuk panday sikam apiya say Niku gawiko, raduna kirimko jak surel. Informasimu nulung sikam nandanina!</string>
|
|
||||||
<string name="crash_dialog_ok_toast">Tarima kasih!</string>
|
|
||||||
</resources>
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue