[feat] Update MyDir view.

Author: tanpengcheng

app/src/main/java/com/tans/tfiletransporter/file/FileUtils.kt

@@ -85,4 +85,17 @@ fun List<FileLeaf.CommonFileLeaf>.toExploreFiles(): List<FileExploreFile> {
             lastModify = it.lastModified
         )
     }
+}
+
+fun File.hasTargetParent(targetParent: File): Boolean {
+    val parent = parentFile
+    return if (parent == null) {
+        false
+    } else {
+        if (parent.canonicalPath == targetParent.canonicalPath) {
+            true
+        } else {
+            parent.hasTargetParent(targetParent)
+        }
+    }
 }

app/src/main/java/com/tans/tfiletransporter/file/LocalFileExt.kt

@@ -1,27 +1,29 @@
 package com.tans.tfiletransporter.file
 
+import android.content.Context
+import android.os.Environment
 import java.io.File
 
 
-fun File.toFileLeaf(rootDirString: String): FileLeaf.CommonFileLeaf {
+fun File.toFileLeaf(): FileLeaf.CommonFileLeaf {
     return FileLeaf.CommonFileLeaf(
         name = name,
-        path = canonicalPath.removePrefix(rootDirString),
+        path = canonicalPath,
         size = length(),
         lastModified = lastModified()
     )
 }
 
-fun File.toDirLeaf(rootDirString: String): FileLeaf.DirectoryFileLeaf {
+fun File.toDirLeaf(): FileLeaf.DirectoryFileLeaf {
     return FileLeaf.DirectoryFileLeaf(
         name = name,
-        path = canonicalPath.removePrefix(rootDirString),
+        path = canonicalPath,
         childrenCount = listFiles()?.size?.toLong() ?: 0L,
         lastModified = lastModified()
     )
 }
 
-fun File.childrenLeafs(rootDirString: String): Pair<List<FileLeaf.DirectoryFileLeaf>, List<FileLeaf.CommonFileLeaf>> {
+fun File.childrenLeafs(): Pair<List<FileLeaf.DirectoryFileLeaf>, List<FileLeaf.CommonFileLeaf>> {
     val children = listFiles() ?: emptyArray<File>()
     val resultFiles = mutableListOf<FileLeaf.CommonFileLeaf>()
     val resultDirs = mutableListOf<FileLeaf.DirectoryFileLeaf>()
@@ -30,10 +32,10 @@ fun File.childrenLeafs(rootDirString: String): Pair<List<FileLeaf.DirectoryFileL
             if (c.canRead()) {
                 if (c.isFile) {
                     if (c.length() > 0) {
-                        resultFiles.add(c.toFileLeaf(rootDirString))
+                        resultFiles.add(c.toFileLeaf())
                     }
                 } else {
-                    resultDirs.add(c.toDirLeaf(rootDirString))
+                    resultDirs.add(c.toDirLeaf())
                 }
             }
         } catch (e: Throwable) {
@@ -43,35 +45,42 @@ fun File.childrenLeafs(rootDirString: String): Pair<List<FileLeaf.DirectoryFileL
     return resultDirs to resultFiles
 }
 
-fun createLocalRootTree(rootFile: File): FileTree {
+fun createLocalRootTree(context: Context): FileTree {
     val fileSeparator = File.separator
-    return if (rootFile.canRead()) {
-        val (dirLeafs, fileLeafs) = rootFile.childrenLeafs(rootFile.canonicalPath)
-        FileTree(
-            dirLeafs = dirLeafs,
-            fileLeafs = fileLeafs,
-            path = fileSeparator,
-            parentTree = null
+    val defaultStorageFile = Environment.getExternalStorageDirectory()
+    val othersSdCardFiles =
+        getSdCardPaths(context, true).map { File(it) }.filter { !defaultStorageFile.hasTargetParent(it) }
+    val defaultStorageLeaf = if (defaultStorageFile.canRead()) {
+        listOf(
+            FileLeaf.DirectoryFileLeaf(
+                name = "Default Storage",
+                path = defaultStorageFile.canonicalPath,
+                childrenCount = defaultStorageFile.listFiles()?.size?.toLong() ?: 0L,
+                lastModified = defaultStorageFile.lastModified()
+            )
         )
     } else {
-        FileTree(
-            dirLeafs = emptyList(),
-            fileLeafs = emptyList(),
-            path = fileSeparator,
-            parentTree = null
-        )
+        emptyList()
+    }
+    val sdCardLeafs = othersSdCardFiles.map {
+        it.toDirLeaf()
     }
+    return FileTree(
+        dirLeafs = defaultStorageLeaf + sdCardLeafs,
+        fileLeafs = emptyList(),
+        path = fileSeparator,
+        parentTree = null
+    )
 }
 
 fun FileTree.newLocalSubTree(
-    dirLeaf: FileLeaf.DirectoryFileLeaf,
-    rootFile: File): FileTree {
-    val file = File(rootFile, dirLeaf.path)
-    val (dirLeafs, fileLeafs) = file.childrenLeafs(rootFile.canonicalPath)
+    dirLeaf: FileLeaf.DirectoryFileLeaf): FileTree {
+    val file = File(dirLeaf.path)
+    val (dirLeafs, fileLeafs) = file.childrenLeafs()
     return FileTree(
         dirLeafs = dirLeafs,
         fileLeafs = fileLeafs,
-        path = file.canonicalPath.removePrefix(rootFile.canonicalPath),
+        path = file.canonicalPath,
         parentTree = this
     )
 }

app/src/main/java/com/tans/tfiletransporter/ui/activity/filetransport/MyDirFragment.kt

@@ -43,10 +43,6 @@ import kotlin.math.min
 
 class MyDirFragment : BaseFragment<MyDirFragmentBinding, MyDirFragment.Companion.MyDirFragmentState>(R.layout.my_dir_fragment, MyDirFragmentState()) {
 
-    private val rootDir: File by lazy {
-        (requireActivity() as FileTransportActivity).rootDirFile
-    }
-
     private val recyclerViewScrollChannel = Channel<Int>(1)
 
     private val folderPositionDeque: Deque<Int> = ArrayDeque()
@@ -73,7 +69,7 @@ class MyDirFragment : BaseFragment<MyDirFragmentBinding, MyDirFragment.Companion
     override fun initViews(binding: MyDirFragmentBinding) {
         launch(Dispatchers.IO) {
             updateState {
-                it.copy(fileTree = createLocalRootTree(rootDir))
+                it.copy(fileTree = createLocalRootTree(requireContext()))
             }.await()
         }
 
@@ -121,7 +117,7 @@ class MyDirFragment : BaseFragment<MyDirFragmentBinding, MyDirFragment.Companion
                             folderPositionDeque.push(i)
                             updateState { oldState ->
                                 oldState.copy(
-                                    fileTree = oldState.fileTree.newLocalSubTree(data, rootDir),
+                                    fileTree = oldState.fileTree.newLocalSubTree(data),
                                     selectedFiles = emptySet()
                                 )
                             }.await()
@@ -220,15 +216,15 @@ class MyDirFragment : BaseFragment<MyDirFragmentBinding, MyDirFragment.Companion
                     val oldTree = oldState.fileTree
                     if (oldTree.isRootFileTree()) {
                         oldState.copy(
-                            fileTree = createLocalRootTree(rootDir),
+                            fileTree = createLocalRootTree(requireContext()),
                             selectedFiles = emptySet()
                         )
                     } else {
                         val parentTree = oldTree.parentTree
                         val dirLeaf = parentTree?.dirLeafs?.find { it.path == oldTree.path }
                         if (parentTree != null && dirLeaf != null) {
                             oldState.copy(
-                                fileTree = parentTree.newLocalSubTree(dirLeaf, rootDir),
+                                fileTree = parentTree.newLocalSubTree(dirLeaf),
                                 selectedFiles = emptySet()
                             )
                         } else {