diff --git a/apps/vbox/client/androidApp/build.gradle.kts b/apps/vbox/client/androidApp/build.gradle.kts index 9c14eb5..7ffbc04 100644 --- a/apps/vbox/client/androidApp/build.gradle.kts +++ b/apps/vbox/client/androidApp/build.gradle.kts @@ -7,7 +7,7 @@ plugins { alias(libs.plugins.convention.ktor.client) } -val appVersion = "1.27" +val appVersion = "1.27.1" android { buildFeatures { buildConfig = true } diff --git a/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/MainScreen.kt b/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/MainScreen.kt index 42e6c60..50c41fc 100644 --- a/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/MainScreen.kt +++ b/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/MainScreen.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable import ru.shadowsparky.ui.AppScaffold import ru.shadowsparky.ui.components.LargeFlexibleTopAppBar @@ -34,6 +35,7 @@ fun MainScreenScaffold( appBar: @Composable () -> Unit, route: Route, onNavigate: (Route) -> Unit, + scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(), content: @Composable (PaddingValues) -> Unit ) { AppScaffold( @@ -41,7 +43,7 @@ fun MainScreenScaffold( currentRoute = route, onSelectNavigation = { onNavigate(it) }, navigationEntries = createNavigationList(), - scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + scrollBehavior = scrollBehavior ) { padding -> content(padding) } } diff --git a/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/chat/ChatScreen.kt b/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/chat/ChatScreen.kt index 6f4b67c..5c69009 100644 --- a/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/chat/ChatScreen.kt +++ b/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/chat/ChatScreen.kt @@ -4,6 +4,7 @@ import androiddev.apps.vbox.client.shared.generated.resources.Res import androiddev.apps.vbox.client.shared.generated.resources.chat_title_app_bar import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -24,6 +25,7 @@ fun ChatScreen(component: ChatComponent, route: Route, onNavigate: (Route) -> Un }, route, onNavigate = onNavigate, - content = { ChatContent(component, it, state) } + content = { ChatContent(component, it, state) }, + scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() ) }