diff --git a/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordFragment.kt
index a865ab9d206eb6538989d2f73b437d8f4a9395f6..35766c298a127678216e9e9da1e27cff1ff908cf 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/uia/stages/password/PasswordFragment.kt
@@ -45,7 +45,7 @@ class PasswordFragment :
private fun setupViews() {
with(binding) {
btnLogin.apply {
- setText(getString(if (isSignupMode()) R.string.set_password else R.string.log_in))
+ setText(getString(if (isSignupMode()) R.string.set_passphrase else R.string.log_in))
setOnClickListener {
startLoading(btnLogin)
viewModel.processPasswordStage(
@@ -55,6 +55,8 @@ class PasswordFragment :
)
}
}
+ tvPasswordTitle.text =
+ getString(if (isSignupMode()) R.string.choose_a_passphrase else R.string.enter_your_passphrase)
tilPassword.editText?.apply {
doAfterTextChanged {
if (isSignupMode()) vPasswordStrength.calculateStrength(tilPassword.getText())
diff --git a/auth/src/main/res/layout/fragment_password.xml b/auth/src/main/res/layout/fragment_password.xml
index 1c704087b2b9ddb5bf945da6cf180ffe55162e72..64c0e3cebfa6638e1b7e74e32123638a1cb2190b 100644
--- a/auth/src/main/res/layout/fragment_password.xml
+++ b/auth/src/main/res/layout/fragment_password.xml
@@ -36,7 +36,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
- android:text="@string/enter_your_password"
app:layout_constraintBottom_toTopOf="@id/tilPassword"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -48,7 +47,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:hint="@string/password"
+ android:hint="@string/passphrase"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvPasswordTitle"
@@ -79,7 +78,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:hint="@string/repeat_password"
+ android:hint="@string/repeat_passphrase"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index 5d060fbb7538719e590cf9adac4d719b48fcdd2d..7a97b4305cffc122fa709f2777287a0b7afb1089 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
<string name="session_sync">Session sync</string>
<string name="unsupported_login_method">Unsupported login method</string>
<string name="discard_current_auth_progress">Discard current auth progress?</string>
- <string name="set_password">Set password</string>
+ <string name="set_passphrase">Set passphrase</string>
<string name="log_in">Log In</string>
<string name="wrong_signup_config">Wrong signup config!</string>
<string name="sign_up">Sign Up</string>
@@ -50,9 +50,9 @@
<string name="user_id_separator">:</string>
<string name="not_a_member">Not a member?</string>
<string name="resume_session">Resume session:</string>
- <string name="enter_your_password">Enter your password</string>
- <string name="password">Password</string>
- <string name="repeat_password">Repeat password</string>
+ <string name="choose_a_passphrase">Choose a passphrase</string>
+ <string name="enter_your_passphrase">Enter your passphrase</string>
+ <string name="repeat_passphrase">Repeat passphrase</string>
<string name="server">Server</string>
<string name="sign_up_with_subscription">Sign up with subscription</string>
<string name="sign_up_for_free">Sign up for free</string>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 4c05b5b89d00cbcf5b68184ca21ec0d46af4fd9b..8cb94eb04f6738f32bcc86028a6baf4118e38a08 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -46,7 +46,7 @@
<string name="describe_your_problem_here">Describe your problem here</string>
<string name="save">Save</string>
<string name="select_items_from_list_below">Select items from list below</string>
- <string name="password_changed">Password changed</string>
+ <string name="passphrase_changed">Passphrase changed</string>
<string name="email_added">Email added</string>
<string name="remove">Remove</string>
<string name="choose_gallery">Choose gallery</string>
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/change_password/ChangePasswordDialogFragment.kt b/settings/src/main/java/org/futo/circles/settings/feature/change_password/ChangePasswordDialogFragment.kt
index 68939e38c3612acc6a3eb71a562e317d696cee9c..710ff16d0b7ce07f1c019a6af4e2f8005d5185f8 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/change_password/ChangePasswordDialogFragment.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/change_password/ChangePasswordDialogFragment.kt
@@ -55,7 +55,7 @@ class ChangePasswordDialogFragment :
private fun setupObservers() {
viewModel.responseLiveData.observeResponse(this,
success = {
- showSuccess(getString(org.futo.circles.core.R.string.password_changed))
+ showSuccess(getString(org.futo.circles.core.R.string.passphrase_changed))
onBackPressed()
},
error = { message ->
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/settings/SettingsFragment.kt b/settings/src/main/java/org/futo/circles/settings/feature/settings/SettingsFragment.kt
index fa33cddcab927043713aa32eebea073bb4c82dd6..ccad4f32ffe648a3588eb6f9d3e7c06715fd9b72 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/settings/SettingsFragment.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/settings/SettingsFragment.kt
@@ -73,7 +73,7 @@ class SettingsFragment :
}
}
tvSwitchUser.setOnClickListener { withConfirmation(SwitchUser()) { (activity as? SessionHolderActivity)?.stopSyncAndRestart() } }
- tvChangePassword.setOnClickListener {
+ tvChangePassphrase.setOnClickListener {
if (showNoInternetConnection()) return@setOnClickListener
viewModel.handleChangePasswordFlow()
}
@@ -121,7 +121,7 @@ class SettingsFragment :
onRequestInvoked = { loadingDialog.dismiss() }
)
viewModel.changePasswordResponseLiveData.observeResponse(this,
- success = { showSuccess(getString(org.futo.circles.core.R.string.password_changed)) },
+ success = { showSuccess(getString(org.futo.circles.core.R.string.passphrase_changed)) },
error = { message -> showError(message) },
onRequestInvoked = { loadingDialog.dismiss() }
)
diff --git a/settings/src/main/res/layout/fragment_settings.xml b/settings/src/main/res/layout/fragment_settings.xml
index cbe985fe9b78ea18ad3ba20fde10c2eb1960519f..86809b5ee45609b56f15040614854518c30579fb 100644
--- a/settings/src/main/res/layout/fragment_settings.xml
+++ b/settings/src/main/res/layout/fragment_settings.xml
@@ -112,11 +112,11 @@
<org.futo.circles.core.view.SettingsMenuItemView
- android:id="@+id/tvChangePassword"
+ android:id="@+id/tvChangePassphrase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:optionIcon="@drawable/ic_lock"
- app:optionName="@string/change_password" />
+ app:optionName="@string/change_passphrase" />
<org.futo.circles.core.view.SettingsMenuItemView
android:id="@+id/tvAddEmail"
diff --git a/settings/src/main/res/values/strings.xml b/settings/src/main/res/values/strings.xml
index 59c649d5c0a8a6cb22f6df99e52d3841b770339c..aab5cbdc64090d5b87ccd90174108230b6dd8580 100644
--- a/settings/src/main/res/values/strings.xml
+++ b/settings/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
<resources>
<string name="shared_circles_space_not_found">Shared Circles space not found</string>
<string name="active_login_sessions">Active login sessions</string>
+ <string name="change_passphrase">Change passphrase</string>
<string name="change_password">Change password</string>
<string name="new_password">New password</string>
<string name="old_password">Old Password</string>