Address various issues with dark theme registration flow.

main
Cody Henthorne 2023-02-15 13:20:12 -05:00 zatwierdzone przez Greyson Parrelli
rodzic e2c3db3eda
commit 6100160e18
12 zmienionych plików z 96 dodań i 70 usunięć

Wyświetl plik

@ -464,7 +464,7 @@
<activity android:name=".registration.RegistrationNavigationActivity"
android:launchMode="singleTask"
android:theme="@style/TextSecure.LightRegistrationTheme"
android:theme="@style/Theme.Signal.DayNight.NoActionBar"
android:windowSoftInputMode="stateHidden"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

Wyświetl plik

@ -43,12 +43,14 @@ class VerificationCodeView @JvmOverloads constructor(context: Context, attrs: At
fun delete() {
if (index <= 0) return
containers[--index].editText?.setText("")
containers[index].editText?.requestFocus()
}
fun clear() {
if (index != 0) {
containers.forEach { it.editText?.setText("") }
index = 0
containers[index].editText?.requestFocus()
}
}

Wyświetl plik

@ -1,33 +1,35 @@
package org.thoughtcrime.securesms.pin;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import org.thoughtcrime.securesms.MainActivity;
import org.thoughtcrime.securesms.PassphraseRequiredActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
import org.thoughtcrime.securesms.util.DynamicTheme;
public final class PinRestoreActivity extends AppCompatActivity {
@Override
protected void attachBaseContext(@NonNull Context newBase) {
getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
super.attachBaseContext(newBase);
}
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
dynamicTheme.onCreate(this);
super.onCreate(savedInstanceState);
setContentView(R.layout.pin_restore_activity);
}
@Override
protected void onResume() {
super.onResume();
dynamicTheme.onResume(this);
}
void navigateToPinCreation() {
final Intent main = MainActivity.clearTop(this);
final Intent createPin = CreateKbsPinActivity.getIntentForPinCreate(this);

Wyświetl plik

@ -14,6 +14,8 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
import org.thoughtcrime.securesms.util.CommunicationActions;
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
import org.thoughtcrime.securesms.util.DynamicTheme;
public final class RegistrationNavigationActivity extends AppCompatActivity {
@ -22,6 +24,8 @@ public final class RegistrationNavigationActivity extends AppCompatActivity {
public static final String RE_REGISTRATION_EXTRA = "re_registration";
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
private SmsRetrieverReceiver smsRetrieverReceiver;
private RegistrationViewModel viewModel;
@ -44,6 +48,8 @@ public final class RegistrationNavigationActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
dynamicTheme.onCreate(this);
super.onCreate(savedInstanceState);
viewModel = new ViewModelProvider(this, new RegistrationViewModel.Factory(this, isReregister(getIntent()))).get(RegistrationViewModel.class);
@ -55,6 +61,12 @@ public final class RegistrationNavigationActivity extends AppCompatActivity {
}
}
@Override
protected void onResume() {
super.onResume();
dynamicTheme.onResume(this);
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);

Wyświetl plik

@ -60,18 +60,17 @@
app:hintEnabled="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edit_kbs_pin_description">
app:layout_constraintTop_toBottomOf="@+id/edit_kbs_pin_description"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_kbs_pin_input"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:imeOptions="actionDone"
android:inputType="numberPassword"
android:textColor="@color/signal_colorOnSurface"
android:textCursorDrawable="@color/signal_colorOnSurface"
tools:text="1234567890" />
</com.google.android.material.textfield.TextInputLayout>

Wyświetl plik

@ -37,6 +37,7 @@
style="@style/Widget.Signal.TextInputLayout.Registration.Dropdown"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:theme="@style/Signal.ThemeOverlay.TextInputLayout"
app:errorEnabled="false"
app:hintEnabled="false">
@ -51,8 +52,6 @@
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>
@ -63,14 +62,15 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/RegistrationActivity_phone_number_description">
android:hint="@string/RegistrationActivity_phone_number_description"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionDone"
android:inputType="phone"
style="@style/Widget.Signal.TextInputEditText.Registration">
android:inputType="phone">
<requestFocus />
</com.google.android.material.textfield.TextInputEditText>
@ -101,7 +101,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:text="@string/RegistrationActivity_you_will_receive_a_verification_code"
android:textColor="@color/core_grey_60"
android:textColor="@color/signal_colorOnSurfaceVariant"
app:layout_constraintTop_toBottomOf="@+id/verify_header"
tools:layout_editor_absoluteX="0dp" />
@ -113,13 +113,11 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="@android:string/cancel"
android:textColor="@color/core_grey_60"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/registerButton"
app:layout_constraintVertical_bias="0" />
tools:visibility="visible" />
<org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton
android:id="@+id/registerButton"
@ -130,10 +128,8 @@
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp"
app:circularProgressMaterialButton__label="@string/RegistrationActivity_continue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/cancel_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintVertical_bias="0"
app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Tonal" />
</androidx.constraintlayout.widget.ConstraintLayout>

Wyświetl plik

@ -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">
<LinearLayout
android:layout_width="match_parent"
@ -22,7 +22,7 @@
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="@string/TransferOrRestoreFragment__transfer_or_restore_account"
android:textAppearance="@style/Signal.Text.Headline.Registration" />
android:textAppearance="@style/Signal.Text.HeadlineMedium" />
<TextView
android:layout_width="match_parent"
@ -30,7 +30,8 @@
android:layout_marginBottom="@dimen/transfer_item_spacing"
android:gravity="center"
android:text="@string/TransferOrRestoreFragment__if_you_have_previously_registered_a_signal_account"
android:textAppearance="@style/TextAppearance.Signal.Body1" />
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOnSurfaceVariant" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/transfer_or_restore_fragment_transfer"
@ -48,7 +49,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_transfer_phone_48"
app:tint="@color/signal_colorPrimary"/>
app:tint="@color/signal_colorPrimary" />
<TextView
android:id="@+id/transfer_or_restore_fragment_transfer_header"
@ -56,7 +57,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/TransferOrRestoreFragment__transfer_from_android_device"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
android:textAppearance="@style/Signal.Text.Body"
app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_transfer_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
@ -68,7 +69,7 @@
android:id="@+id/transfer_or_restore_fragment_transfer_description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/signal_text_secondary"
android:textColor="@color/signal_colorOnSurfaceVariant"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
@ -102,7 +103,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/TransferOrRestoreFragment__restore_from_backup"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
android:textAppearance="@style/Signal.Text.Body"
app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_restore_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
@ -115,7 +116,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/TransferOrRestoreFragment__restore_your_messages_from_a_local_backup"
android:textColor="@color/signal_text_secondary"
android:textColor="@color/signal_colorOnSurfaceVariant"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"

Wyświetl plik

@ -36,7 +36,7 @@
android:minHeight="66dp"
android:text="@string/RegistrationLockFragment__enter_the_pin_you_created"
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/core_grey_60"
android:textColor="@color/signal_colorOnSurfaceVariant"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/pin_restore_pin_title" />
@ -53,14 +53,18 @@
android:minWidth="210dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pin_restore_pin_description">
app:layout_constraintTop_toBottomOf="@+id/pin_restore_pin_description"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/pin_restore_pin_input"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:imeOptions="actionDone"
android:inputType="numberPassword" />
android:inputType="numberPassword"
tools:text="1234567890" />
</com.google.android.material.textfield.TextInputLayout>
<TextView

Wyświetl plik

@ -60,7 +60,7 @@
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:layout_marginBottom="16dp"
android:text="@string/ProfileCreateFragment__profiles_are_visible_to_contacts_and_people_you_message"
android:textColor="@color/core_grey_60"
android:textColor="@color/signal_colorOnSurfaceVariant"
app:layout_constraintTop_toBottomOf="@id/title" />
<androidx.appcompat.widget.AppCompatImageView
@ -135,15 +135,17 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/given_name_wrapper"
style="@style/Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor"
style="@style/Widget.Signal.TextInputLayout.Registration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="13dp"
android:hint="@string/CreateProfileActivity_first_name_required">
android:hint="@string/CreateProfileActivity_first_name_required"
android:theme="@style/Signal.ThemeOverlay.TextInputLayout">
<org.thoughtcrime.securesms.components.emoji.EmojiEditText
android:id="@+id/given_name"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@ -168,15 +170,17 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/family_name_wrapper"
style="@style/Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor"
style="@style/Widget.Signal.TextInputLayout.Registration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="13dp"
android:hint="@string/CreateProfileActivity_last_name_optional">
android:hint="@string/CreateProfileActivity_last_name_optional"
android:theme="@style/Signal.ThemeOverlay.TextInputLayout">
<org.thoughtcrime.securesms.components.emoji.EmojiEditText
android:id="@+id/family_name"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"

Wyświetl plik

@ -19,11 +19,12 @@
app:layout_constraintEnd_toStartOf="@+id/container_one"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/code_zero"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
@ -48,11 +49,12 @@
app:layout_constraintEnd_toStartOf="@+id/container_two"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/container_zero"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/code_one"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
@ -77,11 +79,12 @@
app:layout_constraintEnd_toStartOf="@+id/separator"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/container_one"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/code_two"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
@ -98,8 +101,8 @@
android:id="@+id/separator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:layout_marginStart="4dp"
android:gravity="center"
android:importantForAccessibility="no"
android:text="-"
android:textSize="28sp"
@ -108,6 +111,7 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/container_two"
app:layout_constraintTop_toTopOf="parent"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout"
tools:ignore="HardcodedText" />
<com.google.android.material.textfield.TextInputLayout
@ -122,11 +126,12 @@
app:layout_constraintEnd_toStartOf="@+id/container_four"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/separator"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/code_three"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
@ -151,11 +156,12 @@
app:layout_constraintEnd_toStartOf="@+id/container_five"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/container_three"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/code_four"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
@ -180,11 +186,12 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/container_four"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/code_five"
style="@style/Widget.Signal.TextInputEditText.Registration"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"

Wyświetl plik

@ -304,6 +304,8 @@
</style>
<style name="ThemeOverlay.Signal.CircularProgressIndicator.Tonal" parent="ThemeOverlay.Material3">
<item name="colorPrimary">@color/signal_colorPrimary</item>
<item name="colorSurfaceVariant">@color/signal_colorSurfaceVariant</item>
<item name="circularProgressMaterialButtonStyle">@style/Signal.Widget.Button.Large.Tonal</item>
<item name="circularProgressIndicatorStyle">@style/Widget.Signal.CircularProgressIndicator.Medium.Indeterminate</item>
</style>
@ -315,4 +317,13 @@
<style name="Widget.Signal.CircularProgressIndicator.Medium.Indeterminate.Tonal">
<item name="indicatorColor">@color/signal_colorPrimaryContainer</item>
</style>
<style name="Signal.ThemeOverlay.TextInputLayout" parent="ThemeOverlay.Material3">
<item name="colorSurfaceVariant">@color/signal_colorSurfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/signal_colorOnSurfaceVariant</item>
<item name="colorPrimary">@color/signal_colorPrimary</item>
<item name="colorOnPrimary">@color/signal_colorOnPrimary</item>
<item name="colorOnSurface">@color/signal_colorOnSurface</item>
<item name="colorError">@color/signal_colorError</item>
</style>
</resources>

Wyświetl plik

@ -494,26 +494,14 @@
</style>
<style name="Widget.Signal.TextInputLayout.Registration" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
<item name="boxBackgroundColor">@color/signal_colorSurfaceVariant</item>
<item name="boxCornerRadiusTopEnd">4dp</item>
<item name="boxCornerRadiusTopStart">4dp</item>
<item name="hintTextColor">@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>
<item name="hintTextAppearance">@style/Signal.Text.LabelMedium</item>
<item name="boxStrokeErrorColor">@color/signal_colorError</item>
</style>
<style name="Widget.Signal.TextInputEditText.Registration" parent="Widget.MaterialComponents.TextInputEditText.FilledBox">
<item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
</style>
<style name="Widget.Signal.TextInputLayout.Registration.Dropdown" parent="Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
<item name="android:paddingStart">12dp</item>
<item name="android:paddingEnd">6dp</item>
<item name="boxBackgroundColor">@color/signal_colorSurfaceVariant</item>
<item name="boxCornerRadiusTopEnd">2dp</item>
<item name="boxCornerRadiusTopStart">2dp</item>
</style>