From e111bce5f2a31b5cd209c021c902086267996d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Mon, 2 Oct 2023 17:08:28 +0200
Subject: [PATCH] Remove ConstraintLayout from compose

---
 .../screens/WidgetConfigureScreen.kt          | 29 +++++--------------
 gradle/libs.versions.toml                     |  3 --
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt
index 54b73f1..c5a4f44 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt
@@ -17,7 +17,6 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.constraintlayout.compose.ConstraintLayout
 import com.simplemobiletools.commons.compose.extensions.MyDevices
 import com.simplemobiletools.commons.compose.theme.AppThemeSurface
 import com.simplemobiletools.commons.extensions.adjustAlpha
@@ -32,21 +31,16 @@ internal fun WidgetConfigureScreen(
     onColorPressed: () -> Unit,
     onSavePressed: () -> Unit
 ) {
-    ConstraintLayout(
-        modifier = Modifier.fillMaxSize()
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Bottom,
     ) {
-        val (brightDisplay, bottomControls, saveButton) = createRefs()
-
         Box(
             modifier = Modifier
                 .padding(dimensionResource(id = R.dimen.activity_margin))
                 .padding(bottom = dimensionResource(id = R.dimen.activity_margin))
-                .constrainAs(brightDisplay) {
-                    top.linkTo(parent.top)
-                    end.linkTo(parent.end)
-                    start.linkTo(parent.start)
-                    bottom.linkTo(bottomControls.top)
-                }
+                .fillMaxWidth()
+                .weight(1f)
         ) {
             Icon(
                 modifier = Modifier
@@ -58,13 +52,7 @@ internal fun WidgetConfigureScreen(
             )
         }
 
-        Row(
-            modifier = Modifier.constrainAs(bottomControls) {
-                bottom.linkTo(saveButton.top)
-                start.linkTo(parent.start)
-                end.linkTo(parent.end)
-            }
-        ) {
+        Row {
             Icon(
                 modifier = Modifier
                     .size(dimensionResource(id = R.dimen.widget_colorpicker_size))
@@ -90,10 +78,7 @@ internal fun WidgetConfigureScreen(
         }
 
         Button(
-            modifier = Modifier.constrainAs(saveButton) {
-                end.linkTo(parent.end)
-                bottom.linkTo(parent.bottom)
-            },
+            modifier = Modifier.align(Alignment.End),
             onClick = onSavePressed
         ) {
             Text(text = stringResource(id = R.string.ok))
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9b72545..59cfe9c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,6 @@ composeActivity = "1.8.0-rc01"
 compose = "1.6.0-alpha06"
 composeCompiler = "1.5.3"
 composeMaterial3 = "1.2.0-alpha08"
-composeConstraintLayout = "1.0.1"
 #Gradle
 gradlePlugins-agp = "8.1.1"
 #build
@@ -45,7 +44,6 @@ simple-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons",
 #Compose
 compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
-compose-constraintlayout = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "composeConstraintLayout" }
 compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "composeMaterial3" }
 compose-material2 = { module = "androidx.compose.material:material", version.ref = "compose" }
 compose-material-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
@@ -63,7 +61,6 @@ compose = [
     "compose-foundation",
     "compose-material-icons",
     "compose-material3",
-    "compose-constraintlayout",
     "compose-runtime",
     "compose-ui",
     "compose-uiTooling-preview",