fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

make the Favorites tab optional at selecting contact

Browse Source
This commit is contained in:
tibbi
2019-12-06 23:19:14 +01:00
parent 794e99e5c2
commit 9762792388
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
View File

@ -112,7 +112,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
}) })
viewpager.onGlobalLayout { viewpager.onGlobalLayout {
refreshContacts(CONTACTS_TAB_MASK or FAVORITES_TAB_MASK) refreshContacts(getTabsMask())
} }
insert_or_edit_tabs_holder.onTabSelectionChanged( insert_or_edit_tabs_holder.onTabSelectionChanged(
@ -132,7 +132,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
insert_or_edit_tabs_holder.removeAllTabs() insert_or_edit_tabs_holder.removeAllTabs()
var skippedTabs = 0 var skippedTabs = 0
contactsFavoritesList.forEachIndexed { index, value -> contactsFavoritesList.forEachIndexed { index, value ->
if (config.showTabs and value == 0) { if (config.showTabs and value == 0 && value == FAVORITES_TAB_MASK) {
skippedTabs++ skippedTabs++
} else { } else {
val tab = insert_or_edit_tabs_holder.newTab().setIcon(getTabIcon(index)) val tab = insert_or_edit_tabs_holder.newTab().setIcon(getTabIcon(index))
@ -211,7 +211,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
} }
if (viewpager.adapter == null) { if (viewpager.adapter == null) {
viewpager.adapter = ViewPagerAdapter(this, contactsFavoritesList, CONTACTS_TAB_MASK or FAVORITES_TAB_MASK) viewpager.adapter = ViewPagerAdapter(this, contactsFavoritesList, getTabsMask())
} }
ContactsHelper(this).getContacts { contacts -> ContactsHelper(this).getContacts { contacts ->
@ -285,14 +285,22 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
private fun showSortingDialog() { private fun showSortingDialog() {
ChangeSortingDialog(this) { ChangeSortingDialog(this) {
refreshContacts(CONTACTS_TAB_MASK or FAVORITES_TAB_MASK) refreshContacts(getTabsMask())
} }
} }
fun showFilterDialog() { fun showFilterDialog() {
FilterContactSourcesDialog(this) { FilterContactSourcesDialog(this) {
contacts_fragment?.forceListRedraw = true contacts_fragment?.forceListRedraw = true
refreshContacts(CONTACTS_TAB_MASK or FAVORITES_TAB_MASK) refreshContacts(getTabsMask())
} }
} }
fun getTabsMask(): Int {
var mask = CONTACTS_TAB_MASK
if (config.showTabs and FAVORITES_TAB_MASK != 0) {
mask += FAVORITES_TAB_MASK
}
return mask
}
} }

2
app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
View File

@ -100,7 +100,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
} }
fun refreshContacts(contacts: ArrayList<Contact>) { fun refreshContacts(contacts: ArrayList<Contact>) {
if ((config.showTabs and CONTACTS_TAB_MASK == 0 && this is ContactsFragment) || if ((config.showTabs and CONTACTS_TAB_MASK == 0 && this is ContactsFragment && activity !is InsertOrEditContactActivity) ||
(config.showTabs and FAVORITES_TAB_MASK == 0 && this is FavoritesFragment) || (config.showTabs and FAVORITES_TAB_MASK == 0 && this is FavoritesFragment) ||
(config.showTabs and GROUPS_TAB_MASK == 0 && this is GroupsFragment)) { (config.showTabs and GROUPS_TAB_MASK == 0 && this is GroupsFragment)) {
return return