Previewing SVG files works

Author: fesave

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
@@ -120,6 +121,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()
@@ -325,18 +328,26 @@ class PreviewImageFragment : FileFragment() {
                     return false
                 }
 
-                override fun onResourceReady(
-                    resource: Drawable?, model: Any, target: Target<Drawable?>,
-                    dataSource: DataSource, isFirstResource: Boolean
-                ): Boolean {
-                    Timber.d("Loading image %s", file.fileName)
-                    return false
-                }
-            })
-            .into(binding.photoView)
+                    override fun onResourceReady(
+                        resource: Drawable?, model: Any, target: Target<Drawable?>,
+                        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 getBackgroundColor(file: OCFile): Int {
+        return if (isSVGFile(file)) Color.WHITE else Color.BLACK
+    }
+
     /**
      * Finishes the preview
      */
@@ -348,6 +359,7 @@ 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.

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"