From e75af0938fbc221ab4564a7b5b38e86dae7401c9 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Thu, 23 Feb 2023 13:10:49 +0100 Subject: [PATCH] Added trimStart for commit message Fixes #89 --- .../gitnuro/extensions/RevCommitExtensions.kt | 9 ++++++++- src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RevCommitExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RevCommitExtensions.kt index 7d2d3d0..b262a56 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RevCommitExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/RevCommitExtensions.kt @@ -8,4 +8,11 @@ fun RevCommit.fullData(repository: Repository): RevCommit? { repository.parseCommit(this) else this -} \ No newline at end of file +} + +fun RevCommit.getShortMessageTrimmed(): String { + return (this.fullMessage ?: "") + .trimStart() + .replace("\r\n", "\n") + .takeWhile { it != '\n' } +} diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt index 3e4fdb8..51f98c6 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt @@ -884,8 +884,13 @@ fun CommitMessage( } } } + + val message = remember(commit.id.name) { + commit.getShortMessageTrimmed() + } + Text( - text = commit.shortMessage, + text = message, modifier = Modifier .padding(start = 8.dp) .weight(1f),