Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Scroll for Qr Color Picker #13968

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support Scroll for Qr Color Picker #13968

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions ...ms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand All @@ -21,13 +24,16 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -56,13 +62,21 @@ class UsernameLinkQrColorPickerFragment : ComposeFragment() {
override fun FragmentContent() {
val state: UsernameLinkQrColorPickerState by viewModel.state
val navController: NavController by remember { mutableStateOf(findNavController()) }
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()

Scaffold(
topBar = { TopAppBarContent(onBackClicked = { navController.popBackStack() }) }
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
TopAppBarContent(
scrollBehavior = scrollBehavior,
onBackClicked = { navController.popBackStack() }
)
}
) { contentPadding ->
Column(
modifier = Modifier
.padding(contentPadding)
.verticalScroll(rememberScrollState())
.fillMaxWidth()
.fillMaxHeight(),
verticalArrangement = Arrangement.SpaceBetween,
Expand All @@ -83,9 +97,8 @@ class UsernameLinkQrColorPickerFragment : ComposeFragment() {

Row(
modifier = Modifier
.weight(1f, false)
.fillMaxWidth()
.padding(end = 24.dp),
.padding(end = 24.dp, bottom = 24.dp),
horizontalArrangement = Arrangement.End
) {
Buttons.MediumTonal(onClick = { navController.popBackStack() }) {
Expand All @@ -97,7 +110,10 @@ class UsernameLinkQrColorPickerFragment : ComposeFragment() {
}

@Composable
private fun TopAppBarContent(onBackClicked: () -> Unit) {
private fun TopAppBarContent(
scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(),
onBackClicked: () -> Unit
) {
TopAppBar(
title = {
Text(stringResource(R.string.UsernameLinkSettings_color_picker_app_bar_title))
Expand All @@ -110,14 +126,15 @@ class UsernameLinkQrColorPickerFragment : ComposeFragment() {
contentDescription = null
)
}
}
},
scrollBehavior = scrollBehavior
)
}

@Composable
private fun ColorPicker(colors: ImmutableList<UsernameQrCodeColorScheme>, selected: UsernameQrCodeColorScheme, onSelectionChanged: (UsernameQrCodeColorScheme) -> Unit) {
LazyVerticalGrid(
modifier = Modifier.padding(horizontal = 30.dp),
modifier = Modifier.padding(horizontal = 30.dp).heightIn(max = 880.dp),
columns = GridCells.Adaptive(minSize = 88.dp)
) {
colors.forEach { color ->
Expand Down