remove PreferencesManager's sections for better accessibility

Author: Raival-e

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

@@ -21,7 +21,6 @@ import com.raival.compose.file.explorer.coil.apk.ApkFileDecoder
 import com.raival.compose.file.explorer.coil.pdf.PdfFileDecoder
 import com.raival.compose.file.explorer.common.FileExplorerLogger
 import com.raival.compose.file.explorer.screen.main.MainActivityManager
-import com.raival.compose.file.explorer.screen.main.tab.files.FilesTabManager
 import com.raival.compose.file.explorer.screen.main.tab.files.coil.DocumentFileMapper
 import com.raival.compose.file.explorer.screen.main.tab.files.holder.LocalFileHolder
 import com.raival.compose.file.explorer.screen.main.tab.files.task.TaskManager
@@ -83,7 +82,6 @@ class App : Application(), coil3.SingletonImageLoader.Factory {
 
     val textEditorManager: TextEditorManager by lazy { TextEditorManager().also { setupTextMate() } }
     val mainActivityManager: MainActivityManager by lazy { MainActivityManager().also { it.setup() } }
-    val filesTabManager: FilesTabManager by lazy { FilesTabManager() }
     val preferencesManager: PreferencesManager by lazy { PreferencesManager() }
     val viewersManager: ViewersManager by lazy {
         setupTextMate()

app/src/main/java/com/raival/compose/file/explorer/common/Utils.kt

@@ -653,7 +653,7 @@ fun Int.isMultipleOf100(): Boolean {
 
 @SuppressLint("SimpleDateFormat")
 fun Long.toFormattedDate(): String =
-    SimpleDateFormat(globalClass.preferencesManager.appearancePrefs.dateTimeFormat).format(this)
+    SimpleDateFormat(globalClass.preferencesManager.dateTimeFormat).format(this)
 
 fun Long.toFormattedSize(): String {
     if (this <= 0) return "0 B"

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

@@ -104,7 +104,7 @@ class MainActivity : BaseActivity() {
 
                     StartupTabsSettingsScreen(mainActivityState.showStartupTabsDialog) {
                         mainActivityManager.toggleStartupTabsDialog(false)
-                        globalClass.preferencesManager.behaviorPrefs.startupTabs = it.toJson()
+                        globalClass.preferencesManager.startupTabs = it.toJson()
                     }
 
                     Column(Modifier.fillMaxSize()) {

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

@@ -215,7 +215,7 @@ class MainActivityManager {
         }
 
         // Replace the active tab with the home tab (if turned on in settings)
-        if (getActiveTab() !is HomeTab && !globalClass.preferencesManager.behaviorPrefs.skipHomeWhenTabClosed) {
+        if (getActiveTab() !is HomeTab && !globalClass.preferencesManager.skipHomeWhenTabClosed) {
             replaceCurrentTabWith(HomeTab())
             return false
         }
@@ -267,7 +267,7 @@ class MainActivityManager {
     fun loadStartupTabs() {
         managerScope.launch {
             val startupTabs: StartupTabs =
-                fromJson(globalClass.preferencesManager.behaviorPrefs.startupTabs)
+                fromJson(globalClass.preferencesManager.startupTabs)
                     ?: StartupTabs.default()
 
             val tabs = arrayListOf<Tab>()

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

@@ -270,7 +270,7 @@ class FilesTab(
             val newContent =
                 (activeFolder as LocalFileHolder).file.listFiles()?.toCollection(arrayListOf())
                     ?.apply {
-                        if (!globalClass.preferencesManager.fileListPrefs.showHiddenFiles) {
+                        if (!globalClass.preferencesManager.showHiddenFiles) {
                             removeIf { it.name.startsWith(".") }
                         }
                     }

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

@@ -103,7 +103,7 @@ abstract class ContentHolder {
     }
 
     open suspend fun listSortedContent(): ArrayList<out ContentHolder> {
-        val sortingPrefs = globalClass.preferencesManager.filesSortingPrefs.getSortingPrefsFor(this)
+        val sortingPrefs = globalClass.preferencesManager.getSortingPrefsFor(this)
 
         return listContent().apply {
             when (sortingPrefs.sortMethod) {
@@ -122,7 +122,7 @@ abstract class ContentHolder {
 
             if (sortingPrefs.showFoldersFirst) sortWith(sortFoldersFirst)
 
-            if (!globalClass.preferencesManager.fileListPrefs.showHiddenFiles) {
+            if (!globalClass.preferencesManager.showHiddenFiles) {
                 removeIf { it.isHidden() }
             }
         }

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

@@ -32,7 +32,7 @@ class LocalFileHolder(val file: File) : ContentHolder() {
         buildString {
             append(lastModified.toFormattedDate())
             if (file.isDirectory) {
-                if (globalClass.preferencesManager.fileListPrefs.showFolderContentCount && file.canRead()) {
+                if (globalClass.preferencesManager.showFolderContentCount && file.canRead()) {
                     append(separator)
                     append(getFormattedFileCount())
                 }

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

@@ -181,7 +181,7 @@ class ZipFileHolder(
         return buildString {
             append(node.lastModified.toFormattedDate())
             if (node.isDirectory) {
-                if (globalClass.preferencesManager.fileListPrefs.showFolderContentCount) {
+                if (globalClass.preferencesManager.showFolderContentCount) {
                     append(separator)
                     append(getFormattedFileCount())
                 }

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

@@ -248,7 +248,7 @@ object StorageProvider {
         return videoFiles
     }
 
-    fun getBookmarks() = globalClass.filesTabManager.bookmarks
+    fun getBookmarks() = globalClass.preferencesManager.bookmarks
         .map { LocalFileHolder(File(it)) } as ArrayList<LocalFileHolder>
 
     fun getAudioFiles(): ArrayList<LocalFileHolder> {
@@ -287,7 +287,7 @@ object StorageProvider {
     ): ArrayList<LocalFileHolder> {
         val recentFiles = ArrayList<LocalFileHolder>()
         val contentResolver: ContentResolver = globalClass.contentResolver
-        val showHiddenFiles = globalClass.preferencesManager.fileListPrefs.showHiddenFiles
+        val showHiddenFiles = globalClass.preferencesManager.showHiddenFiles
 
         val uri: Uri = MediaStore.Files.getContentUri("external")