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

Adjust text colors in dark mode in Registration V2.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-06-06 11:58:50 -04:00
committed by Cody Henthorne
parent 7dfffbd50b
commit f2191d2996
7 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt
View File

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

9
app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt
View File

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

8
app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
View File

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