From 385ee6a9c5fe02cb876f317b38dd505877fa9c32 Mon Sep 17 00:00:00 2001
From: eehouse <eehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Tue, 9 Feb 2010 14:28:09 +0000
Subject: [PATCH] separate dialogs for sms, bt and relay config.

---
 .../XWords4/res/layout/role_edit_bt.xml       | 23 ++++++++
 .../{role_edit.xml => role_edit_relay.xml}    | 16 ------
 .../XWords4/res/layout/role_edit_sms.xml      | 56 +++++++++++++++++++
 3 files changed, 79 insertions(+), 16 deletions(-)
 create mode 100644 xwords4/android/XWords4/res/layout/role_edit_bt.xml
 rename xwords4/android/XWords4/res/layout/{role_edit.xml => role_edit_relay.xml} (80%)
 create mode 100644 xwords4/android/XWords4/res/layout/role_edit_sms.xml

diff --git a/xwords4/android/XWords4/res/layout/role_edit_bt.xml b/xwords4/android/XWords4/res/layout/role_edit_bt.xml
new file mode 100644
index 000000000..e629c7c1b
--- /dev/null
+++ b/xwords4/android/XWords4/res/layout/role_edit_bt.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" 
+            android:id="@+id/screen"
+            android:layout_width="fill_parent" 
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+  <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+    <TextView android:layout_height="wrap_content"
+              android:layout_width="wrap_content"
+              android:layout_marginLeft="20dip"
+              android:layout_marginRight="20dip"
+              android:text="@string/bt_label"
+              android:gravity="left"
+              android:textAppearance="?android:attr/textAppearanceMedium" 
+              />
+
+  </LinearLayout>
+</ScrollView>
diff --git a/xwords4/android/XWords4/res/layout/role_edit.xml b/xwords4/android/XWords4/res/layout/role_edit_relay.xml
similarity index 80%
rename from xwords4/android/XWords4/res/layout/role_edit.xml
rename to xwords4/android/XWords4/res/layout/role_edit_relay.xml
index 34b13621a..a4a5bcae9 100644
--- a/xwords4/android/XWords4/res/layout/role_edit.xml
+++ b/xwords4/android/XWords4/res/layout/role_edit_relay.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-     
-     http://www.apache.org/licenses/LICENSE-2.0
-     
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-  -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" 
             android:id="@+id/screen"
@@ -20,8 +6,6 @@
             android:layout_height="fill_parent"
             android:orientation="vertical">
 
-<!-- This eventually wants to be a tabbed dialog switching off of the
-connType: different tab for SMS, Relay, Bluetooth, etc. -->
   <LinearLayout android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
diff --git a/xwords4/android/XWords4/res/layout/role_edit_sms.xml b/xwords4/android/XWords4/res/layout/role_edit_sms.xml
new file mode 100644
index 000000000..77b75df80
--- /dev/null
+++ b/xwords4/android/XWords4/res/layout/role_edit_sms.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" 
+            android:id="@+id/screen"
+            android:layout_width="fill_parent" 
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+  <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+    <TextView android:layout_height="wrap_content"
+              android:layout_width="wrap_content"
+              android:layout_marginLeft="20dip"
+              android:layout_marginRight="20dip"
+              android:text="@string/sms_phone_label"
+              android:gravity="left"
+              android:textAppearance="?android:attr/textAppearanceMedium" 
+              />
+    
+    <EditText android:id="@+id/sms_phone_edit"
+              android:layout_height="wrap_content"
+              android:layout_width="fill_parent"
+              android:layout_marginLeft="20dip"
+              android:layout_marginRight="20dip"
+              android:scrollHorizontally="true"
+              android:autoText="false"
+              android:numeric="decimal"
+              android:gravity="fill_horizontal"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              />
+
+    <TextView android:layout_height="wrap_content"
+              android:layout_width="wrap_content"
+              android:layout_marginLeft="20dip"
+              android:layout_marginRight="20dip"
+              android:text="@string/sms_port_label"
+              android:gravity="left"
+              android:textAppearance="?android:attr/textAppearanceMedium" 
+              />
+    
+    <EditText android:id="@+id/sms_port_edit"
+              android:layout_height="wrap_content"
+              android:layout_width="fill_parent"
+              android:layout_marginLeft="20dip"
+              android:layout_marginRight="20dip"
+              android:scrollHorizontally="true"
+              android:autoText="false"
+              android:numeric="decimal"
+              android:gravity="fill_horizontal"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              />
+
+  </LinearLayout>
+</ScrollView>