From d9bd6fc905220de5bd2cb1fae54710f3eccccf9d Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Wed, 24 Jan 2024 20:36:26 +0100 Subject: [PATCH] Selected branch is now shown as bold in the side panel --- src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt | 1 + .../com/jetpackduba/gitnuro/ui/components/SideMenuSubentry.kt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt index 3285e13..923f6d5 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt @@ -437,6 +437,7 @@ private fun Branch( ) { SideMenuSubentry( text = branch.simpleName, + fontWeight = if (isCurrentBranch) FontWeight.Bold else FontWeight.Normal, iconResourcePath = AppIcons.BRANCH, isSelected = isSelectedItem, onClick = onBranchClicked, diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuSubentry.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuSubentry.kt index fe53cb2..9b81c9f 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuSubentry.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuSubentry.kt @@ -13,6 +13,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.extensions.backgroundIf @@ -26,6 +27,7 @@ const val ENTRY_HEIGHT = 36 @Composable fun SideMenuSubentry( text: String, + fontWeight: FontWeight = FontWeight.Normal, iconResourcePath: String, isSelected: Boolean, extraPadding: Dp = 0.dp, @@ -59,6 +61,7 @@ fun SideMenuSubentry( Text( text = text, + fontWeight = fontWeight, modifier = Modifier.weight(1f, fill = true), maxLines = 1, style = MaterialTheme.typography.body2,