From 1c2009bd87e6adc30df7b3c5e26974c80c5cd07b Mon Sep 17 00:00:00 2001 From: Fernando Sanz Date: Thu, 28 Apr 2022 09:21:41 +0200 Subject: [PATCH] CR suggestions --- .../ui/preview/PreviewImageFragment.kt | 24 +++++++++---------- .../android/domain/files/MimeTypeConstants.kt | 1 + 2 files changed, 13 insertions(+), 12 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 index 402f4d1d563f..5adb7992f603 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt @@ -48,6 +48,7 @@ import com.owncloud.android.R import com.owncloud.android.databinding.PreviewImageFragmentBinding import com.owncloud.android.databinding.TopProgressBarBinding import com.owncloud.android.datamodel.OCFile +import com.owncloud.android.domain.files.MIME_SVG import com.owncloud.android.files.FileMenuFilter import com.owncloud.android.ui.controller.TransferProgressController import com.owncloud.android.ui.dialog.ConfirmationDialogFragment @@ -327,21 +328,21 @@ class PreviewImageFragment : FileFragment() { return false } - override fun onResourceReady( - resource: Drawable?, model: Any, target: Target, - dataSource: DataSource, isFirstResource: Boolean - ): Boolean { - Timber.d("Loading image %s", file.fileName) - binding.progressWheel.isVisible = false - return false - } - }) - .into(binding.photoView) + override fun onResourceReady( + resource: Drawable?, model: Any, target: Target, + dataSource: DataSource, isFirstResource: Boolean + ): Boolean { + Timber.d("Loading image %s", file.fileName) + binding.progressWheel.isVisible = false + return false + } + }) + .into(binding.photoView) binding.photoView.isVisible = true } - private fun isSVGFile(file: OCFile): Boolean = file.mimetype == SVG_MIMETYPE + private fun isSVGFile(file: OCFile): Boolean = file.mimetype == MIME_SVG private fun getBackgroundColor(file: OCFile): Int { return if (isSVGFile(file)) Color.WHITE else Color.BLACK @@ -358,7 +359,6 @@ class PreviewImageFragment : FileFragment() { private const val ARG_FILE = "FILE" private const val ARG_ACCOUNT = "ACCOUNT" private const val ARG_IGNORE_FIRST = "IGNORE_FIRST" - private const val SVG_MIMETYPE = "image/svg+xml" /** * Public factory method to create a new fragment that previews an image. diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/MimeTypeConstants.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/MimeTypeConstants.kt index 6f045acb1205..eea03d4aa76d 100644 --- a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/MimeTypeConstants.kt +++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/MimeTypeConstants.kt @@ -21,4 +21,5 @@ package com.owncloud.android.domain.files const val MIME_DIR = "DIR" const val MIME_DIR_UNIX = "httpd/unix-directory" +const val MIME_SVG = "image/svg+xml" val LIST_MIME_DIR = listOf(MIME_DIR, MIME_DIR_UNIX)