From 07a89382708f8983fefc95a9629e3524f7f84ec4 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 1 Mar 2013 11:17:12 +0100 Subject: [PATCH] Improvements in load of images: progress wheel while loading and better scaling --- .../android/ui/preview/PreviewImageActivity.java | 4 ++-- .../android/ui/preview/PreviewImageFragment.java | 19 +++++-------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 51489871..47406bea 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -237,7 +237,7 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override protected void onResume() { super.onResume(); - Log.e(TAG, "ACTIVITY, ONRESUME"); + //Log.e(TAG, "ACTIVITY, ONRESUME"); mDownloadFinishReceiver = new DownloadFinishReceiver(); IntentFilter filter = new IntentFilter(FileDownloader.DOWNLOAD_FINISH_MESSAGE); registerReceiver(mDownloadFinishReceiver, filter); @@ -245,7 +245,7 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override protected void onPostResume() { - Log.e(TAG, "ACTIVITY, ONPOSTRESUME"); + //Log.e(TAG, "ACTIVITY, ONPOSTRESUME"); super.onPostResume(); } diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index a082b53c..77cbc492 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -282,7 +282,7 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag @Override public void onResume() { super.onResume(); - Log.e(TAG, "FRAGMENT, ONRESUME"); + //Log.e(TAG, "FRAGMENT, ONRESUME"); /* mDownloadFinishReceiver = new DownloadFinishReceiver(); IntentFilter filter = new IntentFilter( @@ -533,14 +533,6 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag int height = options.outHeight; int scale = 1; - /* - if (width >= 2048 || height >= 2048) { - // try to scale down the image to save memory - scale = (int) Math.ceil((Math.ceil(Math.max(height, width) / 2048.))); - options.inSampleSize = scale; - } - */ - Display display = getActivity().getWindowManager().getDefaultDisplay(); Point size = new Point(); int screenWidth; @@ -555,14 +547,13 @@ public class PreviewImageFragment extends SherlockFragment implements FileFrag } if (width > screenWidth) { - // second try to scale down the image , this time depending upon the screen size; WTF... - scale = (int) Math.ceil((float)width / screenWidth); - options.inSampleSize = scale; + // second try to scale down the image , this time depending upon the screen size + scale = (int) Math.floor((float)width / screenWidth); } if (height > screenHeight) { - scale = Math.max(scale, (int) Math.ceil((float)height / screenHeight)); + scale = Math.max(scale, (int) Math.floor((float)height / screenHeight)); } - + options.inSampleSize = scale; // really load the bitmap options.inJustDecodeBounds = false; // the next decodeFile call will be real -- 2.11.0