From 990f0f6d73b1c63dd61c824a6b73ba056e2de75c Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 31 Jul 2014 15:09:34 +0200
Subject: refactored account array adapter into seperate class. added account
 image

---
 res/layout/account_row.xml | 61 ++++++++++++++++++----------------------------
 res/values/colors.xml      |  2 +-
 2 files changed, 25 insertions(+), 38 deletions(-)

(limited to 'res')

diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 0c18d9b2f..5494e4365 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -2,55 +2,42 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:background="?android:attr/activatedBackgroundIndicator">
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:padding="8dp" >
 
- 
+    <ImageView
+        android:id="@+id/account_image"
+        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_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:orientation="vertical">
+        android:layout_toRightOf="@+id/account_image"
+        android:layout_centerVertical="true"
+        android:orientation="vertical"
+        android:paddingLeft="8dp" >
 
         <TextView
             android:id="@+id/account_jid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:textColor="@color/primarytext"
+            android:scrollHorizontally="false"
             android:singleLine="true"
-	        android:scrollHorizontally="false"/>
+            android:textColor="@color/primarytext"
+            android:textSize="18sp" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/account_status"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="3dp">
-
-            <TextView
-                android:id="@+id/textView2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/account_status"
-                android:textStyle="bold"
-               	android:textSize="14sp"
-               	android:textColor="@color/primarytext"/>
-
-            <TextView
-                android:id="@+id/account_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="4dp"
-                android:text="@string/account_status_unknown"
-                android:textStyle="bold"
-                android:textSize="14sp"/>
-
-        </LinearLayout>
-
+            android:text="@string/account_status_unknown"
+            android:textSize="14sp"
+            android:textColor="@color/secondarytext"
+            android:textStyle="bold"/>
     </LinearLayout>
 
-    
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b64779391..ed0a0ffbf 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -9,5 +9,5 @@
     <color name="secondarybackground" type="color">#ffeeeeee</color>
     <color name="darkbackground" type="color">#ff323232</color>
     <color name="divider">#1f000000</color>
-    <color name="red">#ffe51c23</color>
+    <color name="warningtext">#ffe51c23</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3