aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_action_discard.pngbin0 -> 454 bytes
-rw-r--r--res/drawable-mdpi/ic_action_discard.pngbin0 -> 333 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_discard.pngbin0 -> 552 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_discard.pngbin0 -> 781 bytes
-rw-r--r--res/layout/activity_contact_details.xml (renamed from res/layout/dialog_contact_details.xml)73
-rw-r--r--res/layout/activity_muc_details.xml (renamed from res/layout/muc_options.xml)0
-rw-r--r--res/layout/edit_contact_name.xml28
-rw-r--r--res/menu/contact_details.xml27
-rw-r--r--res/menu/muc_details.xml15
-rw-r--r--res/values/strings.xml2
10 files changed, 107 insertions, 38 deletions
diff --git a/res/drawable-hdpi/ic_action_discard.png b/res/drawable-hdpi/ic_action_discard.png
new file mode 100644
index 00000000..9c717dd3
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_discard.png b/res/drawable-mdpi/ic_action_discard.png
new file mode 100644
index 00000000..9dfb7cc2
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_discard.png b/res/drawable-xhdpi/ic_action_discard.png
new file mode 100644
index 00000000..db69d6c2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_discard.png b/res/drawable-xxhdpi/ic_action_discard.png
new file mode 100644
index 00000000..b522daff
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_discard.png
Binary files differ
diff --git a/res/layout/dialog_contact_details.xml b/res/layout/activity_contact_details.xml
index 00da4396..cd49f1bf 100644
--- a/res/layout/dialog_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -3,12 +3,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="8dp" >
+ android:background="#e5e5e5">
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="Contact Details" />
<RelativeLayout
android:layout_width="wrap_content"
- android:layout_height="72dp"
- android:padding="0dp">
+ android:layout_height="88dp"
+ android:padding="8dp">
<QuickContactBadge
android:id="@+id/details_contact_badge"
@@ -21,78 +27,69 @@
android:id="@+id/details_jidbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
android:layout_toRightOf="@+id/details_contact_badge"
android:orientation="vertical"
- android:layout_alignParentTop="true"
- android:paddingLeft="8dp">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Jabber ID"
- android:textColor="#33B5E5"
- android:textSize="20sp" />
+ android:paddingLeft="8dp" >
<TextView
android:id="@+id/details_contactjid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="something@jabber.example.com"
+ android:paddingLeft="8dp"
android:singleLine="true"
- android:textSize="14sp"
- android:paddingLeft="8dp"/>
+ android:text="something@jabber.example.com"
+ android:textColor="#5b5b5b"
+ android:textSize="18sp" />
-
- </LinearLayout>
- <TextView
+ <TextView
android:id="@+id/details_contactstatus"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
+ android:paddingLeft="16dp"
android:text="online"
android:textSize="24sp"
- android:textStyle="bold"
- android:gravity="center_vertical"
- android:layout_below="@+id/details_jidbox"
- android:layout_toRightOf="@id/details_contact_badge"
- android:paddingLeft="16dp"/>
+ android:textStyle="bold" />
+ </LinearLayout>
+
</RelativeLayout>
- <TextView
+
+ <TextView
+ style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:text="Your account"
- android:textColor="#33B5E5"
- android:textSize="20sp"/>
-
+ android:padding="8dp"
+ android:text="Your account" />
<TextView
android:id="@+id/details_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:text="julia@jabber.example.com"
- android:textSize="14sp" />
-
- <TextView
+ android:textSize="18sp"
+ android:textColor="#5b5b5b" />
+ <TextView
+ style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:text="Subscription"
- android:textColor="#33B5E5"
- android:textSize="20sp" />
+ android:padding="8dp"
+ android:text="Subscription" />
<CheckBox
android:id="@+id/details_send_presence"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Send presence updates"
- android:textSize="14sp" />
+ android:textSize="18sp"
+ android:textColor="#5b5b5b" />
<CheckBox
android:id="@+id/details_receive_presence"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Receive presence updates"
- android:textSize="14sp" />
+ android:textSize="18sp"
+ android:textColor="#5b5b5b" />
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/muc_options.xml b/res/layout/activity_muc_details.xml
index fd5583cf..fd5583cf 100644
--- a/res/layout/muc_options.xml
+++ b/res/layout/activity_muc_details.xml
diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml
new file mode 100644
index 00000000..206c7432
--- /dev/null
+++ b/res/layout/edit_contact_name.xml
@@ -0,0 +1,28 @@
+<?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/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/enter_new_name"
+ android:textColor="#5b5b5b"
+ android:textSize="18sp" />
+
+ <EditText
+ android:paddingTop="16dp"
+ android:paddingBottom="8dp"
+ android:id="@+id/editText1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:inputType="textPersonName" >
+
+ <requestFocus />
+ </EditText>
+
+</LinearLayout>
diff --git a/res/menu/contact_details.xml b/res/menu/contact_details.xml
new file mode 100644
index 00000000..5d4a8d56
--- /dev/null
+++ b/res/menu/contact_details.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item
+ android:id="@+id/action_edit_contact"
+ android:orderInCategory="10"
+ android:showAsAction="always"
+ android:icon="@drawable/ic_action_edit"
+ android:title="Edit name" />
+ <item
+ android:id="@+id/action_delete_contact"
+ android:orderInCategory="10"
+ android:showAsAction="always"
+ android:icon="@drawable/ic_action_discard"
+ android:title="Delete from roster" />
+ <item
+ android:id="@+id/action_accounts"
+ android:orderInCategory="90"
+ android:showAsAction="never"
+ android:title="@string/action_accounts"
+ />
+
+ <item
+ android:id="@+id/action_settings"
+ android:orderInCategory="100"
+ android:showAsAction="never"
+ android:title="@string/action_settings"/>
+</menu>
diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml
new file mode 100644
index 00000000..4f9b6da0
--- /dev/null
+++ b/res/menu/muc_details.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item
+ android:id="@+id/action_accounts"
+ android:orderInCategory="90"
+ android:showAsAction="never"
+ android:title="@string/action_accounts"
+ />
+
+ <item
+ android:id="@+id/action_settings"
+ android:orderInCategory="100"
+ android:showAsAction="never"
+ android:title="@string/action_settings"/>
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a9e1fb99..3b575db1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,4 +20,6 @@
<string name="moderator">Moderator</string>
<string name="participant">Participant</string>
<string name="visitor">Visitor</string>
+ <string name="enter_new_name">Enter a new name:</string>
+ <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed.</string>
</resources>