Skip to content

Commit 6d060da

Browse files
wisemujil2hyunwoo
wisemuji
and
l2hyunwoo
authored
refactor: remove redundant code in jindong-compose and migrate to reference jindong-core (#79)
* refactor: Remove duplicate code from jindong-compose Remove redundant model, executor, and node classes from jindong-compose that are now defined in jindong-core. Migrate to using HapticElement instead of HapticNode * Update jindong-compose/src/commonMain/kotlin/io/github/compose/jindong/compose/JindongApplier.kt * fix: update api --------- Co-authored-by: HyunWoo Lee (Nunu Lee) <54518925+l2hyunwoo@users.noreply.github.com>
1 parent 7dcaba0 commit 6d060da

42 files changed

Lines changed: 181 additions & 2796 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎jindong-compose/api/jindong-compose.api‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
public final class io/github/compose/jindong/DurationExtensionsKt {
2-
public static final fun getMs (I)J
3-
public static final fun getMs (J)J
4-
}
5-
61
public final class io/github/compose/jindong/JindongKt {
72
public static final fun Jindong ([Ljava/lang/Object;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
83
}
@@ -22,7 +17,7 @@ public final class io/github/compose/jindong/dsl/DelayKt {
2217
}
2318

2419
public final class io/github/compose/jindong/dsl/HapticKt {
25-
public static final fun Haptic-NcHsxvU (Lio/github/compose/jindong/JindongScope;JLio/github/compose/jindong/model/HapticIntensity;Landroidx/compose/runtime/Composer;II)V
20+
public static final fun Haptic-NcHsxvU (Lio/github/compose/jindong/JindongScope;JLio/github/compose/jindong/core/model/HapticIntensity;Landroidx/compose/runtime/Composer;II)V
2621
}
2722

2823
public final class io/github/compose/jindong/dsl/RepeatKt {
@@ -37,51 +32,3 @@ public final class io/github/compose/jindong/dsl/SequenceKt {
3732
public static final fun Sequence (Lio/github/compose/jindong/JindongScope;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
3833
}
3934

40-
public abstract class io/github/compose/jindong/model/HapticIntensity {
41-
public static final field $stable I
42-
public synthetic fun <init> (FLkotlin/jvm/internal/DefaultConstructorMarker;)V
43-
public final fun getValue ()F
44-
}
45-
46-
public final class io/github/compose/jindong/model/HapticIntensity$Custom : io/github/compose/jindong/model/HapticIntensity {
47-
public static final field $stable I
48-
public fun <init> (F)V
49-
public final fun copy (F)Lio/github/compose/jindong/model/HapticIntensity$Custom;
50-
public static synthetic fun copy$default (Lio/github/compose/jindong/model/HapticIntensity$Custom;FILjava/lang/Object;)Lio/github/compose/jindong/model/HapticIntensity$Custom;
51-
public fun equals (Ljava/lang/Object;)Z
52-
public fun hashCode ()I
53-
public fun toString ()Ljava/lang/String;
54-
}
55-
56-
public final class io/github/compose/jindong/model/HapticIntensity$HIGH : io/github/compose/jindong/model/HapticIntensity {
57-
public static final field $stable I
58-
public static final field INSTANCE Lio/github/compose/jindong/model/HapticIntensity$HIGH;
59-
public fun equals (Ljava/lang/Object;)Z
60-
public fun hashCode ()I
61-
public fun toString ()Ljava/lang/String;
62-
}
63-
64-
public final class io/github/compose/jindong/model/HapticIntensity$LIGHT : io/github/compose/jindong/model/HapticIntensity {
65-
public static final field $stable I
66-
public static final field INSTANCE Lio/github/compose/jindong/model/HapticIntensity$LIGHT;
67-
public fun equals (Ljava/lang/Object;)Z
68-
public fun hashCode ()I
69-
public fun toString ()Ljava/lang/String;
70-
}
71-
72-
public final class io/github/compose/jindong/model/HapticIntensity$MEDIUM : io/github/compose/jindong/model/HapticIntensity {
73-
public static final field $stable I
74-
public static final field INSTANCE Lio/github/compose/jindong/model/HapticIntensity$MEDIUM;
75-
public fun equals (Ljava/lang/Object;)Z
76-
public fun hashCode ()I
77-
public fun toString ()Ljava/lang/String;
78-
}
79-
80-
public final class io/github/compose/jindong/model/HapticIntensity$STRONG : io/github/compose/jindong/model/HapticIntensity {
81-
public static final field $stable I
82-
public static final field INSTANCE Lio/github/compose/jindong/model/HapticIntensity$STRONG;
83-
public fun equals (Ljava/lang/Object;)Z
84-
public fun hashCode ()I
85-
public fun toString ()Ljava/lang/String;
86-
}
87-

‎jindong-compose/api/jindong-compose.klib.api‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -12,65 +12,10 @@ open annotation class io.github.compose.jindong/JindongScopeMarker : kotlin/Anno
1212

1313
abstract interface io.github.compose.jindong/JindongScope // io.github.compose.jindong/JindongScope|null[0]
1414

15-
sealed class io.github.compose.jindong.model/HapticIntensity { // io.github.compose.jindong.model/HapticIntensity|null[0]
16-
final val value // io.github.compose.jindong.model/HapticIntensity.value|{}value[0]
17-
final fun <get-value>(): kotlin/Float // io.github.compose.jindong.model/HapticIntensity.value.<get-value>|<get-value>(){}[0]
18-
19-
final class Custom : io.github.compose.jindong.model/HapticIntensity { // io.github.compose.jindong.model/HapticIntensity.Custom|null[0]
20-
constructor <init>(kotlin/Float) // io.github.compose.jindong.model/HapticIntensity.Custom.<init>|<init>(kotlin.Float){}[0]
21-
22-
final fun copy(kotlin/Float = ...): io.github.compose.jindong.model/HapticIntensity.Custom // io.github.compose.jindong.model/HapticIntensity.Custom.copy|copy(kotlin.Float){}[0]
23-
final fun equals(kotlin/Any?): kotlin/Boolean // io.github.compose.jindong.model/HapticIntensity.Custom.equals|equals(kotlin.Any?){}[0]
24-
final fun hashCode(): kotlin/Int // io.github.compose.jindong.model/HapticIntensity.Custom.hashCode|hashCode(){}[0]
25-
final fun toString(): kotlin/String // io.github.compose.jindong.model/HapticIntensity.Custom.toString|toString(){}[0]
26-
}
27-
28-
final object HIGH : io.github.compose.jindong.model/HapticIntensity { // io.github.compose.jindong.model/HapticIntensity.HIGH|null[0]
29-
final fun equals(kotlin/Any?): kotlin/Boolean // io.github.compose.jindong.model/HapticIntensity.HIGH.equals|equals(kotlin.Any?){}[0]
30-
final fun hashCode(): kotlin/Int // io.github.compose.jindong.model/HapticIntensity.HIGH.hashCode|hashCode(){}[0]
31-
final fun toString(): kotlin/String // io.github.compose.jindong.model/HapticIntensity.HIGH.toString|toString(){}[0]
32-
}
33-
34-
final object LIGHT : io.github.compose.jindong.model/HapticIntensity { // io.github.compose.jindong.model/HapticIntensity.LIGHT|null[0]
35-
final fun equals(kotlin/Any?): kotlin/Boolean // io.github.compose.jindong.model/HapticIntensity.LIGHT.equals|equals(kotlin.Any?){}[0]
36-
final fun hashCode(): kotlin/Int // io.github.compose.jindong.model/HapticIntensity.LIGHT.hashCode|hashCode(){}[0]
37-
final fun toString(): kotlin/String // io.github.compose.jindong.model/HapticIntensity.LIGHT.toString|toString(){}[0]
38-
}
39-
40-
final object MEDIUM : io.github.compose.jindong.model/HapticIntensity { // io.github.compose.jindong.model/HapticIntensity.MEDIUM|null[0]
41-
final fun equals(kotlin/Any?): kotlin/Boolean // io.github.compose.jindong.model/HapticIntensity.MEDIUM.equals|equals(kotlin.Any?){}[0]
42-
final fun hashCode(): kotlin/Int // io.github.compose.jindong.model/HapticIntensity.MEDIUM.hashCode|hashCode(){}[0]
43-
final fun toString(): kotlin/String // io.github.compose.jindong.model/HapticIntensity.MEDIUM.toString|toString(){}[0]
44-
}
45-
46-
final object STRONG : io.github.compose.jindong.model/HapticIntensity { // io.github.compose.jindong.model/HapticIntensity.STRONG|null[0]
47-
final fun equals(kotlin/Any?): kotlin/Boolean // io.github.compose.jindong.model/HapticIntensity.STRONG.equals|equals(kotlin.Any?){}[0]
48-
final fun hashCode(): kotlin/Int // io.github.compose.jindong.model/HapticIntensity.STRONG.hashCode|hashCode(){}[0]
49-
final fun toString(): kotlin/String // io.github.compose.jindong.model/HapticIntensity.STRONG.toString|toString(){}[0]
50-
}
51-
}
52-
53-
final val io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity$stableprop // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity$stableprop|#static{}io_github_compose_jindong_model_HapticIntensity$stableprop[0]
54-
final val io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_Custom$stableprop // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_Custom$stableprop|#static{}io_github_compose_jindong_model_HapticIntensity_Custom$stableprop[0]
55-
final val io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_HIGH$stableprop // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_HIGH$stableprop|#static{}io_github_compose_jindong_model_HapticIntensity_HIGH$stableprop[0]
56-
final val io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_LIGHT$stableprop // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_LIGHT$stableprop|#static{}io_github_compose_jindong_model_HapticIntensity_LIGHT$stableprop[0]
57-
final val io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_MEDIUM$stableprop // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_MEDIUM$stableprop|#static{}io_github_compose_jindong_model_HapticIntensity_MEDIUM$stableprop[0]
58-
final val io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_STRONG$stableprop // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_STRONG$stableprop|#static{}io_github_compose_jindong_model_HapticIntensity_STRONG$stableprop[0]
59-
final val io.github.compose.jindong/ms // io.github.compose.jindong/ms|@kotlin.Int{}ms[0]
60-
final fun (kotlin/Int).<get-ms>(): kotlin.time/Duration // io.github.compose.jindong/ms.<get-ms>|<get-ms>@kotlin.Int(){}[0]
61-
final val io.github.compose.jindong/ms // io.github.compose.jindong/ms|@kotlin.Long{}ms[0]
62-
final fun (kotlin/Long).<get-ms>(): kotlin.time/Duration // io.github.compose.jindong/ms.<get-ms>|<get-ms>@kotlin.Long(){}[0]
63-
6415
final fun (io.github.compose.jindong/JindongScope).io.github.compose.jindong.dsl/Delay(kotlin.time/Duration, androidx.compose.runtime/Composer?, kotlin/Int) // io.github.compose.jindong.dsl/Delay|Delay@io.github.compose.jindong.JindongScope(kotlin.time.Duration;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
65-
final fun (io.github.compose.jindong/JindongScope).io.github.compose.jindong.dsl/Haptic(kotlin.time/Duration, io.github.compose.jindong.model/HapticIntensity?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int) // io.github.compose.jindong.dsl/Haptic|Haptic@io.github.compose.jindong.JindongScope(kotlin.time.Duration;io.github.compose.jindong.model.HapticIntensity?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0]
16+
final fun (io.github.compose.jindong/JindongScope).io.github.compose.jindong.dsl/Haptic(kotlin.time/Duration, io.github.compose.jindong.core.model/HapticIntensity?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int) // io.github.compose.jindong.dsl/Haptic|Haptic@io.github.compose.jindong.JindongScope(kotlin.time.Duration;io.github.compose.jindong.core.model.HapticIntensity?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0]
6617
final fun (io.github.compose.jindong/JindongScope).io.github.compose.jindong.dsl/Repeat(kotlin/Int, kotlin/Function3<io.github.compose.jindong/JindongScope, androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int) // io.github.compose.jindong.dsl/Repeat|Repeat@io.github.compose.jindong.JindongScope(kotlin.Int;kotlin.Function3<io.github.compose.jindong.JindongScope,androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
6718
final fun (io.github.compose.jindong/JindongScope).io.github.compose.jindong.dsl/RepeatWithIndex(kotlin/Int, kotlin/Function4<io.github.compose.jindong/JindongScope, kotlin/Int, androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int) // io.github.compose.jindong.dsl/RepeatWithIndex|RepeatWithIndex@io.github.compose.jindong.JindongScope(kotlin.Int;kotlin.Function4<io.github.compose.jindong.JindongScope,kotlin.Int,androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
6819
final fun (io.github.compose.jindong/JindongScope).io.github.compose.jindong.dsl/Sequence(kotlin/Function3<io.github.compose.jindong/JindongScope, androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int) // io.github.compose.jindong.dsl/Sequence|Sequence@io.github.compose.jindong.JindongScope(kotlin.Function3<io.github.compose.jindong.JindongScope,androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
69-
final fun io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity$stableprop_getter(): kotlin/Int // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity$stableprop_getter|io_github_compose_jindong_model_HapticIntensity$stableprop_getter(){}[0]
70-
final fun io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_Custom$stableprop_getter(): kotlin/Int // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_Custom$stableprop_getter|io_github_compose_jindong_model_HapticIntensity_Custom$stableprop_getter(){}[0]
71-
final fun io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_HIGH$stableprop_getter(): kotlin/Int // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_HIGH$stableprop_getter|io_github_compose_jindong_model_HapticIntensity_HIGH$stableprop_getter(){}[0]
72-
final fun io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_LIGHT$stableprop_getter(): kotlin/Int // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_LIGHT$stableprop_getter|io_github_compose_jindong_model_HapticIntensity_LIGHT$stableprop_getter(){}[0]
73-
final fun io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_MEDIUM$stableprop_getter(): kotlin/Int // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_MEDIUM$stableprop_getter|io_github_compose_jindong_model_HapticIntensity_MEDIUM$stableprop_getter(){}[0]
74-
final fun io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_STRONG$stableprop_getter(): kotlin/Int // io.github.compose.jindong.model/io_github_compose_jindong_model_HapticIntensity_STRONG$stableprop_getter|io_github_compose_jindong_model_HapticIntensity_STRONG$stableprop_getter(){}[0]
7520
final fun io.github.compose.jindong/Jindong(kotlin/Array<out kotlin/Any?>..., kotlin/Function3<io.github.compose.jindong/JindongScope, androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int) // io.github.compose.jindong/Jindong|Jindong(kotlin.Array<out|kotlin.Any?>...;kotlin.Function3<io.github.compose.jindong.JindongScope,androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
7621
final fun io.github.compose.jindong/JindongProvider(kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int) // io.github.compose.jindong/JindongProvider|JindongProvider(kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int){}[0]

‎jindong-compose/build.gradle.kts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ kotlin {
4848
}
4949
}
5050
}
51-
withHostTest {
52-
isIncludeAndroidResources = true
53-
}
5451
}
5552
iosX64()
5653
iosArm64()
@@ -73,14 +70,6 @@ kotlin {
7370
implementation(libs.kotest.framework.engine)
7471
implementation(libs.kotest.assertions.core)
7572
}
76-
77-
named("androidHostTest").dependencies {
78-
implementation(libs.robolectric)
79-
implementation(libs.androidx.test.core)
80-
implementation(libs.androidx.test.runner)
81-
implementation(libs.kotest.assertions.core)
82-
implementation(libs.kotlinx.coroutines.test)
83-
}
8473
}
8574
}
8675

0 commit comments

Comments
 (0)