Remove transparent background in icons

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 362106e..e0d0fcc 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.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;

-import android.graphics.Shader;

 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.BitmapDrawable;

+import android.graphics.drawable.ColorDrawable;

 import android.graphics.drawable.Drawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 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) {
                                 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);
                                     InputStream inputStream = get.getResponseBodyAsStream();
                                     Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
                                     thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);


@@ -326,15 +323,10 @@ public class ThumbnailsCacheManager {
                     px,
                     Bitmap.Config.ARGB_8888);
             Canvas c = new Canvas(resultBitmap);
                     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);
+            ColorDrawable backgroundColor =
+                    new ColorDrawable(MainApp.getAppContext().getResources().
+                            getColor(R.color.background_color));
+            backgroundColor.draw(c);

 
             c.drawBitmap(bitmap, 0, 0, null);
 
 
             c.drawBitmap(bitmap, 0, 0, null);
 

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 321a9e0..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 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
  *   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.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
 import android.os.Build;\r
 import android.preference.PreferenceManager;\r
 import android.text.format.DateUtils;\r


@@ -322,14 +322,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                         }\r
                     }\r
 \r
                         }\r
                     }\r
 \r

-                    if (file.getMimetype().equalsIgnoreCase("image/png")){\r
-                        Drawable backrepeat = mContext.getResources().\r
-                                              getDrawable(R.drawable.backrepeat);\r
-                        fileIcon.setBackground(backrepeat);\r
-                    } else {\r
-                        fileIcon.setBackground(null);\r
+                    if (file.getMimetype().equalsIgnoreCase("image/png")) {\r
+                        fileIcon.setBackgroundColor(mContext.getResources()\r
+                                .getColor(R.color.background_color));\r

                     }\r
 \r
                     }\r
 \r

+\r

                 } else {\r
                     fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(file.getMimetype(),\r
                             file.getFileName()));\r
                 } else {\r
                     fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(file.getMimetype(),\r
                             file.getFileName()));\r


@@ -337,7 +335,6 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 \r
             } else {\r
                 // Folder\r
 \r
             } else {\r
                 // Folder\r

-                fileIcon.setBackground(null);\r

 \r
                 if (checkIfFileIsSharedWithMe(file)) {\r
                     fileIcon.setImageResource(R.drawable.shared_with_me_folder);\r
 \r
                 if (checkIfFileIsSharedWithMe(file)) {\r
                     fileIcon.setImageResource(R.drawable.shared_with_me_folder);\r