wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -258,6 +258,7 @@ public final class ThumbnailsCacheManager {
         private WeakReference<FrameLayout> frameLayoutReference;
         private OCFile file;
         private ConnectivityService connectivityService;
+        private int backgroundColor;
 
 
         public ResizedImageGenerationTask(FileFragment fileFragment,
@@ -265,7 +266,8 @@ public final class ThumbnailsCacheManager {
                                           FrameLayout emptyListProgress,
                                           FileDataStorageManager storageManager,
                                           ConnectivityService connectivityService,
-                                          Account account)
+                                          Account account,
+                                          int backgroundColor)
                 throws IllegalArgumentException {
             this.fileFragment = fileFragment;
             imageViewReference = new WeakReference<>(imageView);
@@ -273,6 +275,7 @@ public final class ThumbnailsCacheManager {
             this.storageManager = storageManager;
             this.connectivityService = connectivityService;
             this.account = account;
+            this.backgroundColor = backgroundColor;
         }
 
         @Override
@@ -397,6 +400,7 @@ public final class ThumbnailsCacheManager {
                         if (String.valueOf(imageView.getTag()).equals(tagId)) {
                             imageView.setVisibility(View.VISIBLE);
                             imageView.setImageBitmap(bitmap);
+                            imageView.setBackgroundColor(backgroundColor);
 
                             if (frameLayout != null) {
                                 frameLayout.setVisibility(View.GONE);

src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -579,12 +579,14 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
                 if (ThumbnailsCacheManager.cancelPotentialThumbnailWork(getFile(), toolbarActivity.getPreviewImageView()) &&
                         containerActivity.getStorageManager() != null) {
                     final ThumbnailsCacheManager.ResizedImageGenerationTask task =
-                            new ThumbnailsCacheManager.ResizedImageGenerationTask(this,
-                                                                                  toolbarActivity.getPreviewImageView(),
-                                                                                  toolbarActivity.getPreviewImageContainer(),
-                                                                                  containerActivity.getStorageManager(),
-                                                                                  connectivityService,
-                                                                                  containerActivity.getStorageManager().getAccount());
+                        new ThumbnailsCacheManager.ResizedImageGenerationTask(this,
+                                                                              toolbarActivity.getPreviewImageView(),
+                                                                              toolbarActivity.getPreviewImageContainer(),
+                                                                              containerActivity.getStorageManager(),
+                                                                              connectivityService,
+                                                                              containerActivity.getStorageManager().getAccount(),
+                                                                              getResources().getColor(R.color.background_color_inverse)
+                        );
 
                     if (resizedImage == null) {
                         resizedImage = thumbnail;

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

@@ -239,6 +239,20 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
             int width = screenSize.x;
             int height = screenSize.y;
 
+            // show thumbnail while loading image
+            binding.image.setVisibility(View.GONE);
+            binding.emptyListProgress.setVisibility(View.VISIBLE);
+
+            Bitmap thumbnail = getThumbnailBitmap(getFile());
+            if (thumbnail != null) {
+                binding.shimmer.setVisibility(View.VISIBLE);
+                binding.shimmerThumbnail.setImageBitmap(thumbnail);
+                binding.image.setVisibility(View.GONE);
+                bitmap = thumbnail;
+            } else {
+                thumbnail = ThumbnailsCacheManager.mDefaultImg;
+            }
+
             if (showResizedImage) {
                 Bitmap resizedImage = getResizedBitmap(getFile(), width, height);
 
@@ -251,21 +265,6 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
 
                     bitmap = resizedImage;
                 } else {
-                    binding.emptyListProgress.setVisibility(View.VISIBLE);
-                    binding.image.setVisibility(View.GONE);
-
-                    // show thumbnail while loading resized image
-                    Bitmap thumbnail = getThumbnailBitmap(getFile());
-
-                    if (thumbnail != null) {
-                        binding.shimmer.setVisibility(View.VISIBLE);
-                        binding.shimmerThumbnail.setImageBitmap(thumbnail);
-                        binding.image.setVisibility(View.GONE);
-                        bitmap = thumbnail;
-                    } else {
-                        thumbnail = ThumbnailsCacheManager.mDefaultImg;
-                    }
-
                     // generate new resized image
                     if (ThumbnailsCacheManager.cancelPotentialThumbnailWork(getFile(), binding.image) &&
                         containerActivity.getStorageManager() != null) {
@@ -275,7 +274,9 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
                                                                                   binding.emptyListProgress,
                                                                                   containerActivity.getStorageManager(),
                                                                                   connectivityService,
-                                                                                  containerActivity.getStorageManager().getAccount());
+                                                                                  containerActivity.getStorageManager().getAccount(),
+                                                                                  getResources().getColor(R.color.background_color_inverse)
+                            );
                         if (resizedImage == null) {
                             resizedImage = thumbnail;
                         }