Skip to content

Commit 2967621

Browse files
committed
fetch the proper default tab, if some tabs arent shown
1 parent 9b9d023 commit 2967621

File tree

1 file changed

+20
-5
lines changed
  • app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities

1 file changed

+20
-5
lines changed

app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
5555
private var isFirstResume = true
5656
private var isGettingContacts = false
5757
private var ignoredExportContactSources = HashSet<String>()
58-
private var handledShowTabs = 0
5958

6059
private var storedTextColor = 0
6160
private var storedBackgroundColor = 0
@@ -71,9 +70,9 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
7170
setContentView(R.layout.activity_main)
7271
appLaunched(BuildConfig.APPLICATION_ID)
7372

73+
storeStateVariables()
7474
setupTabColors()
7575
checkContactPermissions()
76-
storeStateVariables()
7776
checkWhatsNewDialog()
7877
checkDialerMigrationDialog()
7978
}
@@ -339,7 +338,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
339338
}
340339

341340
private fun setupTabColors() {
342-
handledShowTabs = config.showTabs
343341
val lastUsedPage = getDefaultTab()
344342
main_tabs_holder.apply {
345343
background = ColorDrawable(config.backgroundColor)
@@ -596,11 +594,28 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
596594
private fun getAllFragments() = arrayListOf(contacts_fragment, favorites_fragment, groups_fragment)
597595

598596
private fun getDefaultTab(): Int {
597+
val showTabsMask = config.showTabs
599598
return when (config.defaultTab) {
600599
TAB_LAST_USED -> config.lastUsedViewPagerPage
601600
TAB_CONTACTS -> 0
602-
TAB_FAVORITES -> 1
603-
else -> 2
601+
TAB_FAVORITES -> {
602+
if (showTabsMask and TAB_CONTACTS > 0) {
603+
1
604+
} else {
605+
0
606+
}
607+
}
608+
else -> {
609+
if (showTabsMask and TAB_CONTACTS > 0) {
610+
if (showTabsMask and TAB_FAVORITES > 0) {
611+
2
612+
} else {
613+
1
614+
}
615+
} else {
616+
0
617+
}
618+
}
604619
}
605620
}
606621

0 commit comments

Comments
 (0)