From ef0db15f11acb3bd30e6c77bf9178417e5c167d3 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Tue, 21 Feb 2023 19:14:06 +0400 Subject: [PATCH] Text paddings --- .../sadellie/unitto/feature/calculator/CalculatorScreen.kt | 7 ++++--- .../unitto/feature/calculator/components/HistoryList.kt | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt index b5684f20..2511c8ea 100644 --- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt +++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt @@ -173,12 +173,13 @@ private fun CalculatorScreen( } .toFloat() } - ), + ) + .padding(top = 8.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp) ) { InputTextField( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), value = TextFieldValue( text = uiState.input, selection = TextRange(uiState.selection.first, uiState.selection.last) @@ -187,7 +188,7 @@ private fun CalculatorScreen( pasteCallback = addSymbol ) Text( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), text = uiState.output, textAlign = TextAlign.End, softWrap = false, diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt index d9b122a1..9cd1c009 100644 --- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt +++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt @@ -89,12 +89,14 @@ internal fun HistoryList( // We do this so that callback for items height is called only once item { HistoryListItem( - modifier = Modifier.onPlaced { historyItemHeightCallback(it.size.height) }, + modifier = Modifier.onPlaced { historyItemHeightCallback(it.size.height) }.padding(horizontal = 8.dp), historyItem = historyItems.first() ) } items(historyItems.drop(1)) { historyItem -> - HistoryListItem(historyItem = historyItem) + HistoryListItem( + modifier = Modifier.padding(horizontal = 8.dp), + historyItem = historyItem) } } }