Minor optimisation in SearchBar naming

tarkalabs · Mar 5, 2024 · bd962ec · bd962ec
1 parent 754924c
commit bd962ec
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt b/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt
@@ -53,7 +53,7 @@ class UIComponentListActivity : ComponentActivity() {
             onSearchQuery = {
               query = it
             },
-            toggleSearchbar = showSearchbar
+            showSearchBar = showSearchbar
           )
 
         }) { paddingValues ->

diff --git a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUIAppTopBar.kt b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUIAppTopBar.kt
@@ -82,38 +82,37 @@ import com.tarkalabs.tarkaui.theme.TUITheme
   onSecondMenuItemClicked: () -> Unit = {},
   onThirdMenuItemClicked: () -> Unit = {},
   onSearchQuery: (String) -> Unit = {},
-  searchQuery : String = "",
-  searchQueryHint : String = "",
+  searchQuery: String = "",
+  searchQueryHint: String = "",
   disableSearchIcon: Boolean = false,
   clearQueryAndHideSearchBar: Boolean = false,
-  toggleSearchbar: Boolean = false,
+  showSearchBar: Boolean = false,
   colors: TopAppBarColors = TopAppBarDefaults.topAppBarColors(
     containerColor = TUITheme.colors.surface
   ),
   scrollBehavior: TopAppBarScrollBehavior? = null,
   tags: TUIAppTopBarTags = TUIAppTopBarTags(),
 ) {
 
-  var showSearchBar by remember {
+  var showSearchBarState by remember {
     mutableStateOf(false)
   }
 
-  if (clearQueryAndHideSearchBar && showSearchBar) {
-    showSearchBar = false
+  if (clearQueryAndHideSearchBar && showSearchBarState) {
+    showSearchBarState = false
     onSearchQuery("")
   }
-  LaunchedEffect(key1 = toggleSearchbar){
-    showSearchBar = toggleSearchbar
+  LaunchedEffect(key1 = showSearchBar) {
+    showSearchBarState = showSearchBar
   }
 
   Column(
     modifier = modifier
       .background(color = TUITheme.colors.surface)
       .fillMaxWidth()
-      .wrapContentHeight(),
-    horizontalAlignment = Alignment.CenterHorizontally
+      .wrapContentHeight(), horizontalAlignment = Alignment.CenterHorizontally
   ) {
-    if (showSearchBar) {
+    if (showSearchBarState) {
       TUISearchBar(
         modifier = Modifier
           .fillMaxWidth()
@@ -122,7 +121,7 @@ import com.tarkalabs.tarkaui.theme.TUITheme
         placeholder = searchQueryHint,
         leadingIcon = TarkaIcons.Regular.ChevronLeft24,
         onLeadingIconClick = {
-          showSearchBar = false
+          showSearchBarState = false
           onSearchQuery("")
         },
         onQueryTextChange = {
@@ -141,7 +140,7 @@ import com.tarkalabs.tarkaui.theme.TUITheme
         },
         navigationIcon = {
           if (navigationIcon != null) {
-            if (!showSearchBar) {
+            if (!showSearchBarState) {
               TUIIconButton(
                 onIconClick = onNavigationIconClick,
                 icon = navigationIcon,
@@ -153,15 +152,15 @@ import com.tarkalabs.tarkaui.theme.TUITheme
           }
         },
         actions = {
-          if (!showSearchBar) {
+          if (!showSearchBarState) {
             if (searchIcon != null) {
               TUIIconButton(
                 icon = searchIcon,
                 tags = tags.searchIconTags,
                 iconButtonStyle = GHOST,
                 onIconClick = {
                   if (!disableSearchIcon) {
-                    showSearchBar = true
+                    showSearchBarState = true
                   }
                 },
                 buttonSize = XL
@@ -229,16 +228,21 @@ data class TUIAppTopBarTags(
         menuItemIconThree = TarkaIcons.Regular.ChevronRight20,
         searchQuery = "Search",
         onSearchQuery = { _ ->
-        },
-        searchIcon = TarkaIcons.Regular.Search24,
-        searchQueryHint = "Search"
+        }, searchIcon = TarkaIcons.Regular.Search24, searchQueryHint = "Search"
       )
       VerticalSpacer(space = 5)
       TUIAppTopBar(
         title = "Lorem Ipsum",
         navigationIcon = TarkaIcons.Regular.ChevronRight20,
         searchIcon = TarkaIcons.Regular.Search16
       )
+      VerticalSpacer(space = 5)
+      TUIAppTopBar(
+        title = "Lorem Ipsum",
+        navigationIcon = TarkaIcons.Regular.ChevronRight20,
+        searchIcon = TarkaIcons.Regular.Search16,
+        showSearchBar = true
+      )
     }
   }
 }