From 2ce3f4745d19808e8b6ff3ecfb0d2d28c50a1299 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 7 Dec 2023 03:35:21 +0100 Subject: [PATCH] Fix "Create a new happening" not being cancellable --- .../main/java/eu/steffo/twom/create/CreateActivityScaffold.kt | 4 +++- .../main/java/eu/steffo/twom/create/CreateActivityTopBar.kt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/steffo/twom/create/CreateActivityScaffold.kt b/app/src/main/java/eu/steffo/twom/create/CreateActivityScaffold.kt index ec09d88..10b4169 100644 --- a/app/src/main/java/eu/steffo/twom/create/CreateActivityScaffold.kt +++ b/app/src/main/java/eu/steffo/twom/create/CreateActivityScaffold.kt @@ -17,7 +17,9 @@ fun CreateActivityScaffold( TwoMTheme { Scaffold( topBar = { - CreateActivityTopBar() + CreateActivityTopBar( + onClickBack = onClickBack, + ) }, content = { CreateActivityContent( diff --git a/app/src/main/java/eu/steffo/twom/create/CreateActivityTopBar.kt b/app/src/main/java/eu/steffo/twom/create/CreateActivityTopBar.kt index 599a403..3c20d12 100644 --- a/app/src/main/java/eu/steffo/twom/create/CreateActivityTopBar.kt +++ b/app/src/main/java/eu/steffo/twom/create/CreateActivityTopBar.kt @@ -18,12 +18,12 @@ import eu.steffo.twom.R @Preview fun CreateActivityTopBar( modifier: Modifier = Modifier, - onBack: () -> Unit = {}, + onClickBack: () -> Unit = {}, ) { TopAppBar( modifier = modifier, navigationIcon = { - IconButton(onClick = onBack) { + IconButton(onClick = onClickBack) { Icon( imageVector = Icons.Filled.ArrowBack, contentDescription = LocalContext.current.getString(R.string.back)