resolved issue of bottombarnav, screen going to account screen bcz of focus condition, Update UI of help, settings, account screen

.idea/deploymentTargetSelector.xml

@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-06-28T11:34:49.550343704Z">
+        <DropdownSelection timestamp="2024-07-01T09:12:48.052197565Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=/home/ubuntu/.android/avd/Television_1080p_API_31.avd" />

app/src/main/java/com/vpn/fastestvpnservice/navigation/BottomBarNavGraphTV.kt

@@ -12,28 +12,11 @@ import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import com.vpn.fastestvpnservice.screens.ServerList
-import com.vpn.fastestvpnservice.screens.accountScreensAll.ChangePassword
-import com.vpn.fastestvpnservice.screens.accountScreensAll.FavoriteServers
-import com.vpn.fastestvpnservice.screens.accountScreensAll.SubscriptionScreen
-import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.Account
-import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.Help
-import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.Home
-import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.Settings
-import com.vpn.fastestvpnservice.screens.helpScreensAll.About
-import com.vpn.fastestvpnservice.screens.helpScreensAll.CustomerSupport
-import com.vpn.fastestvpnservice.screens.helpScreensAll.EmailUsScreen
-import com.vpn.fastestvpnservice.screens.helpScreensAll.FAQ
-import com.vpn.fastestvpnservice.screens.helpScreensAll.PrivacyPolicy
-import com.vpn.fastestvpnservice.screens.helpScreensAll.TermsAndConditions
-import com.vpn.fastestvpnservice.screens.settingsScreenAll.Notifications
-import com.vpn.fastestvpnservice.screens.settingsScreenAll.SplitTunneling
 import com.vpn.fastestvpnservice.screensTV.AccountTV
 import com.vpn.fastestvpnservice.screensTV.HelpTV
 import com.vpn.fastestvpnservice.screensTV.HomeTV
 import com.vpn.fastestvpnservice.screensTV.SettingsTV
 import com.vpn.fastestvpnservice.sealedClass.BottomBarScreen
