From f2191d299635c237a894c528d8e96452f38254f5 Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Thu, 6 Jun 2024 11:58:50 -0400 Subject: [PATCH] Adjust text colors in dark mode in Registration V2. --- .../registration/v2/ui/RegistrationV2Activity.kt | 10 ++++++++++ .../v2/ui/entercode/EnterCodeV2Fragment.kt | 9 +++++++++ .../thoughtcrime/securesms/restore/RestoreActivity.kt | 8 ++++++++ app/src/main/res/layout/create_profile_fragment.xml | 3 ++- .../res/layout/fragment_registration_enter_code_v2.xml | 1 + .../fragment_registration_enter_phone_number_v2.xml | 8 +++++--- app/src/main/res/layout/verification_code_view.xml | 6 ++++++ 7 files changed, 41 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt index 3231adc6bf..2d62e9ea32 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt @@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.profiles.AvatarHelper import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.registration.SmsRetrieverReceiver +import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme /** * Activity to hold the entire registration process. @@ -31,6 +32,7 @@ class RegistrationV2Activity : BaseActivity() { private val TAG = Log.tag(RegistrationV2Activity::class.java) + private val dynamicTheme = DynamicNoActionBarTheme() val sharedViewModel: RegistrationV2ViewModel by viewModels() private var smsRetrieverReceiver: SmsRetrieverReceiver? = null @@ -40,8 +42,11 @@ class RegistrationV2Activity : BaseActivity() { } override fun onCreate(savedInstanceState: Bundle?) { + dynamicTheme.onCreate(this) + super.onCreate(savedInstanceState) setContentView(R.layout.activity_registration_navigation_v2) + sharedViewModel.checkpoint.observe(this) { if (it >= RegistrationCheckpoint.LOCAL_REGISTRATION_COMPLETE) { handleSuccessfulVerify() @@ -49,6 +54,11 @@ class RegistrationV2Activity : BaseActivity() { } } + override fun onResume() { + super.onResume() + dynamicTheme.onResume(this) + } + private fun handleSuccessfulVerify() { if (SignalStore.misc().hasLinkedDevices) { SignalStore.misc().shouldShowLinkedDevicesReminder = sharedViewModel.isReregister diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt index 2587023ea1..3e29bf9c5f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt @@ -14,6 +14,7 @@ import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.i18n.phonenumbers.PhoneNumberUtil import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import org.signal.core.util.logging.Log @@ -123,6 +124,14 @@ class EnterCodeV2Fragment : LoggingFragment(R.layout.fragment_registration_enter } } + override fun onResume() { + super.onResume() + sharedViewModel.phoneNumber?.let { + val formatted = PhoneNumberUtil.getInstance().format(it, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL) + binding.verificationSubheader.setText(requireContext().getString(R.string.RegistrationActivity_enter_the_code_we_sent_to_s, formatted)) + } + } + private fun handleSessionErrorResponse(result: RegistrationResult) { when (result) { is VerificationCodeRequestResult.Success -> binding.keyboard.displaySuccess() diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt index fea5fb263b..eb85a2fd4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt @@ -13,15 +13,18 @@ import org.signal.core.util.getParcelableExtraCompat import org.thoughtcrime.securesms.BaseActivity import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R +import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme /** * Activity to hold the restore from backup flow. */ class RestoreActivity : BaseActivity() { + private val dynamicTheme = DynamicNoActionBarTheme() private val sharedViewModel: RestoreViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { + dynamicTheme.onCreate(this) super.onCreate(savedInstanceState) setResult(RESULT_CANCELED) @@ -32,6 +35,11 @@ class RestoreActivity : BaseActivity() { } } + override fun onResume() { + super.onResume() + dynamicTheme.onResume(this) + } + fun finishActivitySuccessfully() { setResult(RESULT_OK) finish() diff --git a/app/src/main/res/layout/create_profile_fragment.xml b/app/src/main/res/layout/create_profile_fragment.xml index 3b5b814a89..03787ed541 100644 --- a/app/src/main/res/layout/create_profile_fragment.xml +++ b/app/src/main/res/layout/create_profile_fragment.xml @@ -229,7 +229,8 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_group_24" /> + app:srcCompat="@drawable/ic_group_24" + app:tint="@color/signal_icon_tint_primary" /> @@ -61,14 +62,15 @@ android:layout_height="wrap_content" android:layout_weight="1" android:hint="@string/RegistrationActivity_phone_number_description" - app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout"> + android:theme="@style/Signal.ThemeOverlay.TextInputLayout" + app:editTextStyle="@style/Signal.ThemeOverlay.TextInputLayout"> + android:inputType="phone" + android:textColor="?attr/colorOnSurface"> diff --git a/app/src/main/res/layout/verification_code_view.xml b/app/src/main/res/layout/verification_code_view.xml index f134e07bae..06d3788229 100644 --- a/app/src/main/res/layout/verification_code_view.xml +++ b/app/src/main/res/layout/verification_code_view.xml @@ -33,6 +33,7 @@ android:inputType="none" android:padding="0dp" android:textAppearance="@style/Signal.Text.BodyLarge" + android:textColor="?attr/colorOnSurface" tools:text="0" /> @@ -63,6 +64,7 @@ android:inputType="none" android:padding="0dp" android:textAppearance="@style/Signal.Text.BodyLarge" + android:textColor="?attr/colorOnSurface" tools:text="1" /> @@ -93,6 +95,7 @@ android:inputType="none" android:padding="0dp" android:textAppearance="@style/Signal.Text.BodyLarge" + android:textColor="?attr/colorOnSurface" tools:text="2" /> @@ -140,6 +143,7 @@ android:inputType="none" android:padding="0dp" android:textAppearance="@style/Signal.Text.BodyLarge" + android:textColor="?attr/colorOnSurface" tools:text="3" /> @@ -170,6 +174,7 @@ android:inputType="none" android:padding="0dp" android:textAppearance="@style/Signal.Text.BodyLarge" + android:textColor="?attr/colorOnSurface" tools:text="4" /> @@ -200,6 +205,7 @@ android:inputType="none" android:padding="0dp" android:textAppearance="@style/Signal.Text.BodyLarge" + android:textColor="?attr/colorOnSurface" tools:text="5" />