From 0a94bc5ffc42574232b300d25db6294b69b3a415 Mon Sep 17 00:00:00 2001 From: Paul Kraft Date: Mon, 11 Nov 2024 14:17:40 -0800 Subject: [PATCH] Move files into the correct repositories --- .../data/ContactDocumentToContactMapper.kt | 13 +++++++------ .../bdh/engagehf/contact/ui/ContactScreen.kt | 7 +++++-- .../data/ContactDocumentToContactMapperTest.kt | 4 ++-- .../composables/NameFieldsTestComposable.kt | 8 ++++---- .../composables/UserProfileTestComposable.kt | 12 +++++++++--- .../personalInfo/PersonNameComponents.kt | 12 ++++++------ .../personalInfo/UserProfileComposable.kt | 6 +++--- .../personalInfo/fields/NameFieldRow.kt | 18 +++++++++--------- .../personalInfo/fields/NameTextField.kt | 16 ++++++++-------- .../validation/CascadingValidationEffect.kt | 2 +- .../validation/ValidationEngine.kt | 2 +- .../validation/ValidationModifier.kt | 2 +- .../validation/ValidationRule.kt | 2 +- .../validation/ValidationRuleDefaults.kt | 2 +- .../ValidationDebounceDuration.kt | 2 +- .../configuration/ValidationEngine.kt | 2 +- .../ValidationEngineConfiguration.kt | 2 +- .../state/CapturedValidationState.kt | 2 +- .../state/CapturedValidationStateEntries.kt | 2 +- .../validation/state/FailedValidationResult.kt | 2 +- .../validation/state/ReceiveValidation.kt | 2 +- .../validation/state/ValidationContext.kt | 2 +- .../views/ValidationResultsComposable.kt | 2 +- .../validation/views/VerifiableTextField.kt | 2 +- .../ProcessingDebounceDuration.kt | 2 +- .../views/layout/DescriptionGridRow.kt | 2 +- .../views/model/OperationState.kt | 2 +- .../views/model/ViewState.kt | 2 +- .../viewState/OperationStateAlert.kt | 2 +- .../viewModifier/viewState/ViewStateAlert.kt | 2 +- .../viewModifier/viewState/ViewStateMapper.kt | 2 +- .../views/views/button/ProcessingOverlay.kt | 2 +- .../views/views/button/SuspendButton.kt | 2 +- .../views/views/text/Markdown.kt | 2 +- .../spezi/modules/contact/ContactFactory.kt | 12 +++++++++--- .../simulator/ContactComposableSimulator.kt | 4 ++-- .../spezi/modules/contact/ContactComposable.kt | 7 +++++-- .../spezi/modules/contact/model/Contact.kt | 4 ++-- 38 files changed, 96 insertions(+), 77 deletions(-) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/personalInfo/PersonNameComponents.kt (53%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/personalInfo/UserProfileComposable.kt (91%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/personalInfo/fields/NameFieldRow.kt (65%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/personalInfo/fields/NameTextField.kt (64%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/CascadingValidationEffect.kt (51%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/ValidationEngine.kt (98%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/ValidationModifier.kt (97%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/ValidationRule.kt (95%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/ValidationRuleDefaults.kt (96%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/configuration/ValidationDebounceDuration.kt (77%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/configuration/ValidationEngine.kt (73%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/configuration/ValidationEngineConfiguration.kt (83%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/state/CapturedValidationState.kt (92%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/state/CapturedValidationStateEntries.kt (87%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/state/FailedValidationResult.kt (88%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/state/ReceiveValidation.kt (91%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/state/ValidationContext.kt (95%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/views/ValidationResultsComposable.kt (91%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/validation/views/VerifiableTextField.kt (97%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/compositionLocal/ProcessingDebounceDuration.kt (71%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/layout/DescriptionGridRow.kt (96%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/model/OperationState.kt (50%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/model/ViewState.kt (90%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/viewModifier/viewState/OperationStateAlert.kt (86%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/viewModifier/viewState/ViewStateAlert.kt (92%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/viewModifier/viewState/ViewStateMapper.kt (86%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/views/button/ProcessingOverlay.kt (95%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/views/button/SuspendButton.kt (97%) rename core/design/src/main/kotlin/edu/stanford/spezi/core/design/{validation => views}/views/views/text/Markdown.kt (97%) diff --git a/app/src/main/kotlin/edu/stanford/bdh/engagehf/contact/data/ContactDocumentToContactMapper.kt b/app/src/main/kotlin/edu/stanford/bdh/engagehf/contact/data/ContactDocumentToContactMapper.kt index cd07937fb..b87f3394d 100644 --- a/app/src/main/kotlin/edu/stanford/bdh/engagehf/contact/data/ContactDocumentToContactMapper.kt +++ b/app/src/main/kotlin/edu/stanford/bdh/engagehf/contact/data/ContactDocumentToContactMapper.kt @@ -2,7 +2,7 @@ package edu.stanford.bdh.engagehf.contact.data import com.google.firebase.firestore.DocumentSnapshot import edu.stanford.spezi.core.design.component.StringResource -import edu.stanford.spezi.core.design.validation.personalInfo.PersonNameComponents +import edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents import edu.stanford.spezi.modules.contact.model.Contact import edu.stanford.spezi.modules.contact.model.ContactOption import edu.stanford.spezi.modules.contact.model.call @@ -19,11 +19,12 @@ class ContactDocumentToContactMapper @Inject constructor() { } val components = contactName.split(", ") val nameComponents = components.firstOrNull()?.split(" ") - val personNameComponents = PersonNameComponents( - givenName = nameComponents?.getOrNull(0), - familyName = nameComponents?.drop(1) - ?.joinToString(" ") // assigning everything besides given name here - ) + val personNameComponents = + edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents( + givenName = nameComponents?.getOrNull(0), + familyName = nameComponents?.drop(1) + ?.joinToString(" ") // assigning everything besides given name here + ) val title = components.lastOrNull() val contactEmail = document.getString(CONTACT_EMAIL_FIELD) val phone = document.getString(CONTACT_PHONE_FIELD) diff --git a/app/src/main/kotlin/edu/stanford/bdh/engagehf/contact/ui/ContactScreen.kt b/app/src/main/kotlin/edu/stanford/bdh/engagehf/contact/ui/ContactScreen.kt index 66966444d..bce489e51 100644 --- a/app/src/main/kotlin/edu/stanford/bdh/engagehf/contact/ui/ContactScreen.kt +++ b/app/src/main/kotlin/edu/stanford/bdh/engagehf/contact/ui/ContactScreen.kt @@ -29,7 +29,7 @@ import edu.stanford.spezi.core.design.theme.Spacings import edu.stanford.spezi.core.design.theme.SpeziTheme import edu.stanford.spezi.core.design.theme.TextStyles import edu.stanford.spezi.core.design.theme.ThemePreviews -import edu.stanford.spezi.core.design.validation.personalInfo.PersonNameComponents +import edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents import edu.stanford.spezi.core.notification.R import edu.stanford.spezi.modules.contact.ContactComposable import edu.stanford.spezi.modules.contact.model.Contact @@ -109,7 +109,10 @@ private class ContactUiStateProvider : PreviewParameterProvider listOfNotNull( + edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents.FormatStyle.LONG -> listOfNotNull( namePrefix, givenName, nickname?.let { "\"$it\"" }, @@ -22,11 +22,11 @@ data class PersonNameComponents( familyName, nameSuffix ).joinToString(" ") - FormatStyle.MEDIUM -> + edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents.FormatStyle.MEDIUM -> TODO("Not yet implemented.") - FormatStyle.SHORT -> + edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents.FormatStyle.SHORT -> TODO("Not yet implemented.") - FormatStyle.ABBREVIATED -> listOfNotNull( + edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents.FormatStyle.ABBREVIATED -> listOfNotNull( givenName, middleName, familyName, diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/UserProfileComposable.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/UserProfileComposable.kt similarity index 91% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/UserProfileComposable.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/UserProfileComposable.kt index 77e8db0d2..eb14be993 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/UserProfileComposable.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/UserProfileComposable.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.personalInfo +package edu.stanford.spezi.core.design.views.personalInfo import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -30,7 +30,7 @@ import kotlin.math.min @Composable fun UserProfileComposable( modifier: Modifier = Modifier, - name: PersonNameComponents, + name: edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents, imageLoader: suspend () -> ImageResource? = { null }, ) { var size by remember { mutableStateOf(IntSize.Zero) } @@ -43,7 +43,7 @@ fun UserProfileComposable( } val formattedName = remember(name) { - name.formatted(PersonNameComponents.FormatStyle.ABBREVIATED) + name.formatted(edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents.FormatStyle.ABBREVIATED) } Box(modifier.onSizeChanged { size = it }.aspectRatio(1f)) { diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/fields/NameFieldRow.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/fields/NameFieldRow.kt similarity index 65% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/fields/NameFieldRow.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/fields/NameFieldRow.kt index 3c4f5e046..2a0c8ebbc 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/fields/NameFieldRow.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/fields/NameFieldRow.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.personalInfo.fields +package edu.stanford.spezi.core.design.views.personalInfo.fields import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding @@ -12,15 +12,15 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import edu.stanford.spezi.core.design.component.StringResource import edu.stanford.spezi.core.design.theme.ThemePreviews -import edu.stanford.spezi.core.design.validation.personalInfo.PersonNameComponents +import edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents import edu.stanford.spezi.core.design.validation.views.layout.DescriptionGridRow import kotlin.reflect.KMutableProperty1 @Composable fun NameFieldRow( description: StringResource, - name: MutableState, - component: KMutableProperty1, + name: MutableState, + component: KMutableProperty1, label: @Composable () -> Unit, ) { NameFieldRow( @@ -33,8 +33,8 @@ fun NameFieldRow( @Composable fun NameFieldRow( - name: MutableState, - component: KMutableProperty1, + name: MutableState, + component: KMutableProperty1, description: @Composable () -> Unit, label: @Composable () -> Unit, ) { @@ -51,12 +51,12 @@ fun NameFieldRow( @ThemePreviews @Composable private fun NameFieldRowPreview() { - val name = remember { mutableStateOf(PersonNameComponents()) } + val name = remember { mutableStateOf(edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents()) } Column { NameFieldRow( name, - PersonNameComponents::givenName, + edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents::givenName, description = { Text("First") } ) { Text("enter first name") @@ -67,7 +67,7 @@ private fun NameFieldRowPreview() { // Last Name Field NameFieldRow( name, - PersonNameComponents::familyName, + edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents::familyName, description = { Text("Last") } ) { Text("enter last name") diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/fields/NameTextField.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/fields/NameTextField.kt similarity index 64% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/fields/NameTextField.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/fields/NameTextField.kt index 2b0528625..6fc5a6304 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/personalInfo/fields/NameTextField.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/personalInfo/fields/NameTextField.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.personalInfo.fields +package edu.stanford.spezi.core.design.views.personalInfo.fields import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Text @@ -9,14 +9,14 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import edu.stanford.spezi.core.design.component.StringResource import edu.stanford.spezi.core.design.theme.ThemePreviews -import edu.stanford.spezi.core.design.validation.personalInfo.PersonNameComponents +import edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents import kotlin.reflect.KMutableProperty1 @Composable fun NameTextField( label: StringResource, - name: MutableState, - component: KMutableProperty1, + name: MutableState, + component: KMutableProperty1, prompt: StringResource? = null, ) { NameTextField(name, component, prompt) { @@ -26,8 +26,8 @@ fun NameTextField( @Composable fun NameTextField( - name: MutableState, - component: KMutableProperty1, + name: MutableState, + component: KMutableProperty1, prompt: StringResource? = null, label: @Composable () -> Unit, ) { @@ -53,9 +53,9 @@ fun NameTextField( @ThemePreviews @Composable private fun NameTextFieldPreview() { - val name = remember { mutableStateOf(PersonNameComponents()) } + val name = remember { mutableStateOf(edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents()) } - NameTextField(name, PersonNameComponents::givenName) { + NameTextField(name, edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents::givenName) { Text("Enter first name") } } diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/CascadingValidationEffect.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/CascadingValidationEffect.kt similarity index 51% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/CascadingValidationEffect.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/CascadingValidationEffect.kt index 75ba0a587..e1676ff23 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/CascadingValidationEffect.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/CascadingValidationEffect.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation +package edu.stanford.spezi.core.design.views.validation enum class CascadingValidationEffect { CONTINUE, INTERCEPT diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationEngine.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationEngine.kt similarity index 98% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationEngine.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationEngine.kt index 39f333125..cfadd374a 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationEngine.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationEngine.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation +package edu.stanford.spezi.core.design.views.validation import androidx.compose.runtime.mutableStateOf import edu.stanford.spezi.core.design.validation.validation.configuration.DEFAULT_VALIDATION_DEBOUNCE_DURATION diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationModifier.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationModifier.kt similarity index 97% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationModifier.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationModifier.kt index 7c7019f60..3546772ae 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationModifier.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationModifier.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation +package edu.stanford.spezi.core.design.views.validation import android.annotation.SuppressLint import androidx.compose.runtime.Composable diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationRule.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationRule.kt similarity index 95% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationRule.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationRule.kt index e488f4da3..cadde2fcb 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationRule.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationRule.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation +package edu.stanford.spezi.core.design.views.validation import edu.stanford.spezi.core.design.component.StringResource import edu.stanford.spezi.core.design.validation.validation.state.FailedValidationResult diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationRuleDefaults.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationRuleDefaults.kt similarity index 96% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationRuleDefaults.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationRuleDefaults.kt index 791d4c37f..a6aa86bc7 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/ValidationRuleDefaults.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/ValidationRuleDefaults.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation +package edu.stanford.spezi.core.design.views.validation import edu.stanford.spezi.core.design.component.StringResource import java.nio.charset.StandardCharsets diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationDebounceDuration.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationDebounceDuration.kt similarity index 77% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationDebounceDuration.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationDebounceDuration.kt index 000da7721..15cef5d76 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationDebounceDuration.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationDebounceDuration.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.configuration +package edu.stanford.spezi.core.design.views.validation.configuration import androidx.compose.runtime.compositionLocalOf import kotlin.time.Duration.Companion.seconds diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationEngine.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationEngine.kt similarity index 73% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationEngine.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationEngine.kt index 4ba7077af..da8284914 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationEngine.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationEngine.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.configuration +package edu.stanford.spezi.core.design.views.validation.configuration import androidx.compose.runtime.compositionLocalOf import edu.stanford.spezi.core.design.validation.validation.ValidationEngine diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationEngineConfiguration.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationEngineConfiguration.kt similarity index 83% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationEngineConfiguration.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationEngineConfiguration.kt index 117c756e5..dfd0a7cd2 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/configuration/ValidationEngineConfiguration.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/configuration/ValidationEngineConfiguration.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.configuration +package edu.stanford.spezi.core.design.views.validation.configuration import androidx.compose.runtime.compositionLocalOf import edu.stanford.spezi.core.design.validation.validation.ValidationEngine diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/CapturedValidationState.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/CapturedValidationState.kt similarity index 92% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/CapturedValidationState.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/CapturedValidationState.kt index c04602159..a9aa8de9b 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/CapturedValidationState.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/CapturedValidationState.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.state +package edu.stanford.spezi.core.design.views.validation.state import androidx.compose.runtime.MutableState import edu.stanford.spezi.core.design.validation.validation.ValidationEngine diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/CapturedValidationStateEntries.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/CapturedValidationStateEntries.kt similarity index 87% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/CapturedValidationStateEntries.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/CapturedValidationStateEntries.kt index 949a771b3..50d5e1583 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/CapturedValidationStateEntries.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/CapturedValidationStateEntries.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.state +package edu.stanford.spezi.core.design.views.validation.state import androidx.compose.runtime.compositionLocalOf diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/FailedValidationResult.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/FailedValidationResult.kt similarity index 88% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/FailedValidationResult.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/FailedValidationResult.kt index 35bc2b51c..14b4cf8a0 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/FailedValidationResult.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/FailedValidationResult.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.state +package edu.stanford.spezi.core.design.views.validation.state import edu.stanford.spezi.core.design.component.StringResource import edu.stanford.spezi.core.design.validation.validation.ValidationRule diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/ReceiveValidation.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/ReceiveValidation.kt similarity index 91% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/ReceiveValidation.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/ReceiveValidation.kt index bddafd645..94ce4e850 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/ReceiveValidation.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/ReceiveValidation.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.state +package edu.stanford.spezi.core.design.views.validation.state import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/ValidationContext.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/ValidationContext.kt similarity index 95% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/ValidationContext.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/ValidationContext.kt index 18873e6a8..a12a71d86 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/state/ValidationContext.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/state/ValidationContext.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.state +package edu.stanford.spezi.core.design.views.validation.state data class ValidationContext internal constructor( private val entries: List = emptyList(), diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/views/ValidationResultsComposable.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/views/ValidationResultsComposable.kt similarity index 91% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/views/ValidationResultsComposable.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/views/ValidationResultsComposable.kt index 29fb9bb0b..b374c4be3 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/views/ValidationResultsComposable.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/views/ValidationResultsComposable.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.views +package edu.stanford.spezi.core.design.views.validation.views import androidx.compose.foundation.layout.Column import androidx.compose.material3.Text diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/views/VerifiableTextField.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/views/VerifiableTextField.kt similarity index 97% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/views/VerifiableTextField.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/views/VerifiableTextField.kt index 838ecd806..53623862e 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/validation/views/VerifiableTextField.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/validation/views/VerifiableTextField.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.validation.views +package edu.stanford.spezi.core.design.views.validation.views import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/compositionLocal/ProcessingDebounceDuration.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/compositionLocal/ProcessingDebounceDuration.kt similarity index 71% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/compositionLocal/ProcessingDebounceDuration.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/compositionLocal/ProcessingDebounceDuration.kt index 86318136c..2c96fa2a8 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/compositionLocal/ProcessingDebounceDuration.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/compositionLocal/ProcessingDebounceDuration.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.compositionLocal +package edu.stanford.spezi.core.design.views.views.compositionLocal import androidx.compose.runtime.compositionLocalOf import kotlin.time.Duration.Companion.milliseconds diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/layout/DescriptionGridRow.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/layout/DescriptionGridRow.kt similarity index 96% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/layout/DescriptionGridRow.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/layout/DescriptionGridRow.kt index 11689d46a..230ba0101 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/layout/DescriptionGridRow.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/layout/DescriptionGridRow.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.layout +package edu.stanford.spezi.core.design.views.views.layout import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/model/OperationState.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/model/OperationState.kt similarity index 50% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/model/OperationState.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/model/OperationState.kt index 3b2380d32..e252a1615 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/model/OperationState.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/model/OperationState.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.model +package edu.stanford.spezi.core.design.views.views.model interface OperationState { val representation: ViewState diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/model/ViewState.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/model/ViewState.kt similarity index 90% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/model/ViewState.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/model/ViewState.kt index a32b361b9..a73b14109 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/model/ViewState.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/model/ViewState.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.model +package edu.stanford.spezi.core.design.views.views.model import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/OperationStateAlert.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/OperationStateAlert.kt similarity index 86% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/OperationStateAlert.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/OperationStateAlert.kt index 07b6086e0..a5b5208a2 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/OperationStateAlert.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/OperationStateAlert.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.viewModifier.viewState +package edu.stanford.spezi.core.design.views.views.viewModifier.viewState import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/ViewStateAlert.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/ViewStateAlert.kt similarity index 92% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/ViewStateAlert.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/ViewStateAlert.kt index df5891385..f3c2b44a2 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/ViewStateAlert.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/ViewStateAlert.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.viewModifier.viewState +package edu.stanford.spezi.core.design.views.views.viewModifier.viewState import androidx.compose.material3.AlertDialog import androidx.compose.material3.Text diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/ViewStateMapper.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/ViewStateMapper.kt similarity index 86% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/ViewStateMapper.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/ViewStateMapper.kt index bff40fbad..6005db697 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/viewModifier/viewState/ViewStateMapper.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/viewModifier/viewState/ViewStateMapper.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.viewModifier.viewState +package edu.stanford.spezi.core.design.views.views.viewModifier.viewState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/button/ProcessingOverlay.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/button/ProcessingOverlay.kt similarity index 95% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/button/ProcessingOverlay.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/button/ProcessingOverlay.kt index b78c7dddf..c84894061 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/button/ProcessingOverlay.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/button/ProcessingOverlay.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.views.button +package edu.stanford.spezi.core.design.views.views.views.button import androidx.compose.animation.core.animate import androidx.compose.foundation.layout.Box diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/button/SuspendButton.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/button/SuspendButton.kt similarity index 97% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/button/SuspendButton.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/button/SuspendButton.kt index 2239a953c..0e4311f61 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/button/SuspendButton.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/button/SuspendButton.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.views.button +package edu.stanford.spezi.core.design.views.views.views.button import androidx.compose.material3.Text import androidx.compose.runtime.Composable diff --git a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/text/Markdown.kt b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/text/Markdown.kt similarity index 97% rename from core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/text/Markdown.kt rename to core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/text/Markdown.kt index 0e865340d..9b2451242 100644 --- a/core/design/src/main/kotlin/edu/stanford/spezi/core/design/validation/views/views/text/Markdown.kt +++ b/core/design/src/main/kotlin/edu/stanford/spezi/core/design/views/views/views/text/Markdown.kt @@ -1,4 +1,4 @@ -package edu.stanford.spezi.core.design.validation.views.views.text +package edu.stanford.spezi.core.design.views.views.views.text import androidx.compose.material3.CircularProgressIndicator import androidx.compose.runtime.Composable diff --git a/modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/ContactFactory.kt b/modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/ContactFactory.kt index 2038e79dd..1116c5f9e 100644 --- a/modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/ContactFactory.kt +++ b/modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/ContactFactory.kt @@ -5,7 +5,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountBox import edu.stanford.spezi.core.design.component.ImageResource import edu.stanford.spezi.core.design.component.StringResource -import edu.stanford.spezi.core.design.validation.personalInfo.PersonNameComponents +import edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents import edu.stanford.spezi.modules.contact.model.Contact import edu.stanford.spezi.modules.contact.model.ContactOption import edu.stanford.spezi.modules.contact.model.call @@ -16,7 +16,10 @@ import java.util.Locale object ContactFactory { val leland = Contact( - name = PersonNameComponents(givenName = "Leland", familyName = "Stanford"), + name = edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents( + givenName = "Leland", + familyName = "Stanford" + ), image = ImageResource.Vector(Icons.Default.AccountBox), title = StringResource("University Founder"), description = StringResource(""" @@ -42,7 +45,10 @@ He and his wife Jane were also the founders of Stanford University, which they n ) val mock = Contact( - name = PersonNameComponents(givenName = "Paul", familyName = "Schmiedmayer"), + name = edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents( + givenName = "Paul", + familyName = "Schmiedmayer" + ), image = ImageResource.Vector(Icons.Default.AccountBox), title = StringResource("A Title"), description = StringResource(""" diff --git a/modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/simulator/ContactComposableSimulator.kt b/modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/simulator/ContactComposableSimulator.kt index d13d0e6ae..c137d742f 100644 --- a/modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/simulator/ContactComposableSimulator.kt +++ b/modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/simulator/ContactComposableSimulator.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.test.onNodeWithTag import androidx.test.platform.app.InstrumentationRegistry import edu.stanford.spezi.core.design.component.ImageResource import edu.stanford.spezi.core.design.component.StringResource -import edu.stanford.spezi.core.design.validation.personalInfo.PersonNameComponents +import edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents import edu.stanford.spezi.core.testing.assertImageIdentifier import edu.stanford.spezi.core.testing.onNodeWithIdentifier import edu.stanford.spezi.modules.contact.ContactComposableTestIdentifier @@ -53,7 +53,7 @@ class ContactComposableSimulator( } } - fun assertHasName(text: PersonNameComponents?) { + fun assertHasName(text: edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents?) { text?.let { name.assertExists() .assertTextEquals(it.formatted()) diff --git a/modules/contact/src/main/kotlin/edu/stanford/spezi/modules/contact/ContactComposable.kt b/modules/contact/src/main/kotlin/edu/stanford/spezi/modules/contact/ContactComposable.kt index 59d36d12a..d7a1f10f6 100644 --- a/modules/contact/src/main/kotlin/edu/stanford/spezi/modules/contact/ContactComposable.kt +++ b/modules/contact/src/main/kotlin/edu/stanford/spezi/modules/contact/ContactComposable.kt @@ -32,7 +32,7 @@ import edu.stanford.spezi.core.design.theme.Spacings import edu.stanford.spezi.core.design.theme.SpeziTheme import edu.stanford.spezi.core.design.theme.TextStyles import edu.stanford.spezi.core.design.theme.ThemePreviews -import edu.stanford.spezi.core.design.validation.personalInfo.PersonNameComponents +import edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents import edu.stanford.spezi.core.utils.extensions.testIdentifier import edu.stanford.spezi.modules.contact.component.AddressCard import edu.stanford.spezi.modules.contact.component.ContactOptionCard @@ -197,7 +197,10 @@ private object ContactComposableFactory { ), ): Contact { return Contact( - name = PersonNameComponents(givenName = "Leland", familyName = "Stanford"), + name = edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents( + givenName = "Leland", + familyName = "Stanford" + ), image = ImageResource.Vector(Icons.Default.AccountBox), title = title, description = description, diff --git a/modules/contact/src/main/kotlin/edu/stanford/spezi/modules/contact/model/Contact.kt b/modules/contact/src/main/kotlin/edu/stanford/spezi/modules/contact/model/Contact.kt index 68c62e381..b78ce225d 100644 --- a/modules/contact/src/main/kotlin/edu/stanford/spezi/modules/contact/model/Contact.kt +++ b/modules/contact/src/main/kotlin/edu/stanford/spezi/modules/contact/model/Contact.kt @@ -5,7 +5,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountBox import edu.stanford.spezi.core.design.component.ImageResource import edu.stanford.spezi.core.design.component.StringResource -import edu.stanford.spezi.core.design.validation.personalInfo.PersonNameComponents +import edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents import java.util.UUID /** @@ -24,7 +24,7 @@ import java.util.UUID */ data class Contact( val id: UUID = UUID.randomUUID(), - val name: PersonNameComponents, + val name: edu.stanford.spezi.core.design.views.personalInfo.PersonNameComponents, val image: ImageResource = ImageResource.Vector(Icons.Default.AccountBox), val title: StringResource? = null, val description: StringResource? = null,