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

Remove compose material (2) library

Browse Source
This commit is contained in:
MM20 2023-02-08 20:49:14 +01:00
parent 3f2a7358c8
commit 91bb5a2096
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
4 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ui/build.gradle.kts
View File

@ -39,7 +39,6 @@ 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",
@ -72,7 +71,6 @@ 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)

24
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt
View File

@ -3,11 +3,9 @@ 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.material.ContentAlpha
import androidx.compose.material.LocalContentAlpha
import androidx.compose.material3.*
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
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
@ -24,13 +22,11 @@ fun CalculatorItem(
.fillMaxWidth()
) {
CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
Text(
text = calculator.getBeatifiedTerm(),
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.secondary
)
}
Text(
text = calculator.getBeatifiedTerm(),
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.secondary
)
Text(
text = "= ${calculator.formattedString}",
style = MaterialTheme.typography.titleLarge,
@ -39,19 +35,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),
)
}

8
app/ui/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt
View File

@ -1,8 +0,0 @@
package de.mm20.launcher2.ui.theme
import androidx.compose.material.ContentAlpha
import androidx.compose.runtime.Composable
val ContentAlpha.divider: Float
@Composable
get() = 0.12f

2
settings.gradle.kts
View File

@ -44,8 +44,6 @@ 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")