Changeset 14547

Timestamp:

04/11/13 17:04:59 (12 years ago)

Author:

cnpetrie

Message:

updated team page to load issm/about/ web page in webview inside issm app. updated about page to load a local html about page in new webview. updated app to prompt for confirm on exit using back button.

Location:

issm/trunk-jpl/src/mobile/android

Files:

• ISSM/src/gov/nasa/jpl/issm/VideoActivity.java (modified) (1 diff)
• ISSM_APP/AndroidManifest.xml (modified) (1 diff)
• ISSM_APP/assets/about.html (added)
• ISSM_APP/bin/AndroidManifest.xml (modified) (1 diff)
• ISSM_APP/project.properties (modified) (1 diff)
• ISSM_APP/res/layout/aboutpage.xml (added)
• ISSM_APP/res/layout/teampage.xml (added)
• ISSM_APP/res/values/strings.xml (modified) (1 diff)
• ISSM_APP/src/gov/nasa/jpl/issm/AboutActivity.java (added)
• ISSM_APP/src/gov/nasa/jpl/issm/MenuPage.java (modified) (5 diffs)
• ISSM_APP/src/gov/nasa/jpl/issm/MyWebViewClient.java (added)
• ISSM_APP/src/gov/nasa/jpl/issm/TeamActivity.java (added)

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

