|
|
@@ -85,12 +85,8 @@ fun CreateWorkoutScreen(
|
|
|
number = index + 1,
|
|
|
typeLabel = stringResource(exercise.type.labelRes),
|
|
|
name = exercise.name,
|
|
|
- notes = exercise.notes,
|
|
|
onNameChange = { name ->
|
|
|
updateExercise(exercises, exercise.id) { it.copy(name = name) }
|
|
|
- },
|
|
|
- onNotesChange = { notes ->
|
|
|
- updateExercise(exercises, exercise.id) { it.copy(notes = notes) }
|
|
|
}
|
|
|
)
|
|
|
}
|
|
|
@@ -163,9 +159,7 @@ private fun NamedExerciseEditor(
|
|
|
number: Int,
|
|
|
typeLabel: String,
|
|
|
name: String,
|
|
|
- notes: String,
|
|
|
- onNameChange: (String) -> Unit,
|
|
|
- onNotesChange: (String) -> Unit
|
|
|
+ onNameChange: (String) -> Unit
|
|
|
) {
|
|
|
val shape = RoundedCornerShape(14.dp)
|
|
|
Column(
|
|
|
@@ -196,13 +190,6 @@ private fun NamedExerciseEditor(
|
|
|
onValueChange = onNameChange,
|
|
|
label = stringResource(R.string.exercise_name)
|
|
|
)
|
|
|
- TorusTextField(
|
|
|
- value = notes,
|
|
|
- onValueChange = onNotesChange,
|
|
|
- label = stringResource(R.string.exercise_notes),
|
|
|
- singleLine = false,
|
|
|
- minLines = 3
|
|
|
- )
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -259,17 +246,14 @@ private fun TorusTextField(
|
|
|
value: String,
|
|
|
onValueChange: (String) -> Unit,
|
|
|
label: String,
|
|
|
- modifier: Modifier = Modifier,
|
|
|
- singleLine: Boolean = true,
|
|
|
- minLines: Int = 1
|
|
|
+ modifier: Modifier = Modifier
|
|
|
) {
|
|
|
OutlinedTextField(
|
|
|
value = value,
|
|
|
onValueChange = onValueChange,
|
|
|
modifier = modifier.fillMaxWidth(),
|
|
|
label = { Text(text = label) },
|
|
|
- singleLine = singleLine,
|
|
|
- minLines = minLines,
|
|
|
+ singleLine = true,
|
|
|
shape = RoundedCornerShape(14.dp),
|
|
|
colors = torusTextFieldColors()
|
|
|
)
|