mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
fix: remove if-condition to prevent hiding top card and refactor code
This commit is contained in:
parent
1e1e5d763f
commit
07a71cbef2
1 changed files with 22 additions and 25 deletions
|
|
@ -146,34 +146,31 @@ class UploadPresenter @Inject internal constructor(
|
||||||
|
|
||||||
override fun deletePictureAtIndex(index: Int) {
|
override fun deletePictureAtIndex(index: Int) {
|
||||||
val uploadableFiles = view.getUploadableFiles()
|
val uploadableFiles = view.getUploadableFiles()
|
||||||
if (index == uploadableFiles!!.size - 1) {
|
uploadableFiles?.let {
|
||||||
// If the next fragment to be shown is not one of the MediaDetailsFragment
|
view.setImageCancelled(true)
|
||||||
// lets hide the top card so that it doesn't appear on the other fragments
|
repository.deletePicture(uploadableFiles[index].getFilePath())
|
||||||
view.showHideTopCard(false)
|
if (uploadableFiles.size == 1) {
|
||||||
}
|
view.showMessage(R.string.upload_cancelled)
|
||||||
view.setImageCancelled(true)
|
view.finish()
|
||||||
repository.deletePicture(uploadableFiles[index].getFilePath())
|
return
|
||||||
if (uploadableFiles.size == 1) {
|
|
||||||
view.showMessage(R.string.upload_cancelled)
|
|
||||||
view.finish()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
presenter.updateImageQualitiesJSON(uploadableFiles.size, index)
|
|
||||||
view.onUploadMediaDeleted(index)
|
|
||||||
if (index != uploadableFiles.size && index != 0) {
|
|
||||||
// if the deleted image was not the last item to be uploaded, check quality of next
|
|
||||||
repository.getUploadItem(index)?.let {
|
|
||||||
presenter.checkImageQuality(it, index)
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (uploadableFiles.size < 2) {
|
presenter.updateImageQualitiesJSON(uploadableFiles.size, index)
|
||||||
view.showHideTopCard(false)
|
view.onUploadMediaDeleted(index)
|
||||||
}
|
if (index != uploadableFiles.size && index != 0) {
|
||||||
|
// if the deleted image was not the last item to be uploaded, check quality of next
|
||||||
|
repository.getUploadItem(index)?.let {
|
||||||
|
presenter.checkImageQuality(it, index)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//In case lets update the number of uploadable media
|
if (uploadableFiles.size < 2) {
|
||||||
view.updateTopCardTitle()
|
view.showHideTopCard(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
//In case lets update the number of uploadable media
|
||||||
|
view.updateTopCardTitle()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onAttachView(view: UploadContract.View) {
|
override fun onAttachView(view: UploadContract.View) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue