Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-27 05:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address various issues with dark theme registration flow.

Browse Source
This commit is contained in:
Cody Henthorne
2023-02-15 13:20:12 -05:00
committed by Greyson Parrelli
parent e2c3db3eda
commit 6100160e18
12 changed files with 96 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()
}
}

18
app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreActivity.java
View File

@@ -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);

12
app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java
View File

@@ -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);