From 2434ff812ea304efffdd91314b3bb056eb98283e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Fri, 20 May 2022 11:03:42 +0200 Subject: [PATCH] Sync with Common Libraries --- build.gradle | 2 +- .../no/nordicsemi/android/uart/view/InputSection.kt | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 24bbec42..6d1d7680 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.2.0' classpath 'com.google.gms:google-services:4.3.10' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/InputSection.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/InputSection.kt index 2a2e0021..b59f8ae1 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/InputSection.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/InputSection.kt @@ -6,12 +6,14 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import kotlinx.coroutines.launch import no.nordicsemi.android.material.you.RadioButtonGroup import no.nordicsemi.android.material.you.RadioButtonItem import no.nordicsemi.android.material.you.RadioGroupViewEntity @@ -30,15 +32,21 @@ internal fun InputSection(onEvent: (UARTViewEvent) -> Unit) { Row(verticalAlignment = Alignment.CenterVertically) { Box(modifier = Modifier.weight(1f)) { + val scope = rememberCoroutineScope() + val scrollState = rememberScrollState() + OutlinedTextField( modifier = Modifier .fillMaxWidth() - .height(60.dp) - .verticalScroll(rememberScrollState()), + .heightIn(max = 65.dp) + .verticalScroll(scrollState), value = text.value, label = { Text(hint) }, onValueChange = { newValue: String -> text.value = newValue + scope.launch { + scrollState.scrollTo(Int.MAX_VALUE) + } } ) }