Merge pull request #82 from overpas/rework

Rework

Author: overpas

.github/workflows/build.yml

@@ -0,0 +1,32 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+      - rework
+  pull_request:
+    branches:
+      - master
+      - rework
+
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - name: Build
+        run: ./gradlew build
+      - name: Collect test coverage
+        run: ./gradlew koverReport
+      - name: Submit coverage report
+        run: |
+          curl -Os https://uploader.codecov.io/latest/linux/codecov
+          chmod +x codecov
+          ./codecov -f "build/reports/kover/report.xml"

.github/workflows/publish.yml

@@ -11,27 +11,27 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: adopt
-          java-version: 11
-
-        # Builds the release artifacts of the library
-      - name: Release build
-        run: ./gradlew :treemap-core:assemble :treemap-compose-android:assembleRelease
-
-        # Generates other artifacts
-      - name: Source jar
-        run: ./gradlew androidSourcesJar javadocJar
-
-        # Runs upload, and then closes & releases the repository
-      - name: Publish to MavenCentral
-        run: ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
-        env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          distribution: adopt
+#          java-version: 11
+#
+#        # Builds the release artifacts of the library
+#      - name: Release build
+#        run: ./gradlew :treemap-chart:assemble :treemap-compose-android:assembleRelease
+#
+#        # Generates other artifacts
+#      - name: Source jar
+#        run: ./gradlew androidSourcesJar javadocJar
+#
+#        # Runs upload, and then closes & releases the repository
+#      - name: Publish to MavenCentral
+#        run: ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
+#        env:
+#          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+#          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+#          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
+#          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+#          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+#          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}

.github/workflows/static-analysis.yml

@@ -2,9 +2,13 @@ name: Static analysis
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - rework
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - rework
 
   workflow_dispatch:
 
@@ -13,7 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
       - name: Android Lint
         run: ./gradlew lintDebug
       - name: Detekt
-        run: ./gradlew detekt
+        run: ./gradlew detektAll

.github/workflows/test.yml

@@ -0,0 +1,28 @@
+name: UI-Test
+
+on:
+  push:
+    branches:
+      - master
+      - rework
+  pull_request:
+    branches:
+      - master
+      - rework
+
+  workflow_dispatch:
+
+jobs:
+  ui-test:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - name: UI tests + Macrobenchmark
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          script: ./gradlew :treemap-chart-compose:connectedCheck :sample:android:macrobenchmark:connectedBenchmarkAndroidTest

.github/workflows/ui-test.yml

@@ -4,7 +4,13 @@
 .idea
 .DS_Store
 /build
+build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+xcuserdata
+Pods
+*.lock
+*.trace
+*.gpg

.gitignore

@@ -1,17 +1,22 @@
 # Compose Treemap Chart
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.overpas/treemap-compose-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.overpas/treemap-compose-android)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.overpas/treemap-chart-compose/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.overpas/treemap-chart-compose)
 [![Test](https://github.com/overpas/compose-treemap-chart/actions/workflows/test.yml/badge.svg)](https://github.com/overpas/compose-treemap-chart/actions/workflows/test.yml)
 [![Static analysis](https://github.com/overpas/compose-treemap-chart/actions/workflows/static-analysis.yml/badge.svg)](https://github.com/overpas/compose-treemap-chart/actions/workflows/static-analysis.yml)
 [![codecov](https://codecov.io/gh/overpas/compose-treemap-chart/branch/master/graph/badge.svg?token=CHYdQiizEr)](https://codecov.io/gh/overpas/compose-treemap-chart)
+![Badge-Android](https://img.shields.io/badge/platform-android-blue)
+![Badge-JVM](https://img.shields.io/badge/platform-jvm-blue)
+![Badge-iOS](https://img.shields.io/badge/platform-ios-blue)
+![Badge-JS](https://img.shields.io/badge/platform-js-blue)
 
 Jetpack compose [treemap](https://en.wikipedia.org/wiki/Treemapping) chart implementation
+<img src="https://raw.githubusercontent.com/overpas/compose-treemap-chart/master/img/sample_complex_chart.png" width="500">
 
 ## Usage
 ### Adding to the project
 Add this to your `dependencies` gradle block:
 ```gradle
-implementation "io.github.overpas:treemap-core:0.0.3"
-implementation "io.github.overpas:treemap-compose-android:0.0.3"
+implementation "io.github.overpas:treemap-chart:0.1.0"
+implementation "io.github.overpas:treemap-chart-compose:0.1.0"
 ```
 ### Sample code
 ```kotlin
@@ -44,26 +49,15 @@ class MainActivity : ComponentActivity() {
                             .fillMaxHeight()
                             .fillMaxWidth(),
                     ) { item ->
-                        TreemapItem(item = item)
+                        SimpleTreemapItem(item = item.toString())
                     }
                 }
             }
         }
     }
 }
-
-@Composable
-fun TreemapItem(item: Int, modifier: Modifier = Modifier) {
-    Box(
-        contentAlignment = Alignment.Center,
-        modifier = modifier.border(1.dp, MaterialTheme.colors.onBackground),
-    ) {
-        Text(
-            text = item.toString(),
-            textAlign = TextAlign.Center,
-        )
-    }
-}
 ```
 The code above produces something like this:
 <img src="https://raw.githubusercontent.com/overpas/compose-treemap-chart/master/img/sample_treemap.png" width="750">
+
+For more advanced Kotlin Multiplatform samples check out the /sample directory

README.md

@@ -0,0 +1,22 @@
+import io.gitlab.arturbosch.detekt.Detekt
+
+plugins {
+    alias(libs.plugins.kotlin.multiplatform).apply(false)
+    alias(libs.plugins.kotlin.android).apply(false)
+    alias(libs.plugins.android.lib).apply(false)
+    alias(libs.plugins.android.app).apply(false)
+    alias(libs.plugins.android.test).apply(false)
+    alias(libs.plugins.compose.multiplatform).apply(false)
+    alias(libs.plugins.detekt).apply(false)
+    alias(libs.plugins.kotlinx.kover)
+}
+
+tasks.register("cleanAll", Delete::class) {
+    delete(rootProject.buildDir)
+}
+
+tasks.register("detektAll") {
+    allprojects {
+        this@register.dependsOn(tasks.withType<Detekt>())
+    }
+}