diff --git a/build.gradle.kts b/build.gradle.kts index 6ea81fc..9ea0d86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,8 +4,3 @@ plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.kotlin.compose) apply false } - -allprojects { - version = "0.1.0" - group = "de.thetadev.formconductor" -} diff --git a/compose-ui/build.gradle.kts b/compose-ui/build.gradle.kts index f792d06..fd27b51 100644 --- a/compose-ui/build.gradle.kts +++ b/compose-ui/build.gradle.kts @@ -1,10 +1,9 @@ plugins { id("com.android.library") alias(libs.plugins.kotlin.compose) - `maven-publish` } android { - namespace = "de.thetadev.formconductor.composeui" + namespace = "me.naingaungluu.formconductor.composeui" compileSdk = 37 defaultConfig { @@ -50,15 +49,3 @@ dependencies { api(libs.androidx.compose.ui) api(libs.androidx.compose.runtime) } - -apply(from = "$rootDir/scripts/publish-root.gradle.kts") -afterEvaluate { - configure { - publications { - register("release") { - artifactId = "compose-ui" - from(components["release"]) - } - } - } -} diff --git a/compose-ui/consumer-rules.pro b/compose-ui/consumer-rules.pro index 57ccb1e..3781e98 100644 --- a/compose-ui/consumer-rules.pro +++ b/compose-ui/consumer-rules.pro @@ -1,25 +1,25 @@ --keepclassmembers class * extends de.thetadev.formconductor.validation.rules.ValidationRule { +-keepclassmembers class * extends me.naingaungluu.formconductor.validation.rules.ValidationRule { ; public static ; } # Keep classes and properties annotated with @Form --if @de.thetadev.formconductor.annotations.Form class ** +-if @me.naingaungluu.formconductor.annotations.Form class ** -keepclassmembers,allowobfuscation,allowoptimization class <1> { (...); ; } # keep all the classes referenced in the @Form class --if @de.thetadev.formconductor.annotations.Form class ** { +-if @me.naingaungluu.formconductor.annotations.Form class ** { ** *; } -keep,allowoptimization,allowshrinking class <1> { (...); ; } --keep @de.thetadev.formconductor.annotations.Form class * { *; } --keep class de.thetadev.formconductor.** { *; } +-keep @me.naingaungluu.formconductor.annotations.Form class * { *; } +-keep class me.naingaungluu.formconductor.** { *; } # Keep kotlin.Metadata annotations to maintain metadata on kept items -keepattributes *Annotation*,Signature,InnerClasses diff --git a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/FormComposables.kt b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/FormComposables.kt similarity index 80% rename from compose-ui/src/main/java/de/thetadev/formconductor/composeui/FormComposables.kt rename to compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/FormComposables.kt index 5849bd6..67a5c7f 100644 --- a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/FormComposables.kt +++ b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/FormComposables.kt @@ -1,15 +1,15 @@ -package de.thetadev.formconductor.composeui +package me.naingaungluu.formconductor.composeui import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.remember -import de.thetadev.formconductor.Form -import de.thetadev.formconductor.FormField -import de.thetadev.formconductor.FormImpl -import de.thetadev.formconductor.composeui.scope.FormFieldScope -import de.thetadev.formconductor.composeui.scope.FormFieldScopeImpl -import de.thetadev.formconductor.composeui.scope.FormScope -import de.thetadev.formconductor.composeui.scope.FormScopeImpl +import me.naingaungluu.formconductor.Form +import me.naingaungluu.formconductor.FormField +import me.naingaungluu.formconductor.FormImpl +import me.naingaungluu.formconductor.composeui.scope.FormFieldScope +import me.naingaungluu.formconductor.composeui.scope.FormFieldScopeImpl +import me.naingaungluu.formconductor.composeui.scope.FormScope +import me.naingaungluu.formconductor.composeui.scope.FormScopeImpl import kotlin.reflect.KClass import kotlin.reflect.KProperty1 diff --git a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormFieldScope.kt b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormFieldScope.kt similarity index 87% rename from compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormFieldScope.kt rename to compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormFieldScope.kt index ce49cb1..a4fa7ac 100644 --- a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormFieldScope.kt +++ b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormFieldScope.kt @@ -1,8 +1,8 @@ -package de.thetadev.formconductor.composeui.scope +package me.naingaungluu.formconductor.composeui.scope import androidx.compose.runtime.Composable import androidx.compose.runtime.State -import de.thetadev.formconductor.FieldResult +import me.naingaungluu.formconductor.FieldResult /** * A scope interface for FormField objects diff --git a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormFieldScopeImpl.kt b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormFieldScopeImpl.kt similarity index 80% rename from compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormFieldScopeImpl.kt rename to compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormFieldScopeImpl.kt index 2a1ab19..5c48391 100644 --- a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormFieldScopeImpl.kt +++ b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormFieldScopeImpl.kt @@ -1,10 +1,10 @@ -package de.thetadev.formconductor.composeui.scope +package me.naingaungluu.formconductor.composeui.scope import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.collectAsState -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.FormField +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.FormField internal class FormFieldScopeImpl( private val formField: FormField diff --git a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormScope.kt b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormScope.kt similarity index 89% rename from compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormScope.kt rename to compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormScope.kt index 739287a..63ef6ea 100644 --- a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormScope.kt +++ b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormScope.kt @@ -1,9 +1,9 @@ -package de.thetadev.formconductor.composeui.scope +package me.naingaungluu.formconductor.composeui.scope import androidx.compose.runtime.Composable import androidx.compose.runtime.State -import de.thetadev.formconductor.FormField -import de.thetadev.formconductor.FormResult +import me.naingaungluu.formconductor.FormField +import me.naingaungluu.formconductor.FormResult import kotlin.reflect.KProperty1 /** diff --git a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormScopeImpl.kt b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormScopeImpl.kt similarity index 84% rename from compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormScopeImpl.kt rename to compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormScopeImpl.kt index 042af0e..28ea84f 100644 --- a/compose-ui/src/main/java/de/thetadev/formconductor/composeui/scope/FormScopeImpl.kt +++ b/compose-ui/src/main/java/me/naingaungluu/formconductor/composeui/scope/FormScopeImpl.kt @@ -1,11 +1,11 @@ -package de.thetadev.formconductor.composeui.scope +package me.naingaungluu.formconductor.composeui.scope import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.collectAsState -import de.thetadev.formconductor.FormField -import de.thetadev.formconductor.FormImpl -import de.thetadev.formconductor.FormResult +import me.naingaungluu.formconductor.FormField +import me.naingaungluu.formconductor.FormImpl +import me.naingaungluu.formconductor.FormResult import kotlin.reflect.KProperty1 internal class FormScopeImpl( diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 0f93175..1ee6f69 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("java-library") alias(libs.plugins.jetbrains.kotlin.jvm) - `maven-publish` } java { sourceCompatibility = JavaVersion.VERSION_11 @@ -17,15 +16,3 @@ dependencies { implementation(libs.kotlin.reflect) implementation(libs.kotlinx.coroutines.core) } - -apply(from = "$rootDir/scripts/publish-root.gradle.kts") -afterEvaluate { - configure { - publications { - register("java") { - artifactId = "core" - from(components["java"]) - } - } - } -} diff --git a/core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/OptionalFlag.kt b/core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/OptionalFlag.kt deleted file mode 100644 index 6f98fdb..0000000 --- a/core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/OptionalFlag.kt +++ /dev/null @@ -1,5 +0,0 @@ -package de.thetadev.formconductor.validation.optionalFlags - -interface OptionalFlag { - fun evaluate(): Boolean -} diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/ValidationRule.kt b/core/src/main/java/de/thetadev/formconductor/validation/rules/ValidationRule.kt deleted file mode 100644 index 43233f1..0000000 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/ValidationRule.kt +++ /dev/null @@ -1,3 +0,0 @@ -package de.thetadev.formconductor.validation.rules - -interface ValidationRule diff --git a/core/src/main/java/de/thetadev/formconductor/validation/validators/FieldValidator.kt b/core/src/main/java/de/thetadev/formconductor/validation/validators/FieldValidator.kt deleted file mode 100644 index ba3c476..0000000 --- a/core/src/main/java/de/thetadev/formconductor/validation/validators/FieldValidator.kt +++ /dev/null @@ -1,7 +0,0 @@ -package de.thetadev.formconductor.validation.validators - -import de.thetadev.formconductor.FieldResult - -internal interface FieldValidator { - fun validate(input: V): FieldResult -} diff --git a/core/src/main/java/de/thetadev/formconductor/CollectableFormData.kt b/core/src/main/java/me/naingaungluu/formconductor/CollectableFormData.kt similarity index 84% rename from core/src/main/java/de/thetadev/formconductor/CollectableFormData.kt rename to core/src/main/java/me/naingaungluu/formconductor/CollectableFormData.kt index 205ac83..d2953ba 100644 --- a/core/src/main/java/de/thetadev/formconductor/CollectableFormData.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/CollectableFormData.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor +package me.naingaungluu.formconductor import kotlin.reflect.KProperty1 diff --git a/core/src/main/java/de/thetadev/formconductor/FieldResult.kt b/core/src/main/java/me/naingaungluu/formconductor/FieldResult.kt similarity index 86% rename from core/src/main/java/de/thetadev/formconductor/FieldResult.kt rename to core/src/main/java/me/naingaungluu/formconductor/FieldResult.kt index ae8c2e4..7627029 100644 --- a/core/src/main/java/de/thetadev/formconductor/FieldResult.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/FieldResult.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor +package me.naingaungluu.formconductor -import de.thetadev.formconductor.validation.rules.ValidationRule +import me.naingaungluu.formconductor.validation.rules.ValidationRule /** * Returns after a field validation as a result diff --git a/core/src/main/java/de/thetadev/formconductor/Form.kt b/core/src/main/java/me/naingaungluu/formconductor/Form.kt similarity index 97% rename from core/src/main/java/de/thetadev/formconductor/Form.kt rename to core/src/main/java/me/naingaungluu/formconductor/Form.kt index 217c5ce..010cd6a 100644 --- a/core/src/main/java/de/thetadev/formconductor/Form.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/Form.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor +package me.naingaungluu.formconductor import kotlinx.coroutines.flow.Flow import kotlin.reflect.KProperty1 diff --git a/core/src/main/java/de/thetadev/formconductor/FormField.kt b/core/src/main/java/me/naingaungluu/formconductor/FormField.kt similarity index 97% rename from core/src/main/java/de/thetadev/formconductor/FormField.kt rename to core/src/main/java/me/naingaungluu/formconductor/FormField.kt index b66f9e3..3725492 100644 --- a/core/src/main/java/de/thetadev/formconductor/FormField.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/FormField.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor +package me.naingaungluu.formconductor import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/de/thetadev/formconductor/FormFieldImpl.kt b/core/src/main/java/me/naingaungluu/formconductor/FormFieldImpl.kt similarity index 91% rename from core/src/main/java/de/thetadev/formconductor/FormFieldImpl.kt rename to core/src/main/java/me/naingaungluu/formconductor/FormFieldImpl.kt index b6d7a5a..ec57b2b 100644 --- a/core/src/main/java/de/thetadev/formconductor/FormFieldImpl.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/FormFieldImpl.kt @@ -1,10 +1,10 @@ -package de.thetadev.formconductor +package me.naingaungluu.formconductor import kotlinx.coroutines.flow.MutableStateFlow -import de.thetadev.formconductor.validation.optionalFlags.OptionalFlag -import de.thetadev.formconductor.validation.rules.OptionalRule -import de.thetadev.formconductor.validation.validators.FieldValidator -import de.thetadev.formconductor.validation.validators.StatelessFieldValidator +import me.naingaungluu.formconductor.validation.optionalFlags.OptionalFlag +import me.naingaungluu.formconductor.validation.rules.OptionalRule +import me.naingaungluu.formconductor.validation.validators.FieldValidator +import me.naingaungluu.formconductor.validation.validators.StatelessFieldValidator import kotlin.reflect.KProperty1 /** diff --git a/core/src/main/java/de/thetadev/formconductor/FormImpl.kt b/core/src/main/java/me/naingaungluu/formconductor/FormImpl.kt similarity index 96% rename from core/src/main/java/de/thetadev/formconductor/FormImpl.kt rename to core/src/main/java/me/naingaungluu/formconductor/FormImpl.kt index aaba92a..3b52f7a 100644 --- a/core/src/main/java/de/thetadev/formconductor/FormImpl.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/FormImpl.kt @@ -1,13 +1,13 @@ -package de.thetadev.formconductor +package me.naingaungluu.formconductor import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.combine -import de.thetadev.formconductor.builder.FormFieldFactory -import de.thetadev.formconductor.syntax.AnnotationSyntaxProcessor -import de.thetadev.formconductor.syntax.SyntaxProcessor -import de.thetadev.formconductor.syntax.SyntaxResult -import de.thetadev.formconductor.syntax.getErrorMessage +import me.naingaungluu.formconductor.builder.FormFieldFactory +import me.naingaungluu.formconductor.syntax.AnnotationSyntaxProcessor +import me.naingaungluu.formconductor.syntax.SyntaxProcessor +import me.naingaungluu.formconductor.syntax.SyntaxResult +import me.naingaungluu.formconductor.syntax.getErrorMessage import kotlin.reflect.KClass import kotlin.reflect.KMutableProperty import kotlin.reflect.KParameter diff --git a/core/src/main/java/de/thetadev/formconductor/FormResult.kt b/core/src/main/java/me/naingaungluu/formconductor/FormResult.kt similarity index 89% rename from core/src/main/java/de/thetadev/formconductor/FormResult.kt rename to core/src/main/java/me/naingaungluu/formconductor/FormResult.kt index 52566f3..21a1048 100644 --- a/core/src/main/java/de/thetadev/formconductor/FormResult.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/FormResult.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor +package me.naingaungluu.formconductor -import de.thetadev.formconductor.validation.rules.ValidationRule +import me.naingaungluu.formconductor.validation.rules.ValidationRule /** * Form result object with multiple states diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/Collateral.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/Collateral.kt similarity index 57% rename from core/src/main/java/de/thetadev/formconductor/annotations/Collateral.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/Collateral.kt index 05a832b..84a9562 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/Collateral.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/Collateral.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.CollateralValidationRule +import me.naingaungluu.formconductor.validation.rules.CollateralValidationRule @Target(AnnotationTarget.PROPERTY) @Retention(AnnotationRetention.RUNTIME) diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/DynamicOptional.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/DynamicOptional.kt similarity index 63% rename from core/src/main/java/de/thetadev/formconductor/annotations/DynamicOptional.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/DynamicOptional.kt index 244a594..7515cee 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/DynamicOptional.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/DynamicOptional.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.OptionalStateRule +import me.naingaungluu.formconductor.validation.rules.OptionalStateRule import kotlin.reflect.KClass @Target(AnnotationTarget.PROPERTY) diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/EmailAddress.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/EmailAddress.kt similarity index 76% rename from core/src/main/java/de/thetadev/formconductor/annotations/EmailAddress.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/EmailAddress.kt index b9fa3cf..53a19a0 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/EmailAddress.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/EmailAddress.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.EmailAddressRule +import me.naingaungluu.formconductor.validation.rules.EmailAddressRule /** * Property Annotation for [EmailAddressRule] diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/FieldValidation.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/FieldValidation.kt similarity index 82% rename from core/src/main/java/de/thetadev/formconductor/annotations/FieldValidation.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/FieldValidation.kt index d4f6b5c..fd4dc14 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/FieldValidation.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/FieldValidation.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.ValidationRule +import me.naingaungluu.formconductor.validation.rules.ValidationRule import kotlin.reflect.KClass internal class AnyFieldType diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/FloatRange.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/FloatRange.kt similarity index 83% rename from core/src/main/java/de/thetadev/formconductor/annotations/FloatRange.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/FloatRange.kt index d4a184c..60e15f7 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/FloatRange.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/FloatRange.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.FloatRangeRule +import me.naingaungluu.formconductor.validation.rules.FloatRangeRule /** * Property Annotation for [FloatRangeRule] diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/Form.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/Form.kt similarity index 65% rename from core/src/main/java/de/thetadev/formconductor/annotations/Form.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/Form.kt index 4fe26d6..1826ea6 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/Form.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/Form.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations @Retention(AnnotationRetention.RUNTIME) @Target(AnnotationTarget.CLASS) diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/IntegerRange.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/IntegerRange.kt similarity index 83% rename from core/src/main/java/de/thetadev/formconductor/annotations/IntegerRange.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/IntegerRange.kt index 4a12b69..5f4fbcd 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/IntegerRange.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/IntegerRange.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.IntegerRangeRule +import me.naingaungluu.formconductor.validation.rules.IntegerRangeRule /** * Property Annotation for [IntegerRangeRule] diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/IsChecked.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/IsChecked.kt similarity index 80% rename from core/src/main/java/de/thetadev/formconductor/annotations/IsChecked.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/IsChecked.kt index 60c48b6..9f496d2 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/IsChecked.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/IsChecked.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.IsCheckedRule +import me.naingaungluu.formconductor.validation.rules.IsCheckedRule /** * Property Annotation for [IsCheckedRule] diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/MaxLength.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/MaxLength.kt similarity index 80% rename from core/src/main/java/de/thetadev/formconductor/annotations/MaxLength.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/MaxLength.kt index 4ea69b4..55a5c45 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/MaxLength.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/MaxLength.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.MaxLengthRule +import me.naingaungluu.formconductor.validation.rules.MaxLengthRule /** * Property Annotation for [MaxLengthRule] diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/MinLength.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/MinLength.kt similarity index 80% rename from core/src/main/java/de/thetadev/formconductor/annotations/MinLength.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/MinLength.kt index 4324e51..8c4de59 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/MinLength.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/MinLength.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.MinLengthRule +import me.naingaungluu.formconductor.validation.rules.MinLengthRule /** * Property Annotation for [MinLengthRule] diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/OptionalField.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/OptionalField.kt similarity index 75% rename from core/src/main/java/de/thetadev/formconductor/annotations/OptionalField.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/OptionalField.kt index 12a1178..e8a9858 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/OptionalField.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/OptionalField.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.OptionalRule +import me.naingaungluu.formconductor.validation.rules.OptionalRule /** * Property Annotation for [OptionalRule] diff --git a/core/src/main/java/de/thetadev/formconductor/annotations/WebUrl.kt b/core/src/main/java/me/naingaungluu/formconductor/annotations/WebUrl.kt similarity index 74% rename from core/src/main/java/de/thetadev/formconductor/annotations/WebUrl.kt rename to core/src/main/java/me/naingaungluu/formconductor/annotations/WebUrl.kt index 41bed19..e4b3086 100644 --- a/core/src/main/java/de/thetadev/formconductor/annotations/WebUrl.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/annotations/WebUrl.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.annotations +package me.naingaungluu.formconductor.annotations -import de.thetadev.formconductor.validation.rules.OptionalRule -import de.thetadev.formconductor.validation.rules.WebUrlRule +import me.naingaungluu.formconductor.validation.rules.OptionalRule +import me.naingaungluu.formconductor.validation.rules.WebUrlRule /** * Property Annotation for [WebUrlRule] diff --git a/core/src/main/java/de/thetadev/formconductor/builder/FormBuilder.kt b/core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilder.kt similarity index 82% rename from core/src/main/java/de/thetadev/formconductor/builder/FormBuilder.kt rename to core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilder.kt index b222e1c..6de809d 100644 --- a/core/src/main/java/de/thetadev/formconductor/builder/FormBuilder.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilder.kt @@ -1,8 +1,8 @@ -package de.thetadev.formconductor.builder +package me.naingaungluu.formconductor.builder -import de.thetadev.formconductor.Form -import de.thetadev.formconductor.FormField -import de.thetadev.formconductor.FormImpl +import me.naingaungluu.formconductor.Form +import me.naingaungluu.formconductor.FormField +import me.naingaungluu.formconductor.FormImpl import kotlin.reflect.KClass import kotlin.reflect.KProperty1 diff --git a/core/src/main/java/de/thetadev/formconductor/builder/FormBuilderScope.kt b/core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilderScope.kt similarity index 61% rename from core/src/main/java/de/thetadev/formconductor/builder/FormBuilderScope.kt rename to core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilderScope.kt index 06b1a6a..44eba74 100644 --- a/core/src/main/java/de/thetadev/formconductor/builder/FormBuilderScope.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilderScope.kt @@ -1,8 +1,8 @@ -package de.thetadev.formconductor.builder +package me.naingaungluu.formconductor.builder import kotlinx.coroutines.flow.Flow -import de.thetadev.formconductor.FormField -import de.thetadev.formconductor.FormResult +import me.naingaungluu.formconductor.FormField +import me.naingaungluu.formconductor.FormResult import kotlin.reflect.KProperty1 interface FormBuilderScope { diff --git a/core/src/main/java/de/thetadev/formconductor/builder/FormBuilderScopeImpl.kt b/core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilderScopeImpl.kt similarity index 67% rename from core/src/main/java/de/thetadev/formconductor/builder/FormBuilderScopeImpl.kt rename to core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilderScopeImpl.kt index a0a7fa4..a09f469 100644 --- a/core/src/main/java/de/thetadev/formconductor/builder/FormBuilderScopeImpl.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/builder/FormBuilderScopeImpl.kt @@ -1,9 +1,9 @@ -package de.thetadev.formconductor.builder +package me.naingaungluu.formconductor.builder import kotlinx.coroutines.flow.Flow -import de.thetadev.formconductor.FormField -import de.thetadev.formconductor.FormImpl -import de.thetadev.formconductor.FormResult +import me.naingaungluu.formconductor.FormField +import me.naingaungluu.formconductor.FormImpl +import me.naingaungluu.formconductor.FormResult import kotlin.reflect.KProperty1 class FormBuilderScopeImpl( diff --git a/core/src/main/java/de/thetadev/formconductor/builder/FormFieldBuilderScope.kt b/core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldBuilderScope.kt similarity index 65% rename from core/src/main/java/de/thetadev/formconductor/builder/FormFieldBuilderScope.kt rename to core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldBuilderScope.kt index 686d466..4e847a2 100644 --- a/core/src/main/java/de/thetadev/formconductor/builder/FormFieldBuilderScope.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldBuilderScope.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.builder +package me.naingaungluu.formconductor.builder import kotlinx.coroutines.flow.StateFlow -import de.thetadev.formconductor.FieldResult +import me.naingaungluu.formconductor.FieldResult interface FormFieldBuilderScope { val state: StateFlow diff --git a/core/src/main/java/de/thetadev/formconductor/builder/FormFieldBuilderScopeImpl.kt b/core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldBuilderScopeImpl.kt similarity index 76% rename from core/src/main/java/de/thetadev/formconductor/builder/FormFieldBuilderScopeImpl.kt rename to core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldBuilderScopeImpl.kt index abfa8f3..9086f1a 100644 --- a/core/src/main/java/de/thetadev/formconductor/builder/FormFieldBuilderScopeImpl.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldBuilderScopeImpl.kt @@ -1,9 +1,9 @@ -package de.thetadev.formconductor.builder +package me.naingaungluu.formconductor.builder import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.FormField +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.FormField class FormFieldBuilderScopeImpl( private val formField: FormField diff --git a/core/src/main/java/de/thetadev/formconductor/builder/FormFieldFactory.kt b/core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldFactory.kt similarity index 69% rename from core/src/main/java/de/thetadev/formconductor/builder/FormFieldFactory.kt rename to core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldFactory.kt index 2aa1c0f..3b9ec7d 100644 --- a/core/src/main/java/de/thetadev/formconductor/builder/FormFieldFactory.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldFactory.kt @@ -1,16 +1,16 @@ -package de.thetadev.formconductor.builder +package me.naingaungluu.formconductor.builder -import de.thetadev.formconductor.CollectableFormData -import de.thetadev.formconductor.FormField -import de.thetadev.formconductor.FormFieldImpl -import de.thetadev.formconductor.annotations.DynamicOptional -import de.thetadev.formconductor.utils.getEvaluatorInstance -import de.thetadev.formconductor.utils.isFieldOptional -import de.thetadev.formconductor.utils.validationAnnotations -import de.thetadev.formconductor.validation.optionalFlags.DefaultOptionalFlag -import de.thetadev.formconductor.validation.optionalFlags.OptionalFlag -import de.thetadev.formconductor.validation.optionalFlags.RuleBasedOptionalFlag -import de.thetadev.formconductor.validation.validators.FieldValidator +import me.naingaungluu.formconductor.CollectableFormData +import me.naingaungluu.formconductor.FormField +import me.naingaungluu.formconductor.FormFieldImpl +import me.naingaungluu.formconductor.annotations.DynamicOptional +import me.naingaungluu.formconductor.utils.getEvaluatorInstance +import me.naingaungluu.formconductor.utils.isFieldOptional +import me.naingaungluu.formconductor.utils.validationAnnotations +import me.naingaungluu.formconductor.validation.optionalFlags.DefaultOptionalFlag +import me.naingaungluu.formconductor.validation.optionalFlags.OptionalFlag +import me.naingaungluu.formconductor.validation.optionalFlags.RuleBasedOptionalFlag +import me.naingaungluu.formconductor.validation.validators.FieldValidator import kotlin.reflect.KProperty1 import kotlin.reflect.full.findAnnotations import kotlin.reflect.full.hasAnnotation diff --git a/core/src/main/java/de/thetadev/formconductor/builder/FormFieldValidatorFactory.kt b/core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldValidatorFactory.kt similarity index 67% rename from core/src/main/java/de/thetadev/formconductor/builder/FormFieldValidatorFactory.kt rename to core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldValidatorFactory.kt index fe3b34c..a9fb871 100644 --- a/core/src/main/java/de/thetadev/formconductor/builder/FormFieldValidatorFactory.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/builder/FormFieldValidatorFactory.kt @@ -1,15 +1,15 @@ -package de.thetadev.formconductor.builder +package me.naingaungluu.formconductor.builder -import de.thetadev.formconductor.CollectableFormData -import de.thetadev.formconductor.annotations.FieldValidation -import de.thetadev.formconductor.utils.getFieldValidationData -import de.thetadev.formconductor.validation.rules.CollateralValidationRule -import de.thetadev.formconductor.validation.rules.StateBasedValidationRule -import de.thetadev.formconductor.validation.rules.StatelessValidationRule -import de.thetadev.formconductor.validation.validators.CollateralFieldValidator -import de.thetadev.formconductor.validation.validators.FieldValidator -import de.thetadev.formconductor.validation.validators.StateBasedFieldValidator -import de.thetadev.formconductor.validation.validators.StatelessFieldValidator +import me.naingaungluu.formconductor.CollectableFormData +import me.naingaungluu.formconductor.annotations.FieldValidation +import me.naingaungluu.formconductor.utils.getFieldValidationData +import me.naingaungluu.formconductor.validation.rules.CollateralValidationRule +import me.naingaungluu.formconductor.validation.rules.StateBasedValidationRule +import me.naingaungluu.formconductor.validation.rules.StatelessValidationRule +import me.naingaungluu.formconductor.validation.validators.CollateralFieldValidator +import me.naingaungluu.formconductor.validation.validators.FieldValidator +import me.naingaungluu.formconductor.validation.validators.StateBasedFieldValidator +import me.naingaungluu.formconductor.validation.validators.StatelessFieldValidator import kotlin.reflect.KProperty1 internal class FormFieldValidatorFactory( diff --git a/core/src/main/java/de/thetadev/formconductor/syntax/AnnotationSyntaxProcessor.kt b/core/src/main/java/me/naingaungluu/formconductor/syntax/AnnotationSyntaxProcessor.kt similarity index 90% rename from core/src/main/java/de/thetadev/formconductor/syntax/AnnotationSyntaxProcessor.kt rename to core/src/main/java/me/naingaungluu/formconductor/syntax/AnnotationSyntaxProcessor.kt index 679442c..905133b 100644 --- a/core/src/main/java/de/thetadev/formconductor/syntax/AnnotationSyntaxProcessor.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/syntax/AnnotationSyntaxProcessor.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.syntax +package me.naingaungluu.formconductor.syntax -import de.thetadev.formconductor.annotations.AnyFieldType -import de.thetadev.formconductor.annotations.FieldValidation +import me.naingaungluu.formconductor.annotations.AnyFieldType +import me.naingaungluu.formconductor.annotations.FieldValidation import kotlin.reflect.KProperty1 import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.hasAnnotation diff --git a/core/src/main/java/de/thetadev/formconductor/syntax/SyntaxProcessor.kt b/core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxProcessor.kt similarity index 75% rename from core/src/main/java/de/thetadev/formconductor/syntax/SyntaxProcessor.kt rename to core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxProcessor.kt index ec043ca..dda6999 100644 --- a/core/src/main/java/de/thetadev/formconductor/syntax/SyntaxProcessor.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxProcessor.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor.syntax +package me.naingaungluu.formconductor.syntax import kotlin.reflect.KProperty1 diff --git a/core/src/main/java/de/thetadev/formconductor/syntax/SyntaxResult.kt b/core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxResult.kt similarity index 94% rename from core/src/main/java/de/thetadev/formconductor/syntax/SyntaxResult.kt rename to core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxResult.kt index f68e5dd..873e78e 100644 --- a/core/src/main/java/de/thetadev/formconductor/syntax/SyntaxResult.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxResult.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor.syntax +package me.naingaungluu.formconductor.syntax /** * Result types for Syntax Processor diff --git a/core/src/main/java/de/thetadev/formconductor/syntax/SyntaxUtils.kt b/core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxUtils.kt similarity index 94% rename from core/src/main/java/de/thetadev/formconductor/syntax/SyntaxUtils.kt rename to core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxUtils.kt index 5c95d43..5abf92c 100644 --- a/core/src/main/java/de/thetadev/formconductor/syntax/SyntaxUtils.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/syntax/SyntaxUtils.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor.syntax +package me.naingaungluu.formconductor.syntax import kotlin.reflect.KClass import kotlin.reflect.KProperty diff --git a/core/src/main/java/de/thetadev/formconductor/utils/ReflectionExtensions.kt b/core/src/main/java/me/naingaungluu/formconductor/utils/ReflectionExtensions.kt similarity index 76% rename from core/src/main/java/de/thetadev/formconductor/utils/ReflectionExtensions.kt rename to core/src/main/java/me/naingaungluu/formconductor/utils/ReflectionExtensions.kt index 8880b1c..d092d1a 100644 --- a/core/src/main/java/de/thetadev/formconductor/utils/ReflectionExtensions.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/utils/ReflectionExtensions.kt @@ -1,9 +1,9 @@ -package de.thetadev.formconductor.utils +package me.naingaungluu.formconductor.utils -import de.thetadev.formconductor.annotations.DynamicOptional -import de.thetadev.formconductor.annotations.FieldValidation -import de.thetadev.formconductor.annotations.OptionalField -import de.thetadev.formconductor.validation.rules.OptionalStateRule +import me.naingaungluu.formconductor.annotations.DynamicOptional +import me.naingaungluu.formconductor.annotations.FieldValidation +import me.naingaungluu.formconductor.annotations.OptionalField +import me.naingaungluu.formconductor.validation.rules.OptionalStateRule import kotlin.reflect.KClass import kotlin.reflect.KProperty1 import kotlin.reflect.full.findAnnotation diff --git a/core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/DefaultOptionalFlag.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/DefaultOptionalFlag.kt similarity index 68% rename from core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/DefaultOptionalFlag.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/DefaultOptionalFlag.kt index 97a007a..b495cbe 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/DefaultOptionalFlag.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/DefaultOptionalFlag.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor.validation.optionalFlags +package me.naingaungluu.formconductor.validation.optionalFlags class DefaultOptionalFlag( private val isOptional: Boolean diff --git a/core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/OptionalFlag.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/OptionalFlag.kt new file mode 100644 index 0000000..1875016 --- /dev/null +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/OptionalFlag.kt @@ -0,0 +1,5 @@ +package me.naingaungluu.formconductor.validation.optionalFlags + +interface OptionalFlag { + fun evaluate(): Boolean +} diff --git a/core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/RuleBasedOptionalFlag.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/RuleBasedOptionalFlag.kt similarity index 58% rename from core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/RuleBasedOptionalFlag.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/RuleBasedOptionalFlag.kt index f830d64..30ae3f1 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/optionalFlags/RuleBasedOptionalFlag.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/optionalFlags/RuleBasedOptionalFlag.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.validation.optionalFlags +package me.naingaungluu.formconductor.validation.optionalFlags -import de.thetadev.formconductor.CollectableFormData -import de.thetadev.formconductor.validation.rules.OptionalStateRule +import me.naingaungluu.formconductor.CollectableFormData +import me.naingaungluu.formconductor.validation.rules.OptionalStateRule internal class RuleBasedOptionalFlag( private val formState: CollectableFormData, diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/CollateralValidationRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/CollateralValidationRule.kt similarity index 84% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/CollateralValidationRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/CollateralValidationRule.kt index 400f618..cb4e143 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/CollateralValidationRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/CollateralValidationRule.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules /** * Validation Rule that triggers validation of the entire form when this value is updated. diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/EmailAddressRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/EmailAddressRule.kt similarity index 86% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/EmailAddressRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/EmailAddressRule.kt index db35859..79d2f38 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/EmailAddressRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/EmailAddressRule.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.annotations.EmailAddress +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.annotations.EmailAddress /** * Validation Rule for Email Addresses diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/FloatRangeRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/FloatRangeRule.kt similarity index 84% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/FloatRangeRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/FloatRangeRule.kt index 52b35ed..3ab8a72 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/FloatRangeRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/FloatRangeRule.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.annotations.FloatRange +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.annotations.FloatRange /** * Validation Rule for Ranged Float Values diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/IntegerRangeRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/IntegerRangeRule.kt similarity index 79% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/IntegerRangeRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/IntegerRangeRule.kt index cc505a5..d85ae7f 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/IntegerRangeRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/IntegerRangeRule.kt @@ -1,8 +1,8 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.annotations.FloatRange -import de.thetadev.formconductor.annotations.IntegerRange +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.annotations.FloatRange +import me.naingaungluu.formconductor.annotations.IntegerRange /** * Validation Rule for Ranged Integer Values diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/IsCheckedRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/IsCheckedRule.kt similarity index 82% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/IsCheckedRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/IsCheckedRule.kt index 1bd935e..2faa394 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/IsCheckedRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/IsCheckedRule.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.annotations.IsChecked +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.annotations.IsChecked /** * Validation Rule for Checkboxes diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/MaxLengthRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/MaxLengthRule.kt similarity index 85% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/MaxLengthRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/MaxLengthRule.kt index a51825b..afca79e 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/MaxLengthRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/MaxLengthRule.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.annotations.MaxLength +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.annotations.MaxLength /** * Validation Rule for String Lengths diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/MinLengthRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/MinLengthRule.kt similarity index 80% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/MinLengthRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/MinLengthRule.kt index 252df73..d0a1e17 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/MinLengthRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/MinLengthRule.kt @@ -1,8 +1,8 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.annotations.MaxLength -import de.thetadev.formconductor.annotations.MinLength +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.annotations.MaxLength +import me.naingaungluu.formconductor.annotations.MinLength /** * Validation Rule for String Lengths diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/OptionalRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/OptionalRule.kt similarity index 74% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/OptionalRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/OptionalRule.kt index b64f766..82aeae1 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/OptionalRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/OptionalRule.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.annotations.OptionalField +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.annotations.OptionalField /** * Validation Rule for Optional Fields diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/OptionalStateRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/OptionalStateRule.kt similarity index 57% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/OptionalStateRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/OptionalStateRule.kt index f91f6b9..95b8c66 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/OptionalStateRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/OptionalStateRule.kt @@ -1,4 +1,4 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules interface OptionalStateRule { fun isOptional(state: T): Boolean diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/StateBasedValidationRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/StateBasedValidationRule.kt similarity index 59% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/StateBasedValidationRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/StateBasedValidationRule.kt index 11a0283..e8e3f40 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/StateBasedValidationRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/StateBasedValidationRule.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult +import me.naingaungluu.formconductor.FieldResult interface StateBasedValidationRule : ValidationRule { fun validate(value: V, options: A, formState: T): FieldResult diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/StatelessValidationRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/StatelessValidationRule.kt similarity index 77% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/StatelessValidationRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/StatelessValidationRule.kt index 907351d..ceac69a 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/StatelessValidationRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/StatelessValidationRule.kt @@ -1,6 +1,6 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult +import me.naingaungluu.formconductor.FieldResult /** * Stateless Validation Rule interface diff --git a/core/src/main/java/me/naingaungluu/formconductor/validation/rules/ValidationRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/ValidationRule.kt new file mode 100644 index 0000000..a8bc223 --- /dev/null +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/ValidationRule.kt @@ -0,0 +1,3 @@ +package me.naingaungluu.formconductor.validation.rules + +interface ValidationRule diff --git a/core/src/main/java/de/thetadev/formconductor/validation/rules/WebUrlRule.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/WebUrlRule.kt similarity index 84% rename from core/src/main/java/de/thetadev/formconductor/validation/rules/WebUrlRule.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/rules/WebUrlRule.kt index 601ee2f..e74dc55 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/rules/WebUrlRule.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/rules/WebUrlRule.kt @@ -1,9 +1,9 @@ -package de.thetadev.formconductor.validation.rules +package me.naingaungluu.formconductor.validation.rules -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.annotations.MaxLength -import de.thetadev.formconductor.annotations.MinLength -import de.thetadev.formconductor.annotations.WebUrl +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.annotations.MaxLength +import me.naingaungluu.formconductor.annotations.MinLength +import me.naingaungluu.formconductor.annotations.WebUrl /** * Validation Rule for String Lengths diff --git a/core/src/main/java/de/thetadev/formconductor/validation/validators/CollateralFieldValidator.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/validators/CollateralFieldValidator.kt similarity index 67% rename from core/src/main/java/de/thetadev/formconductor/validation/validators/CollateralFieldValidator.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/validators/CollateralFieldValidator.kt index b686fa0..7b24ae3 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/validators/CollateralFieldValidator.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/validators/CollateralFieldValidator.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.validation.validators +package me.naingaungluu.formconductor.validation.validators -import de.thetadev.formconductor.CollectableFormData -import de.thetadev.formconductor.FieldResult +import me.naingaungluu.formconductor.CollectableFormData +import me.naingaungluu.formconductor.FieldResult import kotlin.reflect.KProperty1 internal class CollateralFieldValidator( diff --git a/core/src/main/java/me/naingaungluu/formconductor/validation/validators/FieldValidator.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/validators/FieldValidator.kt new file mode 100644 index 0000000..2391ea5 --- /dev/null +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/validators/FieldValidator.kt @@ -0,0 +1,7 @@ +package me.naingaungluu.formconductor.validation.validators + +import me.naingaungluu.formconductor.FieldResult + +internal interface FieldValidator { + fun validate(input: V): FieldResult +} diff --git a/core/src/main/java/de/thetadev/formconductor/validation/validators/StateBasedFieldValidator.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/validators/StateBasedFieldValidator.kt similarity index 78% rename from core/src/main/java/de/thetadev/formconductor/validation/validators/StateBasedFieldValidator.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/validators/StateBasedFieldValidator.kt index d33fe61..127005d 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/validators/StateBasedFieldValidator.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/validators/StateBasedFieldValidator.kt @@ -1,8 +1,8 @@ -package de.thetadev.formconductor.validation.validators +package me.naingaungluu.formconductor.validation.validators -import de.thetadev.formconductor.CollectableFormData -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.validation.rules.StateBasedValidationRule +import me.naingaungluu.formconductor.CollectableFormData +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.validation.rules.StateBasedValidationRule /** * This is a wrapper class for a [StateBasedValidationRule] instance. diff --git a/core/src/main/java/de/thetadev/formconductor/validation/validators/StatelessFieldValidator.kt b/core/src/main/java/me/naingaungluu/formconductor/validation/validators/StatelessFieldValidator.kt similarity index 81% rename from core/src/main/java/de/thetadev/formconductor/validation/validators/StatelessFieldValidator.kt rename to core/src/main/java/me/naingaungluu/formconductor/validation/validators/StatelessFieldValidator.kt index 227518e..6917937 100644 --- a/core/src/main/java/de/thetadev/formconductor/validation/validators/StatelessFieldValidator.kt +++ b/core/src/main/java/me/naingaungluu/formconductor/validation/validators/StatelessFieldValidator.kt @@ -1,7 +1,7 @@ -package de.thetadev.formconductor.validation.validators +package me.naingaungluu.formconductor.validation.validators -import de.thetadev.formconductor.FieldResult -import de.thetadev.formconductor.validation.rules.StatelessValidationRule +import me.naingaungluu.formconductor.FieldResult +import me.naingaungluu.formconductor.validation.rules.StatelessValidationRule /** * A wrapper class or proxy that passes the annotation object as options to the validation rule diff --git a/scripts/publish-root.gradle.kts b/scripts/publish-root.gradle.kts deleted file mode 100644 index 47653fe..0000000 --- a/scripts/publish-root.gradle.kts +++ /dev/null @@ -1,56 +0,0 @@ -configure { - withSourcesJar() - withJavadocJar() -} - -configure { - publications.withType().configureEach { - group = project.group - version = project.version.toString() - - pom { - name = artifactId - description = "Declarative form validation library for Jetpack Compose" - url = "https://code.thetadev.de/ThetaDev/formconductor" - licenses { - license { - name = "MIT" - url = "https://opensource.org/licenses/MIT" - } - } - scm { - connection = "scm:git@code.thetadev.de/ThetaDev/formconductor.git" - url = "https://code.thetadev.de/ThetaDev/formconductor" - } - developers { - developer { - id = "NaingAungLuu" - name = "Naing Aung Luu" - email = "naingaunglu01@gmail.com" - url = "https://github.com/NaingAungLuu" - } - developer { - id = "ThetaDev" - name = "ThetaDev" - url = "https://thetadev.de" - } - } - } - } - - repositories { - maven { - name = "ThetaDev" - url = uri("https://code.thetadev.de/api/packages/ThetaDev/maven") - - credentials(HttpHeaderCredentials::class) { - name = "Authorization" - value = "token ${System.getenv("FORGEJO_TOKEN")}" - } - - authentication { - create("header") - } - } - } -}