anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-3460 Primitives | Screens, vertical scroll (#2269)

Browse source
This commit is contained in:
Konstantin Ivanov 2025-04-09 17:09:38 +02:00 • committed by GitHub
parent 187cb9fc3b
commit 0c7f01adb1
Signed by: github
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/fields/ui/ListScreen.kt
View file

@ -27,7 +27,9 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyItemScope
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Scaffold
@ -206,6 +208,8 @@ fun FieldsMainModalScreen(
}
}
val scrollState = rememberScrollState()
Column(
modifier = Modifier.fillMaxSize()
.nestedScroll(rememberNestedScrollInteropConnection())
@ -217,12 +221,14 @@ fun FieldsMainModalScreen(
Dragger(
modifier = Modifier
.padding(vertical = 6.dp)
.verticalScroll(state = scrollState)
.align(Alignment.CenterHorizontally)
)
Box(
modifier = Modifier
.fillMaxWidth()
.height(48.dp)
.verticalScroll(state = scrollState)
) {
Text(
modifier = Modifier
@ -237,6 +243,7 @@ fun FieldsMainModalScreen(
modifier = Modifier
.fillMaxWidth()
.height(36.dp)
.verticalScroll(state = scrollState)
.background(color = colorResource(R.color.shape_transparent_secondary)),
uiTitleState = uiTitleState,
uiIconState = uiIconState

6
feature-properties/src/main/java/com/anytypeio/anytype/feature_properties/add/ui/AddScreen.kt
View file

@ -19,7 +19,9 @@ import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyItemScope
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
@ -70,6 +72,8 @@ fun AddFieldScreen(
val lazyListState = rememberLazyListState()
val scrollState = rememberScrollState()
Scaffold(
modifier = Modifier
.fillMaxSize()
@ -90,10 +94,12 @@ fun AddFieldScreen(
modifier = Modifier
.fillMaxWidth()
.height(48.dp)
.verticalScroll(scrollState)
)
DefaultSearchBar(
modifier = Modifier
.fillMaxWidth()
.verticalScroll(scrollState)
.padding(horizontal = 20.dp, vertical = 10.dp),
hint = R.string.object_type_add_property_screen_search_hint
) { newQuery ->