Changeset 14563

Timestamp:

04/12/13 15:16:23 (12 years ago)

Author:

ltnguyen

Message:

CHNG: simple layout of gallery for description of images

Location:

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

Files:

• res/drawable-mdpi/ic_action_info.png (added)
• res/drawable-mdpi/ic_action_photo.png (added)
• res/layout/gallery.xml (modified) (3 diffs)
• src/gov/nasa/jpl/issm/DisplayNextView.java (modified) (2 diffs)
• src/gov/nasa/jpl/issm/GalleryImage.java (modified) (4 diffs)
• src/gov/nasa/jpl/issm/MenuPage.java (modified) (1 diff)
• src/gov/nasa/jpl/issm/SwapViews.java (modified) (2 diffs)
• src/gov/nasa/jpl/issm/VideoActivity.java (modified) (1 diff)

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

@@ -5 +5 @@
     android:background="@layout/roundcorner"
     android:orientation="vertical" >
-        
+    
     <FrameLayout
                 android:id="@+id/container"
@@ -13 +13 @@
                 android:layout_marginLeft="20dip"
         android:layout_marginRight="20dip"
-        android:layout_marginTop="20dip">
+        android:layout_marginTop="30dip">
                 <include android:id="@+id/front" layout="@layout/frontview" />
                 <include android:id="@+id/back" layout="@layout/backview" />
@@ -61 +61 @@
     </RelativeLayout>
 
+    <ImageView
+        android:id="@+id/info_stage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignRight="@+id/container"
+        android:src="@drawable/ic_action_info" />
+    
+    <ImageView
+        android:id="@+id/photo_stage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignRight="@+id/container"
+        android:src="@drawable/ic_action_photo" />
+
 </RelativeLayout>

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

@@ -6 +6 @@
 import android.widget.TextView;
 
