fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-02-07 23:48:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

properly handle showing the app with 1 tab only too

Browse Source
This commit is contained in:
tibbi 2022-12-31 13:05:44 +01:00
parent 0d2486a7eb
commit 56911478ae
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
View File

@ -18,7 +18,9 @@ import android.view.MenuItem
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.MenuItemCompat import androidx.core.view.MenuItemCompat
import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog
@ -73,7 +75,6 @@ class MainActivity : SimpleActivity() {
appLaunched(BuildConfig.APPLICATION_ID) appLaunched(BuildConfig.APPLICATION_ID)
setupOptionsMenu() setupOptionsMenu()
refreshMenuItems() refreshMenuItems()
updateMaterialActivityViews(main_coordinator, main_holder, false)
mTabsToShow = getTabsList() mTabsToShow = getTabsList()
if (!config.wasStorageAnalysisTabAdded && isOreoPlus()) { if (!config.wasStorageAnalysisTabAdded && isOreoPlus()) {
@ -85,6 +86,10 @@ class MainActivity : SimpleActivity() {
storeStateVariables() storeStateVariables()
setupTabs() setupTabs()
updateMaterialActivityViews(main_coordinator, null, main_tabs_holder.tabCount == 1)
setupMaterialScrollListener(null, main_toolbar)
mIsPasswordProtectionPending = config.isAppPasswordProtectionOn mIsPasswordProtectionPending = config.isAppPasswordProtectionOn
if (savedInstanceState == null) { if (savedInstanceState == null) {
@ -463,16 +468,13 @@ class MainActivity : SimpleActivity() {
} }
} }
main_tabs_holder.onTabSelectionChanged( main_tabs_holder.onTabSelectionChanged(tabUnselectedAction = {
tabUnselectedAction = {
updateBottomTabItemColors(it.customView, false) updateBottomTabItemColors(it.customView, false)
}, }, tabSelectedAction = {
tabSelectedAction = {
closeSearch() closeSearch()
main_view_pager.currentItem = it.position main_view_pager.currentItem = it.position
updateBottomTabItemColors(it.customView, true) updateBottomTabItemColors(it.customView, true)
} })
)
main_tabs_holder.beGoneIf(main_tabs_holder.tabCount == 1) main_tabs_holder.beGoneIf(main_tabs_holder.tabCount == 1)
main_tabs_holder.onGlobalLayout { main_tabs_holder.onGlobalLayout {
@ -483,6 +485,13 @@ class MainActivity : SimpleActivity() {
private fun updateStatusBarChanger() { private fun updateStatusBarChanger() {
setupMaterialScrollListener(getCurrentFragment()?.getScrollingView(), main_toolbar) setupMaterialScrollListener(getCurrentFragment()?.getScrollingView(), main_toolbar)
updateStatusBarOnPageChange() updateStatusBarOnPageChange()
if (main_tabs_holder.tabCount == 1) {
val scrollingView = getCurrentFragment()?.getScrollingView() as? RecyclerView
scrollingView?.setPadding(scrollingView.paddingLeft, scrollingView.paddingTop, scrollingView.paddingRight, navigationBarHeight)
(getCurrentFragment()?.items_fab?.layoutParams as? CoordinatorLayout.LayoutParams)?.bottomMargin =
navigationBarHeight + resources.getDimension(R.dimen.activity_margin).toInt()
}
} }
private fun setupTabColors() { private fun setupTabColors() {
@ -494,15 +503,12 @@ class MainActivity : SimpleActivity() {
updateBottomTabItemColors(inactiveView, false) updateBottomTabItemColors(inactiveView, false)
} }
val bottomBarColor = if (main_tabs_holder.isGone()) { if (main_tabs_holder.isVisible()) {
getProperBackgroundColor() val bottomBarColor = getBottomNavigationBackgroundColor()
} else {
getBottomNavigationBackgroundColor()
}
main_tabs_holder.setBackgroundColor(bottomBarColor) main_tabs_holder.setBackgroundColor(bottomBarColor)
updateNavigationBarColor(bottomBarColor) updateNavigationBarColor(bottomBarColor)
} }
}
private fun getTabIcon(position: Int): Drawable { private fun getTabIcon(position: Int): Drawable {
val drawableId = when (position) { val drawableId = when (position) {

4
app/src/main/res/layout/activity_main.xml
View File

@ -17,9 +17,7 @@
android:id="@+id/main_holder" android:id="@+id/main_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize" android:layout_marginTop="?attr/actionBarSize">
android:fillViewport="true"
android:scrollbars="none">
<com.simplemobiletools.commons.views.MyViewPager <com.simplemobiletools.commons.views.MyViewPager
android:id="@+id/main_view_pager" android:id="@+id/main_view_pager"