Add sort order option (closes #112)

you-apps · Apr 26, 2023 · 3ec0aa6 · 3ec0aa6
1 parent c054220
commit 3ec0aa6
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 4 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/java/com/bnyro/recorder/enums/SortOrder.kt b/app/src/main/java/com/bnyro/recorder/enums/SortOrder.kt
@@ -0,0 +1,8 @@
+package com.bnyro.recorder.enums
+
+enum class SortOrder {
+    ALPHABETIC,
+    ALPHABETIC_REV,
+    SIZE,
+    SIZE_REV
+}
diff --git a/app/src/main/java/com/bnyro/recorder/ui/components/PlayerView.kt b/app/src/main/java/com/bnyro/recorder/ui/components/PlayerView.kt
@@ -1,5 +1,6 @@
 package com.bnyro.recorder.ui.components
 
+import android.provider.OpenableColumns
 import android.text.format.DateUtils
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
@@ -38,15 +39,18 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.recorder.R
+import com.bnyro.recorder.enums.SortOrder
 import com.bnyro.recorder.enums.VideoFormat
 import com.bnyro.recorder.ui.dialogs.ConfirmationDialog
 import com.bnyro.recorder.ui.models.PlayerModel
+import kotlin.math.absoluteValue
 import kotlinx.coroutines.delay
 
 @Composable
 fun PlayerView(
     showVideoModeInitially: Boolean,
     showDeleteAllDialog: Boolean,
+    sortOrder: SortOrder,
     onDeleteAllDialogDismissed: () -> Unit
 ) {
     val playerModel: PlayerModel = viewModel()
@@ -61,11 +65,25 @@ fun PlayerView(
         )
     }
 
-    val files = playerModel.files.filter { file ->
+    val filesToShow = playerModel.files.filter { file ->
         val videoCriteria = VideoFormat.codecs.any { file.name.orEmpty().endsWith(it.extension) }
         if (selectedTab == 0) !videoCriteria else videoCriteria
     }
 
+    val files = when (sortOrder) {
+        SortOrder.ALPHABETIC, SortOrder.ALPHABETIC_REV -> filesToShow.sortedBy { it.name }
+        else -> filesToShow.sortedBy {
+            context.contentResolver.query(it.uri, null, null, null, null)?.use { cursor ->
+                cursor.getLong(cursor.getColumnIndex(OpenableColumns.SIZE).absoluteValue)
+            }
+        }
+    }.let {
+        when (sortOrder) {
+            SortOrder.ALPHABETIC_REV, SortOrder.SIZE -> it.reversed()
+            else -> it
+        }
+    }
+
     Column(
         modifier = Modifier.fillMaxSize()
     ) {

diff --git a/app/src/main/java/com/bnyro/recorder/ui/screens/PlayerScreen.kt b/app/src/main/java/com/bnyro/recorder/ui/screens/PlayerScreen.kt
@@ -1,9 +1,14 @@
 package com.bnyro.recorder.ui.screens
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Sort
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -13,6 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bnyro.recorder.R
+import com.bnyro.recorder.enums.SortOrder
 import com.bnyro.recorder.ui.common.ClickableIcon
 import com.bnyro.recorder.ui.common.FullscreenDialog
 import com.bnyro.recorder.ui.components.PlayerView
@@ -25,12 +31,52 @@ fun PlayerScreen(
     var showDeleteAllDialog by remember {
         mutableStateOf(false)
     }
+    var selectedSortOrder by remember {
+        mutableStateOf(SortOrder.ALPHABETIC)
+    }
 
     FullscreenDialog(
         title = stringResource(R.string.recordings),
         onDismissRequest = onDismissRequest,
         useLargeAppBar = true,
         actions = {
+            Box {
+                var showDropDown by remember {
+                    mutableStateOf(false)
+                }
+                ClickableIcon(
+                    imageVector = Icons.Default.Sort,
+                    contentDescription = stringResource(R.string.sort)
+                ) {
+                    showDropDown = true
+                }
+
+                val sortOptions = listOf(
+                    SortOrder.ALPHABETIC,
+                    SortOrder.ALPHABETIC_REV,
+                    SortOrder.SIZE,
+                    SortOrder.SIZE_REV
+                )
+                val sortOptionNames = listOf(
+                    R.string.alphabetic,
+                    R.string.alphabetic_rev,
+                    R.string.size,
+                    R.string.size_rev
+                )
+                DropdownMenu(showDropDown, { showDropDown = false }) {
+                    sortOptions.forEachIndexed { index, sortOrder ->
+                        DropdownMenuItem(
+                            text = {
+                                Text(stringResource(sortOptionNames[index]))
+                            },
+                            onClick = {
+                                selectedSortOrder = sortOrder
+                                showDropDown = false
+                            }
+                        )
+                    }
+                }
+            }
             ClickableIcon(
                 imageVector = Icons.Default.Delete,
                 contentDescription = stringResource(R.string.delete_all)
@@ -44,7 +90,7 @@ fun PlayerScreen(
                 horizontal = 20.dp
             )
         ) {
-            PlayerView(showVideoModeInitially, showDeleteAllDialog) {
+            PlayerView(showVideoModeInitially, showDeleteAllDialog, selectedSortOrder) {
                 showDeleteAllDialog = false
             }
         }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -27,6 +27,12 @@
     <string name="record">Record</string>
     <string name="play">Play</string>
     <string name="back">Back</string>
+    <!-- Sort order -->
+    <string name="sort">Sort</string>
+    <string name="alphabetic">Alphabetic</string>
+    <string name="alphabetic_rev">Alphabetic (reversed)</string>
+    <string name="size">Size</string>
+    <string name="size_rev">Size (reversed)</string>
     <!-- Settings -->
     <string name="settings">Settings</string>
     <string name="options">Options</string>