Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added diff update when staging/unstagins (files & hunks)

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-12-28 02:40:18 +01:00
parent ad55f41f58
commit 6ddb77bf60
3 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/app/ui/Diff.kt
View File

@ -28,7 +28,7 @@ import org.eclipse.jgit.diff.DiffEntry
fun Diff(gitManager: GitManager, diffEntryType: DiffEntryType, onCloseDiffView: () -> Unit) {
var text by remember { mutableStateOf(listOf<Hunk>()) }
LaunchedEffect(diffEntryType.diffEntry) {
LaunchedEffect(Unit) {
text = gitManager.diffFormat(diffEntryType)

1
src/main/kotlin/app/ui/RepositoryOpen.kt
View File

@ -127,6 +127,7 @@ fun RepositoryOpenPage(gitManager: GitManager) {
if (selectedItem == SelectedItem.UncommitedChanges) {
UncommitedChanges(
gitManager = gitManager,
selectedEntryType = diffSelected,
onStagedDiffEntrySelected = { diffEntry ->
diffSelected = if (diffEntry != null)
DiffEntryType.StagedDiff(diffEntry)

58
src/main/kotlin/app/ui/UncommitedChanges.kt
View File

@ -30,6 +30,7 @@ import androidx.compose.ui.unit.sp
import app.extensions.filePath
import app.extensions.icon
import app.extensions.iconColor
import app.git.DiffEntryType
import app.git.GitManager
import app.git.StageStatus
import app.theme.headerBackground
@ -43,6 +44,7 @@ import org.eclipse.jgit.diff.DiffEntry
@Composable
fun UncommitedChanges(
gitManager: GitManager,
selectedEntryType: DiffEntryType?,
onStagedDiffEntrySelected: (DiffEntry?) -> Unit,
onUnstagedDiffEntrySelected: (DiffEntry) -> Unit,
) {
@ -55,12 +57,28 @@ fun UncommitedChanges(
gitManager.loadStatus()
}
val (staged, unstaged) = if (stageStatus is StageStatus.Loaded) {
stageStatus.staged to stageStatus.unstaged
val staged: List<DiffEntry>
val unstaged: List<DiffEntry>
if (stageStatus is StageStatus.Loaded) {
staged = stageStatus.staged
unstaged = stageStatus.unstaged
LaunchedEffect(staged) {
if(selectedEntryType != null) {
checkIfSelectedEntryShouldBeUpdated(
selectedEntryType = selectedEntryType,
staged = staged,
unstaged = unstaged,
onStagedDiffEntrySelected = onStagedDiffEntrySelected,
onUnstagedDiffEntrySelected = onUnstagedDiffEntrySelected,
)
}
}
} else {
listOf<DiffEntry>() to listOf<DiffEntry>() // return 2 empty lists if still loading
staged = listOf<DiffEntry>()
unstaged = listOf<DiffEntry>() // return empty lists if still loading
}
var commitMessage by remember { mutableStateOf("") }
val doCommit = {
gitManager.commit(commitMessage)
@ -170,6 +188,40 @@ fun UncommitedChanges(
}
}
fun checkIfSelectedEntryShouldBeUpdated(
selectedEntryType: DiffEntryType,
staged: List<DiffEntry>,
unstaged: List<DiffEntry>,
onStagedDiffEntrySelected: (DiffEntry?) -> Unit,
onUnstagedDiffEntrySelected: (DiffEntry) -> Unit,
) {
val selectedDiffEntry = selectedEntryType.diffEntry
val selectedEntryTypeNewId = selectedDiffEntry.newId.name()
if (selectedEntryType is DiffEntryType.StagedDiff) {
val entryType = staged.firstOrNull { it.newPath == selectedDiffEntry.newPath }
if(
entryType != null &&
selectedEntryTypeNewId != entryType.newId.name()
) {
onStagedDiffEntrySelected(entryType)
} else if (entryType == null)
onStagedDiffEntrySelected(null)
} else if(selectedEntryType is DiffEntryType.UnstagedDiff) {
val entryType = unstaged.firstOrNull {
if(selectedDiffEntry.changeType == DiffEntry.ChangeType.DELETE)
it.oldPath == selectedDiffEntry.oldPath
else
it.newPath == selectedDiffEntry.newPath
}
if(entryType != null) {
onUnstagedDiffEntrySelected(entryType)
} else onStagedDiffEntrySelected(null)
}
}
@OptIn(ExperimentalAnimationApi::class)
@Composable
private fun EntriesList(