refactor(display-util): snackbar

app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt

@@ -23,6 +23,7 @@ import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.model.OCUploadLocalPathData
+import com.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.extensions.getParcelableArgument
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ActivityEditImageBinding
@@ -31,7 +32,6 @@ import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener
 import com.owncloud.android.operations.UploadFileOperation
 import com.owncloud.android.ui.activity.FileActivity
-import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.MimeType
 import java.io.File
 
@@ -87,7 +87,7 @@ class EditImageActivity :
 
     override fun onCropImageComplete(view: CropImageView, result: CropImageView.CropResult) {
         if (!result.isSuccessful) {
-            DisplayUtils.showSnackMessage(this, getString(R.string.image_editor_unable_to_edit_image))
+            SnackbarUtil.show(this, getString(R.string.image_editor_unable_to_edit_image))
             return
         }
         val resultUri = result.getUriFilePath(this, false)
@@ -113,7 +113,7 @@ class EditImageActivity :
 
     override fun onSetImageUriComplete(view: CropImageView, uri: Uri, error: Exception?) {
         if (error != null) {
-            DisplayUtils.showSnackMessage(this, getString(R.string.image_editor_unable_to_edit_image))
+            SnackbarUtil.show(this, getString(R.string.image_editor_unable_to_edit_image))
             return
         }
         view.visibility = View.VISIBLE

app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt

@@ -12,6 +12,7 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.snackbar.Snackbar
+import com.nextcloud.utils.SnackbarUtil
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ActivityShowErrorBinding
 import com.owncloud.android.utils.ClipboardUtil
@@ -35,14 +36,9 @@ class ShowErrorActivity : AppCompatActivity() {
         setSupportActionBar(binding.toolbarInclude.toolbar)
         supportActionBar!!.title = createErrorTitle()
 
-        val snackbar = DisplayUtils.createSnackbar(
-            binding.errorPageContainer,
-            R.string.error_report_issue_text,
-            Snackbar.LENGTH_INDEFINITE
-        )
-            .setAction(R.string.error_report_issue_action) { reportIssue() }
-
-        snackbar.show()
+        SnackbarUtil.create(binding.errorPageContainer, R.string.error_report_issue_text, Snackbar.LENGTH_INDEFINITE)
+            ?.setAction(R.string.error_report_issue_action) { reportIssue() }
+            ?.show()
     }
 
     private fun createErrorTitle() = String.format(getString(R.string.error_crash_title), getString(R.string.app_name))

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt

@@ -25,6 +25,7 @@ import com.nextcloud.client.network.Connectivity
 import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.notifications.AppWideNotificationManager
 import com.nextcloud.model.OCUploadLocalPathData
+import com.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.extensions.checkWCFRestrictions
 import com.nextcloud.utils.extensions.createOwncloudClient
 import com.nextcloud.utils.extensions.getUploadIds
@@ -51,7 +52,6 @@ import com.owncloud.android.operations.RemoveFileOperation
 import com.owncloud.android.operations.UploadFileOperation
 import com.owncloud.android.ui.adapter.uploadList.helper.ConflictHandlingResult
 import com.owncloud.android.ui.adapter.uploadList.helper.UploadListAdapterActionHandler
-import com.owncloud.android.utils.DisplayUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -619,7 +619,7 @@ class FileUploadHelper {
             MAX_FILE_COUNT,
             MAX_FILE_COUNT
         )
-        DisplayUtils.showSnackMessage(activity, message)
+        SnackbarUtil.show(activity, message)
     }
 
     class UploadNotificationActionReceiver : BroadcastReceiver() {

app/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.kt

@@ -24,6 +24,7 @@ import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.appinfo.AppInfo
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.preferences.AppPreferences
+import com.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.mdm.MDMConfig
 import com.owncloud.android.BuildConfig
 import com.owncloud.android.R
@@ -103,7 +104,7 @@ class FirstRunActivity :
                     val accountName = data?.getStringExtra(AccountManager.KEY_ACCOUNT_NAME)
                     val account = userAccountManager?.getAccountByName(accountName)
                     if (account == null) {
-                        DisplayUtils.showSnackMessage(this, R.string.account_creation_failed)
+                        SnackbarUtil.show(this, R.string.account_creation_failed)
                         return@registerForActivityResult
                     }
 

app/src/main/java/com/nextcloud/client/player/ui/PlayerActivity.kt

@@ -26,14 +26,14 @@ import com.nextcloud.client.player.model.file.PlaybackFileType
 import com.nextcloud.client.player.ui.audio.AudioPlayerView
 import com.nextcloud.client.player.ui.video.VideoPlayerView
 import com.nextcloud.ui.fileactions.FileActionsBottomSheet
+import com.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.extensions.getSerializableArgument
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.ui.activity.FileActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment
-import com.owncloud.android.utils.DisplayUtils
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
@@ -211,7 +211,7 @@ class PlayerActivity :
 
     private fun showFileExportStartedMessage() {
         val message = resources.getQuantityString(R.plurals.export_start, 1, 1)
-        DisplayUtils.showSnackMessage(playerView, message)
+        SnackbarUtil.show(playerView, message)
     }
 
     private fun showRemoveFileDialog(file: OCFile) {

app/src/main/java/com/nextcloud/client/player/ui/PlayerView.kt

@@ -26,12 +26,12 @@ import com.nextcloud.client.player.model.state.PlaybackState
 import com.nextcloud.client.player.ui.control.PlayerControlView
 import com.nextcloud.client.player.ui.pager.PlayerPager
 import com.nextcloud.client.player.util.WindowWrapper
+import com.nextcloud.utils.SnackbarUtil
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.operations.DownloadFileOperation
-import com.owncloud.android.utils.DisplayUtils
 import dagger.android.HasAndroidInjector
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -124,7 +124,7 @@ abstract class PlayerView @JvmOverloads constructor(
         if (error is SourceException) {
             downloadFile()
         } else {
-            DisplayUtils.showSnackMessage(this, R.string.common_error_unknown)
+            SnackbarUtil.show(this, R.string.common_error_unknown)
         }
     }
 
@@ -145,7 +145,7 @@ abstract class PlayerView @JvmOverloads constructor(
             } else {
                 Log_OC.e(TAG, "cannot download file")
                 withContext(Dispatchers.Main) {
-                    DisplayUtils.showSnackMessage(this@PlayerView, R.string.player_error_source_not_found)
+                    SnackbarUtil.show(this@PlayerView, R.string.player_error_source_not_found)
                 }
             }
         }

app/src/main/java/com/nextcloud/ui/SetOnlineStatusBottomSheet.kt

@@ -24,13 +24,13 @@ import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.core.AsyncRunner
 import com.nextcloud.client.di.Injectable
+import com.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.extensions.setVisibleIf
 import com.owncloud.android.R
 import com.owncloud.android.databinding.SetOnlineStatusBottomSheetBinding
 import com.owncloud.android.lib.resources.users.Status
 import com.owncloud.android.lib.resources.users.StatusType
 import com.owncloud.android.ui.activity.BaseActivity
-import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.theme.CapabilityUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.Dispatchers
@@ -114,7 +114,7 @@ class SetOnlineStatusBottomSheet(val currentStatus: Status?) :
             }
 
             activity?.let {
-                DisplayUtils.showSnackMessage(it, R.string.set_online_status_bottom_sheet_error_message)
+                SnackbarUtil.show(it, R.string.set_online_status_bottom_sheet_error_message)
             }
             clearTopStatus()
         }

