ContactList: account groups new design: contact like height, status.

app/src/main/java/com/xabber/android/ui/adapter/GroupedContactAdapter.java

@@ -27,6 +27,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.Group;
@@ -53,6 +54,8 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
      */
     static final Collection<Group> NO_GROUP_LIST;
 
+    static final int TYPE_COUNT = 3;
+
     /**
      * View type used for contact items.
      */
@@ -63,6 +66,9 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
      */
     static final int TYPE_GROUP = 1;
 
+
+    static final int TYPE_ACCOUNT = 2;
+
     static {
         Collection<Group> groups = new ArrayList<>(1);
         groups.add(new Group() {
@@ -108,7 +114,7 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
 
     @Override
     public int getViewTypeCount() {
-        return 2;
+        return TYPE_COUNT;
     }
 
     @Override
@@ -116,6 +122,8 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
         Object object = getItem(position);
         if (object instanceof AbstractContact) {
             return TYPE_CONTACT;
+        } else if (object instanceof AccountConfiguration) {
+            return TYPE_ACCOUNT;
         } else if (object instanceof GroupConfiguration) {
             return TYPE_GROUP;
         } else {
@@ -125,16 +133,17 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        if (getItemViewType(position) == TYPE_CONTACT) {
+        switch (getItemViewType(position)) {
+            case TYPE_CONTACT:
                 return super.getView(position, convertView, parent);
-        } else if (getItemViewType(position) == TYPE_GROUP) {
+
+            case TYPE_GROUP:
+            {
                 final View view;
                 final GroupViewHolder viewHolder;
                 if (convertView == null) {
                     view = layoutInflater.inflate(R.layout.base_group_item, parent, false);
                     TypedArray typedArray = activity.obtainStyledAttributes(R.styleable.ContactList);
-                view.setBackgroundDrawable(
-                        typedArray.getDrawable(R.styleable.ContactList_expanderBackground));
                     ((ImageView) view.findViewById(R.id.indicator)).setImageDrawable(
                             typedArray.getDrawable(R.styleable.ContactList_expanderIndicator));
                     typedArray.recycle();
@@ -145,6 +154,7 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
                     view = convertView;
                     viewHolder = (GroupViewHolder) view.getTag();
                 }
+
                 final GroupConfiguration configuration = (GroupConfiguration) getItem(position);
                 final int level = AccountManager.getInstance().getColorLevel(configuration.getAccount());
 
@@ -159,7 +169,6 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
                 int color;
 
 
-            viewHolder.accountStatus.setVisibility(View.GONE);
                 viewHolder.groupOfflineIndicator.setVisibility(View.GONE);
 
                 if (configuration.getUser().equals(GroupManager.ACTIVE_CHATS)) {
@@ -170,20 +179,10 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
                     viewHolder.name.setText(name + " (" + configuration.getOnline()
                             + "/" + configuration.getTotal() + ")");
 
-                if (configuration instanceof AccountConfiguration) {
-                    color = accountColors[level];
-                    elevation = accountGroupElevation;
-                    viewHolder.groupOfflineIndicator.setVisibility(View.INVISIBLE);
-                    viewHolder.accountStatus.setVisibility(View.VISIBLE);
-
-                    viewHolder.accountStatus.setImageLevel(AccountManager.getInstance()
-                            .getAccount(configuration.getAccount()).getDisplayStatusMode().getStatusLevel());
-                } else {
                     color = accountSubgroupColors[level];
                     elevation = accountSubgroupElevation;
                     viewHolder.groupOfflineIndicator.setVisibility(View.VISIBLE);
                 }
-            }
 
                 view.setBackgroundDrawable(new ColorDrawable(color));
 
@@ -191,9 +190,58 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
                     view.setElevation(elevation);
                 }
 
-
                 return view;
+            }
+
+            case TYPE_ACCOUNT:
+                final View view;
+                final AccountViewHolder viewHolder;
+                if (convertView == null) {
+                    view = layoutInflater.inflate(R.layout.account_group_item, parent, false);
+                    TypedArray typedArray = activity.obtainStyledAttributes(R.styleable.ContactList);
+                    ((ImageView) view.findViewById(R.id.indicator)).setImageDrawable(
+                            typedArray.getDrawable(R.styleable.ContactList_expanderIndicator));
+                    typedArray.recycle();
+
+                    viewHolder = new AccountViewHolder(view);
+                    view.setTag(viewHolder);
                 } else {
+                    view = convertView;
+                    viewHolder = (AccountViewHolder) view.getTag();
+                }
+
+                final AccountConfiguration configuration = (AccountConfiguration) getItem(position);
+
+                final int level = AccountManager.getInstance().getColorLevel(configuration.getAccount());
+                view.setBackgroundDrawable(new ColorDrawable(accountColors[level]));
+
+                viewHolder.indicator.setImageLevel(configuration.isExpanded() ? 1 : 0);
+
+                final String name = GroupManager.getInstance()
+                        .getGroupName(configuration.getAccount(), configuration.getUser());
+
+                viewHolder.jid.setText(name + " (" + configuration.getOnline()
+                        + "/" + configuration.getTotal() + ")");
+
+                AccountItem accountItem = AccountManager.getInstance().getAccount(configuration.getAccount());
+
+                viewHolder.statusIcon.setImageLevel(accountItem.getDisplayStatusMode().getStatusLevel());
+
+                String statusText = accountItem.getStatusText().trim();
+
+                if (statusText.isEmpty()) {
+                    statusText = activity.getString(accountItem.getDisplayStatusMode().getStringID());
+                }
+
+                viewHolder.status.setText(statusText);
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    view.setElevation(accountGroupElevation);
+                }
+
+                return view;
+
+            default:
                 throw new IllegalStateException();
         }
     }
@@ -399,14 +447,27 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
         final ImageView indicator;
         final TextView name;
         final ImageView groupOfflineIndicator;
-        final ImageView accountStatus;
 
         public GroupViewHolder(View view) {
             indicator = (ImageView) view.findViewById(R.id.indicator);
             name = (TextView) view.findViewById(R.id.name);
             groupOfflineIndicator = (ImageView) view.findViewById(R.id.group_offline_indicator);
-            accountStatus = (ImageView) view.findViewById(R.id.account_status);
         }
     }
 
+    private static class AccountViewHolder {
+        final ImageView indicator;
+        final TextView jid;
+        final TextView status;
+        final ImageView statusIcon;
+
+        public AccountViewHolder(View view) {
+            indicator = (ImageView) view.findViewById(R.id.indicator);
+            jid = (TextView) view.findViewById(R.id.account_jid);
+            status = (TextView) view.findViewById(R.id.account_status);
+            statusIcon = (ImageView) view.findViewById(R.id.account_status_icon);
+        }
+    }
+
+
 }

app/src/main/res/layout/account_group_item.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
+
+     This file is part of Xabber project; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License, Version 3.
+
+     Xabber is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License,
+     along with this program. If not, see http://www.gnu.org/licenses/.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/contact_list_item_height"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="@color/green_500"
+    >
+
+    <ImageView
+        android:id="@+id/indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/expander_indicator_dark"
+    />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        >
+        <TextView
+            android:id="@+id/account_jid"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:text="name@example.com (0/0)"
+            />
+
+        <TextView
+            android:id="@+id/account_status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:text="Online"
+            />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/account_status_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_status"
+        android:padding="16dp"
+        />
+
+</LinearLayout>
\ No newline at end of file

app/src/main/res/layout/base_group_item.xml

@@ -54,14 +54,4 @@
         android:layout_toStartOf="@id/group_offline_indicator"
         />
 
-    <ImageView
-        android:id="@+id/account_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_status"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        />
-
 </RelativeLayout>
\ No newline at end of file