Updated on 2026-08-14

app/src/main/java/com/tangem/tap/MainActivity.kt

@@ -12,15 +12,18 @@ import android.nfc.NfcAdapter
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
@@ -195,6 +198,13 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
 
         installAppTheme() // We need to call it before onCreate to prevent unnecessary activity recreation
 
+        enableEdgeToEdge(
+            navigationBarStyle = SystemBarStyle.auto(
+                Color.Transparent.toArgb(),
+                Color.Transparent.toArgb(),
+            ),
+        )
+
         super.onCreate(savedInstanceState)
 
         splashScreen.setKeepOnScreenCondition { viewModel.isSplashScreenShown }
@@ -307,8 +317,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
 
     @SuppressLint("SourceLockedOrientationActivity")
     private fun initContent() {
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
         supportFragmentManager.registerFragmentLifecycleCallbacks(
             NavBarInsetsFragmentLifecycleCallback(),
             true,

app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/AddCustomTokenFragment.kt

@@ -1,12 +1,12 @@
 package com.tangem.tap.features.customtoken.impl.presentation
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.tangem.core.ui.UiDependencies
-import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.screen.ComposeFragment
 import com.tangem.tap.features.customtoken.impl.presentation.ui.AddCustomTokenScreen
@@ -30,12 +30,10 @@ internal class AddCustomTokenFragment : ComposeFragment() {
         val viewModel = hiltViewModel<AddCustomTokenViewModel>().apply {
             LocalLifecycleOwner.current.lifecycle.addObserver(this)
         }
-        val statusBarColor = TangemTheme.colors.background.secondary
-        SystemBarsEffect {
-            setSystemBarsColor(color = statusBarColor)
-        }
         AddCustomTokenScreen(
-            modifier = Modifier.systemBarsPadding(),
+            modifier = Modifier
+                .background(TangemTheme.colors.background.primary)
+                .systemBarsPadding(),
             stateHolder = viewModel.uiState,
         )
     }

app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorFragment.kt

@@ -6,8 +6,7 @@ import androidx.compose.ui.Modifier
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.core.ui.UiDependencies
-import com.tangem.core.ui.components.SystemBarsEffect
-import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.components.NavigationBar3ButtonsScrim
 import com.tangem.core.ui.screen.ComposeFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -22,12 +21,8 @@ internal class AppCurrencySelectorFragment : ComposeFragment() {
 
     @Composable
     override fun ScreenContent(modifier: Modifier) {
-        val systemBarsColor = TangemTheme.colors.background.secondary
-        SystemBarsEffect {
-            setSystemBarsColor(systemBarsColor)
-        }
-
         val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+        NavigationBar3ButtonsScrim()
         AppCurrencySelectorScreen(
             modifier = modifier,
             state = uiState,

app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -40,7 +41,9 @@ internal fun AppCurrencySelectorScreen(state: AppCurrencySelectorState, modifier
     val listState = rememberLazyListState()
 
     Scaffold(
-        modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        modifier = modifier
+            .imePadding()
+            .nestedScroll(scrollBehavior.nestedScrollConnection),
         containerColor = TangemTheme.colors.background.secondary,
         topBar = {
             TopBar(
@@ -49,6 +52,7 @@ internal fun AppCurrencySelectorScreen(state: AppCurrencySelectorState, modifier
                 state = state,
             )
         },
+        contentWindowInsets = ScaffoldDefaults.contentWindowInsets.exclude(WindowInsets.navigationBars),
         content = { paddingValues ->
             val contentModifier = Modifier
                 .padding(paddingValues)
@@ -62,7 +66,7 @@ internal fun AppCurrencySelectorScreen(state: AppCurrencySelectorState, modifier
                     modifier = contentModifier,
                     listState = listState,
                     currencies = state.items,
-                    selectedId = state.selectedId.orEmpty(),
+                    selectedId = state.selectedId,
                     onCurrencyClick = state.onCurrencyClick,
                 )
             }
@@ -175,6 +179,7 @@ private fun SearchBar(onInputChange: (String) -> Unit, modifier: Modifier = Modi
 
 @Composable
 private fun LoadingList(modifier: Modifier = Modifier) {
+    val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
     Column(modifier = modifier) {
         repeat(times = 10) {
             Row(
@@ -199,6 +204,7 @@ private fun LoadingList(modifier: Modifier = Modifier) {
                 )
             }
         }
+        Spacer(Modifier.height(bottomBarHeight))
     }
 }
 
@@ -210,9 +216,11 @@ private fun CurrenciesList(
     onCurrencyClick: (Currency) -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
     LazyColumn(
         modifier = modifier,
         state = listState,
+        contentPadding = PaddingValues(bottom = bottomBarHeight),
     ) {
         items(
             items = currencies,

app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt

@@ -1,13 +1,17 @@
 package com.tangem.tap.features.details.ui.appsettings
 
 import android.content.res.Configuration
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
@@ -32,6 +36,7 @@ internal fun AppSettingsScreen(state: AppSettingsScreenState, onBackClick: () ->
         },
         titleRes = R.string.app_settings_title,
         onBackClick = onBackClick,
+        addBottomInsets = false,
     )
 }
 
@@ -44,7 +49,11 @@ private fun AppSettings(state: AppSettingsScreenState.Content) {
         null -> Unit
     }
 
-    LazyColumn {
+    val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
+
+    LazyColumn(
+        contentPadding = PaddingValues(bottom = bottomBarHeight),
+    ) {
         items(
             items = state.items,
             key = Item::id,

app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt

@@ -13,8 +13,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.PrimaryButtonIconEnd
-import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.utils.WindowInsetsZero
 import com.tangem.wallet.R
 
 @Composable
@@ -24,31 +24,42 @@ internal fun SettingsScreensScaffold(
     modifier: Modifier = Modifier,
     @StringRes titleRes: Int? = null,
     snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
+    addBottomInsets: Boolean = true,
     fab: @Composable () -> Unit = {},
 ) {
     val state = rememberScaffoldState(snackbarHostState = snackbarHostState)
     val backgroundColor = TangemTheme.colors.background.secondary
 
     BackHandler(onBack = onBackClick)
-    SystemBarsEffect {
-        setSystemBarsColor(backgroundColor)
-    }
 
     Scaffold(
         scaffoldState = state,
         topBar = {
             EmptyTopBarWithNavigation(
+                modifier = Modifier.statusBarsPadding(),
                 onBackClick = onBackClick,
                 backgroundColor = backgroundColor,
             )
         },
-        modifier = modifier.systemBarsPadding(),
+        modifier = modifier,
+        contentWindowInsets = WindowInsetsZero,
         backgroundColor = backgroundColor,
-        floatingActionButton = fab,
-        content = { paddings ->
+        floatingActionButton = {
+            Box(modifier = Modifier.navigationBarsPadding()) {
+                fab()
+            }
+        },
+        content = { paddingValues ->
             Column(
                 modifier = Modifier
-                    .padding(paddings)
+                    .run {
+                        if (addBottomInsets) {
+                            navigationBarsPadding()
+                        } else {
+                            this
+                        }
+                    }
+                    .padding(paddingValues)
                     .fillMaxSize(),
             ) {
                 if (titleRes != null) {
@@ -81,9 +92,11 @@ internal fun ScreenTitle(titleRes: Int, modifier: Modifier = Modifier) {
 @Composable
 internal fun EmptyTopBarWithNavigation(
     onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
     backgroundColor: Color = TangemTheme.colors.background.primary,
 ) {
     TopAppBar(
+        modifier = modifier,
         title = { },
         navigationIcon =
         {

app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt

@@ -6,14 +6,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.lifecycleScope
 import com.tangem.common.routing.AppRoute
 import com.tangem.core.analytics.Analytics
 
 import com.tangem.core.ui.UiDependencies
-import com.tangem.core.ui.components.SystemBarsEffect
+import com.tangem.core.ui.components.SystemBarsIconsDisposable
 import com.tangem.core.ui.screen.ComposeFragment
 import com.tangem.domain.tokens.TokensAction
 import com.tangem.tap.common.analytics.events.IntroductionProcess
@@ -44,15 +42,12 @@ class HomeFragment : ComposeFragment(), StoreSubscriber<HomeState> {
     @Composable
     override fun ScreenContent(modifier: Modifier) {
         BackHandler(onBack = requireActivity()::finish)
-        SystemBarsEffect {
-            setSystemBarsColor(color = Color.Transparent, darkIcons = false)
-        }
+        SystemBarsIconsDisposable(darkIcons = false)
         ScreenContent()
     }
 
     override fun onStart() {
         super.onStart()
-        activity?.window?.let { WindowCompat.setDecorFitsSystemWindows(it, false) }
 
         store.subscribe(subscriber = this) { state ->
             state

app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/TokensListFragment.kt

@@ -1,13 +1,10 @@
 package com.tangem.tap.features.tokens.impl.presentation
 
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.tangem.core.ui.UiDependencies
-import com.tangem.core.ui.components.SystemBarsEffect
-import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.screen.ComposeFragment
 import com.tangem.tap.features.tokens.impl.presentation.ui.TokensListScreen
 import com.tangem.tap.features.tokens.impl.presentation.viewmodels.TokensListViewModel
@@ -30,12 +27,7 @@ internal class TokensListFragment : ComposeFragment() {
         val viewModel = hiltViewModel<TokensListViewModel>().apply {
             LocalLifecycleOwner.current.lifecycle.addObserver(this)
         }
-        val statusBarColor = TangemTheme.colors.background.secondary
-        SystemBarsEffect {
-            setSystemBarsColor(color = statusBarColor)
-        }
         TokensListScreen(
-            modifier = Modifier.systemBarsPadding(),
             stateHolder = viewModel.uiState,
         )
     }

app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt

@@ -15,7 +15,6 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
@@ -34,6 +33,8 @@ import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
+import com.tangem.core.ui.components.BottomFade
+import com.tangem.core.ui.components.NavigationBar3ButtonsScrim
 import com.tangem.core.ui.components.PrimaryButton
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
@@ -61,32 +62,45 @@ internal fun TokensListScreen(stateHolder: TokensListStateHolder, modifier: Modi
 
     Scaffold(
         modifier = modifier,
-        topBar = { TokensListToolbar(state = stateHolder.toolbarState) },
+        topBar = {
+            TokensListToolbar(state = stateHolder.toolbarState)
+        },
         floatingActionButton = {
             if (stateHolder is TokensListStateHolder.ManageContent) {
                 val density = LocalDensity.current
                 val verticalPadding = TangemTheme.dimens.spacing32
 
                 SaveChangesButton(
-                    modifier = Modifier.onSizeChanged {
-                        with(density) { floatingButtonHeight = it.height.toDp() + verticalPadding }
-                    },
+                    modifier = Modifier
+                        .navigationBarsPadding()
+                        .onSizeChanged {
+                            with(density) { floatingButtonHeight = it.height.toDp() + verticalPadding }
+                        },
                     showProgress = stateHolder.isSavingInProgress,
                     onClick = stateHolder.onSaveButtonClick,
                 )
             }
         },
         floatingActionButtonPosition = FabPosition.Center,
-        backgroundColor = TangemTheme.colors.background.primary,
-    ) { scaffoldPadding ->
+        backgroundColor = TangemTheme.colors.background.secondary,
+    ) { _ ->
         val tokens = stateHolder.tokens.collectAsLazyPagingItems()
 
-        TokensListContent(
-            isDifferentAddressesBlockVisible = stateHolder.isDifferentAddressesBlockVisible,
-            tokens = tokens,
-            scaffoldPadding = scaffoldPadding,
-            bottomMarginDp = floatingButtonHeight,
-        )
+        if (stateHolder !is TokensListStateHolder.ManageContent) {
+            NavigationBar3ButtonsScrim()
+        }
+
+        Box {
+            TokensListContent(
+                isDifferentAddressesBlockVisible = stateHolder.isDifferentAddressesBlockVisible,
+                tokens = tokens,
+                bottomMarginDp = floatingButtonHeight,
+            )
+
+            if (stateHolder is TokensListStateHolder.ManageContent) {
+                BottomFade(Modifier.align(Alignment.BottomCenter))
+            }
+        }
 
         Crossfade(targetState = stateHolder.isLoading, label = "Update progress bar visibility") {
             if (it) {
@@ -112,23 +126,24 @@ private fun LoadingContent() {
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun TokensListContent(
     isDifferentAddressesBlockVisible: Boolean,
     tokens: LazyPagingItems<TokenItemState>,
-    scaffoldPadding: PaddingValues,
     bottomMarginDp: Dp,
 ) {
     val state = rememberLazyListState()
+    val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
 
     LazyColumn(
         modifier = Modifier
+            .background(color = TangemTheme.colors.background.primary)
             .imePadding()
-            .fillMaxSize()
-            .padding(scaffoldPadding),
+            .fillMaxSize(),
         state = state,
-        contentPadding = PaddingValues(bottom = bottomMarginDp),
+        contentPadding = PaddingValues(
+            bottom = bottomMarginDp + bottomBarHeight,
+        ),
     ) {
         item(
             key = "DifferentAddressesWarning$isDifferentAddressesBlockVisible",

app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListToolbar.kt

@@ -1,10 +1,7 @@
 package com.tangem.tap.features.tokens.impl.presentation.ui
 
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@@ -16,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -42,8 +40,15 @@ internal fun TokensListToolbar(state: TokensListToolbarState) {
     } else {
         AppBarDefaults.TopAppBarElevation
     }
+    val statusBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getTop(this).toDp() }
+
     TopAppBar(
         backgroundColor = TangemTheme.colors.background.secondary,
+        contentPadding = PaddingValues(
+            start = TangemTheme.dimens.spacing4,
+            end = TangemTheme.dimens.spacing4,
+            top = statusBarHeight,
+        ),
         elevation = toolbarElevation,
     ) {
         IconButton(onClick = state.onBackButtonClick) {

app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt

@@ -16,7 +16,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.ui.UiDependencies
-import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.screen.ComposeFragment
 import com.tangem.tap.common.analytics.events.SignIn
@@ -49,19 +48,14 @@ internal class WelcomeFragment : ComposeFragment() {
         val errorMessage by rememberUpdatedState(newValue = state.error?.resolveReference())
         val warning by rememberUpdatedState(newValue = state.warning)
 
-        val backgroundColor = TangemTheme.colors.background.primary
-        SystemBarsEffect {
-            setSystemBarsColor(backgroundColor)
-        }
-
         BackHandler {
             requireActivity().finish()
         }
 
         Box(
             modifier = modifier
-                .systemBarsPadding()
-                .background(backgroundColor),
+                .background(TangemTheme.colors.background.primary)
+                .systemBarsPadding(),
         ) {
             WelcomeScreenContent(
                 showUnlockProgress = state.showUnlockWithBiometricsProgress,