-import com.vpn.fastestvpnservice.sealedClass.Screen
 
 @Composable
 fun BottomBarNavGraphTV(navHostController: NavHostController,

app/src/main/java/com/vpn/fastestvpnservice/screens/BottomBarMainScreen.kt

@@ -150,7 +150,7 @@ fun RowScope.AddItem(
     BottomNavigationItem(
         modifier = Modifier
             .onFocusChanged {
-                            isClicked = true
+//                            isClicked = true
         },
         label = {
             if (currentDestination?.route == screen.route) {

app/src/main/java/com/vpn/fastestvpnservice/screensTV/AccountScreenTV.kt

@@ -10,6 +10,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.LocalOverscrollConfiguration
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -47,6 +48,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.painter.Painter
@@ -97,6 +99,7 @@ fun AccountTV(navHostController: NavHostController,
             .background(colorResource(id = R.color.background_color_gray))
             .fillMaxSize()
             .padding(vertical = 10.dp)
+            .padding(bottom = 0.dp)
             .verticalScroll(rememberScrollState())
 //        contentAlignment = Alignment.Center
 
@@ -119,20 +122,20 @@ fun AccountTV(navHostController: NavHostController,
                     size = 28.sp,
                     color = MaterialTheme.colorScheme.inversePrimary
                 )
-                Spacer(modifier = Modifier.height(15.dp))
-                AddRowAccountTV("Email: ", basePreferenceHelper.getUser()?.userinfo?.email ?: "")
-                AddRowAccountTV("Product: ", basePreferenceHelper.getProduct()?.productName ?: "")
-                AddRowAccountTV("Account Status: ", basePreferenceHelper.getProduct()?.status ?: "")
+//                Spacer(modifier = Modifier.height(15.dp))
+//                AddRowAccountTV("Email: ", basePreferenceHelper.getUser()?.userinfo?.email ?: "")
+//                AddRowAccountTV("Product: ", basePreferenceHelper.getProduct()?.productName ?: "")
+//                AddRowAccountTV("Account Status: ", basePreferenceHelper.getProduct()?.status ?: "")
 
-                Surface(
-                    modifier = Modifier
-                        .padding(top = 23.5.dp, bottom = 0.dp)
-                        .height(1.dp)
-                        .fillMaxWidth(),
-                    color = colorResource(id = R.color.gray_icon)
-                ) {}
+//                Surface(
+//                    modifier = Modifier
+//                        .padding(top = 23.5.dp, bottom = 0.dp)
+//                        .height(1.dp)
+//                        .fillMaxWidth(),
+//                    color = colorResource(id = R.color.gray_icon)
+//                ) {}
 
-                Spacer(modifier = Modifier.height(23.5.dp))
+                Spacer(modifier = Modifier.height(22.dp))
 
                 AddRowAccountIconFirstTV(
                     icon = painterResource(id = R.drawable.subscription3x),
@@ -362,8 +365,9 @@ fun ColumnScope.AddRowAccountIconFirstTV(
         modifier = Modifier
             .fillMaxWidth()
             .padding(top = 0.dp)
-            .background(Color.Transparent)
-            .height(24.dp)
+            .clip(RoundedCornerShape(4.dp))
+            .background(Color.White)
+            .height(61.dp)
             .pointerInput(Unit) {
                 detectTapGestures {
                     onClick()
@@ -373,7 +377,7 @@ fun ColumnScope.AddRowAccountIconFirstTV(
         verticalAlignment = Alignment.CenterVertically
     ) {
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 20.dp),
             color = Color.Transparent
         ) {
             Image(
@@ -402,7 +406,7 @@ fun ColumnScope.AddRowAccountIconFirstTV(
         Spacer(modifier = Modifier.weight(1f))
         Surface(
             modifier = Modifier
-                .padding(start = 15.dp)
+                .padding(end = 20.dp)
                 .align(Alignment.CenterVertically),
             color = Color.Transparent
         ) {
@@ -433,9 +437,13 @@ fun ColumnScope.AddRowAccountIconTV(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 40.dp)
-            .background(Color.Transparent)
-            .height(24.dp)
+            .padding(top = 5.dp)
+            .background(Color.White, shape = RoundedCornerShape(4.dp))
+            .height(61.dp)
+//            .border(
+//                1.dp, Color.Blue, RoundedCornerShape(40.dp)
+//            )
+//            .clip(RoundedCornerShape(40.dp))
             .pointerInput(Unit) {
                 detectTapGestures {
                     onClick()
@@ -445,7 +453,7 @@ fun ColumnScope.AddRowAccountIconTV(
         verticalAlignment = Alignment.CenterVertically
     ) {
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 20.dp),
             color = Color.Transparent
         ) {
             Image(
@@ -474,7 +482,7 @@ fun ColumnScope.AddRowAccountIconTV(
         Spacer(modifier = Modifier.weight(1f))
         Surface(
             modifier = Modifier
-                .padding(start = 15.dp)
+                .padding(end = 20.dp)
                 .align(Alignment.CenterVertically),
             color = Color.Transparent
         ) {

app/src/main/java/com/vpn/fastestvpnservice/screensTV/BottomBarMainScreenTV.kt

@@ -1,10 +1,14 @@
 package com.vpn.fastestvpnservice.screensTV
 
-import android.app.Activity
 import android.util.Log
 import androidx.activity.ComponentActivity
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -20,13 +24,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
@@ -38,9 +41,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.vpn.fastestvpnservice.R
-import com.vpn.fastestvpnservice.navigation.BottomBarNavGraph
 import com.vpn.fastestvpnservice.navigation.BottomBarNavGraphTV
-import com.vpn.fastestvpnservice.screens.BottomBar
 import com.vpn.fastestvpnservice.sealedClass.BottomBarScreen
 import com.vpn.fastestvpnservice.ui.theme.customTypography2
 import com.vpn.fastestvpnservice.utils.StaticMethods
@@ -64,6 +65,7 @@ fun BottomBarMainScreenTV(navHostController: NavHostController, activity: Compon
     }
 
     Scaffold (
+        modifier = Modifier.fillMaxSize(),
         bottomBar = {
             if (isBottomBarVisible) {
                 BottomBarTV(navController1, screens)
@@ -71,14 +73,18 @@ fun BottomBarMainScreenTV(navHostController: NavHostController, activity: Compon
         },
         content = { padding ->
             Box(modifier = Modifier.padding(padding)) {
-                val view = LocalView.current
-                val window = (view.context as Activity).window
-                window.statusBarColor = Color.Transparent.toArgb()
-                window.navigationBarColor = Color.Transparent.toArgb()
+//                val view = LocalView.current
+//                val window = (view.context as Activity).window
+//                window.statusBarColor = Color.Transparent.toArgb()
+//                window.navigationBarColor = Color.Transparent.toArgb()
 
                 BottomBarNavGraphTV(navHostController = navController1,
                     settingsNavHostController = navHostController,
                     activity)
+
+//                if (isBottomBarVisible) {
+//                    BottomBarTV(navController1, screens)
+//                }
             }
         }
     )
@@ -92,24 +98,29 @@ fun BottomBarTV(navHostController: NavHostController, screens: List<BottomBarScr
     val currentDestination = navBackStackEntry.value?.destination
     Log.d("currentRoute -> BB ", currentDestination.toString())
 
-    BottomNavigation (
+    Column(
+        modifier = Modifier,
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        BottomNavigation (
 //        backgroundColor = MaterialTheme.colorScheme.onBackground,
-        backgroundColor = colorResource(id = R.color.white),
-
-        elevation = 0.dp,
+            backgroundColor = colorResource(id = R.color.background_color_gray),
+            elevation = 0.dp,
 //        contentColor = Color.Gray,
-        modifier = Modifier
-            .height(if (StaticMethods.isTV(context)) 90.dp else if (isTablet()) 150.dp else 110.dp)
-//            .border(
-//                1.dp, colorResource(id = R.color.blue_text), RoundedCornerShape (15.dp)
-//            )
-    ) {
-        screens.forEach { screen ->
-            AddItemTV(
-                screen = screen,
-                currentDestination = currentDestination,
-                navHostController = navHostController
-            )
+            modifier = Modifier
+                .height(if (StaticMethods.isTV(context)) 70.dp else if (isTablet()) 150.dp else 110.dp)
+                .fillMaxWidth(fraction = 1f)
+//                .background(Color.LightGray)
+
+        ) {
+            screens.forEach { screen ->
+                AddItemTV(
+                    screen = screen,
+                    currentDestination = currentDestination,
+                    navHostController = navHostController
+                )
+            }
         }
     }
 }
@@ -147,8 +158,9 @@ fun RowScope.AddItemTV(
     BottomNavigationItem(
         modifier = Modifier
             .onFocusChanged {
-                isClicked = true
-            },
+                if (it.isFocused) isClicked = true
+            }
+        ,
         label = {
             if (currentDestination?.route == screen.route) {
                 Text(

app/src/main/java/com/vpn/fastestvpnservice/screensTV/HelpScreenTV.kt

@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Message
@@ -30,6 +31,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.toArgb
@@ -87,9 +89,11 @@ fun HelpTV(navHostController: NavHostController) {
                     size = 28.sp,
                     color = MaterialTheme.colorScheme.inversePrimary
                 )
+                Spacer(modifier = Modifier.height(22.dp))
+
                 AddRowTV(icon = R.drawable.faq3x,
                     text = "FAQ", navHostController = navHostController,
-                    topPadding = 33.dp)
+                    topPadding = 22.dp)
                 {
                     navHostController.navigate(
                         Screen.FAQ.route
@@ -142,9 +146,10 @@ fun ColumnScope.AddRowTV(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = topPadding)
-            .background(Color.Transparent)
-            .height(24.dp)
+            .padding(top = 5.dp)
+            .clip(RoundedCornerShape(4.dp))
+            .background(Color.White)
+            .height(61.dp)
             .pointerInput(Unit) {
                 detectTapGestures {
                     Log.d("test_row", "Clicked Row ${onClick().toString()}")
@@ -161,7 +166,7 @@ fun ColumnScope.AddRowTV(
     ) {
 
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 20.dp),
             color = Color.Transparent
         ) {
             Image(
@@ -193,7 +198,7 @@ fun ColumnScope.AddRowTV(
 
         Surface(
             modifier = Modifier
-                .padding(start = 15.dp)
+                .padding(end = 20.dp)
                 .align(Alignment.CenterVertically),
             color = Color.Transparent
 
@@ -227,9 +232,9 @@ fun ColumnScope.AddRowIconTV(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = topPadding)
-            .background(Color.Transparent)
-            .height(24.dp)
+            .padding(top = 5.dp)
+            .background(Color.White)
+            .height(61.dp)
             .pointerInput(Unit) {
                 detectTapGestures {
                     Log.d("test_row", "Clicked Row ${onClick().toString()}")
@@ -246,7 +251,7 @@ fun ColumnScope.AddRowIconTV(
     ) {
 
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 20.dp),
             color = Color.Transparent
         ) {
             Image(
@@ -278,7 +283,7 @@ fun ColumnScope.AddRowIconTV(
 
         Surface(
             modifier = Modifier
-                .padding(start = 15.dp)
+                .padding(end = 20.dp)
                 .align(Alignment.CenterVertically),
             color = Color.Transparent
 

app/src/main/java/com/vpn/fastestvpnservice/screensTV/SettingsScreenTV.kt

@@ -28,6 +28,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.DarkMode
@@ -57,6 +58,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
@@ -142,6 +144,8 @@ fun SettingsTV(navHostController: NavHostController) {
                     color = MaterialTheme.colorScheme.inversePrimary,
                     style = MaterialTheme.typography.headlineLarge
                 )
+                Spacer(modifier = Modifier.height(22.dp))
+
                 AddRowSettingsColumnTV(
                     icon = R.drawable.vpn_protocols3x,
                     text = "VPN Protocols"
@@ -220,9 +224,10 @@ fun ColumnScope.AddRowSettingsTV(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = topPadding, end = 27.dp)
-            .background(Color.Transparent)
-            .height(24.dp)
+            .padding(top = 5.dp, end = 27.dp)
+            .clip(RoundedCornerShape(4.dp))
+            .background(Color.White)
+            .height(61.dp)
             .pointerInput(Unit) {
                 detectTapGestures {
                     onClick()
@@ -233,7 +238,7 @@ fun ColumnScope.AddRowSettingsTV(
     ) {
 
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 20.dp),
             color = Color.Transparent
         ) {
             Image(
@@ -264,7 +269,7 @@ fun ColumnScope.AddRowSettingsTV(
 
         Surface(
             modifier = Modifier
-                .padding(start = 15.dp)
+                .padding(end = 20.dp)
                 .align(Alignment.CenterVertically),
             color = Color.Transparent
 
@@ -309,15 +314,16 @@ fun ColumnScope.AddRowSwitchTV(icon: Int, text: String) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 40.dp, end = 13.dp)
-            .background(Color.Transparent)
-            .height(30.dp),
+            .padding(top = 5.dp, end = 27.dp)
+            .clip(RoundedCornerShape(4.dp))
+            .background(Color.White)
+            .height(61.dp),
         horizontalArrangement = Arrangement.Start,
         verticalAlignment = Alignment.CenterVertically
     ) {
 
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 20.dp),
             color = Color.Transparent
         ) {
             Image(
@@ -355,7 +361,7 @@ fun ColumnScope.AddRowSwitchTV(icon: Int, text: String) {
 
         Surface(
             modifier = Modifier
-                .padding(start = 0.dp, end = 0.dp)
+                .padding(start = 0.dp, end = 13.dp)
                 .align(Alignment.CenterVertically),
             color = Color.Transparent
         ) {
@@ -415,9 +421,10 @@ fun ColumnScope.AddRowSettingsColumnTV(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 29.dp, end = 27.dp)
-            .background(Color.Transparent)
-            .height(37.dp)
+            .padding(top = 5.dp, end = 27.dp)
+            .clip(RoundedCornerShape(4.dp))
+            .background(Color.White)
+            .height(61.dp)
 //            .clickable { isSheetOpen = true }
             .pointerInput(Unit) {
                 detectTapGestures {
@@ -430,7 +437,7 @@ fun ColumnScope.AddRowSettingsColumnTV(
     ) {
 
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 20.dp),
             color = Color.Transparent
         ) {
             Image(
@@ -446,17 +453,21 @@ fun ColumnScope.AddRowSettingsColumnTV(
         }
 
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 0.dp)
+                .align(Alignment.CenterVertically),
             color = Color.Transparent
         ) {
-            Column {
+            Column(
+                modifier = Modifier.background(Color.Transparent),
+                verticalArrangement = Arrangement.Center
+            ) {
                 Text(text = text,
                     color = MaterialTheme.colorScheme.inversePrimary,
                     style = MaterialTheme.typography.titleSmall,
                     maxLines = 1,
                     modifier = Modifier
                         .padding(start = 18.dp, end = 0.dp)
-                        .weight(1f)
+//                        .weight(1f)
                 )
                 Spacer(modifier = Modifier.height(2.dp))
                 Text(text = selectedProtocol,
@@ -467,7 +478,7 @@ fun ColumnScope.AddRowSettingsColumnTV(
                     maxLines = 1,
                     modifier = Modifier
                         .padding(start = 18.dp, end = 0.dp)
-                        .weight(1f)
+//                        .weight(1f)
                         .alpha(0.6F),
                 )
             }
@@ -476,7 +487,7 @@ fun ColumnScope.AddRowSettingsColumnTV(
 
         Surface(
             modifier = Modifier
-                .padding(start = 15.dp)
+                .padding(end = 20.dp)
                 .align(Alignment.CenterVertically),
             color = Color.Transparent
 
@@ -591,20 +602,21 @@ fun ColumnScope.AddRowSettingsSmartTV(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 40.dp, end = 27.dp)
-            .background(Color.Transparent)
+            .padding(top = 5.dp, end = 27.dp)
+            .clip(RoundedCornerShape(4.dp))
+            .background(Color.White)
             .pointerInput(Unit) {
                 detectTapGestures {
                     isSmartSheetOpen = true
                 }
             }
-            .height(30.dp),
+            .height(61.dp),
         horizontalArrangement = Arrangement.Start,
         verticalAlignment = Alignment.CenterVertically
     ) {
 
         Surface(
-            modifier = Modifier.padding(start = 0.dp),
+            modifier = Modifier.padding(start = 20.dp),
             color = Color.Transparent
         ) {
             Image(
@@ -634,7 +646,7 @@ fun ColumnScope.AddRowSettingsSmartTV(
         Spacer(modifier = Modifier.weight(1f))
         Surface(
             modifier = Modifier
-                .padding(start = 15.dp)
+                .padding(end = 20.dp)
                 .align(Alignment.CenterVertically),
             color = Color.Transparent
         ) {

app/src/main/java/com/vpn/fastestvpnservice/screensTV/SplashScreenTV.kt

@@ -38,7 +38,7 @@ fun SplashTV(navHostController: NavHostController) {
 
     Box(modifier = Modifier
         .paint(
-            painter = painterResource(id = if (isDarkTheme.value) R.drawable.bg_app else R.drawable.bg_img3),
+            painter = painterResource(id = if (isDarkTheme.value) R.drawable.bg_app_light else R.drawable.bg_app_light),
             contentScale = ContentScale.FillBounds
         )
         .fillMaxSize(),