Add menu

xrj3000 · Jul 29, 2013 · b469043 · b469043
1 parent b982cc1
commit b469043
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/Android/Controller/gen/com/tikoLabs/quadcontrol/R.java b/Android/Controller/gen/com/tikoLabs/quadcontrol/R.java
@@ -25,14 +25,18 @@ public static final class drawable {
     }
     public static final class id {
         public static final int AHRSView=0x7f080002;
-        public static final int action_settings=0x7f08000d;
+        public static final int action_settings=0x7f080011;
         public static final int angleTextView=0x7f080001;
         public static final int button_scan=0x7f08000c;
         public static final int joystickView=0x7f080000;
         public static final int joystickView2=0x7f080005;
+        public static final int menu_connect=0x7f08000d;
+        public static final int menu_disconnect=0x7f08000e;
+        public static final int menu_radio_scan=0x7f08000f;
         public static final int new_devices=0x7f08000b;
         public static final int paired_devices=0x7f080009;
         public static final int powerTextView=0x7f080003;
+        public static final int preferences=0x7f080010;
         public static final int textStatus=0x7f080004;
         public static final int title_left_text=0x7f080006;
         public static final int title_new_devices=0x7f08000a;
@@ -46,7 +50,8 @@ public static final class layout {
         public static final int device_name=0x7f030003;
     }
     public static final class menu {
-        public static final int main=0x7f070000;
+        public static final int activity_main=0x7f070000;
+        public static final int main=0x7f070001;
     }
     public static final class string {
         public static final int action_settings=0x7f050001;

diff --git a/Android/Controller/res/layout/activity_main.xml b/Android/Controller/res/layout/activity_main.xml
@@ -21,7 +21,7 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_below="@+id/AHRSView"
-        android:layout_toRightOf="@+id/joystickView"
+        android:layout_alignLeft="@+id/AHRSView"
         android:text="Roll: 0.00\nPitch: 0.00"
         android:textColor="#FFFFFF" />
 
@@ -30,8 +30,7 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_below="@+id/angleTextView"
-        android:layout_marginTop="16dp"
-        android:layout_toRightOf="@+id/joystickView"
+        android:layout_alignLeft="@+id/angleTextView"
         android:text="Thrust: 0"
         android:textColor="#FFFFFF" />
 
@@ -49,7 +48,8 @@
         android:id="@+id/AHRSView"
         android:layout_width="150dp"
         android:layout_height="150dp"
-        android:layout_centerHorizontal="true" />
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true" />
 
     <com.zerokol.views.JoystickView
         android:id="@+id/joystickView2"

diff --git a/Android/Controller/res/menu/activity_main.xml b/Android/Controller/res/menu/activity_main.xml
@@ -0,0 +1,23 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_connect"
+        android:showAsAction="never"
+        android:title="connect"/>
+    <item
+        android:id="@+id/menu_disconnect"
+        android:orderInCategory="50"
+        android:showAsAction="never"
+        android:title="disconnect"/>
+    <item
+        android:id="@+id/menu_radio_scan"
+        android:title="scan"
+        android:orderInCategory="80"
+        android:showAsAction="never"/>
+    <item
+        android:id="@+id/preferences"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="preferences"/>
+
+</menu>
diff --git a/Android/Controller/src/com/tikoLabs/quadcontrol/MainActivity.java b/Android/Controller/src/com/tikoLabs/quadcontrol/MainActivity.java
@@ -4,6 +4,7 @@
 
 import java.nio.ByteBuffer;
 
+
 import com.tikoLabs.AHRS.AHRSView;
 import com.zerokol.views.JoystickView;
 import com.zerokol.views.JoystickView.OnJoystickMoveListener;
@@ -16,6 +17,7 @@
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
 import android.util.Log;
+import android.view.Menu;
 import android.view.View;
 import android.view.Window;
 import android.view.View.OnClickListener;
@@ -212,6 +214,11 @@ public void onDestroy() {
         if (mBTService != null) mBTService.stop();
         if(D) Log.e(TAG, "--- ON DESTROY ---");
     }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
 
     private void ensureDiscoverable() {
         if(D) Log.d(TAG, "ensure discoverable");