From 0512510be6c2b1221e5144025f9d1f3d41d406ae Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sat, 15 Apr 2023 16:04:02 +0200 Subject: [PATCH] Removed whitespace replace when in a new tab --- .../ui/components/RepositoriesTabPanel.kt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/RepositoriesTabPanel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/RepositoriesTabPanel.kt index 1319a07..ad2cfe0 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/RepositoriesTabPanel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/RepositoriesTabPanel.kt @@ -100,6 +100,7 @@ fun RepositoriesTabPanel( Tab( title = tab.tabName, isSelected = currentTab == tab, + isNewTab = tab.path == null, onClick = { onTabSelected(tab) }, @@ -143,7 +144,12 @@ fun RepositoriesTabPanel( } @Composable -fun Tab(title: MutableState, isSelected: Boolean, onClick: () -> Unit, onCloseTab: () -> Unit) { +fun Tab( + title: MutableState, + isSelected: Boolean, + isNewTab: Boolean, + onClick: () -> Unit, onCloseTab: () -> Unit +) { val backgroundColor = if (isSelected) MaterialTheme.colors.surface else @@ -151,6 +157,13 @@ fun Tab(title: MutableState, isSelected: Boolean, onClick: () -> Unit, o val hoverInteraction = remember { MutableInteractionSource() } val isHovered by hoverInteraction.collectIsHoveredAsState() + val tabTitle = if (isNewTab) + title.value + else + title.value.replace( + " ", + "-" + ) // TODO This replace is a workaround for https://issuetracker.google.com/issues/278044455 Box( modifier = Modifier @@ -168,7 +181,7 @@ fun Tab(title: MutableState, isSelected: Boolean, onClick: () -> Unit, o horizontalArrangement = Arrangement.SpaceBetween, ) { Text( - text = title.value.replace(" ", "-"), // TODO This replace is a workaround for https://issuetracker.google.com/issues/278044455 + text = tabTitle, modifier = Modifier .padding(start = 16.dp) .weight(1f)