diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index 5ed5d380..7ef34ba2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -34,6 +34,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) appLaunched() + setupTabColors() handlePermission(PERMISSION_READ_CONTACTS) { if (it) { @@ -137,6 +138,18 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { } } + private fun setupTabColors() { + val lastUsedPage = config.lastUsedViewPagerPage + viewpager.currentItem = lastUsedPage + main_tabs_holder.apply { + background = ColorDrawable(config.backgroundColor) + setSelectedTabIndicatorColor(getAdjustedPrimaryColor()) + getTabAt(lastUsedPage)?.select() + getTabAt(lastUsedPage)?.icon?.applyColorFilter(getAdjustedPrimaryColor()) + getTabAt(getOtherViewPagerItem(lastUsedPage))?.icon?.applyColorFilter(config.textColor) + } + } + private fun getOtherViewPagerItem(used: Int) = if (used == 1) 0 else 1 private fun initFragments() { @@ -148,16 +161,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { invalidateOptionsMenu() } - val lastUsedPage = config.lastUsedViewPagerPage - viewpager.currentItem = lastUsedPage - main_tabs_holder.apply { - background = ColorDrawable(config.backgroundColor) - setSelectedTabIndicatorColor(getAdjustedPrimaryColor()) - getTabAt(lastUsedPage)?.select() - getTabAt(lastUsedPage)?.icon?.applyColorFilter(getAdjustedPrimaryColor()) - getTabAt(getOtherViewPagerItem(lastUsedPage))?.icon?.applyColorFilter(config.textColor) - } - main_tabs_holder.onTabSelectionChanged( tabUnselectedAction = { it.icon?.applyColorFilter(config.textColor)