app/src/main/java/com/nextcloud/ui/SetStatusMessageBottomSheet.kt

@@ -28,6 +28,7 @@ import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.core.AsyncRunner
 import com.nextcloud.client.di.Injectable
+import com.nextcloud.utils.SnackbarUtil
 import com.owncloud.android.R
 import com.owncloud.android.databinding.SetStatusMessageBottomSheetBinding
 import com.owncloud.android.datamodel.ArbitraryDataProvider
@@ -296,7 +297,7 @@ class SetStatusMessageBottomSheet(val user: User, val currentStatus: Status?) :
         if (boolean) {
             dismiss()
         } else {
-            DisplayUtils.showSnackMessage(view, view?.resources?.getString(R.string.error_setting_status_message))
+            SnackbarUtil.show(view, view?.resources?.getString(R.string.error_setting_status_message))
         }
     }
 

app/src/main/java/com/nextcloud/ui/component/UploadWarningCard.kt

@@ -18,10 +18,10 @@ import android.view.View
 import androidx.core.net.toUri
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.jobs.BackgroundJobManager
+import com.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.extensions.setVisibleIf
 import com.owncloud.android.databinding.UploadWarningCardBinding
 import com.owncloud.android.datamodel.SyncedFolderProvider
-import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.FilesSyncHelper
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.CoroutineScope
@@ -120,7 +120,7 @@ class UploadWarningCard(
                 FilesSyncHelper.startAutoUploadIgnoringPowerSaving(syncedFolderProvider, backgroundJobManager)
             }
 
