Clean up

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt

@@ -50,6 +50,7 @@ import io.element.android.features.createroom.impl.R
 import io.element.android.features.createroom.impl.components.RoomPrivacyOption
 import io.element.android.libraries.designsystem.components.LabelledTextField
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
+import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -150,7 +151,11 @@ fun ConfigureRoomView(
 
     AsyncActionView(
         async = state.createRoomAction,
-        progressText = stringResource(CommonStrings.common_creating_room),
+        progressDialog = {
+            AsyncActionViewDefaults.ProgressDialog(
+                progressText = stringResource(CommonStrings.common_creating_room),
+            )
+        },
         onSuccess = { onRoomCreated(it) },
         errorMessage = { stringResource(R.string.screen_create_room_error_creating_room) },
         onRetry = { state.eventSink(ConfigureRoomEvents.CreateRoom(state.config)) },

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt

@@ -39,6 +39,7 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.createroom.impl.R
 import io.element.android.features.createroom.impl.components.UserListView
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
+import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -95,7 +96,11 @@ fun CreateRoomRootView(
 
     AsyncActionView(
         async = state.startDmAction,
-        progressText = stringResource(CommonStrings.common_starting_chat),
+        progressDialog = {
+            AsyncActionViewDefaults.ProgressDialog(
+                progressText = stringResource(CommonStrings.common_starting_chat),
+            )
+        },
         onSuccess = { onOpenDM(it) },
         errorMessage = { stringResource(R.string.screen_start_chat_error_starting_chat) },
         onRetry = {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt

@@ -42,7 +42,6 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.messages.impl.R
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -66,7 +65,7 @@ fun ReportMessageView(
     val isSending = state.result is AsyncAction.Loading
     AsyncActionView(
         async = state.result,
-        showProgressDialog = false,
+        progressDialog = {},
         onSuccess = { onBackClicked() },
         errorMessage = { stringResource(CommonStrings.error_unknown) },
         onErrorDismiss = { state.eventSink(ReportMessageEvents.ClearError) }

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt

@@ -57,6 +57,7 @@ import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
 import io.element.android.libraries.matrix.ui.components.EditableAvatarView
 import io.element.android.libraries.permissions.api.PermissionsView
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.launch
 
@@ -149,7 +150,11 @@ fun EditUserProfileView(
 
         AsyncActionView(
             async = state.saveAction,
-            progressText = stringResource(R.string.screen_edit_profile_updating_details),
+            progressDialog = {
+                AsyncActionViewDefaults.ProgressDialog(
+                    progressText = stringResource(R.string.screen_edit_profile_updating_details),
+                )
+            },
             onSuccess = { onProfileEdited() },
             errorTitle = { stringResource(R.string.screen_edit_profile_error_title) },
             errorMessage = { stringResource(R.string.screen_edit_profile_error) },

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt

@@ -152,7 +152,7 @@ fun BugReportView(
 
         AsyncActionView(
             async = state.sending,
-            showProgressDialog = false,
+            progressDialog = { },
             onSuccess = {
                 eventSink(BugReportEvents.ResetAll)
                 onDone()

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt

@@ -61,6 +61,7 @@ import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
 import io.element.android.libraries.matrix.ui.components.EditableAvatarView
 import io.element.android.libraries.permissions.api.PermissionsView
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.launch
 
@@ -173,7 +174,11 @@ fun RoomDetailsEditView(
 
     AsyncActionView(
         async = state.saveAction,
-        progressText = stringResource(R.string.screen_room_details_updating_room),
+        progressDialog = {
+            AsyncActionViewDefaults.ProgressDialog(
+                progressText = stringResource(R.string.screen_room_details_updating_room),
+            )
+        },
         onSuccess = { onRoomEdited() },
         errorMessage = { stringResource(R.string.screen_room_details_edition_error) },
         onErrorDismiss = { state.eventSink(RoomDetailsEditEvents.CancelSaveChanges) }

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt

@@ -31,7 +31,6 @@ import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.roomdetails.impl.R
 import io.element.android.libraries.androidutils.system.startSharePlainTextIntent
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.RoomScope

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsView.kt

@@ -34,6 +34,7 @@ import io.element.android.features.roomdetails.impl.R
 import io.element.android.features.roomdetails.impl.blockuser.BlockUserDialogs
 import io.element.android.features.roomdetails.impl.blockuser.BlockUserSection
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
+import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
@@ -90,7 +91,11 @@ fun RoomMemberDetailsView(
             }
             AsyncActionView(
                 async = state.startDmActionState,
-                progressText = stringResource(CommonStrings.common_starting_chat),
+                progressDialog = {
+                    AsyncActionViewDefaults.ProgressDialog(
+                        progressText = stringResource(CommonStrings.common_starting_chat),
+                    )
+                },
                 onSuccess = onDMStarted,
                 errorMessage = { stringResource(R.string.screen_start_chat_error_starting_chat) },
                 onRetry = { state.eventSink(RoomMemberDetailsEvents.StartDM) },

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyStateProvider.kt

@@ -21,7 +21,6 @@ import io.element.android.features.securebackup.impl.setup.views.RecoveryKeyUser
 import io.element.android.features.securebackup.impl.setup.views.RecoveryKeyViewState
 import io.element.android.features.securebackup.impl.setup.views.aFormattedRecoveryKey
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.architecture.AsyncData
 
 open class SecureBackupEnterRecoveryKeyStateProvider : PreviewParameterProvider<SecureBackupEnterRecoveryKeyState> {
     override val values: Sequence<SecureBackupEnterRecoveryKeyState>

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt

@@ -46,7 +46,7 @@ fun SecureBackupEnterRecoveryKeyView(
     AsyncActionView(
         async = state.submitAction,
         onSuccess = { onDone() },
-        showProgressDialog = false,
+        progressDialog = { },
         errorTitle = { stringResource(id = R.string.screen_recovery_key_confirm_error_title) },
         errorMessage = { stringResource(id = R.string.screen_recovery_key_confirm_error_content) },
         onErrorDismiss = { state.eventSink(SecureBackupEnterRecoveryKeyEvents.ClearDialog) },

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt

@@ -18,69 +18,29 @@ package io.element.android.libraries.designsystem.components.async
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.ProgressDialog
+import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialogDefaults
 import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.ui.strings.CommonStrings
 
 /**
  * Render an AsyncAction object.
  * - If Success, invoke the callback [onSuccess], only once.
  * - If Failure, display a dialog with the error, which can be transformed, using [errorMessage]. When
  * closed, [onErrorDismiss] will be invoked. If [onRetry] is not null, a retry button will be displayed.
- * - When loading, display a loading dialog, if [showProgressDialog] is true, with on optional [progressText].
+ * - When loading, display a loading dialog using [progressDialog]. Pass empty lambda to disable.
  */
 @Composable
 fun <T> AsyncActionView(
     async: AsyncAction<T>,
     onSuccess: (T) -> Unit,
     onErrorDismiss: () -> Unit,
-    showConfirmationDialog: Boolean = false,
-    confirmationText: String? = null,
-    confirmationSubmit: String? = null,
-    onConfirmation: (() -> Unit)? = null,
-    showProgressDialog: Boolean = true,
-    progressText: String? = null,
-    errorTitle: @Composable (Throwable) -> String = { ErrorDialogDefaults.title },
-    errorMessage: @Composable (Throwable) -> String = { it.message ?: it.toString() },
-    onRetry: (() -> Unit)? = null,
-) {
-    AsyncActionView(
-        async = async,
-        onSuccess = onSuccess,
-        onErrorDismiss = onErrorDismiss,
-        confirmationDialog = {
-            if (showConfirmationDialog) {
-                AsyncActionViewDefaults.ConfirmationDialog(
-                    confirmationText = confirmationText,
-                    confirmationSubmit = confirmationSubmit,
-                    onConfirmation = onConfirmation,
-                )
-            }
-        },
-        progressDialog = {
-            if (showProgressDialog) {
-                AsyncActionViewDefaults.ProgressDialog(progressText)
-            }
-        },
-        errorTitle = errorTitle,
-        errorMessage = errorMessage,
-        onRetry = onRetry,
-    )
-}
-
-@Composable
-fun <T> AsyncActionView(
-    async: AsyncAction<T>,
-    onSuccess: (T) -> Unit,
-    onErrorDismiss: () -> Unit,
-    confirmationDialog: @Composable () -> Unit = { AsyncActionViewDefaults.ConfirmationDialog() },
+    confirmationDialog: @Composable () -> Unit = { },
     progressDialog: @Composable () -> Unit = { AsyncActionViewDefaults.ProgressDialog() },
     errorTitle: @Composable (Throwable) -> String = { ErrorDialogDefaults.title },
     errorMessage: @Composable (Throwable) -> String = { it.message ?: it.toString() },
@@ -115,22 +75,6 @@ fun <T> AsyncActionView(
 }
 
 object AsyncActionViewDefaults {
-    @Composable
-    fun ConfirmationDialog(
-        confirmationText: String? = null,
-        confirmationSubmit: String? = null,
-        onConfirmation: (() -> Unit)? = null,
-        onDismiss: (() -> Unit)? = null,
-    ) {
-        io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog(
-            content = confirmationText.orEmpty(),
-            onSubmitClicked = onConfirmation ?: {},
-            onDismiss = onDismiss ?: {},
-            submitText = confirmationSubmit ?: stringResource(CommonStrings.action_continue),
-            cancelText = stringResource(CommonStrings.action_cancel),
-        )
-    }
-
     @Composable
     fun ProgressDialog(progressText: String? = null) {
         ProgressDialog(
@@ -148,5 +92,13 @@ internal fun AsyncActionViewPreview(
         async = async,
         onSuccess = {},
         onErrorDismiss = {},
+        confirmationDialog = {
+            ConfirmationDialog(
+                title = "Confirmation",
+                content = "Are you sure?",
+                onSubmitClicked = {},
+                onDismiss = {},
+            )
+        },
     )
 }