@@ -11 +11 @@
 public class VideoActivity extends Activity {
 
-        String SrcPath = "rtsp://v5.cache1.c.youtube.com/CjYLENy73wIaLQnNSFpiQoeuyBMYDSANFEIJbXYtZ29vZ2xlSARSBXdhdGNoYI-SyfPGoqqyUQw=/0/0/0/video.3gp";
+        String SrcPath = "rtsp://v8.cache8.c.youtube.com/CjYLENy73wIaLQkL_ysv0M5QKhMYDSANFEIJbXYtZ29vZ2xlSARSBXdhdGNoYI-SyfPGoqqyUQw=/0/0/0/video.3gp";
         
            /** Called when the activity is first created. */

issm/trunk-jpl/src/mobile/android/ISSM_APP/AndroidManifest.xml

@@ -32 +32 @@
             android:name="gov.nasa.jpl.issm.VideoActivity"
             android:screenOrientation="portrait"
+            android:label="@string/title_video_issm" >
+        </activity>
+        <activity
+            android:name="gov.nasa.jpl.issm.AboutActivity"
+            android:screenOrientation="portrait"
+            android:label="@string/title_activity_issm" >
+        </activity>
+         <activity
+            android:name="gov.nasa.jpl.issm.TeamActivity"
+            android:screenOrientation="portrait"
             android:label="@string/title_activity_issm" >
         </activity>

issm/trunk-jpl/src/mobile/android/ISSM_APP/bin/AndroidManifest.xml

@@ -32 +32 @@
             android:name="gov.nasa.jpl.issm.VideoActivity"
             android:screenOrientation="portrait"
+            android:label="@string/title_video_issm" >
+        </activity>
+        <activity
+            android:name="gov.nasa.jpl.issm.AboutActivity"
+            android:screenOrientation="portrait"
+            android:label="@string/title_activity_issm" >
+        </activity>
+         <activity
+            android:name="gov.nasa.jpl.issm.TeamActivity"
+            android:screenOrientation="portrait"
             android:label="@string/title_activity_issm" >
         </activity>

issm/trunk-jpl/src/mobile/android/ISSM_APP/project.properties

@@ -12 +12 @@
 
 # Project target.
-target=android-16
+target=android-15

issm/trunk-jpl/src/mobile/android/ISSM_APP/res/values/strings.xml

@@ -4 +4 @@
     <string name="hello_world">Hello world!</string>
     <string name="menu_settings">Settings</string>
+    <string name="title_video_issm">ISSM Sample Video</string>
+    <string name="about">ISSM is the result of a collaboration between the Jet Propulsion Laboratory and University of California at Irvine. Its purpose is to tackle the challenge of modeling the evolution of the polar ice caps in Greenland and Antarctica. \n\tISSM is funded by the NASA Cryosphere and MAP (Modeling Analysis and Prediction) programs, JPL R&amp;TD(Research, Technology and Development) and the National Science Foundation. Our main collaborators are:MSSMat Laboratory of École Centrale Paris, Argonne National Laboratory and the Department of Geology of University of Buffalo, NY.\n\tAs synthesized in the last Intergovernmental Panel on Climate Change (IPCC) Assessment Report AR4,future changes in the Greenland and Antarctic ice sheet mass, particularly due to changes in ice flow,are a major source of uncertainty that could increase sea level rise projections.\n\tTo remedy this problem, large scale ice flow models are necessary that can accurately model the evolution of Greenland and Antarctica in a warming climate. In order to achieve this goal,and improve projections of future sea level rise, ISSM relies on state of the art technologies,developed in synergy with the Research and Technology Development (R&amp;TD) at JPL.</string>
     <string name="title_activity_issm">ISSM</string>
     <string name="color_prompt">Pick a Color Map</string>

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

@@ -2 +2 @@
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.net.Uri;
 import android.os.Bundle;
@@ -9 +10 @@
 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
@@ -58 +64 @@
                         public void onClick(View v)
                         {
-                                LayoutInflater layoutInflater = (LayoutInflater)getBaseContext().getSystemService(LAYOUT_INFLATER_SERVICE);  
-                                View popupView = layoutInflater.inflate(R.layout.popuptext, null);  
-                                final PopupWindow popupWindow = new PopupWindow( popupView, 400,600, true);
-                                popupWindow.showAtLocation(popupView, Gravity.CENTER, 0, 0);
-                                Button dismiss = (Button)popupView.findViewById(R.id.dismiss);
-                    dismiss.setOnClickListener(new Button.OnClickListener()
-                    {
-                        public void onClick(View v)
-                        {
-                                popupWindow.dismiss();
-                        }
-                    });
+                                //LayoutInflater layoutInflater = (LayoutInflater)getBaseContext().getSystemService(LAYOUT_INFLATER_SERVICE);  
+                                //View popupView = layoutInflater.inflate(R.layout.popuptext, null);  
+                                //final PopupWindow popupWindow = new PopupWindow( popupView, 400,600, true);
+                                //popupWindow.showAtLocation(popupView, Gravity.CENTER, 0, 0);
+                                //Button dismiss = (Button)popupView.findViewById(R.id.dismiss);
+                    //dismiss.setOnClickListener(new Button.OnClickListener()
+                    //{
+                        //public void onClick(View v)
+                    //  {
+                                //popupWindow.dismiss();
+                        //}
+                    //});
+                                Intent i = new Intent(MenuPage.this, AboutActivity.class);
+                        startActivity(i);
                         }
                 });
-                //navigate to website
+                //Show Team Website
                 Button visitus = (Button) findViewById(R.id.visitus);           
                 visitus.setOnClickListener(new View.OnClickListener() 
@@ -78 +86 @@
                         public void onClick(View v) 
                         {
-                                String url = "http://issm.jpl.nasa.gov/";
-                                Intent i = new Intent(Intent.ACTION_VIEW);
-                                i.setData(Uri.parse(url));
+                                //String url = "http://issm.jpl.nasa.gov/";
+                                //Intent i = new Intent(Intent.ACTION_VIEW);
+                                //i.setData(Uri.parse(url));
+                        //startActivity(i);
+                                
+                                Intent i = new Intent(MenuPage.this, TeamActivity.class);
                         startActivity(i);
                         }
@@ -95 +106 @@
                 });
         }
-//------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------
+        
+         @Override
+     public void onBackPressed() {
+         new AlertDialog.Builder(this)
+                .setMessage("Are you sure you want to exit?")
+                .setCancelable(false)
+                .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        MenuPage.this.finish();
+                    }
+                })
+                .setNegativeButton("No", null)
+                .show();
+     }
 }
 /////////////////////////////////////////////////////////////////////////////////////////