diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts index 419e2357..52774568 100644 --- a/app/ui/build.gradle.kts +++ b/app/ui/build.gradle.kts @@ -39,6 +39,7 @@ android { "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi", "-opt-in=androidx.compose.ui.text.ExperimentalTextApi", "-opt-in=androidx.compose.ui.unit.ExperimentalUnitApi", + "-opt-in=androidx.compose.material.ExperimentalMaterialApi", "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api", "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi", "-opt-in=androidx.compose.animation.ExperimentalAnimationApi", @@ -71,6 +72,7 @@ dependencies { implementation(libs.androidx.compose.foundationlayout) implementation(libs.androidx.compose.ui) implementation(libs.androidx.compose.uitooling) + implementation(libs.androidx.compose.material) implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.materialicons) implementation(libs.androidx.compose.animation) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt index 35e2e95b..01bbd819 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt @@ -3,9 +3,11 @@ package de.mm20.launcher2.ui.launcher.search.calculator import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text +import androidx.compose.material.ContentAlpha +import androidx.compose.material.LocalContentAlpha +import androidx.compose.material3.* import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontFamily @@ -22,11 +24,13 @@ fun CalculatorItem( .fillMaxWidth() ) { - Text( - text = calculator.getBeatifiedTerm(), - style = MaterialTheme.typography.labelLarge, - color = MaterialTheme.colorScheme.secondary - ) + CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) { + Text( + text = calculator.getBeatifiedTerm(), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.secondary + ) + } Text( text = "= ${calculator.formattedString}", style = MaterialTheme.typography.titleLarge, @@ -35,19 +39,19 @@ fun CalculatorItem( if (calculator.term.matches(Regex("(0x|0b)?[0-9]+"))) { Text( calculator.formattedBinaryString, - style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace), + style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace), modifier = Modifier .align(Alignment.End) .padding(top = 8.dp), ) Text( calculator.formattedHexString, - style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace), + style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace), modifier = Modifier.align(Alignment.End), ) Text( calculator.formattedOctString, - style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace), + style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace), modifier = Modifier.align(Alignment.End), ) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt new file mode 100644 index 00000000..13832862 --- /dev/null +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt @@ -0,0 +1,8 @@ +package de.mm20.launcher2.ui.theme + +import androidx.compose.material.ContentAlpha +import androidx.compose.runtime.Composable + +val ContentAlpha.divider: Float +@Composable +get() = 0.12f \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 1c1b4fc1..bd793455 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -44,6 +44,8 @@ dependencyResolutionManagement { .version("1.4.0-beta01") library("androidx.compose.uitooling", "androidx.compose.ui", "ui-tooling") .version("1.4.0-beta01") + library("androidx.compose.material", "androidx.compose.material", "material") + .version("1.4.0-beta01") library("androidx.compose.materialicons", "androidx.compose.material", "material-icons-extended") .version("1.4.0-beta01") library("androidx.compose.animation", "androidx.compose.animation", "animation")