Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(compose) Add WindowEditTextDefaults to WindowEditText #366

Merged
merged 1 commit into from
May 14, 2024
Merged

feat(compose) Add WindowEditTextDefaults to WindowEditText #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions ...ary-compose/src/main/java/com/spendesk/grapes/compose/edittext/windowed/WindowEditText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,15 @@ import com.spendesk.grapes.compose.theme.GrapesTheme
* @since 04/07/2022
*/

private const val DefaultWindowLength = 4
private const val DefaultMaxLength = 12
private val ForbiddenCharRegex = "\\D".toRegex()

@Composable
fun WindowEditText(
text: String,
onTextChange: (String) -> Unit,
modifier: Modifier = Modifier,
windowLength: Int = DefaultWindowLength,
maxLength: Int = DefaultMaxLength,
cursorColor: Color = GrapesTheme.colors.mainWhite,
textStyle: TextStyle = GrapesTheme.typography.bodyM.copy(letterSpacing = 3.sp, color = GrapesTheme.colors.mainWhite, fontSize = 18.sp, fontFeatureSettings = "tnum"),
windowLength: Int = WindowEditTextDefaults.DefaultWindowLength,
maxLength: Int = WindowEditTextDefaults.DefaultMaxLength,
cursorColor: Color = Color.White,
textStyle: TextStyle = WindowEditTextDefaults.defaultTextStyle(),
hintChar: Char = '0',
separatorChar: Char = '-',
) {
Expand All @@ -70,10 +66,10 @@ fun WindowEditText(
text = text,
onTextChange = onTextChange,
modifier = modifier
.padding(16.dp)
.padding(GrapesTheme.dimensions.spacing3)
.fillMaxWidth()
.background(GrapesTheme.colors.primaryDark, RoundedCornerShape(12.dp))
.padding(vertical = 16.dp),
.padding(vertical = GrapesTheme.dimensions.spacing3),
windowLength = windowLength,
maxLength = maxLength,
cursorColor = cursorColor,
Expand All @@ -88,10 +84,10 @@ internal fun WindowEditTextBase(
text: String,
onTextChange: (String) -> Unit,
modifier: Modifier = Modifier,
windowLength: Int = DefaultWindowLength,
maxLength: Int = DefaultMaxLength,
cursorColor: Color = GrapesTheme.colors.mainWhite,
textStyle: TextStyle = GrapesTheme.typography.bodyM.copy(letterSpacing = 3.sp, color = GrapesTheme.colors.mainWhite, fontSize = 18.sp, fontFeatureSettings = "tnum"),
windowLength: Int = WindowEditTextDefaults.DefaultWindowLength,
maxLength: Int = WindowEditTextDefaults.DefaultMaxLength,
cursorColor: Color = Color.White,
textStyle: TextStyle = WindowEditTextDefaults.defaultTextStyle(),
hint: AnnotatedString = AnnotatedString("0"),
separator: AnnotatedString = AnnotatedString("-"),
) {
Expand All @@ -117,7 +113,7 @@ internal fun WindowEditTextBase(
}

private fun sanitizeWindowedEditTextContent(text: String, maxLength: Int): String {
return text.replace(ForbiddenCharRegex, "").run {
return text.replace(WindowEditTextDefaults.ForbiddenCharRegex, "").run {
if (this.length > maxLength) {
this.substring(0 until maxLength)
} else {
Expand Down
18 changes: 18 additions & 0 deletions ...ose/src/main/java/com/spendesk/grapes/compose/edittext/windowed/WindowEditTextDefaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.spendesk.grapes.compose.edittext.windowed

import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.sp
import com.spendesk.grapes.compose.theme.GrapesTheme

@Immutable
object WindowEditTextDefaults {
const val DefaultWindowLength = 4
const val DefaultMaxLength = 12
internal val ForbiddenCharRegex = "\\D".toRegex()

@Composable
fun defaultTextStyle(): TextStyle = GrapesTheme.typography.bodyM.copy(letterSpacing = 3.sp, color = Color.White, fontSize = 18.sp, fontFeatureSettings = "tnum")
}
Loading