From d5707638a64538b77ac8a3260ead08ec02031e3e Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 11 Mar 2024 13:01:23 -0300 Subject: [PATCH] Apply proper theming to FindByActivity. --- .../securesms/recipients/ui/findby/FindByActivity.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt index 8872a47ca4..9e8f75016c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt @@ -66,7 +66,6 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.dialog import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument -import com.google.accompanist.permissions.ExperimentalPermissionsApi import kotlinx.coroutines.launch import org.signal.core.ui.Animations.navHostSlideInTransition import org.signal.core.ui.Animations.navHostSlideOutTransition @@ -86,6 +85,7 @@ import org.thoughtcrime.securesms.permissions.compose.Permissions import org.thoughtcrime.securesms.phonenumbers.PhoneNumberVisualTransformation import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.registration.util.CountryPrefix +import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme import org.thoughtcrime.securesms.util.viewModel import org.whispersystems.signalservice.api.util.PhoneNumberFormatter @@ -95,6 +95,8 @@ import org.whispersystems.signalservice.api.util.PhoneNumberFormatter */ class FindByActivity : PassphraseRequiredActivity() { + private val theme = DynamicNoActionBarTheme() + companion object { private const val MODE = "FindByActivity.mode" private const val RECIPIENT_ID = "FindByActivity.recipientId" @@ -104,8 +106,9 @@ class FindByActivity : PassphraseRequiredActivity() { FindByViewModel(FindByMode.valueOf(intent.getStringExtra(MODE)!!)) } - @OptIn(ExperimentalPermissionsApi::class) override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) { + theme.onCreate(this) + val qrScanLauncher: ActivityResultLauncher = registerForActivityResult(UsernameQrScannerActivity.Contract()) { recipientId -> if (recipientId != null) { setResult(RESULT_OK, Intent().putExtra(RECIPIENT_ID, recipientId)) @@ -284,6 +287,11 @@ class FindByActivity : PassphraseRequiredActivity() { } } + override fun onResume() { + super.onResume() + theme.onResume(this) + } + class Contract : ActivityResultContract() { override fun createIntent(context: Context, input: FindByMode): Intent { return Intent(context, FindByActivity::class.java)