Skip to content

chore: migrate auth, home, and conversation screens to Compose Destinations 2.x (part_3) [WPB-20393] #4577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MohamadJaara merged 6 commits into from
Feb 10, 2026
Merged

chore: migrate auth, home, and conversation screens to Compose Destinations 2.x (part_3) [WPB-20393] #4577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90a4fbd
chore: update Kotlin 2.3.10, AGP 9.0, Gradle 9.1, compile SDK 36
MohamadJaara Feb 7, 2026
455efa1
chore: migrate to Compose Destinations 2.x - core navigation infrastr…
MohamadJaara Feb 7, 2026
e8d8a04
chore: migrate auth, home, and conversation screens to Compose Destin…
MohamadJaara Feb 7, 2026
7f2b521
Merge branch 'mo/epic/update-kotlin' into mo/chore/update-kotlin-part-3
MohamadJaara Feb 10, 2026
85ebbc7
chore: update TabletDialogRoutePolicy to use generated destination ro…
MohamadJaara Feb 10, 2026
0bd26e6
revert refactor to MessageComposerInput.kt
MohamadJaara Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions ...src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package com.wire.android.ui.authentication.create.code

import com.wire.android.navigation.annotation.app.WireCreateTeamAccountDestination
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -45,11 +46,8 @@ 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.annotation.app.WireDestination
import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
import com.wire.android.ui.authentication.create.common.CreatePersonalAccountNavGraph
import com.wire.android.ui.authentication.create.common.CreateTeamAccountNavGraph
import com.wire.android.ui.authentication.create.common.ServerTitle
import com.wire.android.ui.authentication.create.summary.CreateAccountSummaryNavArgs
import com.wire.android.ui.authentication.verificationcode.ResendCodeText
Expand All @@ -62,8 +60,8 @@ import com.wire.android.ui.common.textfield.CodeTextField
import com.wire.android.ui.common.textfield.WireTextFieldState
import com.wire.android.ui.common.topappbar.NavigationIconType
import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
import com.wire.android.ui.destinations.CreateAccountSummaryScreenDestination
import com.wire.android.ui.destinations.RemoveDeviceScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.CreateAccountSummaryScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.RemoveDeviceScreenDestination
import com.wire.android.ui.registration.code.CreateAccountCodeResult
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.ui.theme.wireDimensions
Expand All @@ -73,9 +71,7 @@ import com.wire.android.util.dialogErrorStrings
import com.wire.kalium.logic.configuration.server.ServerConfig
import kotlinx.coroutines.job

