From c908156c2e7086dd93163785ff1d9187506e40e0 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Sat, 17 Feb 2024 10:05:40 +0100
Subject: [PATCH] Remove usages of material 2 compose library

---
 app/build.gradle.kts                                           | 2 --
 .../be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt   | 3 +--
 gradle/libs.versions.toml                                      | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a40d496..e1f19aa 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -40,7 +40,6 @@ android {
         jvmTarget = "17"
         freeCompilerArgs +=
             arrayOf(
-                "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
                 "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
             )
     }
@@ -87,7 +86,6 @@ dependencies {
     implementation(libs.activity.compose)
     implementation(libs.activity.ktx)
     implementation(platform(libs.compose.bom))
-    implementation(libs.compose.material)
     implementation(libs.compose.material.icons.extended)
     implementation(libs.compose.material3)
     implementation(libs.compose.runtime)
diff --git a/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt
index 4e24add..50be6b8 100644
--- a/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt
+++ b/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt
@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.ContentAlpha
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.AlertDialog
@@ -209,7 +208,7 @@ fun Setting(
             subtext,
             modifier = Modifier.padding(bottom = 8.dp, start = 8.dp),
             style = MaterialTheme.typography.bodyMedium,
-            color = LocalContentColor.current.copy(alpha = ContentAlpha.medium),
+            fontWeight = FontWeight.Normal,
         )
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a839e9a..98b0069 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,6 @@ activity-compose = { group = "androidx.activity", name = "activity-compose", ver
 activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
 compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
-compose-material = { group = "androidx.compose.material", name = "material" }
 compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
 compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 compose-runtime = { group = "androidx.compose.runtime", name = "runtime-livedata" }