Skip to content

Commit 2d31a94

Browse files
committed
Renamed AspectRatio.Unspecified to AspectRatio.Original
1 parent 31eb4a3 commit 2d31a94

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

cropper/src/main/java/com/smarttoolfactory/cropper/model/AspectRatios.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ val aspectRatios = listOf(
1818
),
1919
CropAspectRatio(
2020
title = "Original",
21-
shape = createRectShape(AspectRatio.Unspecified),
22-
aspectRatio = AspectRatio.Unspecified
21+
shape = createRectShape(AspectRatio.Original),
22+
aspectRatio = AspectRatio.Original
2323
),
2424
CropAspectRatio(
2525
title = "1:1",

cropper/src/main/java/com/smarttoolfactory/cropper/model/CropAspectRatio.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ import androidx.compose.ui.graphics.Shape
1111
data class CropAspectRatio(
1212
val title: String,
1313
val shape: Shape,
14-
val aspectRatio: AspectRatio = AspectRatio.Unspecified,
14+
val aspectRatio: AspectRatio = AspectRatio.Original,
1515
val icons: List<Int> = listOf()
1616
)
1717

1818
/**
1919
* Value class for containing aspect ratio
20-
* and [AspectRatio.Unspecified] for comparing
20+
* and [AspectRatio.Original] for comparing
2121
*/
2222
@Immutable
2323
data class AspectRatio(val value: Float) {
2424
companion object {
25-
val Unspecified = AspectRatio(-1f)
25+
val Original = AspectRatio(-1f)
2626
}
2727
}

cropper/src/main/java/com/smarttoolfactory/cropper/state/CropStateImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ abstract class CropState internal constructor(
403403
coefficient: Float
404404
): Rect {
405405

406-
if (aspectRatio == AspectRatio.Unspecified) {
406+
if (aspectRatio == AspectRatio.Original) {
407407

408408
// Maximum width and height overlay rectangle can be measured with
409409
val overlayWidthMax = drawAreaWidth.coerceAtMost(containerWidth * coefficient)

cropper/src/main/java/com/smarttoolfactory/cropper/state/DynamicCropState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class DynamicCropState internal constructor(
149149
}
150150

151151
private fun getAspectRatio(): Float {
152-
return if (aspectRatio == AspectRatio.Unspecified) {
152+
return if (aspectRatio == AspectRatio.Original) {
153153
imageSize.width / imageSize.height.toFloat()
154154
} else {
155155
aspectRatio.value

cropper/src/main/java/com/smarttoolfactory/cropper/util/ShapeUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fun createRectShape(aspectRatio: AspectRatio): GenericShape {
8181
val width = size.width
8282
val height = size.height
8383
val shapeSize =
84-
if (aspectRatio == AspectRatio.Unspecified) Size(width, height)
84+
if (aspectRatio == AspectRatio.Original) Size(width, height)
8585
else if (value > 1) Size(width = width, height = width / value)
8686
else Size(width = height * value, height = height)
8787

@@ -154,7 +154,7 @@ fun calculateSizeAndOffsetFromAspectRatio(
154154

155155
val value = aspectRatio.value
156156

157-
val newSize = if (aspectRatio == AspectRatio.Unspecified) {
157+
val newSize = if (aspectRatio == AspectRatio.Original) {
158158
Size(width * coefficient, height * coefficient)
159159
} else if (value > 1) {
160160
Size(

0 commit comments

Comments
 (0)