Merge pull request #3639 from owncloud/feature/preview_svg

Previewing SVG files works

Author: abelgardep

CHANGELOG.md

@@ -25,6 +25,7 @@ Summary
 * Enhancement - New option to show or not hidden files: [#2578](https://github.com/owncloud/android/issues/2578)
 * Enhancement - Option to allow screenshots or not in Android Enterprise: [#3625](https://github.com/owncloud/android/issues/3625)
 * Enhancement - Full name is shown in shares: [#1106](https://github.com/owncloud/android/issues/1106)
+* Enhancement - Support for SVG files added: [#1033](https://github.com/owncloud/android/issues/1033)
 * Enhancement - Improved copy/move dialog: [#1414](https://github.com/owncloud/android/issues/1414)
 * Enhancement - Thumbnail click action in file detail: [#3653](https://github.com/owncloud/android/pull/3653)
 
@@ -163,6 +164,13 @@ Details
    https://github.com/owncloud/android/issues/1106
    https://github.com/owncloud/android/pull/3636
 
+* Enhancement - Support for SVG files added: [#1033](https://github.com/owncloud/android/issues/1033)
+
+   SVG files are supported and can be downloaded and viewed.
+
+   https://github.com/owncloud/android/issues/1033
+   https://github.com/owncloud/android/pull/3639
+
 * Enhancement - Improved copy/move dialog: [#1414](https://github.com/owncloud/android/issues/1414)
 
    Previously,they appeared exactly the same and there was no way of knowing which was which. Now

changelog/unreleased/3639

@@ -0,0 +1,6 @@
+Enhancement: Support for SVG files added
+
+SVG files are supported and can be downloaded and viewed.
+
+https://github.com/owncloud/android/issues/1033
+https://github.com/owncloud/android/pull/3639

owncloudApp/build.gradle

@@ -26,6 +26,7 @@ dependencies {
 
     // Image loading
     implementation 'com.github.bumptech.glide:glide:4.12.0'
+    implementation 'com.github.corouteam:GlideToVectorYou:v2.0.0'
 
     // CustomTabs required for OAuth2 and OIDC.
     implementation "androidx.browser:browser:1.4.0"

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt

@@ -27,6 +27,7 @@ package com.owncloud.android.ui.preview
 
 import android.accounts.Account
 import android.graphics.Bitmap
+import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -47,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
@@ -120,6 +122,8 @@ class PreviewImageFragment : FileFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.top.setBackgroundColor(getBackgroundColor(file))
+
         binding.photoView.isVisible = false
         binding.photoView.setOnClickListener {
             (requireActivity() as PreviewImageActivity).toggleFullScreen()
@@ -330,13 +334,21 @@ class PreviewImageFragment : FileFragment() {
                     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 == MIME_SVG
+
+    private fun getBackgroundColor(file: OCFile): Int {
+        return if (isSVGFile(file)) Color.WHITE else Color.BLACK
+    }
+
     /**
      * Finishes the preview
      */

owncloudApp/src/main/res/layout/preview_image_fragment.xml

@@ -22,7 +22,6 @@
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
     android:filterTouchesWhenObscured="true"
     tools:context=".ui.preview.PreviewImageFragment">
 
@@ -46,7 +45,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintBottom_toBottomOf="parent" />
 
     <TextView
         android:id="@+id/errorText"

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)