From bf84a464920e2ec81b21f5641897a52a261330cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Tue, 3 May 2022 13:02:13 +0200 Subject: [PATCH] Migrate to material compose alpha10 --- .../theme/view/dialog/StringListDialog.kt | 3 - .../android/uart/view/UARTAddMacroDialog.kt | 10 ++- .../android/uart/view/UARTContentView.kt | 61 +++++++++---------- settings.gradle | 4 +- 4 files changed, 36 insertions(+), 42 deletions(-) diff --git a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/dialog/StringListDialog.kt b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/dialog/StringListDialog.kt index 29e31714..7199e8d5 100644 --- a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/dialog/StringListDialog.kt +++ b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/dialog/StringListDialog.kt @@ -32,9 +32,6 @@ fun StringListDialog(config: StringListDialogConfig) { fun StringListView(config: StringListDialogConfig) { Card( modifier = Modifier.height(300.dp), - backgroundColor = MaterialTheme.colorScheme.surfaceVariant, - shape = RoundedCornerShape(10.dp), - elevation = 0.dp ) { Column( modifier = Modifier.padding(16.dp), diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt index 3fdc6e0d..845b8ba6 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTAddMacroDialog.kt @@ -1,13 +1,12 @@ package no.nordicsemi.android.uart.view -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.foundation.lazy.GridCells -import androidx.compose.foundation.lazy.GridItemSpan -import androidx.compose.foundation.lazy.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -38,7 +37,6 @@ import no.nordicsemi.android.utils.EMPTY private const val GRID_SIZE = 5 -@OptIn(ExperimentalFoundationApi::class) @Composable internal fun UARTAddMacroDialog(macro: UARTMacro?, onEvent: (UARTViewEvent) -> Unit) { val newLineChar = rememberSaveable { mutableStateOf(macro?.newLineChar ?: MacroEol.LF) } @@ -62,7 +60,7 @@ internal fun UARTAddMacroDialog(macro: UARTMacro?, onEvent: (UARTViewEvent) -> U ) LazyVerticalGrid( - cells = GridCells.Fixed(GRID_SIZE), + columns = GridCells.Fixed(GRID_SIZE), modifier = Modifier .padding(horizontal = 16.dp) .wrapContentHeight() diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt index dcf08dbe..cb1cf801 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt @@ -1,7 +1,6 @@ package no.nordicsemi.android.uart.view import androidx.compose.foundation.layout.* -import androidx.compose.foundation.layout.RowScopeInstance.weight import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Delete @@ -36,10 +35,12 @@ internal fun UARTContentView( ) { Column( horizontalAlignment = Alignment.CenterHorizontally, - modifier = Modifier.padding(16.dp) + modifier = Modifier.padding(16.dp).fillMaxSize() ) { - OutputSection(state.displayMessages, onEvent) + ScreenSection(modifier = Modifier.fillMaxSize()) { + OutputSection(state.displayMessages, onEvent) + } Spacer(modifier = Modifier.size(16.dp)) @@ -207,40 +208,38 @@ private fun DeleteConfigurationDialog(onEvent: (UARTViewEvent) -> Unit, onDismis @Composable private fun OutputSection(records: List, onEvent: (UARTViewEvent) -> Unit) { - ScreenSection(modifier = Modifier.weight(1f)) { - Column( - horizontalAlignment = Alignment.CenterHorizontally + Column( + horizontalAlignment = Alignment.CenterHorizontally + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically ) { - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically - ) { - SectionTitle( - resId = R.drawable.ic_output, - title = stringResource(R.string.uart_output), - modifier = Modifier + SectionTitle( + resId = R.drawable.ic_output, + title = stringResource(R.string.uart_output), + modifier = Modifier + ) + + IconButton(onClick = { onEvent(ClearOutputItems) }) { + Icon( + Icons.Default.Delete, + contentDescription = "Clear items.", ) - - IconButton(onClick = { onEvent(ClearOutputItems) }) { - Icon( - Icons.Default.Delete, - contentDescription = "Clear items.", - ) - } } + } - Spacer(modifier = Modifier.size(16.dp)) + Spacer(modifier = Modifier.size(16.dp)) - Column(modifier = Modifier.fillMaxWidth()) { - if (records.isEmpty()) { - Text(text = stringResource(id = R.string.uart_output_placeholder)) - } else { - records.forEach { - MessageItem(record = it) + Column(modifier = Modifier.fillMaxWidth()) { + if (records.isEmpty()) { + Text(text = stringResource(id = R.string.uart_output_placeholder)) + } else { + records.forEach { + MessageItem(record = it) - Spacer(modifier = Modifier.height(16.dp)) - } + Spacer(modifier = Modifier.height(16.dp)) } } } diff --git a/settings.gradle b/settings.gradle index 68009a0f..b5488f81 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,7 +21,7 @@ dependencyResolutionManagement { library('nordic-theme', 'no.nordicsemi.android.common', 'theme').versionRef('commonlibraries') library('localbroadcastmanager', 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0') - library('material', 'com.google.android.material:material:1.6.0-alpha02') + library('material', 'com.google.android.material:material:1.6.0-rc01') version('lifecycle', '2.4.1') library('lifecycle-activity', 'androidx.lifecycle', 'lifecycle-runtime-ktx').versionRef('lifecycle') @@ -39,7 +39,7 @@ dependencyResolutionManagement { version('compose', '1.1.0') library('compose-ui', 'androidx.compose.ui', 'ui').versionRef('compose') - library('compose-material', 'androidx.compose.material3:material3:1.0.0-alpha05') + library('compose-material', 'androidx.compose.material3:material3:1.0.0-alpha10') library('compose-tooling-preview', 'androidx.compose.ui', 'ui-tooling-preview').versionRef('compose') library('compose-navigation', 'androidx.navigation:navigation-compose:2.4.1') bundle('compose', ['compose-ui', 'compose-material', 'compose-tooling-preview', 'compose-navigation'])