ROBOT_DEMO: add "About" dialog

diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
index 33d8bd0a5168a813ac81e2451b6ce139c7095904..51f64ed95ccbc951c683f63457f149c8bbf1c2e0 100644 (file)
--- a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
+++ b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
@@ -13,34 +13,39 @@ public final class R {
     public static final class drawable {
         public static final int ic_launcher=0x7f020000;
         public static final int logo_cvut=0x7f020001;
+        public static final int logo_flamingos=0x7f020002;
     }
     public static final class id {
-        public static final int button1=0x7f07000e;
-        public static final int crane=0x7f070012;
-        public static final int editText1=0x7f070004;
-        public static final int editText2=0x7f070007;
-        public static final int editText3=0x7f07000a;
-        public static final int editText4=0x7f07000d;
-        public static final int exit=0x7f070015;
-        public static final int hokuyo=0x7f070011;
-        public static final int hokuyo_view=0x7f070001;
-        public static final int hokuyo_view_bg=0x7f070000;
-        public static final int magnet=0x7f070013;
-        public static final int speed=0x7f07000f;
-        public static final int speed_mon=0x7f070010;
-        public static final int tableRow1=0x7f070002;
-        public static final int tableRow2=0x7f070005;
-        public static final int tableRow3=0x7f070008;
-        public static final int tableRow4=0x7f07000b;
-        public static final int textView1=0x7f070003;
-        public static final int textView2=0x7f070006;
-        public static final int textView3=0x7f070009;
-        public static final int textView4=0x7f07000c;
-        public static final int voltage=0x7f070014;
+        public static final int about=0x7f070017;
+        public static final int button1=0x7f070010;
+        public static final int crane=0x7f070014;
+        public static final int editText1=0x7f070006;
+        public static final int editText2=0x7f070009;
+        public static final int editText3=0x7f07000c;
+        public static final int editText4=0x7f07000f;
+        public static final int exit=0x7f070018;
+        public static final int hokuyo=0x7f070013;
+        public static final int hokuyo_view=0x7f070004;
+        public static final int hokuyo_view_bg=0x7f070003;
+        public static final int imageView1=0x7f070000;
+        public static final int magnet=0x7f070015;
+        public static final int scrollView1=0x7f070001;
+        public static final int speed=0x7f070011;
+        public static final int speed_mon=0x7f070012;
+        public static final int tableRow1=0x7f070005;
+        public static final int tableRow2=0x7f070007;
+        public static final int tableRow3=0x7f07000a;
+        public static final int tableRow4=0x7f07000d;
+        public static final int textView1=0x7f070002;
+        public static final int textView2=0x7f070008;
+        public static final int textView3=0x7f07000b;
+        public static final int textView4=0x7f07000e;
+        public static final int voltage=0x7f070016;
     }
     public static final class layout {
-        public static final int hokuyo_view=0x7f030000;
-        public static final int status_dialog=0x7f030001;
+        public static final int about_dialog=0x7f030000;
+        public static final int hokuyo_view=0x7f030001;
+        public static final int status_dialog=0x7f030002;
     }
     public static final class menu {
         public static final int activity_main=0x7f060000;

diff --git a/orte/Robot_Demo/res/drawable/logo_flamingos.png b/orte/Robot_Demo/res/drawable/logo_flamingos.png
new file mode 100644 (file)
index 0000000..e96aa9b
Binary files /dev/null and b/orte/Robot_Demo/res/drawable/logo_flamingos.png differ

diff --git a/orte/Robot_Demo/res/layout/about_dialog.xml b/orte/Robot_Demo/res/layout/about_dialog.xml
new file mode 100644 (file)
index 0000000..aaa7cc9
--- /dev/null
+++ b/orte/Robot_Demo/res/layout/about_dialog.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:src="@drawable/logo_flamingos" />
+
+    <ScrollView 
+        android:id="@+id/scrollView1"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:scrollbars="vertical" >
+
+           <TextView
+               android:id="@+id/textView1"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_gravity="center_horizontal"
+               android:gravity="center"
+               android:text="\nRoboDruid 1.0\n\n\nby Martin Vajnar\nand Flamingos Team\n\u00A9 2013\n\n\nDepartment of Control Engineering\nFaculty of Electrical Engineering\nCTU in Prague"
+               android:textSize="15sp" />
+        
+    </ScrollView>
+
+</LinearLayout>

diff --git a/orte/Robot_Demo/res/menu/activity_main.xml b/orte/Robot_Demo/res/menu/activity_main.xml
index d85a49b6941783e38756661bfa7f46317df1a30d..b1438bc9d924349f0f704a499b11453cc5f1ef93 100644 (file)
--- a/orte/Robot_Demo/res/menu/activity_main.xml
+++ b/orte/Robot_Demo/res/menu/activity_main.xml
@@ -34,10 +34,16 @@
         android:orderInCategory="6"
         android:showAsAction="never">
     </item>
-    
+
+    <item android:id="@+id/about"
+        android:title="About"
+        android:orderInCategory="7"
+        android:showAsAction="never">
+    </item>
+
     <item android:id="@+id/exit"
         android:title="Exit"
-        android:orderInCategory="7"
+        android:orderInCategory="8"
         android:showAsAction="never">
     </item>
 </menu>

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
index 76320d893994a3ccb27b4b436f5fdd2f2e371193..31581c92dc00bbcb80768f6963adcea052380181 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
@@ -4,6 +4,7 @@ import org.ocera.orte.DomainApp;
 import org.ocera.orte.Manager;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -18,6 +19,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -27,6 +29,7 @@ import android.widget.EditText;
  
 public class MainActivity extends Activity {
        private Dialog voltageDialog = null;
+       private AlertDialog aboutDialog = null;
        static EditText voltage33 = null;
        static EditText voltage50 = null;
        static EditText voltage80 = null;
@@ -167,6 +170,13 @@ public class MainActivity extends Activity {
                voltage80 = (EditText)voltageDialog.findViewById(R.id.editText3);
                voltageBAT = (EditText)voltageDialog.findViewById(R.id.editText4);
                
+               AlertDialog.Builder builder = new AlertDialog.Builder(this);
+               LayoutInflater inflater = getLayoutInflater();
+               View aboutView = inflater.inflate(R.layout.about_dialog, null);
+               builder.setView(aboutView);
+               builder.setPositiveButton("OK", null);
+               aboutDialog = builder.create();
+               
         mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
         mGravity = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
         
@@ -270,6 +280,9 @@ public class MainActivity extends Activity {
                        pwr_voltage.start();
                        voltageDialog.show();
                }
+               else if (item.getTitle().equals("About")) {
+                       aboutDialog.show();
+               }
                else if (item.getTitle().equals("Exit")) {
                        finish();
                }