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