diff --git a/app/src/main/kotlin/com/wire/android/navigation/WaitUntilTransitionEndsWrapper.kt b/app/src/main/kotlin/com/wire/android/navigation/WaitUntilTransitionEndsWrapper.kt new file mode 100644 index 00000000000..2608d5699df --- /dev/null +++ b/app/src/main/kotlin/com/wire/android/navigation/WaitUntilTransitionEndsWrapper.kt @@ -0,0 +1,60 @@ +/* + * Wire + * Copyright (C) 2024 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ +package com.wire.android.navigation + +import androidx.compose.animation.EnterExitState +import androidx.compose.animation.ExperimentalAnimationApi +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.pointerInput +import com.ramcosta.composedestinations.scope.AnimatedDestinationScope +import com.ramcosta.composedestinations.scope.DestinationScope +import com.ramcosta.composedestinations.wrapper.DestinationWrapper + +@OptIn(ExperimentalAnimationApi::class) +object WaitUntilTransitionEndsWrapper : DestinationWrapper { + + @Composable + override fun DestinationScope.Wrap(screenContent: @Composable () -> Unit) { + (this as? AnimatedDestinationScope)?.let { + var transitionComplete by remember { mutableStateOf(false) } + LaunchedEffect(transition.isRunning, transition.currentState, transition.targetState) { + with(transition) { + transitionComplete = !isRunning && currentState == targetState && currentState == EnterExitState.Visible + } + } + screenContent() + if (!transitionComplete) { + Box( + modifier = Modifier + .fillMaxSize() + .pointerInput(Unit) { + // empty, do nothing to prevent clicks + } + ) + } + } + } +} diff --git a/app/src/main/kotlin/com/wire/android/navigation/WireDestination.kt b/app/src/main/kotlin/com/wire/android/navigation/WireDestination.kt new file mode 100644 index 00000000000..91da4005221 --- /dev/null +++ b/app/src/main/kotlin/com/wire/android/navigation/WireDestination.kt @@ -0,0 +1,34 @@ +/* + * Wire + * Copyright (C) 2024 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ +package com.wire.android.navigation + +import com.ramcosta.composedestinations.annotation.DeepLink +import com.ramcosta.composedestinations.annotation.Destination +import com.ramcosta.composedestinations.annotation.Destination.Companion.COMPOSABLE_NAME +import com.ramcosta.composedestinations.spec.DestinationStyle +import com.ramcosta.composedestinations.wrapper.DestinationWrapper +import kotlin.reflect.KClass + +@Destination +annotation class WireDestination( + val route: String = COMPOSABLE_NAME, + val navArgsDelegate: KClass<*> = Nothing::class, + val deepLinks: Array = [], + val style: KClass = DestinationStyle.Default::class, + val wrappers: Array> = [WaitUntilTransitionEndsWrapper::class], +) diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeScreen.kt index 31f752d8fb3..2cb301716eb 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeScreen.kt @@ -42,11 +42,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.ServerTitle import com.wire.android.ui.authentication.create.common.CreateAccountFlowType import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs @@ -73,7 +73,7 @@ import com.wire.kalium.logic.configuration.server.ServerConfig @CreatePersonalAccountNavGraph @CreateTeamAccountNavGraph -@Destination(navArgsDelegate = CreateAccountNavArgs::class) +@WireDestination(navArgsDelegate = CreateAccountNavArgs::class) @Composable fun CreateAccountCodeScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/create/details/CreateAccountDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/create/details/CreateAccountDetailsScreen.kt index 03d9332dac8..c7a08c62028 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/create/details/CreateAccountDetailsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/create/details/CreateAccountDetailsScreen.kt @@ -28,7 +28,6 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material3.MaterialTheme -import com.wire.android.ui.common.scaffold.WireScaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -48,10 +47,10 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.ServerTitle import com.wire.android.ui.authentication.create.common.CreateAccountFlowType import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs @@ -75,7 +74,7 @@ import com.wire.kalium.logic.configuration.server.ServerConfig @CreatePersonalAccountNavGraph @CreateTeamAccountNavGraph -@Destination(navArgsDelegate = CreateAccountNavArgs::class) +@WireDestination(navArgsDelegate = CreateAccountNavArgs::class) @Composable fun CreateAccountDetailsScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt index 18dc6a7570b..28bfea3a9da 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt @@ -56,11 +56,11 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.ServerTitle import com.wire.android.ui.authentication.create.common.CreateAccountFlowType import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs @@ -87,7 +87,7 @@ import com.wire.kalium.logic.configuration.server.ServerConfig @CreatePersonalAccountNavGraph @CreateTeamAccountNavGraph -@Destination(navArgsDelegate = CreateAccountNavArgs::class) +@WireDestination(navArgsDelegate = CreateAccountNavArgs::class) @Composable fun CreateAccountEmailScreen( createAccountEmailViewModel: CreateAccountEmailViewModel = hiltViewModel(), diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/create/overview/CreatePersonalAccountOverviewScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/create/overview/CreatePersonalAccountOverviewScreen.kt index 4f51e25164f..250ab890772 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/create/overview/CreatePersonalAccountOverviewScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/create/overview/CreatePersonalAccountOverviewScreen.kt @@ -41,10 +41,10 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.ServerTitle import com.wire.android.ui.authentication.create.common.CreateAccountFlowType import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs @@ -59,7 +59,7 @@ import com.wire.android.util.CustomTabsHelper import com.wire.kalium.logic.configuration.server.ServerConfig @CreatePersonalAccountNavGraph(start = true) -@Destination +@WireDestination @Composable fun CreatePersonalAccountOverviewScreen( viewModel: CreateAccountOverviewViewModel = hiltViewModel(), @@ -86,7 +86,7 @@ fun CreatePersonalAccountOverviewScreen( } @CreateTeamAccountNavGraph(start = true) -@Destination +@WireDestination @Composable fun CreateTeamAccountOverviewScreen( viewModel: CreateAccountOverviewViewModel = hiltViewModel(), diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/create/summary/CreateAccountSummaryScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/create/summary/CreateAccountSummaryScreen.kt index 3f9549920ef..cb0053fda16 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/create/summary/CreateAccountSummaryScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/create/summary/CreateAccountSummaryScreen.kt @@ -36,11 +36,11 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.create.common.CreateAccountFlowType import com.wire.android.ui.authentication.create.common.CreatePersonalAccountNavGraph import com.wire.android.ui.authentication.create.common.CreateTeamAccountNavGraph @@ -52,7 +52,7 @@ import com.wire.android.ui.theme.wireTypography @CreatePersonalAccountNavGraph @CreateTeamAccountNavGraph -@Destination(navArgsDelegate = CreateAccountSummaryNavArgs::class) +@WireDestination(navArgsDelegate = CreateAccountSummaryNavArgs::class) @Composable fun CreateAccountSummaryScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/create/username/CreateAccountUsernameScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/create/username/CreateAccountUsernameScreen.kt index 6410b5e8e33..ed08e82ac34 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/create/username/CreateAccountUsernameScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/create/username/CreateAccountUsernameScreen.kt @@ -34,12 +34,12 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.create.common.handle.UsernameTextField import com.wire.android.ui.common.button.WireButtonState import com.wire.android.ui.common.button.WirePrimaryButton @@ -49,7 +49,7 @@ import com.wire.android.ui.theme.wireDimensions import com.wire.android.ui.theme.wireTypography @RootNavGraph -@Destination +@WireDestination @Composable fun CreateAccountUsernameScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceScreen.kt index ba16c4bb82c..aa24fe8ab88 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceScreen.kt @@ -40,13 +40,13 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.feature.NavigationSwitchAccountActions import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.authentication.devices.common.ClearSessionState import com.wire.android.ui.authentication.devices.common.ClearSessionViewModel @@ -69,7 +69,7 @@ import com.wire.android.ui.theme.wireDimensions import com.wire.android.ui.theme.wireTypography @RootNavGraph -@Destination( +@WireDestination( style = PopUpNavigationAnimation::class, ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceScreen.kt index ae337f60e78..e5fc0b0afcc 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceScreen.kt @@ -36,13 +36,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.feature.NavigationSwitchAccountActions import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.authentication.devices.DeviceItem import com.wire.android.ui.authentication.devices.common.ClearSessionState @@ -64,7 +64,7 @@ import com.wire.android.ui.destinations.InitialSyncScreenDestination import com.wire.android.util.dialogErrorStrings @RootNavGraph -@Destination( +@WireDestination( style = PopUpNavigationAnimation::class, ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/login/LoginScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/login/LoginScreen.kt index 96327f343ec..5807ebe22ab 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/login/LoginScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/login/LoginScreen.kt @@ -52,12 +52,12 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.window.DialogProperties import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.TransitionAnimationType import com.wire.android.ui.authentication.ServerTitle import com.wire.android.ui.authentication.login.email.LoginEmailScreen @@ -88,7 +88,7 @@ import com.wire.android.util.ui.UIText import kotlinx.coroutines.launch @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = LoginNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/welcome/WelcomeScreen.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/welcome/WelcomeScreen.kt index 0759a0a9aa7..2c0eae5776e 100644 --- a/app/src/main/kotlin/com/wire/android/ui/authentication/welcome/WelcomeScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/authentication/welcome/WelcomeScreen.kt @@ -67,12 +67,12 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.config.LocalCustomUiConfigurationProvider import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.authentication.ServerTitle import com.wire.android.ui.common.button.WirePrimaryButton @@ -102,7 +102,7 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.scan @RootNavGraph(start = true) -@Destination( +@WireDestination( style = PopUpNavigationAnimation::class, ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/debug/DebugScreen.kt b/app/src/main/kotlin/com/wire/android/ui/debug/DebugScreen.kt index fa38be1fb90..cb9ff1936ab 100644 --- a/app/src/main/kotlin/com/wire/android/ui/debug/DebugScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/debug/DebugScreen.kt @@ -38,13 +38,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.BuildConfig import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.topappbar.NavigationIconType import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar import com.wire.android.ui.destinations.MigrationScreenDestination @@ -55,7 +55,7 @@ import com.wire.kalium.logic.data.user.UserId import java.io.File @RootNavGraph -@Destination +@WireDestination @Composable fun DebugScreen(navigator: Navigator) { UserDebugContent( diff --git a/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/E2EIEnrollmentScreen.kt b/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/E2EIEnrollmentScreen.kt index a8c3285779d..ba7c74fbc12 100644 --- a/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/E2EIEnrollmentScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/E2EIEnrollmentScreen.kt @@ -32,13 +32,13 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.feature.NavigationSwitchAccountActions import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.ClickableText import com.wire.android.ui.common.button.WireButtonState @@ -65,7 +65,7 @@ import com.wire.kalium.logic.feature.e2ei.usecase.E2EIEnrollmentResult import com.wire.kalium.logic.functional.Either @RootNavGraph -@Destination( +@WireDestination( style = PopUpNavigationAnimation::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt index 798dc5db0e0..cc322f5a371 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt @@ -58,7 +58,6 @@ import com.google.accompanist.navigation.material.ExperimentalMaterialNavigation import com.ramcosta.composedestinations.DestinationsNavHost import com.ramcosta.composedestinations.animations.defaults.RootNavGraphDefaultAnimations import com.ramcosta.composedestinations.animations.rememberAnimatedNavHostEngine -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.navigation.dependency import com.ramcosta.composedestinations.result.NavResult @@ -68,6 +67,7 @@ import com.wire.android.appLogger import com.wire.android.navigation.HomeDestination import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.handleNavigation import com.wire.android.ui.NavGraphs import com.wire.android.ui.common.CollapsingTopBarScaffold @@ -93,7 +93,7 @@ import com.wire.android.util.permission.rememberRequestPushNotificationsPermissi import kotlinx.coroutines.launch @RootNavGraph -@Destination +@WireDestination @Composable fun HomeScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeScreen.kt index 23add6063a8..a03f5658acb 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeScreen.kt @@ -46,12 +46,12 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.WireDialog import com.wire.android.ui.common.WireDialogButtonProperties import com.wire.android.ui.common.WireDialogButtonType @@ -68,7 +68,7 @@ import com.wire.android.util.dialogErrorStrings import com.wire.android.util.ui.PreviewMultipleThemes @RootNavGraph -@Destination +@WireDestination @Composable fun ForgotLockCodeScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/appLock/set/SetLockCodeScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/appLock/set/SetLockCodeScreen.kt index 8890c22670e..63a5bf9f23f 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/appLock/set/SetLockCodeScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/appLock/set/SetLockCodeScreen.kt @@ -48,10 +48,10 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.TextFieldValue import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.rememberNavigator import com.wire.android.ui.common.button.WireButtonState import com.wire.android.ui.common.button.WirePrimaryButton @@ -74,7 +74,7 @@ import com.wire.kalium.logic.feature.auth.ValidatePasswordResult import java.util.Locale @RootNavGraph -@Destination +@WireDestination @Composable fun SetLockCodeScreen( viewModel: SetLockScreenViewModel = hiltViewModel(), diff --git a/app/src/main/kotlin/com/wire/android/ui/home/appLock/unlock/AppUnlockWithBiometricsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/appLock/unlock/AppUnlockWithBiometricsScreen.kt index 488ba58f3ba..c8acb649edb 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/appLock/unlock/AppUnlockWithBiometricsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/appLock/unlock/AppUnlockWithBiometricsScreen.kt @@ -34,7 +34,6 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.appLogger @@ -42,12 +41,13 @@ import com.wire.android.biometric.showBiometricPrompt import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.colorsScheme import com.wire.android.ui.common.dimensions import com.wire.android.ui.destinations.EnterLockCodeScreenDestination @RootNavGraph -@Destination +@WireDestination @Composable fun AppUnlockWithBiometricsScreen( appUnlockWithBiometricsViewModel: AppUnlockWithBiometricsViewModel = hiltViewModel(), diff --git a/app/src/main/kotlin/com/wire/android/ui/home/appLock/unlock/EnterLockCodeScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/appLock/unlock/EnterLockCodeScreen.kt index 6a56a3707a9..79b19c94a3b 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/appLock/unlock/EnterLockCodeScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/appLock/unlock/EnterLockCodeScreen.kt @@ -47,12 +47,12 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.TextFieldValue import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.utils.destination import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.button.WireButtonState import com.wire.android.ui.common.button.WirePrimaryButton import com.wire.android.ui.common.button.WireTertiaryButton @@ -70,7 +70,7 @@ import com.wire.android.util.ui.PreviewMultipleThemes import java.util.Locale @RootNavGraph -@Destination +@WireDestination @Composable fun EnterLockCodeScreen( viewModel: EnterLockScreenViewModel = hiltViewModel(), diff --git a/app/src/main/kotlin/com/wire/android/ui/home/archive/ArchiveScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/archive/ArchiveScreen.kt index fb6491bee42..fca23bc1b0d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/archive/ArchiveScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/archive/ArchiveScreen.kt @@ -30,9 +30,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.HomeNavGraph +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.dimensions import com.wire.android.ui.home.HomeStateHolder import com.wire.android.ui.home.conversationslist.ConversationItemType @@ -53,7 +53,7 @@ import com.wire.android.ui.theme.wireTypography * 5. **Optimization**: Speeds up the development cycle by reusing established components. */ @HomeNavGraph -@Destination +@WireDestination @Composable fun ArchiveScreen(homeStateHolder: HomeStateHolder) { with(homeStateHolder) { diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt index 7dea288b51e..dcaeb88f685 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt @@ -71,7 +71,6 @@ import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.collectAsLazyPagingItems import androidx.paging.compose.itemContentType import androidx.paging.compose.itemKey -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.NavResult.Canceled import com.ramcosta.composedestinations.result.NavResult.Value @@ -88,6 +87,7 @@ import com.wire.android.navigation.Navigator import com.wire.android.ui.LocalActivity import com.wire.android.ui.calling.getOngoingCallIntent import com.wire.android.ui.calling.getOutgoingCallIntent +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.bottomsheet.MenuModalSheetHeader import com.wire.android.ui.common.bottomsheet.MenuModalSheetLayout import com.wire.android.ui.common.colorsScheme @@ -191,7 +191,7 @@ private const val MAX_GROUP_SIZE_FOR_CALL_WITHOUT_ALERT = 5 // TODO: !! this screen definitely needs a refactor and some cleanup !! @Suppress("ComplexMethod") @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = ConversationNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt index d2ffb0e7076..c4be7ed072a 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt @@ -60,7 +60,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.NavResult import com.ramcosta.composedestinations.result.ResultBackNavigator @@ -69,6 +68,7 @@ import com.wire.android.R import com.wire.android.appLogger import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.CollapsingTopBarScaffold import com.wire.android.ui.common.MLSVerifiedIcon @@ -121,7 +121,7 @@ import com.wire.kalium.logic.data.conversation.Conversation import kotlinx.coroutines.launch @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = GroupConversationDetailsNavArgs::class, style = PopUpNavigationAnimation::class, ) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/EditGuestAccessScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/EditGuestAccessScreen.kt index cd8fccfb47a..3fa4dcd2ca2 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/EditGuestAccessScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/EditGuestAccessScreen.kt @@ -41,11 +41,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.rememberNavigator import com.wire.android.ui.common.bottomsheet.WireModalSheetState import com.wire.android.ui.common.dimensions @@ -66,7 +66,7 @@ import kotlinx.coroutines.launch @Suppress("ComplexMethod") @OptIn(ExperimentalMaterial3Api::class) @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = EditGuestAccessNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/createPasswordProtectedGuestLink/CreatePasswordProtectedGuestLinkScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/createPasswordProtectedGuestLink/CreatePasswordProtectedGuestLinkScreen.kt index 5952128c155..5f534977f12 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/createPasswordProtectedGuestLink/CreatePasswordProtectedGuestLinkScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/createPasswordProtectedGuestLink/CreatePasswordProtectedGuestLinkScreen.kt @@ -41,10 +41,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.button.WireButtonState import com.wire.android.ui.common.button.WirePrimaryButton import com.wire.android.ui.common.dimensions @@ -58,7 +58,7 @@ import com.wire.android.ui.theme.wireDimensions import com.wire.android.ui.theme.wireTypography @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = CreatePasswordGuestLinkNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editselfdeletingmessages/EditSelfDeletingMessagesScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editselfdeletingmessages/EditSelfDeletingMessagesScreen.kt index 419cddc4d5f..9909919d9cb 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editselfdeletingmessages/EditSelfDeletingMessagesScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editselfdeletingmessages/EditSelfDeletingMessagesScreen.kt @@ -38,10 +38,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.rememberNavigator import com.wire.android.ui.common.button.WireButton import com.wire.android.ui.common.button.WireButtonState @@ -58,7 +58,7 @@ import com.wire.android.ui.theme.wireTypography import com.wire.android.util.extension.folderWithElements @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = EditSelfDeletingMessagesNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/metadata/EditConversationNameScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/metadata/EditConversationNameScreen.kt index 8432cc28fd1..52215572f70 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/metadata/EditConversationNameScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/metadata/EditConversationNameScreen.kt @@ -20,14 +20,14 @@ package com.wire.android.ui.home.conversations.details.metadata import androidx.compose.runtime.Composable import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.ResultBackNavigator import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.groupname.GroupNameScreen @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = EditConversationNameNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/GroupConversationAllParticipantsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/GroupConversationAllParticipantsScreen.kt index 366073d9d29..8365ea4bf79 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/GroupConversationAllParticipantsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/GroupConversationAllParticipantsScreen.kt @@ -34,11 +34,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.rememberTopBarElevationState import com.wire.android.ui.common.topappbar.NavigationIconType import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar @@ -49,7 +49,7 @@ import com.wire.android.ui.home.conversations.details.participants.model.UIParti import com.wire.android.ui.theme.WireTheme @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = GroupConversationAllParticipantsNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt index 4395bfe2be1..04b32986335 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt @@ -42,13 +42,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.media.audiomessage.AudioState import com.wire.android.model.SnackBarMessage import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.TabItem import com.wire.android.ui.common.WireTabRow @@ -76,7 +76,7 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.launch @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = ConversationMediaNavArgs::class, style = PopUpNavigationAnimation::class ) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/preview/ImagesPreviewScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/preview/ImagesPreviewScreen.kt index 3088fb2234c..53f3fd484b8 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/preview/ImagesPreviewScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/preview/ImagesPreviewScreen.kt @@ -42,11 +42,11 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import coil.compose.AsyncImage import coil.request.ImageRequest -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.model.SnackBarMessage import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.button.WirePrimaryButton import com.wire.android.ui.common.button.WireSecondaryButton @@ -71,7 +71,7 @@ import com.wire.android.ui.theme.wireColorScheme import kotlinx.coroutines.flow.SharedFlow @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = ImagesPreviewNavArgs::class, style = PopUpNavigationAnimation::class ) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsScreen.kt index a8d21c17f6f..ab8755310c1 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsScreen.kt @@ -44,10 +44,10 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.TabItem import com.wire.android.ui.common.WireTabRow @@ -62,7 +62,7 @@ import com.wire.android.util.ui.UIText import kotlinx.coroutines.launch @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = MessageDetailsNavArgs::class, style = PopUpNavigationAnimation::class, ) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/adddembertoconversation/AddMembersSearchScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/adddembertoconversation/AddMembersSearchScreen.kt index 77f4b46be3d..a0168cac918 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/adddembertoconversation/AddMembersSearchScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/adddembertoconversation/AddMembersSearchScreen.kt @@ -20,11 +20,11 @@ package com.wire.android.ui.home.conversations.search.adddembertoconversation import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.collectAsStateLifecycleAware import com.wire.android.ui.destinations.OtherUserProfileScreenDestination import com.wire.android.ui.destinations.ServiceDetailsScreenDestination @@ -38,7 +38,7 @@ import com.wire.kalium.logic.data.id.QualifiedID import com.wire.kalium.logic.data.user.BotService @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = AddMembersSearchNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/messages/SearchConversationMessagesScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/messages/SearchConversationMessagesScreen.kt index bbcb84fc324..248281bc4ad 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/messages/SearchConversationMessagesScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/messages/SearchConversationMessagesScreen.kt @@ -25,12 +25,12 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.paging.PagingData import androidx.paging.compose.collectAsLazyPagingItems -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.dimensions import com.wire.android.ui.common.scaffold.WireScaffold @@ -41,7 +41,7 @@ import com.wire.android.ui.home.conversations.model.UIMessage import kotlinx.coroutines.flow.Flow @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = SearchConversationMessagesNavArgs::class, style = PopUpNavigationAnimation::class ) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/all/AllConversationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/all/AllConversationScreen.kt index a2cf3dccfc4..3cb5dd6286d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/all/AllConversationScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/all/AllConversationScreen.kt @@ -36,10 +36,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.appLogger import com.wire.android.navigation.HomeNavGraph +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.dialogs.calling.JoinAnywayDialog import com.wire.android.ui.common.dimensions import com.wire.android.ui.home.HomeStateHolder @@ -59,7 +59,7 @@ import kotlinx.collections.immutable.ImmutableMap import kotlinx.collections.immutable.persistentMapOf @HomeNavGraph(start = true) -@Destination +@WireDestination @Composable fun AllConversationScreen(homeStateHolder: HomeStateHolder) { with(homeStateHolder) { diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt index d8b5f051091..2c1e8f4de7b 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt @@ -25,9 +25,9 @@ import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.HomeNavGraph +import com.wire.android.navigation.WireDestination import com.wire.android.ui.home.HomeStateHolder import com.wire.android.ui.home.conversationslist.ConversationItemType import com.wire.android.ui.home.conversationslist.ConversationRouterHomeBridge @@ -38,7 +38,7 @@ import com.wire.kalium.logic.data.id.ConversationId import com.wire.kalium.logic.data.user.UserId @HomeNavGraph -@Destination +@WireDestination @Composable fun CallsScreen(homeStateHolder: HomeStateHolder) { with(homeStateHolder) { diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt index 3fd0a165d5f..909ca158937 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt @@ -25,9 +25,9 @@ import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.HomeNavGraph +import com.wire.android.navigation.WireDestination import com.wire.android.ui.home.HomeStateHolder import com.wire.android.ui.home.conversationslist.ConversationItemType import com.wire.android.ui.home.conversationslist.ConversationRouterHomeBridge @@ -38,7 +38,7 @@ import com.wire.kalium.logic.data.id.ConversationId import com.wire.kalium.logic.data.user.UserId @HomeNavGraph -@Destination +@WireDestination @Composable fun MentionScreen(homeStateHolder: HomeStateHolder) { with(homeStateHolder) { diff --git a/app/src/main/kotlin/com/wire/android/ui/home/gallery/MediaGalleryScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/gallery/MediaGalleryScreen.kt index 9f25f540f78..39f649a4381 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/gallery/MediaGalleryScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/gallery/MediaGalleryScreen.kt @@ -32,11 +32,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.ResultBackNavigator import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.bottomsheet.MenuModalSheetLayout import com.wire.android.ui.common.colorsScheme @@ -51,7 +51,7 @@ import com.wire.android.util.permission.rememberWriteStorageRequestFlow import com.wire.android.util.ui.openDownloadFolder @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = MediaGalleryNavArgs::class, style = PopUpNavigationAnimation::class, ) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupOptions/GroupOptionsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupOptions/GroupOptionsScreen.kt index 7151a5d84f1..09592e8cb3d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupOptions/GroupOptionsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupOptions/GroupOptionsScreen.kt @@ -38,12 +38,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.model.Clickable import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.Icon import com.wire.android.ui.common.WireDialog import com.wire.android.ui.common.WireDialogButtonProperties @@ -66,7 +66,7 @@ import com.wire.android.ui.theme.wireDimensions import com.wire.kalium.logic.data.id.ConversationId @NewConversationNavGraph -@Destination +@WireDestination @Composable fun GroupOptionScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupname/NewGroupNameScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupname/NewGroupNameScreen.kt index fb435b4c38a..2678c3ff836 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupname/NewGroupNameScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupname/NewGroupNameScreen.kt @@ -20,10 +20,10 @@ package com.wire.android.ui.home.newconversation.groupname import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.groupname.GroupMetadataState import com.wire.android.ui.common.groupname.GroupNameScreen import com.wire.android.ui.destinations.ConversationScreenDestination @@ -36,7 +36,7 @@ import com.wire.android.ui.home.newconversation.common.NewConversationNavGraph import com.wire.kalium.logic.data.id.ConversationId @NewConversationNavGraph -@Destination +@WireDestination @Composable fun NewGroupNameScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupsearch/NewGroupConversationSearchPeopleScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupsearch/NewGroupConversationSearchPeopleScreen.kt index 70db5b75142..4c1c9fe7f1d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupsearch/NewGroupConversationSearchPeopleScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupsearch/NewGroupConversationSearchPeopleScreen.kt @@ -20,23 +20,23 @@ package com.wire.android.ui.home.newconversation.groupsearch import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.collectAsStateLifecycleAware import com.wire.android.ui.destinations.NewGroupNameScreenDestination import com.wire.android.ui.destinations.OtherUserProfileScreenDestination +import com.wire.android.ui.home.conversations.search.SearchBarViewModel import com.wire.android.ui.home.conversations.search.SearchPeopleScreenType import com.wire.android.ui.home.conversations.search.SearchUsersAndServicesScreen -import com.wire.android.ui.home.conversations.search.SearchBarViewModel import com.wire.android.ui.home.newconversation.NewConversationViewModel import com.wire.android.ui.home.newconversation.common.NewConversationNavGraph import com.wire.android.util.EMPTY import com.wire.kalium.logic.data.id.QualifiedID @NewConversationNavGraph -@Destination +@WireDestination @Composable fun NewGroupConversationSearchPeopleScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt index 1e21ec091ee..6ead356920a 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt @@ -20,10 +20,10 @@ package com.wire.android.ui.home.newconversation.search import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.collectAsStateLifecycleAware import com.wire.android.ui.destinations.NewGroupConversationSearchPeopleScreenDestination @@ -37,7 +37,7 @@ import com.wire.android.util.EMPTY import com.wire.kalium.logic.data.id.QualifiedID @NewConversationNavGraph(start = true) -@Destination( +@WireDestination( style = PopUpNavigationAnimation::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/SettingsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/SettingsScreen.kt index 155b71e8045..7828b8e7381 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/SettingsScreen.kt @@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.BuildConfig import com.wire.android.R import com.wire.android.appLogger @@ -37,6 +36,7 @@ import com.wire.android.model.Clickable import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.HomeNavGraph import com.wire.android.navigation.NavigationCommand +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.handleNavigation import com.wire.android.ui.common.visbility.rememberVisibilityState import com.wire.android.ui.destinations.SetLockCodeScreenDestination @@ -45,7 +45,7 @@ import com.wire.android.util.debug.LocalFeatureVisibilityFlags import com.wire.android.util.extension.folderWithElements @HomeNavGraph -@Destination +@WireDestination @Composable fun SettingsScreen( homeStateHolder: HomeStateHolder, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/about/licenses/LicensesScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/about/licenses/LicensesScreen.kt index 1468ec40d56..633ce4d74e9 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/about/licenses/LicensesScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/about/licenses/LicensesScreen.kt @@ -31,14 +31,14 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.mikepenz.aboutlibraries.entity.Library import com.mikepenz.aboutlibraries.ui.compose.util.htmlReadyLicenseContent -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar @RootNavGraph -@Destination +@WireDestination @Composable fun LicensesScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/MyAccountScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/MyAccountScreen.kt index 08d78bc53ff..c42a026520f 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/MyAccountScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/MyAccountScreen.kt @@ -38,7 +38,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.NavResult import com.ramcosta.composedestinations.result.ResultRecipient @@ -48,6 +47,7 @@ import com.wire.android.appLogger import com.wire.android.model.Clickable import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.Icon import com.wire.android.ui.common.RowItemTemplate import com.wire.android.ui.common.button.WireButtonState @@ -78,7 +78,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch @RootNavGraph -@Destination +@WireDestination @Composable fun MyAccountScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/displayname/ChangeDisplayNameScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/displayname/ChangeDisplayNameScreen.kt index 4192ee45981..32fcc2f9173 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/displayname/ChangeDisplayNameScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/displayname/ChangeDisplayNameScreen.kt @@ -40,11 +40,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.ResultBackNavigator import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.Icon import com.wire.android.ui.common.ShakeAnimation import com.wire.android.ui.common.button.WireButtonState.Default @@ -60,7 +60,7 @@ import com.wire.android.ui.theme.wireDimensions import com.wire.android.ui.theme.wireTypography @RootNavGraph -@Destination +@WireDestination @Composable fun ChangeDisplayNameScreen( viewModel: ChangeDisplayNameViewModel = hiltViewModel(), diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/email/updateEmail/ChangeEmailScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/email/updateEmail/ChangeEmailScreen.kt index 5fc3f2a704b..fcba37126a0 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/email/updateEmail/ChangeEmailScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/email/updateEmail/ChangeEmailScreen.kt @@ -43,12 +43,12 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.Icon import com.wire.android.ui.common.ShakeAnimation import com.wire.android.ui.common.button.WireButtonState.Default @@ -65,7 +65,7 @@ import com.wire.android.ui.theme.wireDimensions import com.wire.android.ui.theme.wireTypography @RootNavGraph -@Destination +@WireDestination @Composable fun ChangeEmailScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/email/verifyEmail/VerifyEmailScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/email/verifyEmail/VerifyEmailScreen.kt index 039f983e7b9..2155afa78f3 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/email/verifyEmail/VerifyEmailScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/email/verifyEmail/VerifyEmailScreen.kt @@ -35,10 +35,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.button.WireButtonState.Default import com.wire.android.ui.common.button.WireButtonState.Disabled import com.wire.android.ui.common.button.WirePrimaryButton @@ -52,7 +52,7 @@ import com.wire.android.ui.theme.wireTypography import com.wire.android.util.ui.stringWithStyledArgs @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = VerifyEmailNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/handle/ChangeHandleScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/handle/ChangeHandleScreen.kt index 94c0ce2c887..cfb31ea7e05 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/handle/ChangeHandleScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/handle/ChangeHandleScreen.kt @@ -37,11 +37,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.ResultBackNavigator import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.create.common.handle.UsernameTextField import com.wire.android.ui.common.Icon import com.wire.android.ui.common.button.WireButtonState.Default @@ -55,7 +55,7 @@ import com.wire.android.ui.theme.wireDimensions import com.wire.android.ui.theme.wireTypography @RootNavGraph -@Destination +@WireDestination @Composable fun ChangeHandleScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceScreen.kt index 8c85481267a..36228b3640b 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceScreen.kt @@ -40,10 +40,10 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.dimensions import com.wire.android.ui.common.scaffold.WireScaffold import com.wire.android.ui.common.selectableBackground @@ -56,7 +56,7 @@ import com.wire.android.util.extension.folderWithElements import com.wire.android.util.ui.PreviewMultipleThemes @RootNavGraph -@Destination +@WireDestination @Composable fun AppearanceScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/AppSettingsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/AppSettingsScreen.kt index 6f350a7dc3b..400a4ca24cd 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/AppSettingsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/AppSettingsScreen.kt @@ -32,11 +32,11 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph +import com.wire.android.navigation.WireDestination @RootNavGraph -@Destination +@WireDestination @Composable fun AppSettingsScreen() { Column( diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt index c13a5fa6f44..7ba1c65e2c8 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt @@ -29,10 +29,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.scaffold.WireScaffold import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar import com.wire.android.ui.home.conversations.details.options.ArrowType @@ -41,7 +41,7 @@ import com.wire.android.ui.home.settings.SwitchState import com.wire.android.util.isWebsocketEnabledByDefault @RootNavGraph -@Destination +@WireDestination @Composable fun NetworkSettingsScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreScreen.kt index ffcd2674b93..48a53cc5122 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreScreen.kt @@ -39,12 +39,12 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.button.WirePrimaryButton import com.wire.android.ui.common.dialogs.PermissionPermanentlyDeniedDialog import com.wire.android.ui.common.scaffold.WireScaffold @@ -62,7 +62,7 @@ import com.wire.android.util.permission.PermissionDenialType import com.wire.android.util.time.convertTimestampToDateTime @RootNavGraph -@Destination +@WireDestination @Composable fun BackupAndRestoreScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsScreen.kt index 1d3bfc07a44..94e9c48f4d9 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsScreen.kt @@ -27,10 +27,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.scaffold.WireScaffold import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar import com.wire.android.ui.home.conversations.details.options.ArrowType @@ -38,7 +38,7 @@ import com.wire.android.ui.home.conversations.details.options.GroupConversationO import com.wire.android.ui.home.settings.SwitchState @RootNavGraph -@Destination +@WireDestination @Composable fun PrivacySettingsConfigScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/vault/VaultScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/vault/VaultScreen.kt index f2ed55641fa..833ff5df8b0 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/vault/VaultScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/vault/VaultScreen.kt @@ -20,12 +20,12 @@ package com.wire.android.ui.home.vault import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.navigation.HomeNavGraph +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.UnderConstructionScreen @HomeNavGraph -@Destination +@WireDestination @Composable fun VaultScreen() { UnderConstructionScreen(screenName = "VaultScreen") diff --git a/app/src/main/kotlin/com/wire/android/ui/home/whatsnew/WhatsNewScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/whatsnew/WhatsNewScreen.kt index e1ee4023c77..145b235abe3 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/whatsnew/WhatsNewScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/whatsnew/WhatsNewScreen.kt @@ -29,18 +29,18 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.wire.android.R import com.wire.android.model.Clickable import com.wire.android.navigation.HomeNavGraph import com.wire.android.navigation.NavigationCommand +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.handleNavigation import com.wire.android.ui.home.HomeStateHolder import com.wire.android.util.extension.folderWithElements import com.wire.android.util.ui.UIText @HomeNavGraph -@Destination +@WireDestination @Composable fun WhatsNewScreen( homeStateHolder: HomeStateHolder, diff --git a/app/src/main/kotlin/com/wire/android/ui/initialsync/InitialSyncScreen.kt b/app/src/main/kotlin/com/wire/android/ui/initialsync/InitialSyncScreen.kt index fca66bc5575..1a8c9abf0e7 100644 --- a/app/src/main/kotlin/com/wire/android/ui/initialsync/InitialSyncScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/initialsync/InitialSyncScreen.kt @@ -22,17 +22,17 @@ import androidx.compose.animation.core.AnimationConstants.DefaultDurationMillis import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.SettingUpWireScreenContent import com.wire.android.ui.destinations.HomeScreenDestination import kotlinx.coroutines.delay @RootNavGraph -@Destination +@WireDestination @Composable fun InitialSyncScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/migration/MigrationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/migration/MigrationScreen.kt index 29fdf09b6d0..e095bf8e6aa 100644 --- a/app/src/main/kotlin/com/wire/android/ui/migration/MigrationScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/migration/MigrationScreen.kt @@ -28,13 +28,13 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.migration.MigrationData import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.SettingUpWireScreenContent import com.wire.android.ui.common.SettingUpWireScreenType import com.wire.android.ui.destinations.HomeScreenDestination @@ -46,7 +46,7 @@ import com.wire.android.util.EMPTY import com.wire.android.util.ui.stringWithStyledArgs @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = MigrationNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/about/AboutThisAppScreen.kt b/app/src/main/kotlin/com/wire/android/ui/settings/about/AboutThisAppScreen.kt index 020d3723dc7..a52f76bf149 100644 --- a/app/src/main/kotlin/com/wire/android/ui/settings/about/AboutThisAppScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/settings/about/AboutThisAppScreen.kt @@ -34,13 +34,13 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.BuildConfig import com.wire.android.R import com.wire.android.model.Clickable import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.handleNavigation import com.wire.android.ui.common.dimensions import com.wire.android.ui.common.scaffold.WireScaffold @@ -51,7 +51,7 @@ import com.wire.android.ui.theme.WireTheme import com.wire.android.util.ui.PreviewMultipleThemes @RootNavGraph -@Destination +@WireDestination @Composable fun AboutThisAppScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt index a907d318d85..c535b1db256 100644 --- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt @@ -47,12 +47,12 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.BuildConfig import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.devices.model.Device import com.wire.android.ui.authentication.devices.model.lastActiveDescription import com.wire.android.ui.authentication.devices.remove.RemoveDeviceDialog @@ -97,7 +97,7 @@ import com.wire.kalium.logic.functional.Either import kotlinx.datetime.Instant @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = DeviceDetailsNavArgs::class ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesScreen.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesScreen.kt index 485f3f8e16c..4d6e0e05254 100644 --- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesScreen.kt @@ -36,11 +36,11 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.Lifecycle -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.authentication.devices.DeviceItem import com.wire.android.ui.authentication.devices.model.Device import com.wire.android.ui.common.Icon @@ -53,7 +53,7 @@ import com.wire.android.util.extension.folderWithElements import com.wire.android.util.lifecycle.rememberLifecycleEvent @RootNavGraph -@Destination +@WireDestination @Composable fun SelfDevicesScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/e2ei/E2eiCertificateDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/e2ei/E2eiCertificateDetailsScreen.kt index f8496fb52cb..0f5ec22bfe7 100644 --- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/e2ei/E2eiCertificateDetailsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/e2ei/E2eiCertificateDetailsScreen.kt @@ -34,10 +34,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.button.WireSecondaryIconButton import com.wire.android.ui.common.colorsScheme @@ -53,7 +53,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = E2eiCertificateDetailsScreenNavArgs::class, style = PopUpNavigationAnimation::class, ) diff --git a/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaAuthenticatedViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaAuthenticatedViewModel.kt index 567c6ed3f5c..d2e819bb576 100644 --- a/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaAuthenticatedViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaAuthenticatedViewModel.kt @@ -17,11 +17,9 @@ */ package com.wire.android.ui.sharing -import android.content.Context import android.content.Intent import android.net.Uri import android.os.Parcelable -import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.compose.runtime.Stable import androidx.compose.runtime.getValue @@ -68,7 +66,6 @@ import com.wire.kalium.logic.feature.selfDeletingMessages.ObserveSelfDeletionTim import com.wire.kalium.logic.feature.selfDeletingMessages.PersistNewSelfDeletionTimerUseCase import com.wire.kalium.logic.feature.user.GetSelfUserUseCase import dagger.hilt.android.lifecycle.HiltViewModel -import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.collections.immutable.PersistentList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toPersistentList @@ -92,7 +89,6 @@ import javax.inject.Inject @OptIn(FlowPreview::class) @Suppress("LongParameterList", "TooManyFunctions") class ImportMediaAuthenticatedViewModel @Inject constructor( - @ApplicationContext private val context: Context, private val getSelf: GetSelfUserUseCase, private val userTypeMapper: UserTypeMapper, private val observeConversationListDetails: ObserveConversationListDetailsUseCase, diff --git a/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt b/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt index faefed8d64e..4145c78b50a 100644 --- a/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt @@ -48,7 +48,6 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.model.Clickable @@ -57,6 +56,7 @@ import com.wire.android.model.UserAvatarData import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.UserProfileAvatar import com.wire.android.ui.common.bottomsheet.MenuModalSheetLayout import com.wire.android.ui.common.button.WirePrimaryButton @@ -90,7 +90,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow @RootNavGraph -@Destination +@WireDestination @Composable fun ImportMediaScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/avatarpicker/AvatarPicker.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/avatarpicker/AvatarPicker.kt index 4f78ffcca92..4721721087e 100644 --- a/app/src/main/kotlin/com/wire/android/ui/userprofile/avatarpicker/AvatarPicker.kt +++ b/app/src/main/kotlin/com/wire/android/ui/userprofile/avatarpicker/AvatarPicker.kt @@ -41,11 +41,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.ResultBackNavigator import com.wire.android.R import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.ArrowRightIcon import com.wire.android.ui.common.bottomsheet.MenuBottomSheetItem import com.wire.android.ui.common.bottomsheet.MenuItemIcon @@ -73,7 +73,7 @@ import kotlinx.coroutines.withContext import okio.Path @RootNavGraph -@Destination +@WireDestination @Composable fun AvatarPickerScreen( navigator: Navigator, diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt index 1cd3352fe91..638ef43e6a9 100644 --- a/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt @@ -55,13 +55,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.ResultBackNavigator import com.wire.android.R import com.wire.android.navigation.BackStackMode import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.authentication.devices.model.Device import com.wire.android.ui.common.CollapsingTopBarScaffold @@ -114,7 +114,7 @@ import kotlinx.coroutines.flow.FlowCollector import kotlinx.coroutines.launch @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = OtherUserProfileNavArgs::class, style = PopUpNavigationAnimation::class, ) diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/self/SelfUserProfileScreen.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/self/SelfUserProfileScreen.kt index 96e150cc898..b1442fda43b 100644 --- a/app/src/main/kotlin/com/wire/android/ui/userprofile/self/SelfUserProfileScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/userprofile/self/SelfUserProfileScreen.kt @@ -48,7 +48,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.result.NavResult import com.ramcosta.composedestinations.result.ResultRecipient @@ -59,6 +58,7 @@ import com.wire.android.model.ClickBlockParams import com.wire.android.model.Clickable import com.wire.android.navigation.NavigationCommand import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.navigation.style.PopUpNavigationAnimation import com.wire.android.ui.common.ArrowRightIcon import com.wire.android.ui.common.RowItemTemplate @@ -104,7 +104,7 @@ import com.wire.kalium.logic.data.user.UserAvailabilityStatus import com.wire.kalium.logic.data.user.UserId @RootNavGraph -@Destination( +@WireDestination( style = PopUpNavigationAnimation::class, ) @Composable diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/service/ServiceDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/service/ServiceDetailsScreen.kt index c59f845c43d..fa0dd677f64 100644 --- a/app/src/main/kotlin/com/wire/android/ui/userprofile/service/ServiceDetailsScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/userprofile/service/ServiceDetailsScreen.kt @@ -38,11 +38,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.wire.android.R import com.wire.android.model.ClickBlockParams import com.wire.android.navigation.Navigator +import com.wire.android.navigation.WireDestination import com.wire.android.ui.common.button.WirePrimaryButton import com.wire.android.ui.common.colorsScheme import com.wire.android.ui.common.dimensions @@ -58,7 +58,7 @@ import com.wire.android.ui.userprofile.common.UserProfileInfo import com.wire.kalium.logic.data.service.ServiceDetails @RootNavGraph -@Destination( +@WireDestination( navArgsDelegate = ServiceDetailsNavArgs::class ) @Composable