From c4647f69118e3e5bdefc8c934ab050dec7b6fed4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 31 Dec 2022 10:20:20 +0100 Subject: [PATCH] updating commons and min OS to 6 --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 9 +++++++++ .../filemanager/pro/activities/MainActivity.kt | 2 +- .../filemanager/pro/activities/PDFViewerActivity.kt | 1 - app/src/main/res/menu/menu.xml | 4 ++-- app/src/main/res/menu/menu_editor.xml | 4 ++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7cdc449a..e1a72bde 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { defaultConfig { applicationId "com.simplemobiletools.filemanager.pro" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 33 versionCode 129 versionName "6.14.4" @@ -64,7 +64,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:b452494768' + implementation 'com.github.SimpleMobileTools:Simple-Commons:7e489f7121' 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 65db2b77..bb0fca19 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,7 @@ @@ -116,6 +119,7 @@ @@ -127,6 +131,7 @@ @@ -139,6 +144,7 @@ @@ -151,18 +157,21 @@ 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 a8b3c794..57be24b4 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 @@ -478,7 +478,7 @@ class MainActivity : SimpleActivity() { } val bottomBarColor = if (main_tabs_holder.isGone()) { - config.navigationBarColor + getProperBackgroundColor() } else { getBottomNavigationBackgroundColor() } diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt index cd63bf96..8a812c85 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt @@ -29,7 +29,6 @@ class PDFViewerActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { showTransparentTop = true - showTransparentNavigation = true super.onCreate(savedInstanceState) setContentView(R.layout.activity_pdf_viewer) diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index 0380da9f..2c737750 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -71,9 +71,9 @@ app:showAsAction="never" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" />