material3 > material 다운그레이드

croquiscom · Mar 23, 2023 · e9d968f · e9d968f
1 parent 97ee834
commit e9d968f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/cropper/build.gradle b/cropper/build.gradle
@@ -50,8 +50,8 @@ dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.runtime:runtime:$compose_version"
 
-    // Material Design 3 for Compose
-    implementation "androidx.compose.material3:material3:1.0.0"
+    implementation "androidx.compose.material:material:$compose_version"
+
     // Material design icons
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
 

diff --git a/cropper/src/main/java/com/smarttoolfactory/cropper/CropModifier.kt b/cropper/src/main/java/com/smarttoolfactory/cropper/CropModifier.kt
@@ -2,6 +2,7 @@ package com.smarttoolfactory.cropper
 
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.runtime.*
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.clipToBounds
@@ -40,6 +41,7 @@ import kotlinx.coroutines.launch
  * @param onGestureEnd callback to notify that gesture finished return current
  * [CropData]  of this modifier
  */
+@OptIn(ExperimentalComposeUiApi::class)
 fun Modifier.crop(
     vararg keys: Any?,
     cropState: CropState,

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,8 +2,8 @@ package com.smarttoolfactory.cropper.widget
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -21,7 +21,7 @@ import com.smarttoolfactory.cropper.model.CropAspectRatio
 @Composable
 fun AspectRatioSelectionCard(
     modifier: Modifier = Modifier,
-    contentColor: Color = MaterialTheme.colorScheme.surface,
+    contentColor: Color = MaterialTheme.colors.surface,
     color: Color,
     cropAspectRatio: CropAspectRatio,
     onClick: ((List<Int>) -> Unit)? = null

diff --git a/cropper/src/main/java/com/smarttoolfactory/cropper/widget/CropFrameDisplayCard.kt b/cropper/src/main/java/com/smarttoolfactory/cropper/widget/CropFrameDisplayCard.kt
@@ -4,13 +4,13 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.outlined.FavoriteBorder
 import androidx.compose.material.icons.outlined.Image
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -37,10 +37,10 @@ fun CropFrameDisplayCard(
     modifier: Modifier = Modifier,
     editable: Boolean,
     scale: Float,
-    contentColor: Color = MaterialTheme.colorScheme.surface,
+    contentColor: Color = MaterialTheme.colors.surface,
     outlineColor: Color,
-    editButtonBackgroundColor: Color = MaterialTheme.colorScheme.tertiary,
-    editButtonContentColor: Color = MaterialTheme.colorScheme.onTertiary,
+    editButtonBackgroundColor: Color = MaterialTheme.colors.primary,
+    editButtonContentColor: Color = MaterialTheme.colors.primary,
     fontSize: TextUnit = 12.sp,
     title: String,
     cropOutline: CropOutline,

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.material3.Text
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment