Compare commits

...

5 Commits

Author SHA1 Message Date
Lisa Hillebrand cb33d93f8e 623 Remove common translation file 2022-11-25 20:27:08 +01:00
Lisa Hillebrand b4f711e4db 623 Rename password component 2022-11-25 20:27:08 +01:00
Lisa Hillebrand 1d5737d8a9 623 Use translation library in password section 2022-11-25 20:27:08 +01:00
Lisa Hillebrand edc6f350c5 623 Add common.json for shared translation strings 2022-11-25 20:27:08 +01:00
Lisa Hillebrand d30b7db3fb 623 Remove unused stats labels 2022-11-25 20:27:08 +01:00
5 changed files with 51 additions and 50 deletions
@@ -10,26 +10,34 @@ import Header from './header'
import { saveEncryptionFlag } from '../local-storage'
import { deleteDbAndOpenNew, openDb } from '../db'
import { passwordPrompt as labels, shared } from '../i18n/en/labels'
import { Containers, Spacing } from '../styles'
const cancelButton = { text: shared.cancel, style: 'cancel' }
import { useTranslation } from 'react-i18next'
const PasswordPrompt = ({ enableShowApp }) => {
const [password, setPassword] = useState(null)
const isPasswordEntered = Boolean(password)
const { t } = useTranslation(null, { keyPrefix: 'password' })
const cancelButton = {
text: t('forgotPasswordDialog.cancel'),
style: 'cancel',
}
const unlockApp = async () => {
const hash = new SHA512().hex(password)
const connected = await openDb(hash)
if (!connected) {
Alert.alert(shared.incorrectPassword, shared.incorrectPasswordMessage, [
{
text: shared.tryAgain,
onPress: () => setPassword(null),
},
])
Alert.alert(
t('incorrectPasswordDialog.incorrectPassword'),
t('incorrectPasswordDialog.incorrectPasswordMessage'),
[
{
text: t('incorrectPasswordDialog.tryAgain'),
onPress: () => setPassword(null),
},
]
)
return
}
enableShowApp()
@@ -42,19 +50,22 @@ const PasswordPrompt = ({ enableShowApp }) => {
}
const onDeleteData = () => {
Alert.alert(labels.areYouSureTitle, labels.areYouSure, [
Alert.alert(t('confirmationDialog.title'), t('confirmationDialog.text'), [
cancelButton,
{
text: labels.reallyDeleteData,
text: t('confirmationDialog.confirm'),
onPress: onDeleteDataConfirmation,
},
])
}
const onConfirmDeletion = async () => {
Alert.alert(labels.deleteDatabaseTitle, labels.deleteDatabaseExplainer, [
Alert.alert(t('forgotPassword'), t('forgotPasswordDialog.text'), [
cancelButton,
{ text: labels.deleteData, onPress: onDeleteData },
{
text: t('forgotPasswordDialog.confirm'),
onPress: onDeleteData,
},
])
}
@@ -65,17 +76,13 @@ const PasswordPrompt = ({ enableShowApp }) => {
<KeyboardAvoidingView behavior="padding" keyboardVerticalOffset={150}>
<AppTextInput
onChangeText={setPassword}
secureTextEntry={true}
placeholder={labels.enterPassword}
secureTextEntry
placeholder={t('enterPassword')}
/>
<View style={styles.containerButtons}>
<Button onPress={onConfirmDeletion}>{labels.forgotPassword}</Button>
<Button
disabled={!isPasswordEntered}
isCTA={isPasswordEntered}
onPress={unlockApp}
>
{labels.title}
<Button onPress={onConfirmDeletion}>{t('forgotPassword')}</Button>
<Button disabled={!password} isCTA={!!password} onPress={unlockApp}>
{t('unlockApp')}
</Button>
</View>
</KeyboardAvoidingView>
+1 -1
View File
@@ -7,7 +7,7 @@ import App from './app'
import AppLoadingView from './common/app-loading'
import AppStatusBar from './common/app-status-bar'
import AcceptLicense from './AcceptLicense'
import PasswordPrompt from './password-prompt'
import PasswordPrompt from './PasswordPrompt'
export default function AppWrapper() {
const [isLoading, setIsLoading] = useState(true)
-1
View File
@@ -1 +0,0 @@
{}
+20
View File
@@ -132,6 +132,26 @@
"title": "Settings"
}
},
"password": {
"confirmationDialog": {
"confirm": "Yes, I am sure",
"text": "Are you absolutely sure you want to permanently delete all your data?",
"title": "Are you sure?"
},
"enterPassword": "Enter password here",
"forgotPassword": "Forgot your password?",
"forgotPasswordDialog": {
"cancel": "Cancel",
"confirm": "Yes, delete all my data",
"text": "If you've forgotten your password, unfortunately, there is nothing we can do to recover your data, because it is encrypted with the password only you know. You can, however, delete all your encrypted data and start fresh. Once all data has been erased, you can set a new password in the settings, if you like."
},
"incorrectPasswordDialog": {
"incorrectPassword": "Password incorrect",
"incorrectPasswordMessage": "That password is incorrect.",
"tryAgain": "Try again"
},
"unlockApp": "Unlock app"
},
"stats": {
"noData": "At least one completed cycle is needed to display stats.",
"intro": "Basic statistics about the length of your cycles.",
-25
View File
@@ -26,17 +26,6 @@ export const shared = {
learnMore: 'Learn more',
}
export const stats = {
cycleLengthExplainer: 'Basic statistics about the length of your cycles.',
emptyStats: 'At least one completed cycle is needed to display stats.',
daysLabel: 'days',
basisOfStatsEnd: 'completed\ncycles',
averageLabel: 'Average cycle',
minLabel: `Shortest`,
maxLabel: `Longest`,
stdLabel: `Standard\ndeviation`,
}
export const bleedingPrediction = {
predictionInFuture: (startDays, endDays) =>
`Your next period is likely to start in ${startDays} to ${endDays} days.`,
@@ -49,20 +38,6 @@ export const bleedingPrediction = {
`Based on your documented data, your period was likely to start between ${startDate} and ${endDate}.`,
}
export const passwordPrompt = {
title: 'Unlock app',
enterPassword: 'Enter password here',
deleteDatabaseExplainer:
"If you've forgotten your password, unfortunately, there is nothing we can do to recover your data, because it is encrypted with the password only you know. You can, however, delete all your encrypted data and start fresh. Once all data has been erased, you can set a new password in the settings, if you like.",
forgotPassword: 'Forgot your password?',
deleteDatabaseTitle: 'Forgot your password?',
deleteData: 'Yes, delete all my data',
areYouSureTitle: 'Are you sure?',
areYouSure:
'Are you absolutely sure you want to permanently delete all your data?',
reallyDeleteData: 'Yes, I am sure',
}
export const fertilityStatus = {
fertile: 'fertile',
infertile: 'infertile',