Skip to content

feat: app lock forgot logout navigation [WPB-23188] #4569

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

Open
Garzas wants to merge 5 commits into
base: develop
Choose a base branch
from
+163 −563
Open

feat: app lock forgot logout navigation [WPB-23188] #4569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b62244c
fix: app lock forgot logout navigation
Garzas Feb 5, 2026
158b258
restore account switch
Garzas Feb 5, 2026
d2e8464
test fixes
Garzas Feb 6, 2026
1bc31da
detekt fix
Garzas Feb 6, 2026
5af38f9
Merge branch 'develop' into fix/forgot-applock-logout
Garzas Feb 6, 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
147 changes: 0 additions & 147 deletions ...rc/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeResetDeviceDialog.kt
View file
Open in desktop

This file was deleted.

79 changes: 42 additions & 37 deletions app/src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package com.wire.android.ui.home.appLock.forgot

import android.content.Intent
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
Expand Down Expand Up @@ -47,58 +48,52 @@ import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.style.TextAlign
import androidx.hilt.navigation.compose.hiltViewModel
import com.wire.android.R
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.ui.LocalActivity
import com.wire.android.ui.WireActivity
import com.wire.android.ui.common.WireDialog
import com.wire.android.ui.common.WireDialogButtonProperties
import com.wire.android.ui.common.WireDialogButtonType
import com.wire.android.ui.common.button.WireButtonState
import com.wire.android.ui.common.button.WirePrimaryButton
import com.wire.android.ui.common.rememberBottomBarElevationState
import com.wire.android.ui.common.scaffold.WireScaffold
import com.wire.android.ui.destinations.NewLoginScreenDestination
import com.wire.android.ui.destinations.WelcomeScreenDestination
import com.wire.android.ui.common.visbility.rememberVisibilityState
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.ui.userprofile.self.dialog.LogoutOptionsDialog
import com.wire.android.ui.userprofile.self.dialog.LogoutOptionsDialogState
import com.wire.android.util.dialogErrorStrings
import com.wire.android.util.ui.PreviewMultipleThemes

@WireDestination
@Composable
fun ForgotLockCodeScreen(
navigator: Navigator,
loginTypeSelector: LoginTypeSelector,
viewModel: ForgotLockScreenViewModel = hiltViewModel(),
) {
val activity = LocalActivity.current
val logoutOptionsDialogState = rememberVisibilityState<LogoutOptionsDialogState>()
with(viewModel.state) {
LaunchedEffect(completed) {
val destination = if (loginTypeSelector.canUseNewLogin()) NewLoginScreenDestination() else WelcomeScreenDestination()
if (completed) navigator.navigate(NavigationCommand(destination, BackStackMode.CLEAR_WHOLE))
if (completed) {
startLoginActivity(activity)
}
}
ForgotLockCodeScreenContent(
scrollState = rememberScrollState(),
onResetDevice = viewModel::onResetDevice,
)
if (dialogState is ForgotLockCodeDialogState.Visible) {
if (dialogState.loading) {
ForgotLockCodeResettingDeviceDialog()
} else {
ForgotLockCodeResetDeviceDialog(
passwordTextState = viewModel.passwordTextState,
username = dialogState.username,
isPasswordRequired = dialogState.passwordRequired,
isPasswordValid = dialogState.passwordValid,
isResetDeviceEnabled = dialogState.resetDeviceEnabled,
onResetDeviceClicked = viewModel::onResetDeviceConfirmed,
onDialogDismissed = viewModel::onDialogDismissed,
isLoggingOut = isLoggingOut,
onLogout = {
logoutOptionsDialogState.show(
logoutOptionsDialogState.savedState ?: LogoutOptionsDialogState()
)
}
}
},
)
LogoutOptionsDialog(
dialogState = logoutOptionsDialogState,
logout = viewModel::onLogoutConfirmed,
)
if (error != null) {
val (title, message) = error.dialogErrorStrings(LocalContext.current.resources)
WireDialog(
Expand All @@ -119,7 +114,8 @@ fun ForgotLockCodeScreen(
@Composable
fun ForgotLockCodeScreenContent(
scrollState: ScrollState,
onResetDevice: () -> Unit,
isLoggingOut: Boolean,
onLogout: () -> Unit,
modifier: Modifier = Modifier,
) {
WireScaffold { internalPadding ->
Expand Down Expand Up @@ -165,7 +161,7 @@ fun ForgotLockCodeScreenContent(
text = stringResource(id = R.string.settings_forgot_lock_screen_warning),
style = MaterialTheme.wireTypography.body01,
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.error,
color = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.padding(
top = MaterialTheme.wireDimensions.spacing8x,
bottom = MaterialTheme.wireDimensions.spacing8x
Expand All @@ -180,37 +176,46 @@ fun ForgotLockCodeScreenContent(
modifier = Modifier.semantics { testTagsAsResourceId = true }
) {
Box(modifier = Modifier.padding(MaterialTheme.wireDimensions.spacing16x)) {
ContinueButton(enabled = true, onContinue = onResetDevice)
LogoutButton(isLoggingOut = isLoggingOut, onLogout = onLogout)
}
}
}
}
}

@Composable
private fun ContinueButton(
enabled: Boolean,
onContinue: () -> Unit,
private fun LogoutButton(
isLoggingOut: Boolean,
onLogout: () -> Unit,
modifier: Modifier = Modifier.fillMaxWidth(),
) {
val interactionSource = remember { MutableInteractionSource() }
Column(modifier = modifier) {
WirePrimaryButton(
text = stringResource(R.string.settings_forgot_lock_screen_reset_device),
onClick = onContinue,
state = if (enabled) WireButtonState.Default else WireButtonState.Disabled,
text = stringResource(R.string.user_profile_logout),
onClick = onLogout,
loading = isLoggingOut,
state = if (isLoggingOut) WireButtonState.Disabled else WireButtonState.Default,
interactionSource = interactionSource,
modifier = Modifier
.fillMaxWidth()
.testTag("reset_device_button")
.testTag("logout_button")
)
}
}

private fun startLoginActivity(activity: androidx.appcompat.app.AppCompatActivity) {
val intent = Intent(activity, WireActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
}
activity.startActivity(intent)
activity.finish()
}

@Composable
@PreviewMultipleThemes
fun PreviewForgotLockCodeScreen() {
WireTheme {
ForgotLockCodeScreenContent(rememberScrollState(), {})
ForgotLockCodeScreenContent(rememberScrollState(), false, {})
}
}
13 changes: 1 addition & 12 deletions app/src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeViewState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,5 @@ import com.wire.kalium.common.error.CoreFailure
data class ForgotLockCodeViewState(
val completed: Boolean = false,
val error: CoreFailure? = null,
val dialogState: ForgotLockCodeDialogState = ForgotLockCodeDialogState.Hidden,
val isLoggingOut: Boolean = false,
)

sealed class ForgotLockCodeDialogState {
data object Hidden : ForgotLockCodeDialogState()
data class Visible(
val username: String,
val passwordRequired: Boolean = false,
val passwordValid: Boolean = true,
val resetDeviceEnabled: Boolean = false,
val loading: Boolean = false,
) : ForgotLockCodeDialogState()
}
Loading