From: Martin Vajnar Date: Sun, 25 Aug 2013 21:02:08 +0000 (+0200) Subject: ROBOT_DEMO: add "About" dialog X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte/eurobot.git/commitdiff_plain/a0b0fdbcfcd0435eebf8ecba052aec25cbf70287 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 33d8bd0..51f64ed 100644 --- 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 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 index 0000000..aaa7cc9 --- /dev/null +++ b/orte/Robot_Demo/res/layout/about_dialog.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + diff --git a/orte/Robot_Demo/res/menu/activity_main.xml b/orte/Robot_Demo/res/menu/activity_main.xml index d85a49b..b1438bc 100644 --- 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"> - + + + + 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 76320d8..31581c9 100644 --- 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(); }