-
Notifications
You must be signed in to change notification settings - Fork 20
Reset password screen #26
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.
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
nirvan73
merged 9 commits into
bsoc-bitbyte:main
from
nehasiwach802:ResetPasswordScreen
Jun 28, 2026
Merged
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
46a478f
Revamped ForgetPasswordScreen and Added Reset Password Screen
34de47e
Revamped ForgetPasswordScreen and Added Reset Password Screen
f9eccc0
Merge remote-tracking branch 'origin/ResetPasswordScreen' into ResetP…
2cffee3
changed NudjLogo , textColor and LoginClick
5e80ca3
changed NudjLogo , textColor and LoginClick
6dd9444
Merge remote-tracking branch 'origin/ResetPasswordScreen' into ResetP…
3e19412
removed background color which was being used twice, and textcolor
4a38702
Merge remote-tracking branch 'origin/ResetPasswordScreen' into ResetP…
af258fb
final change in bg
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletions
175
app/src/main/java/com/tpc/nudj/ui/screen/auth/Reset/ResetPasswordScreen.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| package com.tpc.nudj.ui.screen.auth.Reset | ||
|
|
||
| import android.content.res.Configuration | ||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.isSystemInDarkTheme | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Card | ||
| import androidx.compose.material3.CardDefaults | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.hilt.navigation.compose.hiltViewModel | ||
| import com.tpc.nudj.ui.components.LoadingIndicator | ||
| import com.tpc.nudj.ui.theme.LocalAppColors | ||
| import com.tpc.nudj.viewmodels.auth.ResetPassword.ResetPasswordViewModel | ||
| import com.tpc.nudj.R | ||
| import com.tpc.nudj.ui.components.NudjLogo | ||
| import com.tpc.nudj.ui.components.PasswordTextField | ||
| import com.tpc.nudj.ui.components.PrimaryButton | ||
| import com.tpc.nudj.ui.components.TertiaryButton | ||
| import com.tpc.nudj.ui.theme.NudjTheme | ||
|
|
||
| @Composable | ||
| fun ResetPasswordScreen( | ||
| viewModel: ResetPasswordViewModel = hiltViewModel(), | ||
| onLoginClick :() ->Unit | ||
| ) { | ||
| Scaffold( | ||
| containerColor = LocalAppColors.current.background | ||
| ) { paddingValues -> | ||
|
|
||
| val uiState by viewModel.resetPasswordUiState.collectAsState() | ||
| LoadingIndicator(isLoading = uiState.isLoading) { | ||
| ResetPasswordScreenLayout( | ||
| modifier = Modifier.padding(paddingValues), | ||
| uiState = uiState, | ||
| onPasswordInput = viewModel::onPasswordChange, | ||
| onConfirmPasswordInput = viewModel::onConfirmPasswordChange, | ||
| onPasswordVisibilityToggle = viewModel::togglePasswordVisibility, | ||
| onConfirmPasswordVisibilityToggle = viewModel::toggleConfirmPasswordVisibility, | ||
| onSubmitClick = viewModel::onSubmitClick, | ||
| onLoginClick = onLoginClick | ||
| ) | ||
| } | ||
| } | ||
| }@Composable | ||
| fun ResetPasswordScreenLayout( | ||
| uiState: ResetPasswordUiState, | ||
| modifier: Modifier = Modifier, | ||
| onPasswordInput: (String) -> Unit, | ||
| onConfirmPasswordInput: (String) -> Unit, | ||
| onPasswordVisibilityToggle: () -> Unit, | ||
| onConfirmPasswordVisibilityToggle: () -> Unit, | ||
| onSubmitClick: () -> Unit, | ||
| onLoginClick: () -> Unit | ||
| ) { | ||
| Column( | ||
| modifier = modifier | ||
| .fillMaxSize() | ||
| .background(LocalAppColors.current.background) | ||
| .padding(horizontal = 24.dp), | ||
| horizontalAlignment = Alignment.CenterHorizontally | ||
| ) { | ||
| Spacer(modifier = Modifier.height(56.dp)) | ||
| NudjLogo() | ||
|
|
||
| Spacer(modifier = Modifier.height(96.dp)) | ||
|
|
||
| Text( | ||
| text = "Reset Password", | ||
| style = MaterialTheme.typography.titleLarge, | ||
| color = LocalAppColors.current.onBackground | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(16.dp)) | ||
|
|
||
| Card( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| shape = RoundedCornerShape(16.dp), | ||
| colors = CardDefaults.cardColors( | ||
| containerColor = LocalAppColors.current.surfaceColor | ||
| ) | ||
| ) { | ||
| Column( | ||
| modifier = Modifier.padding(16.dp) | ||
| ) { | ||
| PasswordTextField( | ||
| value = uiState.password, | ||
| onValueChange = onPasswordInput, | ||
| passwordVisible = uiState.passwordVisible, | ||
| onPasswordVisibilityToggle = | ||
| onPasswordVisibilityToggle, | ||
| placeholder = "New Password" | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(16.dp)) | ||
|
|
||
| PasswordTextField( | ||
| value = uiState.confirmPassword, | ||
| onValueChange = onConfirmPasswordInput, | ||
| passwordVisible = uiState.confirmPasswordVisible, | ||
| onPasswordVisibilityToggle = onConfirmPasswordVisibilityToggle, | ||
| placeholder = "Confirm Password" | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(64.dp)) | ||
|
|
||
| PrimaryButton( | ||
| text = "Submit", | ||
| onClick = onSubmitClick, | ||
| enabled = !uiState.isLoading, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(horizontal = 16.dp) | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.weight(1f)) | ||
|
|
||
| Row( | ||
| modifier = Modifier.padding(bottom = 40.dp), | ||
| horizontalArrangement = Arrangement.Center, | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Text( | ||
| text = "Already have an account?", | ||
| style = MaterialTheme.typography.bodyMedium, | ||
| color = LocalAppColors.current.onBackground | ||
| ) | ||
|
|
||
| TertiaryButton( | ||
| text = "Login", | ||
| onClick = onLoginClick | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| @Preview(showBackground = true) | ||
| @Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) | ||
| @Composable | ||
| private fun ResetPasswordScreenLayoutPreview() { | ||
| NudjTheme { | ||
| ResetPasswordScreenLayout( | ||
| uiState = ResetPasswordUiState(), | ||
| onPasswordInput = {}, | ||
| onConfirmPasswordInput = {}, | ||
| onPasswordVisibilityToggle = {}, | ||
| onConfirmPasswordVisibilityToggle = {}, | ||
| onSubmitClick = {}, | ||
| onLoginClick = {} | ||
| ) | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
app/src/main/java/com/tpc/nudj/ui/screen/auth/Reset/ResetPasswordUiState.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package com.tpc.nudj.ui.screen.auth.Reset | ||
|
|
||
| data class ResetPasswordUiState( | ||
| val isLoading: Boolean = false, | ||
| val errorMessage: String? = null, | ||
| val toastMessage: String? = null, | ||
| val password: String = "", | ||
| val confirmPassword: String = "", | ||
| val passwordVisible: Boolean = false, | ||
| val confirmPasswordVisible: Boolean = false | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.