From 21ebb35e44ee2e6a6cffaffee737d537ab1b8d6b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 26 May 2016 22:53:55 +0200
Subject: add 'create conference' dialog

---
 src/main/res/layout/create_conference_dialog.xml | 42 ++++++++++++++++++++++++
 src/main/res/menu/start_conversation.xml         | 14 ++++++--
 src/main/res/values/strings.xml                  |  5 +++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 src/main/res/layout/create_conference_dialog.xml

(limited to 'src/main/res')

diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml
new file mode 100644
index 00000000..cab2ac57
--- /dev/null
+++ b/src/main/res/layout/create_conference_dialog.xml
@@ -0,0 +1,42 @@
+<?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:paddingBottom="8dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="16dp">
+
+    <TextView
+        android:id="@+id/your_account"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/your_account"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody" />
+
+    <Spinner
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/conference_subject"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeBody" />
+
+    <EditText
+        android:id="@+id/subject"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/edit_subject_hint"
+        android:inputType="textAutoComplete"
+        android:textColor="@color/black87"
+        android:textColorHint="@color/black54"
+        android:textSize="?attr/TextSizeBody"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index a89d71ff..327709fa 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -13,10 +13,20 @@
         android:showAsAction="always"
         android:title="@string/create_contact" />
     <item
-        android:id="@+id/action_join_conference"
+        android:id="@+id/action_conference"
         android:icon="?attr/icon_add_group"
         android:showAsAction="always"
-        android:title="@string/join_conference" />
+        android:title="@string/join_or_create_conference">
+        <menu>
+            <item
+                android:id="@+id/action_join_conference"
+                android:title="@string/join_conference"/>
+            <item
+                android:id="@+id/action_create_conference"
+                android:title="@string/create_conference"/>
+
+        </menu>
+    </item>
     <item
         android:id="@+id/action_scan_qr_code"
         android:showAsAction="never"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8a1dc1b3..da7a6098 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -644,4 +644,9 @@
 	<string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string>
 	<string name="show_password">Show password</string>
 	<string name="registration_please_wait">Registration failed: Try again later</string>
+	<string name="create_conference">Create conference</string>
+	<string name="join_or_create_conference">Join or create conference</string>
+	<string name="conference_subject">Subject</string>
+	<string name="choose_participants">Choose participants</string>
+	<string name="creating_conference">Creating conference…</string>
 </resources>
-- 
cgit v1.2.3