allow specifying date time format

Author: Raival-e

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

@@ -652,7 +652,8 @@ fun Int.isMultipleOf100(): Boolean {
 }
 
 @SuppressLint("SimpleDateFormat")
-fun Long.toFormattedDate(): String = SimpleDateFormat("MMM dd, hh:mm a").format(this)
+fun Long.toFormattedDate(): String =
+    SimpleDateFormat(globalClass.preferencesManager.appearancePrefs.dateTimeFormat).format(this)
 
 fun Long.toFormattedSize(): String {
     if (this <= 0) return "0 B"

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/apps/ui/AppInfoBottomSheet.kt

@@ -61,6 +61,7 @@ import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import com.raival.compose.file.explorer.App.Companion.globalClass
 import com.raival.compose.file.explorer.R
+import com.raival.compose.file.explorer.common.toFormattedDate
 import com.raival.compose.file.explorer.common.toFormattedSize
 import com.raival.compose.file.explorer.common.ui.BottomSheetDialog
 import com.raival.compose.file.explorer.common.ui.Space
@@ -69,8 +70,6 @@ import com.raival.compose.file.explorer.screen.main.tab.files.holder.LocalFileHo
 import com.raival.compose.file.explorer.screen.main.tab.files.task.CopyTask
 import kotlinx.coroutines.launch
 import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Locale
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -79,7 +78,6 @@ fun AppInfoBottomSheet(
     onDismiss: () -> Unit
 ) {
     var selectedTab by remember { mutableIntStateOf(0) }
-    val dateFormat = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault())
 
     BottomSheetDialog(onDismissRequest = onDismiss) {
         Column(
@@ -245,14 +243,14 @@ fun AppInfoBottomSheet(
                         item {
                             InfoCard(
                                 title = stringResource(R.string.install_date),
-                                value = dateFormat.format(app.installDate),
+                                value = app.installDate.time.toFormattedDate(),
                                 icon = Icons.Rounded.CalendarMonth
                             )
                         }
                         item {
                             InfoCard(
                                 title = stringResource(R.string.last_update),
-                                value = dateFormat.format(app.lastUpdateDate),
+                                value = app.lastUpdateDate.time.toFormattedDate(),
                                 icon = Icons.Rounded.Update
                             )
                         }

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

@@ -3,6 +3,8 @@ package com.raival.compose.file.explorer.screen.main.tab.files.provider
 import com.raival.compose.file.explorer.App.Companion.globalClass
 import com.raival.compose.file.explorer.R
 import com.raival.compose.file.explorer.common.emptyString
+import com.raival.compose.file.explorer.common.toFormattedDate
+import com.raival.compose.file.explorer.common.toFormattedSize
 import com.raival.compose.file.explorer.screen.main.tab.files.holder.ContentHolder
 import com.raival.compose.file.explorer.screen.main.tab.files.holder.LocalFileHolder
 import kotlinx.coroutines.CoroutineScope
@@ -23,9 +25,6 @@ import java.io.FileInputStream
 import java.math.BigInteger
 import java.nio.file.Files
 import java.security.MessageDigest
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 data class CalculationProgress(
     val isCalculating: Boolean = false,
@@ -114,10 +113,8 @@ class ContentPropertiesProvider(private val contentHolders: List<ContentHolder>)
                     name = file.displayName.ifEmpty { globalClass.getString(R.string.root) },
                     path = file.getParent()?.uniquePath ?: File.separator,
                     type = determineFileType(file),
-                    lastModified = formatTimestamp(file.lastModified),
-                    size = if (file.isFolder) globalClass.getString(R.string.calculating) else formatFileSize(
-                        file.size
-                    ),
+                    lastModified = file.lastModified.toFormattedDate(),
+                    size = if (file.isFolder) globalClass.getString(R.string.calculating) else file.size.toFormattedSize(),
                     permissions = getPermissions(file),
                     owner = getOwner(file),
                     contentCount = contentCountFlow,
@@ -149,7 +146,7 @@ class ContentPropertiesProvider(private val contentHolders: List<ContentHolder>)
                             state.details as? PropertiesState.SingleContentProperties
                         currentDetails?.let {
                             state.copy(
-                                details = it.copy(size = formatFileSize(totalSize))
+                                details = it.copy(size = totalSize.toFormattedSize())
                             )
                         } ?: state
                     }
@@ -265,7 +262,7 @@ class ContentPropertiesProvider(private val contentHolders: List<ContentHolder>)
                         totalFiles,
                         totalFolders
                     )
-                    totalSizeFlow.value = formatFileSize(totalSize)
+                    totalSizeFlow.value = totalSize.toFormattedSize()
 
                     yield() // Allow cancellation
                 }
@@ -289,22 +286,6 @@ class ContentPropertiesProvider(private val contentHolders: List<ContentHolder>)
         }
     }
 
