Merge pull request #164 from tarkalabs/younes/Fix/renaming

tarkalabs · Jan 11, 2024 · 7bf970a · 7bf970a
2 parents 056bcd6 + 5ffda66
commit 7bf970a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Android application for building UI components using Jetpack Compose
 - TUISnackBar
 - TUIStatusIndicator
 - TUITextRow
-- TUITopBar
+- TUITopAppBar
 - TUIChip
 - TUIMobileButtonBlock
 - TUIMenuItem

diff --git a/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt b/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt
@@ -23,7 +23,7 @@ import com.tarkalabs.tarkaicons.TarkaIcons
 import com.tarkalabs.tarkaicons.TarkaIcons.Filled
 import com.tarkalabs.tarkaicons.TarkaIcons.Regular
 import com.tarkalabs.uicomponents.components.TUISearchBar
-import com.tarkalabs.uicomponents.components.TUITopBar
+import com.tarkalabs.uicomponents.components.TUITopAppBar
 import com.tarkalabs.uicomponents.theme.TUITheme
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@@ -39,7 +39,7 @@ class UIComponentListActivity : ComponentActivity() {
         }
 
         Scaffold(topBar = {
-          TUITopBar(
+          TUITopAppBar(
             title = "Lorem Ipsum",
             navigationIcon = TarkaIcons.Regular.ChevronRight20,
             menuItemIconOne = TarkaIcons.Regular.ChevronRight20,

diff --git a/tarkaui/build.gradle.kts b/tarkaui/build.gradle.kts
@@ -64,7 +64,7 @@ publishing {
       run {
         groupId = "com.tarkalabs"
         artifactId = getLibraryArtifactId()
-        version = "0.68-alpha"
+        version = "0.69-alpha"
         artifact("$buildDir/outputs/aar/${getLibraryArtifactId()}-release.aar")
       }
     }

diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITopBarTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITopBarTest.kt
@@ -15,7 +15,7 @@ import com.tarkalabs.tarkaicons.Delete24
 import com.tarkalabs.tarkaicons.Search24
 import com.tarkalabs.tarkaicons.TarkaIcons
 import com.tarkalabs.uicomponents.components.base.TUIIconButtonTags
-import com.tarkalabs.uicomponents.components.TUITopBar
+import com.tarkalabs.uicomponents.components.TUITopAppBar
 import com.tarkalabs.uicomponents.components.TUITopBarTags
 import org.junit.Rule
 import org.junit.Test
@@ -41,7 +41,7 @@ class TUITopBarTest {
 
   @OptIn(ExperimentalMaterial3Api::class) @Test fun topBar_Item_Displayed() {
     composeTestRule.setContent {
-      TUITopBar(
+      TUITopAppBar(
         title = "title",
         navigationIcon = TarkaIcons.Regular.ChevronRight20,
         menuItemIconOne = TarkaIcons.Filled.Checkmark16,
@@ -60,7 +60,7 @@ class TUITopBarTest {
 
   @OptIn(ExperimentalMaterial3Api::class) @Test fun topBar_SearchIcon_Displayed() {
     composeTestRule.setContent {
-      TUITopBar(
+      TUITopAppBar(
         title = "title",
         navigationIcon = TarkaIcons.Regular.ChevronRight20,
         searchIcon = TarkaIcons.Regular.Search24,
@@ -78,7 +78,7 @@ class TUITopBarTest {
     val onThirdMenuItemClicked: () -> Unit = mock()
 
     composeTestRule.setContent {
-      TUITopBar(
+      TUITopAppBar(
         title = "title",
         navigationIcon = TarkaIcons.Regular.ChevronRight20,
         searchIcon = TarkaIcons.Regular.Search24,

diff --git a/...ui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUITopBarScreenShotTest.kt b/...ui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUITopBarScreenShotTest.kt
@@ -4,13 +4,10 @@ package com.tarkalabs.uicomponents.screenshots
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import com.tarkalabs.tarkaicons.ArrowRight16
-import com.tarkalabs.tarkaicons.TarkaIcon
 import com.tarkalabs.tarkaicons.TarkaIcons
-import com.tarkalabs.uicomponents.R.drawable
-import com.tarkalabs.uicomponents.components.TUITopBar
+import com.tarkalabs.uicomponents.components.TUITopAppBar
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
 import org.junit.runners.Parameterized
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -34,11 +31,11 @@ class TUITopBarScreenShotTest(
   }
 
   @Test fun renderTopAppBarTextOnly() = compareScreenshotFor(darkTheme, "_renderTopAppBarTextOnly_$testName") {
-    TUITopBar(title = "Screenshot")
+    TUITopAppBar(title = "Screenshot")
   }
 
   @Test fun renderTopAppBarTextWithIcon() = compareScreenshotFor(darkTheme, "_renderTopAppBarTextWithIcon_$testName") {
-    TUITopBar(
+    TUITopAppBar(
       title = "Screenshot",
       navigationIcon = TarkaIcons.Filled.ArrowRight16
     )

diff --git a/...labs/uicomponents/components/TUITopBar.kt → ...s/uicomponents/components/TUITopAppBar.kt b/...labs/uicomponents/components/TUITopBar.kt → ...s/uicomponents/components/TUITopAppBar.kt
@@ -69,7 +69,7 @@ import com.tarkalabs.uicomponents.theme.TUITheme
     scrollBehavior = TopAppBarScrollBehavior.ScrollOnAppBarScroll, // Optional: Specify scroll behavior
       )
  */
-@OptIn(ExperimentalMaterial3Api::class) @Composable fun TUITopBar(
+@OptIn(ExperimentalMaterial3Api::class) @Composable fun TUITopAppBar(
   modifier: Modifier = Modifier,
   title: String,
   navigationIcon: TarkaIcon? = null,
@@ -217,7 +217,7 @@ data class TUITopBarTags(
 ) {
   TUITheme {
     Column {
-      TUITopBar(
+      TUITopAppBar(
         title = "Lorem Ipsum",
         navigationIcon = TarkaIcons.Regular.ChevronRight20,
         menuItemIconOne = TarkaIcons.Regular.ChevronRight20,
@@ -230,7 +230,7 @@ data class TUITopBarTags(
         searchQueryHint = "Search"
       )
       VerticalSpacer(space = 5)
-      TUITopBar(
+      TUITopAppBar(
         title = "Lorem Ipsum",
         navigationIcon = TarkaIcons.Regular.ChevronRight20,
         searchIcon = TarkaIcons.Regular.Search16