From e79a34b651a626b93686b8c578280b77c54b6138 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 16 Jul 2014 12:34:09 +0200
Subject: redesigned muc details a little bit

---
 res/drawable-hdpi/ic_action_edit_dark.png   | Bin 0 -> 884 bytes
 res/drawable-mdpi/ic_action_edit_dark.png   | Bin 0 -> 587 bytes
 res/drawable-xhdpi/ic_action_edit_dark.png  | Bin 0 -> 1179 bytes
 res/drawable-xxhdpi/ic_action_edit_dark.png | Bin 0 -> 1670 bytes
 res/layout/activity_muc_details.xml         | 239 +++++++++++++---------------
 res/layout/edit_contact_name.xml            |  28 ----
 res/layout/quickedit.xml                    |  18 +++
 res/menu/muc_details.xml                    |   6 +
 res/values/colors.xml                       |   2 +
 res/values/strings.xml                      |   2 +
 res/values/styles.xml                       |   4 +-
 res/values/themes.xml                       |   4 +-
 12 files changed, 142 insertions(+), 161 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_action_edit_dark.png
 create mode 100644 res/drawable-mdpi/ic_action_edit_dark.png
 create mode 100644 res/drawable-xhdpi/ic_action_edit_dark.png
 create mode 100644 res/drawable-xxhdpi/ic_action_edit_dark.png
 delete mode 100644 res/layout/edit_contact_name.xml
 create mode 100644 res/layout/quickedit.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_action_edit_dark.png b/res/drawable-hdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..5f7c6eff
Binary files /dev/null and b/res/drawable-hdpi/ic_action_edit_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_edit_dark.png b/res/drawable-mdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..650b4d89
Binary files /dev/null and b/res/drawable-mdpi/ic_action_edit_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_edit_dark.png b/res/drawable-xhdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..8ab436d8
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_edit_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_edit_dark.png b/res/drawable-xxhdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..f2b2078b
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_edit_dark.png differ
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index 15f09c7c..d47c6b6e 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -2,147 +2,128 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/secondarybackground">
-
-<LinearLayout
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-     <TextView
-        style="@style/sectionHeader"
+    android:background="@color/primarybackground" >
+
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:text="@string/muc_details_conference"
-        android:textColor="@color/primarytext"/>
-       <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/primarybackground" >
-        
+        android:orientation="vertical" >
 
-        <EditText
-            android:id="@+id/muc_subject"
+        <TextView
+            style="@style/sectionHeader"
             android:layout_width="wrap_content"
-            android:layout_height="48dp"
-            android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@+id/muc_edit_subject"
-            android:background="@color/primarybackground"
-            android:ems="10"
-            android:hint="@string/muc_details_conference_subject"
-            android:inputType="textAutoComplete"
-            android:paddingBottom="12dp"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:paddingTop="12dp" />
-
-        <ImageButton
-            android:id="@+id/muc_edit_subject"
-            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:layout_height="wrap_content"
             android:padding="8dp"
-            android:src="@drawable/ic_action_edit" />
-    </RelativeLayout>
-    <TextView
-        android:id="@+id/muc_jabberid"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:singleLine="true"
-        android:textSize="14sp"
-        android:textColor="@color/primarytext"/>
+            android:text="@string/muc_details_conference" />
 
-    <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="@string/muc_details_your_nickname"
-        android:textColor="@color/primarytext"/>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/primarybackground" >
-        
+        <TextView
+            android:id="@+id/muc_jabberid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:singleLine="true"
+            android:text="@string/account_settings_example_jabber_id"
+            android:textColor="@color/primarytext"
+            android:textSize="14sp"/>
 
-        <EditText
-            android:id="@+id/muc_your_nick"
+        <TextView
+            style="@style/sectionHeader"
             android:layout_width="wrap_content"
-            android:layout_height="48dp"
-            android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@+id/muc_edit_nick"
-            android:background="@color/primarybackground"
-            android:ems="10"
-            android:hint="@string/muc_details_your_nickname"
-            android:inputType="textEmailAddress"
-            android:paddingBottom="12dp"
+            android:layout_height="wrap_content"
             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:paddingTop="8dp"
+            android:text="@string/you" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:attr/activatedBackgroundIndicator"
             android:padding="8dp"