-public class DisplayNextView implements AnimationListener {
+class DisplayNextView implements AnimationListener {
 
         private boolean mCurrentView;
-        ImageView image;
+        private boolean containTextView;
+        ImageView mainImage;
+        ImageView infoImage;
         TextView text;
 
         public DisplayNextView(boolean currentView, ImageView image, TextView text) {
                 mCurrentView = currentView;
-                this.image = image;
+                containTextView = true;
+                mainImage = image;
                 this.text = text;
+        }
+        
+        public DisplayNextView(boolean currentView, ImageView front, ImageView back) {
+                mCurrentView = currentView;
+                containTextView = false;
+                mainImage = front;
+                infoImage = back;
         }
 
@@ -22 +32 @@
 
         public void onAnimationEnd(Animation animation) {
-                image.post(new SwapViews(mCurrentView, image, text));
+                if(containTextView)
+                        mainImage.post(new SwapViews(mCurrentView, mainImage, text));
+                else
+                        mainImage.post(new SwapViews(mCurrentView, mainImage, infoImage));
         }
 

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

@@ -23 +23 @@
         private ImageView selectedImageView;
         private TextView selectedTextView;
-
+        private ImageView photoState;
+        private ImageView infoState;
         private ImageView leftArrowImageView;
 
@@ -52 +53 @@
                 selectedTextView = (TextView) findViewById(R.id.back_view);
                 selectedTextView.setVisibility(View.GONE);
+                photoState = (ImageView) findViewById(R.id.photo_stage);
+                infoState = (ImageView) findViewById(R.id.info_stage);
+                infoState.setVisibility(View.GONE);
                 leftArrowImageView = (ImageView) findViewById(R.id.left_arrow_imageview);
                 rightArrowImageView = (ImageView) findViewById(R.id.right_arrow_imageview);
                 gallery = (Gallery) findViewById(R.id.gallery);
                 
-                selectedImageView.setOnClickListener(new View.OnClickListener() 
+                photoState.setOnClickListener(new View.OnClickListener() 
                 {
                            public void onClick(View view) {
@@ -188 +192 @@
         {
                 // Find the center of image
-                final float centerX = selectedImageView.getWidth() / 2.0f;
-                final float centerY = selectedImageView.getHeight() / 2.0f;
+                final float centerX = photoState.getWidth() / 2.0f;
+                final float centerY = photoState.getHeight() / 2.0f;
 
                 // Create a new 3D rotation with the supplied parameter
@@ -195 +199 @@
                 final FlipAnimation rotation =
                        new FlipAnimation(start, end, centerX, centerY);
+                final FlipAnimation rotation2 =
+                               new FlipAnimation(start, end, centerX, centerY);
                 rotation.setDuration(500);
                 rotation.setFillAfter(true);
                 rotation.setInterpolator(new AccelerateInterpolator());
-                rotation.setAnimationListener(new DisplayNextView(isFirstImage, selectedImageView, selectedTextView));
+                rotation.setAnimationListener(new DisplayNextView(isFirstImage, photoState, infoState));
+                rotation2.setDuration(500);
+                rotation2.setFillAfter(true);
+                rotation2.setInterpolator(new AccelerateInterpolator());
+                rotation2.setAnimationListener(new DisplayNextView(isFirstImage, selectedImageView, selectedTextView));
+                
+                
 
                 if (isFirstImage)
                 {
-                        selectedImageView.startAnimation(rotation);
+                        photoState.startAnimation(rotation);
+                        selectedImageView.startAnimation(rotation2);
                 } else {
-                        selectedTextView.startAnimation(rotation);
+                        infoState.startAnimation(rotation);
+                        selectedTextView.startAnimation(rotation2);
                 }
 

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

@@ -3 +3 @@
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.net.Uri;
 import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
-import android.widget.PopupWindow;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.widget.TabHost;
-import android.widget.TextView;
-import android.widget.TabHost.TabContentFactory;
-import android.widget.TabHost.TabSpec;
+
 /////////////////////////////////////////////////////////////////////////// 
 public class MenuPage extends Activity

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

@@ -6 +6 @@
 import android.widget.TextView;
 
-public final class SwapViews implements Runnable {
+class SwapViews implements Runnable {
         private boolean mIsFirstView;
-        ImageView image;
+        private boolean containTextView;
+        ImageView mainImage;
+        ImageView infoImage;
         TextView text;
         
         public SwapViews(boolean isFirstView, ImageView image, TextView text) {
          mIsFirstView = isFirstView;
-         this.image = image;
+         containTextView = true;
+         this.mainImage = image;
          this.text = text;
         }
         
+        public SwapViews(boolean isFirstView, ImageView front, ImageView back) {
+                mIsFirstView = isFirstView;
+                 containTextView = false;
+                 this.mainImage = front;
+                 this.infoImage  = back;
+        }
+        
         public void run() {
-         final float centerX = image.getWidth() / 2.0f;
-         final float centerY = image.getHeight() / 2.0f;
+         final float centerX = mainImage.getWidth() / 2.0f;
+         final float centerY = mainImage.getHeight() / 2.0f;
          FlipAnimation rotation;
         
-         if (mIsFirstView) {
-          image.setVisibility(View.GONE);
-          text.setVisibility(View.VISIBLE);
-          text.requestFocus();
-        
+         if (mIsFirstView) 
+         {
+                 mainImage.setVisibility(View.GONE);
+                 if(containTextView)
+                 {
+                         text.setVisibility(View.VISIBLE);
+                         text.requestFocus();
+                 }
+                 else
+                 {
+                    infoImage.setVisibility(View.VISIBLE);
+                        infoImage.requestFocus();
+                 }
              rotation = new FlipAnimation(-90, 0, centerX, centerY);
-         } else {
-          text.setVisibility(View.GONE);
-          image.setVisibility(View.VISIBLE);
-          image.requestFocus();
+         } else 
+         {
+                 if(containTextView)
+                 {
+                         text.setVisibility(View.GONE);
+                 }
+                 else infoImage.setVisibility(View.GONE);
+                 mainImage.setVisibility(View.VISIBLE);
+                 mainImage.requestFocus();
         
              rotation = new FlipAnimation(90, 0, centerX, centerY);
@@ -40 +63 @@
          rotation.setInterpolator(new DecelerateInterpolator());
         
-         if (mIsFirstView) {
-          text.startAnimation(rotation);
-         } else {
-          image.startAnimation(rotation);
+         if (mIsFirstView) 
+         {
+                 if(containTextView)
+                         text.startAnimation(rotation);
+                 else 
+                         infoImage.setAnimation(rotation);
+         } 
+         else 
+         {
+                 mainImage.startAnimation(rotation);
          }
-        }
+   }
 }

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

@@ -6 +6 @@
 import android.widget.MediaController;
 import android.widget.VideoView;
-import android.app.Activity;
-import android.view.Menu;
 
 public class VideoActivity extends Activity {