pornking/android-projects
0
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

fix scroll in chat screen

Browse Source
This commit is contained in:
pornking
2026-09-05 15:11:08 +03:00
parent cf77ae33a1
commit 699c1cfe0b
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/vbox/client/androidApp/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
alias(libs.plugins.convention.ktor.client) alias(libs.plugins.convention.ktor.client)
} }
val appVersion = "1.27" val appVersion = "1.27.1"
android { android {
buildFeatures { buildConfig = true } buildFeatures { buildConfig = true }
apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/MainScreen.kt
+3 -1
View File
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import ru.shadowsparky.ui.AppScaffold import ru.shadowsparky.ui.AppScaffold
import ru.shadowsparky.ui.components.LargeFlexibleTopAppBar import ru.shadowsparky.ui.components.LargeFlexibleTopAppBar
@@ -34,6 +35,7 @@ fun MainScreenScaffold(
appBar: @Composable () -> Unit, appBar: @Composable () -> Unit,
route: Route, route: Route,
onNavigate: (Route) -> Unit, onNavigate: (Route) -> Unit,
scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(),
content: @Composable (PaddingValues) -> Unit content: @Composable (PaddingValues) -> Unit
) { ) {
AppScaffold( AppScaffold(
@@ -41,7 +43,7 @@ fun MainScreenScaffold(
currentRoute = route, currentRoute = route,
onSelectNavigation = { onNavigate(it) }, onSelectNavigation = { onNavigate(it) },
navigationEntries = createNavigationList(), navigationEntries = createNavigationList(),
scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() scrollBehavior = scrollBehavior
) { padding -> content(padding) } ) { padding -> content(padding) }
} }
apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/chat/ChatScreen.kt
+3 -1
View File
@@ -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 androiddev.apps.vbox.client.shared.generated.resources.chat_title_app_bar
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -24,6 +25,7 @@ fun ChatScreen(component: ChatComponent, route: Route, onNavigate: (Route) -> Un
}, },
route, route,
onNavigate = onNavigate, onNavigate = onNavigate,
content = { ChatContent(component, it, state) } content = { ChatContent(component, it, state) },
scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
) )
} }