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

Remote branches in side panel is shown now without the remote name

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-02-05 01:35:21 +01:00
parent cc787064b6
commit 857032ec04
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/app/extensions/RefExtensions.kt
View File

@ -24,7 +24,7 @@ val Ref.simpleName: String
} }
} }
val Ref.simpleVisibleName: String val Ref.simpleLogName: String
get() { get() {
return when { return when {
this.name == Constants.HEAD -> { this.name == Constants.HEAD -> {

4
src/main/kotlin/app/ui/Remotes.kt
View File

@ -9,7 +9,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import app.extensions.simpleVisibleName import app.extensions.simpleName
import app.ui.components.SideMenuPanel import app.ui.components.SideMenuPanel
import app.ui.components.SideMenuSubentry import app.ui.components.SideMenuSubentry
import app.ui.components.VerticalExpandable import app.ui.components.VerticalExpandable
@ -80,7 +80,7 @@ private fun RemoteRow(
} }
) { ) {
SideMenuSubentry( SideMenuSubentry(
text = branch.simpleVisibleName, text = branch.simpleName,
extraPadding = 8.dp, extraPadding = 8.dp,
iconResourcePath = "branch.svg", iconResourcePath = "branch.svg",
onClick = { onBranchClicked(branch) } onClick = { onBranchClicked(branch) }

3
src/main/kotlin/app/ui/log/Log.kt
View File

@ -26,7 +26,6 @@ import androidx.compose.ui.input.pointer.PointerIconDefaults
import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.input.pointer.pointerHoverIcon
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -759,7 +758,7 @@ fun RefChip(
) )
} }
Text( Text(
text = ref.simpleVisibleName, text = ref.simpleLogName,
color = MaterialTheme.colors.primaryTextColor, color = MaterialTheme.colors.primaryTextColor,
fontSize = 13.sp, fontSize = 13.sp,
maxLines = 1, maxLines = 1,