diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c3692df2..cdb40add 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -74,6 +74,10 @@ android:label="@string/settings" android:parentActivityName=".activities.MainActivity"/> + + () + private var activity: MainActivity? = null + private var lastContacts = ArrayList() override fun setupFragment(activity: MainActivity) { if (this.activity == null) { @@ -63,8 +66,10 @@ class GroupsFragment(context: Context, attributeSet: AttributeSet) : Coordinator val currAdapter = groups_list.adapter if (currAdapter == null) { GroupsAdapter(activity as SimpleActivity, storedGroups, groups_list, groups_fastscroller) { - val group = it as Group - val groupContacts = contacts.filter { it.groups.map { it.id }.contains(group.id) } + Intent(activity, GroupContactsActivity::class.java).apply { + putExtra(GROUP, it as Group) + activity!!.startActivity(this) + } }.apply { setupDragListener(true) addVerticalDividers(true) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt index 6f104a57..aa6133ab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt @@ -13,6 +13,7 @@ const val ON_CONTACT_CLICK = "on_contact_click" const val CONTACT_ID = "contact_id" const val SMT_PRIVATE = "smt_private" // used at the contact source of local contacts hidden from other apps const val IS_PRIVATE = "is_private" +const val GROUP = "group" // contact photo changes const val PHOTO_ADDED = 1 diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Group.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Group.kt index d03775f7..12b7ba27 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Group.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Group.kt @@ -1,6 +1,12 @@ package com.simplemobiletools.contacts.models -data class Group(var id: Long, var title: String, var contactsCount: Int = 0) { +import java.io.Serializable + +data class Group(var id: Long, var title: String, var contactsCount: Int = 0) : Serializable { + companion object { + private const val serialVersionUID = -1384515348451345L + } + fun addContact() = contactsCount++ fun getBubbleText() = title diff --git a/app/src/main/res/layout/activity_group_contacts.xml b/app/src/main/res/layout/activity_group_contacts.xml new file mode 100644 index 00000000..e5403216 --- /dev/null +++ b/app/src/main/res/layout/activity_group_contacts.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + +