Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import kotlinx.coroutines.tasks.await
* @see signInWithProvider
*/
@Composable
fun FirebaseAuthUI.rememberOAuthSignInHandler(
internal fun FirebaseAuthUI.rememberOAuthSignInHandler(
activity: Activity?,
config: AuthUIConfiguration,
provider: AuthProvider.OAuth,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,15 @@ interface AuthUIStringProvider {
/** Body for email sign in link sent dialog */
fun emailSignInLinkSentDialogBody(email: String): String

/** Divider text for alternate sign-in options */
val orContinueWith: String

/** Button text to sign in with email link */
val signInWithEmailLink: String

/** Button text to sign in with password */
val signInWithPassword: String

/** Title shown when prompting the user to confirm their email for cross-device flows */
val emailLinkPromptForEmailTitle: String

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,15 @@ class DefaultAuthUIStringProvider(
override fun emailSignInLinkSentDialogBody(email: String): String =
localizedContext.getString(R.string.fui_email_link_email_sent, email)

override val orContinueWith: String
get() = localizedContext.getString(R.string.fui_or_continue_with)

override val signInWithEmailLink: String
get() = localizedContext.getString(R.string.fui_sign_in_with_email_link)

override val signInWithPassword: String
get() = localizedContext.getString(R.string.fui_sign_in_with_password)

override val emailLinkPromptForEmailTitle: String
get() = localizedContext.getString(R.string.fui_email_link_confirm_email_header)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ fun SignInEmailLinkUI(
) {
HorizontalDivider(modifier = Modifier.weight(1f))
Text(
text = "or Continue with",
text = stringProvider.orContinueWith,
modifier = Modifier.padding(horizontal = 8.dp),
style = MaterialTheme.typography.bodySmall
)
Expand All @@ -220,7 +220,7 @@ fun SignInEmailLinkUI(
modifier = Modifier.fillMaxWidth(),
enabled = !isLoading
) {
Text("Sign in with password".uppercase())
Text(stringProvider.signInWithPassword.uppercase())
}

Spacer(modifier = Modifier.height(16.dp))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ fun SignInUI(
) {
HorizontalDivider(modifier = Modifier.weight(1f))
Text(
text = "or Continue with",
text = stringProvider.orContinueWith,
modifier = Modifier.padding(horizontal = 8.dp),
style = MaterialTheme.typography.bodySmall
)
Expand All @@ -227,7 +227,7 @@ fun SignInUI(
modifier = Modifier.fillMaxWidth(),
enabled = !isLoading
) {
Text("Sign in with email link".uppercase())
Text(stringProvider.signInWithEmailLink.uppercase())
}
}

Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">تأكيد عنوان البريد الإلكتروني لمتابعة تسجيل الدخول</string>
<string name="fui_email_link_dismiss_button">رفض</string>
<string name="fui_email_link_cross_device_linking_text">لقد بدأت هذه العملية بهدف ربط %1$s ببريدك الإلكتروني إلّا أنك فتحت الرابط على جهاز آخر لم يتمّ تسجيل الدخول عليه.\n\nلربط حسابك على %1$s، يجب فتح الرابط على الجهاز نفسه حيث سجّلت الدخول في البداية. ولإلغاء عملية الربط، يُرجى النقر على \"متابعة\" لتسجيل الدخول على هذا الجهاز.</string>
<string name="fui_or_continue_with">أو المتابعة باستخدام</string>
<string name="fui_sign_in_with_email_link">تسجيل الدخول باستخدام رابط البريد الإلكتروني</string>
<string name="fui_sign_in_with_password">تسجيل الدخول باستخدام كلمة المرور</string>
<string name="fui_verify_phone_number_title">أدخل رقم هاتفك</string>
<string name="fui_invalid_phone_number">يُرجى إدخال رقم هاتف صالح</string>
<string name="fui_enter_confirmation_code">أدخل الرمز المكوّن من 6 أرقام الذي أرسلناه إلى</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-b+es+419/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">Confirma el correo electrónico para continuar con el acceso</string>
<string name="fui_email_link_dismiss_button">Descartar</string>
<string name="fui_email_link_cross_device_linking_text">Originalmente, intentaste conectar tu cuenta de correo electrónico con %1$s, pero abriste el vínculo en un dispositivo diferente en el que no accediste.\n\nSi quieres conectar tu cuenta de %1$s, abre el vínculo en el mismo dispositivo con el que iniciaste el acceso. De lo contrario, presiona Continuar para acceder en este dispositivo.</string>
<string name="fui_or_continue_with">o Continuar con</string>
<string name="fui_sign_in_with_email_link">Iniciar sesión con enlace de correo</string>
<string name="fui_sign_in_with_password">Iniciar sesión con contraseña</string>
<string name="fui_verify_phone_number_title">Ingresa tu número de teléfono</string>
<string name="fui_invalid_phone_number">Ingresa un número de teléfono válido</string>
<string name="fui_enter_confirmation_code">Ingresa el código de 6 dígitos que enviamos al número</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">Потвърдете имейл адреса, за да продължите с влизането в профила</string>
<string name="fui_email_link_dismiss_button">Отхвърляне</string>
<string name="fui_email_link_cross_device_linking_text">Първоначално искахте да свържете %1$s с имейла на профила си, но отворихте връзката на различно устройство без вход в профила.\n\nАко все още искате да свържете профила си в(ъв) %1$s, отворете връзката на същото устройство, на което започнахте влизането в профила. В противен случай докоснете „Напред“, за да влезете на това устройство.</string>
<string name="fui_or_continue_with">или Продължете с</string>
<string name="fui_sign_in_with_email_link">Вход чрез имейл връзка</string>
<string name="fui_sign_in_with_password">Вход с парола</string>
<string name="fui_verify_phone_number_title">Въвеждане на телефонния ви номер</string>
<string name="fui_invalid_phone_number">Въведете валиден телефонен номер</string>
<string name="fui_enter_confirmation_code">Въведете 6-цифрения код, който изпратихме до</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">সাইন-ইন করতে ইমেল আইডি কনফার্ম করুন</string>
<string name="fui_email_link_dismiss_button">খারিজ করুন</string>
<string name="fui_email_link_cross_device_linking_text">আপনি %1$s অ্যাকাউন্ট ইমেল অ্যাকাউন্টের সাথে কানেক্ট করতে চেয়েছিলেন কিন্তু এমন একটি ডিভাইসে লিঙ্কটি খুলেছেন যেখানে সাইন-ইন করেননি।\n\nআপনি যদি এখনও %1$s অ্যাকাউন্টটি কানেক্ট করতে চান, যে ডিভাইসে সাইন-ইন করেছিলেন সেখানেই লিঙ্কটি খুলুন। নাহলে, ডিভাইসের সাইন-ইন বিকল্পে ট্যাপ করুন।</string>
<string name="fui_or_continue_with">বা এটি দিয়ে চালিয়ে যান</string>
<string name="fui_sign_in_with_email_link">ইমেল লিঙ্ক দিয়ে সাইন ইন করুন</string>
<string name="fui_sign_in_with_password">পাসওয়ার্ড দিয়ে সাইন ইন করুন</string>
<string name="fui_verify_phone_number_title">আপনার ফোন নম্বর লিখুন</string>
<string name="fui_invalid_phone_number">একটি সঠিক ফোন নম্বর লিখুন</string>
<string name="fui_enter_confirmation_code">আমাদের পাঠানো ৬-সংখ্যার কোডটি লিখুন</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">Confirma l\'adreça electrònica per continuar amb l\'inici de sessió</string>
<string name="fui_email_link_dismiss_button">Ignora</string>
<string name="fui_email_link_cross_device_linking_text">Inicialment has intentat connectar %1$s amb el teu compte de correu electrònic, però has obert l\'enllaç amb un dispositiu diferent en què no has iniciat la sessió.\n\nSi encara vols connectar el compte que tens a %1$s, obre l\'enllaç al mateix dispositiu en què has començat a iniciar la sessió. Si no, toca Continua per iniciar la sessió en aquest dispositiu.</string>
<string name="fui_or_continue_with">o Continua amb</string>
<string name="fui_sign_in_with_email_link">Inicia la sessió amb l\'enllaç de correu electrònic</string>
<string name="fui_sign_in_with_password">Inicia la sessió amb la contrasenya</string>
<string name="fui_verify_phone_number_title">Introdueix el número de telèfon</string>
<string name="fui_invalid_phone_number">Introdueix un número de telèfon vàlid</string>
<string name="fui_enter_confirmation_code">Introdueix el codi de 6 dígits que s\'ha enviat al número</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">Pokud chcete pokračovat v přihlášení, potvrďte e-mailovou adresu.</string>
<string name="fui_email_link_dismiss_button">Zavřít</string>
<string name="fui_email_link_cross_device_linking_text">Původně jste chtěli propojit %1$s se svým e-mailovým účtem, ale otevřeli jste odkaz na jiném zařízení, na kterém nejste přihlášení.\n\nPokud stále chcete propojit svůj účet %1$s, otevřete odkaz na stejném zařízení, na kterém jste se začali přihlašovat. V opačném případě klepněte na možnost Pokračovat a přihlaste se na tomto zařízení.</string>
<string name="fui_or_continue_with">nebo Pokračovat s</string>
<string name="fui_sign_in_with_email_link">Přihlásit se pomocí e-mailového odkazu</string>
<string name="fui_sign_in_with_password">Přihlásit se pomocí hesla</string>
<string name="fui_verify_phone_number_title">Zadejte své telefonní číslo</string>
<string name="fui_invalid_phone_number">Zadejte platné telefonní číslo</string>
<string name="fui_enter_confirmation_code">Zadejte šestimístný kód, který jsme vám zaslali</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">Bekræft mailadresse for at fortsætte loginprocessen</string>
<string name="fui_email_link_dismiss_button">Afvis</string>
<string name="fui_email_link_cross_device_linking_text">Du ville egentlig knytte %1$s til din mailkonto, men du har åbnet linket på en anden enhed, som du ikke er logget ind på.\n\nHvis du stadig vil tilknytte din %1$s-konto, skal du åbne linket på den enhed, hvor du startede loginprocessen. Ellers kan du klikke på Fortsæt for at fortsætte med at logge ind på denne enhed.</string>
<string name="fui_or_continue_with">eller Fortsæt med</string>
<string name="fui_sign_in_with_email_link">Log ind med maillink</string>
<string name="fui_sign_in_with_password">Log ind med adgangskode</string>
<string name="fui_verify_phone_number_title">Angiv dit telefonnummer</string>
<string name="fui_invalid_phone_number">Angiv et gyldigt telefonnummer</string>
<string name="fui_enter_confirmation_code">Angiv den 6-cifrede kode, vi sendte til</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-de-rAT/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">E-Mail-Adresse bestätigen, um Anmeldung fortzusetzen</string>
<string name="fui_email_link_dismiss_button">Ablehnen</string>
<string name="fui_email_link_cross_device_linking_text">Sie haben versucht, %1$s auf einem Gerät, auf dem Sie nicht angemeldet sind, mit Ihrem E-Mail-Konto zu verbinden.\n\nWenn Sie Ihr %1$s-Konto weiterhin verbinden möchten, öffnen Sie den Link bitte auf dem Gerät, auf dem Sie den Anmeldevorgang gestartet haben. Andernfalls tippen Sie auf \"Weiter\", um sich auf diesem Gerät anzumelden.</string>
<string name="fui_or_continue_with">oder Fortfahren mit</string>
<string name="fui_sign_in_with_email_link">Mit E-Mail-Link anmelden</string>
<string name="fui_sign_in_with_password">Mit Passwort anmelden</string>
<string name="fui_verify_phone_number_title">Telefonnummer eingeben</string>
<string name="fui_invalid_phone_number">Geben Sie eine gültige Telefonnummer ein</string>
<string name="fui_enter_confirmation_code">Geben Sie den 6-stelligen Code ein, der gesendet wurde an</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-de-rCH/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">E-Mail-Adresse bestätigen, um Anmeldung fortzusetzen</string>
<string name="fui_email_link_dismiss_button">Ablehnen</string>
<string name="fui_email_link_cross_device_linking_text">Sie haben versucht, %1$s auf einem Gerät, auf dem Sie nicht angemeldet sind, mit Ihrem E-Mail-Konto zu verbinden.\n\nWenn Sie Ihr %1$s-Konto weiterhin verbinden möchten, öffnen Sie den Link bitte auf dem Gerät, auf dem Sie den Anmeldevorgang gestartet haben. Andernfalls tippen Sie auf \"Weiter\", um sich auf diesem Gerät anzumelden.</string>
<string name="fui_or_continue_with">oder Fortfahren mit</string>
<string name="fui_sign_in_with_email_link">Mit E-Mail-Link anmelden</string>
<string name="fui_sign_in_with_password">Mit Passwort anmelden</string>
<string name="fui_verify_phone_number_title">Telefonnummer eingeben</string>
<string name="fui_invalid_phone_number">Geben Sie eine gültige Telefonnummer ein</string>
<string name="fui_enter_confirmation_code">Geben Sie den 6-stelligen Code ein, der gesendet wurde an</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">E-Mail-Adresse bestätigen, um Anmeldung fortzusetzen</string>
<string name="fui_email_link_dismiss_button">Ablehnen</string>
<string name="fui_email_link_cross_device_linking_text">Sie haben versucht, %1$s auf einem Gerät, auf dem Sie nicht angemeldet sind, mit Ihrem E-Mail-Konto zu verbinden.\n\nWenn Sie Ihr %1$s-Konto weiterhin verbinden möchten, öffnen Sie den Link bitte auf dem Gerät, auf dem Sie den Anmeldevorgang gestartet haben. Andernfalls tippen Sie auf \"Weiter\", um sich auf diesem Gerät anzumelden.</string>
<string name="fui_or_continue_with">oder Fortfahren mit</string>
<string name="fui_sign_in_with_email_link">Mit E-Mail-Link anmelden</string>
<string name="fui_sign_in_with_password">Mit Passwort anmelden</string>
<string name="fui_verify_phone_number_title">Telefonnummer eingeben</string>
<string name="fui_invalid_phone_number">Geben Sie eine gültige Telefonnummer ein</string>
<string name="fui_enter_confirmation_code">Geben Sie den 6-stelligen Code ein, der gesendet wurde an</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">Επιβεβαιώστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου για να συνεχίσετε τη σύνδεση</string>
<string name="fui_email_link_dismiss_button">Παράβλεψη</string>
<string name="fui_email_link_cross_device_linking_text">Αρχικά, σκοπεύατε να συνδέσετε το %1$s με τον λογαριασμό ηλεκτρονικού ταχυδρομείου, αλλά, για το άνοιγμα του συνδέσμου, χρησιμοποιήσατε άλλη συσκευή στην οποία δεν είστε συνδεδεμένοι.\n\nΑν θέλετε να συνεχίσετε τη σύνδεση του λογαριασμού %1$s, ανοίξτε τον σύνδεσμο στην ίδια συσκευή από την οποία ξεκινήσατε τη σύνδεση. Διαφορετικά, πατήστε Συνέχεια για να συνδεθείτε σε αυτήν τη συσκευή.</string>
<string name="fui_or_continue_with">ή Συνέχεια με</string>
<string name="fui_sign_in_with_email_link">Σύνδεση με σύνδεσμο email</string>
<string name="fui_sign_in_with_password">Σύνδεση με κωδικό πρόσβασης</string>
<string name="fui_verify_phone_number_title">Εισαγάγετε τον αριθμό τηλεφώνου σας</string>
<string name="fui_invalid_phone_number">Καταχωρίστε έναν έγκυρο αριθμό τηλεφώνου</string>
<string name="fui_enter_confirmation_code">Εισαγάγετε τον 6ψήφιο κωδικό που σας στείλαμε στο</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-en-rAU/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">Confirm email to continue sign in</string>
<string name="fui_email_link_dismiss_button">Dismiss</string>
<string name="fui_email_link_cross_device_linking_text">You originally intended to connect %1$s to your email account, but have opened the link on a different device where you are not signed in.\n\nIf you still want to connect your %1$s account, open the link on the same device on which you started sign-in. Otherwise, tap \'Continue\' to sign in on this device.</string>
<string name="fui_or_continue_with">or Continue with</string>
<string name="fui_sign_in_with_email_link">Sign in with email link</string>
<string name="fui_sign_in_with_password">Sign in with password</string>
<string name="fui_verify_phone_number_title">Enter your phone number</string>
<string name="fui_invalid_phone_number">Enter a valid phone number</string>
<string name="fui_enter_confirmation_code">Enter the 6-digit code that we sent to</string>
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/res/values-en-rCA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="fui_email_link_confirm_email_message">Confirm email to continue sign in</string>
<string name="fui_email_link_dismiss_button">Dismiss</string>
<string name="fui_email_link_cross_device_linking_text">You originally intended to connect %1$s to your email account, but have opened the link on a different device where you are not signed in.\n\nIf you still want to connect your %1$s account, open the link on the same device on which you started sign-in. Otherwise, tap \'Continue\' to sign in on this device.</string>
<string name="fui_or_continue_with">or Continue with</string>
<string name="fui_sign_in_with_email_link">Sign in with email link</string>
<string name="fui_sign_in_with_password">Sign in with password</string>
<string name="fui_verify_phone_number_title">Enter your phone number</string>
<string name="fui_invalid_phone_number">Enter a valid phone number</string>
<string name="fui_enter_confirmation_code">Enter the 6-digit code that we sent to</string>
Expand Down
Loading