-            android:src="@drawable/ic_action_edit" />
-    </RelativeLayout>
-    <TextView
-        android:id="@+id/muc_role"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:singleLine="true"
-        android:textSize="14sp"
-        android:textColor="@color/primarytext"/>
-    
-    <LinearLayout
-        android:id="@+id/muc_more_details"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-
-    <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="@string/muc_details_other_members"
-        android:textColor="@color/primarytext"/>
+            android:paddingBottom="8dp" >
 
-    <LinearLayout
-        android:id="@+id/muc_members"
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" 
-        android:orientation="vertical"
-        android:divider="?android:dividerHorizontal"
-        android:showDividers="middle"
-        >
-    </LinearLayout>
+            <ImageView
+                android:id="@+id/your_photo"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_alignParentLeft="true"
+                android:src="@drawable/ic_profile" >
+            </ImageView>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/your_photo"
+                android:orientation="vertical"
+                android:paddingLeft="8dp" >
+
+                <TextView
+                    android:id="@+id/muc_your_nick"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:text="hallo hallo"
+                    android:textColor="@color/primarytext"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/muc_role"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:text="Participant"
+                    android:textColor="@color/primarytext"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <ImageButton
+                android:id="@+id/edit_nick_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="?android:selectableItemBackground"
+              	android:src="@drawable/ic_action_edit_dark"
+              	android:padding="8dp"/>
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/muc_more_details"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical" >
+
+            <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="@string/muc_details_other_members" />
+
+            <LinearLayout
+                android:id="@+id/muc_members"
+                android:layout_width="fill_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:divider="?android:dividerHorizontal"
+                android:orientation="vertical"
+                android:showDividers="middle" >
+            </LinearLayout>
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/invite"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="24dp"
+            android:text="@string/invite_contacts" />
     </LinearLayout>
 
-    <Button
-        android:layout_marginTop="24dp"
-        android:id="@+id/invite"
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/invite_contacts"
-        android:layout_gravity="center_horizontal"/>
-</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml
deleted file mode 100644
index 42f0fb88..00000000
--- a/res/layout/edit_contact_name.xml
+++ /dev/null
@@ -1,28 +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">
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/enter_new_name"
-        android:textColor="@color/primarytext"
-        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/quickedit.xml b/res/layout/quickedit.xml
new file mode 100644
index 00000000..07a7ac3b
--- /dev/null
+++ b/res/layout/quickedit.xml
@@ -0,0 +1,18 @@
+<?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="16dp">
+    <EditText
+        android:id="@+id/editor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:inputType="textPersonName"
+        android:textColor="@color/primarytext">
+
+        <requestFocus />
+    </EditText>
+    
+</LinearLayout>
diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml
index 4f9b6da0..685109cd 100644
--- a/res/menu/muc_details.xml
+++ b/res/menu/muc_details.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/action_edit_subject"
+        android:orderInCategory="10"
+        android:showAsAction="always"
+        android:icon="@drawable/ic_action_edit"
+        android:title="@string/action_edit_subject" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4ede1c10..b6477939 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="primary" type="color">#ff259b24</color>
+    <color name="primarydark" type="color">#ff0a7e07</color>
     <color name="primarytext" type="color">#de000000</color>
     <color name="secondarytext" type="color">#8a000000</color>
     <color name="ondarktext" type="color">#fffafafa</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5aa7afe1..26e5dda5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -270,4 +270,6 @@
     <string name="save_as_bookmark">Save as bookmark</string>
     <string name="delete_bookmark">Delete bookmark</string>
     <string name="bookmark_already_exists">This bookmark already exists</string>
+    <string name="you">You</string>
+    <string name="action_edit_subject">Edit conference subject</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1468283e..a827fe36 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -6,14 +6,14 @@
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">#5b5b5b</item>
+        <item name="android:textColor">@color/primarytext</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="Divider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1.5dp</item>
-        <item name="android:background">#b7b7b7</item>
+        <item name="android:background">@color/divider</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0c4ddc39..97f1db8f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -8,8 +8,8 @@
     </style>
 
     <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:background">#259b24</item>
-        <item name="android:backgroundStacked">#0a7e07</item>
+        <item name="android:background">@color/primary</item>
+        <item name="android:backgroundStacked">@color/primarydark</item>
         <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
         <item name="android:icon">@android:color/transparent</item>
     </style>
-- 
cgit v1.2.3