Account group expander: offline contacts indicator always shown, conacts...

Account group expander: offline contacts indicator always shown, conacts number shown on second line.

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

@@ -26,6 +26,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountItem;
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.extension.avatar.AvatarManager;
@@ -218,16 +219,10 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
                 final int level = AccountManager.getInstance().getColorLevel(account);
                 view.setBackgroundDrawable(new ColorDrawable(accountColors[level]));
 
-                final String name = GroupManager.getInstance().getGroupName(account, configuration.getUser());
-
-                viewHolder.jid.setText(name + " (" + configuration.getOnline()
-                        + "/" + configuration.getTotal() + ")");
+                viewHolder.jid.setText(GroupManager.getInstance().getGroupName(account, configuration.getUser()));
+                viewHolder.contactCounter.setText(configuration.getOnline() + "/" + configuration.getTotal());
 
                 AccountItem accountItem = AccountManager.getInstance().getAccount(account);
-
-                viewHolder.avatar.setImageDrawable(AvatarManager.getInstance().getAccountAvatar(account));
-                viewHolder.statusIcon.setImageLevel(accountItem.getDisplayStatusMode().getStatusLevel());
-
                 String statusText = accountItem.getStatusText().trim();
 
                 if (statusText.isEmpty()) {
@@ -236,6 +231,20 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
 
                 viewHolder.status.setText(statusText);
 
+                viewHolder.avatar.setImageDrawable(AvatarManager.getInstance().getAccountAvatar(account));
+                viewHolder.statusIcon.setImageLevel(accountItem.getDisplayStatusMode().getStatusLevel());
+
+                ShowOfflineMode showOfflineMode = configuration.getShowOfflineMode();
+                if (showOfflineMode == ShowOfflineMode.normal) {
+                    if (SettingsManager.contactsShowOffline()) {
+                        showOfflineMode = ShowOfflineMode.always;
+                    } else {
+                        showOfflineMode = ShowOfflineMode.never;
+                    }
+                }
+
+                viewHolder.offlineContactsIndicator.setImageLevel(showOfflineMode.ordinal());
+
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                     view.setElevation(accountGroupElevation);
                 }
@@ -455,14 +464,21 @@ public abstract class GroupedContactAdapter<Inflater extends BaseContactInflater
     private static class AccountViewHolder {
         final TextView jid;
         final TextView status;
+        final TextView contactCounter;
+
         final ImageView statusIcon;
         final ImageView avatar;
+        final ImageView offlineContactsIndicator;
+
 
         public AccountViewHolder(View view) {
             jid = (TextView) view.findViewById(R.id.account_jid);
             status = (TextView) view.findViewById(R.id.account_status);
+            contactCounter = (TextView) view.findViewById(R.id.contact_counter);
+
             statusIcon = (ImageView) view.findViewById(R.id.account_status_icon);
             avatar = (ImageView) view.findViewById(R.id.avatar);
+            offlineContactsIndicator = (ImageView) view.findViewById(R.id.offline_contacts_indicator);
         }
     }
 

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

@@ -58,20 +58,48 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="marquee"
-            android:text="name@example.com (0/0)"
+            android:text="name@example.com"
             android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textStyle="bold"
         />
 
-        <TextView
-            android:id="@+id/account_status"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:text="Online"
-            />
+            android:orientation="horizontal"
+            >
+
+            <ImageView
+                android:id="@+id/offline_contacts_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_show_offline"
+                android:layout_gravity="center_horizontal"
+                android:alpha="0.2"
+                />
+
+
+            <TextView
+                android:id="@+id/contact_counter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:text="3/9"
+                android:paddingLeft="4dp"
+                android:paddingRight="6dp"
+                />
+
+            <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>
 
     </LinearLayout>