Changeset 14641

Timestamp:

04/18/13 10:27:27 (12 years ago)

Author:

ltnguyen

Message:

Description implementation for images

Location:

issm/trunk-jpl/src/mobile/android/ISSM_APP

Files:

• res/drawable/image0.png (added)
• res/drawable/image15.png (deleted)
• res/raw (added)
• res/raw/text.txt (added)
• src/gov/nasa/jpl/issm/GalleryDescription.java (added)
• src/gov/nasa/jpl/issm/GalleryImage.java (modified) (4 diffs)
• src/gov/nasa/jpl/issm/ISSM.java (modified) (2 diffs)

issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/GalleryImage.java

@@ -20 +20 @@
 
 public class GalleryImage extends Activity {
-
+        private GalleryDescription description;
         private ImageView selectedImageView;
         private TextView selectedTextView;
@@ -59 +59 @@
                 rightArrowImageView = (ImageView) findViewById(R.id.right_arrow_imageview);
                 gallery = (Gallery) findViewById(R.id.gallery);
-                
+                description = new GalleryDescription(this);
                 infoState.setOnClickListener(new View.OnClickListener() 
                 {
@@ -173 +173 @@
                 drawables = new ArrayList<Drawable>();
                 
-                for (int i = 1; i < 16; i++)
+                for (int i = 0; i < 15; i++)
                 {
                         drawables.add(getResources().getDrawable(getResources().getIdentifier("image"+i, "drawable", getPackageName())));
@@ -186 +186 @@
                 selectedImageView.setImageBitmap(b);
                 selectedImageView.setScaleType(ScaleType.FIT_XY);
-                selectedTextView.setText("This is sample text " + selectedImagePosition);
+                selectedTextView.setText(description.getDescription(selectedImagePosition));
         }
         

issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java

@@ -278 +278 @@
                         super.onProgressUpdate();
                         dialog.setProgress(value[0]);
-                        if(value[0] == 100)
+                        if(value[0] == 100 )
                         {
                                 dialog.dismiss();
@@ -293 +293 @@
                                 e.printStackTrace();
                         }
+                        if (dialog.isShowing())
+                                dialog.dismiss();
+                        //set back dialog start at 0
+                        dialog.setProgress(0);
                         if(result) drawFigure();