From 78312d71dd1f281f494a2a1c04e4a80f34898d2c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 5 Mar 2014 15:41:14 +0100
Subject: reworked contact details

---
 res/drawable-hdpi/ic_action_discard.png   | Bin 0 -> 454 bytes
 res/drawable-mdpi/ic_action_discard.png   | Bin 0 -> 333 bytes
 res/drawable-xhdpi/ic_action_discard.png  | Bin 0 -> 552 bytes
 res/drawable-xxhdpi/ic_action_discard.png | Bin 0 -> 781 bytes
 res/layout/activity_contact_details.xml   |  95 +++++++++++++++++++++++++
 res/layout/activity_muc_details.xml       | 114 ++++++++++++++++++++++++++++++
 res/layout/dialog_contact_details.xml     |  98 -------------------------
 res/layout/edit_contact_name.xml          |  28 ++++++++
 res/layout/muc_options.xml                | 114 ------------------------------
 res/menu/contact_details.xml              |  27 +++++++
 res/menu/muc_details.xml                  |  15 ++++
 res/values/strings.xml                    |   2 +
 12 files changed, 281 insertions(+), 212 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_action_discard.png
 create mode 100644 res/drawable-mdpi/ic_action_discard.png
 create mode 100644 res/drawable-xhdpi/ic_action_discard.png
 create mode 100644 res/drawable-xxhdpi/ic_action_discard.png
 create mode 100644 res/layout/activity_contact_details.xml
 create mode 100644 res/layout/activity_muc_details.xml
 delete mode 100644 res/layout/dialog_contact_details.xml
 create mode 100644 res/layout/edit_contact_name.xml
 delete mode 100644 res/layout/muc_options.xml
 create mode 100644 res/menu/contact_details.xml
 create mode 100644 res/menu/muc_details.xml

(limited to 'res')

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
Binary files /dev/null and b/res/drawable-hdpi/ic_action_discard.png 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
Binary files /dev/null and b/res/drawable-mdpi/ic_action_discard.png 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
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_discard.png 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
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_discard.png differ
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
new file mode 100644
index 00000000..cd49f1bf
--- /dev/null
+++ b/res/layout/activity_contact_details.xml
@@ -0,0 +1,95 @@
+<?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: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="88dp"
+        android:padding="8dp">
+
+        <QuickContactBadge
+            android:id="@+id/details_contact_badge"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_centerVertical="true"
+            android:scaleType="fitXY"/>
+
+        <LinearLayout
+            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:paddingLeft="8dp" >
+
+            <TextView
+                android:id="@+id/details_contactjid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="8dp"
+                android:singleLine="true"
+                android:text="something@jabber.example.com"
+                android:textColor="#5b5b5b"
+                android:textSize="18sp" />
+
+            <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" />
+        </LinearLayout>
+          
+    </RelativeLayout>
+
+  
+   <TextView
+        style="@style/sectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        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="18sp"
+        android:textColor="#5b5b5b" />
+   <TextView
+        style="@style/sectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        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="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="18sp"
+        android:textColor="#5b5b5b" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
new file mode 100644
index 00000000..fd5583cf
--- /dev/null
+++ b/res/layout/activity_muc_details.xml
@@ -0,0 +1,114 @@
+<?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:background="#e5e5e5">
+
+<LinearLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <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/muc_edit_nick"
+            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/layout/dialog_contact_details.xml b/res/layout/dialog_contact_details.xml
deleted file mode 100644
index 00da4396..00000000
--- a/res/layout/dialog_contact_details.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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" >
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="72dp"
-        android:padding="0dp">
-
-        <QuickContactBadge
-            android:id="@+id/details_contact_badge"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_centerVertical="true"
-            android:scaleType="fitXY"/>
-
-        <LinearLayout
-            android:id="@+id/details_jidbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            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" />
-
-            <TextView
-                android:id="@+id/details_contactjid"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="something@jabber.example.com"
-                android:singleLine="true"
-                android:textSize="14sp"
-                android:paddingLeft="8dp"/>
-
-         
-        </LinearLayout>
-           <TextView
-                android:id="@+id/details_contactstatus"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                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"/>
-    </RelativeLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:text="Your account"
-        android:textColor="#33B5E5"
-        android:textSize="20sp"/>
-
-    <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:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:text="Subscription"
-        android:textColor="#33B5E5"
-        android:textSize="20sp" />
-
-    <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" />
-
-    <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" />
-
-</LinearLayout>
\ No newline at end of file
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/layout/muc_options.xml b/res/layout/muc_options.xml
deleted file mode 100644
index fd5583cf..00000000
--- a/res/layout/muc_options.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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:background="#e5e5e5">
-
-<LinearLayout
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <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/muc_edit_nick"
-            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/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>
-- 
cgit v1.2.3