From 6acaad08cbf36b7d6fa85df7b8481ce8231836b2 Mon Sep 17 00:00:00 2001 From: Sylwester Zielinski Date: Fri, 27 Jan 2023 16:04:36 +0100 Subject: [PATCH] Fix tabs on UART --- profile_uart/build.gradle.kts | 6 +++--- .../java/no/nordicsemi/android/uart/view/UARTScreen.kt | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/profile_uart/build.gradle.kts b/profile_uart/build.gradle.kts index 9fa2df04..eda73918 100644 --- a/profile_uart/build.gradle.kts +++ b/profile_uart/build.gradle.kts @@ -53,10 +53,10 @@ dependencies { implementation(libs.room.runtime) implementation(libs.room.ktx) - -// kapt(libs.room.compiler) kapt(libs.room.compiler) -// kapt("") + + implementation(libs.accompanist.pager) + implementation(libs.accompanist.pagerindicators) implementation(libs.nordic.ble.common) implementation(libs.nordic.ble.ktx) diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt index 795de080..87f0b7d3 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt @@ -42,10 +42,12 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel +import com.google.accompanist.pager.ExperimentalPagerApi import no.nordicsemi.android.common.theme.view.PagerView import no.nordicsemi.android.common.theme.view.PagerViewEntity import no.nordicsemi.android.common.theme.view.PagerViewItem @@ -120,6 +122,7 @@ private fun AppBar(state: UARTViewState, navigateUp: () -> Unit, onEvent: (UARTV } } +@OptIn(ExperimentalPagerApi::class) @Composable private fun SuccessScreen() { val input = stringResource(id = R.string.uart_input) @@ -133,7 +136,9 @@ private fun SuccessScreen() { PagerView( viewEntity = viewEntity, modifier = Modifier.fillMaxSize(), - itemSpacing = 16.dp + itemSpacing = 16.dp, + coroutineScope = rememberCoroutineScope(), + scrollable = false ) }