Merge pull request #1114 from owncloud/tryFix1113

Removed squared background for transparencies from file type icons and thumbnails (stays for images in gallery view)

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 362106e..ce8bfd4 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -34,8 +34,8 @@ import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
-import android.graphics.Shader;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
@@ -290,9 +290,6 @@ public class ThumbnailsCacheManager {
                                 GetMethod get = new GetMethod(uri);
                                 int status = mClient.executeMethod(get);
                                 if (status == HttpStatus.SC_OK) {
-//                                    byte[] bytes = get.getResponseBody();
-//                                    Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0,
-//                                            bytes.length);
                                     InputStream inputStream = get.getResponseBodyAsStream();
                                     Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
                                     thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
@@ -326,16 +323,9 @@ public class ThumbnailsCacheManager {
                     px,
                     Bitmap.Config.ARGB_8888);
             Canvas c = new Canvas(resultBitmap);
-            Bitmap checker = BitmapFactory.decodeResource(MainApp.getAppContext().getResources(),
-                                                          R.drawable.checker_16_16);
-
-            BitmapDrawable background;
-            background = new BitmapDrawable(MainApp.getAppContext().getResources(), checker);
-
-            background.setBounds(0, 0, px, px);
-            background.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
-            background.draw(c);
 
+            c.drawColor(MainApp.getAppContext().getResources().
+                    getColor(R.color.background_color));
             c.drawBitmap(bitmap, 0, 0, null);
 
             return resultBitmap;

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 0c72052..27fc8c1 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -4,6 +4,7 @@
  *   @author Bartek Przybylski\r
  *   @author Tobias Kaminsky\r
  *   @author David A. Velasco\r
+ *   @author masensio\r
  *   Copyright (C) 2011  Bartek Przybylski\r
  *   Copyright (C) 2015 ownCloud Inc.\r
  *\r
@@ -30,7 +31,6 @@ import android.accounts.Account;
 import android.content.Context;\r
 import android.content.SharedPreferences;\r
 import android.graphics.Bitmap;\r
-import android.graphics.drawable.Drawable;\r
 import android.os.Build;\r
 import android.preference.PreferenceManager;\r
 import android.text.format.DateUtils;\r
@@ -322,12 +322,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                         }\r
                     }\r
 \r
-                    if (file.getMimetype().equalsIgnoreCase("image/png")){\r
-                        Drawable backrepeat = mContext.getResources().\r
-                                              getDrawable(R.drawable.backrepeat);\r
-                        fileIcon.setBackground(backrepeat);\r
+                    if (file.getMimetype().equalsIgnoreCase("image/png")) {\r
+                        fileIcon.setBackgroundColor(mContext.getResources()\r
+                                .getColor(R.color.background_color));\r
                     }\r
 \r
+\r
                 } else {\r
                     fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(file.getMimetype(),\r
                             file.getFileName()));\r
@@ -335,6 +335,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 \r
             } else {\r
                 // Folder\r
+\r
                 if (checkIfFileIsSharedWithMe(file)) {\r
                     fileIcon.setImageResource(R.drawable.shared_with_me_folder);\r
                 } else if (file.isShareByLink()) {\r