add checker background pattern for all png images.

diff --git a/res/drawable/backrepeat.xml b/res/drawable/backrepeat.xml
new file mode 100644 (file)
index 0000000..37105c7
--- /dev/null
+++ b/res/drawable/backrepeat.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/checker_16_16"
+    android:tileMode="repeat" />
\ No newline at end of file

diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml
index d584b44..11f88ba 100644 (file)
--- a/res/layout/preview_image_fragment.xml
+++ b/res/layout/preview_image_fragment.xml
@@ -42,7 +42,7 @@
         android:indeterminateOnly="true"
         android:layout_centerInParent="true"
         />
         android:indeterminateOnly="true"
         android:layout_centerInParent="true"
         />

-    
+

     <third_parties.michaelOrtiz.TouchImageViewCustom
         android:id="@+id/image"
         android:layout_width="match_parent"
     <third_parties.michaelOrtiz.TouchImageViewCustom
         android:id="@+id/image"
         android:layout_width="match_parent"


@@ -62,5 +62,5 @@
         android:text="@string/placeholder_sentence"
         android:textColor="@color/owncloud_blue_bright"
         />
         android:text="@string/placeholder_sentence"
         android:textColor="@color/owncloud_blue_bright"
         />

-    
+

 </RelativeLayout>
\ No newline at end of file
 </RelativeLayout>
\ No newline at end of file

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 7950ec9..394bc4d 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -26,6 +26,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Point;

+import android.graphics.drawable.Drawable;

 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.FragmentStatePagerAdapter;


@@ -200,7 +201,8 @@ public class PreviewImageFragment extends FileFragment {
         if (getFile() != null) {
             mLoadBitmapTask = new LoadBitmapTask(mImageView, mMessageView, mProgressWheel);
             //mLoadBitmapTask.execute(new String[]{getFile().getStoragePath()});
         if (getFile() != null) {
             mLoadBitmapTask = new LoadBitmapTask(mImageView, mMessageView, mProgressWheel);
             //mLoadBitmapTask.execute(new String[]{getFile().getStoragePath()});

-            mLoadBitmapTask.execute(getFile().getStoragePath());
+//            mLoadBitmapTask.execute(getFile().getStoragePath());
+            mLoadBitmapTask.execute(getFile());

         }
     }
     
         }
     }
     


@@ -351,7 +353,7 @@ public class PreviewImageFragment extends FileFragment {
     }
     
     
     }
     
     

-    private class LoadBitmapTask extends AsyncTask<String, Void, Bitmap> {
+    private class LoadBitmapTask extends AsyncTask<OCFile, Void, LoadImage> {

 
         /**
          * Weak reference to the target {@link ImageView} where the bitmap will be loaded into.
 
         /**
          * Weak reference to the target {@link ImageView} where the bitmap will be loaded into.


@@ -397,12 +399,12 @@ public class PreviewImageFragment extends FileFragment {
             mProgressWheelRef = new WeakReference<ProgressBar>(progressWheel);
         }
         
             mProgressWheelRef = new WeakReference<ProgressBar>(progressWheel);
         }
         

-        

         @Override
         @Override

-        protected Bitmap doInBackground(String... params) {
+        protected LoadImage doInBackground(OCFile... params) {

             Bitmap result = null;
             if (params.length != 1) return null;
             Bitmap result = null;
             if (params.length != 1) return null;

-            String storagePath = params[0];
+            OCFile ocFile = params[0];
+            String storagePath = ocFile.getStoragePath();

             try {
 
                 int maxDownScale = 3;   // could be a parameter passed to doInBackground(...)
             try {
 
                 int maxDownScale = 3;   // could be a parameter passed to doInBackground(...)


@@ -415,7 +417,7 @@ public class PreviewImageFragment extends FileFragment {
                         result = BitmapUtils.decodeSampledBitmapFromFile(storagePath, minWidth,
                                 minHeight);
 
                         result = BitmapUtils.decodeSampledBitmapFromFile(storagePath, minWidth,
                                 minHeight);
 

-                        if (isCancelled()) return result;
+                        if (isCancelled()) return new LoadImage(result, ocFile);

 
                         if (result == null) {
                             mErrorMessageId = R.string.preview_image_error_unknown_format;
 
                         if (result == null) {
                             mErrorMessageId = R.string.preview_image_error_unknown_format;


@@ -455,40 +457,46 @@ public class PreviewImageFragment extends FileFragment {
                 Log_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t);
                 
             }
                 Log_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t);
                 
             }

-            
-            return result;
+            return new LoadImage(result, ocFile);

         }
         
         @Override
         }
         
         @Override

-        protected void onCancelled(Bitmap result) {
-            if (result != null) {
-                result.recycle();
+        protected void onCancelled(LoadImage result) {
+            if (result.bitmap != null) {
+                result.bitmap.recycle();

             }
         }
 
         @Override
             }
         }
 
         @Override

-        protected void onPostExecute(Bitmap result) {
+        protected void onPostExecute(LoadImage result) {

             hideProgressWheel();
             hideProgressWheel();

-            if (result != null) {
+            if (result.bitmap != null) {

                 showLoadedImage(result);
             } else {
                 showErrorMessage();
             }
                 showLoadedImage(result);
             } else {
                 showErrorMessage();
             }

-            if (result != null && mBitmap != result)  {
+            if (result.bitmap != null && mBitmap != result.bitmap)  {

                 // unused bitmap, release it! (just in case)
                 // unused bitmap, release it! (just in case)

-                result.recycle();
+                result.bitmap.recycle();

             }
         }
         
         @SuppressLint("InlinedApi")
             }
         }
         
         @SuppressLint("InlinedApi")

-        private void showLoadedImage(Bitmap result) {
+        private void showLoadedImage(LoadImage result) {

             final ImageViewCustom imageView = mImageViewRef.get();
             final ImageViewCustom imageView = mImageViewRef.get();

+            Bitmap bitmap = result.bitmap;

             if (imageView != null) {
             if (imageView != null) {

-                Log_OC.d(TAG, "Showing image with resolution " + result.getWidth() + "x" +
-                        result.getHeight());
-                imageView.setImageBitmap(result);
+                Log_OC.d(TAG, "Showing image with resolution " + bitmap.getWidth() + "x" +
+                        bitmap.getHeight());
+
+                if (result.ocFile.getMimetype().equalsIgnoreCase("image/png")){
+                    Drawable backrepeat = getResources().getDrawable(R.drawable.backrepeat);
+                    imageView.setBackground(backrepeat);
+                }
+
+                imageView.setImageBitmap(bitmap);

                 imageView.setVisibility(View.VISIBLE);
                 imageView.setVisibility(View.VISIBLE);

-                mBitmap  = result;  // needs to be kept for recycling when not useful
+                mBitmap  = bitmap;  // needs to be kept for recycling when not useful

             }
 
             final TextView messageView = mMessageViewRef.get();
             }
 
             final TextView messageView = mMessageViewRef.get();


@@ -544,4 +552,15 @@ public class PreviewImageFragment extends FileFragment {
         return mImageView;
     }
 
         return mImageView;
     }
 

+    private class LoadImage {
+        private Bitmap bitmap;
+        private OCFile ocFile;
+
+        public LoadImage(Bitmap bitmap, OCFile ocFile){
+            this.bitmap = bitmap;
+            this.ocFile = ocFile;
+        }
+
+    }
+

 }
 }