From 4ed10c06821e617fcd144e072564a3f87c950463 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Mon, 21 Feb 2022 01:49:14 +0100 Subject: [PATCH] Reformated project's code --- src/main/kotlin/app/extensions/DateExtensions.kt | 2 +- src/main/kotlin/app/extensions/RefExtensions.kt | 4 ++-- src/main/kotlin/app/git/BranchesManager.kt | 2 +- src/main/kotlin/app/git/LogManager.kt | 2 +- src/main/kotlin/app/git/RawFileManager.kt | 3 +-- src/main/kotlin/app/git/RemoteOperationsManager.kt | 4 ++-- src/main/kotlin/app/git/StatusManager.kt | 2 +- src/main/kotlin/app/ui/Branches.kt | 1 - src/main/kotlin/app/ui/Remotes.kt | 2 -- src/main/kotlin/app/ui/Stashes.kt | 2 +- src/main/kotlin/app/ui/UncommitedChanges.kt | 1 - .../app/ui/components/ScrollableLazyColumn.kt | 2 -- src/main/kotlin/app/ui/components/SideMenuEntry.kt | 7 ++++--- .../app/ui/context_menu/DropDownContentData.kt | 2 -- .../kotlin/app/ui/context_menu/LogContextMenu.kt | 3 ++- src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt | 4 ++-- src/main/kotlin/app/viewmodels/LogViewModel.kt | 4 ++-- src/main/kotlin/app/viewmodels/MenuViewModel.kt | 2 +- src/main/kotlin/app/viewmodels/RemotesViewModel.kt | 13 ++++++------- src/main/kotlin/app/viewmodels/StatusViewModel.kt | 2 +- src/main/resources/add.svg | 5 ++++- src/main/resources/more_vert.svg | 5 ++++- src/main/resources/refresh.svg | 5 ++++- src/main/resources/remove.svg | 5 ++++- 24 files changed, 44 insertions(+), 40 deletions(-) diff --git a/src/main/kotlin/app/extensions/DateExtensions.kt b/src/main/kotlin/app/extensions/DateExtensions.kt index a8b1359..0d19a4d 100644 --- a/src/main/kotlin/app/extensions/DateExtensions.kt +++ b/src/main/kotlin/app/extensions/DateExtensions.kt @@ -11,7 +11,7 @@ fun Date.toSmartSystemString(): String { val sdf = DateFormat.getDateInstance(DateFormat.MEDIUM, locale) val zoneId = ZoneId.systemDefault() - val localDate = this.toInstant().atZone(zoneId).toLocalDate(); + val localDate = this.toInstant().atZone(zoneId).toLocalDate() val currentTime = LocalDate.now(zoneId) var result = sdf.format(this) diff --git a/src/main/kotlin/app/extensions/RefExtensions.kt b/src/main/kotlin/app/extensions/RefExtensions.kt index 191e00e..578c192 100644 --- a/src/main/kotlin/app/extensions/RefExtensions.kt +++ b/src/main/kotlin/app/extensions/RefExtensions.kt @@ -4,6 +4,7 @@ import org.eclipse.jgit.lib.Constants import org.eclipse.jgit.lib.ObjectIdRef import org.eclipse.jgit.lib.Ref +// Remotes can have slashes in the name, but we won't care about it, known issue private const val REMOTE_PREFIX_LENGTH = 3 private const val LOCAL_PREFIX_LENGTH = 2 @@ -54,7 +55,6 @@ val Ref.isLocal: Boolean val Ref.isRemote: Boolean get() = this.name.startsWith(Constants.R_REMOTES) - fun Ref.isSameBranch(otherRef: Ref?): Boolean { if (this.name == Constants.HEAD && otherRef == null) return true @@ -63,4 +63,4 @@ fun Ref.isSameBranch(otherRef: Ref?): Boolean { return false return this.name == otherRef.name -} \ No newline at end of file +} diff --git a/src/main/kotlin/app/git/BranchesManager.kt b/src/main/kotlin/app/git/BranchesManager.kt index b46f5bf..84485e2 100644 --- a/src/main/kotlin/app/git/BranchesManager.kt +++ b/src/main/kotlin/app/git/BranchesManager.kt @@ -25,7 +25,7 @@ class BranchesManager @Inject constructor() { it.name == branchName } - if(branchFound == null) { + if (branchFound == null) { branchFound = branchList.firstOrNull { it.objectId.name == branchName // Try to get the HEAD } diff --git a/src/main/kotlin/app/git/LogManager.kt b/src/main/kotlin/app/git/LogManager.kt index c96cd98..33c145b 100644 --- a/src/main/kotlin/app/git/LogManager.kt +++ b/src/main/kotlin/app/git/LogManager.kt @@ -76,7 +76,7 @@ class LogManager @Inject constructor( val log = git.log().setMaxCount(1).call() val latestCommitNode = log.firstOrNull() - return@withContext if(latestCommitNode == null) + return@withContext if (latestCommitNode == null) "" else latestCommitNode.fullMessage diff --git a/src/main/kotlin/app/git/RawFileManager.kt b/src/main/kotlin/app/git/RawFileManager.kt index 7230b93..c86a185 100644 --- a/src/main/kotlin/app/git/RawFileManager.kt +++ b/src/main/kotlin/app/git/RawFileManager.kt @@ -15,7 +15,6 @@ import org.eclipse.jgit.treewalk.WorkingTreeIterator import org.eclipse.jgit.util.LfsFactory import java.io.FileOutputStream import java.nio.file.Path -import kotlin.io.path.absolutePathString import kotlin.io.path.createTempFile @@ -105,7 +104,7 @@ sealed class EntryContent { object Missing : EntryContent() object InvalidObjectBlob : EntryContent() data class Text(val rawText: RawText) : EntryContent() - sealed class BinaryContent() : EntryContent() + sealed class BinaryContent : EntryContent() data class ImageBinary(val tempFilePath: Path) : BinaryContent() object Binary : BinaryContent() object TooLargeEntry : EntryContent() diff --git a/src/main/kotlin/app/git/RemoteOperationsManager.kt b/src/main/kotlin/app/git/RemoteOperationsManager.kt index 9f11700..a469890 100644 --- a/src/main/kotlin/app/git/RemoteOperationsManager.kt +++ b/src/main/kotlin/app/git/RemoteOperationsManager.kt @@ -36,8 +36,8 @@ class RemoteOperationsManager @Inject constructor( if (!pullResult.isSuccessful) { var message = "Pull failed" - if(rebase) { - message = when(pullResult.rebaseResult.status) { + if (rebase) { + message = when (pullResult.rebaseResult.status) { RebaseResult.Status.UNCOMMITTED_CHANGES -> "The pull with rebase has failed because you have got uncommited changes" RebaseResult.Status.CONFLICTS -> "Pull with rebase has conflicts, fix them to continue" else -> message diff --git a/src/main/kotlin/app/git/StatusManager.kt b/src/main/kotlin/app/git/StatusManager.kt index c0a1216..998aa8f 100644 --- a/src/main/kotlin/app/git/StatusManager.kt +++ b/src/main/kotlin/app/git/StatusManager.kt @@ -321,7 +321,7 @@ class StatusManager @Inject constructor( val addedEntries = diffEntries.filter { it.changeType == DiffEntry.ChangeType.ADD } - if(addedEntries.isNotEmpty()) { + if (addedEntries.isNotEmpty()) { val addCommand = git .add() diff --git a/src/main/kotlin/app/ui/Branches.kt b/src/main/kotlin/app/ui/Branches.kt index 3c64137..be1e636 100644 --- a/src/main/kotlin/app/ui/Branches.kt +++ b/src/main/kotlin/app/ui/Branches.kt @@ -14,7 +14,6 @@ import app.extensions.simpleName import app.ui.components.SideMenuPanel import app.ui.components.SideMenuSubentry import app.ui.context_menu.branchContextMenuItems -import app.ui.context_menu.remoteContextMenu import app.ui.dialogs.MergeDialog import app.ui.dialogs.RebaseDialog import app.viewmodels.BranchesViewModel diff --git a/src/main/kotlin/app/ui/Remotes.kt b/src/main/kotlin/app/ui/Remotes.kt index 98a1fa7..7f537d8 100644 --- a/src/main/kotlin/app/ui/Remotes.kt +++ b/src/main/kotlin/app/ui/Remotes.kt @@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.material.Icon import androidx.compose.material.IconButton import androidx.compose.material.MaterialTheme -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Settings import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource diff --git a/src/main/kotlin/app/ui/Stashes.kt b/src/main/kotlin/app/ui/Stashes.kt index e7fc914..32cd066 100644 --- a/src/main/kotlin/app/ui/Stashes.kt +++ b/src/main/kotlin/app/ui/Stashes.kt @@ -42,7 +42,7 @@ fun Stashes( }, onDelete = { stashesViewModel.deleteStash(stash) - }, + }, ) ) } diff --git a/src/main/kotlin/app/ui/UncommitedChanges.kt b/src/main/kotlin/app/ui/UncommitedChanges.kt index 80ed898..cc8e678 100644 --- a/src/main/kotlin/app/ui/UncommitedChanges.kt +++ b/src/main/kotlin/app/ui/UncommitedChanges.kt @@ -19,7 +19,6 @@ import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.graphics.Shape import androidx.compose.ui.input.key.Key import androidx.compose.ui.input.key.isCtrlPressed diff --git a/src/main/kotlin/app/ui/components/ScrollableLazyColumn.kt b/src/main/kotlin/app/ui/components/ScrollableLazyColumn.kt index 7ac5241..112bf9d 100644 --- a/src/main/kotlin/app/ui/components/ScrollableLazyColumn.kt +++ b/src/main/kotlin/app/ui/components/ScrollableLazyColumn.kt @@ -1,7 +1,6 @@ package app.ui.components import androidx.compose.foundation.LocalScrollbarStyle -import androidx.compose.foundation.ScrollbarStyle import androidx.compose.foundation.VerticalScrollbar import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight @@ -15,7 +14,6 @@ import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import app.theme.scrollbarHover import app.theme.scrollbarUnhover diff --git a/src/main/kotlin/app/ui/components/SideMenuEntry.kt b/src/main/kotlin/app/ui/components/SideMenuEntry.kt index 8ae30c2..39d1d76 100644 --- a/src/main/kotlin/app/ui/components/SideMenuEntry.kt +++ b/src/main/kotlin/app/ui/components/SideMenuEntry.kt @@ -2,14 +2,15 @@ package app.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.hoverable -import androidx.compose.foundation.interaction.HoverInteraction import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsHoveredAsState import androidx.compose.foundation.layout.* import androidx.compose.material.Icon import androidx.compose.material.MaterialTheme import androidx.compose.material.Text -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.painter.Painter @@ -60,7 +61,7 @@ fun SideMenuEntry( overflow = TextOverflow.Ellipsis, ) - if(hoverIcon != null && isHovered) { + if (hoverIcon != null && isHovered) { hoverIcon() } else Text( diff --git a/src/main/kotlin/app/ui/context_menu/DropDownContentData.kt b/src/main/kotlin/app/ui/context_menu/DropDownContentData.kt index 3ca695e..f104cf6 100644 --- a/src/main/kotlin/app/ui/context_menu/DropDownContentData.kt +++ b/src/main/kotlin/app/ui/context_menu/DropDownContentData.kt @@ -1,7 +1,5 @@ package app.ui.context_menu -import androidx.compose.ui.graphics.painter.Painter - data class DropDownContentData( val label: String, val icon: String? = null, diff --git a/src/main/kotlin/app/ui/context_menu/LogContextMenu.kt b/src/main/kotlin/app/ui/context_menu/LogContextMenu.kt index 97ae1e5..3927869 100644 --- a/src/main/kotlin/app/ui/context_menu/LogContextMenu.kt +++ b/src/main/kotlin/app/ui/context_menu/LogContextMenu.kt @@ -14,7 +14,8 @@ fun logContextMenu( ) = listOf( ContextMenuItem( label = "Checkout commit", - onClick = onCheckoutCommit), + onClick = onCheckoutCommit + ), ContextMenuItem( label = "Create branch", onClick = onCreateNewBranch diff --git a/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt b/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt index 9678917..0e40c4b 100644 --- a/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt @@ -17,9 +17,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp +import app.theme.borderColor import app.theme.primaryTextColor import app.theme.secondaryTextColor -import app.theme.borderColor import app.viewmodels.RemotesViewModel import org.eclipse.jgit.transport.RemoteConfig @@ -115,7 +115,7 @@ fun EditRemotesDialog( modifier = Modifier.weight(1f) ) { items(remotesEditorData.listRemotes) { remote -> - val background = if(remote == selectedRemote) { + val background = if (remote == selectedRemote) { MaterialTheme.colors.background } else MaterialTheme.colors.surface diff --git a/src/main/kotlin/app/viewmodels/LogViewModel.kt b/src/main/kotlin/app/viewmodels/LogViewModel.kt index eee3141..b220afc 100644 --- a/src/main/kotlin/app/viewmodels/LogViewModel.kt +++ b/src/main/kotlin/app/viewmodels/LogViewModel.kt @@ -123,10 +123,10 @@ class LogViewModel @Inject constructor( val previousLogStatusValue = _logStatus.value - if(previousLogStatusValue is LogStatus.Loaded) { + if (previousLogStatusValue is LogStatus.Loaded) { val newLogStatusValue = LogStatus.Loaded( hasUncommitedChanges = hasUncommitedChanges, - plotCommitList = previousLogStatusValue.plotCommitList, + plotCommitList = previousLogStatusValue.plotCommitList, currentBranch = currentBranch, statusSummary = statsSummary, ) diff --git a/src/main/kotlin/app/viewmodels/MenuViewModel.kt b/src/main/kotlin/app/viewmodels/MenuViewModel.kt index 6cd4801..5f24eac 100644 --- a/src/main/kotlin/app/viewmodels/MenuViewModel.kt +++ b/src/main/kotlin/app/viewmodels/MenuViewModel.kt @@ -53,7 +53,7 @@ class MenuViewModel @Inject constructor( fun refresh() = tabState.safeProcessing( refreshType = RefreshType.ALL_DATA, - ){ + ) { // Nothing to do here } } \ No newline at end of file diff --git a/src/main/kotlin/app/viewmodels/RemotesViewModel.kt b/src/main/kotlin/app/viewmodels/RemotesViewModel.kt index fd94b38..d7f428b 100644 --- a/src/main/kotlin/app/viewmodels/RemotesViewModel.kt +++ b/src/main/kotlin/app/viewmodels/RemotesViewModel.kt @@ -10,7 +10,6 @@ import kotlinx.coroutines.withContext import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.RemoteSetUrlCommand import org.eclipse.jgit.lib.Ref -import org.eclipse.jgit.transport.URIish import javax.inject.Inject class RemotesViewModel @Inject constructor( @@ -68,7 +67,7 @@ class RemotesViewModel @Inject constructor( } fun deleteRemote(remoteName: String, isNew: Boolean) = tabState.safeProcessing( - refreshType = if(isNew) RefreshType.REMOTES else RefreshType.ALL_DATA, + refreshType = if (isNew) RefreshType.REMOTES else RefreshType.ALL_DATA, showError = true, ) { git -> remotesManager.deleteRemote(git, remoteName) @@ -88,11 +87,11 @@ class RemotesViewModel @Inject constructor( refreshType = RefreshType.REMOTES, showError = true, ) { git -> - if(selectedRemoteConfig.fetchUri.isBlank()) { + if (selectedRemoteConfig.fetchUri.isBlank()) { throw InvalidRemoteUrlException("Invalid empty fetch URI") } - if(selectedRemoteConfig.pushUri.isBlank()) { + if (selectedRemoteConfig.pushUri.isBlank()) { throw InvalidRemoteUrlException("Invalid empty push URI") } @@ -101,16 +100,16 @@ class RemotesViewModel @Inject constructor( updateRemote(selectedRemoteConfig) // Sets both, fetch and push uri } - fun updateRemote(selectedRemoteConfig: RemoteWrapper) = tabState.runOperation( + fun updateRemote(selectedRemoteConfig: RemoteWrapper) = tabState.runOperation( refreshType = RefreshType.REMOTES, showError = true, ) { git -> - if(selectedRemoteConfig.fetchUri.isBlank()) { + if (selectedRemoteConfig.fetchUri.isBlank()) { throw InvalidRemoteUrlException("Invalid empty fetch URI") } - if(selectedRemoteConfig.pushUri.isBlank()) { + if (selectedRemoteConfig.pushUri.isBlank()) { throw InvalidRemoteUrlException("Invalid empty push URI") } diff --git a/src/main/kotlin/app/viewmodels/StatusViewModel.kt b/src/main/kotlin/app/viewmodels/StatusViewModel.kt index 7b0ac5d..fff9e2e 100644 --- a/src/main/kotlin/app/viewmodels/StatusViewModel.kt +++ b/src/main/kotlin/app/viewmodels/StatusViewModel.kt @@ -95,7 +95,7 @@ class StatusViewModel @Inject constructor( fun commit(message: String, amend: Boolean) = tabState.safeProcessing( refreshType = RefreshType.ALL_DATA, ) { git -> - val commitMessage = if(amend && message.isBlank()) { + val commitMessage = if (amend && message.isBlank()) { logManager.latestMessage(git) } else message diff --git a/src/main/resources/add.svg b/src/main/resources/add.svg index bead882..a89a929 100644 --- a/src/main/resources/add.svg +++ b/src/main/resources/add.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/src/main/resources/more_vert.svg b/src/main/resources/more_vert.svg index f226ebf..707e578 100644 --- a/src/main/resources/more_vert.svg +++ b/src/main/resources/more_vert.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/src/main/resources/refresh.svg b/src/main/resources/refresh.svg index e217f03..4b0ba27 100644 --- a/src/main/resources/refresh.svg +++ b/src/main/resources/refresh.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/src/main/resources/remove.svg b/src/main/resources/remove.svg index d84e9a6..156879f 100644 --- a/src/main/resources/remove.svg +++ b/src/main/resources/remove.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file