Skip to content

Commit

Permalink
Merge pull request #28 from pseudoankit/migrate-to-cmp
Browse files Browse the repository at this point in the history
Migrate to compose multi platform
  • Loading branch information
pseudoankit authored Feb 24, 2024
2 parents 812b6e9 + d1e7c1e commit 85b3b8b
Show file tree
Hide file tree
Showing 84 changed files with 969 additions and 406 deletions.
16 changes: 13 additions & 3 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,28 @@ concurrency:
cancel-in-progress: true

jobs:
build:
lint:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup JDK 17
uses: actions/setup-java@v1
with:
java-version: 17
- name: Run Lint Check
run: ./gradlew lint

build:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup JDK 17
uses: actions/setup-java@v1
with:
java-version: 17
- name: Build apk
run: ./gradlew build --stacktrace
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*.iml
.gradle
/local.properties
/.idea/artifacts
/.idea/caches
/.idea/libraries
/.idea/modules.xml
Expand Down
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

21 changes: 0 additions & 21 deletions app/proguard-rules.pro

This file was deleted.

11 changes: 0 additions & 11 deletions app/src/main/java/com/pseudoankit/coachmark_demo/ui/theme/Color.kt

This file was deleted.

70 changes: 0 additions & 70 deletions app/src/main/java/com/pseudoankit/coachmark_demo/ui/theme/Theme.kt

This file was deleted.

34 changes: 0 additions & 34 deletions app/src/main/java/com/pseudoankit/coachmark_demo/ui/theme/Type.kt

This file was deleted.

25 changes: 0 additions & 25 deletions build.gradle

This file was deleted.

8 changes: 8 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
plugins {
id("publication.root")
alias(libs.plugins.android.app) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.compose.multiplatform) apply false
}
47 changes: 0 additions & 47 deletions coachmark/build.gradle

This file was deleted.

66 changes: 66 additions & 0 deletions coachmark/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.compose.multiplatform)
id("publication.module")
}

kotlin {
applyDefaultHierarchyTemplate()
androidTarget {
publishLibraryVariants("release")
compilations.all {
kotlinOptions {
jvmTarget = "11"
}
}
}
jvm("desktop")
js(IR) {
browser()
}
listOf(
iosX64(),
iosArm64(),
iosSimulatorArm64()
).forEach {
it.binaries.framework {
this.baseName = baseName
}
}

sourceSets {
val commonMain by getting {
dependencies {
implementation(compose.runtime)
implementation(compose.foundation)
implementation(compose.material3)
}
}
}

explicitApi()
}

android {
namespace = "com.pseudoankit.coachmark"
compileSdk = libs.versions.compileSdk.get().toInt()

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

lint {
baseline = file("lint.xml")
}

}

dependencies {
lintChecks(libs.compose.lint)
}
4 changes: 4 additions & 0 deletions coachmark/lint.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<lint>
<issue id="ComposePreviewPublic" severity="ignore" />
<issue id="ComposeModifierMissing" severity="warning" />
</lint>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public val LocalCoachMarkScope: ProvidableCompositionLocal<CoachMarkScope> =

@Composable
public fun UnifyCoachmark(
tooltip: @Composable CoachMarkScope.(CoachMarkKey) -> Unit,
overlayEffect: UnifyOverlayEffect = CoachMarkDefaults.Overlay.background,
onOverlayClicked: (CoachMarkKey) -> OverlayClickEvent = { CoachMarkDefaults.Overlay.clickEvent },
tooltip: @Composable CoachMarkScope.(CoachMarkKey) -> Unit,
content: @Composable CoachMarkScope.() -> Unit
) {
val density = LocalDensity.current
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.pseudoankit.coachmark.shape.Arrow
import com.pseudoankit.coachmark.shape.Balloon

@Preview
@Composable
public fun BalloonShapeDemo() {
Column(
Expand Down
Loading

0 comments on commit 85b3b8b

Please sign in to comment.