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

Reduced flickering when refreshing diff or changing between items

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-06-11 13:43:06 +02:00
parent 9bf5fc4663
commit 21c6f98bb3
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/kotlin/app/viewmodels/DiffViewModel.kt
View File

@ -2,6 +2,7 @@ package app.viewmodels
import androidx.compose.foundation.lazy.LazyListState
import app.exceptions.MissingDiffEntryException
import app.extensions.delayedStateChange
import app.git.*
import app.git.diff.Hunk
import kotlinx.coroutines.flow.MutableStateFlow
@ -9,6 +10,8 @@ import kotlinx.coroutines.flow.StateFlow
import org.eclipse.jgit.diff.DiffEntry
import javax.inject.Inject
private const val DIFF_MIN_TIME_IN_MS_TO_SHOW_LOAD = 200L
class DiffViewModel @Inject constructor(
private val tabState: TabState,
private val diffManager: DiffManager,
@ -31,11 +34,10 @@ class DiffViewModel @Inject constructor(
var oldDiffEntryType: DiffEntryType? = null
val oldDiffResult = _diffResult.value
if(oldDiffResult is ViewDiffResult.Loaded) {
if (oldDiffResult is ViewDiffResult.Loaded) {
oldDiffEntryType = oldDiffResult.diffEntryType
}
_diffResult.value = ViewDiffResult.Loading
// If it's a different file or different state (index or workdir), reset the scroll state
if (oldDiffEntryType != null &&
@ -49,10 +51,15 @@ class DiffViewModel @Inject constructor(
}
try {
val diffFormat = diffManager.diffFormat(git, diffEntryType)
_diffResult.value = ViewDiffResult.Loaded(diffEntryType, diffFormat)
delayedStateChange(
delayMs = DIFF_MIN_TIME_IN_MS_TO_SHOW_LOAD,
onDelayTriggered = { _diffResult.value = ViewDiffResult.Loading }
) {
val diffFormat = diffManager.diffFormat(git, diffEntryType)
_diffResult.value = ViewDiffResult.Loaded(diffEntryType, diffFormat)
}
} catch (ex: Exception) {
if(ex is MissingDiffEntryException) {
if (ex is MissingDiffEntryException) {
tabState.refreshData(refreshType = RefreshType.UNCOMMITED_CHANGES)
_diffResult.value = ViewDiffResult.DiffNotFound
} else