From 2f701f7237f69f2e9516d95b60c4234c56320cc5 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 22 Jul 2022 13:21:46 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/MainActivity.kt | 8 ++++++-- .../com/tangem/tap/features/home/HomeFragment.kt | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt index ac07841c19..78d55638ca 100644 --- a/app/src/main/java/com/tangem/tap/MainActivity.kt +++ b/app/src/main/java/com/tangem/tap/MainActivity.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsControllerCompat import by.kirich1409.viewbindingdelegate.viewBinding import com.google.android.material.snackbar.Snackbar import com.tangem.TangemSdk @@ -28,11 +29,11 @@ import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction import com.tangem.tap.features.shop.redux.ShopAction import com.tangem.wallet.R import com.tangem.wallet.databinding.ActivityMainBinding -import java.lang.ref.WeakReference -import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job +import java.lang.ref.WeakReference +import kotlin.coroutines.CoroutineContext lateinit var tangemSdk: TangemSdk lateinit var tangemSdkManager: TangemSdkManager @@ -85,6 +86,9 @@ class MainActivity : AppCompatActivity(), SnackbarHandler { private fun systemActions() { WindowCompat.setDecorFitsSystemWindows(window, false) + WindowInsetsControllerCompat(window, binding.root) + .isAppearanceLightStatusBars = true + requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT } diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 4e8f7b62b6..f1b3fa3f55 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.ui.platform.ComposeView +import androidx.core.view.WindowInsetsControllerCompat import androidx.fragment.app.Fragment import com.google.accompanist.appcompattheme.AppCompatTheme import com.tangem.tap.common.redux.navigation.AppScreen @@ -23,7 +24,7 @@ import org.rekotlin.StoreSubscriber class HomeFragment : Fragment(), StoreSubscriber { private var homeState: MutableState = mutableStateOf(store.state.homeState) - var composeView: ComposeView? = null + private var composeView: ComposeView? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -65,6 +66,7 @@ class HomeFragment : Fragment(), StoreSubscriber { override fun onDestroyView() { super.onDestroyView() + rollbackStatusBarIconsColor() composeView = null } @@ -91,4 +93,15 @@ class HomeFragment : Fragment(), StoreSubscriber { } ) } + + /* + * !!! Workaround !!! + * Used to roll back the color of icons in the status bar after the stories screen + * */ + private fun rollbackStatusBarIconsColor() { + WindowInsetsControllerCompat( + activity?.window ?: return, + view ?: return, + ).isAppearanceLightStatusBars = true + } } \ No newline at end of file