added join conference dialog

4 files changed, 56 insertions, 5 deletions

diff --git a/res/layout/create_contact_dialog.xml b/res/layout/create_contact_dialog.xml
index 93248b40e..4b5b9a04a 100644
--- a/res/layout/create_contact_dialog.xml
+++ b/res/layout/create_contact_dialog.xml
@@ -19,7 +19,7 @@
 
      <TextView
         android:id="@+id/jabber_id"
-        android:paddingTop="8dp"
+        android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="14sp"
@@ -28,10 +28,11 @@
     
     <AutoCompleteTextView
         android:id="@+id/jid"
-        android:paddingTop="8dp"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:inputType="textEmailAddress"
         android:hint="@string/account_settings_example_jabber_id"
+        android:textColorHint="@color/secondarytext"
+        android:textColor="@color/primarytext"
         />
 </LinearLayout>
diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml
new file mode 100644
index 000000000..2a0e300a2
--- /dev/null
+++ b/res/layout/join_conference_dialog.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+     <TextView
+        android:id="@+id/your_account"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:textColor="@color/primarytext"
+        android:text="@string/your_account" />
+    <Spinner
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+     <TextView
+        android:id="@+id/jabber_id"
+        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:textColor="@color/primarytext"
+        android:text="@string/conference_address" />
+    
+    <AutoCompleteTextView
+        android:id="@+id/jid"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textEmailAddress"
+        android:hint="@string/conference_address_example"
+        android:textColorHint="@color/secondarytext"
+        android:textColor="@color/primarytext"
+        />
+
+    <CheckBox
+        android:id="@+id/bookmark"
+        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/save_as_bookmark" />
+
+</LinearLayout>
diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
index 12109d7b6..907fbdede 100644
--- a/res/menu/start_conversation.xml
+++ b/res/menu/start_conversation.xml
@@ -14,10 +14,10 @@
         android:showAsAction="always"
         android:title="@string/create_contact"/>
     <item
-        android:id="@+id/action_create_conference"
+        android:id="@+id/action_join_conference"
         android:icon="@drawable/ic_action_add_group"
         android:showAsAction="always"
-        android:title="@string/create_conference"/>
+        android:title="@string/join_conference"/>
     
     <item
         android:id="@+id/action_accounts"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ebfaaa174..417d838ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -258,9 +258,13 @@
     <string name="conferences">Conferences</string>
     <string name="search">Search</string>
     <string name="create_contact">Create Contact</string>
-    <string name="create_conference">Create Conference</string>
+    <string name="join_conference">Join Conference</string>
     <string name="delete_contact">Delete Contact</string>
     <string name="view_contact_details">View contact details</string>
     <string name="create">Create</string>
     <string name="contact_already_exists">The contact already exists</string>
+    <string name="join">Join</string>
+    <string name="conference_address">Conference address</string>
+    <string name="conference_address_example">room@conference.example.com</string>
+    <string name="save_as_bookmark">Save as bookmark</string>
 </resources>
\ No newline at end of file