Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix files that persist in the gallery when deleted in the preview #1440

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

Fix files that persist in the gallery when deleted in the preview #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core
Open in desktop
Submodule Core updated 4 files
+1 −0 build.gradle
+8 −3 src/main/java/com/infomaniak/lib/core/ui/WebViewActivity.kt
+2 −2 src/main/java/com/infomaniak/lib/core/utils/Extensions.kt
+5 −0 src/main/res/navigation/webview_navigation.xml
2 changes: 2 additions & 0 deletions app/src/main/java/com/infomaniak/drive/ui/fileList/preview/PreviewSliderFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import com.infomaniak.drive.ui.MainViewModel.FileResult
import com.infomaniak.drive.ui.fileList.DownloadProgressDialog.DownloadAction
import com.infomaniak.drive.ui.fileList.fileDetails.CategoriesUsageMode
import com.infomaniak.drive.ui.fileList.fileDetails.SelectCategoriesFragment
import com.infomaniak.drive.ui.menu.GalleryFragment.Companion.DELETE_FILE_KEY
import com.infomaniak.drive.utils.*
import com.infomaniak.drive.utils.Utils.openWith
import com.infomaniak.drive.views.FileInfoActionsView
Expand Down Expand Up @@ -438,6 +439,7 @@ class PreviewSliderFragment : Fragment(), FileInfoActionsView.OnItemClickListene
removeFileInSlider()
showSnackbar(getString(R.string.snackbarMoveTrashConfirmation, currentFile.name))
mainViewModel.deleteFileFromHome.value = true
setBackNavigationResult(DELETE_FILE_KEY, currentFile.id, withPopBackStack = false)
Copy link
Contributor

@KevinBoulongne KevinBoulongne Oct 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe use a SingleLiveEvent instead of tweaking an existing system that is not designed for this use case ?

} else {
showSnackbar(R.string.errorDelete)
}
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/infomaniak/drive/ui/menu/GalleryFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import com.infomaniak.drive.utils.Utils
import com.infomaniak.drive.utils.getAdjustedColumnNumber
import com.infomaniak.drive.views.NoItemsLayoutView
import com.infomaniak.lib.core.utils.Utils.createRefreshTimer
import com.infomaniak.lib.core.utils.getBackNavigationResult
import com.infomaniak.lib.core.utils.setPagination
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -84,6 +85,10 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

getBackNavigationResult<Int>(DELETE_FILE_KEY) { fileId ->
galleryAdapter.deleteByFileId(fileId)
}

setupPagination()

val isCurrentlyInGallery = menuGalleryBinding != null
Expand Down Expand Up @@ -331,5 +336,7 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
const val TAG = "GalleryFragment"
const val MATOMO_CATEGORY = "picturesFileAction"
private const val NUMBER_ITEMS_LOADER = 13

const val DELETE_FILE_KEY = "sort_type_option"
}
}
Loading