-    private fun formatTimestamp(millis: Long): String {
-        val sdf = SimpleDateFormat("MMM dd, yyyy • hh:mm:ss a", Locale.getDefault())
-        return sdf.format(Date(millis))
-    }
-
-    private fun formatFileSize(bytes: Long): String {
-        if (bytes < 1024) return "$bytes B"
-        val z = (63 - java.lang.Long.numberOfLeadingZeros(bytes)) / 10
-        return String.format(
-            Locale.US,
-            "%.1f %sB",
-            bytes.toDouble() / (1L shl (z * 10)),
-            " KMGTPE"[z]
-        )
-    }
-
     private fun getPermissions(file: ContentHolder): String {
         if (file is LocalFileHolder) {
             return buildString {

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

@@ -70,14 +70,12 @@ import coil3.compose.AsyncImage
 import com.raival.compose.file.explorer.App.Companion.globalClass
 import com.raival.compose.file.explorer.App.Companion.logger
 import com.raival.compose.file.explorer.R
+import com.raival.compose.file.explorer.common.toFormattedDate
 import com.raival.compose.file.explorer.common.toFormattedSize
 import com.raival.compose.file.explorer.common.ui.BottomSheetDialog
 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.misc.ApkInfo
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -119,10 +117,8 @@ fun ApkPreviewDialog(tab: FilesTab) {
                             packageManager.getPackageInfo(archiveInfo.packageName, 0)
                         isInstalled = true
                         installedVersion = installedInfo.versionName
-                        installTime = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault())
-                            .format(Date(installedInfo.firstInstallTime))
-                        lastUpdateTime = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault())
-                            .format(Date(installedInfo.lastUpdateTime))
+                        installTime = installedInfo.firstInstallTime.toFormattedDate()
+                        lastUpdateTime = installedInfo.lastUpdateTime.toFormattedDate()
                     } catch (_: PackageManager.NameNotFoundException) {
                         // App not installed
                     }

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

@@ -58,6 +58,12 @@ class PreferencesManager {
             defaultValue = StartupTabs.default().toJson(),
             getPreferencesKey = { stringPreferencesKey(it) }
         )
+
+        var dateTimeFormat by prefMutableState(
+            keyName = "dateTimeFormat",
+            defaultValue = "yyyy-MM-dd HH:mm:ss",
+            getPreferencesKey = { stringPreferencesKey(it) }
+        )
     }
 
     class FileListPrefs {

app/src/main/java/com/raival/compose/file/explorer/screen/preferences/ui/AppearanceContainer.kt

@@ -2,6 +2,7 @@ package com.raival.compose.file.explorer.screen.preferences.ui
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.Label
+import androidx.compose.material.icons.rounded.CalendarToday
 import androidx.compose.material.icons.rounded.Nightlight
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
@@ -54,5 +55,32 @@ fun AppearanceContainer() {
             switchState = appearancePrefs.showBottomBarLabels,
             onSwitchChange = { appearancePrefs.showBottomBarLabels = it }
         )
+
+        HorizontalDivider(
+            color = MaterialTheme.colorScheme.surfaceContainerLow,
+            thickness = 3.dp
+        )
+
+        val commonDateFormat = arrayListOf(
+            "yyyy-MM-dd HH:mm:ss",
+            "yyyy-MM-dd",
+            "dd-MM-yyyy HH:mm:ss",
+            "dd-MM-yyyy",
+        )
+
+        PreferenceItem(
+            label = stringResource(R.string.date_time_format),
+            supportingText = appearancePrefs.dateTimeFormat,
+            icon = Icons.Rounded.CalendarToday,
+            onClick = {
+                manager.singleChoiceDialog.show(
+                    title = globalClass.getString(R.string.date_time_format),
+                    description = globalClass.getString(R.string.select_date_format),
+                    choices = commonDateFormat,
+                    selectedChoice = commonDateFormat.indexOf(appearancePrefs.dateTimeFormat),
+                    onSelect = { appearancePrefs.dateTimeFormat = commonDateFormat[it] }
+                )
+            }
+        )
     }
 }

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

@@ -358,4 +358,6 @@
     <string name="disabled">غیرفعال</string>
     <string name="update_date">تاریخ به روز رسانی</string>
     <string name="extract">استخراج</string>
+    <string name="date_time_format">فرمت تاریخ و زمان</string>
+    <string name="select_date_format">انتخاب فرمت تاریخ</string>
 </resources>

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

@@ -358,4 +358,6 @@
     <string name="disabled">Desativado</string>
     <string name="update_date">Data de Atualização</string>
     <string name="extract">Extrair</string>
+    <string name="date_time_format">Formato de data e hora</string>
+    <string name="select_date_format">Selecionar formato de data</string>
 </resources>

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

@@ -358,4 +358,6 @@
     <string name="disabled">Отключено</string>
     <string name="update_date">Дата обновления</string>
     <string name="extract">Извлечь</string>
+    <string name="date_time_format">Формат даты и времени</string>
+    <string name="select_date_format">Выберите формат даты</string>
 </resources>

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

@@ -358,4 +358,6 @@
     <string name="disabled">已禁用</string>
     <string name="update_date">更新日期</string>
     <string name="extract">提取</string>
+    <string name="date_time_format">日期时间格式</string>
+    <string name="select_date_format">选择日期格式</string>
 </resources>