Skip to content

Commit 7ac54cd

Browse files
committed
Disable form after an email has been submitted in the Forgot Password view
Bump version, update changelog and translations
1 parent 65aa999 commit 7ac54cd

File tree

6 files changed

+45
-17
lines changed

6 files changed

+45
-17
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Version 2.6.0 "OK Quack"
2+
3+
Allow to update and remove issues
4+
Add "Forgot password" page
5+
Add context menu to copy the list of owned or missing issues in the current view
6+
Show message when a new version is available
7+
18
Version 2.5.1
29

310
Fix background in notified countries list

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
applicationId "net.ducksmanager.whattheduck"
1515
minSdkVersion 16
1616
targetSdkVersion 29
17-
versionCode 72
18-
versionName "2.5.1"
17+
versionCode 73
18+
versionName "2.6.0"
1919
multiDexEnabled true
2020

2121
javaCompileOptions {

app/src/main/java/net/ducksmanager/activity/ForgotPassword.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ class ForgotPassword : AppCompatActivity() {
2323
val email = binding.emailAddress.text.toString()
2424
DmServer.api.initForgotPassword(EmailWrapper(email)).enqueue(object : DmServer.Callback<Void>("initForgotPassword", this@ForgotPassword, true) {
2525
override fun onSuccessfulResponse(response: Response<Void>) {
26+
binding.emailAddress.isEnabled = false
27+
binding.sendEmail.isEnabled = false
2628
binding.feedback.text = getString(reset_password_confirmation)
2729
}
2830
})

app/src/main/res/values-fr/strings.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,11 @@
9898
<string name="reset_password_description">Indiquez votre addresse e-mail pour réinitialiser votre mot de passe</string>
9999
<string name="condition_missing">Numéro manquant</string>
100100
<string name="reset_password_confirmation">Si l\'adresse e-mail entrée correspond à un compte DucksManager, nous venons d\'y envoyer un lien permettant la réinitialisation du mot de passe. Si l\'e-mail ne vous parvient pas d\'ici quelques minutes, veuillez vérifier votre dossier Spam.</string>
101+
<string name="issue_list_copied">La liste a été copiée dans votre presse-papiers.</string>
102+
<string name="issue_list_copy_possessed">Copier les numéros possédés</string>
103+
<string name="issue_list_copy_missing">Copier les numéros manquants</string>
104+
<string name="issue_list_copy_possessed_title">Numéros possédés de&#160;</string>
105+
<string name="issue_list_copy_missing_title">Numéros manquants de&#160;</string>
106+
<string name="no_issue">Aucun numéro</string>
107+
<string name="new_version_available">Une nouvelle version de What The Duck est disponible ! Cliquez ici pour mettre à jour l\'application</string>
101108
</resources>

app/src/main/res/values-sv/strings.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<string name="condition_good">Bra skick</string>
1717
<string name="condition_none">Ospecificerat skick</string>
1818
<string name="condition_notsogood">Genomsnittligt skick</string>
19-
<string name="confirmation_message__collection_updated">Utgåvan har lagts till i din samling</string>
19+
<string name="confirmation_message__collection_updated">Din samling har uppdaterats</string>
2020
<string name="country">Land</string>
2121
<string name="cover_suggestion">Framsideförslag</string>
2222
<string name="coversearch_result_template">%1$s %2$d/%3$d</string>
@@ -32,9 +32,9 @@
3232
<string name="input_error__empty_credentials">Du måste fylla i alla fälten för att fortsätta</string>
3333
<string name="input_error__invalid_credentials">Ogiltig information</string>
3434
<string name="input_error__no_issue_selected">Välj åtminstone en utgåva</string>
35-
<string name="insert_issue__title_multiple_issues_plural">Lägger till utgåva %1$s och %2$d andra</string>
36-
<string name="insert_issue__title_multiple_issues_singular">Lägger till utgåva %1$s och en till</string>
37-
<string name="insert_issue__title_single_issue">Lägger till utgåva %1$s</string>
35+
<string name="insert_issue__title_multiple_issues_plural">Utgåva %1$s och %2$d andra</string>
36+
<string name="insert_issue__title_multiple_issues_singular">Utgåva %1$s och en till</string>
37+
<string name="insert_issue__title_single_issue">Utgåva %1$s</string>
3838
<string name="internal_error">Internt fel</string>
3939
<string name="internal_error__crypting_failed">Krypteringen av din information misslyckades</string>
4040
<string name="internal_error__empty_list">Tom lista</string>
@@ -93,4 +93,16 @@
9393
<string name="welcome_bookcase_view_portrait">Välkommen till bohyllan! Rotera din skärm till landskapsläge för bästa effekt ;-)</string>
9494
<string name="welcome_message">Din DucksManager-samling visas när du öppnar What The Duck. Klicka på ett land för att se de publikationer du har, eller tryck på \"+\" för att lägga till en utgåva i din samling.</string>
9595
<string name="welcome_title">Välkommen till What The Duck!</string>
96+
<string name="condition_missing">Utgåva saknas</string>
97+
<string name="issue_list_copied">Listan har kopierats till dina urklipp.</string>
98+
<string name="issue_list_copy_missing">Kopiera saknade utgåvor</string>
99+
<string name="issue_list_copy_possessed">Kopiera ägda utgåvor</string>
100+
<string name="issue_list_copy_missing_title">Saknade utgåvor av&#160;</string>
101+
<string name="issue_list_copy_possessed_title">Ägda utgåvor av&#160;</string>
102+
<string name="new_version_available">En ny version av What The Duck finns tillgänglig!\\nKlicka här för att uppdatera appen</string>
103+
<string name="no_issue">Ingen utgåva</string>
104+
<string name="reset_password_title">Glömt lösenord?</string>
105+
<string name="reset_password_description">Skriv in din emailadress för att återställa ditt lösenord.</string>
106+
<string name="reset_password_confirmation">Om emailadressen överensstämmer med ett DucksManager konto skickas en länk för att återställa ditt lösenord. Om du inte får ett email inom några minter, kolla din Spam mapp.</string>
107+
<string name="send">Skicka</string>
96108
</resources>

app/src/main/res/values/strings.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
<string name="internal_error__malformed_list">The list is malformed, please try again later</string>
4444
<string name="internal_error__purchase_creation_failed">The creation of the purchase date failed</string>
4545
<string name="issue_already_possessed">You already have this issue in your collection</string>
46+
<string name="issue_list_copied">The list has been copied to your clipboard.</string>
47+
<string name="issue_list_copy_missing">Copy missing issues</string>
48+
<string name="issue_list_copy_missing_title">Missing issues for&#160;</string>
49+
<string name="issue_list_copy_possessed">Copy possessed issues</string>
50+
<string name="issue_list_copy_possessed_title">Possessed issues for&#160;</string>
4651
<string name="issue_selection_tip">Select an issue by tapping on it.\nSelect a range of issues by long-tapping on the first item of the range.</string>
4752
<string name="item_description">Description</string>
4853
<string name="itemtitle">Item</string>
4954
<string name="link_to_ducksmanager_website">What The Duck is the mobile app of DucksManager. Click here to access the DucksManager website.</string>
50-
<string name="issue_list_copied">The list has been copied to your clipboard.</string>
51-
<string name="issue_list_copy_possessed">Copy possessed issues</string>
52-
<string name="issue_list_copy_possessed_title">Possessed issues for&#160;</string>
53-
<string name="issue_list_copy_missing">Copy missing issues</string>
54-
<string name="issue_list_copy_missing_title">Missing issues for&#160;</string>
5555
<string name="list_view">List</string>
5656
<string name="loading_collection">Loading your collection…</string>
5757
<string name="login">Login</string>
@@ -62,6 +62,8 @@
6262
<string name="network_error__no_connection">Network issue: please check your Internet connection</string>
6363
<string name="new_feature">New features in the WhatTheDuck app</string>
6464
<string name="new_features_18_text">You can now see your bookcase on WhatTheDuck!\n\nWhen in an issue list, tap on the bookcase icon to switch to the bookcase view.</string>
65+
<string name="new_version_available">A new version of What The Duck is available !\nClick here to update the app</string>
66+
<string name="no_issue">No issue</string>
6567
<string name="no_item">No issue in this list. Click on the "+" icon to add issues to your collection!</string>
6668
<string name="no_purchase_date">No purchase date</string>
6769
<string name="no_suggestion">We don\'t have any suggestion for you. Make sure that you rated your favorite authors on the DucksManager.\nThe suggestions are updated daily.</string>
@@ -81,8 +83,12 @@
8183
<string name="report_description">Is something not working in the app? Explain your issue and we will try to fix it in the next version :-)</string>
8284
<string name="report_hint">Describe the issue…</string>
8385
<string name="report_send">Send</string>
86+
<string name="reset_password_confirmation">If the typed e-mail address corresponds to a DucksManager account, we just sent a link to this address allowing you to reset your password. If the e-mail does not reach you within a few minutes, please check your Spam folder.</string>
87+
<string name="reset_password_description">Fill in your e-mail address to reset your password.</string>
88+
<string name="reset_password_title">Forgot password?</string>
8489
<string name="result">Result</string>
8590
<string name="save">Save</string>
91+
<string name="send">Send</string>
8692
<string name="settings">Settings</string>
8793
<string name="signup">Signup</string>
8894
<string name="signup__confirm">You have signed up to DucksManager successfully, please login.</string>
@@ -99,10 +105,4 @@
99105
<string name="welcome_bookcase_view_portrait">Welcome to the bookcase view! Rotate your screen to landscape for the best effect ;-)</string>
100106
<string name="welcome_message">Your DucksManager collection is displayed when you open What The Duck. Tap on a country to view the publications that you possess, or tap on \"+\" to add an issue to your collection.</string>
101107
<string name="welcome_title">Welcome on What The Duck!</string>
102-
<string name="reset_password_description">Fill in your e-mail address to reset your password.</string>
103-
<string name="reset_password_confirmation">If the typed e-mail address corresponds to a DucksManager account, we just sent there a link allowing you to reset your password. If the e-mail does not reach you within a few minutes, please check your "Spam" folder.</string>
104-
<string name="send">Send</string>
105-
<string name="reset_password_title">Forgot password?</string>
106-
<string name="no_issue">No issue</string>
107-
<string name="new_version_available">A new version of What The Duck is available !\nClick here to update the app</string>
108108
</resources>

0 commit comments

Comments
 (0)