From d90ae9220a2899570f2ece7480e2d30af14dc52a Mon Sep 17 00:00:00 2001
From: sadellie <sadellie.dev@gmail.com>
Date: Sun, 13 Nov 2022 11:49:44 +0400
Subject: [PATCH] Tiny padding fixes

Input and output text fields now occupy full screen width
---
 .../unitto/screens/main/MainScreen.kt         | 21 ++++++++-----------
 .../screens/main/components/TopScreen.kt      |  7 ++-----
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
index a894a9a9..085d02c5 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
@@ -91,10 +91,8 @@ fun MainScreen(
                 navControllerAction = { navControllerAction(it) },
                 swapMeasurements = { viewModel.swapUnits() },
                 processInput = { viewModel.processInput(it) },
-                deleteDigit = { viewModel.deleteDigit() },
-                clearInput = { viewModel.clearInput() },
-                negateInput = { viewModel.negateInput() }
-            )
+                deleteDigit = { viewModel.deleteDigit() }
+            ) { viewModel.clearInput() }
         }
     )
 
@@ -121,14 +119,12 @@ private fun PortraitMainScreenContent(
     processInput: (String) -> Unit = {},
     deleteDigit: () -> Unit = {},
     clearInput: () -> Unit = {},
-    negateInput: () -> Unit = {},
 ) {
     if (portrait) {
         Column(
             modifier
-                .fillMaxSize()
-                .padding(8.dp),
-            verticalArrangement = Arrangement.spacedBy(24.dp)
+                .fillMaxSize(),
+            verticalArrangement = Arrangement.spacedBy(8.dp)
         ) {
             TopScreenPart(
                 modifier = Modifier,
@@ -146,7 +142,8 @@ private fun PortraitMainScreenContent(
             // Keyboard which takes half the screen
             Keyboard(
                 Modifier
-                    .fillMaxSize(),
+                    .fillMaxSize()
+                    .padding(horizontal = 8.dp),
                 addDigit = processInput,
                 deleteDigit = deleteDigit,
                 clearInput = clearInput,
@@ -157,8 +154,7 @@ private fun PortraitMainScreenContent(
     } else {
         Row(
             modifier
-                .fillMaxSize()
-                .padding(8.dp),
+                .fillMaxSize(),
             horizontalArrangement = Arrangement.spacedBy(8.dp)
         ) {
             TopScreenPart(
@@ -181,7 +177,8 @@ private fun PortraitMainScreenContent(
             Keyboard(
                 Modifier
                     .weight(1f)
-                    .fillMaxSize(),
+                    .fillMaxSize()
+                    .padding(horizontal = 8.dp),
                 addDigit = processInput,
                 deleteDigit = deleteDigit,
                 clearInput = clearInput,
diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt
index a1535c2f..eb13d497 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt
@@ -21,10 +21,7 @@ package com.sadellie.unitto.screens.main.components
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.SwapHoriz
 import androidx.compose.material3.Icon
@@ -105,7 +102,7 @@ fun TopScreenPart(
         )
         // Unit selection buttons
         Row(
-            modifier = Modifier,
+            modifier = Modifier.padding(horizontal = 8.dp),
             verticalAlignment = Alignment.Bottom,
         ) {
             UnitSelectionButton(