moving main screen tabs at the bottom

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

@@ -12,9 +12,10 @@ import android.graphics.drawable.Icon
 import android.graphics.drawable.LayerDrawable
 import android.net.Uri
 import android.os.Bundle
-import android.os.Handler
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.ImageView
+import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.MenuItemCompat
@@ -75,7 +76,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
         appLaunched(BuildConfig.APPLICATION_ID)
 
         storeStateVariables()
-        setupTabColors()
+        setupTabs()
         checkContactPermissions()
         checkWhatsNewDialog()
     }
@@ -122,7 +123,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             it?.setupColors(getProperTextColor(), properPrimaryColor)
         }
 
-        updateTabColors()
+        setupTabColors()
 
         val configStartNameWithSurname = config.startNameWithSurname
         if (storedStartNameWithSurname != configStartNameWithSurname) {
@@ -138,7 +139,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
         }
 
         if (werePermissionsHandled && !isFirstResume) {
-            if (viewpager.adapter == null) {
+            if (view_pager.adapter == null) {
                 initFragments()
             } else {
                 refreshContacts(ALL_TABS_MASK)
@@ -159,7 +160,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
     override fun onPause() {
         super.onPause()
         storeStateVariables()
-        config.lastUsedViewPagerPage = viewpager.currentItem
+        config.lastUsedViewPagerPage = view_pager.currentItem
     }
 
     override fun onDestroy() {
@@ -261,13 +262,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
         })
     }
 
-    private fun updateTabColors() {
-        getInactiveTabIndexes(viewpager.currentItem).forEach {
-            main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
-        }
-        main_tabs_holder.getTabAt(viewpager.currentItem)?.icon?.applyColorFilter(getProperPrimaryColor())
-    }
-
     private fun getSearchString(): Int {
         return when (getCurrentFragment()) {
             favorites_fragment -> R.string.search_favorites
@@ -322,28 +316,28 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             fragments.add(groups_fragment)
         }
 
-        return fragments.getOrNull(viewpager.currentItem)
+        return fragments.getOrNull(view_pager.currentItem)
     }
 
     private fun setupTabColors() {
-        val lastUsedPage = getDefaultTab()
+        val activeView = main_tabs_holder.getTabAt(view_pager.currentItem)?.customView
-        main_tabs_holder.apply {
+        updateBottomTabItemColors(activeView, true)
-            background = ColorDrawable(getProperBackgroundColor())
-            setSelectedTabIndicatorColor(getProperPrimaryColor())
-            getTabAt(lastUsedPage)?.select()
-            getTabAt(lastUsedPage)?.icon?.applyColorFilter(getProperPrimaryColor())
 
-            getInactiveTabIndexes(lastUsedPage).forEach {
+        getInactiveTabIndexes(view_pager.currentItem).forEach { index ->
-                getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
+            val inactiveView = main_tabs_holder.getTabAt(index)?.customView
-            }
+            updateBottomTabItemColors(inactiveView, false)
         }
+
+        val bottomBarColor = getBottomTabsBackgroundColor()
+        main_tabs_holder.setBackgroundColor(bottomBarColor)
+        updateNavigationBarColor(bottomBarColor)
     }
 
     private fun getInactiveTabIndexes(activeIndex: Int) = (0 until tabsList.size).filter { it != activeIndex }
 
     private fun initFragments() {
-        viewpager.offscreenPageLimit = tabsList.size - 1
+        view_pager.offscreenPageLimit = tabsList.size - 1
-        viewpager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+        view_pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
             override fun onPageScrollStateChanged(state: Int) {
                 if (isSearchOpen) {
                     getCurrentFragment()?.onSearchQueryChanged("")
@@ -362,54 +356,51 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             }
         })
 
-        viewpager.onGlobalLayout {
+        view_pager.onGlobalLayout {
             refreshContacts(ALL_TABS_MASK)
         }
 
-        main_tabs_holder.onTabSelectionChanged(
-            tabUnselectedAction = {
-                it.icon?.applyColorFilter(getProperTextColor())
-            },
-            tabSelectedAction = {
-                if (isSearchOpen) {
-                    getCurrentFragment()?.onSearchQueryChanged("")
-                    searchMenuItem?.collapseActionView()
-                }
-                viewpager.currentItem = it.position
-                it.icon?.applyColorFilter(getProperPrimaryColor())
-            }
-        )
-
         if (intent?.action == Intent.ACTION_VIEW && intent.data != null) {
             tryImportContactsFromFile(intent.data!!)
             intent.data = null
         }
 
+        main_dialpad_button.setOnClickListener {
+            launchDialpad()
+        }
+    }
+
+    private fun setupTabs() {
         main_tabs_holder.removeAllTabs()
-        var skippedTabs = 0
         tabsList.forEachIndexed { index, value ->
-            if (config.showTabs and value == 0) {
+            if (config.showTabs and value != 0) {
-                skippedTabs++
+                main_tabs_holder.newTab().setCustomView(R.layout.bottom_tablayout_item).apply {
-            } else {
+                    customView?.findViewById<ImageView>(R.id.tab_item_icon)?.setImageDrawable(getTabIcon(index))
-                val tab = main_tabs_holder.newTab().setIcon(getTabIcon(index))
+                    customView?.findViewById<TextView>(R.id.tab_item_label)?.text = getTabLabel(index)
-                tab.contentDescription = getTabContentDescription(index)
+                    main_tabs_holder.addTab(this)
-                main_tabs_holder.addTab(tab, index - skippedTabs, getDefaultTab() == index - skippedTabs)
+                }
             }
         }
 
+        main_tabs_holder.onTabSelectionChanged(
+            tabUnselectedAction = {
+                updateBottomTabItemColors(it.customView, false)
+            },
+            tabSelectedAction = {
+                view_pager.currentItem = it.position
+                updateBottomTabItemColors(it.customView, true)
+            }
+        )
+
         // selecting the proper tab sometimes glitches, add an extra selector to make sure we have it right
-        main_tabs_holder.onGlobalLayout {
+        /*main_tabs_holder.onGlobalLayout {
             Handler().postDelayed({
                 main_tabs_holder.getTabAt(getDefaultTab())?.select()
                 invalidateOptionsMenu()
             }, 100L)
-        }
+        }*/
 
-        main_tabs_holder.beVisibleIf(skippedTabs < tabsList.size - 1)
+        main_tabs_holder.beGoneIf(main_tabs_holder.tabCount == 1)
-
-        main_dialpad_button.setOnClickListener {
-            launchDialpad()
-        }
     }
 
     private fun showSortingDialog(showCustomSorting: Boolean) {
@@ -579,10 +570,9 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
 
         isGettingContacts = true
 
-        if (viewpager.adapter == null) {
+        if (view_pager.adapter == null) {
-            viewpager.adapter = ViewPagerAdapter(this, tabsList, config.showTabs)
+            view_pager.adapter = ViewPagerAdapter(this, tabsList, config.showTabs)
-            viewpager.currentItem = getDefaultTab()
+            view_pager.currentItem = getDefaultTab()
-            updateTabColors()
         }
 
         ContactsHelper(this).getContacts { contacts ->

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

@@ -73,7 +73,7 @@ open class SimpleActivity : BaseSimpleActivity() {
         return resources.getColoredDrawableWithColor(drawableId, getProperTextColor())
     }
 
-    protected fun getTabContentDescription(position: Int): String {
+    protected fun getTabLabel(position: Int): String {
         val stringId = when (position) {
             LOCATION_CONTACTS_TAB -> R.string.contacts_tab
             LOCATION_FAVORITES_TAB -> R.string.favorites_tab

app/src/main/res/layout/activity_main.xml

@@ -5,27 +5,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/main_tabs_holder"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        app:elevation="6dp"
-        app:tabIndicatorColor="@android:color/white"
-        app:tabIndicatorHeight="2dp"
-        app:tabMinWidth="150dp"
-        app:tabSelectedTextColor="@android:color/white" />
-
     <com.simplemobiletools.commons.views.MyViewPager
-        android:id="@+id/viewpager"
+        android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/main_tabs_holder" />
+        android:layout_above="@+id/main_tabs_holder" />
 
     <ImageView
         android:id="@+id/main_dialpad_button"
         android:layout_width="@dimen/dialpad_button_size"
         android:layout_height="@dimen/dialpad_button_size"
-        android:layout_alignParentBottom="true"
+        android:layout_above="@+id/main_tabs_holder"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/activity_margin"
         android:background="@drawable/circle_background"
@@ -34,4 +24,13 @@
         android:padding="@dimen/activity_margin"
         android:src="@drawable/ic_dialpad_vector" />
 
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/main_tabs_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        app:tabIndicator="@null"
+        app:tabMinWidth="150dp"
+        app:tabRippleColor="@null" />
+
 </RelativeLayout>