aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-02-23 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add fixes to UART screen

Browse Source
This commit is contained in:
Sylwester Zieliński
2022-05-09 16:08:26 +02:00
parent bd485ee996
commit 76da017c63
5 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
profile_uart/src/main/java/no/nordicsemi/android/uart/view/MacroSection.kt
View File

@@ -1,6 +1,8 @@
package no.nordicsemi.android.uart.view
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Edit
@@ -37,8 +39,9 @@ internal fun MacroSection(viewState: UARTViewState, onEvent: (UARTViewEvent) ->
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.padding(16.dp)
.fillMaxSize()
.verticalScroll(rememberScrollState())
.padding(16.dp)
) {
ScreenSection {
Column(

32
profile_uart/src/main/java/no/nordicsemi/android/uart/view/OutputSection.kt
View File

@@ -90,10 +90,16 @@ fun LazyListState.isScrolledToTheEnd() = layoutInfo.visibleItemsInfo.lastOrNull(
@Composable
private fun MessageItemInput(record: UARTRecord) {
Box(
Column(
modifier = Modifier.fillMaxWidth(),
contentAlignment = Alignment.CenterEnd
horizontalAlignment = Alignment.End
) {
Text(
text = record.timeToString(),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurface
)
Spacer(modifier = Modifier.height(4.dp))
Column(
modifier = Modifier
.clip(RoundedCornerShape(topStart = 10.dp, topEnd = 10.dp, bottomStart = 10.dp))
@@ -101,12 +107,6 @@ private fun MessageItemInput(record: UARTRecord) {
.padding(8.dp),
horizontalAlignment = Alignment.End
) {
Text(
text = record.timeToString(),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.inverseOnSurface
)
Spacer(modifier = Modifier.height(4.dp))
Text(
text = record.text,
style = MaterialTheme.typography.bodyMedium,
@@ -118,22 +118,22 @@ private fun MessageItemInput(record: UARTRecord) {
@Composable
private fun MessageItemOutput(record: UARTRecord) {
Box(
Column(
modifier = Modifier.fillMaxWidth(),
contentAlignment = Alignment.CenterStart
horizontalAlignment = Alignment.Start
) {
Text(
text = record.timeToString(),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurface,
)
Spacer(modifier = Modifier.height(4.dp))
Column(
modifier = Modifier
.clip(RoundedCornerShape(topStart = 10.dp, topEnd = 10.dp, bottomEnd = 10.dp))
.background(MaterialTheme.colorScheme.primary)
.padding(8.dp)
) {
Text(
text = record.timeToString(),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.inverseOnSurface,
)
Spacer(modifier = Modifier.height(4.dp))
Text(
text = record.text,
style = MaterialTheme.typography.bodyMedium,

15
profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt
View File

@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import no.nordicsemi.android.material.you.ScreenSection
import no.nordicsemi.android.material.you.Card
import no.nordicsemi.android.uart.data.UARTData
@Composable
@@ -20,8 +20,17 @@ internal fun UARTContentView(
.fillMaxSize()
) {
ScreenSection(modifier = Modifier.weight(1f)) {
OutputSection(state.displayMessages, onEvent)
Card(
modifier = Modifier
.weight(1f)
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(start = 16.dp, top = 16.dp, end = 16.dp)
) {
OutputSection(state.displayMessages, onEvent)
}
}
Spacer(modifier = Modifier.size(16.dp))