Merge pull request #182 from tarkalabs/ms/fix/floating_nav

tarkalabs · Feb 2, 2024 · ab62bd3 · ab62bd3
2 parents 78fa537 + f6cd485
commit ab62bd3
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 10 deletions.
diff --git a/...ts.screenshots.TUIFloatingNavBarScreenShotTest__twoFourTest_darkTheme_false.png b/...ts.screenshots.TUIFloatingNavBarScreenShotTest__twoFourTest_darkTheme_false.png
diff --git a/...nts.screenshots.TUIFloatingNavBarScreenShotTest__twoFourTest_darkTheme_true.png b/...nts.screenshots.TUIFloatingNavBarScreenShotTest__twoFourTest_darkTheme_true.png
diff --git a/...s.screenshots.TUIFloatingNavBarScreenShotTest__twoItemsTest_darkTheme_false.png b/...s.screenshots.TUIFloatingNavBarScreenShotTest__twoItemsTest_darkTheme_false.png
diff --git a/...ts.screenshots.TUIFloatingNavBarScreenShotTest__twoItemsTest_darkTheme_true.png b/...ts.screenshots.TUIFloatingNavBarScreenShotTest__twoItemsTest_darkTheme_true.png
diff --git a/...TUIFloatingNavButtonScreenShotTest__floatingNavBurgerButton_darkTheme_false.png b/...TUIFloatingNavButtonScreenShotTest__floatingNavBurgerButton_darkTheme_false.png
diff --git a/....TUIFloatingNavButtonScreenShotTest__floatingNavBurgerButton_darkTheme_true.png b/....TUIFloatingNavButtonScreenShotTest__floatingNavBurgerButton_darkTheme_true.png
diff --git a/...shots.TUIFloatingNavButtonScreenShotTest__floatingNavButton_darkTheme_false.png b/...shots.TUIFloatingNavButtonScreenShotTest__floatingNavButton_darkTheme_false.png
diff --git a/...nshots.TUIFloatingNavButtonScreenShotTest__floatingNavButton_darkTheme_true.png b/...nshots.TUIFloatingNavButtonScreenShotTest__floatingNavButton_darkTheme_true.png
diff --git a/...s.TUIFloatingNavButtonScreenShotTest__floatingNavListButton_darkTheme_false.png b/...s.TUIFloatingNavButtonScreenShotTest__floatingNavListButton_darkTheme_false.png
diff --git a/...ts.TUIFloatingNavButtonScreenShotTest__floatingNavListButton_darkTheme_true.png b/...ts.TUIFloatingNavButtonScreenShotTest__floatingNavListButton_darkTheme_true.png
diff --git a/...loatingNavButtonScreenShotTest__floatingNavViewToggleButton_darkTheme_false.png b/...loatingNavButtonScreenShotTest__floatingNavViewToggleButton_darkTheme_false.png
diff --git a/...FloatingNavButtonScreenShotTest__floatingNavViewToggleButton_darkTheme_true.png b/...FloatingNavButtonScreenShotTest__floatingNavViewToggleButton_darkTheme_true.png
diff --git a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/tab/TUIFloatingNavBar.kt b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/tab/TUIFloatingNavBar.kt
@@ -44,7 +44,7 @@ import com.tarkalabs.uicomponents.theme.TUITheme
     horizontalArrangement = Arrangement.SpaceAround,
     modifier = modifier
       .horizontalScroll(rememberScrollState())
-      .background(color = TUITheme.colors.primaryAltHover, shape = RoundedCornerShape(32.dp))
+      .background(color = TUITheme.colors.primaryAltHover.copy(alpha = 0.3f), shape = RoundedCornerShape(32.dp))
       .border(
         width = 1.dp,
         color = TUITheme.colors.primaryAltHover,

diff --git a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/tab/TUIFloatingNavButton.kt b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/tab/TUIFloatingNavButton.kt
@@ -1,11 +1,11 @@
 package com.tarkalabs.uicomponents.components.tab
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -18,7 +18,6 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.tarkalabs.tarkaicons.Add24
 import com.tarkalabs.tarkaicons.CalendarRtl24
 import com.tarkalabs.tarkaicons.ChevronDown24
 import com.tarkalabs.tarkaicons.Directions24
@@ -27,11 +26,7 @@ import com.tarkalabs.tarkaicons.Map24
 import com.tarkalabs.tarkaicons.Navigation24
 import com.tarkalabs.tarkaicons.TarkaIcon
 import com.tarkalabs.tarkaicons.TarkaIcons
-import com.tarkalabs.tarkaicons.TarkaIcons.Regular
-import com.tarkalabs.uicomponents.components.HorizontalSpacer
 import com.tarkalabs.uicomponents.components.VerticalSpacer
-import com.tarkalabs.uicomponents.components.base.FloatingActionButtonSize.R
-import com.tarkalabs.uicomponents.components.base.TUIFloatingActionButton
 import com.tarkalabs.uicomponents.components.tab.TUIFloatingNavButtonContentType.Burger
 import com.tarkalabs.uicomponents.components.tab.TUIFloatingNavButtonContentType.List
 import com.tarkalabs.uicomponents.components.tab.TUIFloatingNavButtonContentType.Navigation
@@ -85,7 +80,12 @@ sealed class TUIFloatingNavButtonContentType {
         onClicked()
       }
     }
-    .background(shape = RoundedCornerShape(32.dp), color = TUITheme.colors.primaryAltHover)
+    .background(
+      shape = RoundedCornerShape(32.dp), color = TUITheme.colors.primaryAltHover.copy(0.3f)
+    )
+    .border(
+      width = 1.dp, color = TUITheme.colors.primaryAltHover, shape = RoundedCornerShape(32.dp)
+    )
     .testTag(tags.parentTag)) {
 
     when (contentType) {
@@ -222,6 +222,9 @@ data class TUIFloatingNavButtonTags(
 @Preview @Composable fun TUIFloatingNavButtonPreview() {
   TUITheme {
     Column(
+      modifier = Modifier
+        .fillMaxSize()
+        .background(TUITheme.colors.surface),
       horizontalAlignment = Alignment.CenterHorizontally
     ) {
       VerticalSpacer(space = 40)

diff --git a/tarkaui/src/main/java/com/tarkalabs/uicomponents/theme/Color.kt b/tarkaui/src/main/java/com/tarkalabs/uicomponents/theme/Color.kt
@@ -138,6 +138,6 @@ val defaultDarkColors = TUIColors(
   surfaceVariantHover = Color(0xFF353F50),
   inputTextDim = Color(0xFFFCFCFD),
   surfaceHover = Color(0xFF29313D),
-  primaryAltHover = Color(0xFFC4D7F3),
+  primaryAltHover = Color(0xFF324767),
   )