aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-04 02:51:01 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-04 02:51:01 +0100
commit8e4be5256ea5b4e47225a84604720a15b45d3f39 (patch)
tree36005a1a78536e5bfa1fb5ebc3b4d43feddf0d60 /res
parent69af009c88c4ffa0ea3275c4b875a13e0ecdcddc (diff)
Muc Options even more awesome
Diffstat (limited to '')
-rw-r--r--res/drawable-hdpi/ic_action_edit.pngbin0 -> 884 bytes
-rw-r--r--res/drawable-ldpi/ic_action_edit.pngbin0 -> 587 bytes
-rw-r--r--res/drawable-mdpi/ic_action_edit.pngbin0 -> 587 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_edit.pngbin0 -> 1179 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_edit.pngbin0 -> 1670 bytes
-rw-r--r--res/layout/fragment_conversation.xml4
-rw-r--r--res/layout/muc_options.xml178
-rw-r--r--res/values/strings.xml3
8 files changed, 113 insertions, 72 deletions
diff --git a/res/drawable-hdpi/ic_action_edit.png b/res/drawable-hdpi/ic_action_edit.png
new file mode 100644
index 00000000..5f7c6eff
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-ldpi/ic_action_edit.png b/res/drawable-ldpi/ic_action_edit.png
new file mode 100644
index 00000000..650b4d89
--- /dev/null
+++ b/res/drawable-ldpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_edit.png b/res/drawable-mdpi/ic_action_edit.png
new file mode 100644
index 00000000..650b4d89
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_edit.png b/res/drawable-xhdpi/ic_action_edit.png
new file mode 100644
index 00000000..8ab436d8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_edit.png b/res/drawable-xxhdpi/ic_action_edit.png
new file mode 100644
index 00000000..f2b2078b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_edit.png
Binary files differ
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index dabce457..db22f38d 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5" >
+ android:background="#e5e5e5">
<RelativeLayout
android:background="#eee"
@@ -11,7 +11,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true" >
+ android:layout_alignParentLeft="true">
<EditText
android:id="@+id/textinput"
diff --git a/res/layout/muc_options.xml b/res/layout/muc_options.xml
index 3874de14..a4e142c2 100644
--- a/res/layout/muc_options.xml
+++ b/res/layout/muc_options.xml
@@ -1,76 +1,114 @@
-<?xml version="1.0" encoding="utf-8"?><LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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" />
+ android:background="#e5e5e5">
- <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"
- />
+<LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
- <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"/>
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="8dp"
+ android:text="Your nickname" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="#eee" >
+
+ <EditText
+ android:id="@+id/muc_your_nick"
+ android:layout_width="wrap_content"
+ android:layout_height="48dp"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@+id/imageView1"
+ android:background="#eee"
+ android:ems="10"
+ android:hint="Search or enter Jabber ID"
+ android:inputType="textEmailAddress"
+ android:paddingBottom="12dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="12dp" />
+
+ <ImageButton
+ android:id="@+id/muc_edit_nick"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:layout_centerVertical="true"
+ android:background="?android:selectableItemBackground"
+ android:padding="8dp"
+ android:src="@drawable/ic_action_edit" />
+ </RelativeLayout>
+
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="Jabber ID" />
+ <TextView
+ android:id="@+id/muc_jabberid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:singleLine="true"
+ android:textColor="#5b5b5b"
+ android:textSize="18sp"/>
+
+ <LinearLayout
+ android:id="@+id/muc_more_details"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
+
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="Your role" />
+
+ <TextView
+ android:id="@+id/muc_role"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:singleLine="true"
+ android:textSize="18sp"
+ android:textColor="#5b5b5b"/>
+
+
+ <TextView
+ android:id="@+id/muc_participants_header"
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="8dp"
+ android:text="Other Members" />
+
+ <LinearLayout
+ android:id="@+id/muc_members"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:divider="?android:dividerHorizontal"
+ android:showDividers="middle"
+ >
+ </LinearLayout>
+ </LinearLayout>
-
</LinearLayout>
+</ScrollView> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 557b2353..a9e1fb99 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,4 +17,7 @@
<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>
+ <string name="moderator">Moderator</string>
+ <string name="participant">Participant</string>
+ <string name="visitor">Visitor</string>
</resources>