diff options
author | 2020-03-03 17:53:09 +0100 | |
---|---|---|
committer | 2020-03-03 17:53:09 +0100 | |
commit | e043795a040b8666a6ad253bb6cd37a5d647bbd5 (patch) | |
tree | d14e1237d49687742901d515c95d7d2c5fbe069f /src/containers/settings/EditSettingsScreen.js | |
parent | Add Crowdin contributors to list of contributors (#429) (diff) | |
download | ferdium-app-e043795a040b8666a6ad253bb6cd37a5d647bbd5.tar.gz ferdium-app-e043795a040b8666a6ad253bb6cd37a5d647bbd5.tar.zst ferdium-app-e043795a040b8666a6ad253bb6cd37a5d647bbd5.zip |
Add support for unlocking with Touch ID (#423)
* Enhance installation guide in README
* Add TouchID unlock for Ferdi Lock
* Remove commit 8861014 as it is not related to this feature
This reverts commit 88610144b942739772286ec3073b328e829a8b39.
* Rename TouchID to "Touch ID"
* Improve Touch ID prompt text
* Improve unlocking with Touch ID
* Fix lint
* Add separator after lock-related menu entry
Co-authored-by: Amine <amine@mouafik.fr>
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 6dd21f961..6b3f8d3d3 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -88,6 +88,10 @@ const messages = defineMessages({ | |||
88 | id: 'settings.app.form.lockPassword', | 88 | id: 'settings.app.form.lockPassword', |
89 | defaultMessage: '!!!Password', | 89 | defaultMessage: '!!!Password', |
90 | }, | 90 | }, |
91 | useTouchIdToUnlock: { | ||
92 | id: 'settings.app.form.useTouchIdToUnlock', | ||
93 | defaultMessage: '!!!Allow using Touch ID to unlock', | ||
94 | }, | ||
91 | inactivityLock: { | 95 | inactivityLock: { |
92 | id: 'settings.app.form.inactivityLock', | 96 | id: 'settings.app.form.inactivityLock', |
93 | defaultMessage: '!!!Lock after inactivity', | 97 | defaultMessage: '!!!Lock after inactivity', |
@@ -202,6 +206,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
202 | todoServer: settingsData.todoServer, | 206 | todoServer: settingsData.todoServer, |
203 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, | 207 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, |
204 | lockedPassword: settingsData.lockedPassword, | 208 | lockedPassword: settingsData.lockedPassword, |
209 | useTouchIdToUnlock: settingsData.useTouchIdToUnlock, | ||
205 | inactivityLock: settingsData.inactivityLock, | 210 | inactivityLock: settingsData.inactivityLock, |
206 | scheduledDNDEnabled: settingsData.scheduledDNDEnabled, | 211 | scheduledDNDEnabled: settingsData.scheduledDNDEnabled, |
207 | scheduledDNDStart: settingsData.scheduledDNDStart, | 212 | scheduledDNDStart: settingsData.scheduledDNDStart, |
@@ -365,6 +370,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
365 | default: '', | 370 | default: '', |
366 | type: 'password', | 371 | type: 'password', |
367 | }, | 372 | }, |
373 | useTouchIdToUnlock: { | ||
374 | label: intl.formatMessage(messages.useTouchIdToUnlock), | ||
375 | value: settings.all.app.useTouchIdToUnlock, | ||
376 | default: DEFAULT_APP_SETTINGS.useTouchIdToUnlock, | ||
377 | }, | ||
368 | inactivityLock: { | 378 | inactivityLock: { |
369 | label: intl.formatMessage(messages.inactivityLock), | 379 | label: intl.formatMessage(messages.inactivityLock), |
370 | value: settings.all.app.inactivityLock, | 380 | value: settings.all.app.inactivityLock, |