Skip to content

Commit

Permalink
Merge pull request #187 from tarkalabs/raja/packagestructuringforpubl…
Browse files Browse the repository at this point in the history
…ishing

refactoring: package structuring of tarkaui and tarkaui-iconset
  • Loading branch information
rajajawahar authored Feb 14, 2024
2 parents a4d79a1 + bdbccf3 commit 7af1c3f
Show file tree
Hide file tree
Showing 1,236 changed files with 14,190 additions and 14,194 deletions.
2 changes: 1 addition & 1 deletion example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {

dependencies {
val composeUiVersion = "1.4.0"
implementation(project(":tarkaui"))
implementation(project(":tarka-ui"))
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
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.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

android {
namespace = "com.tarkalabs.tarkaicons"
namespace = "com.tarkalabs.tarkaui.icons"
compileSdk = 33

defaultConfig {
Expand Down Expand Up @@ -38,9 +38,9 @@ publishing {
create<MavenPublication>("gpr") {
run {
groupId = "com.tarkalabs"
artifactId = "tarkaicons"
artifactId = "tarkaui-icons"
version = "1.0.0"
artifact("$buildDir/outputs/aar/tarkaicons-release.aar")
artifact("$buildDir/outputs/aar/tarka-ui-icons-release.aar")
}
}
}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RELEASE_SIGNING_ENABLED=true


GROUP=com.tarkalabs
POM_ARTIFACT_ID=tarkauikit-icons
POM_ARTIFACT_ID=tarkaui-icons
VERSION_NAME=1.0.0

POM_NAME=Tarka UIKit IconSet
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tarkalabs.tarkaicons
package com.tarkalabs.tarkaui

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
File renamed without changes.
6,839 changes: 6,839 additions & 0 deletions tarka-ui-icons/src/main/java/com/tarkalabs/tarkaui/icons/Filled.kt

Large diffs are not rendered by default.

6,838 changes: 6,838 additions & 0 deletions tarka-ui-icons/src/main/java/com/tarkalabs/tarkaui/icons/Regular.kt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tarkalabs.tarkaicons
package com.tarkalabs.tarkaui.icons

import androidx.annotation.DrawableRes
import androidx.compose.ui.graphics.Color
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tarkalabs.tarkaicons
package com.tarkalabs.tarkaui

import org.junit.Test

Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions tarkaui/build.gradle.kts → tarka-ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ plugins {
}

android {
namespace = "com.tarkalabs.uicomponents"
namespace = "com.tarkalabs.tarkaui"
compileSdk = 33

defaultConfig {
minSdk = 26
targetSdk = 33

testInstrumentationRunner = "com.karumi.shot.ShotTestRunner"
testApplicationId = "com.tarkalabs.uicomponents"
testApplicationId = "com.tarkalabs.tarkaui"
consumerProguardFiles("consumer-rules.pro")
}

Expand Down Expand Up @@ -48,7 +48,7 @@ android {
}
shot {
tolerance = 0.1
applicationId = "com.tarkalabs.uicomponents"
applicationId = "com.tarkalabs.tarkaui"
}
testOptions {
emulatorSnapshots.maxSnapshotsForTestFailures = 10
Expand All @@ -66,7 +66,7 @@ publishing {
run {
groupId = "com.tarkalabs"
artifactId = getLibraryArtifactId()
version = "1.0.7"
version = "1.0.8"
artifact("$buildDir/outputs/aar/${getLibraryArtifactId()}-release.aar")
}
}
Expand All @@ -91,7 +91,7 @@ dependencies {
implementation("androidx.compose.ui:ui-tooling-preview:$composeUiVersion")
implementation("androidx.compose.material3:material3:1.1.0-rc01")
implementation("androidx.compose.foundation:foundation:$composeUiVersion")
api(project(":tarkaicons"))
api(project(":tarka-ui-icons"))

testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
Expand Down
File renamed without changes.
50 changes: 25 additions & 25 deletions tarkaui/gradle.properties → tarka-ui/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@ kotlin.code.style=official
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true

#SONATYPE_HOST=DEFAULT
#
#RELEASE_SIGNING_ENABLED=true
#
#
#GROUP=com.tarkalabs
#POM_ARTIFACT_ID=tarkauikit
#VERSION_NAME=1.0.5
#
#POM_NAME=Tarka UIKit
#POM_DESCRIPTION=An Tarka UIKit Component Library.
#POM_INCEPTION_YEAR=2024
#POM_URL=https://github.com/tarkalabs/tarka-ui-kit-android
#
#POM_LICENSE_NAME=MIT License
#POM_LICENSE_URL=https://opensource.org/licenses/MIT
#POM_LICENSE_DIST=repo
#
#POM_SCM_URL=https://github.com/tarkalabs/tarka-ui-kit-android
#POM_SCM_CONNECTION=scm:git:git://github.com/tarkalabs/tarka-ui-kit-android
#POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/tarkalabs/tarka-ui-kit-android
#
#POM_DEVELOPER_ID=rajajawahar
#POM_DEVELOPER_NAME=Raja Jawahar
#POM_DEVELOPER_URL=https://github.com/rajajawahar
SONATYPE_HOST=DEFAULT

RELEASE_SIGNING_ENABLED=true


GROUP=com.tarkalabs
POM_ARTIFACT_ID=tarkaui
VERSION_NAME=1.1.0-SNAPSHOT

POM_NAME=Tarka UIKit
POM_DESCRIPTION=An Tarka UIKit Component Library.
POM_INCEPTION_YEAR=2024
POM_URL=https://github.com/tarkalabs/tarka-ui-kit-android

POM_LICENSE_NAME=MIT License
POM_LICENSE_URL=https://opensource.org/licenses/MIT
POM_LICENSE_DIST=repo

POM_SCM_URL=https://github.com/tarkalabs/tarka-ui-kit-android
POM_SCM_CONNECTION=scm:git:git://github.com/tarkalabs/tarka-ui-kit-android
POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/tarkalabs/tarka-ui-kit-android

POM_DEVELOPER_ID=rajajawahar
POM_DEVELOPER_NAME=Raja Jawahar
POM_DEVELOPER_URL=https://github.com/rajajawahar
File renamed without changes.
Loading

0 comments on commit 7af1c3f

Please sign in to comment.