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

fix #514, make sure we always show proper tab icons

Browse Source
This commit is contained in:
tibbi
2023-01-04 13:03:11 +01:00
parent 1d2f26e304
commit 1d6ce0eff2
1 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
View File

@@ -97,6 +97,12 @@ class MainActivity : SimpleActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (storedShowTabs != config.showTabs) {
config.lastUsedViewPagerPage = 0
System.exit(0)
return
}
val statusBarColor = if (getCurrentFragment()?.getScrollingView() == null) { val statusBarColor = if (getCurrentFragment()?.getScrollingView() == null) {
getProperBackgroundColor() getProperBackgroundColor()
} else { } else {
@@ -116,10 +122,6 @@ class MainActivity : SimpleActivity() {
} }
if (!isSearchOpen) { if (!isSearchOpen) {
if (storedShowTabs != config.showTabs) {
System.exit(0)
return
}
refreshItems(true) refreshItems(true)
} }
@@ -296,19 +298,45 @@ class MainActivity : SimpleActivity() {
updateNavigationBarColor(bottomBarColor) updateNavigationBarColor(bottomBarColor)
} }
private fun getInactiveTabIndexes(activeIndex: Int) = (0 until tabsList.size).filter { it != activeIndex } private fun getInactiveTabIndexes(activeIndex: Int) = (0 until main_tabs_holder.tabCount).filter { it != activeIndex }
private fun getSelectedTabDrawableIds() = arrayOf( private fun getSelectedTabDrawableIds(): ArrayList<Int> {
R.drawable.ic_person_vector, val showTabs = config.showTabs
R.drawable.ic_star_vector, val icons = ArrayList<Int>()
R.drawable.ic_clock_filled_vector
)
private fun getDeselectedTabDrawableIds() = arrayOf( if (showTabs and TAB_CONTACTS != 0) {
R.drawable.ic_person_outline_vector, icons.add(R.drawable.ic_person_vector)
R.drawable.ic_star_outline_vector, }
R.drawable.ic_clock_vector
) if (showTabs and TAB_FAVORITES != 0) {
icons.add(R.drawable.ic_star_vector)
}
if (showTabs and TAB_CALL_HISTORY != 0) {
icons.add(R.drawable.ic_clock_filled_vector)
}
return icons
}
private fun getDeselectedTabDrawableIds(): ArrayList<Int> {
val showTabs = config.showTabs
val icons = ArrayList<Int>()
if (showTabs and TAB_CONTACTS != 0) {
icons.add(R.drawable.ic_person_outline_vector)
}
if (showTabs and TAB_FAVORITES != 0) {
icons.add(R.drawable.ic_star_outline_vector)
}
if (showTabs and TAB_CALL_HISTORY != 0) {
icons.add(R.drawable.ic_clock_vector)
}
return icons
}
private fun initFragments() { private fun initFragments() {
view_pager.offscreenPageLimit = 2 view_pager.offscreenPageLimit = 2