From df18722135b575d41c999c00f6cd7743e5433cf3 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Fri, 24 Sep 2021 21:56:04 +0200
Subject: [PATCH] Compose: Calculator: show card background

---
 .../launcher2/ui/search/CalculatorItem.kt     | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt
index 54f8bacd..2686a0d4 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt
@@ -4,10 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.ContentAlpha
-import androidx.compose.material.LocalContentAlpha
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
@@ -26,38 +23,42 @@ fun calculatorItem(): LazyListScope.() -> Unit {
     return {
         calculator?.let {
             item {
-                Column(
-                    modifier = Modifier
-                        .padding(8.dp)
-                        .fillMaxWidth()
+                Card(
+                    elevation = 0.dp
                 ) {
+                    Column(
+                        modifier = Modifier
+                            .padding(16.dp)
+                            .fillMaxWidth()
+                    ) {
 
-                    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
-                        Text(it.getBeatifiedTerm())
-                    }
-                    Text(
-                        text = "= ${it.formattedString}",
-                        style = MaterialTheme.typography.h1,
-                        modifier = Modifier.align(Alignment.End),
-                    )
-                    if (it.term.matches(Regex("(0x|0b)?[0-9]+"))) {
+                        CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+                            Text(it.getBeatifiedTerm())
+                        }
                         Text(
-                            it.formattedBinaryString,
-                            fontFamily = FontFamily.Monospace,
-                            modifier = Modifier
-                                .align(Alignment.End)
-                                .padding(top = 8.dp),
-                        )
-                        Text(
-                            it.formattedHexString,
-                            fontFamily = FontFamily.Monospace,
-                            modifier = Modifier.align(Alignment.End),
-                        )
-                        Text(
-                            it.formattedOctString,
-                            fontFamily = FontFamily.Monospace,
+                            text = "= ${it.formattedString}",
+                            style = MaterialTheme.typography.h1,
                             modifier = Modifier.align(Alignment.End),
                         )
+                        if (it.term.matches(Regex("(0x|0b)?[0-9]+"))) {
+                            Text(
+                                it.formattedBinaryString,
+                                fontFamily = FontFamily.Monospace,
+                                modifier = Modifier
+                                    .align(Alignment.End)
+                                    .padding(top = 8.dp),
+                            )
+                            Text(
+                                it.formattedHexString,
+                                fontFamily = FontFamily.Monospace,
+                                modifier = Modifier.align(Alignment.End),
+                            )
+                            Text(
+                                it.formattedOctString,
+                                fontFamily = FontFamily.Monospace,
+                                modifier = Modifier.align(Alignment.End),
+                            )
+                        }
                     }
                 }
             }