diff --git a/app/build.gradle b/app/build.gradle index b214f09..c765368 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:b2167e4b2a' + implementation 'com.github.SimpleMobileTools:Simple-Commons:d1d5402388' implementation 'org.greenrobot:eventbus:3.3.1' implementation 'com.github.Armen101:AudioRecordView:1.0.4' implementation 'androidx.documentfile:documentfile:1.0.1' diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/MainActivity.kt index c5f8877..05e305e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/MainActivity.kt @@ -116,13 +116,11 @@ class MainActivity : SimpleActivity() { main_tabs_holder.onTabSelectionChanged( tabUnselectedAction = { - it.customView?.findViewById(R.id.tab_item_icon)?.applyColorFilter(getProperTextColor()) - it.customView?.findViewById(R.id.tab_item_label)?.setTextColor(getProperTextColor()) + updateBottomTabItemColors(it.customView, false) }, tabSelectedAction = { view_pager.currentItem = it.position - it.customView?.findViewById(R.id.tab_item_icon)?.applyColorFilter(getProperPrimaryColor()) - it.customView?.findViewById(R.id.tab_item_label)?.setTextColor(getProperPrimaryColor()) + updateBottomTabItemColors(it.customView, true) } ) @@ -139,15 +137,10 @@ class MainActivity : SimpleActivity() { private fun getPagerAdapter() = (view_pager.adapter as? ViewPagerAdapter) private fun setupTabColors() { - main_tabs_holder.getTabAt(getInactiveTabIndex())?.customView?.apply { - findViewById(R.id.tab_item_icon)?.applyColorFilter(getProperTextColor()) - findViewById(R.id.tab_item_label)?.setTextColor(getProperTextColor()) - } - - main_tabs_holder.getTabAt(view_pager.currentItem)?.customView?.apply { - findViewById(R.id.tab_item_icon)?.applyColorFilter(getProperPrimaryColor()) - findViewById(R.id.tab_item_label)?.setTextColor(getProperPrimaryColor()) - } + val activeView = main_tabs_holder.getTabAt(view_pager.currentItem)?.customView + val inactiveView = main_tabs_holder.getTabAt(getInactiveTabIndex())?.customView + updateBottomTabItemColors(activeView, true) + updateBottomTabItemColors(inactiveView, false) } private fun getInactiveTabIndex() = if (view_pager.currentItem == 0) 1 else 0