Added option to delete file in uncommited changes context menu

src/main/kotlin/app/ui/UncommitedChanges.kt

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalAnimationApi::class, ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class)
+
 package app.ui
 
 import androidx.compose.animation.AnimatedVisibility
@@ -31,12 +33,13 @@ import app.git.StatusEntry
 import app.theme.*
 import app.ui.components.ScrollableLazyColumn
 import app.ui.components.SecondaryButton
+import app.ui.context_menu.stagedEntriesContextMenuItems
+import app.ui.context_menu.unstagedEntriesContextMenuItems
 import app.viewmodels.StageStatus
 import app.viewmodels.StatusViewModel
 import org.eclipse.jgit.diff.DiffEntry
 import org.eclipse.jgit.lib.RepositoryState
 
-@OptIn(ExperimentalAnimationApi::class, ExperimentalComposeUiApi::class)
 @Composable
 fun UncommitedChanges(
     statusViewModel: StatusViewModel,
@@ -51,9 +54,11 @@ fun UncommitedChanges(
     val stageStatus = stageStatusState.value
     val staged: List<StatusEntry>
     val unstaged: List<StatusEntry>
+
     if (stageStatus is StageStatus.Loaded) {
         staged = stageStatus.staged
         unstaged = stageStatus.unstaged
+        
         LaunchedEffect(staged) {
             if (selectedEntryType != null) {
                 checkIfSelectedEntryShouldBeUpdated(
@@ -101,8 +106,13 @@ fun UncommitedChanges(
             onDiffEntryOptionSelected = {
                 statusViewModel.unstage(it)
             },
-            onReset = { diffEntry ->
+            onGenerateContextMenu = { diffEntry ->
-                statusViewModel.resetStaged(diffEntry)
+                stagedEntriesContextMenuItems(
+                    diffEntry = diffEntry,
+                    onReset = {
+                        statusViewModel.resetUnstaged(diffEntry)
+                    },
+                )
             },
             onAllAction = {
                 statusViewModel.unstageAll()
@@ -122,13 +132,21 @@ fun UncommitedChanges(
             onDiffEntryOptionSelected = {
                 statusViewModel.stage(it)
             },
-            onReset = { diffEntry ->
+            onGenerateContextMenu = { diffEntry ->
+                unstagedEntriesContextMenuItems(
+                    diffEntry = diffEntry,
+                    onReset = {
                         statusViewModel.resetUnstaged(diffEntry)
                     },
-            {
+                    onDelete = {
-                statusViewModel.stageAll()
+                        statusViewModel.deleteFile(diffEntry)
+                    }
+                )
             },
-            allActionTitle = "Stage all"
+            allActionTitle = "Stage all",
+            onAllAction = {
+                statusViewModel.stageAll()
+            }
         )
 
         Column(
@@ -326,7 +344,7 @@ fun checkIfSelectedEntryShouldBeUpdated(
     }
 }
 
-@OptIn(ExperimentalAnimationApi::class)
+@OptIn(ExperimentalAnimationApi::class, ExperimentalFoundationApi::class)
 @Composable
 private fun EntriesList(
     modifier: Modifier,
@@ -336,7 +354,7 @@ private fun EntriesList(
     diffEntries: List<StatusEntry>,
     onDiffEntrySelected: (DiffEntry) -> Unit,
     onDiffEntryOptionSelected: (DiffEntry) -> Unit,
-    onReset: (DiffEntry) -> Unit,
+    onGenerateContextMenu: (DiffEntry) -> List<ContextMenuItem>,
     onAllAction: () -> Unit,
     allActionTitle: String,
 ) {
@@ -382,9 +400,7 @@ private fun EntriesList(
                     onButtonClick = {
                         onDiffEntryOptionSelected(diffEntry)
                     },
-                    onReset = {
+                    onGenerateContextMenu = onGenerateContextMenu,
-                        onReset(diffEntry)
-                    }
                 )
 
                 if (index < diffEntries.size - 1) {
@@ -406,7 +422,7 @@ private fun FileEntry(
     actionColor: Color,
     onClick: () -> Unit,
     onButtonClick: () -> Unit,
-    onReset: () -> Unit,
+    onGenerateContextMenu: (DiffEntry) -> List<ContextMenuItem>,
 ) {
     var active by remember { mutableStateOf(false) }
     val diffEntry = statusEntry.diffEntry
@@ -428,12 +444,7 @@ private fun FileEntry(
     ) {
         ContextMenuArea(
             items = {
-                listOf(
+                onGenerateContextMenu(diffEntry)
-                    ContextMenuItem(
-                        label = "Reset",
-                        onClick = onReset
-                    )
-                )
             },
         ) {
             Row(

src/main/kotlin/app/ui/context_menu/StagedEntriesContextMenu.kt

@@ -0,0 +1,22 @@
+package app.ui.context_menu
+
+import androidx.compose.foundation.ContextMenuItem
+import androidx.compose.foundation.ExperimentalFoundationApi
+import org.eclipse.jgit.diff.DiffEntry
+
+@OptIn(ExperimentalFoundationApi::class)
+fun stagedEntriesContextMenuItems(
+    diffEntry: DiffEntry,
+    onReset: () -> Unit,
+): List<ContextMenuItem> {
+    return mutableListOf<ContextMenuItem>().apply {
+        if (diffEntry.changeType != DiffEntry.ChangeType.ADD) {
+            add(
+                ContextMenuItem(
+                    label = "Reset",
+                    onClick = onReset,
+                )
+            )
+        }
+    }
+}

src/main/kotlin/app/ui/context_menu/UnstagedEntriesContextMenu.kt

@@ -0,0 +1,32 @@
+package app.ui.context_menu
+
+import androidx.compose.foundation.ContextMenuItem
+import androidx.compose.foundation.ExperimentalFoundationApi
+import org.eclipse.jgit.diff.DiffEntry
+
+@OptIn(ExperimentalFoundationApi::class)
+fun unstagedEntriesContextMenuItems(
+    diffEntry: DiffEntry,
+    onReset: () -> Unit,
+    onDelete: () -> Unit,
+): List<ContextMenuItem> {
+    return mutableListOf<ContextMenuItem>().apply {
+        if (diffEntry.changeType != DiffEntry.ChangeType.ADD) {
+            add(
+                ContextMenuItem(
+                    label = "Reset",
+                    onClick = onReset,
+                )
+            )
+        }
+
+        if (diffEntry.changeType != DiffEntry.ChangeType.DELETE) {
+            add(
+                ContextMenuItem(
+                    label = "Delete file",
+                    onClick = onDelete,
+                )
+            )
+        }
+    }
+}

src/main/kotlin/app/viewmodels/StatusViewModel.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.diff.DiffEntry
+import java.io.File
 import javax.inject.Inject
 
 class StatusViewModel @Inject constructor(
@@ -138,6 +139,16 @@ class StatusViewModel @Inject constructor(
 
         return@safeProcessing RefreshType.ALL_DATA
     }
+
+    fun deleteFile(diffEntry: DiffEntry) = tabState.runOperation {
+        val path = diffEntry.newPath
+
+        val fileToDelete = File(path)
+
+        fileToDelete.delete()
+
+        return@runOperation RefreshType.UNCOMMITED_CHANGES
+    }
 }
 
 sealed class StageStatus {