Current branch now shows HEAD instead of a dot and bold text

This and the previous commit fix the scroll overlap of https://github.com/JetpackDuba/Gitnuro/issues/12

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(
+                Text(
-                    painter = painterResource("location.svg"),
+                    text = "HEAD",
-                    contentDescription = null,
+                    color = MaterialTheme.colors.secondaryTextColor,
-                    modifier = Modifier.padding(horizontal = 4.dp),
+                    fontSize = 12.sp,
-                    tint = MaterialTheme.colors.primaryVariant,
+                    modifier = Modifier.padding(horizontal = 16.dp),
                 )
             }
         }

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,
+            fontSize = 12.sp,
-            fontWeight = if (bold) FontWeight.SemiBold else FontWeight.Normal,
             color = MaterialTheme.colors.primaryTextColor,
             softWrap = false,
         )