Design improvements for registration flow.

app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.kt

@@ -11,6 +11,7 @@ class VerificationCodeView @JvmOverloads constructor(context: Context, attrs: At
   private val containers: MutableList<TextInputLayout> = ArrayList(6)
   private var listener: OnCodeEnteredListener? = null
   private var index = 0
+
   init {
     inflate(context, R.layout.verification_code_view, this)
     containers.add(findViewById(R.id.container_zero))
@@ -19,6 +20,8 @@ class VerificationCodeView @JvmOverloads constructor(context: Context, attrs: At
     containers.add(findViewById(R.id.container_three))
     containers.add(findViewById(R.id.container_four))
     containers.add(findViewById(R.id.container_five))
+
+    containers.forEach { it.editText?.showSoftInputOnFocus = false }
   }
 
   fun setOnCompleteListener(listener: OnCodeEnteredListener?) {
@@ -31,7 +34,10 @@ class VerificationCodeView @JvmOverloads constructor(context: Context, attrs: At
 
     if (index == containers.size) {
       listener?.onCodeComplete(containers.joinToString("") { it.editText?.text.toString() })
+      return
     }
+
+    containers[index].editText?.requestFocus()
   }
 
   fun delete() {

app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java

@@ -42,12 +42,6 @@ public final class RegistrationNavigationActivity extends AppCompatActivity {
     return intent;
   }
 
-  @Override
-  protected void attachBaseContext(@NonNull Context newBase) {
-    getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-    super.attachBaseContext(newBase);
-  }
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);

app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java

@@ -9,6 +9,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.Toast;
@@ -126,6 +128,14 @@ public final class EnterPhoneNumberFragment extends LoggingFragment implements R
     if (supportActionBar != null) {
       supportActionBar.setTitle(null);
     }
+    controller.prepopulateCountryCode();
+    showKeyboard(number.getEditText());
+  }
+
+  private void showKeyboard(View viewToFocus) {
+    viewToFocus.requestFocus();
+    InputMethodManager imm = (InputMethodManager) requireContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+    imm.showSoftInput(viewToFocus, InputMethodManager.SHOW_IMPLICIT);
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt

@@ -43,6 +43,10 @@ class RegistrationNumberInputController(
     spinnerView.addTextChangedListener(CountryCodeEntryListener())
   }
 
+  fun prepopulateCountryCode() {
+    spinnerView.setText(supportedCountryPrefixes[0].toString())
+  }
+
   private fun advanceToPhoneNumberInput() {
     if (!isUpdating) {
       phoneNumberInputLayout.requestFocus()

app/src/main/res/layout/base_kbs_pin_fragment.xml

@@ -62,6 +62,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edit_kbs_pin_input"
+                style="@style/Widget.Signal.TextInputEditText.Registration"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"

app/src/main/res/layout/fragment_registration_enter_code.xml

@@ -69,13 +69,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/code"
+                android:layout_marginEnd="22dp"
+                android:layout_marginBottom="8dp"
                 android:hyphenationFrequency="normal"
                 android:maxWidth="150dp"
+                android:maxLines="2"
                 android:textColor="@color/signal_text_secondary"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/resend_sms_count_down"
+                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/code"
                 app:layout_constraintVertical_bias="1.0"
                 tools:text="@string/RegistrationActivity_call" />
@@ -86,11 +87,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/code"
+                android:layout_marginStart="22dp"
+                android:layout_marginBottom="8dp"
                 android:hyphenationFrequency="normal"
                 android:maxWidth="150dp"
+                android:maxLines="2"
                 android:textColor="@color/signal_text_secondary"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/call_me_count_down"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/code"
                 app:layout_constraintVertical_bias="1.0"
                 tools:text="@string/RegistrationActivity_resend_code" />
@@ -101,7 +107,9 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_centerHorizontal="true"
+                android:layout_marginStart="32dp"
                 android:layout_marginTop="32dp"
+                android:layout_marginEnd="32dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/wrong_number" />

app/src/main/res/layout/fragment_registration_enter_phone_number.xml

@@ -51,6 +51,8 @@
                     android:maxLines="1"
                     android:padding="0dp"
                     android:singleLine="true"
+                    android:textColor="@color/signal_colorOnSurfaceVariant"
+                    android:textColorHint="@color/signal_colorOnSurfaceVariant"
                     tools:text="+1" />
 
             </com.google.android.material.textfield.TextInputLayout>
@@ -67,7 +69,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeOptions="actionDone"
-                    android:inputType="phone" />
+                    android:inputType="phone"
+                    style="@style/Widget.Signal.TextInputEditText.Registration">
+
+                    <requestFocus />
+                </com.google.android.material.textfield.TextInputEditText>
 
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>

app/src/main/res/layout/fragment_transfer_restore.xml

@@ -93,7 +93,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/ic_backup_outline_60"
-                app:tint="@color/signal_accent_primary" />
+                app:tint="@color/signal_colorPrimary" />
 
             <TextView
                 android:id="@+id/transfer_or_restore_fragment_restore_header"

app/src/main/res/layout/pin_restore_entry_fragment.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true">
+    android:fillViewport="true"
+    tools:viewBindingIgnore="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -18,11 +18,11 @@
             android:layout_marginStart="24dp"
             android:layout_marginTop="32dp"
             android:layout_marginEnd="24dp"
+            android:text="@string/RegistrationLockFragment__enter_your_pin"
             android:textAppearance="@style/Signal.Text.HeadlineMedium"
+            app:layout_constraintBottom_toTopOf="@id/pin_restore_pin_description"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:text="@string/RegistrationLockFragment__enter_your_pin"
-            app:layout_constraintBottom_toTopOf="@id/pin_restore_pin_description"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.0" />
 

app/src/main/res/layout/pin_restore_locked_fragment.xml

@@ -5,30 +5,33 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/pin_locked_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="49dp"
+        android:layout_marginStart="32dp"
-        android:gravity="center_horizontal"
+        android:layout_marginEnd="32dp"
         android:text="@string/PinRestoreLockedFragment_create_your_pin"
-        android:textAppearance="@style/TextAppearance.Signal.Title1"
+        android:textAppearance="@style/Signal.Text.HeadlineMedium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
     <TextView
         android:id="@+id/pin_locked_description"
+        style="@style/Signal.Text.BodyLarge"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="27dp"
+        android:layout_marginStart="32dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="16dp"
-        android:layout_marginEnd="27dp"
+        android:layout_marginEnd="32dp"
-        android:gravity="center_horizontal"
         android:minHeight="66dp"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-        android:textColor="@color/core_grey_60"
         android:text="@string/PinRestoreLockedFragment_youve_run_out_of_pin_guesses"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -36,7 +39,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/pin_locked_next"
-        style="@style/Signal.Widget.Button.Large.Primary"
+        style="@style/Signal.Widget.Button.Large.Tonal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"

app/src/main/res/layout/profile_create_fragment.xml

@@ -143,7 +143,7 @@
 
                         <org.thoughtcrime.securesms.components.emoji.EmojiEditText
                             android:id="@+id/given_name"
-                            style="@style/Signal.Text.Body"
+                            style="@style/Widget.Signal.TextInputEditText.Registration"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -176,7 +176,7 @@
 
                         <org.thoughtcrime.securesms.components.emoji.EmojiEditText
                             android:id="@+id/family_name"
-                            style="@style/Signal.Text.Body"
+                            style="@style/Widget.Signal.TextInputEditText.Registration"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -264,9 +264,9 @@
 
         <org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton
             android:id="@+id/finish_button"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="50dp"
-            android:layout_gravity="center_horizontal"
+            android:layout_gravity="end"
             android:layout_marginStart="32dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="32dp"

app/src/main/res/layout/verification_code_view.xml

@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:layout_gravity="center"
     android:layoutDirection="ltr"
     tools:viewBindingIgnore="true">
@@ -12,10 +12,10 @@
         android:id="@+id/container_zero"
         style="@style/Widget.Signal.TextInputLayout.Registration"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         app:errorEnabled="false"
         app:hintEnabled="false"
-        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintDimensionRatio="6:7"
         app:layout_constraintEnd_toStartOf="@+id/container_one"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,13 +23,15 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/code_zero"
-            android:layout_width="48dp"
+            style="@style/Widget.Signal.TextInputEditText.Registration"
-            android:layout_height="56dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
             android:importantForAccessibility="yes"
+            android:inputType="none"
             android:padding="0dp"
-            android:textSize="16sp"
+            android:textAppearance="@style/Signal.Text.BodyLarge"
             tools:text="0" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -38,11 +40,11 @@
         android:id="@+id/container_one"
         style="@style/Widget.Signal.TextInputLayout.Registration"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginStart="4dp"
         app:errorEnabled="false"
         app:hintEnabled="false"
-        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintDimensionRatio="6:7"
         app:layout_constraintEnd_toStartOf="@+id/container_two"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/container_zero"
@@ -50,11 +52,13 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/code_one"
-            android:layout_width="48dp"
+            style="@style/Widget.Signal.TextInputEditText.Registration"
-            android:layout_height="56dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
             android:importantForAccessibility="yes"
+            android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             tools:text="1" />
@@ -65,11 +69,11 @@
         android:id="@+id/container_two"
         style="@style/Widget.Signal.TextInputLayout.Registration"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginStart="4dp"
         app:errorEnabled="false"
         app:hintEnabled="false"
-        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintDimensionRatio="6:7"
         app:layout_constraintEnd_toStartOf="@+id/separator"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/container_one"
@@ -77,11 +81,13 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/code_two"
-            android:layout_width="48dp"
+            style="@style/Widget.Signal.TextInputEditText.Registration"
-            android:layout_height="56dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
             android:importantForAccessibility="yes"
+            android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             tools:text="2" />
@@ -91,8 +97,8 @@
     <TextView
         android:id="@+id/separator"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
-        android:layout_gravity="center"
+        android:gravity="center"
         android:layout_marginStart="4dp"
         android:importantForAccessibility="no"
         android:text="-"
@@ -108,11 +114,11 @@
         android:id="@+id/container_three"
         style="@style/Widget.Signal.TextInputLayout.Registration"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginStart="4dp"
         app:errorEnabled="false"
         app:hintEnabled="false"
-        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintDimensionRatio="6:7"
         app:layout_constraintEnd_toStartOf="@+id/container_four"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/separator"
@@ -120,11 +126,13 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/code_three"
-            android:layout_width="48dp"
+            style="@style/Widget.Signal.TextInputEditText.Registration"
-            android:layout_height="56dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
             android:importantForAccessibility="yes"
+            android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             tools:text="3" />
@@ -135,11 +143,11 @@
         android:id="@+id/container_four"
         style="@style/Widget.Signal.TextInputLayout.Registration"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginStart="4dp"
         app:errorEnabled="false"
         app:hintEnabled="false"
-        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintDimensionRatio="6:7"
         app:layout_constraintEnd_toStartOf="@+id/container_five"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/container_three"
@@ -147,11 +155,13 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/code_four"
-            android:layout_width="48dp"
+            style="@style/Widget.Signal.TextInputEditText.Registration"
-            android:layout_height="56dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
             android:importantForAccessibility="yes"
+            android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             tools:text="4" />
@@ -162,11 +172,11 @@
         android:id="@+id/container_five"
         style="@style/Widget.Signal.TextInputLayout.Registration"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginStart="4dp"
         app:errorEnabled="false"
         app:hintEnabled="false"
-        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintDimensionRatio="6:7"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/container_four"
@@ -174,10 +184,13 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/code_five"
-            android:layout_width="48dp"
+            style="@style/Widget.Signal.TextInputEditText.Registration"
-            android:layout_height="56dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
+            android:importantForAccessibility="yes"
+            android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             tools:text="5" />

app/src/main/res/values/strings.xml

@@ -3395,7 +3395,7 @@
     <string name="LocalBackupJobApi29_your_backup_contains_a_very_large_file">Your backup contains a very large file that cannot be backed up. Please delete it and create a new backup.</string>
     <string name="LocalBackupJobApi29_tap_to_manage_backups">Tap to manage backups.</string>
     <string name="RegistrationActivity_wrong_number">Wrong number?</string>
-    <string name="RegistrationActivity_call_me_instead_available_in">Call me instead \n (Available in %1$02d:%2$02d)</string>
+    <string name="RegistrationActivity_call_me_instead_available_in">Call me (%1$02d:%2$02d)</string>
     <string name="RegistrationActivity_contact_signal_support">Contact Signal Support</string>
     <string name="RegistrationActivity_code_support_subject">Signal Registration - Verification Code for Android</string>
     <string name="RegistrationActivity_incorrect_code">Incorrect code</string>

app/src/main/res/values/styles.xml

@@ -505,7 +505,13 @@
         <item name="boxCornerRadiusTopEnd">4dp</item>
         <item name="boxCornerRadiusTopStart">4dp</item>
         <item name="hintTextColor">@color/signal_colorPrimary</item>
-        <item name="android:textColorHint">@color/signal_colorPrimary</item>
+        <item name="android:textColorHint">@color/signal_colorOnSurfaceVariant</item>
+        <item name="android:textCursorDrawable">@color/signal_colorPrimary</item>
+        <item name="colorAccent">@android:color/white</item>
+    </style>
+
+    <style name="Widget.Signal.TextInputEditText.Registration" parent="Widget.MaterialComponents.TextInputEditText.FilledBox">
+        <item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
     </style>
 
 
@@ -515,8 +521,6 @@
         <item name="boxBackgroundColor">@color/signal_colorSurfaceVariant</item>
         <item name="boxCornerRadiusTopEnd">2dp</item>
         <item name="boxCornerRadiusTopStart">2dp</item>
-        <item name="hintTextColor">@color/signal_colorPrimary</item>
-        <item name="android:textColorHint">@color/signal_colorPrimary</item>
     </style>
 
     <style name="Widget.MaterialComponents.Button.TextButton.Dialog">