Redesign FTUX to use Material Design 3.

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

@@ -0,0 +1,56 @@
+package org.thoughtcrime.securesms.components.registration
+
+import android.content.Context
+import android.util.AttributeSet
+import com.google.android.material.button.MaterialButton
+import org.thoughtcrime.securesms.R
+import java.util.concurrent.TimeUnit
+
+class ActionCountDownButton @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyle: Int = 0
+) : MaterialButton(context, attrs, defStyle) {
+  private var countDownToTime: Long = 0
+  private var listener: Listener? = null
+
+  /**
+   * Starts a count down to the specified {@param time}.
+   */
+  fun startCountDownTo(time: Long) {
+    if (time > 0) {
+      countDownToTime = time
+      updateCountDown()
+    }
+  }
+
+  fun setCallEnabled() {
+    setText(R.string.RegistrationActivity_call)
+    isEnabled = true
+    alpha = 1.0f
+  }
+
+  private fun updateCountDown() {
+    val remainingMillis = countDownToTime - System.currentTimeMillis()
+    if (remainingMillis > 0) {
+      isEnabled = false
+      alpha = 0.5f
+      val totalRemainingSeconds = TimeUnit.MILLISECONDS.toSeconds(remainingMillis).toInt()
+      val minutesRemaining = totalRemainingSeconds / 60
+      val secondsRemaining = totalRemainingSeconds % 60
+      text = resources.getString(R.string.RegistrationActivity_call_me_instead_available_in, minutesRemaining, secondsRemaining)
+      listener?.onRemaining(this, totalRemainingSeconds)
+      postDelayed({ updateCountDown() }, 250)
+    } else {
+      setCallEnabled()
+    }
+  }
+
+  fun setListener(listener: Listener?) {
+    this.listener = listener
+  }
+
+  interface Listener {
+    fun onRemaining(view: ActionCountDownButton, secondsRemaining: Int)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java

@@ -1,79 +0,0 @@
-package org.thoughtcrime.securesms.components.registration;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.android.material.button.MaterialButton;
-
-import org.thoughtcrime.securesms.R;
-
-import java.util.concurrent.TimeUnit;
-
-public class CallMeCountDownView extends MaterialButton {
-
-  private long countDownToTime;
-  @Nullable
-  private Listener listener;
-
-  public CallMeCountDownView(Context context) {
-    super(context);
-  }
-
-  public CallMeCountDownView(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  public CallMeCountDownView(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-  }
-
-  /**
-   * Starts a count down to the specified {@param time}.
-   */
-  public void startCountDownTo(long time) {
-    if (time > 0) {
-      this.countDownToTime = time;
-      updateCountDown();
-    }
-  }
-
-  public void setCallEnabled() {
-    setText(R.string.RegistrationActivity_call);
-    setEnabled(true);
-    setAlpha(1.0f);
-  }
-
-  private void updateCountDown() {
-    final long remainingMillis = countDownToTime - System.currentTimeMillis();
-
-    if (remainingMillis > 0) {
-      setEnabled(false);
-      setAlpha(0.5f);
-
-      int totalRemainingSeconds = (int) TimeUnit.MILLISECONDS.toSeconds(remainingMillis);
-      int minutesRemaining      = totalRemainingSeconds / 60;
-      int secondsRemaining      = totalRemainingSeconds % 60;
-
-      setText(getResources().getString(R.string.RegistrationActivity_call_me_instead_available_in, minutesRemaining, secondsRemaining));
-
-      if (listener != null) {
-        listener.onRemaining(this, totalRemainingSeconds);
-      }
-
-      postDelayed(this::updateCountDown, 250);
-    } else {
-      setCallEnabled();
-    }
-  }
-
-  public void setListener(@Nullable Listener listener) {
-    this.listener = listener;
-  }
-
-  public interface Listener {
-    void onRemaining(@NonNull CallMeCountDownView view, int secondsRemaining);
-  }
-}

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

@@ -1,139 +0,0 @@
-package org.thoughtcrime.securesms.components.registration;
-
-import android.content.Context;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.OvershootInterpolator;
-import android.view.animation.TranslateAnimation;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Stream;
-
-import org.thoughtcrime.securesms.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class VerificationCodeView extends FrameLayout {
-
-  private final List<TextView> codes      = new ArrayList<>(6);
-  private final List<View>     containers = new ArrayList<>(6);
-
-  private OnCodeEnteredListener listener;
-  private int                   index;
-
-  public VerificationCodeView(Context context) {
-    super(context);
-    initialize(context);
-  }
-
-  public VerificationCodeView(Context context, @Nullable AttributeSet attrs) {
-    super(context, attrs);
-    initialize(context);
-  }
-
-  public VerificationCodeView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    initialize(context);
-  }
-
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public VerificationCodeView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-    initialize(context);
-  }
-
-  private void initialize(@NonNull Context context) {
-    inflate(context, R.layout.verification_code_view, this);
-
-    codes.add(findViewById(R.id.code_zero));
-    codes.add(findViewById(R.id.code_one));
-    codes.add(findViewById(R.id.code_two));
-    codes.add(findViewById(R.id.code_three));
-    codes.add(findViewById(R.id.code_four));
-    codes.add(findViewById(R.id.code_five));
-
-    containers.add(findViewById(R.id.container_zero));
-    containers.add(findViewById(R.id.container_one));
-    containers.add(findViewById(R.id.container_two));
-    containers.add(findViewById(R.id.container_three));
-    containers.add(findViewById(R.id.container_four));
-    containers.add(findViewById(R.id.container_five));
-  }
-
-  @MainThread
-  public void setOnCompleteListener(OnCodeEnteredListener listener) {
-    this.listener = listener;
-  }
-
-  @MainThread
-  public void append(int value) {
-    if (index >= codes.size()) return;
-
-    setInactive(containers);
-    setActive(containers.get(index));
-
-    TextView codeView = codes.get(index++);
-
-    Animation translateIn = new TranslateAnimation(0, 0, codeView.getHeight(), 0);
-    translateIn.setInterpolator(new OvershootInterpolator());
-    translateIn.setDuration(500);
-
-    Animation fadeIn = new AlphaAnimation(0, 1);
-    fadeIn.setDuration(200);
-
-    AnimationSet animationSet = new AnimationSet(false);
-    animationSet.addAnimation(fadeIn);
-    animationSet.addAnimation(translateIn);
-    animationSet.reset();
-    animationSet.setStartTime(0);
-
-    codeView.setText(String.valueOf(value));
-    codeView.clearAnimation();
-    codeView.startAnimation(animationSet);
-
-    if (index == codes.size() && listener != null) {
-      listener.onCodeComplete(Stream.of(codes).map(TextView::getText).collect(Collectors.joining()));
-    }
-  }
-
-  @MainThread
-  public void delete() {
-    if (index <= 0) return;
-    codes.get(--index).setText("");
-    setInactive(containers);
-    setActive(containers.get(index));
-  }
-
-  @MainThread
-  public void clear() {
-    if (index != 0) {
-      Stream.of(codes).forEach(code -> code.setText(""));
-      index = 0;
-    }
-    setInactive(containers);
-  }
-
-  private static void setInactive(List<View> views) {
-    Stream.of(views).forEach(c -> c.setBackgroundResource(R.drawable.labeled_edit_text_background_inactive));
-  }
-
-  private static void setActive(@NonNull View container) {
-    container.setBackgroundResource(R.drawable.labeled_edit_text_background_active);
-  }
-
-  public interface OnCodeEnteredListener {
-    void onCodeComplete(@NonNull String code);
-  }
-}

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

@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.components.registration
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import com.google.android.material.textfield.TextInputLayout
+import org.thoughtcrime.securesms.R
+
+class VerificationCodeView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, defStyleRes: Int = 0) :
+  FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+  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))
+    containers.add(findViewById(R.id.container_one))
+    containers.add(findViewById(R.id.container_two))
+    containers.add(findViewById(R.id.container_three))
+    containers.add(findViewById(R.id.container_four))
+    containers.add(findViewById(R.id.container_five))
+  }
+
+  fun setOnCompleteListener(listener: OnCodeEnteredListener?) {
+    this.listener = listener
+  }
+
+  fun append(digit: Int) {
+    if (index >= containers.size) return
+    containers[index++].editText?.setText(digit.toString())
+
+    if (index == containers.size) {
+      listener?.onCodeComplete(containers.joinToString("") { it.editText?.text.toString() })
+    }
+  }
+
+  fun delete() {
+    if (index <= 0) return
+    containers[--index].editText?.setText("")
+  }
+
+  fun clear() {
+    if (index != 0) {
+      containers.forEach { it.editText?.setText("") }
+      index = 0
+    }
+  }
+
+  interface OnCodeEnteredListener {
+    fun onCodeComplete(code: String)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt

@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNum
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberViewModel.ContinueStatus
 import org.thoughtcrime.securesms.registration.fragments.CountryPickerFragment
 import org.thoughtcrime.securesms.registration.fragments.CountryPickerFragmentArgs
-import org.thoughtcrime.securesms.registration.util.RegistrationNumberInputController
+import org.thoughtcrime.securesms.registration.util.ChangeNumberInputController
 import org.thoughtcrime.securesms.util.Dialogs
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
@@ -54,13 +54,13 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
     oldNumberCountryCode = view.findViewById(R.id.change_number_enter_phone_number_old_number_country_code)
     oldNumber = view.findViewById(R.id.change_number_enter_phone_number_old_number_number)
 
-    val oldController = RegistrationNumberInputController(
+    val oldController = ChangeNumberInputController(
       requireContext(),
       oldNumberCountryCode,
       oldNumber,
       oldNumberCountrySpinner,
       false,
-      object : RegistrationNumberInputController.Callbacks {
+      object : ChangeNumberInputController.Callbacks {
         override fun onNumberFocused() {
           scrollView.postDelayed({ scrollView.smoothScrollTo(0, oldNumber.bottom) }, 250)
         }
@@ -91,13 +91,13 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
     newNumberCountryCode = view.findViewById(R.id.change_number_enter_phone_number_new_number_country_code)
     newNumber = view.findViewById(R.id.change_number_enter_phone_number_new_number_number)
 
-    val newController = RegistrationNumberInputController(
+    val newController = ChangeNumberInputController(
       requireContext(),
       newNumberCountryCode,
       newNumber,
       newNumberCountrySpinner,
       true,
-      object : RegistrationNumberInputController.Callbacks {
+      object : ChangeNumberInputController.Callbacks {
         override fun onNumberFocused() {
           scrollView.postDelayed({ scrollView.smoothScrollTo(0, newNumber.bottom) }, 250)
         }