github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2024-09-20 02:19:08 -05:00
Code

Fix password reset related issues (#2308)

Browse Source 
* Fix login hint in password reset field

* Don't hide first password reset button

* Change recover button label
This commit is contained in:
Mikołaj Pich 2023-09-26 21:01:59 +02:00 committed by GitHub
parent 4d3b16ec80
commit 1835446468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
View File

@ -238,8 +238,7 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
} }
override fun showContact(show: Boolean) { override fun showContact(show: Boolean) {
binding.loginFormContact.visibility = if (show) VISIBLE else GONE binding.loginFormContact.isVisible = show
binding.loginFormRecoverLink.visibility = if (show) GONE else VISIBLE
} }
override fun openPrivacyPolicyPage() { override fun openPrivacyPolicyPage() {

4
app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
View File

@ -46,7 +46,7 @@ class LoginRecoverPresenter @Inject constructor(
fun updateFields() { fun updateFields() {
view?.run { view?.run {
setUsernameHint(if ("standard" in recoverHostValue) emailHintString else loginPeselEmailHintString) setUsernameHint(if ("email" in recoverHostValue) emailHintString else loginPeselEmailHintString)
} }
} }
@ -92,7 +92,7 @@ class LoginRecoverPresenter @Inject constructor(
isCorrect = false isCorrect = false
} }
if ("standard" in host && "@" !in username) { if ("email" in host && "@" !in username) {
view?.setUsernameError(view?.invalidEmailString.orEmpty()) view?.setUsernameError(view?.invalidEmailString.orEmpty())
isCorrect = false isCorrect = false
} }

2
app/src/main/res/values/strings.xml
View File

@ -76,7 +76,7 @@
<string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string> <string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string>
<string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nIdentyfikator instalacji: %5$s\nOstatni błąd: %6$s\n\nNazwa szkoły i miejscowość: </string> <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nIdentyfikator instalacji: %5$s\nOstatni błąd: %6$s\n\nNazwa szkoły i miejscowość: </string>
<string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string> <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
<string name="login_recover_button">I forgot my password</string> <string name="login_recover_button">Reset password</string>
<string name="login_recover_title">Recover your account</string> <string name="login_recover_title">Recover your account</string>
<string name="login_recover">Recover</string> <string name="login_recover">Recover</string>
<string name="login_signed_in">Student is already signed in</string> <string name="login_signed_in">Student is already signed in</string>