diff --git a/app/build.gradle b/app/build.gradle
index f5031794..22903926 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ android {
}
dependencies {
- implementation 'com.github.SimpleMobileTools:Simple-Commons:afb485c357'
+ implementation 'com.github.SimpleMobileTools:Simple-Commons:a6c22de9d6'
implementation 'com.github.tibbi:PdfViewPager:d2af24208d'
implementation 'com.github.Stericson:RootTools:df729dcb13'
implementation 'com.github.Stericson:RootShell:1.6'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bb0fca19..2e92ff37 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,14 +32,6 @@
android:configChanges="orientation"
android:exported="true">
-
-
-
-
-
-
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/DecompressActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/DecompressActivity.kt
index 886a891a..284d434e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/DecompressActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/DecompressActivity.kt
@@ -27,7 +27,7 @@ class DecompressActivity : SimpleActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_decompress)
setupOptionsMenu()
- updateMaterialActivityViews(decompress_coordinator, decompress_list, true)
+ updateMaterialActivityViews(decompress_coordinator, decompress_list, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(decompress_list, decompress_toolbar)
uri = intent.data
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt
index 2f68d060..305c5ecc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt
@@ -21,7 +21,7 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
setContentView(R.layout.activity_favorites)
setupOptionsMenu()
updateFavorites()
- updateMaterialActivityViews(manage_favorites_coordinator, manage_favorites_list, true)
+ updateMaterialActivityViews(manage_favorites_coordinator, manage_favorites_list, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(manage_favorites_list, manage_favorites_toolbar)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
index a64ac99e..31ca648d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
@@ -18,9 +18,7 @@ import android.view.MenuItem
import android.widget.ImageView
import android.widget.TextView
import androidx.appcompat.widget.SearchView
-import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.MenuItemCompat
-import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager.widget.ViewPager
import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
@@ -87,7 +85,7 @@ class MainActivity : SimpleActivity() {
storeStateVariables()
setupTabs()
- updateMaterialActivityViews(main_coordinator, null, main_tabs_holder.tabCount == 1)
+ updateMaterialActivityViews(main_coordinator, null, useTransparentNavigation = false, useTopSearchMenu = true)
setupMaterialScrollListener(null, main_toolbar)
mIsPasswordProtectionPending = config.isAppPasswordProtectionOn
@@ -117,13 +115,6 @@ class MainActivity : SimpleActivity() {
return
}
- val statusBarColor = if (getCurrentFragment()?.getScrollingView() == null) {
- getProperBackgroundColor()
- } else {
- window.statusBarColor
- }
-
- setupToolbar(main_toolbar, statusBarColor = statusBarColor, searchMenuItem = mSearchMenuItem)
refreshMenuItems()
setupTabColors()
@@ -166,7 +157,6 @@ class MainActivity : SimpleActivity() {
val favorites = config.favorites
main_toolbar.menu.apply {
- findItem(R.id.search).isVisible = currentFragment is ItemsFragment
findItem(R.id.sort).isVisible = currentFragment is ItemsFragment
findItem(R.id.change_view_type).isVisible = currentFragment !is StorageFragment
@@ -429,7 +419,6 @@ class MainActivity : SimpleActivity() {
(it as? ItemOperationsListener)?.finishActMode()
}
refreshMenuItems()
- updateStatusBarChanger()
}
})
main_view_pager.currentItem = config.lastUsedViewPagerPage
@@ -480,21 +469,6 @@ class MainActivity : SimpleActivity() {
)
main_tabs_holder.beGoneIf(main_tabs_holder.tabCount == 1)
- main_tabs_holder.onGlobalLayout {
- updateStatusBarChanger()
- }
- }
-
- private fun updateStatusBarChanger() {
- setupMaterialScrollListener(getCurrentFragment()?.getScrollingView(), main_toolbar)
- 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() {
@@ -506,11 +480,9 @@ class MainActivity : SimpleActivity() {
updateBottomTabItemColors(inactiveView, false, getDeselectedTabDrawableIds()[index])
}
- if (main_tabs_holder.isVisible()) {
- val bottomBarColor = getBottomNavigationBackgroundColor()
- main_tabs_holder.setBackgroundColor(bottomBarColor)
- updateNavigationBarColor(bottomBarColor)
- }
+ val bottomBarColor = getBottomNavigationBackgroundColor()
+ updateNavigationBarColor(bottomBarColor)
+ main_tabs_holder.setBackgroundColor(bottomBarColor)
}
private fun getTabIcon(position: Int): Drawable {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
index c58bd1ee..d5fe92b2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt
@@ -44,7 +44,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
setContentView(R.layout.activity_mimetypes)
setupOptionsMenu()
refreshMenuItems()
- updateMaterialActivityViews(mimetypes_coordinator, mimetypes_list, true)
+ updateMaterialActivityViews(mimetypes_coordinator, mimetypes_list, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(mimetypes_list, mimetypes_toolbar)
currentMimeType = intent.getStringExtra(SHOW_MIMETYPE) ?: return
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt
index 85da3b75..03183d7a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt
@@ -47,7 +47,7 @@ class ReadTextActivity : SimpleActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_read_text)
setupOptionsMenu()
- updateMaterialActivityViews(read_text_coordinator, read_text_view, true)
+ updateMaterialActivityViews(read_text_coordinator, read_text_view, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(read_text_holder, read_text_toolbar)
searchQueryET = findViewById(R.id.search_query)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
index 59c2d577..64f6bcde 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
@@ -23,7 +23,7 @@ class SettingsActivity : SimpleActivity() {
isMaterialActivity = true
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_settings)
- updateMaterialActivityViews(settings_coordinator, settings_holder, true)
+ updateMaterialActivityViews(settings_coordinator, settings_holder, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
index 2e28cbe7..1da7e61d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
@@ -557,6 +557,4 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
override fun selectedPaths(paths: ArrayList) {
(activity as MainActivity).pickedPaths(paths)
}
-
- override fun getScrollingView() = items_list
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt
index 9b816250..70095ab0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt
@@ -3,7 +3,6 @@ package com.simplemobiletools.filemanager.pro.fragments
import android.content.Context
import android.util.AttributeSet
import android.widget.RelativeLayout
-import androidx.core.view.ScrollingView
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST
import com.simplemobiletools.filemanager.pro.R
@@ -67,6 +66,4 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
abstract fun onResume(textColor: Int)
abstract fun refreshFragment()
-
- abstract fun getScrollingView(): ScrollingView?
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
index ed3395d2..5f6ab818 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
@@ -230,6 +230,4 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
override fun finishActMode() {
getRecyclerAdapter()?.finishActMode()
}
-
- override fun getScrollingView() = recents_list
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt
index ad45350e..eb835a57 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt
@@ -221,6 +221,4 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
}
}
}
-
- override fun getScrollingView() = storage_nested_scrollview
}
diff --git a/app/src/main/res/menu/cab.xml b/app/src/main/res/menu/cab.xml
index 7932297b..00129039 100644
--- a/app/src/main/res/menu/cab.xml
+++ b/app/src/main/res/menu/cab.xml
@@ -2,25 +2,29 @@