Changeset 14489

Timestamp:

03/29/13 21:19:25 (12 years ago)

Author:

ltnguyen

Message:

New Layout for button, greenland and Antarctica map

Location:

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

Files:

• res/drawable-hdpi/blank_background.png (added)
• res/drawable-mdpi/antarctica_1.png (added)
• res/drawable-mdpi/greenland_1.png (added)
• res/drawable-mdpi/snow_btn.png (added)
• res/drawable-mdpi/snow_btn_press.png (added)
• res/drawable-mdpi/snow_button.xml (added)
• res/layout/issmcore.xml (modified) (3 diffs)
• res/layout/issmmapselection.xml (modified) (3 diffs)
• res/layout/menupage.xml (modified) (4 diffs)
• res/layout/settingsmenu.xml (modified) (1 diff)
• src/gov/nasa/jpl/issm/ISSM.java (modified) (6 diffs)
• src/gov/nasa/jpl/issm/MenuPage.java (modified) (5 diffs)

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

@@ -19 +19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/solve"
+        android:layout_above="@+id/play"
         android:layout_below="@+id/back"
         android:layout_marginBottom="12dp" >
     </FrameLayout>
 
-    <Button
+    <!-- <Button
         android:id="@+id/solve"
         android:layout_width="wrap_content"
@@ -33 +33 @@
         android:layout_marginBottom="18dp"
         android:background="@drawable/custom_button"
-        android:text="Solve" />
-
-    <Button
-        android:id="@+id/setting"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/frame"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/custom_button"
-        android:text="Settings" />
+        android:text="Solve" /> -->
 
     <Button
@@ -58 +48 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/back"
-        android:layout_alignLeft="@+id/setting"
+        android:layout_marginBottom="5dp"
+        android:layout_toRightOf="@+id/play"
         android:background="@drawable/dropdown"
-        android:layout_marginBottom="5dp"
         android:entries="@array/colormap_array"
         android:prompt="@string/color_prompt" />
 
+    <Button
+        android:id="@+id/play"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="30dp"
+        android:background="@drawable/custom_button"
+        android:text="Play" />
+
 </RelativeLayout>

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

@@ -3 +3 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:background="@drawable/background" >
+        android:background="@drawable/blank_background" >
 
         <ImageButton
@@ -12 +12 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="42dp"
-            android:background="@drawable/greenland" />
+            android:background="@drawable/greenland_1" />
 
                 <View
@@ -28 +28 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="42dp"
-            android:background="@drawable/antarctica" />
+            android:background="@drawable/antarctica_1" />
 
            </RelativeLayout>

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

@@ -4 +4 @@
         android:background="@drawable/mainbackground" >
         
-         <ImageButton
+         <Button
             android:id="@+id/intro"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="60dp"
-            android:layout_marginLeft="19dp"
-            android:background="@null"
-            android:src="@drawable/about_button" />
+            android:layout_marginLeft="15dp"
+            android:background="@drawable/snow_button"
+            android:text="About" />
 
-        <ImageButton
+        <Button
             android:id="@+id/video"
             android:layout_width="wrap_content"
@@ -20 +20 @@
             android:layout_alignParentRight="true"
             android:layout_marginRight="19dp"
-            android:background="@null"
-            android:src="@drawable/video_button" />
+            android:background="@drawable/snow_button"
+            android:text="Video" />
 
-        <ImageButton
+        <Button
             android:id="@+id/start"
             android:layout_width="wrap_content"
@@ -30 +30 @@
             android:layout_alignRight="@+id/intro"
             android:layout_marginBottom="73dp"
-            android:background="@null"
-            android:src="@drawable/play_button" />
+                android:background="@drawable/snow_button"
+            android:text="Play" />
 
-        <ImageButton
+        <Button
             android:id="@+id/visitus"
             android:layout_width="wrap_content"
@@ -40 +40 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="15dp"
-            android:background="@null"
-            android:src="@drawable/team_button" />
+            android:background="@drawable/snow_button"
+            android:text="Team" />
 
     </RelativeLayout>

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

@@ -67 +67 @@
              android:layout_height="wrap_content"
              android:layout_below="@+id/sealvlBar"
-             android:text="Set" /> 
+             android:text="Done" /> 
     </RelativeLayout>

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

@@ -77 +77 @@
         frame = (FrameLayout)findViewById(R.id.frame);
         viewflipper = (ViewFlipper) findViewById(R.id.flipper);
-        Button solve = (Button) super.findViewById(R.id.solve);
-        solve.setOnClickListener(this);
+        //Button solve = (Button) super.findViewById(R.id.solve);
+        //solve.setOnClickListener(this);
         Button back = (Button) super.findViewById(R.id.back);
         back.setOnClickListener(this);
-        Button setting = (Button) super.findViewById(R.id.setting);
-        setting.setOnClickListener(this);
+        Button play = (Button) super.findViewById(R.id.play);
+        play.setOnClickListener(this);
         ImageButton gl = (ImageButton) findViewById(R.id.greenland);            
                 gl.setOnClickListener(this);
@@ -103 +103 @@
         spinner.setOnItemSelectedListener(new OnItemSelectedListener()
         {
-
                         @Override
                         public void onItemSelected(AdapterView<?> arg0, View arg1,
@@ -159 +158 @@
                         viewflipper.setOutAnimation(outToLeftAnimation());
                         viewflipper.showNext();
+                        defaultMap.setVisibility(View.VISIBLE);
                         //create FemModel in native code and return the size of the model
                         this.createModel();
@@ -169 +169 @@
                         viewflipper.setOutAnimation(outToLeftAnimation());
                         viewflipper.showNext();
+                        defaultMap.setVisibility(View.VISIBLE);
                         //create FemModel in native code and return the size of the model
                         this.createModel();
@@ -181 +182 @@
                          break;
                 }
-                case R.id.solve:
+                /*case R.id.solve:
                 {
                         friction = sliders.getFric();
@@ -187 +188 @@
                         new CalculationTask().execute(friction);
                         break;
-                }
-                case R.id.setting:
+                }*/
+                case R.id.play:
                 {
                         final PopupWindow popupWindow = new PopupWindow( sliders, screenWidth*4/5,screenHeight*2/5, true);

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

@@ -8 +8 @@
 import android.view.View;
 import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.PopupWindow;
 import android.content.Intent;
@@ -29 +28 @@
         }
         //start the core implementation of ISSM
-            ImageButton start = (ImageButton) findViewById(R.id.start);         
+            Button start = (Button) findViewById(R.id.start);           
                 start.setOnClickListener(new View.OnClickListener() 
                 {
@@ -40 +39 @@
                 });
                 // navigate to youtube video
-                ImageButton video = (ImageButton) findViewById(R.id.video);             
+                Button video = (Button) findViewById(R.id.video);               
                 video.setOnClickListener(new View.OnClickListener() 
                 {
@@ -52 +51 @@
                 });
                 // pop up a text box that contains information about ISSM
-                final ImageButton intro = (ImageButton) findViewById(R.id.intro);       
+                final Button intro = (Button) findViewById(R.id.intro); 
                 intro.setOnClickListener(new View.OnClickListener() 
                 {
@@ -72 +71 @@
                 });
                 //navigate to website
-                ImageButton visitus = (ImageButton) findViewById(R.id.visitus);         
+                Button visitus = (Button) findViewById(R.id.visitus);           
                 visitus.setOnClickListener(new View.OnClickListener() 
                 {