feat: added snackbar when (un)setting av.offline

owncloud · Oct 1, 2024 · e892103 · e892103
1 parent aca79e8
commit e892103
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
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
@@ -46,6 +46,7 @@ import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
 import com.github.chrisbanes.photoview.PhotoView
+import com.google.android.material.snackbar.Snackbar
 import com.owncloud.android.R
 import com.owncloud.android.databinding.PreviewImageFragmentBinding
 import com.owncloud.android.domain.files.model.MIME_SVG
@@ -234,11 +235,13 @@ class PreviewImageFragment : FileFragment() {
 
             R.id.action_set_available_offline -> {
                 fileOperationsViewModel.performOperation(FileOperation.SetFilesAsAvailableOffline(listOf(file)))
+                showSnackbarMessage()
                 true
             }
 
             R.id.action_unset_available_offline -> {
                 fileOperationsViewModel.performOperation(FileOperation.UnsetFilesAsAvailableOffline(listOf(file)))
+                showSnackbarMessage()
                 true
             }
 
@@ -332,6 +335,15 @@ class PreviewImageFragment : FileFragment() {
         return if (isSVGFile(file)) Color.WHITE else Color.BLACK
     }
 
+    private fun showSnackbarMessage(){
+        val snackbar = Snackbar.make(requireView(), R.string.sync_file_nothing_to_do_msg, Snackbar.LENGTH_LONG)
+        val snackbarView = snackbar.view
+        val params = snackbarView.layoutParams as ViewGroup.MarginLayoutParams
+        params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, 100)
+        snackbarView.layoutParams = params
+        snackbar.show()
+    }
+
     /**
      * Finishes the preview
      */

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt
@@ -37,6 +37,7 @@ import android.view.ViewGroup
 import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.owncloud.android.R
@@ -157,13 +158,15 @@ class PreviewTextFragment : FileFragment() {
                 val fileToSetAsAvailableOffline = ArrayList<OCFile>()
                 fileToSetAsAvailableOffline.add(file)
                 fileOperationsViewModel.performOperation(FileOperation.SetFilesAsAvailableOffline(fileToSetAsAvailableOffline))
+                Snackbar.make(requireView(), R.string.sync_file_nothing_to_do_msg, Snackbar.LENGTH_LONG).show()
                 true
             }
 
             R.id.action_unset_available_offline -> {
                 val fileToUnsetAsAvailableOffline = ArrayList<OCFile>()
                 fileToUnsetAsAvailableOffline.add(file)
                 fileOperationsViewModel.performOperation(FileOperation.UnsetFilesAsAvailableOffline(fileToUnsetAsAvailableOffline))
+                Snackbar.make(requireView(), R.string.sync_file_nothing_to_do_msg, Snackbar.LENGTH_LONG).show()
                 true
             }
 
@@ -211,12 +214,12 @@ class PreviewTextFragment : FileFragment() {
 
     override fun onPrepareOptionsMenu(menu: Menu) {
         mContainerActivity.storageManager?.let {
-            val safeFile = file
+            val safeFile = previewTextViewModel.getCurrentFile() ?: return
             val accountName = it.account.name
-            previewTextViewModel.filterMenuOptions(safeFile, accountName)
+            previewTextViewModel.filterMenuOptions(safeFile.file, accountName)
 
             collectLatestLifecycleFlow(previewTextViewModel.menuOptions) { menuOptions ->
-                val hasWritePermission = safeFile.hasWritePermission
+                val hasWritePermission = safeFile.file.hasWritePermission
                 menu.filterMenuOptions(menuOptions, hasWritePermission)
             }
         }