Skip to content

Commit

Permalink
Merge pull request #192 from tarkalabs/raja/developmerging
Browse files Browse the repository at this point in the history
merging : Develop merging
  • Loading branch information
rajajawahar authored Feb 19, 2024
2 parents 2ab719b + a7ccd69 commit 0022dbb
Show file tree
Hide file tree
Showing 1,969 changed files with 16,642 additions and 17,235 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publishing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
run: chmod +x gradlew

- name: Build AAR 🔨
run: bash ./gradlew :tarkaui:assemble
run: bash ./gradlew :tarka-ui:assemble

- name: Publish to GitHub Package 🚀
run: bash ./gradlew :tarkaui:publish
run: bash ./gradlew :tarka-ui:publish
env:
GITHUB_USER: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.SECRET_TOKEN }}
GITHUB_TOKEN: ${{ secrets.SECRET_TOKEN }}
117 changes: 117 additions & 0 deletions .idea/androidTestResultsUserPreferences.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 26 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,42 @@ Android application for building UI components using Jetpack Compose

## List of components

- TUIAppTopBar
- TUIAttachmentUpload
- TUIAvatar
- TUIBadge
- TUIButton
- TUICheckBox
- TUICheckBoxRow
- TUIChip
- TUIDraggableCard
- TUIDivider
- TUIFloatingActionButton
- TUIEmailField
- TUIEmailSubjectField
- TUIIconButton
- TUIInputField
- TUIToggleRow
- TUIDraggableCard
- TUISelectionCard
- TUICheckBox
- TUIRadioButton
- TUIRadioButtonRow
- TUIFloatingNavBar
- TUIFloatingTab
- TUITab
- TUITabBar
- TUIAttachmentUpload
- TUINavigationRow
- TUISearchBar
- TUISnackBar
- TUIStatusIndicator
- TUITextRow
- TUIAppTopBar
- TUIChip
- TUIMobileButtonBlock
- TUIMenuItem
- TUIMediaThumbnail
- TUIMobileOverlayHeader
- TUIMobileOverlayFooter
- TUIMobileOverlayMenu
- TUINavigationRow
- TUIPlayPauseButton
- TUIRadioButton
- TUIRadioRow
- TUISearchBar
- TUISelectionCard
- TUISnackBar
- TUIStatusIndicator
- TUITableCell
- TUITab
- TUITag
- TUIPlayPauseButton
- TUIMultiLevelSelectorHeader
- TUITabBar
- TUITextRow
- TUIToggleRow


## TODO

Expand Down Expand Up @@ -64,16 +68,10 @@ TarkaUI Kit is a versatile Design Library built on top of Jetpack Compose, based
To integrate TarkaUi Kit and Tarka Icons into your Android project, add the following dependencies in your app-level `build.gradle` file:

```kotlin
implementation("com.tarkalabs:tarkaui:1.0.0")
implementation("com.tarkalabs:tarkaicons:0.1-alpha")
```

You'll need also to mention the repository that you will get it from, we are using github package, make sure you include this code where you are mentionning your repositories
implementation("com.tarkalabs:tarkaui:1.1.0")


```kotlin
repositories {
maven(url = "https://maven.pkg.github.com/tarkalabs/tarka-ui-kit-android")
}
```

## License
Expand Down
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ plugins {
id("com.android.application") version "7.4.2" apply false
id("com.android.library") version "7.4.2" apply false
id("org.jetbrains.kotlin.android") version "1.8.10" apply false
id("com.vanniktech.maven.publish") version "0.27.0"
id("org.jetbrains.dokka") version "1.8.10" apply false
}
3 changes: 2 additions & 1 deletion example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ android {

dependencies {
val composeUiVersion = "1.4.0"
implementation(project(":tarkaui"))
implementation(project(":tarka-ui"))
implementation(project(":tarka-ui-icons"))
implementation("androidx.core:core-ktx:1.10.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
implementation("androidx.activity:activity-compose:1.7.1")
Expand Down
26 changes: 15 additions & 11 deletions example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.tarkalabs.tarkaicons.BarcodeScanner24
import com.tarkalabs.tarkaicons.ChevronRight20
import com.tarkalabs.tarkaicons.Dismiss16
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.TUIAppTopBar
import com.tarkalabs.uicomponents.theme.TUITheme
import com.tarkalabs.tarkaui.components.TUIAppTopBar
import com.tarkalabs.tarkaui.components.TUISearchBar
import com.tarkalabs.tarkaui.icons.BarcodeScanner24
import com.tarkalabs.tarkaui.icons.ChevronRight20
import com.tarkalabs.tarkaui.icons.Dismiss16
import com.tarkalabs.tarkaui.icons.TarkaIcons
import com.tarkalabs.tarkaui.icons.TarkaIcons.Filled
import com.tarkalabs.tarkaui.icons.TarkaIcons.Regular
import com.tarkalabs.tarkaui.theme.TUITheme

@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
class UIComponentListActivity : ComponentActivity() {
Expand Down Expand Up @@ -62,7 +62,9 @@ class UIComponentListActivity : ComponentActivity() {
trailingIcon = Filled.Dismiss16,
leadingIcon = Regular.BarcodeScanner24,
onLeadingIconClick = {},
modifier = Modifier.fillMaxWidth().padding(10.dp),
modifier = Modifier
.fillMaxWidth()
.padding(10.dp),
)
TUISearchBar(
query = "Search",
Expand All @@ -71,7 +73,9 @@ class UIComponentListActivity : ComponentActivity() {
trailingIcon = Filled.Dismiss16,
leadingIcon = Regular.BarcodeScanner24,
onLeadingIconClick = {},
modifier = Modifier.fillMaxWidth().padding(10.dp),
modifier = Modifier
.fillMaxWidth()
.padding(10.dp),
)

}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 06 13:09:30 IST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ dependencyResolutionManagement {
}
rootProject.name = "tarka-ui-kit-android"
include(":example")
include(":tarkaui")
include(":tarkaicons")
include(":tarka-ui")
include(":tarka-ui-icons")
File renamed without changes.
Loading

0 comments on commit 0022dbb

Please sign in to comment.