-            DisplayUtils.showSnackMessage(view, result.messageId)
+            SnackbarUtil.show(view, result.messageId)
         }
     }
 }

app/src/main/java/com/nextcloud/ui/fileInfo/GovernanceDetailInfo.kt

@@ -28,11 +28,11 @@ import com.google.android.material.textfield.TextInputLayout
 import com.nextcloud.ui.fileInfo.model.GovernanceEvent
 import com.nextcloud.ui.fileInfo.model.GovernanceLabel
 import com.nextcloud.ui.fileInfo.model.GovernanceUiState
+import com.nextcloud.utils.SnackbarUtil
 import com.owncloud.android.R
 import com.owncloud.android.databinding.FileInfoFragmentBinding
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.ui.dialog.extensions.themeButtons
-import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.first
@@ -74,7 +74,7 @@ class GovernanceDetailInfo(
             viewModel.events.collect { event ->
                 when (event) {
                     GovernanceEvent.PermissionDenied -> {
-                        DisplayUtils.showSnackMessage(fragment, R.string.governance_permission_denied)
+                        SnackbarUtil.show(fragment, R.string.governance_permission_denied)
                         currentLoadedState()?.let { refresh(it) }
                     }
                 }

app/src/main/java/com/nextcloud/ui/fileactions/ClientIntegration.kt

@@ -38,6 +38,7 @@ import com.nextcloud.operations.PostMethod
 import com.nextcloud.ui.composeActivity.ComposeActivity
 import com.nextcloud.ui.composeActivity.ComposeDestination
 import com.nextcloud.utils.GlideHelper
+import com.nextcloud.utils.SnackbarUtil
 import com.owncloud.android.R
 import com.owncloud.android.databinding.FileActionsBottomSheetBinding
 import com.owncloud.android.databinding.FileActionsBottomSheetItemBinding
@@ -201,7 +202,7 @@ class ClientIntegration(
     }
 
     private suspend fun showMessage(message: String) = withContext(Dispatchers.Main) {
-        DisplayUtils.showSnackMessage(sheet.requireActivity(), message)
+        SnackbarUtil.show(sheet.requireActivity(), message)
     }
 
     private fun parseTooltipResult(response: String?): TooltipResponse {

app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt

@@ -34,6 +34,7 @@ import com.nextcloud.android.lib.resources.clientintegration.Endpoint
 import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.di.ViewModelFactory
+import com.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.extensions.setVisibleIf
 import com.nextcloud.utils.thumbnail.ThumbnailArguments
 import com.owncloud.android.R
@@ -138,7 +139,7 @@ class FileActionsBottomSheet :
 
             FileActionsViewModel.UiState.Error -> {
                 activity?.let {
-                    DisplayUtils.showSnackMessage(it, R.string.error_file_actions)
+                    SnackbarUtil.show(it, R.string.error_file_actions)
                 }
                 dismissAllowingStateLoss()
             }

app/src/main/java/com/nextcloud/ui/trashbinFileActions/TrashbinFileActionsBottomSheet.kt

@@ -26,6 +26,7 @@ import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.di.ViewModelFactory
+import com.nextcloud.utils.SnackbarUtil
 import com.nextcloud.utils.extensions.toOCFile
 import com.nextcloud.utils.thumbnail.ThumbnailArguments
 import com.owncloud.android.R
@@ -34,7 +35,6 @@ import com.owncloud.android.databinding.FileActionsBottomSheetItemBinding
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.SyncedFolderProvider
 import com.owncloud.android.lib.resources.trashbin.model.TrashbinFile
-import com.owncloud.android.utils.DisplayUtils
 import com.nextcloud.utils.thumbnail.ThumbnailGenerator
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import javax.inject.Inject
@@ -111,7 +111,7 @@ class TrashbinFileActionsBottomSheet :
 
             TrashbinFileActionsViewModel.UiState.Error -> {
                 activity?.let {
-                    DisplayUtils.showSnackMessage(it, R.string.error_file_actions)
+                    SnackbarUtil.show(it, R.string.error_file_actions)
                 }
                 dismissAllowingStateLoss()
             }