mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-03 00:03:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge ba7ffc8051 into cdc4f89da5

Browse source
This commit is contained in:
SK 2024-10-27 22:45:14 +09:00 • committed by GitHub
commit c0a74ccb06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 284 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt
View file

@ -12,6 +12,7 @@ import fr.free.nrw.commons.R
import fr.free.nrw.commons.contributions.Contribution import fr.free.nrw.commons.contributions.Contribution
import fr.free.nrw.commons.databinding.FragmentPendingUploadsBinding import fr.free.nrw.commons.databinding.FragmentPendingUploadsBinding
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
import fr.free.nrw.commons.upload.worker.WorkRequestHelper
import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
import fr.free.nrw.commons.utils.ViewUtil import fr.free.nrw.commons.utils.ViewUtil
import java.util.Locale import java.util.Locale
@ -105,14 +106,22 @@ class PendingUploadsFragment :
binding.pendingUplaodsLl.visibility = View.VISIBLE binding.pendingUplaodsLl.visibility = View.VISIBLE
adapter.submitList(list) adapter.submitList(list)
binding.progressTextView.setText(contributionsSize.toString() + " uploads left") binding.progressTextView.setText(contributionsSize.toString() + " uploads left")
if ((pausedOrQueuedUploads == contributionsSize) || CommonsApplication.isPaused) { if ((pausedOrQueuedUploads == contributionsSize) || CommonsApplication.isPaused) {
//As this function would be triggered multiple times by one tap
//Add new checking to enable/ disable the pause button for better UI
if (!WorkRequestHelper.Companion.getisUploadWorkerRunning()) {
uploadProgressActivity.setPausedIcon(true) uploadProgressActivity.setPausedIcon(true)
}
} else { } else {
if (WorkRequestHelper.Companion.getisUploadWorkerRunning()) {
uploadProgressActivity.setPausedIcon(false) uploadProgressActivity.setPausedIcon(false)
} }
} }
} }
} }
}
/** /**
* Cancels a specific upload after getting a confirmation from the user using Dialog. * Cancels a specific upload after getting a confirmation from the user using Dialog.

7
app/src/main/java/fr/free/nrw/commons/upload/worker/WorkRequestHelper.kt
View file

@ -70,5 +70,12 @@ class WorkRequestHelper {
isUploadWorkerRunning = false isUploadWorkerRunning = false
} }
} }
/**
* Provide a function for other class to get the flag isUploadWorkerRunning
*/
fun getisUploadWorkerRunning(): Boolean {
return isUploadWorkerRunning;
}
} }
} }