add "Create Account" button

deltalab-org · Feb 7, 2024 · d7219ed · d7219ed
1 parent 101b09a
commit d7219ed
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/res/layout/welcome_activity.xml b/res/layout/welcome_activity.xml
@@ -43,14 +43,24 @@
 
         <Button
             style="@style/ButtonPrimary"
-            android:id="@+id/login_button"
+            android:id="@+id/register_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="24dp"
             android:paddingRight="24dp"
             android:layout_marginBottom="16dp"
             android:background="@drawable/button_bg"
-            android:text="@string/login_header"/>
+            android:text="@string/register_title"/>
+
+        <Button
+            style="@style/ButtonSecondary"
+            android:id="@+id/login_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/login_title"/>
 
         <Button
             style="@style/ButtonSecondary"

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -577,6 +577,7 @@
     <!-- welcome and login -->
     <string name="welcome_chat_over_email">Charla por correo electrónico.</string>
     <string name="scan_invitation_code">Escanear código de invitación</string>
+    <string name="register_title">Crear cuenta</string>
     <string name="login_title">Iniciar sesión</string>
     <string name="login_header">Inicie sesión en su servidor</string>
     <string name="login_explain">Iniciar sesión con una cuenta de correo existente</string>
@@ -942,6 +943,7 @@
     <string name="qrshow_join_contact_no_connection_toast">No hay conexión a Internet, no se puede configurar con código QR.</string>
     <string name="qraccount_ask_create_and_login">¿Crear una nueva dirección de correo en \"%1$s\" e ingresar allí?</string>
     <string name="qraccount_ask_create_and_login_another">¿Crear una nueva dirección de correo en \"%1$s\" e ingresar ahí?\n\nTu cuenta existente no será eliminada. Usar el ítem \"Cambiar cuenta\" para cambiar entre tus cuentas.</string>
+    <string name="register_hint">¿Crear una nueva dirección de correo en \"%1$s\" e ingresar ahí?\n\nSi lo que desea es iniciar sesión con una de sus cuentas de correo existente, usa el botón \"Iniciar sesión\"</string>
     <!-- deprecated, use set_name_and_avatar_explain instead -->
     <string name="qraccount_success_enter_name">Ingreso satisfactorio—tu dirección de email es %1$s\n\nSi lo deseas, puedes ingresar un nombre y una imagen de perfil, que será mostrada a los usuarios que escribas.</string>
     <string name="set_name_and_avatar_explain">Establece un nombre que tus contactos puedan reconocer. También puedes establecer una foto de perfil.</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -565,6 +565,7 @@
     <!-- welcome and login -->
     <string name="welcome_chat_over_email">Chat over E-Mail.</string>
     <string name="scan_invitation_code">Scan Invitation Code</string>
+    <string name="register_title">Create Account</string>
     <string name="login_title">Log In</string>
     <string name="login_header">Log into your E-Mail Account</string>
     <string name="login_explain">Log in with an existing e-mail account</string>
@@ -930,6 +931,7 @@
     <string name="qrshow_join_contact_no_connection_toast">No internet connection, can\'t perform QR code setup.</string>
     <string name="qraccount_ask_create_and_login">Create new e-mail address on \"%1$s\" and log in there?</string>
     <string name="qraccount_ask_create_and_login_another">Create new e-mail address on \"%1$s\" and log in there?\n\nYour existing account will not be deleted. Use the \"Switch Account\" item to switch between your accounts.</string>
+    <string name="register_hint">Create new e-mail address on \"%1$s\" and log in there?\n\nIf what you want is to log in using your existing email account, use the \"Log In\" button instead.</string>
     <!-- deprecated, use set_name_and_avatar_explain instead -->
     <string name="qraccount_success_enter_name">Login successful—your e-mail address is %1$s\n\nIf you like, you can now enter a name and an profile image that will be displayed to people you write to.</string>
     <string name="set_name_and_avatar_explain">Set a name that your contacts will recognize. You can also set a profile image.</string>

diff --git a/src/org/thoughtcrime/securesms/WelcomeActivity.java b/src/org/thoughtcrime/securesms/WelcomeActivity.java
@@ -70,11 +70,25 @@ public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.welcome_activity);
 
+        Button registerButton = findViewById(R.id.register_button);
         Button loginButton = findViewById(R.id.login_button);
         View addAsSecondDeviceButton = findViewById(R.id.add_as_second_device_button);
         View scanQrButton = findViewById(R.id.scan_qr_button);
         View backupButton = findViewById(R.id.backup_button);
 
+        registerButton.setOnClickListener((view) -> {
+            String qrAccount = "dcaccount:https://nine.testrun.org/new";
+            String domain = dcContext.checkQr(qrAccount).getText1();
+            new AlertDialog.Builder(this)
+              .setMessage(getString(R.string.register_hint, domain))
+              .setCancelable(false)
+              .setNegativeButton(R.string.cancel, null)
+              .setPositiveButton(R.string.ok, (dialog, which) -> {
+                  manualConfigure = false;
+                  startQrAccountCreation(qrAccount);
+              })
+              .show();
+        });
         loginButton.setOnClickListener((view) -> startRegistrationActivity());
         addAsSecondDeviceButton.setOnClickListener((view) -> startAddAsSecondDeviceActivity());
         scanQrButton.setOnClickListener((view) -> startRegistrationQrActivity());