aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-03 05:01:02 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-03 05:01:02 +0100
commitc609eefefac5097c7c40a9f1b8741e9634da316f (patch)
tree53363dfbab46d84e81b8b95f49e586374dc358f0 /res
parent2ab6cb0ada6370e6ea83a73e0a6a39ea3ff90715 (diff)
api changes. muc options
Diffstat (limited to 'res')
-rw-r--r--res/layout/fragment_conversation.xml30
-rw-r--r--res/layout/muc_options.xml76
-rw-r--r--res/values/strings.xml2
3 files changed, 108 insertions, 0 deletions
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index cea2be1f..dabce457 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -62,6 +62,36 @@
android:layout_width="fill_parent"
android:orientation="vertical"
>
+
+ <LinearLayout
+ android:id="@+id/muc_error"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/redbackground"
+ android:orientation="vertical"
+ android:visibility="gone"
+ >
+
+ <TextView
+ android:id="@+id/muc_error_msg"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#eee"
+ android:textStyle="bold"
+ android:padding="8dp"
+ android:textSize="20sp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Click to edit conference details"
+ android:textColor="#eee"
+ android:paddingLeft="8dp"
+ android:paddingBottom="8dp"
+ android:textSize="14sp"/>
+
+ </LinearLayout>
+
+
<LinearLayout
android:id="@+id/new_fingerprint"
android:layout_width="fill_parent"
diff --git a/res/layout/muc_options.xml b/res/layout/muc_options.xml
new file mode 100644
index 00000000..3874de14
--- /dev/null
+++ b/res/layout/muc_options.xml
@@ -0,0 +1,76 @@
+<?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:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Your nickname"
+ android:textColor="#33B5E5"
+ android:textSize="20sp" />
+
+ <EditText
+ android:id="@+id/muc_your_nick"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:inputType="textEmailAddress"
+ android:padding="8dp"
+ />
+
+ <TextView
+ android:paddingTop="16dp"
+ android:id="@+id/muc_moderators_header"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Moderators"
+ android:textColor="#33B5E5"
+ android:textSize="20sp" />
+ <TextView
+ android:id="@+id/muc_moderators"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Romeo"
+ android:singleLine="true"
+ android:textSize="16sp"
+ android:paddingLeft="8dp"
+ android:paddingBottom="8dp"/>
+
+ <TextView
+ android:id="@+id/muc_participants_header"
+ android:paddingTop="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Participants"
+ android:textColor="#33B5E5"
+ android:textSize="20sp" />
+ <TextView
+ android:id="@+id/muc_participants"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Juilett"
+ android:singleLine="true"
+ android:textSize="16sp"
+ android:paddingLeft="8dp"
+ android:paddingBottom="8dp"/>
+ <TextView
+ android:id="@+id/muc_visitors_header"
+ android:paddingTop="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Visitors"
+ android:textColor="#33B5E5"
+ android:textSize="20sp" />
+ <TextView
+ android:id="@+id/muc_visitors"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Benvolio"
+ android:singleLine="true"
+ android:textSize="16sp"
+ android:paddingLeft="8dp"
+ android:paddingBottom="8dp"/>
+
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dd372df6..557b2353 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,4 +15,6 @@
<string name="sending">sending&#8230;</string>
<string name="announce_pgp">Renew PGP announcement</string>
<string name="encrypted_message">Decrypting message. please wait&#8230;</string>
+ <string name="conference_details">Conference Details</string>
+ <string name="nick_in_use">Nickname is already in use</string>
</resources>