luisgulo/Gitnuro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed diff buttons disappearing when using split mode

Browse source 
Fixes #169
This commit is contained in:
Abdelilah El Aissaoui 2023-10-10 16:37:10 +02:00
parent b25375dad8
commit 950c9398bf
No known key found for this signature in database
GPG key ID: 7587FC860F594869
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/kotlin/com/jetpackduba/gitnuro/git/diff/DiffResult.kt
View file

@ -7,15 +7,17 @@ import org.eclipse.jgit.submodule.SubmoduleStatus
sealed class DiffResult( sealed class DiffResult(
val diffEntry: DiffEntry, val diffEntry: DiffEntry,
) { ) {
sealed class TextDiff(diffEntry: DiffEntry): DiffResult(diffEntry)
class Text( class Text(
diffEntry: DiffEntry, diffEntry: DiffEntry,
val hunks: List<Hunk> val hunks: List<Hunk>
) : DiffResult(diffEntry) ) : TextDiff(diffEntry)
class TextSplit( class TextSplit(
diffEntry: DiffEntry, diffEntry: DiffEntry,
val hunks: List<SplitHunk> val hunks: List<SplitHunk>
) : DiffResult(diffEntry) ) : TextDiff(diffEntry)
class NonText( class NonText(
diffEntry: DiffEntry, diffEntry: DiffEntry,

2
src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
View file

@ -121,7 +121,7 @@ fun Diff(
diffEntry = diffEntry, diffEntry = diffEntry,
onCloseDiffView = onCloseDiffView, onCloseDiffView = onCloseDiffView,
diffType = diffType, diffType = diffType,
isTextDiff = diffResult is DiffResult.Text, isTextDiff = diffResult is DiffResult.TextDiff,
isDisplayFullFile = isDisplayFullFile, isDisplayFullFile = isDisplayFullFile,
onStageFile = { diffViewModel.stageFile(it) }, onStageFile = { diffViewModel.stageFile(it) },
onUnstageFile = { diffViewModel.unstageFile(it) }, onUnstageFile = { diffViewModel.unstageFile(it) },