lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compose: Calculator: show card background

Browse Source
This commit is contained in:
MM20 2021-09-24 21:56:04 +02:00
parent ab538badd9
commit df18722135
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt
View File

@ -4,10 +4,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.material.ContentAlpha import androidx.compose.material.*
import androidx.compose.material.LocalContentAlpha
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
@ -26,38 +23,42 @@ fun calculatorItem(): LazyListScope.() -> Unit {
return { return {
calculator?.let { calculator?.let {
item { item {
Column( Card(
modifier = Modifier elevation = 0.dp
.padding(8.dp)
.fillMaxWidth()
) { ) {
Column(
modifier = Modifier
.padding(16.dp)
.fillMaxWidth()
) {
CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) { CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
Text(it.getBeatifiedTerm()) 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]+"))) {
Text( Text(
it.formattedBinaryString, text = "= ${it.formattedString}",
fontFamily = FontFamily.Monospace, style = MaterialTheme.typography.h1,
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), 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),
)
}
} }
} }
} }