Merge branch 'master' into fix/android-data-dir-access

# Conflicts:
#	app/build.gradle

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 ==========
 
+Version 6.10.0 *(2021-08-27)*
+----------------------------
+
+ * Rewrote the current folder path into a 1 liner
+ * Show a save/discard prompt when exiting file editor with unsaved changes
+
 Version 6.9.3 *(2021-06-14)*
 ----------------------------
 

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.simplemobiletools.filemanager.pro"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 107
+        versionCode 108
-        versionName "6.9.3"
+        versionName "6.9.4"
         multiDexEnabled true
         setProperty("archivesBaseName", "file-manager")
         vectorDrawables.useSupportLibrary = true
@@ -58,8 +58,7 @@ android {
 }
 
 dependencies {
-//    implementation 'com.github.SimpleMobileTools:Simple-Commons:e56c724d04'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:649211e294'
-    implementation project(":commons")
     implementation 'com.github.Stericson:RootTools:df729dcb13'
     implementation 'com.github.Stericson:RootShell:1.6'
     implementation 'com.alexvasilkov:gesture-views:2.5.2'

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

@@ -547,7 +547,7 @@ class MainActivity : SimpleActivity() {
             return
         }
 
-        if (getCurrentFragment()!!.breadcrumbs.childCount <= 1) {
+        if (getCurrentFragment()!!.breadcrumbs.itemsCount <= 1) {
             if (!wasBackJustPressed && config.pressBackTwice) {
                 wasBackJustPressed = true
                 toast(R.string.press_back_again)

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt

@@ -525,7 +525,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
                 openPath(it)
             }
         } else {
-            val item = breadcrumbs.getChildAt(id).tag as FileDirItem
+            val item = breadcrumbs.getItem(id)
             openPath(item.path)
         }
     }

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

@@ -24,7 +24,11 @@
                     android:id="@+id/breadcrumbs"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/activity_margin" />
+                    android:layout_marginTop="@dimen/medium_margin"
+                    android:paddingStart="@dimen/activity_margin"
+                    android:paddingTop="@dimen/small_margin"
+                    android:paddingEnd="@dimen/small_margin"
+                    android:paddingBottom="@dimen/small_margin" />
 
                 <com.simplemobiletools.commons.views.MyTextView
                     android:id="@+id/items_placeholder"

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.5.30'
 
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

fastlane/metadata/android/en-US/changelogs/108.txt

@@ -0,0 +1,2 @@
+ * Rewrote the current folder path into a 1 liner
+ * Show a save/discard prompt when exiting file editor with unsaved changes