@CreatePersonalAccountNavGraph
@CreateTeamAccountNavGraph
@WireDestination(navArgsDelegate = CreateAccountNavArgs::class)
@WireCreateTeamAccountDestination(navArgs = CreateAccountNavArgs::class)
@Composable
fun CreateAccountCodeScreen(
navigator: Navigator,
Expand Down
2 changes: 1 addition & 1 deletion .../main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
import com.wire.android.ui.authentication.login.email.LoginEmailViewModel.Companion.RESEND_TIMER_DELAY
import com.wire.android.ui.common.textfield.textAsFlow
import com.wire.android.ui.navArgs
import com.ramcosta.composedestinations.generated.app.navArgs
import com.wire.android.ui.registration.code.CreateAccountCodeResult
import com.wire.android.util.WillNeverOccurError
import com.wire.android.util.ui.CountdownTimer
Expand Down
10 changes: 3 additions & 7 deletions ...in/kotlin/com/wire/android/ui/authentication/create/details/CreateAccountDetailsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package com.wire.android.ui.authentication.create.details

import com.wire.android.navigation.annotation.app.WireCreateTeamAccountDestination
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxHeight
Expand Down Expand Up @@ -47,12 +48,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
import com.wire.android.R
import com.wire.android.navigation.NavigationCommand
import com.wire.android.navigation.Navigator
import com.wire.android.navigation.annotation.app.WireDestination
import com.wire.android.ui.authentication.create.common.ServerTitle
import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
import com.wire.android.ui.authentication.create.common.CreatePersonalAccountNavGraph
import com.wire.android.ui.authentication.create.common.CreateTeamAccountNavGraph
import com.wire.android.ui.common.button.WireButtonState
import com.wire.android.ui.common.button.WirePrimaryButton
import com.wire.android.ui.common.error.CoreFailureErrorDialog
Expand All @@ -64,17 +62,15 @@ import com.wire.android.ui.common.textfield.WirePasswordTextField
import com.wire.android.ui.common.textfield.WireTextField
import com.wire.android.ui.common.textfield.WireTextFieldState
import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
import com.wire.android.ui.destinations.CreateAccountCodeScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.CreateAccountCodeScreenDestination
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.ui.theme.wireDimensions
import com.wire.android.ui.theme.wireTypography
import com.wire.android.util.ui.PreviewMultipleThemes
import com.wire.kalium.logic.configuration.server.ServerConfig

@CreatePersonalAccountNavGraph
@CreateTeamAccountNavGraph
@WireDestination(navArgsDelegate = CreateAccountNavArgs::class)
@WireCreateTeamAccountDestination(navArgs = CreateAccountNavArgs::class)
@Composable
fun CreateAccountDetailsScreen(
navigator: Navigator,
Expand Down
2 changes: 1 addition & 1 deletion ...kotlin/com/wire/android/ui/authentication/create/details/CreateAccountDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import androidx.lifecycle.viewModelScope
import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
import com.wire.android.ui.common.textfield.textAsFlow
import com.wire.android.ui.navArgs
import com.ramcosta.composedestinations.generated.app.navArgs
import com.wire.kalium.logic.configuration.server.ServerConfig
import com.wire.kalium.logic.feature.auth.ValidatePasswordUseCase
import dagger.hilt.android.lifecycle.HiltViewModel
Expand Down
12 changes: 4 additions & 8 deletions ...c/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package com.wire.android.ui.authentication.create.email

import com.wire.android.navigation.annotation.app.WireCreateTeamAccountDestination
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
Expand Down Expand Up @@ -54,12 +55,9 @@ 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.annotation.app.WireDestination
import com.wire.android.ui.authentication.create.common.ServerTitle
import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
import com.wire.android.ui.authentication.create.common.CreatePersonalAccountNavGraph
import com.wire.android.ui.authentication.create.common.CreateTeamAccountNavGraph
import com.wire.android.ui.authentication.create.common.UserRegistrationInfo
import com.wire.android.ui.common.WireDialog
import com.wire.android.ui.common.WireDialogButtonProperties
Expand All @@ -73,8 +71,8 @@ import com.wire.android.ui.common.textfield.DefaultEmailDone
import com.wire.android.ui.common.textfield.WireTextField
import com.wire.android.ui.common.textfield.WireTextFieldState
import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
import com.wire.android.ui.destinations.CreateAccountDetailsScreenDestination
import com.wire.android.ui.destinations.LoginScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.CreateAccountDetailsScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.LoginScreenDestination
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.ui.theme.wireDimensions
Expand All @@ -83,9 +81,7 @@ import com.wire.android.util.CustomTabsHelper
import com.wire.android.util.ui.PreviewMultipleThemes
import com.wire.kalium.logic.configuration.server.ServerConfig

@CreatePersonalAccountNavGraph
@CreateTeamAccountNavGraph
@WireDestination(navArgsDelegate = CreateAccountNavArgs::class)
@WireCreateTeamAccountDestination(navArgs = CreateAccountNavArgs::class)
@Composable
fun CreateAccountEmailScreen(
navigator: Navigator,
Expand Down
2 changes: 1 addition & 1 deletion ...ain/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import androidx.lifecycle.viewModelScope
import com.wire.android.di.KaliumCoreLogic
import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
import com.wire.android.ui.common.textfield.textAsFlow
import com.wire.android.ui.navArgs
import com.ramcosta.composedestinations.generated.app.navArgs
import com.wire.kalium.logic.CoreLogic
import com.wire.kalium.logic.configuration.server.ServerConfig
import com.wire.kalium.logic.feature.auth.ValidateEmailUseCase
Expand Down
2 changes: 1 addition & 1 deletion ...tlin/com/wire/android/ui/authentication/create/overview/CreateAccountOverviewViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package com.wire.android.ui.authentication.create.overview

import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import com.wire.android.ui.navArgs
import com.ramcosta.composedestinations.generated.app.navArgs
import com.wire.kalium.logic.configuration.server.ServerConfig
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
Expand Down
13 changes: 5 additions & 8 deletions ...com/wire/android/ui/authentication/create/overview/CreatePersonalAccountOverviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package com.wire.android.ui.authentication.create.overview

import com.wire.android.navigation.annotation.app.WireCreatePersonalAccountDestination
import com.wire.android.navigation.annotation.app.WireCreateTeamAccountDestination
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
Expand All @@ -43,26 +45,22 @@ import androidx.hilt.navigation.compose.hiltViewModel
import com.wire.android.R
import com.wire.android.navigation.NavigationCommand
import com.wire.android.navigation.Navigator
import com.wire.android.navigation.annotation.app.WireDestination
import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
import com.wire.android.ui.authentication.create.common.CreatePersonalAccountNavGraph
import com.wire.android.ui.authentication.create.common.CreateTeamAccountNavGraph
import com.wire.android.ui.authentication.create.common.ServerTitle
import com.wire.android.ui.common.button.WirePrimaryButton
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.common.scaffold.WireScaffold
import com.wire.android.ui.common.topappbar.NavigationIconType
import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
import com.wire.android.ui.destinations.CreateAccountEmailScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.CreateAccountEmailScreenDestination
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireDimensions
import com.wire.android.ui.theme.wireTypography
import com.wire.android.util.CustomTabsHelper
import com.wire.kalium.logic.configuration.server.ServerConfig

@CreatePersonalAccountNavGraph(start = true)
@WireDestination(navArgsDelegate = CreateAccountOverviewNavArgs::class)
@WireCreatePersonalAccountDestination(start = true, navArgs = CreateAccountOverviewNavArgs::class)
@Composable
fun CreatePersonalAccountOverviewScreen(
navigator: Navigator,
Expand All @@ -71,8 +69,7 @@ fun CreatePersonalAccountOverviewScreen(
CreateAccountOverviewScreen(navigator, CreateAccountFlowType.CreatePersonalAccount, viewModel)
}

@CreateTeamAccountNavGraph(start = true)
@WireDestination(navArgsDelegate = CreateAccountOverviewNavArgs::class)
@WireCreateTeamAccountDestination(start = true, navArgs = CreateAccountOverviewNavArgs::class)
@Composable
fun CreateTeamAccountOverviewScreen(
navigator: Navigator,
Expand Down
10 changes: 3 additions & 7 deletions ...in/kotlin/com/wire/android/ui/authentication/create/summary/CreateAccountSummaryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package com.wire.android.ui.authentication.create.summary

import com.wire.android.navigation.annotation.app.WireCreateTeamAccountDestination
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
Expand All @@ -39,20 +40,15 @@ 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.annotation.app.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
import com.wire.android.ui.common.button.WirePrimaryButton
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
import com.wire.android.ui.destinations.CreateAccountUsernameScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.CreateAccountUsernameScreenDestination
import com.wire.android.ui.theme.wireDimensions
import com.wire.android.ui.theme.wireTypography

@CreatePersonalAccountNavGraph
@CreateTeamAccountNavGraph
@WireDestination(navArgsDelegate = CreateAccountSummaryNavArgs::class)
@WireCreateTeamAccountDestination(navArgs = CreateAccountSummaryNavArgs::class)
@Composable
fun CreateAccountSummaryScreen(
navigator: Navigator,
Expand Down
2 changes: 1 addition & 1 deletion ...kotlin/com/wire/android/ui/authentication/create/summary/CreateAccountSummaryViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.compose.runtime.setValue
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
import com.wire.android.ui.navArgs
import com.ramcosta.composedestinations.generated.app.navArgs
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject

Expand Down
6 changes: 3 additions & 3 deletions .../kotlin/com/wire/android/ui/authentication/create/username/CreateAccountUsernameScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package com.wire.android.ui.authentication.create.username

import com.wire.android.navigation.annotation.app.WireRootDestination
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
Expand All @@ -36,23 +37,22 @@ 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.annotation.app.WireDestination
import com.wire.android.navigation.style.AuthPopUpNavigationAnimation
import com.wire.android.ui.authentication.create.common.handle.UsernameTextField
import com.wire.android.ui.authentication.login.WireAuthBackgroundLayout
import com.wire.android.ui.common.button.WireButtonState
import com.wire.android.ui.common.button.WirePrimaryButton
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.common.preview.EdgeToEdgePreview
import com.wire.android.ui.destinations.InitialSyncScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.InitialSyncScreenDestination
import com.wire.android.ui.newauthentication.login.NewAuthContainer
import com.wire.android.ui.newauthentication.login.NewAuthHeader
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireDimensions
import com.wire.android.ui.theme.wireTypography
import com.wire.android.util.ui.PreviewMultipleThemes

@WireDestination(
@WireRootDestination(
style = AuthPopUpNavigationAnimation::class
)
@Composable
Expand Down
12 changes: 6 additions & 6 deletions ...c/main/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package com.wire.android.ui.authentication.devices.register

import com.wire.android.navigation.annotation.app.WireRootDestination
import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.togetherWith
Expand Down Expand Up @@ -45,7 +46,6 @@ import com.wire.android.navigation.BackStackMode
import com.wire.android.navigation.LoginTypeSelector
import com.wire.android.navigation.NavigationCommand
import com.wire.android.navigation.Navigator
import com.wire.android.navigation.annotation.app.WireDestination
import com.wire.android.navigation.style.PopUpNavigationAnimation
import com.wire.android.navigation.style.TransitionAnimationType
import com.wire.android.ui.authentication.devices.common.ClearSessionState
Expand All @@ -64,16 +64,16 @@ import com.wire.android.ui.common.textfield.clearAutofillTree
import com.wire.android.ui.common.topappbar.NavigationIconType
import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
import com.wire.android.ui.common.visbility.rememberVisibilityState
import com.wire.android.ui.destinations.E2EIEnrollmentScreenDestination
import com.wire.android.ui.destinations.HomeScreenDestination
import com.wire.android.ui.destinations.InitialSyncScreenDestination
import com.wire.android.ui.destinations.RemoveDeviceScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.E2EIEnrollmentScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.HomeScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.InitialSyncScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.RemoveDeviceScreenDestination
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireDimensions
import com.wire.android.ui.theme.wireTypography
import com.wire.android.util.ui.PreviewMultipleThemes

@WireDestination(
@WireRootDestination(
style = PopUpNavigationAnimation::class,
)
@Composable
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package com.wire.android.ui.authentication.devices.remove

import com.wire.android.navigation.annotation.app.WireRootDestination
import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.togetherWith
Expand All @@ -43,7 +44,6 @@ import com.wire.android.navigation.BackStackMode
import com.wire.android.navigation.LoginTypeSelector
import com.wire.android.navigation.NavigationCommand
import com.wire.android.navigation.Navigator
import com.wire.android.navigation.annotation.app.WireDestination
import com.wire.android.navigation.style.PopUpNavigationAnimation
import com.wire.android.navigation.style.TransitionAnimationType
import com.wire.android.ui.authentication.devices.DeviceItem
Expand All @@ -63,15 +63,15 @@ import com.wire.android.ui.common.scaffold.WireScaffold
import com.wire.android.ui.common.textfield.clearAutofillTree
import com.wire.android.ui.common.visbility.rememberVisibilityState
import com.wire.android.ui.common.wireDialogPropertiesBuilder
import com.wire.android.ui.destinations.E2EIEnrollmentScreenDestination
import com.wire.android.ui.destinations.HomeScreenDestination
import com.wire.android.ui.destinations.InitialSyncScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.E2EIEnrollmentScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.HomeScreenDestination
import com.ramcosta.composedestinations.generated.app.destinations.InitialSyncScreenDestination
import com.wire.android.ui.theme.WireTheme
import com.wire.android.util.dialogErrorStrings
import com.wire.android.util.ui.PreviewMultipleThemes
import com.wire.kalium.logic.data.conversation.ClientId

@WireDestination(
@WireRootDestination(
style = PopUpNavigationAnimation::class,
)
@Composable
Expand Down
Loading