From 873fc0ad0c0ac71c359db768ea95d15e4bd78a2d Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 16 May 2017 12:24:21 +0100
Subject: [PATCH] Journal item activity: Improve presentation of groups.

---
 .../syncadapter/ui/JournalItemActivity.java   | 19 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.java
index 5c25d918..dc8d554d 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.java
@@ -308,6 +308,25 @@ public class JournalItemActivity extends BaseActivity implements Refreshable {
                 TextView tv = (TextView) view.findViewById(R.id.display_name);
                 tv.setText(contact.displayName);
 
+                if (contact.group) {
+                    showGroup(contact);
+                } else {
+                    showContact(contact);
+                }
+            }
+
+            private void showGroup(Contact contact) {
+                final ViewGroup mainCard = (ViewGroup) view.findViewById(R.id.main_card);
+
+                addInfoItem(view.getContext(), mainCard, getString(R.string.journal_item_member_count), null, String.valueOf(contact.members.size()));
+
+                for (String member : contact.members) {
+                    addInfoItem(view.getContext(), mainCard, getString(R.string.journal_item_member), null, member);
+                }
+            }
+
+
+            private void showContact(Contact contact) {
                 final ViewGroup mainCard = (ViewGroup) view.findViewById(R.id.main_card);
                 final ViewGroup aboutCard = (ViewGroup) view.findViewById(R.id.about_card);
                 aboutCard.findViewById(R.id.title_container).setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bea6501b..b18eb510 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -146,6 +146,8 @@
     <string name="journal_item_anniversary">Anniversary</string>
     <string name="journal_item_birthday">Birthday</string>
     <string name="journal_item_relation">Relation</string>
+    <string name="journal_item_member">Member</string>
+    <string name="journal_item_member_count">Member Count</string>
 
     <!-- PermissionsActivity -->
     <string name="permissions_title">EteSync permissions</string>