fix #206

Author: Raival-e

app/src/main/java/com/raival/compose/file/explorer/screen/main/MainActivityManager.kt

@@ -193,13 +193,17 @@ class MainActivityManager {
         }
     }
 
-    fun replaceCurrentTabWith(tab: Tab) {
+    fun replaceCurrentTabWith(tab: Tab, keepCurrentTabAsParent: Boolean = false) {
         val currentActiveTab = getActiveTab()
 
         // Stop and remove the active tab BEFORE state update
         currentActiveTab?.apply {
             onTabStopped()
-            onTabRemoved()
+            if (!keepCurrentTabAsParent) onTabRemoved()
+        }
+
+        if (keepCurrentTabAsParent) {
+            tab.parentTab = currentActiveTab
         }
 
         // Update the state
@@ -278,6 +282,12 @@ class MainActivityManager {
             return false
         }
 
+        // Replace with parent tab if exists
+        if (getActiveTab()!!.parentTab != null) {
+            replaceCurrentTabWith(getActiveTab()!!.parentTab!!, false)
+            return false
+        }
+
         // Replace the active tab with the home tab (if turned on in settings)
         if (getActiveTab() !is HomeTab && !globalClass.preferencesManager.skipHomeWhenTabClosed) {
             replaceCurrentTabWith(HomeTab())

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/Tab.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.launch
 
 abstract class Tab {
     var isCreated = false
+    var parentTab: Tab? = null
 
     abstract val id: Int
     abstract val header: String

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/FilesTab.kt

@@ -82,6 +82,7 @@ class FilesTab(
     var highlightedPathSegment by mutableStateOf(activeFolder)
     val currentPathSegmentsListState = LazyListState()
 
+    var showCategories by mutableStateOf(false)
     var categories = mutableStateListOf<FileListCategory>()
     var selectedCategory by mutableStateOf<FileListCategory?>(null)
 
@@ -319,7 +320,9 @@ class FilesTab(
         }
 
         // Check if the back gesture can be handled
-        handleBackGesture = runBlocking { activeFolder.hasParent() || selectedFiles.isNotEmpty() }
+        handleBackGesture = runBlocking {
+            selectedFiles.isNotEmpty() || (activeFolder.hasParent() && !shouldNavigateToParentTab())
+        }
 
         // Update the path list
         updatePathList()
@@ -355,13 +358,24 @@ class FilesTab(
             if (activeFolder is VirtualFileHolder) {
                 categories.clear()
                 categories.addAll((activeFolder as VirtualFileHolder).getCategories())
+                showCategories = categories.isNotEmpty()
+            } else {
+                showCategories = false
             }
 
             // Call any posted events
             postEvent()
         }
     }
 
+    private fun shouldNavigateToParentTab(): Boolean {
+        return parentTab isNot null
+                && activeFolder is ZipFileHolder
+                && with(activeFolder as ZipFileHolder) {
+            runBlocking { getParent()?.uniquePath == zipTree.source.getParent()?.uniquePath }
+        }
+    }
+
     suspend fun validateActiveFolder() {
         if (!activeFolder.isValid()) {
             // Try to find a valid parent folder
@@ -488,7 +502,8 @@ class FilesTab(
             val temp = arrayListOf<ContentHolder>().apply { addAll(activeFolderContent) }
 
             // Recheck the back gesture
-            handleBackGesture = activeFolder.hasParent() || selectedFiles.isNotEmpty()
+            handleBackGesture = selectedFiles.isNotEmpty()
+                    || (activeFolder.hasParent() && !shouldNavigateToParentTab())
 
             // Update the bottom bar options
             _bottomOptionsBarState.update {
@@ -515,7 +530,8 @@ class FilesTab(
     fun onSelectionChange() {
         scope.launch {
             // Recheck the back gesture
-            handleBackGesture = activeFolder.hasParent() || selectedFiles.isNotEmpty()
+            handleBackGesture =
+                selectedFiles.isNotEmpty() || (activeFolder.hasParent() && !shouldNavigateToParentTab())
 
             // Update the bottom bar options
             _bottomOptionsBarState.update {

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/ui/BreadcrumbBar.kt

@@ -50,9 +50,8 @@ import kotlin.math.max
 @Composable
 fun BreadcrumbBar(tab: FilesTab) {
     val highlightedPathListItemColor = MaterialTheme.colorScheme.primary
-    val showCategoriesRow = tab.activeFolder is VirtualFileHolder && tab.categories.isNotEmpty()
 
-    if (showCategoriesRow) {
+    if (tab.showCategories) {
         CategoriesRow(tab)
     } else if (tab.activeFolder !is VirtualFileHolder) {
         Row(

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/zip/ZipManager.kt

@@ -5,6 +5,7 @@ import com.raival.compose.file.explorer.common.isNot
 import com.raival.compose.file.explorer.common.removeIf
 import com.raival.compose.file.explorer.screen.main.tab.files.FilesTab
 import com.raival.compose.file.explorer.screen.main.tab.files.holder.LocalFileHolder
+import com.raival.compose.file.explorer.screen.main.tab.files.holder.VirtualFileHolder
 import kotlinx.coroutines.runBlocking
 
 class ZipManager {
@@ -47,11 +48,23 @@ class ZipManager {
             archiveList[existingTreeKey]?.let { existingTree ->
                 if (existingTree.timeStamp == archive.lastModified) {
                     globalClass.mainActivityManager.let { mainManager ->
-                        (mainManager.getActiveTab() as? FilesTab)?.openFolder(
-                            existingTree.createRootContentHolder()
-                        ) ?: mainManager.replaceCurrentTabWith(
-                            FilesTab(existingTree.createRootContentHolder())
-                        )
+                        val tab = mainManager.getActiveTab()
+                        if (tab is FilesTab) {
+                            if (tab.activeFolder is VirtualFileHolder) {
+                                mainManager.replaceCurrentTabWith(
+                                    tab = FilesTab(
+                                        existingTree.createRootContentHolder()
+                                    ),
+                                    keepCurrentTabAsParent = true
+                                )
+                            } else {
+                                tab.openFolder(existingTree.createRootContentHolder())
+                            }
+                        } else {
+                            mainManager.replaceCurrentTabWith(
+                                FilesTab(existingTree.createRootContentHolder())
+                            )
+                        }
                         return
                     }
                 } else {
@@ -62,11 +75,23 @@ class ZipManager {
 
         archiveList[archive] = ZipTree(archive).apply {
             globalClass.mainActivityManager.let { mainManager ->
-                (mainManager.getActiveTab() as? FilesTab)?.openFolder(
-                    createRootContentHolder()
-                ) ?: mainManager.replaceCurrentTabWith(
-                    FilesTab(createRootContentHolder())
-                )
+                val tab = mainManager.getActiveTab()
+                if (tab is FilesTab) {
+                    if (tab.activeFolder is VirtualFileHolder) {
+                        mainManager.replaceCurrentTabWith(
+                            tab = FilesTab(
+                                createRootContentHolder()
+                            ),
+                            keepCurrentTabAsParent = true
+                        )
+                    } else {
+                        tab.openFolder(createRootContentHolder())
+                    }
+                } else {
+                    mainManager.replaceCurrentTabWith(
+                        FilesTab(createRootContentHolder())
+                    )
+                }
             }
         }
     }