Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/anim/translate.xml =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/anim/translate.xml (revision 15012) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/res/anim/translate.xml (revision 15013) @@ -9,5 +9,5 @@ android:fromYDelta="200%" android:toYDelta="0%" - android:duration="2000" + android:duration="3000" android:zAdjustment="top" /> Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ColorBar.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ColorBar.java (revision 15012) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ColorBar.java (revision 15013) @@ -1,5 +1,3 @@ package gov.nasa.jpl.issm; - -import java.text.DecimalFormat; import android.content.Context; @@ -8,5 +6,4 @@ import android.graphics.Paint; import android.util.AttributeSet; -import android.view.MotionEvent; import android.view.View; ///////////////////////////////////////////////////////////// @@ -19,5 +16,5 @@ private int start_x = 10; private int start_y = 10; - private int end_y = 0; + //private int end_y = 0; boolean touch; final int MAX_SCALING =255; @@ -76,5 +73,5 @@ y+=3; } - end_y = y; + //end_y = y; } //---------------------------------------------------------------- Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/GalleryAdapter.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/GalleryAdapter.java (revision 15012) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/GalleryAdapter.java (revision 15013) @@ -4,5 +4,4 @@ import android.app.Activity; -import android.graphics.drawable.Drawable; import android.view.View; import android.view.ViewGroup; @@ -17,14 +16,14 @@ private static ImageView imageView; - private List plotsImages; + + private List plotsImages; + private static ViewHolder holder; + + public GalleryAdapter(Activity context, List plotsImages) + { + this.context = context; + this.plotsImages = plotsImages; + } - private static ViewHolder holder; - - public GalleryAdapter(Activity context, List plotsImages) { - - this.context = context; - this.plotsImages = plotsImages; - - } @Override @@ -65,6 +64,6 @@ } - holder.imageView.setImageDrawable(plotsImages.get(position)); - + + holder.imageView.setImageBitmap(ImageList.getImageList().get(position)); holder.imageView.setScaleType(ImageView.ScaleType.FIT_XY); holder.imageView.setLayoutParams(new Gallery.LayoutParams(150, 90)); Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/GalleryImage.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/GalleryImage.java (revision 15012) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/GalleryImage.java (revision 15013) @@ -6,6 +6,4 @@ import android.content.Intent; import android.graphics.Bitmap; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; @@ -34,5 +32,6 @@ private int selectedImagePosition = 0; - private List drawables; + //private List drawables; + private List drawables; private GalleryAdapter galImageAdapter; @@ -185,17 +184,21 @@ private void getDrawablesList() { - drawables = new ArrayList(); - + drawables = new ArrayList(); + int resID; for (int i = 0; i < 17; i++) { - drawables.add(getResources().getDrawable(getResources().getIdentifier("image"+i, "drawable", getPackageName()))); - } - + resID=getResources().getIdentifier("image"+i, "drawable", getPackageName()); + drawables.add(resID); + + } } private void setSelectedImage(int selectedImagePosition) { - - BitmapDrawable bd = (BitmapDrawable) drawables.get(selectedImagePosition); - Bitmap b = Bitmap.createScaledBitmap(bd.getBitmap(), (int) (bd.getIntrinsicHeight() * 0.9), (int) (bd.getIntrinsicWidth() * 0.7), false); + + int width= getResources().getDisplayMetrics().widthPixels; + int height= getResources().getDisplayMetrics().heightPixels; + Bitmap b; + b = ImageResizer.decodeSampledBitmapFromResource(getResources(), drawables.get(selectedImagePosition), width, height); + b = Bitmap.createScaledBitmap(b, width, height, true); selectedImageView.setImageBitmap(b); selectedImageView.setScaleType(ScaleType.FIT_XY); Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java (revision 15012) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java (revision 15013) @@ -9,5 +9,4 @@ import android.app.Activity; import android.app.ProgressDialog; -import android.graphics.Matrix; import android.util.DisplayMetrics; import android.view.GestureDetector; Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSMAPP.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSMAPP.java (revision 15012) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSMAPP.java (revision 15013) @@ -7,4 +7,5 @@ import java.io.OutputStream; import android.app.Activity; +import android.app.ProgressDialog; import android.os.AsyncTask; import android.os.Bundle; @@ -22,9 +23,10 @@ public class ISSMAPP extends Activity { - MenuPage mp = new MenuPage(); + ImageList imageList; private static final String PREFERENCE_FIRST_RUN = null; private String extStorageDirectory; private String issmFolder; SharedPreferences settings; + private ProgressDialog progressDialog; //------------------------------------------------------------------------ public void onCreate(Bundle icicle) @@ -36,5 +38,5 @@ extStorageDirectory = Environment.getExternalStorageDirectory().toString(); issmFolder = extStorageDirectory + "/ISSM/input_files/"; - + imageList = new ImageList(this); new CopyDataTask().execute(firstrun); } @@ -47,11 +49,5 @@ protected Boolean doInBackground(Boolean... target) { - StartAnimations(); - try { - Thread.sleep(3000); - } catch (InterruptedException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } + imageList.decodeAndResizeImage(); //not sure why, but target[0] can be true on install! more to be done. //if(target[0] = false) @@ -66,6 +62,16 @@ return true; } + @Override + protected void onPreExecute() + { + progressDialog = new ProgressDialog(ISSMAPP.this); + progressDialog.setMessage("Loading Data"); + progressDialog.setIndeterminate(true); + progressDialog.setCancelable(false); + progressDialog.show(); + } protected void onPostExecute(Boolean result) { + progressDialog.dismiss(); Intent i = new Intent(ISSMAPP.this, MenuPage.class); i.putExtra("pathToFile", issmFolder); @@ -78,5 +84,4 @@ if (android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED)) { - System.out.println(issmFolder); File txtDirectory = new File(issmFolder); @@ -85,5 +90,4 @@ { txtDirectory.mkdirs(); - System.out.println("making directory"); } CopyAssets(); // Then run the method to copy the file. @@ -127,5 +131,4 @@ } } - System.out.println("Done"); } //---------------------------------------------------------------------------- Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ImageList.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ImageList.java (revision 15013) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ImageList.java (revision 15013) @@ -0,0 +1,34 @@ +package gov.nasa.jpl.issm; + +import java.util.ArrayList; + +import android.content.Context; +import android.graphics.Bitmap; + +public class ImageList +{ + private static ArrayList imageList; + private Context context; + final int nImage = 17; +//---------------------------------------------------------- + public ImageList(Context context) + { + imageList = new ArrayList (); + this.context = context; + } +//---------------------------------------------------------- + public void decodeAndResizeImage() + { + int resID; + for(int i = 0 ; i < nImage; i++) + { + resID=context.getResources().getIdentifier("image"+i, "drawable", context.getPackageName()); + imageList.add(ImageResizer.decodeSampledBitmapFromResource(context.getResources(), resID , 50, 50)); + } + } +//---------------------------------------------------------- + public static ArrayList getImageList() + { + return imageList; + } +} Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ImageResizer.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ImageResizer.java (revision 15013) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ImageResizer.java (revision 15013) @@ -0,0 +1,49 @@ +package gov.nasa.jpl.issm; + +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; + +public class ImageResizer { + + public static Bitmap decodeSampledBitmapFromResource(Resources res, int resId, + int reqWidth, int reqHeight) { + + // First decode with inJustDecodeBounds=true to check dimensions + final BitmapFactory.Options options = new BitmapFactory.Options(); + options.inJustDecodeBounds = true; + BitmapFactory.decodeResource(res, resId, options); + + // Calculate inSampleSize + options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight); + + // Decode bitmap with inSampleSize set + options.inJustDecodeBounds = false; + return BitmapFactory.decodeResource(res, resId, options); + } + + public static int calculateInSampleSize( + BitmapFactory.Options options, int reqWidth, int reqHeight) + { + // Raw height and width of image + int height = options.outHeight; + int width = options.outWidth; + int inSampleSize = 1; + + if (height > reqHeight || width > reqWidth) { + + // Calculate ratios of height and width to requested height and width + final int heightRatio = Math.round((float) height / (float) reqHeight); + final int widthRatio = Math.round((float) width / (float) reqWidth); + + // Choose the smallest ratio as inSampleSize value, this will guarantee + // a final image with both dimensions larger than or equal to the + // requested height and width. + inSampleSize = heightRatio > widthRatio ? heightRatio : widthRatio; + } + + return inSampleSize; + + } + +} Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MenuPage.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MenuPage.java (revision 15012) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MenuPage.java (revision 15013) @@ -13,5 +13,5 @@ { ISSM issm = new ISSM(); - GalleryImage gallery = new GalleryImage(); + //GalleryImage gallery = new GalleryImage(); private String issmFolder; //------------------------------------------------------------------------ Index: /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ZoomImageView.java =================================================================== --- /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ZoomImageView.java (revision 15012) +++ /issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ZoomImageView.java (revision 15013) @@ -17,5 +17,7 @@ import android.content.Context; +import android.graphics.Bitmap; import android.graphics.Canvas; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.util.AttributeSet; @@ -27,9 +29,8 @@ public class ZoomImageView extends View { private static final int INVALID_POINTER_ID = -1; - + private Bitmap b; private Drawable mIcon; private float mPosX; private float mPosY; - private float mLastTouchX; private float mLastTouchY; @@ -38,4 +39,5 @@ private ScaleGestureDetector mScaleDetector; private float mScaleFactor = 1.f; + public ZoomImageView(Context context, int i) { @@ -47,11 +49,17 @@ } + public ZoomImageView(Context context, AttributeSet attrs, int defStyle, int i) { super(context, attrs, defStyle); - mIcon = getResources().getDrawable(getResources().getIdentifier("image"+i, "drawable", context.getPackageName())); + int resID2 = getResources().getIdentifier("image"+i, "drawable", context.getPackageName()); + //mIcon = getResources().getDrawable(resID); int width= context.getResources().getDisplayMetrics().widthPixels; int height= context.getResources().getDisplayMetrics().heightPixels; + + + b = ImageResizer.decodeSampledBitmapFromResource(getResources(), resID2, width, height); + b = Bitmap.createScaledBitmap(b, width, height, true); + mIcon = new BitmapDrawable(getResources(), b); mIcon.setBounds(0, 0, width, height); - mScaleDetector = new ScaleGestureDetector(context, new ScaleListener()); } @@ -134,4 +142,5 @@ canvas.scale(mScaleFactor, mScaleFactor); mIcon.draw(canvas); + // canvas.drawBitmap(b,0,0,null); canvas.restore(); }