remove trash

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/MainScreen.kt

@@ -39,8 +39,7 @@ fun BaseMainScreen(
         appBar = { appBar() },
         currentRoute = route,
         onSelectNavigation = { onNavigate(it) },
-        navigationEntries = createNavigationList(),
+        navigationEntries = createNavigationList()
-        colorScheme = getColorScheme()
     ) { padding -> content(padding) }
 }
 

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/Navigation.kt

@@ -1,7 +1,6 @@
 package ru.shadowsparky.vbox.shared.presentation
 
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.TopAppBarScrollBehavior
@@ -28,11 +27,6 @@ import ru.shadowsparky.vbox.shared.presentation.settings.register.RegisterScreen
 import ru.shadowsparky.vbox.shared.presentation.settings.serv.EditServScreen
 import ru.shadowsparky.vbox.shared.presentation.settings.tag.TagScreen
 
-@Composable
-fun getColorScheme(): ColorScheme {
-    return ru.shadowsparky.ui.theme.getColorScheme()
-}
-
 @Composable
 fun Modifier.imePaddingInternal(): Modifier {
     return koin.get<UiConfiguration>().imePadding(this)
@@ -94,7 +88,6 @@ fun AppScaffold(
         modifier,
         scrollBehavior,
         snackbarState,
-        getColorScheme(),
         content = content,
         appBar = { appBar() }
     )

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/offline/OfflineVideoScreen.kt

@@ -60,7 +60,7 @@ fun OfflineVideoScreen(component: OfflineVideoComponent) {
             TopAppBar(
                 { Text(stringResource(Res.string.offline_video)) },
                 navigationIcon = {
-                    BackButton { component.onBack }
+                    BackButton { component.onBack() }
                 }
             )
         }

libs/ui/src/commonMain/kotlin/ru/shadowsparky/ui/AppScaffold.kt

@@ -12,11 +12,9 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialExpressiveTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarDefaults
@@ -40,7 +38,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import ru.shadowsparky.ui.nav.Route
-import ru.shadowsparky.ui.theme.getColorScheme
 
 @Immutable
 data class NavigationEntry<out T : Route>(
@@ -55,7 +52,6 @@ fun AppScaffold(
     modifier: Modifier = Modifier,
     scrollBehavior: TopAppBarScrollBehavior? = TopAppBarDefaults.pinnedScrollBehavior(),
     snackbarState: SnackbarHostState? = null,
-    colorScheme: ColorScheme = getColorScheme(),
     appBar: @Composable (scroll: TopAppBarScrollBehavior?) -> Unit,
     content: @Composable (padding: PaddingValues) -> Unit,
 ) {
@@ -63,7 +59,6 @@ fun AppScaffold(
         modifier,
         scrollBehavior,
         snackbarState,
-        colorScheme,
         appBar = appBar,
         content = content
     )
@@ -75,7 +70,6 @@ fun <T : Route> AppScaffold(
     modifier: Modifier = Modifier,
     scrollBehavior: TopAppBarScrollBehavior? = TopAppBarDefaults.pinnedScrollBehavior(),
     snackbarState: SnackbarHostState? = null,
-    colorScheme: ColorScheme = getColorScheme(),
     currentRoute: T? = null,
     navigationEntries: List<NavigationEntry<T>>? = null,
     onSelectNavigation: ((T) -> Unit)? = null,
@@ -85,36 +79,34 @@ fun <T : Route> AppScaffold(
     val windowType = currentWindowType()
     val blurState = rememberBlurState()
     CompositionLocalProvider(LocalBlurState provides blurState) {
-        MaterialExpressiveTheme(colorScheme = colorScheme) {
+        Scaffold(
-            Scaffold(
+            bottomBar = {
-                bottomBar = {
+                if (windowType.isCompact) {
-                    if (windowType.isCompact) {
+                    BottomBar(navigationEntries, currentRoute, onSelectNavigation)
-                        BottomBar(navigationEntries, currentRoute, onSelectNavigation)
-                    }
-                },
-                topBar = {
-                    appBar(scrollBehavior)
-                }, content = {
-                    if (windowType.isExpanded && navigationEntries?.isNotEmpty() == true) {
-                        ExpandedContent(
-                            it,
-                            navigationEntries,
-                            currentRoute,
-                            onSelectNavigation,
-                            content
-                        )
-                    } else {
-                        content(it)
-                    }
-                }, modifier = if (scrollBehavior != null) {
-                    modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
-                } else {
-                    modifier
-                }, snackbarHost = {
-                    snackbarState?.let { SnackbarHost(it) }
                 }
-            )
+            },
-        }
+            topBar = {
+                appBar(scrollBehavior)
+            }, content = {
+                if (windowType.isExpanded && navigationEntries?.isNotEmpty() == true) {
+                    ExpandedContent(
+                        it,
+                        navigationEntries,
+                        currentRoute,
+                        onSelectNavigation,
+                        content
+                    )
+                } else {
+                    content(it)
+                }
+            }, modifier = if (scrollBehavior != null) {
+                modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
+            } else {
+                modifier
+            }, snackbarHost = {
+                snackbarState?.let { SnackbarHost(it) }
+            }
+        )
     }
 }