summaryrefslogtreecommitdiff
path: root/same-android/res
diff options
context:
space:
mode:
Diffstat (limited to 'same-android/res')
-rw-r--r--same-android/res/layout/controller.xml48
-rw-r--r--same-android/res/layout/main.xml33
-rw-r--r--same-android/res/menu/main_menu.xml8
3 files changed, 59 insertions, 30 deletions
diff --git a/same-android/res/layout/controller.xml b/same-android/res/layout/controller.xml
new file mode 100644
index 0000000..c3c4717
--- /dev/null
+++ b/same-android/res/layout/controller.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Commands"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <Button
+ android:id="@+id/button1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:onClick="createNetwork"
+ android:text="Create" />
+
+ <EditText
+ android:id="@+id/editText1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <Button
+ android:id="@+id/button2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:onClick="joinNetwork"
+ android:text="Search" />
+
+ <Button
+ android:id="@+id/button3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:onClick="doneClicked"
+ android:text="Done" />
+
+ <TextView
+ android:id="@+id/ipAddress"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+</LinearLayout>
diff --git a/same-android/res/layout/main.xml b/same-android/res/layout/main.xml
index 4ddd343..f6f0090 100644
--- a/same-android/res/layout/main.xml
+++ b/same-android/res/layout/main.xml
@@ -1,41 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- >
+ android:orientation="vertical" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Commands"
+ android:text="See menu."
android:textAppearance="?android:attr/textAppearanceLarge" />
- <Button
- android:id="@+id/button1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:onClick="createNetwork"
- android:text="Create" />
-
- <EditText
- android:id="@+id/editText1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <Button
- android:id="@+id/button2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:onClick="joinNetwork"
- android:text="Search" />
-
- <TextView
- android:id="@+id/ipAddress"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=""
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
-</LinearLayout>
+</LinearLayout> \ No newline at end of file
diff --git a/same-android/res/menu/main_menu.xml b/same-android/res/menu/main_menu.xml
new file mode 100644
index 0000000..6d63008
--- /dev/null
+++ b/same-android/res/menu/main_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/same_settings"
+ android:title="Same settings"/>
+
+</menu> \ No newline at end of file