Skip to content

Commit e35a573

Browse files
update setting widgets
1 parent dc78a07 commit e35a573

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

app/src/main/java/com/smarttoolfactory/composecropper/preferences/SelctionWidgets.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ internal fun SliderWithValueSelection(
5959
valueRange: ClosedFloatingPointRange<Float>,
6060
colors: MaterialSliderColors = MaterialSliderDefaults.materialColors(
6161
activeTrackColor = SliderBrushColor(MaterialTheme.colorScheme.primary),
62-
inactiveTrackColor = SliderBrushColor(Color.Transparent),
63-
thumbColor = SliderBrushColor(MaterialTheme.colorScheme.inversePrimary)
64-
)
62+
inactiveTrackColor = SliderBrushColor(Color.Transparent)
63+
),
6564
) {
6665
Column {
6766

@@ -83,7 +82,7 @@ internal fun SliderWithValueSelection(
8382
valueRange = valueRange,
8483
colors = colors,
8584
trackHeight = 10.dp,
86-
thumbRadius = 12.dp
85+
thumbRadius = 10.dp
8786
)
8887
}
8988
}
@@ -109,7 +108,7 @@ internal fun SliderSelection(
109108
colors = colors,
110109
borderStroke = BorderStroke(2.dp, MaterialTheme.colorScheme.primary),
111110
trackHeight = 10.dp,
112-
thumbRadius = 12.dp,
111+
thumbRadius = 10.dp,
113112
onValueChangeFinished = onValueChangeFinished
114113
)
115114
}
@@ -160,17 +159,18 @@ internal fun FullRowSwitch(
160159
}
161160
}
162161

163-
@OptIn(ExperimentalMaterial3Api::class)
164162
@Composable
165163
internal fun CropTextField(value: String, onValueChange: (String) -> Unit) {
166164
TextField(
167165
value = value,
168166
onValueChange = onValueChange,
169-
colors = TextFieldDefaults.textFieldColors(
170-
containerColor = Color.Transparent,
167+
colors = TextFieldDefaults.colors(
168+
focusedContainerColor = Color.Transparent,
169+
unfocusedContainerColor = Color.Transparent,
170+
disabledContainerColor = Color.Transparent,
171171
focusedIndicatorColor = Color.Transparent,
172172
unfocusedIndicatorColor = Color.Transparent,
173-
disabledIndicatorColor = Color.Transparent
173+
disabledIndicatorColor = Color.Transparent,
174174
)
175175
)
176176
}

cropper/src/main/java/com/smarttoolfactory/cropper/widget/AspectRatioSlectionCard.kt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package com.smarttoolfactory.cropper.widget
22

33
import androidx.compose.foundation.background
4-
import androidx.compose.foundation.layout.*
4+
import androidx.compose.foundation.layout.Box
5+
import androidx.compose.foundation.layout.Column
6+
import androidx.compose.foundation.layout.aspectRatio
7+
import androidx.compose.foundation.layout.fillMaxWidth
8+
import androidx.compose.foundation.layout.padding
59
import androidx.compose.material3.MaterialTheme
610
import androidx.compose.material3.Text
711
import androidx.compose.runtime.Composable
@@ -14,6 +18,7 @@ import androidx.compose.ui.graphics.drawscope.Stroke
1418
import androidx.compose.ui.graphics.drawscope.translate
1519
import androidx.compose.ui.platform.LocalDensity
1620
import androidx.compose.ui.platform.LocalLayoutDirection
21+
import androidx.compose.ui.text.style.TextOverflow
1722
import androidx.compose.ui.unit.dp
1823
import androidx.compose.ui.unit.sp
1924
import com.smarttoolfactory.cropper.model.CropAspectRatio
@@ -72,7 +77,13 @@ fun AspectRatioSelectionCard(
7277
)
7378
}
7479
if (cropAspectRatio.title.isNotEmpty()) {
75-
Text(text = cropAspectRatio.title, color = color, fontSize = 14.sp)
80+
Text(
81+
text = cropAspectRatio.title,
82+
color = color,
83+
fontSize = 14.sp,
84+
maxLines = 1,
85+
overflow = TextOverflow.Ellipsis
86+
)
7687
}
7788
}
7889
}

0 commit comments

Comments
 (0)