update colors for dark theme

SmartToolFactory · SmartToolFactory · commit 2bc5907050d8 · 2022-10-04T20:20:43.000+03:00
diff --git a/app/src/main/java/com/smarttoolfactory/composecropper/demo/ImageCropDemo.kt b/app/src/main/java/com/smarttoolfactory/composecropper/demo/ImageCropDemo.kt
@@ -138,7 +138,7 @@ private fun MainContent(
 
     val imageBitmapLarge = ImageBitmap.imageResource(
         LocalContext.current.resources,
-        R.drawable.cinnamon
+        R.drawable.landscape5
     )
 
     var imageBitmap by remember { mutableStateOf(imageBitmapLarge) }
diff --git a/app/src/main/java/com/smarttoolfactory/composecropper/preferences/AspectRatioSelection.kt b/app/src/main/java/com/smarttoolfactory/composecropper/preferences/AspectRatioSelection.kt
@@ -2,6 +2,7 @@ package com.smarttoolfactory.composecropper.preferences
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
@@ -39,6 +40,7 @@ internal fun AnimatedAspectRatioSelection(
                 scaleY = scale
             }
             .width(width),
+            contentColor = MaterialTheme.colorScheme.surface,
             color = color,
             cropAspectRatio = item
         )
diff --git a/app/src/main/java/com/smarttoolfactory/composecropper/preferences/BaseSheet.kt b/app/src/main/java/com/smarttoolfactory/composecropper/preferences/BaseSheet.kt
@@ -6,39 +6,42 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
 @Composable
 internal fun BaseSheet(content: @Composable () -> Unit) {
-    Column {
-        Box(
-            modifier = Modifier
-                .padding(vertical = 16.dp)
-                .fillMaxWidth(),
-            contentAlignment = Alignment.Center
-        ) {
+    Surface {
+        Column {
             Box(
                 modifier = Modifier
-                    .width(32.dp)
-                    .height(4.dp)
-                    .background(
-                        MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = .4f),
-                        RoundedCornerShape(50)
-                    )
-            )
-        }
+                    .padding(vertical = 16.dp)
+                    .fillMaxWidth(),
+                contentAlignment = Alignment.Center
+            ) {
+                Box(
+                    modifier = Modifier
+                        .width(32.dp)
+                        .height(4.dp)
+                        .background(
+                            MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = .4f),
+                            RoundedCornerShape(50)
+                        )
+                )
+            }
 
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(400.dp)
-                .padding(horizontal = 16.dp, vertical = 8.dp)
-                .verticalScroll(rememberScrollState())
-        ) {
-            content()
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(400.dp)
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .verticalScroll(rememberScrollState())
+            ) {
+                content()
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/smarttoolfactory/composecropper/preferences/ContentScaleSelection.kt b/app/src/main/java/com/smarttoolfactory/composecropper/preferences/ContentScaleSelection.kt
@@ -4,7 +4,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/app/src/main/java/com/smarttoolfactory/composecropper/preferences/CropTypeSelection.kt b/app/src/main/java/com/smarttoolfactory/composecropper/preferences/CropTypeSelection.kt
@@ -1,11 +1,13 @@
 package com.smarttoolfactory.composecropper.preferences
 
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.smarttoolfactory.cropper.settings.CropType
@@ -24,7 +26,9 @@ internal fun CropTypeExposedSelection(
     }
 
     ExposedSelectionMenu(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .border(2.dp, Color.Cyan),
         index = index,
         title = "Crop Type",
         options = cropTypeOptions,
diff --git a/app/src/main/java/com/smarttoolfactory/composecropper/preferences/SelctionWidgets.kt b/app/src/main/java/com/smarttoolfactory/composecropper/preferences/SelctionWidgets.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material.AlertDialog
 import androidx.compose.material.RadioButton
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
@@ -173,29 +172,22 @@ internal fun DialogWithMultipleSelection(
                 }
             }
         },
-
-        buttons = {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(8.dp),
-                horizontalArrangement = Arrangement.End
-            ) {
-                Button(
-                    onClick = {
-                        onDismiss()
-                    }
-                ) {
-                    Text(text = "Dismiss")
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onConfirm(selectedOption)
                 }
-                Spacer(modifier = Modifier.width(8.dp))
-                Button(
-                    onClick = {
-                        onConfirm(selectedOption)
-                    }
-                ) {
-                    Text(text = "Confirm")
+            ) {
+                Text(text = "Accept")
+            }
+        },
+        dismissButton = {
+            TextButton(
+                onClick = {
+                    onDismiss()
                 }
+            ) {
+                Text(text = "Cancel")
             }
         }
     )
