diff --git a/src/main/kotlin/app/ui/Branches.kt b/src/main/kotlin/app/ui/Branches.kt index 22cadaf..87b0dbb 100644 --- a/src/main/kotlin/app/ui/Branches.kt +++ b/src/main/kotlin/app/ui/Branches.kt @@ -5,12 +5,16 @@ import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.padding import androidx.compose.material.Icon import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import app.extensions.isLocal import app.extensions.simpleName +import app.theme.backgroundSelected +import app.theme.secondaryTextColor import app.ui.components.SideMenuPanel import app.ui.components.SideMenuSubentry import app.ui.context_menu.branchContextMenuItems @@ -85,16 +89,15 @@ private fun BranchLineEntry( SideMenuSubentry( text = branch.simpleName, iconResourcePath = "branch.svg", - bold = isCurrentBranch, onClick = onBranchClicked, - onDoubleClick = onBranchDoubleClicked + onDoubleClick = onBranchDoubleClicked, ) { if (isCurrentBranch) { - Icon( - painter = painterResource("location.svg"), - contentDescription = null, - modifier = Modifier.padding(horizontal = 4.dp), - tint = MaterialTheme.colors.primaryVariant, + Text( + text = "HEAD", + color = MaterialTheme.colors.secondaryTextColor, + fontSize = 12.sp, + modifier = Modifier.padding(horizontal = 16.dp), ) } } diff --git a/src/main/kotlin/app/ui/components/SideMenuSubentry.kt b/src/main/kotlin/app/ui/components/SideMenuSubentry.kt index 90966e3..3c7d5d6 100644 --- a/src/main/kotlin/app/ui/components/SideMenuSubentry.kt +++ b/src/main/kotlin/app/ui/components/SideMenuSubentry.kt @@ -3,6 +3,7 @@ package app.ui.components import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.* @@ -13,6 +14,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp @@ -26,8 +28,8 @@ import app.theme.primaryTextColor fun SideMenuSubentry( text: String, iconResourcePath: String, - bold: Boolean = false, extraPadding: Dp = 0.dp, + background: Color = MaterialTheme.colors.background, onClick: (() -> Unit)? = null, onDoubleClick: (() -> Unit)? = null, additionalInfo: @Composable () -> Unit = {} @@ -42,7 +44,8 @@ fun SideMenuSubentry( else this } - .padding(start = extraPadding), + .padding(start = extraPadding) + .background(background), verticalAlignment = Alignment.CenterVertically, ) { Icon( @@ -58,8 +61,7 @@ fun SideMenuSubentry( text = text, modifier = Modifier.weight(1f, fill = true), maxLines = 1, - fontSize = 13.sp, - fontWeight = if (bold) FontWeight.SemiBold else FontWeight.Normal, + fontSize = 12.sp, color = MaterialTheme.colors.primaryTextColor, softWrap = false, )