Changeset 14661

Timestamp:

04/19/13 13:48:51 (12 years ago)

Author:

ltnguyen

Message:

Update images for gallery along with better implementation for the gallery description

Location:

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

Files:

• res/drawable/image0.png (modified) ( previous)
• res/drawable/image1.png (modified) ( previous)
• res/drawable/image10.png (modified) ( previous)
• res/drawable/image11.png (modified) ( previous)
• res/drawable/image12.png (modified) ( previous)
• res/drawable/image13.png (modified) ( previous)
• res/drawable/image14.png (modified) ( previous)
• res/drawable/image15.png (added)
• res/drawable/image16.png (added)
• res/drawable/image17.png (added)
• res/drawable/image2.png (modified) ( previous)
• res/drawable/image3.png (modified) ( previous)
• res/drawable/image4.png (modified) ( previous)
• res/drawable/image5.png (modified) ( previous)
• res/drawable/image6.png (modified) ( previous)
• res/drawable/image7.png (modified) ( previous)
• res/drawable/image8.png (modified) ( previous)
• res/drawable/image9.png (modified) ( previous)
• res/layout/backview.xml (modified) (1 diff)
• src/gov/nasa/jpl/issm/GalleryDescription.java (modified) (4 diffs)
• src/gov/nasa/jpl/issm/GalleryImage.java (modified) (2 diffs)

issm/trunk-jpl/src/mobile/android/ISSM_APP/res/layout/backview.xml

@@ -8 +8 @@
                 android:layout_width="wrap_content"
                 android:id="@+id/back_view"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:typeface="serif"
+                android:textSize="20sp">
         </TextView>
 </RelativeLayout>

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

@@ -4 +4 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
 
 import android.content.Context;
@@ -10 +11 @@
 //////////////////////////////////////////////////////////////////
 {
-        private String[] description;
+        private ArrayList<String> description;
         private String[] rawtext;
-        
 //----------------------------------------------------------------
         public GalleryDescription(Context context)
         {
-                description = new String[16];
+                description = new ArrayList<String> ();
                 InputStreamReader isr = new InputStreamReader(context.getResources().openRawResource(R.raw.text));
                 BufferedReader br = new BufferedReader(isr);
@@ -25 +25 @@
                         while ((line = br.readLine()) != null) 
                         {
+                                //this if will continue adding if description is too long to the next line
                                 if(!line.contains(delimiter))
-                                        description[index] += line;
+                                        description.add(index, description.get(index)+" "+line);
                                 else
                                 {       
                                         rawtext = line.split(delimiter); 
+                                        //slot 0 contains the image number, slot 1 contains the description.
                                         index = Integer.parseInt(rawtext[0]);
-                                        description[index] = rawtext[1];
+                                        description.add(index, rawtext[1]);
                                 }
                         }
@@ -41 +43 @@
         public String getDescription(int index)
         {
-                return description[index];
+                if(index >= description.size())
+                {
+                        return "There is no detailed description for this image yet!";
+                }
+                return description.get(index);
         }
 }

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

@@ -173 +173 @@
                 drawables = new ArrayList<Drawable>();
                 
-                for (int i = 0; i < 15; i++)
+                for (int i = 0; i < 17; i++)
                 {
                         drawables.add(getResources().getDrawable(getResources().getIdentifier("image"+i, "drawable", getPackageName())));
@@ -186 +186 @@
                 selectedImageView.setImageBitmap(b);
                 selectedImageView.setScaleType(ScaleType.FIT_XY);
-                selectedTextView.setText(description.getDescription(selectedImagePosition));
+                selectedTextView.setText(description.getDescription(selectedImagePosition       ));
         }