diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt index fcd268478a..ea644f792a 100644 --- a/app/src/main/java/com/tangem/tap/MainActivity.kt +++ b/app/src/main/java/com/tangem/tap/MainActivity.kt @@ -174,19 +174,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac private val onActivityResultCallbacks = mutableListOf() - override fun onConfigurationChanged(newConfig: Configuration) { - super.onConfigurationChanged(newConfig) - - /* - * We need to manually change the background color of the activity when the UI mode changes to prevent - * flickering when navigating between fragments. - * - - * `android:configChanges="uiMode"` is set in the manifest. - * */ - updateAppBackground() - } - override fun onCreate(savedInstanceState: Bundle?) { // We need to call it before onCreate to prevent unnecessary activity recreation installAppTheme() @@ -294,10 +281,10 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac return tangemApplication.getAppThemeModeUseCase() .filterNotNull() + .distinctUntilChanged() .map { maybeMode -> maybeMode.getOrElse { AppThemeMode.DEFAULT } } - .distinctUntilChanged() .shareIn( scope = lifecycleScope, started = SharingStarted.WhileSubscribed(stopTimeoutMillis = 5_000), @@ -367,6 +354,19 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac MutableAppThemeModeHolder.isDarkThemeActive = isDarkTheme() } + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + + /* + * We need to manually change the background color of the activity when the UI mode changes to prevent + * flickering when navigating between fragments. + * + + * `android:configChanges="uiMode"` is set in the manifest. + * */ + updateAppBackground() + } + private fun updateAppBackground() { val backgroundColor = if (isDarkTheme()) { TangemColorPalette.Dark6 diff --git a/app/src/main/java/com/tangem/tap/di/data/CardSDKLoggerModule.kt b/app/src/main/java/com/tangem/tap/di/data/CardSDKLoggerModule.kt index 6da93efeb4..9b326b64c7 100644 --- a/app/src/main/java/com/tangem/tap/di/data/CardSDKLoggerModule.kt +++ b/app/src/main/java/com/tangem/tap/di/data/CardSDKLoggerModule.kt @@ -33,6 +33,7 @@ internal object CardSDKLoggerModule { Log.Level.Network, Log.Level.Error, Log.Level.Biometric, + Log.Level.Info, ) return TangemCardSDKLogger(