mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improvements in load of images: progress wheel while loading and better scaling

Browse source
This commit is contained in:
David A. Velasco 2013-03-01 11:17:12 +01:00
parent 427a3e6331
commit 07a8938270
2 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
View file

@ -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();
}

19
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -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