diff --git a/app/src/main/java/com/scouting/app/components/InputComponents.kt b/app/src/main/java/com/scouting/app/components/InputComponents.kt index 02ccb2f..fc01150 100755 --- a/app/src/main/java/com/scouting/app/components/InputComponents.kt +++ b/app/src/main/java/com/scouting/app/components/InputComponents.kt @@ -11,6 +11,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType @@ -104,36 +105,38 @@ fun CounterBar( ) { IconButton( onClick = { - temporaryCount += incrementStep + temporaryCount -= incrementStep onValueChange.invoke(temporaryCount) }, - modifier = Modifier.padding(start = 5.dp), + modifier = Modifier.padding(end = 5.dp), enabled = enabled, colors = IconButtonDefaults.iconButtonColors( disabledContentColor = MaterialTheme.colorScheme.onBackground ) ) { Icon( - painter = painterResource(id = R.drawable.ic_add_circle), - contentDescription = stringResource(id = R.string.ic_add_circle_content_desc), - modifier = Modifier.size(30.dp) + painter = painterResource(id = R.drawable.ic_subtract_circle), + contentDescription = stringResource(id = R.string.ic_subtract_circle_content_desc), + modifier = Modifier.size(30.dp), + tint = colorResource(id = R.color.minus) ) } IconButton( onClick = { - temporaryCount -= incrementStep + temporaryCount += incrementStep onValueChange.invoke(temporaryCount) }, - modifier = Modifier.padding(end = 5.dp), + modifier = Modifier.padding(start = 5.dp), enabled = enabled, colors = IconButtonDefaults.iconButtonColors( disabledContentColor = MaterialTheme.colorScheme.onBackground ) ) { Icon( - painter = painterResource(id = R.drawable.ic_subtract_circle), - contentDescription = stringResource(id = R.string.ic_subtract_circle_content_desc), - modifier = Modifier.size(30.dp) + painter = painterResource(id = R.drawable.ic_add_circle), + contentDescription = stringResource(id = R.string.ic_add_circle_content_desc), + modifier = Modifier.size(30.dp), + tint = colorResource(id = R.color.plus) ) } } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 60656f1..37e6c72 100755 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,5 +7,7 @@ #FF018786 #FF000000 #FFFFFFFF + #20E000 + #E00000 #CBC3FF \ No newline at end of file