From 54f1974c2094967e4f97f0a59a1a02fa45c800a0 Mon Sep 17 00:00:00 2001 From: govinddixit Date: Sun, 17 Dec 2023 17:46:58 +0530 Subject: [PATCH 1/2] chore(datastore): update composeMaterial3Version and OutlinedTextField:colors method signature --- dependencies.gradle | 2 +- .../datastore/pref/internal/compose/DisplayComponents.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8591d5074..7694b75b1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -14,6 +14,6 @@ ext { navigationVersion = '2.4.1' composeCompileVersion = '1.4.7' composeVersion = '1.4.0' - composeMaterial3Version = '1.0.1' + composeMaterial3Version = '1.1.2' } \ No newline at end of file diff --git a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt index a33a9e6c7..b76f64961 100644 --- a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt +++ b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt @@ -18,6 +18,7 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.Divider import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Text import androidx.compose.material3.TextFieldDefaults import androidx.compose.runtime.Composable @@ -189,7 +190,7 @@ private fun EditableField( onValueChange = { input -> newValue.value = input }, - colors = TextFieldDefaults.outlinedTextFieldColors( + colors = OutlinedTextFieldDefaults.colors( focusedBorderColor = colorResource(id = R.color.pluto___text_dark_60), unfocusedBorderColor = colorResource(id = R.color.pluto___text_dark_20) ), From 65d24886a1cdfbcba3bab77d26bebe23335b3754 Mon Sep 17 00:00:00 2001 From: govinddixit Date: Sun, 17 Dec 2023 17:55:07 +0530 Subject: [PATCH 2/2] chore(datastore): ktlint --- .../plugins/datastore/pref/internal/compose/DisplayComponents.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt index b76f64961..8ad74357d 100644 --- a/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt +++ b/pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt @@ -20,7 +20,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Text -import androidx.compose.material3.TextFieldDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState