Simplify MasterChooser interface.

Now the MasterChooser UI only shows the options relevant to connecting
to a robot by default. A checkbox is added to show "advanced options"
which uncovers the new master and new private master options.

A checkbox is used instead of an on/off switch because the switch needs
a higher API level than the currently used.

android_gingerbread_mr1/src/main/java/org/ros/android/MasterChooser.java

@@ -26,6 +26,8 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Toast;
 import org.ros.android.android_gingerbread_mr1.R;
@@ -135,6 +137,19 @@ public class MasterChooser extends Activity {
     }
   }
 
+  public void advancedCheckboxClicked(View view) {
+    boolean checked = ((CheckBox) view).isChecked();
+    Button new_public_master = (Button) findViewById(R.id.master_chooser_new_master_button);
+    Button new_private_master = (Button) findViewById(R.id.master_chooser_new_private_master_button);
+    if (checked) {
+      new_private_master.setVisibility(View.VISIBLE);
+      new_public_master.setVisibility(View.VISIBLE);
+    } else {
+      new_private_master.setVisibility(View.GONE);
+      new_public_master.setVisibility(View.GONE);
+    }
+  }
+
   public Intent createNewMasterIntent (Boolean isPrivate) {
     Intent intent = new Intent();
     intent.putExtra("NEW_MASTER", true);

android_gingerbread_mr1/src/main/res/layout/master_chooser.xml

@@ -3,19 +3,21 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-        >
+    android:focusable="false"
+    style="@style/padded">
 
     <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
+            android:layout_height="fill_parent"
+            >
 
-        <Button
-            android:id="@+id/master_chooser_ok"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:onClick="okButtonClicked"
-            android:text="@string/use_master"
-            android:layout_weight="1"/>
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/uri_text"
+                android:id="@+id/textView"
+                android:layout_weight="1"
+                android:textSize="18dp"/>
 
         <EditText
             android:id="@+id/master_chooser_uri"
@@ -23,13 +25,44 @@
             android:layout_height="wrap_content"
             android:hint="@string/master_uri_hint"
             android:singleLine="true"
-            android:layout_weight="2">
+            android:layout_weight="20">
 
             <requestFocus />
         </EditText>
 
     </LinearLayout>
 
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            style="@style/padded">
+
+        <Button
+                android:id="@+id/master_chooser_qr_code_button"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:onClick="qrCodeButtonClicked"
+                android:text="@string/qr_code"
+                android:layout_weight="1"/>
+
+        <Button
+            android:id="@+id/master_chooser_ok"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:onClick="okButtonClicked"
+            android:text="@string/use_master"
+            android:layout_weight="1"/>
+    </LinearLayout>
+
+    <CheckBox
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/show_advanced"
+            android:id="@+id/advanced_checkBox"
+            android:checked="false"
+            android:onClick="advancedCheckboxClicked"
+            style="@style/padded"/>
+
     <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="fill_parent">
@@ -40,7 +73,8 @@
             android:layout_height="fill_parent"
             android:onClick="newMasterButtonClicked"
             android:text="@string/new_master"
-            android:layout_weight="1"/>
+            android:layout_weight="1"
+            android:visibility="gone"/>
 
         <Button
                 android:id="@+id/master_chooser_new_private_master_button"
@@ -48,22 +82,17 @@
                 android:layout_height="fill_parent"
                 android:onClick="newPrivateMasterButtonClicked"
                 android:text="@string/new_private_master"
-                android:layout_weight="1"/>
+                android:layout_weight="1"
+                android:visibility="gone"/>
     </LinearLayout>
 
     <Button
-        android:id="@+id/master_chooser_qr_code_button"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:onClick="qrCodeButtonClicked"
-        android:text="@string/qr_code" />
-
-    <Button
-        android:id="@+id/master_chooser_cancel"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:onClick="cancelButtonClicked"
-        android:text="@string/cancel"
-        android:layout_gravity="bottom"/>
+            android:id="@+id/master_chooser_cancel"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:onClick="cancelButtonClicked"
+            android:text="@string/cancel"
+            android:layout_gravity="bottom"
+            style="@style/padded"/>
 
 </LinearLayout>

android_gingerbread_mr1/src/main/res/values/common_strings.xml

@@ -2,11 +2,13 @@
 <resources>
 
     <string name="app_name">ROS for Android</string>
-    <string name="use_master">Use Master:</string>
+    <string name="use_master">Connect</string>
     <string name="cancel">Cancel</string>
-    <string name="qr_code">QRCode</string>
+    <string name="qr_code">Read QRCode</string>
     <string name="master_uri_hint">http://localhost:11311/</string>
     <string name="new_master">New Public Master</string>
     <string name="new_private_master">New Private Master</string>
+    <string name="show_advanced">Show advanced options</string>
+    <string name="uri_text">Robot URI:</string>
 
 </resources>

android_gingerbread_mr1/src/main/res/values/styles.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="padded">
+        <item name="android:layout_marginTop">10dp</item>
+    </style>
+</resources>