From 6422467298f565efa4d09afb5cc7a98b850a18c0 Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Mon, 4 Nov 2024 21:09:56 -0300 Subject: [PATCH 01/10] chore: updated Line Height and added required on FormTextInput --- app/containers/TextInput/FormTextInput.tsx | 15 +++++++++++++-- app/i18n/locales/ar.json | 1 + app/i18n/locales/bn-IN.json | 1 + app/i18n/locales/cs.json | 1 + app/i18n/locales/de.json | 1 + app/i18n/locales/en.json | 1 + app/i18n/locales/es.json | 1 + app/i18n/locales/fi.json | 1 + app/i18n/locales/fr.json | 1 + app/i18n/locales/hi-IN.json | 1 + app/i18n/locales/hu.json | 1 + app/i18n/locales/it.json | 1 + app/i18n/locales/ja.json | 1 + app/i18n/locales/nl.json | 1 + app/i18n/locales/pt-BR.json | 1 + app/i18n/locales/pt-PT.json | 1 + app/i18n/locales/ru.json | 1 + app/i18n/locales/sl-SI.json | 1 + app/i18n/locales/sv.json | 1 + app/i18n/locales/ta-IN.json | 1 + app/i18n/locales/te-IN.json | 1 + app/i18n/locales/tr.json | 1 + app/i18n/locales/zh-CN.json | 1 + app/i18n/locales/zh-TW.json | 1 + app/views/NewServerView/ServerInput/index.tsx | 5 ++--- app/views/NewServerView/index.tsx | 14 +++++++++++--- 26 files changed, 49 insertions(+), 8 deletions(-) diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx index 1fe339060d..f2f03f4e98 100644 --- a/app/containers/TextInput/FormTextInput.tsx +++ b/app/containers/TextInput/FormTextInput.tsx @@ -3,11 +3,13 @@ import React, { useState } from 'react'; import { StyleProp, StyleSheet, Text, TextInput as RNTextInput, TextInputProps, TextStyle, View, ViewStyle } from 'react-native'; import Touchable from 'react-native-platform-touchable'; +import i18n from '../../i18n'; import { useTheme } from '../../theme'; import sharedStyles from '../../views/Styles'; import ActivityIndicator from '../ActivityIndicator'; import { CustomIcon, TIconsName } from '../CustomIcon'; import { TextInput } from './TextInput'; +import { themes } from '../../lib/constants'; const styles = StyleSheet.create({ error: { @@ -23,6 +25,10 @@ const styles = StyleSheet.create({ lineHeight: 22, ...sharedStyles.textMedium }, + required: { + fontSize: 14, + ...sharedStyles.textMedium + }, input: { ...sharedStyles.textRegular, height: 48, @@ -55,6 +61,7 @@ const styles = StyleSheet.create({ export interface IRCTextInputProps extends TextInputProps { label?: string; + required?: boolean; error?: any; loading?: boolean; containerStyle?: StyleProp; @@ -69,6 +76,7 @@ export interface IRCTextInputProps extends TextInputProps { export const FormTextInput = ({ label, + required, error, loading, containerStyle, @@ -85,7 +93,7 @@ export const FormTextInput = ({ placeholder, ...inputProps }: IRCTextInputProps): React.ReactElement => { - const { colors } = useTheme(); + const { colors, theme } = useTheme(); const [showPassword, setShowPassword] = useState(false); const showClearInput = onClearInput && value && value.length > 0; const Input = bottomSheet ? BottomSheetTextInput : TextInput; @@ -93,7 +101,10 @@ export const FormTextInput = ({ {label ? ( - {label} + {label}{' '} + {required && ( + {`(${i18n.t('Required')})`} + )} ) : null} diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json index 00e53b2f7b..3625b984c5 100644 --- a/app/i18n/locales/ar.json +++ b/app/i18n/locales/ar.json @@ -349,6 +349,7 @@ "reply": "رد", "Reply_in_Thread": "الرد في موضوع", "Report": "بلاغ", + "Required": "مطلوب", "Resend": "أعد الإرسال", "RESET": "إعادة", "Reset_password": "إعادة تعيين كلمة المرور", diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json index 68f1977fbe..b815c02902 100644 --- a/app/i18n/locales/bn-IN.json +++ b/app/i18n/locales/bn-IN.json @@ -536,6 +536,7 @@ "Reply_in_direct_message": "সরাসরি বার্তা দিন", "Reply_in_Thread": "থ্রেডে উত্তর দিন", "Report": "রিপোর্ট", + "Required": "প্রয়োজনীয়", "Resend": "পুনরায় পাঠান", "RESET": "রিসেট", "Reset_password": "পাসওয়ার্ড রিসেট করুন", diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json index f46e295968..ab35fc5b75 100644 --- a/app/i18n/locales/cs.json +++ b/app/i18n/locales/cs.json @@ -585,6 +585,7 @@ "Report": "Zpráva", "Report_sent_successfully": "Hlášení bylo úspěšně odesláno", "Report_user": "Nahlásit uživatele", + "Required": "Požadováno", "Resend": "Přeposlat", "Resend_email": "Přeposlat email", "RESET": "RESETOVAT", diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json index 81d03d2d10..d943e376fc 100644 --- a/app/i18n/locales/de.json +++ b/app/i18n/locales/de.json @@ -524,6 +524,7 @@ "Reply_in_direct_message": "Mit einer Direktnachricht antworten", "Reply_in_Thread": "Im Thread antworten", "Report": "Melden", + "Required": "Erforderlich", "Resend": "Erneut senden", "RESET": "ZURÜCKSETZEN", "Reset_password": "Passwort zurücksetzen", diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index 8d3fb574cc..4f30bd4728 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -605,6 +605,7 @@ "Report": "Report", "Report_sent_successfully": "Report sent successfully", "Report_user": "Report user", + "Required": "Required", "Resend": "Resend", "Resend_email": "Resend email", "RESET": "RESET", diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json index a79d291c95..21e22c35df 100644 --- a/app/i18n/locales/es.json +++ b/app/i18n/locales/es.json @@ -209,6 +209,7 @@ "Reply": "Respuesta", "reply": "respuesta", "Report": "Informe", + "Required": "Requerido", "Resend": "Reenviar", "RESET": "RESET", "Reset_password": "Resetear contraseña", diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json index 00b9072435..52deeacab2 100644 --- a/app/i18n/locales/fi.json +++ b/app/i18n/locales/fi.json @@ -499,6 +499,7 @@ "Reply_in_direct_message": "Vastaa suoralla viestillä", "Reply_in_Thread": "Vastaa viestiketjussa", "Report": "Ilmoita", + "Required": "Vaadittu", "Resend": "Lähetä uudelleen", "RESET": "NOLLAA", "Reset_password": "Nollaa salasana", diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json index 81e9c9982e..4f082a34a7 100644 --- a/app/i18n/locales/fr.json +++ b/app/i18n/locales/fr.json @@ -453,6 +453,7 @@ "reply": "répondre", "Reply_in_Thread": "Répondre dans le fil", "Report": "Signaler", + "Required": "Requis", "Resend": "Renvoyer", "RESET": "RÉINITIALISER", "Reset_password": "Réinitialiser le mot de passe", diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json index 2cb539c28d..d7b53902fc 100644 --- a/app/i18n/locales/hi-IN.json +++ b/app/i18n/locales/hi-IN.json @@ -536,6 +536,7 @@ "Reply_in_direct_message": "सीधे संदेश में जवाब दें", "Reply_in_Thread": "थ्रेड में जवाब दें", "Report": "रिपोर्ट", + "Required": "आवश्यक", "Resend": "पुनः भेजें", "RESET": "रीसेट", "Reset_password": "पासवर्ड रीसेट करें", diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json index dbd26db867..8d609082c7 100644 --- a/app/i18n/locales/hu.json +++ b/app/i18n/locales/hu.json @@ -537,6 +537,7 @@ "Reply_in_direct_message": "Válasz közvetlen üzenetben", "Reply_in_Thread": "Válasz a témában", "Report": "Jelentés", + "Required": "Kötelező", "Resend": "Újraküldés", "RESET": "Visszaállítás", "Reset_password": "Jelszó visszaállítása", diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json index 01844e841d..0475af172a 100644 --- a/app/i18n/locales/it.json +++ b/app/i18n/locales/it.json @@ -384,6 +384,7 @@ "reply": "risposta", "Reply_in_Thread": "Rispondi nella discussione", "Report": "Segnala", + "Required": "Richiesto", "Resend": "Invia di nuovo", "RESET": "RIPRISTINA", "Reset_password": "Ripristina password", diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json index 12361ac312..bf76b2f58d 100644 --- a/app/i18n/locales/ja.json +++ b/app/i18n/locales/ja.json @@ -299,6 +299,7 @@ "Reply": "返信", "reply": "返信", "Report": "報告", + "Required": "必須", "Resend": "再送信", "RESET": "リセット", "Reset_password": "パスワードをリセット", diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json index 38e676b42c..09f540609b 100644 --- a/app/i18n/locales/nl.json +++ b/app/i18n/locales/nl.json @@ -453,6 +453,7 @@ "reply": "antwoord", "Reply_in_Thread": "Reageer in discussie", "Report": "Rapporteren", + "Required": "Vereist", "Resend": "Opnieuw verzenden", "RESET": "RESET", "Reset_password": "Wachtwoord resetten", diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index 83bd7664ed..5c92d52def 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -592,6 +592,7 @@ "Report": "Reportar", "Report_sent_successfully": "Reporte enviado com sucesso", "Report_user": "Reportar usuário", + "Required": "Obrigatório", "Resend": "Reenviar", "Resend_email": "Reenviar e-mail", "RESET": "RESETAR", diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json index 6b379b22ce..af4b18986c 100644 --- a/app/i18n/locales/pt-PT.json +++ b/app/i18n/locales/pt-PT.json @@ -309,6 +309,7 @@ "Register": "Registar", "Remove_someone_from_room": "Remover alguém da sala", "Reply": "Responder", + "Required": "Obrigatório", "Resend": "Reenviar", "RESET": "REPOR", "Reset_password": "Repor palavra-passe", diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json index 545e4f4b90..5cafea805d 100644 --- a/app/i18n/locales/ru.json +++ b/app/i18n/locales/ru.json @@ -486,6 +486,7 @@ "Reply_in_direct_message": "Ответить в личном сообщении", "Reply_in_Thread": "Ответить в Треде", "Report": "Жалоба", + "Required": "Обязательно", "Resend": "Отправить повторно", "RESET": "СБРОС", "Reset_password": "Сброс пароля", diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json index 1765eb3f44..3757ed108a 100644 --- a/app/i18n/locales/sl-SI.json +++ b/app/i18n/locales/sl-SI.json @@ -465,6 +465,7 @@ "reply": "odgovor", "Reply_in_Thread": "Odgovor v nit", "Report": "Poročilo", + "Required": "Obvezno", "Resend": "Ponovno poslati", "RESET": "PONASTAVITI", "Reset_password": "Ponastavitev gesla", diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json index 56ddfcf985..0291ed1409 100644 --- a/app/i18n/locales/sv.json +++ b/app/i18n/locales/sv.json @@ -498,6 +498,7 @@ "Reply_in_direct_message": "Svara med direktmeddelande", "Reply_in_Thread": "Svara i tråden", "Report": "Anmäl", + "Required": "Obligatorisk", "Resend": "Skicka igen", "RESET": "ÅTERSTÄLL", "Reset_password": "Återställ lösenordet", diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json index 9b1a29040f..82da8421b5 100644 --- a/app/i18n/locales/ta-IN.json +++ b/app/i18n/locales/ta-IN.json @@ -536,6 +536,7 @@ "Reply_in_direct_message": "நேரடியாக பதிலளிக்க", "Reply_in_Thread": "தொடரில் பதில்", "Report": "அறிவித்தல்", + "Required": "தேவையானது", "Resend": "மீண்டும் அனுப்பு", "RESET": "மீளமை", "Reset_password": "கடவுச்சொல் மீளமைக்க", diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json index d0f065d623..52a4d61725 100644 --- a/app/i18n/locales/te-IN.json +++ b/app/i18n/locales/te-IN.json @@ -536,6 +536,7 @@ "Reply_in_direct_message": "నిర్దేశ సందేశంలో ప్రతిస్థానించండి", "Reply_in_Thread": "థ్రెడ్లో సమాధానం", "Report": "నివేదించండి", + "Required": "అవసరమైనది", "Resend": "మళ్ళీ పంపించు", "RESET": "రీసెట్", "Reset_password": "పాస్‌వర్డ్ను రీసెట్ చేయండి", diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json index 2bafd73327..573d1116c2 100644 --- a/app/i18n/locales/tr.json +++ b/app/i18n/locales/tr.json @@ -367,6 +367,7 @@ "reply": "yanıtla", "Reply_in_Thread": "Konu içinde cevapla", "Report": "Bildir", + "Required": "Gerekli", "Resend": "Yeniden yolla", "RESET": "SIFIRLA", "Reset_password": "Şifre sıfırla", diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json index 23902c7f78..cee8422496 100644 --- a/app/i18n/locales/zh-CN.json +++ b/app/i18n/locales/zh-CN.json @@ -348,6 +348,7 @@ "reply": "回复", "Reply_in_Thread": "讨论串回覆", "Report": "举报", + "Required": "必填", "Resend": "重新发送", "RESET": "重置", "Reset_password": "重置密码", diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json index 21d7425db9..113547f1e1 100644 --- a/app/i18n/locales/zh-TW.json +++ b/app/i18n/locales/zh-TW.json @@ -366,6 +366,7 @@ "reply": "回覆", "Reply_in_Thread": "討論串回覆", "Report": "檢舉", + "Required": "必填", "Resend": "重新發送", "RESET": "重置", "Reset_password": "重置密碼", diff --git a/app/views/NewServerView/ServerInput/index.tsx b/app/views/NewServerView/ServerInput/index.tsx index cd5e9acf57..05c0767b99 100644 --- a/app/views/NewServerView/ServerInput/index.tsx +++ b/app/views/NewServerView/ServerInput/index.tsx @@ -52,7 +52,6 @@ const ServerInput = ({ setFocused(true)} onBlur={() => setFocused(false)} /> {focused && serversHistory?.length ? ( + style={[styles.serverHistory, { backgroundColor: themes[theme].surfaceRoom, borderColor: themes[theme].strokeLight }]}> ( diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx index e270517c12..7e15de48dc 100644 --- a/app/views/NewServerView/index.tsx +++ b/app/views/NewServerView/index.tsx @@ -36,10 +36,11 @@ const styles = StyleSheet.create({ }, buttonPrompt: { ...sharedStyles.textRegular, - textAlign: 'center' + textAlign: 'center', + lineHeight: 20 }, connectButton: { - marginTop: 20 + marginTop: 36 } }); @@ -303,7 +304,14 @@ class NewServerView extends React.Component - + {I18n.t('Add_server')} Date: Tue, 5 Nov 2024 14:03:06 -0300 Subject: [PATCH 02/10] minor changes --- app/containers/TextInput/FormTextInput.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx index f2f03f4e98..a08b056f95 100644 --- a/app/containers/TextInput/FormTextInput.tsx +++ b/app/containers/TextInput/FormTextInput.tsx @@ -100,7 +100,9 @@ export const FormTextInput = ({ return ( {label ? ( - + {label}{' '} {required && ( {`(${i18n.t('Required')})`} From e2136b5f3b3556b3a1988130e28f6e3f33f76884 Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Thu, 14 Nov 2024 12:57:53 -0300 Subject: [PATCH 03/10] chore: updated input accessibility label --- app/containers/TextInput/FormTextInput.tsx | 3 ++- app/i18n/locales/ar.json | 1 + app/i18n/locales/bn-IN.json | 1 + app/i18n/locales/cs.json | 1 + app/i18n/locales/de.json | 1 + app/i18n/locales/en.json | 1 + app/i18n/locales/es.json | 1 + app/i18n/locales/fi.json | 1 + app/i18n/locales/fr.json | 1 + app/i18n/locales/hi-IN.json | 1 + app/i18n/locales/hu.json | 1 + app/i18n/locales/it.json | 1 + app/i18n/locales/ja.json | 1 + app/i18n/locales/nl.json | 1 + app/i18n/locales/pt-BR.json | 1 + app/i18n/locales/pt-PT.json | 1 + app/i18n/locales/ru.json | 1 + app/i18n/locales/sl-SI.json | 1 + app/i18n/locales/sv.json | 1 + app/i18n/locales/ta-IN.json | 1 + app/i18n/locales/te-IN.json | 1 + app/i18n/locales/tr.json | 1 + app/i18n/locales/zh-CN.json | 1 + app/i18n/locales/zh-TW.json | 1 + app/views/NewServerView/ServerInput/index.tsx | 1 + 25 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx index a08b056f95..0eba268b14 100644 --- a/app/containers/TextInput/FormTextInput.tsx +++ b/app/containers/TextInput/FormTextInput.tsx @@ -91,6 +91,7 @@ export const FormTextInput = ({ secureTextEntry, bottomSheet, placeholder, + accessibilityLabel, ...inputProps }: IRCTextInputProps): React.ReactElement => { const { colors, theme } = useTheme(); @@ -134,7 +135,7 @@ export const FormTextInput = ({ underlineColorAndroid='transparent' secureTextEntry={secureTextEntry && !showPassword} testID={testID} - accessibilityLabel={placeholder} + accessibilityLabel={`${accessibilityLabel ?? placeholder}${required ? ' - ' + i18n.t('Required') : ''}`} placeholder={placeholder} value={value} placeholderTextColor={colors.fontAnnotation} diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json index 3625b984c5..131c1f854f 100644 --- a/app/i18n/locales/ar.json +++ b/app/i18n/locales/ar.json @@ -134,6 +134,7 @@ "Encryption_error_desc": "تعذر قراءة مفتاح التشفير أثناء الاستيراد", "Encryption_error_title": "كلمة المرور المشفرة خاطئة", "End_to_end_encrypted_room": "غرفة مشفرة بين الطرفيات", + "Enter": "أدخل", "Enter_E2EE_Password": "أدخل كلمة المرور E2EE", "Enter_E2EE_Password_description": "للوصول إلى قنواتك المشفرة والرسائل المباشرة، أدخل كلمة المرور الخاصة بالتشفير. هذا لا يتم تخزينه على الخادم، لذا ستحتاج إلى استخدامه على كل جهاز.", "Error_uploading": "خطأ في الرفع", diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json index b815c02902..125623777c 100644 --- a/app/i18n/locales/bn-IN.json +++ b/app/i18n/locales/bn-IN.json @@ -237,6 +237,7 @@ "Encryption_error_desc": "এনক্রিপশন কীটি আমদানি করার জন্য আপনার এনক্রিপশন কীটি ডিকোড করা হতে সম্ভব হয়নি।", "Encryption_error_title": "আপনার এনক্রিপশন পাসওয়ার্ড ভুল মনে হচ্ছে", "End_to_end_encrypted_room": "শেষ হতে শেষ এনক্রিপ্টেড রুম", + "Enter": "প্রবেশ করুন", "Enter_E2EE_Password": "E2EE পাসওয়ার্ড দিন", "Enter_E2EE_Password_description": "আপনার এনক্রিপ্টেড চ্যানেলগুলি এবং সরাসরি বার্তাগুলি অ্যাক্সেস করতে, আপনার এনক্রিপশন পাসওয়ার্ড লিখুন। এটি সার্ভারে সংরক্ষিত হয় না, তাই আপনাকে প্রতিটি ডিভাইসে এটি ব্যবহার করতে হবে।", "Error_Download_file": "ফাইল ডাউনলোড করতে ত্রুটি", diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json index ab35fc5b75..3de00b317b 100644 --- a/app/i18n/locales/cs.json +++ b/app/i18n/locales/cs.json @@ -253,6 +253,7 @@ "Encryption_error_desc": "Nebylo možné dekódovat váš šifrovací klíč pro import.", "Encryption_error_title": "Vaše heslo pro šifrování se zdá být špatné", "End_to_end_encrypted_room": "End to end šifrovaná místnost", + "Enter": "Enter", "Enter_the_code": "Zadejte kód, který jsme vám právě poslali e-mailem.", "Enter_Your_E2E_Password": "Zadejte heslo E2E", "Enter_Your_Encryption_Password_desc1": "To vám umožní přístup k vašim zašifrovaným soukromým skupinám a přímým zprávám.", diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json index d943e376fc..8a04eba112 100644 --- a/app/i18n/locales/de.json +++ b/app/i18n/locales/de.json @@ -231,6 +231,7 @@ "Encryption_error_desc": "Es war nicht möglich, Ihren Verschlüsselungs-Key zu importieren.", "Encryption_error_title": "Ihr Verschlüsselungs-Passwort scheint falsch zu sein", "End_to_end_encrypted_room": "Ende-zu-Ende-verschlüsselter Raum", + "Enter": "Eingeben", "Enter_E2EE_Password": "E2EE-Passwort eingeben", "Enter_E2EE_Password_description": "Um auf Ihre verschlüsselten Kanäle und Direktnachrichten zuzugreifen, geben Sie Ihr Verschlüsselungspasswort ein. Dies wird nicht auf dem Server gespeichert, daher müssen Sie es auf jedem Gerät verwenden.", "Error_Download_file": "Fehler beim Herunterladen der Datei", diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index 4f30bd4728..ce5e82cc79 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -270,6 +270,7 @@ "Encryption_error_desc": "It wasn't possible to decode your encryption key to be imported.", "Encryption_error_title": "Your encryption password seems wrong", "End_to_end_encrypted_room": "End to end encrypted room", + "Enter": "Enter", "Enter_E2EE_Password": "Enter E2EE password", "Enter_E2EE_Password_description": "To access your encrypted channels and direct messages, enter your encryption password. This is not stored on the server, so you’ll need to use it on every device.", "Enter_the_code": "Enter the code we just emailed you.", diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json index 21e22c35df..7d72886ce4 100644 --- a/app/i18n/locales/es.json +++ b/app/i18n/locales/es.json @@ -90,6 +90,7 @@ "Edit": "Editar", "Email": "E-mail", "Enable_Auto_Translate": "Permitir Auto-Translate", + "Enter": "Introducir", "Error_uploading": "Error en la subida", "error-action-not-allowed": "{{action}} no permitida", "error-avatar-invalid-url": "URL de avatar inválida: {{url}}", diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json index 52deeacab2..689b8e8e97 100644 --- a/app/i18n/locales/fi.json +++ b/app/i18n/locales/fi.json @@ -216,6 +216,7 @@ "Encryption_error_desc": "Tuotavan salausavaimesi salausta ei voitu purkaa.", "Encryption_error_title": "Salauksen salasanasi näyttää väärältä", "End_to_end_encrypted_room": "Täysin salattu huone", + "Enter": "Syötä", "Enter_E2EE_Password": "Anna E2EE-salasana", "Enter_E2EE_Password_description": "Päästäksesi käsiksi salattuihin kanaviisi ja suoriin viesteihisi, syötä salaus salasanasi. Tätä ei tallenneta palvelimelle, joten sinun on käytettävä sitä jokaisella laitteella.", "Error_Download_file": "Virhe ladattaessa tiedostoa", diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json index 4f082a34a7..df54b01f12 100644 --- a/app/i18n/locales/fr.json +++ b/app/i18n/locales/fr.json @@ -182,6 +182,7 @@ "Encryption_error_desc": "Il n'a pas été possible de décoder votre clé de cryptage pour être importé.", "Encryption_error_title": "Votre mot de passe de cryptage semble erroné", "End_to_end_encrypted_room": "Salon crypté de bout en bout", + "Enter": "Saisir", "Enter_E2EE_Password": "Entrez le mot de passe E2EE", "Enter_E2EE_Password_description": "Pour accéder à vos canaux cryptés et à vos messages directs, entrez votre mot de passe de cryptage. Celui-ci n'est pas stocké sur le serveur, vous devrez donc l'utiliser sur chaque appareil.", "Error_Download_file": "Erreur lors du téléchargement du fichier", diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json index d7b53902fc..6836780b00 100644 --- a/app/i18n/locales/hi-IN.json +++ b/app/i18n/locales/hi-IN.json @@ -237,6 +237,7 @@ "Encryption_error_desc": "आपके एन्क्रिप्शन कुंजी को आयात करने के लिए इसे डीकोड करना संभाव नहीं था।", "Encryption_error_title": "आपका एन्क्रिप्शन पासवर्ड गलत लगता है", "End_to_end_encrypted_room": "इंड-टू-इंड एन्क्रिप्टेड कमरा", + "Enter": "दर्ज करें", "Enter_E2EE_Password": "E2EE पासवर्ड डालें", "Enter_E2EE_Password_description": "अपने एन्क्रिप्टेड चैनल्स और डायरेक्ट मैसेजेस तक पहुँचने के लिए, अपना एन्क्रिप्शन पासवर्ड दर्ज करें। यह सर्वर पर संग्रहीत नहीं होता है, इसलिए आपको इसे हर डिवाइस पर उपयोग करना होगा।", "Error_Download_file": "फ़ाइल डाउनलोड करते समय त्रुटि", diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json index 8d609082c7..d234c99790 100644 --- a/app/i18n/locales/hu.json +++ b/app/i18n/locales/hu.json @@ -237,6 +237,7 @@ "Encryption_error_desc": "Nem sikerült dekódolni az importálandó titkosítási kulcsot.", "Encryption_error_title": "A titkosítási jelszó rossznak tűnik", "End_to_end_encrypted_room": "Végponttól végpontig titkosított szoba", + "Enter": "Beírni", "Enter_E2EE_Password": "Adja meg az E2EE jelszót", "Enter_E2EE_Password_description": "Az titkosított csatornákhoz és közvetlen üzenetekhez való hozzáféréshez írja be a titkosítási jelszavát. Ez nincs tárolva a szerveren, így minden eszközön használnia kell.", "Error_Download_file": "Hiba a fájl letöltése közben", diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json index 0475af172a..2e80947712 100644 --- a/app/i18n/locales/it.json +++ b/app/i18n/locales/it.json @@ -158,6 +158,7 @@ "Encryption_error_desc": "Non è stato possibile importare la tua chiave di cifratura.", "Encryption_error_title": "La tua password di cifratura sembra errata", "End_to_end_encrypted_room": "Stanza crittografata end to end", + "Enter": "Inserire", "Enter_E2EE_Password": "Inserisci la password E2EE", "Enter_E2EE_Password_description": "Per accedere ai tuoi canali criptati e ai messaggi diretti, inserisci la tua password di crittografia. Questa non viene memorizzata sul server, quindi dovrai usarla su ogni dispositivo.", "Error_uploading": "Errore nel caricamento di", diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json index bf76b2f58d..441701bdbb 100644 --- a/app/i18n/locales/ja.json +++ b/app/i18n/locales/ja.json @@ -133,6 +133,7 @@ "Encryption_error_desc": "暗号化キーをデコードしてインポートできませんでした。", "Encryption_error_title": "暗号化パスワードが間違っているようです", "End_to_end_encrypted_room": "暗号化されたエンドツーエンドのルーム", + "Enter": "入力", "Enter_E2EE_Password": "E2EEパスワードを入力", "Enter_E2EE_Password_description": "暗号化されたチャンネルとダイレクトメッセージにアクセスするには、暗号化パスワードを入力してください。これはサーバーに保存されないため、すべてのデバイスで使用する必要があります。", "Error_uploading": "アップロードエラー", diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json index 09f540609b..ccb613b92b 100644 --- a/app/i18n/locales/nl.json +++ b/app/i18n/locales/nl.json @@ -182,6 +182,7 @@ "Encryption_error_desc": "Het was niet mogelijk om uw coderingssleutel te decoderen om te worden geïmporteerd.", "Encryption_error_title": "Jouw coderingswachtwoord lijkt verkeerd", "End_to_end_encrypted_room": "End-to-end versleutelde kamer", + "Enter": "Invoeren", "Enter_E2EE_Password": "Voer E2EE-wachtwoord in", "Enter_E2EE_Password_description": "Om toegang te krijgen tot uw versleutelde kanalen en directe berichten, voert u uw versleutelingswachtwoord in. Dit wordt niet op de server opgeslagen, dus u moet het op elk apparaat gebruiken.", "Error_Download_file": "Fout tijdens het downloaden van bestand", diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index 5c92d52def..5c8ff99bb6 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -264,6 +264,7 @@ "Encryption_error_desc": "Não foi possível decodificar sua chave E2E para ser importada.", "Encryption_error_title": "Sua senha E2E parece errada", "End_to_end_encrypted_room": "Sala criptografada de ponta a ponta", + "Enter": "Inserir", "Enter_E2EE_Password": "Digite a senha E2EE", "Enter_E2EE_Password_description": "Para acessar seus canais criptografados e mensagens diretas, insira sua senha de criptografia. Isso não é armazenado no servidor, então você precisará usá-la em cada dispositivo.", "Enter_the_code": "Insira o código que acabamos de enviar por e-mail.", diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json index af4b18986c..85f4beba88 100644 --- a/app/i18n/locales/pt-PT.json +++ b/app/i18n/locales/pt-PT.json @@ -129,6 +129,7 @@ "Encryption_error_desc": "Não foi possível descodificar a sua chave de encriptação para ser importada.", "Encryption_error_title": "A sua senha de encriptação parece errada", "End_to_end_encrypted_room": "Sala encriptada de ponta a ponta", + "Enter": "Introduzir", "Enter_E2EE_Password": "Digite a senha E2EE", "Enter_E2EE_Password_description": "Para aceder aos seus canais encriptados e mensagens diretas, introduza a sua palavra-passe de encriptação. Isto não é armazenado no servidor, pelo que terá de o utilizar em cada dispositivo.", "Error_uploading": "Erro ao fazer o envio", diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json index 5cafea805d..c4137d254b 100644 --- a/app/i18n/locales/ru.json +++ b/app/i18n/locales/ru.json @@ -207,6 +207,7 @@ "Encryption_error_desc": "Невозможно расшифровать ваш ключ шифрования, чтобы импортировать его", "Encryption_error_title": "Введен не верный пароль шифрования", "End_to_end_encrypted_room": "Чат со сквозным шифрованием", + "Enter": "Ввод", "Enter_E2EE_Password": "Введите E2EE Пароль", "Enter_E2EE_Password_description": "Чтобы получить доступ к вашим зашифрованным каналам и прямым сообщениям, введите свой пароль шифрования. Он не хранится на сервере, поэтому вам нужно будет использовать его на каждом устройстве.", "Error_Download_file": "Ошибка при скачивании файла", diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json index 3757ed108a..15246f2314 100644 --- a/app/i18n/locales/sl-SI.json +++ b/app/i18n/locales/sl-SI.json @@ -192,6 +192,7 @@ "Encryption_error_desc": "Ni bilo mogoče dekodirati vašega šifrirnega ključa, ki bi ga bilo mogoče uvoziti.", "Encryption_error_title": "Vaše šifrirno geslo se zdi napačno", "End_to_end_encrypted_room": "Obojestransko (E2E) šifrirane sobe", + "Enter": "Vnesite", "Enter_E2EE_Password": "Vnesite geslo E2EE", "Enter_E2EE_Password_description": "Za dostop do vaših šifriranih kanalov in neposrednih sporočil vnesite svoje šifrirno geslo. To ni shranjeno na strežniku, zato ga boste morali uporabljati na vsaki napravi.", "Error_Download_file": "Napaka med prenosom datoteke", diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json index 0291ed1409..15aee4ad97 100644 --- a/app/i18n/locales/sv.json +++ b/app/i18n/locales/sv.json @@ -216,6 +216,7 @@ "Encryption_error_desc": "Det gick inte att avkoda krypteringsnyckeln som skulle importeras.", "Encryption_error_title": "Ditt krypteringslösenord verkar vara felaktigt", "End_to_end_encrypted_room": "End-to-end-krypterat rum", + "Enter": "Ange", "Enter_E2EE_Password": "Ange E2EE-lösenord", "Enter_E2EE_Password_description": "För att komma åt dina krypterade kanaler och direkta meddelanden, ange ditt krypteringslösenord. Detta lagras inte på servern, så du måste använda det på varje enhet.", "Error_Download_file": "Fel vid nedladdning av fil", diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json index 82da8421b5..931ffe68d0 100644 --- a/app/i18n/locales/ta-IN.json +++ b/app/i18n/locales/ta-IN.json @@ -237,6 +237,7 @@ "Encryption_error_desc": "உங்கள் என்கிரிப்ஷன் கடவுச்சொல் இறக்குமதி செய்ய முடியவில்லை.", "Encryption_error_title": "உங்கள் என்கிரிப்ஷன் கடவுச்சொல் தவறாக தோனுஆகின்றது", "End_to_end_encrypted_room": "குறிபாக என்று என்கிரிப்டுக்கப்பட்ட அறை", + "Enter": "நுழைய", "Enter_E2EE_Password": "E2EE கடவுச்சொல் உள்ளிடவும்", "Enter_E2EE_Password_description": "உங்கள் என்கிரிப்ட் செய்யப்பட்ட சேனல்கள் மற்றும் நேரடி செய்திகளை அணுக, உங்கள் என்கிரிப்ஷன் கடவுச்சொல்லை உள்ளிடவும். இது சர்வரில் சேமிக்கப்படாது, எனவே நீங்கள் ஒவ்வொரு சாதனத்திலும் இதை பயன்படுத்த வேண்டும்.", "Error_Download_file": "கோப்பு பதிவிறக்கம் செய்யும் போது பிழை", diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json index 52a4d61725..e416e13eea 100644 --- a/app/i18n/locales/te-IN.json +++ b/app/i18n/locales/te-IN.json @@ -237,6 +237,7 @@ "Encryption_error_desc": "మీ ఎన్క్రిప్షన్ కీని దిగుమతి చేసుకోవడం సాధ్యమవ్వలేదు.", "Encryption_error_title": "మీ ఎన్క్రిప్షన్ పాస్‌వర్డ్ చెల్లింపుగా ఉంది", "End_to_end_encrypted_room": "ఎండ్ టు ఎండ్ ఎన్క్రిప్టెడ్ రూం", + "Enter": "పెట్టండి", "Enter_E2EE_Password": "E2EE పాస్‌వర్డ్ నమోదు చేయండి", "Enter_E2EE_Password_description": "మీ ఎన్క్రిప్టెడ్ ఛానెల్స్ మరియు డైరెక్ట్ మెసేజెస్‌ను యాక్సెస్ చేయడానికి, మీ ఎన్క్రిప్షన్ పాస్‌వర్డ్‌ను నమోదు చేయండి. ఇది సర్వర్‌లో నిల్వ చేయబడదు, కాబట్టి మీరు ప్రతి పరికరంపై దీనిని ఉపయోగించాలి.", "Error_Download_file": "ఫైల్ డౌన్‌లోడ్ చేస్తున్నప్పుడు తప్పిబాటు", diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json index 573d1116c2..a792963bba 100644 --- a/app/i18n/locales/tr.json +++ b/app/i18n/locales/tr.json @@ -147,6 +147,7 @@ "Encryption_error_desc": "İçe aktarılacak şifreleme anahtarınızın kodu çözülemedi.", "Encryption_error_title": "Şifreleme şifreniz yanlış görünüyor", "End_to_end_encrypted_room": "Uçtan uca şifreli oda", + "Enter": "Gir", "Enter_E2EE_Password": "E2EE Şifresini Girin", "Enter_E2EE_Password_description": "Şifreli kanallarınıza ve doğrudan mesajlarınıza erişmek için şifreleme şifrenizi girin. Bu, sunucuda saklanmaz, bu nedenle her cihazda kullanmanız gerekir.", "Error_uploading": "Yükleme hatası", diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json index cee8422496..f31bd971b5 100644 --- a/app/i18n/locales/zh-CN.json +++ b/app/i18n/locales/zh-CN.json @@ -143,6 +143,7 @@ "Encryption_error_desc": "无法使用汇入的加密密钥来解密", "Encryption_error_title": "您的加密密码似乎有误", "End_to_end_encrypted_room": "E2E 加密聊天室", + "Enter": "输入", "Enter_E2EE_Password": "输入 E2EE 密码", "Enter_E2EE_Password_description": "要访问您的加密频道和直接消息，请输入您的加密密码。这不会存储在服务器上，因此您需要在每个设备上使用它。", "Error_uploading": "错误上传", diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json index 113547f1e1..489050c962 100644 --- a/app/i18n/locales/zh-TW.json +++ b/app/i18n/locales/zh-TW.json @@ -149,6 +149,7 @@ "Encryption_error_desc": "無法使用匯入的加密金鑰來解密", "Encryption_error_title": "您的加密密碼似乎有誤", "End_to_end_encrypted_room": "E2E 加密聊天室", + "Enter": "輸入", "Enter_E2EE_Password": "輸入 E2EE 密碼", "Enter_E2EE_Password_description": "要存取您的加密頻道和直接訊息，請輸入您的加密密碼。這不會儲存在伺服器上，因此您需要在每個裝置上使用它。", "Error_uploading": "錯誤上傳", diff --git a/app/views/NewServerView/ServerInput/index.tsx b/app/views/NewServerView/ServerInput/index.tsx index 05c0767b99..5ec637439f 100644 --- a/app/views/NewServerView/ServerInput/index.tsx +++ b/app/views/NewServerView/ServerInput/index.tsx @@ -62,6 +62,7 @@ const ServerInput = ({ keyboardType='url' textContentType='URL' required + accessibilityLabel={`${I18n.t('Enter')} ${I18n.t('Workspace_URL')}`} onFocus={() => setFocused(true)} onBlur={() => setFocused(false)} /> From 2bc9b6221042306705bf88ad35c9f723d678d89a Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Thu, 14 Nov 2024 15:01:35 -0300 Subject: [PATCH 04/10] fix lint --- app/containers/TextInput/FormTextInput.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx index 0eba268b14..4d92d99e5d 100644 --- a/app/containers/TextInput/FormTextInput.tsx +++ b/app/containers/TextInput/FormTextInput.tsx @@ -135,7 +135,7 @@ export const FormTextInput = ({ underlineColorAndroid='transparent' secureTextEntry={secureTextEntry && !showPassword} testID={testID} - accessibilityLabel={`${accessibilityLabel ?? placeholder}${required ? ' - ' + i18n.t('Required') : ''}`} + accessibilityLabel={`${accessibilityLabel ?? placeholder}${required ? ` - ${i18n.t('Required')}` : ''}`} placeholder={placeholder} value={value} placeholderTextColor={colors.fontAnnotation} From c490ea8c379e87145b1fa8412cc2d576b46f75bc Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Thu, 14 Nov 2024 16:41:57 -0300 Subject: [PATCH 05/10] chore: removed Enter of i18n --- app/i18n/locales/ar.json | 1 - app/i18n/locales/bn-IN.json | 1 - app/i18n/locales/cs.json | 1 - app/i18n/locales/de.json | 1 - app/i18n/locales/en.json | 1 - app/i18n/locales/es.json | 1 - app/i18n/locales/fi.json | 1 - app/i18n/locales/fr.json | 1 - app/i18n/locales/hi-IN.json | 1 - app/i18n/locales/hu.json | 1 - app/i18n/locales/it.json | 1 - app/i18n/locales/ja.json | 1 - app/i18n/locales/nl.json | 1 - app/i18n/locales/pt-BR.json | 1 - app/i18n/locales/pt-PT.json | 1 - app/i18n/locales/ru.json | 1 - app/i18n/locales/sl-SI.json | 1 - app/i18n/locales/sv.json | 1 - app/i18n/locales/ta-IN.json | 1 - app/i18n/locales/te-IN.json | 1 - app/i18n/locales/tr.json | 1 - app/i18n/locales/zh-CN.json | 1 - app/i18n/locales/zh-TW.json | 1 - 23 files changed, 23 deletions(-) diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json index 131c1f854f..3625b984c5 100644 --- a/app/i18n/locales/ar.json +++ b/app/i18n/locales/ar.json @@ -134,7 +134,6 @@ "Encryption_error_desc": "تعذر قراءة مفتاح التشفير أثناء الاستيراد", "Encryption_error_title": "كلمة المرور المشفرة خاطئة", "End_to_end_encrypted_room": "غرفة مشفرة بين الطرفيات", - "Enter": "أدخل", "Enter_E2EE_Password": "أدخل كلمة المرور E2EE", "Enter_E2EE_Password_description": "للوصول إلى قنواتك المشفرة والرسائل المباشرة، أدخل كلمة المرور الخاصة بالتشفير. هذا لا يتم تخزينه على الخادم، لذا ستحتاج إلى استخدامه على كل جهاز.", "Error_uploading": "خطأ في الرفع", diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json index 125623777c..b815c02902 100644 --- a/app/i18n/locales/bn-IN.json +++ b/app/i18n/locales/bn-IN.json @@ -237,7 +237,6 @@ "Encryption_error_desc": "এনক্রিপশন কীটি আমদানি করার জন্য আপনার এনক্রিপশন কীটি ডিকোড করা হতে সম্ভব হয়নি।", "Encryption_error_title": "আপনার এনক্রিপশন পাসওয়ার্ড ভুল মনে হচ্ছে", "End_to_end_encrypted_room": "শেষ হতে শেষ এনক্রিপ্টেড রুম", - "Enter": "প্রবেশ করুন", "Enter_E2EE_Password": "E2EE পাসওয়ার্ড দিন", "Enter_E2EE_Password_description": "আপনার এনক্রিপ্টেড চ্যানেলগুলি এবং সরাসরি বার্তাগুলি অ্যাক্সেস করতে, আপনার এনক্রিপশন পাসওয়ার্ড লিখুন। এটি সার্ভারে সংরক্ষিত হয় না, তাই আপনাকে প্রতিটি ডিভাইসে এটি ব্যবহার করতে হবে।", "Error_Download_file": "ফাইল ডাউনলোড করতে ত্রুটি", diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json index 3de00b317b..ab35fc5b75 100644 --- a/app/i18n/locales/cs.json +++ b/app/i18n/locales/cs.json @@ -253,7 +253,6 @@ "Encryption_error_desc": "Nebylo možné dekódovat váš šifrovací klíč pro import.", "Encryption_error_title": "Vaše heslo pro šifrování se zdá být špatné", "End_to_end_encrypted_room": "End to end šifrovaná místnost", - "Enter": "Enter", "Enter_the_code": "Zadejte kód, který jsme vám právě poslali e-mailem.", "Enter_Your_E2E_Password": "Zadejte heslo E2E", "Enter_Your_Encryption_Password_desc1": "To vám umožní přístup k vašim zašifrovaným soukromým skupinám a přímým zprávám.", diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json index 8a04eba112..d943e376fc 100644 --- a/app/i18n/locales/de.json +++ b/app/i18n/locales/de.json @@ -231,7 +231,6 @@ "Encryption_error_desc": "Es war nicht möglich, Ihren Verschlüsselungs-Key zu importieren.", "Encryption_error_title": "Ihr Verschlüsselungs-Passwort scheint falsch zu sein", "End_to_end_encrypted_room": "Ende-zu-Ende-verschlüsselter Raum", - "Enter": "Eingeben", "Enter_E2EE_Password": "E2EE-Passwort eingeben", "Enter_E2EE_Password_description": "Um auf Ihre verschlüsselten Kanäle und Direktnachrichten zuzugreifen, geben Sie Ihr Verschlüsselungspasswort ein. Dies wird nicht auf dem Server gespeichert, daher müssen Sie es auf jedem Gerät verwenden.", "Error_Download_file": "Fehler beim Herunterladen der Datei", diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index ce5e82cc79..4f30bd4728 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -270,7 +270,6 @@ "Encryption_error_desc": "It wasn't possible to decode your encryption key to be imported.", "Encryption_error_title": "Your encryption password seems wrong", "End_to_end_encrypted_room": "End to end encrypted room", - "Enter": "Enter", "Enter_E2EE_Password": "Enter E2EE password", "Enter_E2EE_Password_description": "To access your encrypted channels and direct messages, enter your encryption password. This is not stored on the server, so you’ll need to use it on every device.", "Enter_the_code": "Enter the code we just emailed you.", diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json index 7d72886ce4..21e22c35df 100644 --- a/app/i18n/locales/es.json +++ b/app/i18n/locales/es.json @@ -90,7 +90,6 @@ "Edit": "Editar", "Email": "E-mail", "Enable_Auto_Translate": "Permitir Auto-Translate", - "Enter": "Introducir", "Error_uploading": "Error en la subida", "error-action-not-allowed": "{{action}} no permitida", "error-avatar-invalid-url": "URL de avatar inválida: {{url}}", diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json index 689b8e8e97..52deeacab2 100644 --- a/app/i18n/locales/fi.json +++ b/app/i18n/locales/fi.json @@ -216,7 +216,6 @@ "Encryption_error_desc": "Tuotavan salausavaimesi salausta ei voitu purkaa.", "Encryption_error_title": "Salauksen salasanasi näyttää väärältä", "End_to_end_encrypted_room": "Täysin salattu huone", - "Enter": "Syötä", "Enter_E2EE_Password": "Anna E2EE-salasana", "Enter_E2EE_Password_description": "Päästäksesi käsiksi salattuihin kanaviisi ja suoriin viesteihisi, syötä salaus salasanasi. Tätä ei tallenneta palvelimelle, joten sinun on käytettävä sitä jokaisella laitteella.", "Error_Download_file": "Virhe ladattaessa tiedostoa", diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json index df54b01f12..4f082a34a7 100644 --- a/app/i18n/locales/fr.json +++ b/app/i18n/locales/fr.json @@ -182,7 +182,6 @@ "Encryption_error_desc": "Il n'a pas été possible de décoder votre clé de cryptage pour être importé.", "Encryption_error_title": "Votre mot de passe de cryptage semble erroné", "End_to_end_encrypted_room": "Salon crypté de bout en bout", - "Enter": "Saisir", "Enter_E2EE_Password": "Entrez le mot de passe E2EE", "Enter_E2EE_Password_description": "Pour accéder à vos canaux cryptés et à vos messages directs, entrez votre mot de passe de cryptage. Celui-ci n'est pas stocké sur le serveur, vous devrez donc l'utiliser sur chaque appareil.", "Error_Download_file": "Erreur lors du téléchargement du fichier", diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json index 6836780b00..d7b53902fc 100644 --- a/app/i18n/locales/hi-IN.json +++ b/app/i18n/locales/hi-IN.json @@ -237,7 +237,6 @@ "Encryption_error_desc": "आपके एन्क्रिप्शन कुंजी को आयात करने के लिए इसे डीकोड करना संभाव नहीं था।", "Encryption_error_title": "आपका एन्क्रिप्शन पासवर्ड गलत लगता है", "End_to_end_encrypted_room": "इंड-टू-इंड एन्क्रिप्टेड कमरा", - "Enter": "दर्ज करें", "Enter_E2EE_Password": "E2EE पासवर्ड डालें", "Enter_E2EE_Password_description": "अपने एन्क्रिप्टेड चैनल्स और डायरेक्ट मैसेजेस तक पहुँचने के लिए, अपना एन्क्रिप्शन पासवर्ड दर्ज करें। यह सर्वर पर संग्रहीत नहीं होता है, इसलिए आपको इसे हर डिवाइस पर उपयोग करना होगा।", "Error_Download_file": "फ़ाइल डाउनलोड करते समय त्रुटि", diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json index d234c99790..8d609082c7 100644 --- a/app/i18n/locales/hu.json +++ b/app/i18n/locales/hu.json @@ -237,7 +237,6 @@ "Encryption_error_desc": "Nem sikerült dekódolni az importálandó titkosítási kulcsot.", "Encryption_error_title": "A titkosítási jelszó rossznak tűnik", "End_to_end_encrypted_room": "Végponttól végpontig titkosított szoba", - "Enter": "Beírni", "Enter_E2EE_Password": "Adja meg az E2EE jelszót", "Enter_E2EE_Password_description": "Az titkosított csatornákhoz és közvetlen üzenetekhez való hozzáféréshez írja be a titkosítási jelszavát. Ez nincs tárolva a szerveren, így minden eszközön használnia kell.", "Error_Download_file": "Hiba a fájl letöltése közben", diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json index 2e80947712..0475af172a 100644 --- a/app/i18n/locales/it.json +++ b/app/i18n/locales/it.json @@ -158,7 +158,6 @@ "Encryption_error_desc": "Non è stato possibile importare la tua chiave di cifratura.", "Encryption_error_title": "La tua password di cifratura sembra errata", "End_to_end_encrypted_room": "Stanza crittografata end to end", - "Enter": "Inserire", "Enter_E2EE_Password": "Inserisci la password E2EE", "Enter_E2EE_Password_description": "Per accedere ai tuoi canali criptati e ai messaggi diretti, inserisci la tua password di crittografia. Questa non viene memorizzata sul server, quindi dovrai usarla su ogni dispositivo.", "Error_uploading": "Errore nel caricamento di", diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json index 441701bdbb..bf76b2f58d 100644 --- a/app/i18n/locales/ja.json +++ b/app/i18n/locales/ja.json @@ -133,7 +133,6 @@ "Encryption_error_desc": "暗号化キーをデコードしてインポートできませんでした。", "Encryption_error_title": "暗号化パスワードが間違っているようです", "End_to_end_encrypted_room": "暗号化されたエンドツーエンドのルーム", - "Enter": "入力", "Enter_E2EE_Password": "E2EEパスワードを入力", "Enter_E2EE_Password_description": "暗号化されたチャンネルとダイレクトメッセージにアクセスするには、暗号化パスワードを入力してください。これはサーバーに保存されないため、すべてのデバイスで使用する必要があります。", "Error_uploading": "アップロードエラー", diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json index ccb613b92b..09f540609b 100644 --- a/app/i18n/locales/nl.json +++ b/app/i18n/locales/nl.json @@ -182,7 +182,6 @@ "Encryption_error_desc": "Het was niet mogelijk om uw coderingssleutel te decoderen om te worden geïmporteerd.", "Encryption_error_title": "Jouw coderingswachtwoord lijkt verkeerd", "End_to_end_encrypted_room": "End-to-end versleutelde kamer", - "Enter": "Invoeren", "Enter_E2EE_Password": "Voer E2EE-wachtwoord in", "Enter_E2EE_Password_description": "Om toegang te krijgen tot uw versleutelde kanalen en directe berichten, voert u uw versleutelingswachtwoord in. Dit wordt niet op de server opgeslagen, dus u moet het op elk apparaat gebruiken.", "Error_Download_file": "Fout tijdens het downloaden van bestand", diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index 5c8ff99bb6..5c92d52def 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -264,7 +264,6 @@ "Encryption_error_desc": "Não foi possível decodificar sua chave E2E para ser importada.", "Encryption_error_title": "Sua senha E2E parece errada", "End_to_end_encrypted_room": "Sala criptografada de ponta a ponta", - "Enter": "Inserir", "Enter_E2EE_Password": "Digite a senha E2EE", "Enter_E2EE_Password_description": "Para acessar seus canais criptografados e mensagens diretas, insira sua senha de criptografia. Isso não é armazenado no servidor, então você precisará usá-la em cada dispositivo.", "Enter_the_code": "Insira o código que acabamos de enviar por e-mail.", diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json index 85f4beba88..af4b18986c 100644 --- a/app/i18n/locales/pt-PT.json +++ b/app/i18n/locales/pt-PT.json @@ -129,7 +129,6 @@ "Encryption_error_desc": "Não foi possível descodificar a sua chave de encriptação para ser importada.", "Encryption_error_title": "A sua senha de encriptação parece errada", "End_to_end_encrypted_room": "Sala encriptada de ponta a ponta", - "Enter": "Introduzir", "Enter_E2EE_Password": "Digite a senha E2EE", "Enter_E2EE_Password_description": "Para aceder aos seus canais encriptados e mensagens diretas, introduza a sua palavra-passe de encriptação. Isto não é armazenado no servidor, pelo que terá de o utilizar em cada dispositivo.", "Error_uploading": "Erro ao fazer o envio", diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json index c4137d254b..5cafea805d 100644 --- a/app/i18n/locales/ru.json +++ b/app/i18n/locales/ru.json @@ -207,7 +207,6 @@ "Encryption_error_desc": "Невозможно расшифровать ваш ключ шифрования, чтобы импортировать его", "Encryption_error_title": "Введен не верный пароль шифрования", "End_to_end_encrypted_room": "Чат со сквозным шифрованием", - "Enter": "Ввод", "Enter_E2EE_Password": "Введите E2EE Пароль", "Enter_E2EE_Password_description": "Чтобы получить доступ к вашим зашифрованным каналам и прямым сообщениям, введите свой пароль шифрования. Он не хранится на сервере, поэтому вам нужно будет использовать его на каждом устройстве.", "Error_Download_file": "Ошибка при скачивании файла", diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json index 15246f2314..3757ed108a 100644 --- a/app/i18n/locales/sl-SI.json +++ b/app/i18n/locales/sl-SI.json @@ -192,7 +192,6 @@ "Encryption_error_desc": "Ni bilo mogoče dekodirati vašega šifrirnega ključa, ki bi ga bilo mogoče uvoziti.", "Encryption_error_title": "Vaše šifrirno geslo se zdi napačno", "End_to_end_encrypted_room": "Obojestransko (E2E) šifrirane sobe", - "Enter": "Vnesite", "Enter_E2EE_Password": "Vnesite geslo E2EE", "Enter_E2EE_Password_description": "Za dostop do vaših šifriranih kanalov in neposrednih sporočil vnesite svoje šifrirno geslo. To ni shranjeno na strežniku, zato ga boste morali uporabljati na vsaki napravi.", "Error_Download_file": "Napaka med prenosom datoteke", diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json index 15aee4ad97..0291ed1409 100644 --- a/app/i18n/locales/sv.json +++ b/app/i18n/locales/sv.json @@ -216,7 +216,6 @@ "Encryption_error_desc": "Det gick inte att avkoda krypteringsnyckeln som skulle importeras.", "Encryption_error_title": "Ditt krypteringslösenord verkar vara felaktigt", "End_to_end_encrypted_room": "End-to-end-krypterat rum", - "Enter": "Ange", "Enter_E2EE_Password": "Ange E2EE-lösenord", "Enter_E2EE_Password_description": "För att komma åt dina krypterade kanaler och direkta meddelanden, ange ditt krypteringslösenord. Detta lagras inte på servern, så du måste använda det på varje enhet.", "Error_Download_file": "Fel vid nedladdning av fil", diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json index 931ffe68d0..82da8421b5 100644 --- a/app/i18n/locales/ta-IN.json +++ b/app/i18n/locales/ta-IN.json @@ -237,7 +237,6 @@ "Encryption_error_desc": "உங்கள் என்கிரிப்ஷன் கடவுச்சொல் இறக்குமதி செய்ய முடியவில்லை.", "Encryption_error_title": "உங்கள் என்கிரிப்ஷன் கடவுச்சொல் தவறாக தோனுஆகின்றது", "End_to_end_encrypted_room": "குறிபாக என்று என்கிரிப்டுக்கப்பட்ட அறை", - "Enter": "நுழைய", "Enter_E2EE_Password": "E2EE கடவுச்சொல் உள்ளிடவும்", "Enter_E2EE_Password_description": "உங்கள் என்கிரிப்ட் செய்யப்பட்ட சேனல்கள் மற்றும் நேரடி செய்திகளை அணுக, உங்கள் என்கிரிப்ஷன் கடவுச்சொல்லை உள்ளிடவும். இது சர்வரில் சேமிக்கப்படாது, எனவே நீங்கள் ஒவ்வொரு சாதனத்திலும் இதை பயன்படுத்த வேண்டும்.", "Error_Download_file": "கோப்பு பதிவிறக்கம் செய்யும் போது பிழை", diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json index e416e13eea..52a4d61725 100644 --- a/app/i18n/locales/te-IN.json +++ b/app/i18n/locales/te-IN.json @@ -237,7 +237,6 @@ "Encryption_error_desc": "మీ ఎన్క్రిప్షన్ కీని దిగుమతి చేసుకోవడం సాధ్యమవ్వలేదు.", "Encryption_error_title": "మీ ఎన్క్రిప్షన్ పాస్‌వర్డ్ చెల్లింపుగా ఉంది", "End_to_end_encrypted_room": "ఎండ్ టు ఎండ్ ఎన్క్రిప్టెడ్ రూం", - "Enter": "పెట్టండి", "Enter_E2EE_Password": "E2EE పాస్‌వర్డ్ నమోదు చేయండి", "Enter_E2EE_Password_description": "మీ ఎన్క్రిప్టెడ్ ఛానెల్స్ మరియు డైరెక్ట్ మెసేజెస్‌ను యాక్సెస్ చేయడానికి, మీ ఎన్క్రిప్షన్ పాస్‌వర్డ్‌ను నమోదు చేయండి. ఇది సర్వర్‌లో నిల్వ చేయబడదు, కాబట్టి మీరు ప్రతి పరికరంపై దీనిని ఉపయోగించాలి.", "Error_Download_file": "ఫైల్ డౌన్‌లోడ్ చేస్తున్నప్పుడు తప్పిబాటు", diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json index a792963bba..573d1116c2 100644 --- a/app/i18n/locales/tr.json +++ b/app/i18n/locales/tr.json @@ -147,7 +147,6 @@ "Encryption_error_desc": "İçe aktarılacak şifreleme anahtarınızın kodu çözülemedi.", "Encryption_error_title": "Şifreleme şifreniz yanlış görünüyor", "End_to_end_encrypted_room": "Uçtan uca şifreli oda", - "Enter": "Gir", "Enter_E2EE_Password": "E2EE Şifresini Girin", "Enter_E2EE_Password_description": "Şifreli kanallarınıza ve doğrudan mesajlarınıza erişmek için şifreleme şifrenizi girin. Bu, sunucuda saklanmaz, bu nedenle her cihazda kullanmanız gerekir.", "Error_uploading": "Yükleme hatası", diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json index f31bd971b5..cee8422496 100644 --- a/app/i18n/locales/zh-CN.json +++ b/app/i18n/locales/zh-CN.json @@ -143,7 +143,6 @@ "Encryption_error_desc": "无法使用汇入的加密密钥来解密", "Encryption_error_title": "您的加密密码似乎有误", "End_to_end_encrypted_room": "E2E 加密聊天室", - "Enter": "输入", "Enter_E2EE_Password": "输入 E2EE 密码", "Enter_E2EE_Password_description": "要访问您的加密频道和直接消息，请输入您的加密密码。这不会存储在服务器上，因此您需要在每个设备上使用它。", "Error_uploading": "错误上传", diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json index 489050c962..113547f1e1 100644 --- a/app/i18n/locales/zh-TW.json +++ b/app/i18n/locales/zh-TW.json @@ -149,7 +149,6 @@ "Encryption_error_desc": "無法使用匯入的加密金鑰來解密", "Encryption_error_title": "您的加密密碼似乎有誤", "End_to_end_encrypted_room": "E2E 加密聊天室", - "Enter": "輸入", "Enter_E2EE_Password": "輸入 E2EE 密碼", "Enter_E2EE_Password_description": "要存取您的加密頻道和直接訊息，請輸入您的加密密碼。這不會儲存在伺服器上，因此您需要在每個裝置上使用它。", "Error_uploading": "錯誤上傳", From d5570ff452b4ce790bacd6a81ffe56df0bfa13f3 Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Thu, 14 Nov 2024 16:55:23 -0300 Subject: [PATCH 06/10] chore: changed themes[theme] to colors --- app/containers/TextInput/FormTextInput.tsx | 7 +-- app/views/NewServerView/ServerInput/Item.tsx | 47 ++++++++++--------- app/views/NewServerView/ServerInput/index.tsx | 15 ++---- app/views/NewServerView/index.tsx | 1 - 4 files changed, 31 insertions(+), 39 deletions(-) diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx index 4d92d99e5d..07666a49c3 100644 --- a/app/containers/TextInput/FormTextInput.tsx +++ b/app/containers/TextInput/FormTextInput.tsx @@ -9,7 +9,6 @@ import sharedStyles from '../../views/Styles'; import ActivityIndicator from '../ActivityIndicator'; import { CustomIcon, TIconsName } from '../CustomIcon'; import { TextInput } from './TextInput'; -import { themes } from '../../lib/constants'; const styles = StyleSheet.create({ error: { @@ -94,7 +93,7 @@ export const FormTextInput = ({ accessibilityLabel, ...inputProps }: IRCTextInputProps): React.ReactElement => { - const { colors, theme } = useTheme(); + const { colors } = useTheme(); const [showPassword, setShowPassword] = useState(false); const showClearInput = onClearInput && value && value.length > 0; const Input = bottomSheet ? BottomSheetTextInput : TextInput; @@ -105,9 +104,7 @@ export const FormTextInput = ({ accessibilityLabel={`${label} ${required ? i18n.t('Required') : ''}`} style={[styles.label, { color: colors.fontTitlesLabels }, error?.error && { color: colors.fontDanger }]}> {label}{' '} - {required && ( - {`(${i18n.t('Required')})`} - )} + {required && {`(${i18n.t('Required')})`}} ) : null} diff --git a/app/views/NewServerView/ServerInput/Item.tsx b/app/views/NewServerView/ServerInput/Item.tsx index 852f4d70a5..12469e6828 100644 --- a/app/views/NewServerView/ServerInput/Item.tsx +++ b/app/views/NewServerView/ServerInput/Item.tsx @@ -1,12 +1,11 @@ import React from 'react'; import { StyleSheet, Text, View } from 'react-native'; -import { themes } from '../../../lib/constants'; +import { useTheme } from '../../../theme'; import { CustomIcon } from '../../../containers/CustomIcon'; +import { TServerHistoryModel } from '../../../definitions/IServerHistory'; import sharedStyles from '../../Styles'; import Touch from '../../../containers/Touch'; -import { TServerHistoryModel } from '../../../definitions/IServerHistory'; -import { TSupportedThemes } from '../../../theme'; const styles = StyleSheet.create({ container: { @@ -29,30 +28,32 @@ const styles = StyleSheet.create({ interface IItem { item: TServerHistoryModel; - theme: TSupportedThemes; onPress(url: string): void; onDelete(item: TServerHistoryModel): void; } -const Item = ({ item, theme, onPress, onDelete }: IItem): JSX.Element => ( - onPress(item.url)} - testID={`server-history-${item.url}`} - accessible - accessibilityLabel={`${item.url} ${item.username}`}> - - - {item.url} - - - {item.username} - - - onDelete(item)} testID={`server-history-delete-${item.url}`}> - +const Item = ({ item, onPress, onDelete }: IItem): JSX.Element => { + const { colors } = useTheme(); + return ( + onPress(item.url)} + testID={`server-history-${item.url}`} + accessible + accessibilityLabel={`${item.url} ${item.username}`}> + + + {item.url} + + + {item.username} + + + onDelete(item)} testID={`server-history-delete-${item.url}`}> + + - -); + ); +}; export default Item; diff --git a/app/views/NewServerView/ServerInput/index.tsx b/app/views/NewServerView/ServerInput/index.tsx index 5ec637439f..6597f768e7 100644 --- a/app/views/NewServerView/ServerInput/index.tsx +++ b/app/views/NewServerView/ServerInput/index.tsx @@ -1,13 +1,12 @@ import React, { useState } from 'react'; import { FlatList, StyleSheet, TextInputProps, View } from 'react-native'; +import { useTheme } from '../../../theme'; import { FormTextInput } from '../../../containers/TextInput'; +import { TServerHistoryModel } from '../../../definitions'; import * as List from '../../../containers/List'; -import { themes } from '../../../lib/constants'; import I18n from '../../../i18n'; -import { TServerHistoryModel } from '../../../definitions'; import Item from './Item'; -import { TSupportedThemes } from '../../../theme'; const styles = StyleSheet.create({ container: { @@ -31,7 +30,6 @@ const styles = StyleSheet.create({ interface IServerInput extends TextInputProps { text: string; - theme: TSupportedThemes; serversHistory: any[]; onSubmit(): void; onDelete(item: TServerHistoryModel): void; @@ -40,7 +38,6 @@ interface IServerInput extends TextInputProps { const ServerInput = ({ text, - theme, serversHistory, onChangeText, onSubmit, @@ -48,6 +45,7 @@ const ServerInput = ({ onPressServerHistory }: IServerInput): JSX.Element => { const [focused, setFocused] = useState(false); + const { colors } = useTheme(); return ( setFocused(false)} /> {focused && serversHistory?.length ? ( - + ( - onPressServerHistory(item)} onDelete={onDelete} /> - )} + renderItem={({ item }) => onPressServerHistory(item)} onDelete={onDelete} />} ItemSeparatorComponent={List.Separator} keyExtractor={item => item.id} /> diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx index 7e15de48dc..f314a30e4c 100644 --- a/app/views/NewServerView/index.tsx +++ b/app/views/NewServerView/index.tsx @@ -316,7 +316,6 @@ class NewServerView extends React.Component Date: Thu, 14 Nov 2024 17:36:06 -0300 Subject: [PATCH 07/10] chore: updated accessibility label on formTetInput --- app/containers/TextInput/FormTextInput.tsx | 9 +++++---- app/views/NewServerView/ServerInput/index.tsx | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx index 07666a49c3..86e094e880 100644 --- a/app/containers/TextInput/FormTextInput.tsx +++ b/app/containers/TextInput/FormTextInput.tsx @@ -98,11 +98,12 @@ export const FormTextInput = ({ const showClearInput = onClearInput && value && value.length > 0; const Input = bottomSheet ? BottomSheetTextInput : TextInput; return ( - + {label ? ( - + {label}{' '} {required && {`(${i18n.t('Required')})`}} diff --git a/app/views/NewServerView/ServerInput/index.tsx b/app/views/NewServerView/ServerInput/index.tsx index 6597f768e7..efce5c1473 100644 --- a/app/views/NewServerView/ServerInput/index.tsx +++ b/app/views/NewServerView/ServerInput/index.tsx @@ -60,7 +60,6 @@ const ServerInput = ({ keyboardType='url' textContentType='URL' required - accessibilityLabel={`${I18n.t('Enter')} ${I18n.t('Workspace_URL')}`} onFocus={() => setFocused(true)} onBlur={() => setFocused(false)} /> From 83fc3f31d285a9764443aebec0fecdd0111e62dd Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Mon, 18 Nov 2024 12:32:38 -0300 Subject: [PATCH 08/10] fix: adjusts on a11y experience --- app/containers/FormContainer.tsx | 23 +++++++++----- app/containers/TextInput/FormTextInput.tsx | 1 - app/views/NewServerView/index.tsx | 35 ++++++++++++++++++---- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/app/containers/FormContainer.tsx b/app/containers/FormContainer.tsx index 2e0afd496a..3592e0a886 100644 --- a/app/containers/FormContainer.tsx +++ b/app/containers/FormContainer.tsx @@ -14,6 +14,7 @@ import SafeAreaView from './SafeAreaView'; interface IFormContainer extends ScrollViewProps { testID: string; children: React.ReactElement | React.ReactElement[] | null; + showAppVersion: boolean; } const styles = StyleSheet.create({ @@ -22,29 +23,35 @@ const styles = StyleSheet.create({ } }); -export const FormContainerInner = ({ children }: { children: (React.ReactElement | null)[] }) => ( - {children} +export const FormContainerInner = ({ + children, + accessibilityLabel +}: { + children: (React.ReactElement | null)[]; + accessibilityLabel?: string; +}) => ( + + {children} + ); -const FormContainer = ({ children, testID, ...props }: IFormContainer) => { +const FormContainer = ({ children, testID, showAppVersion, ...props }: IFormContainer) => { const { theme } = useTheme(); return ( + keyboardVerticalOffset={128}> + {...props}> {children} - + <>{showAppVersion && } diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx index 86e094e880..f1c9da893d 100644 --- a/app/containers/TextInput/FormTextInput.tsx +++ b/app/containers/TextInput/FormTextInput.tsx @@ -133,7 +133,6 @@ export const FormTextInput = ({ underlineColorAndroid='transparent' secureTextEntry={secureTextEntry && !showPassword} testID={testID} - accessibilityLabel={`${accessibilityLabel ?? placeholder}${required ? ` - ${i18n.t('Required')}` : ''}`} placeholder={placeholder} value={value} placeholderTextColor={colors.fontAnnotation} diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx index f314a30e4c..becbad2c98 100644 --- a/app/views/NewServerView/index.tsx +++ b/app/views/NewServerView/index.tsx @@ -18,7 +18,7 @@ import { sanitizeLikeString } from '../../lib/database/utils'; import UserPreferences from '../../lib/methods/userPreferences'; import { OutsideParamList } from '../../stacks/types'; import { withTheme } from '../../theme'; -import { isTablet } from '../../lib/methods/helpers'; +import { isAndroid, isTablet } from '../../lib/methods/helpers'; import EventEmitter from '../../lib/methods/helpers/events'; import { BASIC_AUTH_KEY, setBasicAuth } from '../../lib/methods/helpers/fetch'; import { showConfirmationAlert } from '../../lib/methods/helpers/info'; @@ -53,6 +53,7 @@ interface INewServerViewState { text: string; certificate: string | null; serversHistory: TServerHistoryModel[]; + showBottomInfo: boolean; } interface ISubmitParams { @@ -68,10 +69,15 @@ class NewServerView extends React.Component this.handleShowKeyboard()); + Keyboard.addListener('keyboardDidHide', () => this.handleHideKeyboard()); + } } componentDidMount() { @@ -81,6 +87,8 @@ class NewServerView extends React.Component { + this.setState({ ...this.state, showBottomInfo: false }); + }; + + handleHideKeyboard = () => { + this.setState({ ...this.state, showBottomInfo: true }); + }; + onChangeText = (text: string) => { this.setState({ text }); this.queryServerHistory(text); @@ -261,8 +277,11 @@ class NewServerView extends React.Component { - const { certificate } = this.state; + const { certificate, showBottomInfo } = this.state; const { theme, connecting } = this.props; + + if (!showBottomInfo) return <>; + return ( <> @@ -285,12 +304,16 @@ class NewServerView extends React.Component - + + Date: Mon, 18 Nov 2024 12:36:20 -0300 Subject: [PATCH 09/10] fix lint --- app/containers/FormContainer.tsx | 4 ++-- app/views/NewServerView/index.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/containers/FormContainer.tsx b/app/containers/FormContainer.tsx index 3592e0a886..33f8afb2c8 100644 --- a/app/containers/FormContainer.tsx +++ b/app/containers/FormContainer.tsx @@ -14,7 +14,7 @@ import SafeAreaView from './SafeAreaView'; interface IFormContainer extends ScrollViewProps { testID: string; children: React.ReactElement | React.ReactElement[] | null; - showAppVersion: boolean; + showAppVersion?: boolean; } const styles = StyleSheet.create({ @@ -35,7 +35,7 @@ export const FormContainerInner = ({ ); -const FormContainer = ({ children, testID, showAppVersion, ...props }: IFormContainer) => { +const FormContainer = ({ children, testID, showAppVersion = true, ...props }: IFormContainer) => { const { theme } = useTheme(); return ( diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx index becbad2c98..c308150075 100644 --- a/app/views/NewServerView/index.tsx +++ b/app/views/NewServerView/index.tsx @@ -75,7 +75,7 @@ class NewServerView extends React.Component this.handleShowKeyboard()); + Keyboard.addListener('keyboardDidShow', () => this.handleShowKeyboard()); Keyboard.addListener('keyboardDidHide', () => this.handleHideKeyboard()); } } From a03d38310079d134e943f3dba91930025f52b995 Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Mon, 18 Nov 2024 15:18:53 -0300 Subject: [PATCH 10/10] fix: isAndroid conditional on unmount --- app/views/NewServerView/index.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx index c308150075..051cf67133 100644 --- a/app/views/NewServerView/index.tsx +++ b/app/views/NewServerView/index.tsx @@ -87,8 +87,11 @@ class NewServerView extends React.Component