From 84d986587d81d912aed0fc880a5bf38fc5df97f7 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Mon, 21 Feb 2022 15:19:45 +0100 Subject: [PATCH] Reduced status sumary font size + fixed typo --- src/main/kotlin/app/ui/log/Log.kt | 3 ++- src/main/kotlin/app/viewmodels/LogViewModel.kt | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/app/ui/log/Log.kt b/src/main/kotlin/app/ui/log/Log.kt index b4d2dad..698b31c 100644 --- a/src/main/kotlin/app/ui/log/Log.kt +++ b/src/main/kotlin/app/ui/log/Log.kt @@ -510,13 +510,14 @@ fun SummaryEntry( Text( text = count.toString(), color = MaterialTheme.colors.primaryTextColor, + fontSize = 14.sp, ) Icon( imageVector = icon, tint = color, contentDescription = null, - modifier = Modifier.size(16.dp) + modifier = Modifier.size(14.dp) ) } } diff --git a/src/main/kotlin/app/viewmodels/LogViewModel.kt b/src/main/kotlin/app/viewmodels/LogViewModel.kt index 39ee52c..e635d4c 100644 --- a/src/main/kotlin/app/viewmodels/LogViewModel.kt +++ b/src/main/kotlin/app/viewmodels/LogViewModel.kt @@ -30,16 +30,16 @@ class LogViewModel @Inject constructor( val currentBranch = branchesManager.currentBranchRef(git) - val statsSummary = statusManager.getStatusSummary( + val statusSummary = statusManager.getStatusSummary( git = git, currentBranch = currentBranch, repositoryState = repositoryManager.getRepositoryState(git), ) - val hasUncommitedChanges = statsSummary.addedCount + statsSummary.deletedCount + statsSummary.modifiedCount > 0 + val hasUncommitedChanges = statusSummary.addedCount + statusSummary.deletedCount + statusSummary.modifiedCount > 0 val log = logManager.loadLog(git, currentBranch, hasUncommitedChanges) - _logStatus.value = LogStatus.Loaded(hasUncommitedChanges, log, currentBranch, statsSummary) + _logStatus.value = LogStatus.Loaded(hasUncommitedChanges, log, currentBranch, statusSummary) } fun checkoutCommit(revCommit: RevCommit) = tabState.safeProcessing(