chore: vereinheitliche Imports und ersetze androidx.compose.foundation.Image durch Image im Veranstalter-Wizard
Desktop CI — Headless Tests & Build / Compose Desktop — Tests (headless) & Build (push) Has been cancelled
Build and Publish Docker Images / build-and-push (., backend/services/ping/Dockerfile, ping-service, ping-service) (push) Has been cancelled
Build and Publish Docker Images / build-and-push (., config/docker/caddy/web-app/Dockerfile, web-app, web-app) (push) Has been cancelled
Build and Publish Docker Images / build-and-push (., config/docker/keycloak/Dockerfile, keycloak, keycloak) (push) Has been cancelled
Build and Publish Docker Images / build-and-push (., backend/infrastructure/gateway/Dockerfile, api-gateway, api-gateway) (push) Has been cancelled
Desktop CI — Headless Tests & Build / Compose Desktop — Tests (headless) & Build (push) Has been cancelled
Build and Publish Docker Images / build-and-push (., backend/services/ping/Dockerfile, ping-service, ping-service) (push) Has been cancelled
Build and Publish Docker Images / build-and-push (., config/docker/caddy/web-app/Dockerfile, web-app, web-app) (push) Has been cancelled
Build and Publish Docker Images / build-and-push (., config/docker/keycloak/Dockerfile, keycloak, keycloak) (push) Has been cancelled
Build and Publish Docker Images / build-and-push (., backend/infrastructure/gateway/Dockerfile, api-gateway, api-gateway) (push) Has been cancelled
Signed-off-by: StefanMoCoAt <stefan.mo.co@gmail.com>
This commit is contained in:
+2
-2
@@ -65,7 +65,7 @@ data class VeranstaltungWizardState(
|
|||||||
|
|
||||||
@OptIn(ExperimentalUuidApi::class)
|
@OptIn(ExperimentalUuidApi::class)
|
||||||
class EventWizardViewModel(
|
class EventWizardViewModel(
|
||||||
private val veranstalterIdParam: Long?,
|
veranstalterIdParam: Long?,
|
||||||
private val httpClient: HttpClient,
|
private val httpClient: HttpClient,
|
||||||
private val authTokenManager: AuthTokenManager,
|
private val authTokenManager: AuthTokenManager,
|
||||||
private val vereinRepository: VereinRepository,
|
private val vereinRepository: VereinRepository,
|
||||||
@@ -251,7 +251,7 @@ class EventWizardViewModel(
|
|||||||
|
|
||||||
state = state.copy(isSaving = false)
|
state = state.copy(isSaving = false)
|
||||||
nextStep()
|
nextStep()
|
||||||
} catch (e: Exception) {
|
} catch (_: Exception) {
|
||||||
state = state.copy(isSaving = false)
|
state = state.copy(isSaving = false)
|
||||||
nextStep()
|
nextStep()
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-13
@@ -88,7 +88,7 @@ fun VeranstalterAnlegenWizard(
|
|||||||
selectedVereinId = state.editId ?: 0L,
|
selectedVereinId = state.editId ?: 0L,
|
||||||
onVereinSelected = { id ->
|
onVereinSelected = { id ->
|
||||||
// Mock: Wir laden die Daten des Vereins aus dem Store in das VM
|
// Mock: Wir laden die Daten des Vereins aus dem Store in das VM
|
||||||
at.mocode.frontend.shell.desktop.data.Store.vereine.find { it.id == id }?.let { v ->
|
Store.vereine.find { it.id == id }?.let { v ->
|
||||||
viewModel.send(VeranstalterWizardIntent.UpdateName(v.name))
|
viewModel.send(VeranstalterWizardIntent.UpdateName(v.name))
|
||||||
viewModel.send(VeranstalterWizardIntent.UpdateOeps(v.oepsNummer))
|
viewModel.send(VeranstalterWizardIntent.UpdateOeps(v.oepsNummer))
|
||||||
viewModel.send(VeranstalterWizardIntent.UpdateOrt(v.ort ?: ""))
|
viewModel.send(VeranstalterWizardIntent.UpdateOrt(v.ort ?: ""))
|
||||||
@@ -160,12 +160,12 @@ fun VeranstalterCardPreview(
|
|||||||
if (!logoBase64.isNullOrBlank()) {
|
if (!logoBase64.isNullOrBlank()) {
|
||||||
val bitmap = remember(logoBase64) { decodeBase64ToImage(logoBase64) }
|
val bitmap = remember(logoBase64) { decodeBase64ToImage(logoBase64) }
|
||||||
if (bitmap != null) {
|
if (bitmap != null) {
|
||||||
androidx.compose.foundation.Image(
|
Image(
|
||||||
bitmap = bitmap,
|
bitmap = bitmap,
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
modifier = Modifier.fillMaxSize().clip(CircleShape),
|
modifier = Modifier.fillMaxSize().clip(CircleShape),
|
||||||
contentScale = ContentScale.Crop
|
contentScale = ContentScale.Crop
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
Icon(Icons.Default.Image, null, modifier = Modifier.size(40.dp), tint = MaterialTheme.colorScheme.error)
|
Icon(Icons.Default.Image, null, modifier = Modifier.size(40.dp), tint = MaterialTheme.colorScheme.error)
|
||||||
}
|
}
|
||||||
@@ -281,12 +281,12 @@ fun Step2VeranstalterDetails(viewModel: VeranstalterWizardViewModel) {
|
|||||||
val logoData = state.logoBase64
|
val logoData = state.logoBase64
|
||||||
val bitmap = remember(logoData) { logoData?.let { decodeBase64ToImage(it) } }
|
val bitmap = remember(logoData) { logoData?.let { decodeBase64ToImage(it) } }
|
||||||
if (bitmap != null) {
|
if (bitmap != null) {
|
||||||
androidx.compose.foundation.Image(
|
Image(
|
||||||
bitmap = bitmap,
|
bitmap = bitmap,
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
modifier = Modifier.size(80.dp).clip(CircleShape),
|
modifier = Modifier.size(80.dp).clip(CircleShape),
|
||||||
contentScale = ContentScale.Crop
|
contentScale = ContentScale.Crop
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Icon(Icons.Default.Image, null, modifier = Modifier.size(40.dp), tint = Color.Gray)
|
Icon(Icons.Default.Image, null, modifier = Modifier.size(40.dp), tint = Color.Gray)
|
||||||
|
|||||||
Reference in New Issue
Block a user