clean up the code

Author: AmirMousavi-Dev

app/src/main/java/ir/codroid/taskino/data/ToDoDao.kt

@@ -30,13 +30,39 @@ interface ToDoDao {
     @Query("DELETE FROM todo_task_table")
     suspend fun deleteAllTasks()
 
-    @Query("SELECT * FROM todo_task_table WHERE title LIKE :searchQuery OR description LIKE :searchQuery")
+    @Query(
+        """
+            SELECT * FROM todo_task_table 
+        WHERE
+            title LIKE :searchQuery OR
+            description LIKE :searchQuery
+            
+        """
+    )
     fun searchTasks(searchQuery: String) :Flow<List<ToDoTask>>
 
-    @Query("SELECT * FROM todo_task_table ORDER BY CASE WHEN priority LIKE 'L%' THEN 1 WHEN priority LIKE 'M%' THEN 2 WHEN priority LIKE 'H%' THEN 3 END ")
+    @Query(
+        """
+            SELECT * FROM todo_task_table ORDER BY
+        CASE    
+            WHEN priority LIKE 'L%' THEN 1
+            WHEN priority LIKE 'M%' THEN 2
+            WHEN priority LIKE 'H%' THEN 3
+        END
+        """
+    )
     fun sortByLowPriority(): Flow<List<ToDoTask>>
 
-    @Query("SELECT * FROM todo_task_table ORDER BY CASE WHEN priority LIKE 'H%' THEN 1 WHEN priority LIKE 'M%' THEN 2 WHEN priority LIKE 'L%' THEN 3 END")
+    @Query(
+        """
+            SELECT * FROM todo_task_table ORDER BY
+        CASE    
+            WHEN priority LIKE 'H%' THEN 1
+            WHEN priority LIKE 'M%' THEN 2
+            WHEN priority LIKE 'L%' THEN 3
+        END    
+        """
+    )
     fun sortByHighPriority(): Flow<List<ToDoTask>>
 
 }

app/src/main/java/ir/codroid/taskino/ui/component/PriorityDropDownMenu.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material3.DropdownMenu
@@ -26,8 +27,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import ir.codroid.taskino.R
 import ir.codroid.taskino.data.model.Priority
@@ -45,10 +49,14 @@ fun PriorityDropDownMenu(
         mutableStateOf(false)
     }
     val angle: Float by animateFloatAsState(targetValue = if (expanded) 180f else 0f)
+    var parentSize by remember { mutableStateOf(IntSize.Zero) }
 
     Row(
         modifier = Modifier
             .fillMaxWidth()
+            .onGloballyPositioned {
+                parentSize = it.size
+            }
             .height(PRIORITY_DROP_DOWN_MENU_HEIGHT)
             .clickable { expanded = !expanded }
             .border(
@@ -88,24 +96,16 @@ fun PriorityDropDownMenu(
         DropdownMenu(
             expanded = expanded,
             onDismissRequest = { expanded = false },
-            modifier = Modifier.fillMaxWidth(fraction = 0.94f)
+            modifier = Modifier.width(with(LocalDensity.current) { parentSize.width.toDp() })
         ) {
-            DropdownMenuItem(
-                text = { PriorityItem(priority = Priority.LOW) },
-                onClick = {
-                    onPriorityClicked(Priority.LOW)
-                    expanded = false
-                })
-            DropdownMenuItem(
-                text = { PriorityItem(priority = Priority.MEDIUM) },
-                onClick = {
-                    onPriorityClicked(Priority.MEDIUM)
-                    expanded = false})
-            DropdownMenuItem(
-                text = { PriorityItem(priority = Priority.HIGH) },
-                onClick = {
-                    onPriorityClicked(Priority.HIGH)
-                    expanded = false})
+            Priority.values().slice(0..2).forEach { priority ->
+                DropdownMenuItem(
+                    text = { PriorityItem(priority = priority) },
+                    onClick = {
+                        onPriorityClicked(priority)
+                        expanded = false
+                    })
+            }
         }
     }
 

app/src/main/java/ir/codroid/taskino/ui/screen/list/ListScreenAppBar.kt

@@ -150,27 +150,15 @@ fun SortAction(onSortClicked: (Priority) -> Unit) {
         )
     }
     DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
-        DropdownMenuItem(
-            text = { PriorityItem(Priority.LOW) },
-            onClick = {
-                onSortClicked(Priority.LOW)
-                expanded = false
-            })
-
-        DropdownMenuItem(
-            text = { PriorityItem(Priority.HIGH) },
-            onClick = {
-                onSortClicked(Priority.HIGH)
-                expanded = false
-            })
-
-        DropdownMenuItem(
-            text = { PriorityItem(Priority.NONE) },
-            onClick = {
-                onSortClicked(Priority.NONE)
-                expanded = false
-            })
-
+        Priority.values().slice(setOf(0,2,3)).forEach { priority ->
+            DropdownMenuItem(
+                text = { PriorityItem(priority) },
+                onClick = {
+                    onSortClicked(priority)
+                    expanded = false
+                }
+            )
+        }
     }
 }
 

app/src/main/java/ir/codroid/taskino/util/Action.kt

@@ -2,32 +2,16 @@ package ir.codroid.taskino.util
 
 import androidx.annotation.StringRes
 import ir.codroid.taskino.R
+import ir.codroid.taskino.data.model.Priority
 
-enum class Action(@StringRes val title : Int) {
+enum class Action(@StringRes val title: Int) {
     ADD(R.string.add),
     UPDATE(R.string.update),
     DELETE(R.string.delete),
     DELETE_ALL(R.string.delete_all),
     UNDO(R.string.undo_delete),
     NO_ACTION(0),
 }
-fun String?.toAction() = when{
-    this == "ADD" -> {
-        Action.ADD
-    }
-    this == "UPDATE" -> {
-        Action.UPDATE
-    }
-    this == "DELETE" -> {
-        Action.DELETE
-    }
-    this == "DELETE_ALL" -> {
-        Action.DELETE_ALL
-    }
-    this == "UNDO" -> {
-        Action.UNDO
-    }
-    else -> {
-        Action.NO_ACTION
-    }
-}
+
+fun String?.toAction(): Action =
+    if (this.isNullOrEmpty()) Action.NO_ACTION else Action.valueOf(this)