@@ -14,6 +14,7 @@ import androidx.compose.foundation.rememberScrollState
14
14
import androidx.compose.foundation.verticalScroll
15
15
import androidx.compose.material.ExperimentalMaterialApi
16
16
import androidx.compose.material.LinearProgressIndicator
17
+ import androidx.compose.material3.DrawerDefaults
17
18
import androidx.compose.material3.ExperimentalMaterial3Api
18
19
import androidx.compose.material3.ModalDrawerSheet
19
20
import androidx.compose.material3.Scaffold
@@ -32,7 +33,9 @@ import androidx.compose.ui.platform.LocalContext
32
33
import androidx.compose.ui.unit.dp
33
34
import androidx.navigation.compose.rememberNavController
34
35
import com.troplo.privateuploader.api.ChatStore
36
+ import com.troplo.privateuploader.api.SessionManager
35
37
import com.troplo.privateuploader.api.SocketHandler
38
+ import com.troplo.privateuploader.api.ThemeOption
36
39
import com.troplo.privateuploader.api.stores.UploadStore
37
40
import com.troplo.privateuploader.api.stores.UserStore
38
41
import com.troplo.privateuploader.components.chat.MemberSidebar
@@ -43,7 +46,6 @@ import com.troplo.privateuploader.components.core.NavRoute
43
46
import com.troplo.privateuploader.components.core.OverlappingPanels
44
47
import com.troplo.privateuploader.components.core.PanelSurface
45
48
import com.troplo.privateuploader.components.core.TopBarNav
46
- import com.troplo.privateuploader.components.core.debug.recomposeHighlighter
47
49
import com.troplo.privateuploader.components.core.dialogs.EmailVerificationDialog
48
50
import com.troplo.privateuploader.components.core.rememberOverlappingPanelsState
49
51
import com.troplo.privateuploader.screens.HomeScreen
@@ -63,7 +65,9 @@ fun MainScreen() {
63
65
val panelState = rememberOverlappingPanelsState()
64
66
var closePanels by remember { mutableStateOf(false ) }
65
67
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} " )
67
71
val closePanelsFunc = {
68
72
closePanels = true
69
73
}
@@ -126,7 +130,8 @@ fun MainScreen() {
126
130
BottomBarNav (
127
131
navController = navController,
128
132
panelState = panelState,
129
- closePanels = closePanelsFunc
133
+ closePanels = closePanelsFunc,
134
+ isAMOLED = isAMOLED
130
135
)
131
136
}
132
137
) { paddingValues ->
@@ -140,7 +145,8 @@ fun MainScreen() {
140
145
modifier = Modifier .padding(
141
146
top = paddingValues.calculateTopPadding(),
142
147
bottom = paddingValues.calculateBottomPadding()
143
- )
148
+ ),
149
+ drawerTonalElevation = if (isAMOLED.value) 0 .dp else DrawerDefaults .ModalDrawerElevation
144
150
) {
145
151
Spacer (Modifier .height(12 .dp))
146
152
HomeScreen (
@@ -177,7 +183,8 @@ fun MainScreen() {
177
183
modifier = Modifier .padding(
178
184
top = paddingValues.calculateTopPadding(),
179
185
bottom = paddingValues.calculateBottomPadding()
180
- )
186
+ ),
187
+ drawerTonalElevation = if (isAMOLED.value) 0 .dp else DrawerDefaults .ModalDrawerElevation
181
188
) {
182
189
Column (
183
190
modifier = Modifier
0 commit comments