diff --git a/cropper/src/main/java/com/smarttoolfactory/cropper/ImageCropper.kt b/cropper/src/main/java/com/smarttoolfactory/cropper/ImageCropper.kt
@@ -121,7 +121,7 @@ fun ImageCropper(
 
         val transparentColor by animateColorAsState(
             animationSpec = tween(300, easing = LinearEasing),
-            targetValue = if (isTouched.value) Color(0x77000000) else Color(0xAA000000)
+            targetValue = if (isTouched.value) Color(0x66000000) else Color(0x99000000)
         )
 
         // Crops image when user invokes crop operation
diff --git a/cropper/src/main/java/com/smarttoolfactory/cropper/widget/AspectRatioSlectionCard.kt b/cropper/src/main/java/com/smarttoolfactory/cropper/widget/AspectRatioSlectionCard.kt
@@ -2,7 +2,8 @@ package com.smarttoolfactory.cropper.widget
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -20,13 +21,14 @@ import com.smarttoolfactory.cropper.model.CropAspectRatio
 @Composable
 fun AspectRatioSelectionCard(
     modifier: Modifier = Modifier,
+    contentColor: Color = MaterialTheme.colorScheme.surface,
     color: Color,
     cropAspectRatio: CropAspectRatio,
     onClick: ((List<Int>) -> Unit)? = null
 ) {
     Box(
         modifier = modifier
-            .background(Color.White)
+            .background(contentColor)
             .padding(4.dp)
     ) {
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
diff --git a/cropper/src/main/java/com/smarttoolfactory/cropper/widget/CropFrameDisplayCard.kt b/cropper/src/main/java/com/smarttoolfactory/cropper/widget/CropFrameDisplayCard.kt
@@ -38,7 +38,7 @@ fun CropFrameDisplayCard(
     modifier: Modifier = Modifier,
     editable: Boolean,
     scale: Float,
-    backgroundColor: Color = Color.White,
+    contentColor: Color = MaterialTheme.colorScheme.surface,
     outlineColor: Color,
     editButtonBackgroundColor: Color = MaterialTheme.colorScheme.tertiary,
     editButtonContentColor: Color = MaterialTheme.colorScheme.onTertiary,
@@ -50,7 +50,7 @@ fun CropFrameDisplayCard(
 
     Box(
         modifier = modifier
-            .background(backgroundColor)
+            .background(contentColor)
             .padding(4.dp),
         contentAlignment = Alignment.Center
     ) {
diff --git a/cropper/src/main/java/com/smarttoolfactory/cropper/widget/GridImageLayout.kt b/cropper/src/main/java/com/smarttoolfactory/cropper/widget/GridImageLayout.kt
@@ -3,7 +3,7 @@ package com.smarttoolfactory.cropper.widget
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ private fun MainContent(`
`138`	`138`
`139`	`139`	`val imageBitmapLarge = ImageBitmap.imageResource(`
`140`	`140`	`LocalContext.current.resources,`
`141`		`- R.drawable.cinnamon`
	`141`	`+ R.drawable.landscape5`
`142`	`142`	`)`
`143`	`143`
`144`	`144`	`var imageBitmap by remember { mutableStateOf(imageBitmapLarge) }`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package com.smarttoolfactory.composecropper.preferences`
`2`	`2`
`3`	`3`	`import androidx.compose.foundation.layout.padding`
`4`	`4`	`import androidx.compose.foundation.layout.width`
	`5`	`+import androidx.compose.material3.MaterialTheme`
`5`	`6`	`import androidx.compose.runtime.*`
`6`	`7`	`import androidx.compose.ui.Modifier`
`7`	`8`	`import androidx.compose.ui.graphics.graphicsLayer`
`@@ -39,6 +40,7 @@ internal fun AnimatedAspectRatioSelection(`
`39`	`40`	`scaleY = scale`
`40`	`41`	`}`
`41`	`42`	`.width(width),`
	`43`	`+ contentColor = MaterialTheme.colorScheme.surface,`
`42`	`44`	`color = color,`
`43`	`45`	`cropAspectRatio = item`
`44`	`46`	`)`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ fun ImageCropper(`
`121`	`121`
`122`	`122`	`val transparentColor by animateColorAsState(`
`123`	`123`	`animationSpec = tween(300, easing = LinearEasing),`
`124`		`- targetValue = if (isTouched.value) Color(0x77000000) else Color(0xAA000000)`
	`124`	`+ targetValue = if (isTouched.value) Color(0x66000000) else Color(0x99000000)`
`125`	`125`	`)`
`126`	`126`
`127`	`127`	`// Crops image when user invokes crop operation`