@@ -14,6 +14,7 @@ import androidx.compose.foundation.rememberScrollState
1414import androidx.compose.foundation.verticalScroll
1515import androidx.compose.material.ExperimentalMaterialApi
1616import androidx.compose.material.LinearProgressIndicator
17+ import androidx.compose.material3.DrawerDefaults
1718import androidx.compose.material3.ExperimentalMaterial3Api
1819import androidx.compose.material3.ModalDrawerSheet
1920import androidx.compose.material3.Scaffold
@@ -32,7 +33,9 @@ import androidx.compose.ui.platform.LocalContext
3233import androidx.compose.ui.unit.dp
3334import androidx.navigation.compose.rememberNavController
3435import com.troplo.privateuploader.api.ChatStore
36+ import com.troplo.privateuploader.api.SessionManager
3537import com.troplo.privateuploader.api.SocketHandler
38+ import com.troplo.privateuploader.api.ThemeOption
3639import com.troplo.privateuploader.api.stores.UploadStore
3740import com.troplo.privateuploader.api.stores.UserStore
3841import com.troplo.privateuploader.components.chat.MemberSidebar
@@ -43,7 +46,6 @@ import com.troplo.privateuploader.components.core.NavRoute
4346import com.troplo.privateuploader.components.core.OverlappingPanels
4447import com.troplo.privateuploader.components.core.PanelSurface
4548import com.troplo.privateuploader.components.core.TopBarNav
46- import com.troplo.privateuploader.components.core.debug.recomposeHighlighter
4749import com.troplo.privateuploader.components.core.dialogs.EmailVerificationDialog
4850import com.troplo.privateuploader.components.core.rememberOverlappingPanelsState
4951import com.troplo.privateuploader.screens.HomeScreen
@@ -63,7 +65,9 @@ fun MainScreen() {
6365 val panelState = rememberOverlappingPanelsState()
6466 var closePanels by remember { mutableStateOf(false ) }
6567 var openPanel by remember { mutableStateOf(false ) }
66-
68+ val theme = SessionManager (context).theme.collectAsState()
69+ val isAMOLED = rememberUpdatedState(theme.value == ThemeOption .AMOLED )
70+ Log .d(" MainScreen" , " isAMOLED: ${isAMOLED.value} " )
6771 val closePanelsFunc = {
6872 closePanels = true
6973 }
@@ -126,7 +130,8 @@ fun MainScreen() {
126130 BottomBarNav (
127131 navController = navController,
128132 panelState = panelState,
129- closePanels = closePanelsFunc
133+ closePanels = closePanelsFunc,
134+ isAMOLED = isAMOLED
130135 )
131136 }
132137 ) { paddingValues ->
@@ -140,7 +145,8 @@ fun MainScreen() {
140145 modifier = Modifier .padding(
141146 top = paddingValues.calculateTopPadding(),
142147 bottom = paddingValues.calculateBottomPadding()
143- )
148+ ),
149+ drawerTonalElevation = if (isAMOLED.value) 0 .dp else DrawerDefaults .ModalDrawerElevation
144150 ) {
145151 Spacer (Modifier .height(12 .dp))
146152 HomeScreen (
@@ -177,7 +183,8 @@ fun MainScreen() {
177183 modifier = Modifier .padding(
178184 top = paddingValues.calculateTopPadding(),
179185 bottom = paddingValues.calculateBottomPadding()
180- )
186+ ),
187+ drawerTonalElevation = if (isAMOLED.value) 0 .dp else DrawerDefaults .ModalDrawerElevation
181188 ) {
182189 Column (
183190 modifier = Modifier
0 commit comments