From 7c4422cad65fe20a4fa69209b262d55a688e993c Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Thu, 29 Feb 2024 13:09:28 +0200
Subject: [PATCH] Add finish forgot password
---
.../org/futo/circles/auth/feature/uia/UIADialogFragment.kt | 1 +
.../java/org/futo/circles/auth/feature/uia/UIAViewModel.kt | 4 ++++
auth/src/main/res/layout/fragment_log_in.xml | 2 +-
auth/src/main/res/values/strings.xml | 3 ++-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADialogFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADialogFragment.kt
index 9e388e259..84a36759e 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADialogFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIADialogFragment.kt
@@ -110,6 +110,7 @@ class UIADialogFragment :
when (UIADataSourceProvider.activeFlowType) {
UIAFlowType.Login -> viewModel.finishLogin(it)
UIAFlowType.Signup -> viewModel.finishSignup(it)
+ UIAFlowType.ForgotPassword->viewModel.finishForgotPassword(it)
else -> dismiss()
}
}
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
index d57295f60..0c52c2a84 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/UIAViewModel.kt
@@ -98,6 +98,10 @@ class UIAViewModel @Inject constructor(
}
}
+ fun finishForgotPassword(session: Session) {
+ TODO("Not yet implemented")
+ }
+
private suspend fun handleKeysBackup() {
if (encryptionAlgorithmHelper.isBcryptAlgorithm()) {
(uiaDataSource as? LoginStagesDataSource)?.userPassword?.let {
diff --git a/auth/src/main/res/layout/fragment_log_in.xml b/auth/src/main/res/layout/fragment_log_in.xml
index b42fd32c2..748cae09c 100644
--- a/auth/src/main/res/layout/fragment_log_in.xml
+++ b/auth/src/main/res/layout/fragment_log_in.xml
@@ -148,7 +148,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="@string/forgot_password"
+ android:text="@string/forgot_password_question"
android:textColor="@color/blue"
android:textSize="17sp"
android:textStyle="bold"
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index c797cb0ff..98e154e56 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -174,7 +174,8 @@ Or, think about all of your friends across all of the places you\'ve ever lived.
<string name="username_not_found">Username not found</string>
<string name="invalid_validation_code">Invalid validation code</string>
<string name="invalid_password">Invalid password</string>
- <string name="forgot_password">Forgot password?</string>
+ <string name="forgot_password_question">Forgot password?</string>
+ <string name="forgot_password">Forgot password</string>
<plurals name="days">
--
GitLab