enhance gallery mode (#152)

Author: Raival-e

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

@@ -3,8 +3,10 @@ package com.raival.compose.file.explorer.screen.main.tab.files.misc
 import com.raival.compose.file.explorer.App.Companion.globalClass
 
 data class ViewConfigs(
-    val viewType: ViewType = ViewType.COLUMNS,
+    val viewType: ViewType = ViewType.LIST,
     val columnCount: Int = 1,
     val cropThumbnails: Boolean = false,
+    val galleryMode: Boolean = false,
+    val hideMediaNames: Boolean = false,
     val itemSize: Int = globalClass.preferencesManager.itemSize
 )

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

@@ -1,5 +1,5 @@
 package com.raival.compose.file.explorer.screen.main.tab.files.misc
 
 enum class ViewType {
-    COLUMNS, GRID
+    LIST, GRID
 }

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

@@ -64,6 +64,8 @@ import com.raival.compose.file.explorer.common.ui.Space
 import com.raival.compose.file.explorer.screen.main.tab.files.FilesTab
 import com.raival.compose.file.explorer.screen.main.tab.files.coil.canUseCoil
 import com.raival.compose.file.explorer.screen.main.tab.files.holder.ContentHolder
+import com.raival.compose.file.explorer.screen.main.tab.files.misc.FileMimeType.imageFileType
+import com.raival.compose.file.explorer.screen.main.tab.files.misc.FileMimeType.videoFileType
 import com.raival.compose.file.explorer.screen.main.tab.files.misc.ViewConfigs
 import com.raival.compose.file.explorer.screen.main.tab.files.misc.ViewType
 import com.raival.compose.file.explorer.screen.preferences.constant.FileItemSizeMap.getFileListFontSize
@@ -170,7 +172,7 @@ private fun LoadingOverlay(tab: FilesTab) {
 @Composable
 private fun FilesListContent(tab: FilesTab) {
     when (tab.viewConfig.viewType) {
-        ViewType.COLUMNS -> FilesListColumns(tab)
+        ViewType.LIST -> FilesListColumns(tab)
         ViewType.GRID -> FilesListGrid(tab)
     }
 }
@@ -380,7 +382,7 @@ private fun GridFileItem(
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .then(if (viewConfigs.cropThumbnails) Modifier.aspectRatio(1f) else Modifier)
+            .then(if (viewConfigs.galleryMode) Modifier.aspectRatio(1f) else Modifier)
             .combinedClickable(
                 onClick = {
                     if (tab.selectedFiles.isNotEmpty()) {
@@ -410,11 +412,11 @@ private fun GridFileItem(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(if (viewConfigs.cropThumbnails) 1.dp else 8.dp),
+                .padding(if (viewConfigs.galleryMode) 1.dp else 6.dp),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Box(
-                modifier = if (viewConfigs.cropThumbnails) Modifier
+                modifier = if (viewConfigs.galleryMode) Modifier
                     .fillMaxWidth()
                     .weight(1f)
                 else Modifier
@@ -438,7 +440,10 @@ private fun GridFileItem(
                         handleLongClick(tab, itemPath, item, index)
                     }
                 )
-                if (viewConfigs.cropThumbnails) {
+                if (viewConfigs.galleryMode && (item.isFolder || (item.isFile() && ((!videoFileType.contains(
+                        item.extension
+                    ) && !imageFileType.contains(item.extension)) || !viewConfigs.hideMediaNames)))
+                ) {
                     Row(
                         modifier = Modifier
                             .fillMaxWidth()
@@ -467,14 +472,14 @@ private fun GridFileItem(
                     }
                 }
             }
-            if (!viewConfigs.cropThumbnails) {
+            if (!viewConfigs.galleryMode) {
                 Spacer(modifier = Modifier.height(4.dp))
                 val fontSize = getFileListFontSize(tab.activeFolder) * 0.8
                 Text(
                     text = item.displayName,
                     fontSize = fontSize.sp,
                     fontWeight = if (isSelected) FontWeight.Medium else FontWeight.Normal,
-                    maxLines = 1,
+                    maxLines = 2,
                     lineHeight = (fontSize + 2).sp,
                     overflow = TextOverflow.Ellipsis,
                     textAlign = TextAlign.Center,
@@ -486,14 +491,6 @@ private fun GridFileItem(
                     modifier = Modifier.fillMaxWidth()
                 )
             }
-
-            // Does not fit. Maybe find a better place later.
-            /*Spacer(modifier = Modifier.height(4.dp))
-            FileDetailsCompact(
-                item = item,
-                currentItemPath = itemPath,
-                isHighlighted = tab.highlightedFiles.contains(itemPath)
-            )*/
         }
     }
 }
@@ -506,7 +503,7 @@ private fun FileIcon(
     onClick: () -> Unit,
     onLongClick: () -> Unit = {}
 ) {
-    val sizeModifier = if (viewConfigs.viewType == ViewType.GRID && viewConfigs.cropThumbnails) {
+    val sizeModifier = if (viewConfigs.viewType == ViewType.GRID && viewConfigs.galleryMode) {
         Modifier.fillMaxSize()
     } else {
         Modifier.size(size)

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

@@ -18,6 +18,8 @@ import androidx.compose.material.icons.automirrored.rounded.ViewList
 import androidx.compose.material.icons.rounded.CropFree
 import androidx.compose.material.icons.rounded.Folder
 import androidx.compose.material.icons.rounded.GridView
+import androidx.compose.material.icons.rounded.Image
+import androidx.compose.material.icons.rounded.TextFields
 import androidx.compose.material.icons.rounded.ViewModule
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
@@ -93,11 +95,21 @@ fun FileViewConfigDialog(
             mutableStateOf(tab.viewConfig.cropThumbnails)
         }
 
+        var galleryMode by remember {
+            mutableStateOf(tab.viewConfig.galleryMode)
+        }
+
+        var hideMediaNames by remember {
+            mutableStateOf(tab.viewConfig.hideMediaNames)
+        }
+
         fun saveConfigs() {
             val configs = ViewConfigs(
-                viewType = if (viewType == ViewType.GRID.ordinal) ViewType.GRID else ViewType.COLUMNS,
+                viewType = if (viewType == ViewType.GRID.ordinal) ViewType.GRID else ViewType.LIST,
                 columnCount = columnCount.roundToInt(),
                 cropThumbnails = cropThumbnails,
+                galleryMode = galleryMode,
+                hideMediaNames = hideMediaNames,
                 itemSize = itemSize
             )
 
@@ -170,45 +182,39 @@ fun FileViewConfigDialog(
                     modifier = Modifier.padding(bottom = 12.dp)
                 )
 
-                Card(
-                    modifier = Modifier.fillMaxWidth(),
-                    colors = CardDefaults.cardColors(
-                        containerColor = MaterialTheme.colorScheme.surfaceContainer
-                    ),
-                    elevation = CardDefaults.cardElevation(defaultElevation = 0.dp)
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .selectableGroup()
                 ) {
-                    Column(
-                        modifier = Modifier
-                            .selectableGroup()
-                            .padding(8.dp)
-                    ) {
-                        RadioButtonItem(
-                            icon = Icons.Rounded.GridView,
-                            text = stringResource(R.string.grid_view),
-                            selected = viewType == ViewType.GRID.ordinal,
-                            onClick = {
-                                viewType = ViewType.GRID.ordinal
-                                // Reset column count for grid view
-                                columnCount = 4f
-                            }
-                        )
+                    RadioButtonItem(
+                        icon = Icons.Rounded.GridView,
+                        text = stringResource(R.string.grid_view),
+                        selected = viewType == ViewType.GRID.ordinal,
+                        onClick = {
+                            viewType = ViewType.GRID.ordinal
+                            // Reset column count for grid view
+                            columnCount = 4f
+                        }
+                    )
 
-                        HorizontalDivider(
-                            modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
-                            color = MaterialTheme.colorScheme.outline.copy(alpha = 0.12f)
+                    HorizontalDivider(
+                        modifier = Modifier.padding(
+                            horizontal = 8.dp,
+                            vertical = 4.dp
                         )
+                    )
 
-                        RadioButtonItem(
-                            icon = Icons.AutoMirrored.Rounded.ViewList,
-                            text = stringResource(R.string.list_view),
-                            selected = viewType == ViewType.COLUMNS.ordinal,
-                            onClick = {
-                                viewType = ViewType.COLUMNS.ordinal
-                                // Reset column count for column view
-                                columnCount = 1f
-                            }
-                        )
-                    }
+                    RadioButtonItem(
+                        icon = Icons.AutoMirrored.Rounded.ViewList,
+                        text = stringResource(R.string.list_view),
+                        selected = viewType == ViewType.LIST.ordinal,
+                        onClick = {
+                            viewType = ViewType.LIST.ordinal
+                            // Reset column count for column view
+                            columnCount = 1f
+                        }
+                    )
                 }
 
                 Space(size = 24.dp)
@@ -376,13 +382,59 @@ fun FileViewConfigDialog(
                 ) {
                     SwitchSettingItem(
                         icon = Icons.Rounded.CropFree,
-                        title = if (viewType == ViewType.GRID.ordinal) stringResource(R.string.gallery_mode) else stringResource(
+                        title = stringResource(
                             R.string.crop_in_thumbnails
                         ),
                         checked = cropThumbnails,
                         onCheckedChange = { cropThumbnails = it }
                     )
                 }
+
+                if (viewType == ViewType.GRID.ordinal) {
+                    HorizontalDivider(
+                        modifier = Modifier.padding(
+                            horizontal = 8.dp,
+                            vertical = 4.dp
+                        )
+                    )
+
+                    Card(
+                        modifier = Modifier.fillMaxWidth(),
+                        colors = CardDefaults.cardColors(
+                            containerColor = MaterialTheme.colorScheme.surfaceContainer
+                        ),
+                        elevation = CardDefaults.cardElevation(defaultElevation = 0.dp)
+                    ) {
+                        SwitchSettingItem(
+                            icon = Icons.Rounded.Image,
+                            title = stringResource(R.string.gallery_mode),
+                            checked = galleryMode,
+                            onCheckedChange = { galleryMode = it }
+                        )
+                    }
+
+                    HorizontalDivider(
+                        modifier = Modifier.padding(
+                            horizontal = 8.dp,
+                            vertical = 4.dp
+                        )
+                    )
+
+                    Card(
+                        modifier = Modifier.fillMaxWidth(),
+                        colors = CardDefaults.cardColors(
+                            containerColor = MaterialTheme.colorScheme.surfaceContainer
+                        ),
+                        elevation = CardDefaults.cardElevation(defaultElevation = 0.dp)
+                    ) {
+                        SwitchSettingItem(
+                            icon = Icons.Rounded.TextFields,
+                            title = stringResource(R.string.hide_media_names),
+                            checked = hideMediaNames,
+                            onCheckedChange = { hideMediaNames = it }
+                        )
+                    }
+                }
             }
         }
     }

app/src/main/res/values-fa/strings.xml

@@ -433,4 +433,5 @@
     <string name="import_prefs_desc">آیا می خواهید تنظیمات فعلی خود را با تنظیمات موجود در فایل انتخاب شده جایگزین کنید؟</string>
     <string name="other">دیگر</string>
     <string name="path_copied_to_clipboard">مسیر در کلیپ‌بورد کپی شد</string>
+    <string name="hide_media_names">مخفی کردن نام‌ها از فایل‌های رسانه</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -433,4 +433,5 @@
     <string name="import_prefs_desc">Voulez-vous remplacer vos préférences actuelles par celles contenues dans le fichier sélectionné ?</string>
     <string name="other">Autre</string>
     <string name="path_copied_to_clipboard">Chemin copié dans le presse-papiers</string>
+    <string name="hide_media_names">Masquer les noms des fichiers multimédias</string>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -433,4 +433,5 @@
     <string name="import_prefs_desc">Czy chcesz zastąpić bieżące preferencje tymi zawartymi w wybranym pliku?</string>
     <string name="other">Inne</string>
     <string name="path_copied_to_clipboard">Ścieżka skopiowana do schowka</string>
+    <string name="hide_media_names">Ukryj nazwy plików multimedialnych</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -433,4 +433,5 @@
     <string name="import_prefs_desc">Você deseja substituir suas preferências atuais pelas contidas no arquivo selecionado?</string>
     <string name="other">Outro</string>
     <string name="path_copied_to_clipboard">Caminho copiado para a área de transferência</string>
+    <string name="hide_media_names">Ocultar nomes de arquivos de mídia</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -433,4 +433,5 @@
     <string name="import_prefs_desc">Вы хотите перезаписать текущие настройки теми, которые содержатся в выбранном файле?</string>
     <string name="other">Другое</string>
     <string name="path_copied_to_clipboard">Путь скопирован в буфер обмена</string>
+    <string name="hide_media_names">Скрыть названия медиафайлов</string>
 </resources>

app/src/main/res/values-tr/strings.xml

@@ -434,4 +434,5 @@
     <string name="import_prefs_desc">Geçerli tercihlerinizi seçilen dosyadaki tercihlerle değiştirmek istiyor musunuz?</string>
     <string name="other">Diğer</string>
     <string name="path_copied_to_clipboard">Yol panoya kopyalandı</string>
+    <string name="hide_media_names">Medya dosyalarındaki adları gizle</string>
 </resources>