feat: updated options menu in image preview

owncloud · Oct 3, 2024 · dd9538c · dd9538c
1 parent 2123686
commit dd9538c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
@@ -65,6 +65,7 @@ import com.owncloud.android.usecases.transfers.DOWNLOAD_FINISH_MESSAGE
 import com.owncloud.android.utils.PreferenceUtils
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import timber.log.Timber
 
 /**
@@ -74,7 +75,9 @@ class PreviewImageActivity : FileActivity(),
     FileFragment.ContainerActivity,
     OnPageChangeListener {
 
-    private val previewImageViewModel: PreviewImageViewModel by viewModel()
+    private val previewImageViewModel by viewModel <PreviewImageViewModel> {
+        parametersOf(file)
+    }
     private val fileOperationsViewModel: FileOperationsViewModel by viewModel()
 
     private lateinit var viewPager: ViewPager

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt
@@ -62,6 +62,7 @@ import com.owncloud.android.ui.fragment.FileFragment
 import com.owncloud.android.utils.PreferenceUtils
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import timber.log.Timber
 import java.io.File
 
@@ -88,7 +89,9 @@ class PreviewImageFragment : FileFragment() {
     private var _binding: PreviewImageFragmentBinding? = null
     private val binding get() = _binding!!
 
-    private val previewImageViewModel by viewModel<PreviewImageViewModel>()
+    private val previewImageViewModel by viewModel<PreviewImageViewModel>() {
+        parametersOf(requireArguments().getParcelable(ARG_FILE))
+    }
     private val fileOperationsViewModel: FileOperationsViewModel by inject()
 
     /**
@@ -144,6 +147,15 @@ class PreviewImageFragment : FileFragment() {
             }
         }
 
+        collectLatestLifecycleFlow(previewImageViewModel.getCurrentFile()) { currentFile ->
+            if (currentFile != null) {
+                file = currentFile
+                requireActivity().invalidateOptionsMenu()
+            } else {
+                requireActivity().onBackPressed()
+            }
+        }
+
         account = requireArguments().getParcelable(PreviewAudioFragment.EXTRA_ACCOUNT)
         checkNotNull(account) { "Instanced with a NULL ownCloud Account" }
         checkNotNull(file) { "Instanced with a NULL OCFile" }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageViewModel.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageViewModel.kt
@@ -30,11 +30,13 @@ import androidx.work.WorkInfo
 import com.owncloud.android.R
 import com.owncloud.android.domain.files.model.FileMenuOption
 import com.owncloud.android.domain.files.model.OCFile
+import com.owncloud.android.domain.files.usecases.GetFileByIdAsStreamUseCase
 import com.owncloud.android.domain.files.usecases.GetFileByIdUseCase
 import com.owncloud.android.providers.ContextProvider
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
 import com.owncloud.android.usecases.files.FilterFileMenuOptionsUseCase
 import com.owncloud.android.usecases.transfers.downloads.GetLiveDataForFinishedDownloadsFromAccountUseCase
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
@@ -45,15 +47,22 @@ class PreviewImageViewModel(
     private val getLiveDataForFinishedDownloadsFromAccountUseCase: GetLiveDataForFinishedDownloadsFromAccountUseCase,
     private val filterFileMenuOptionsUseCase: FilterFileMenuOptionsUseCase,
     private val contextProvider: ContextProvider,
-    private val coroutinesDispatcherProvider: CoroutinesDispatcherProvider
+    private val coroutinesDispatcherProvider: CoroutinesDispatcherProvider,
+    getFileByIdAsStreamUseCase: GetFileByIdAsStreamUseCase,
+    ocFile:OCFile,
 ) : ViewModel() {
 
+
     private val _downloads = MediatorLiveData<List<Pair<OCFile, WorkInfo>>>()
     val downloads: LiveData<List<Pair<OCFile, WorkInfo>>> = _downloads
 
     private val _menuOptions: MutableStateFlow<List<FileMenuOption>> = MutableStateFlow(emptyList())
     val menuOptions: StateFlow<List<FileMenuOption>> = _menuOptions
 
+    private val currentFile: Flow<OCFile?> = getFileByIdAsStreamUseCase(GetFileByIdAsStreamUseCase.Params(ocFile.id!!))
+
+    fun getCurrentFile(): Flow<OCFile?> = currentFile
+
     fun startListeningToDownloadsFromAccount(account: Account) {
         _downloads.addSource(
             getLiveDataForFinishedDownloadsFromAccountUseCase(GetLiveDataForFinishedDownloadsFromAccountUseCase.Params(account))